sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into patch-2

pull/2056/head
Elian Doran 2025-05-30 21:39:57 +07:00
parent 1db36c5aec adc9172681
commit 56cf993f46
No known key found for this signature in database
33 changed files with 385 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
Unescape Escape View File

@ -128,7 +128,7 @@ Download the repository, install dependencies using `pnpm` and then run the envi
git clone https://github.com/TriliumNext/Notes.git git clone https://github.com/TriliumNext/Notes.git
cd Notes cd Notes
pnpm install pnpm install
pnpm nx run edit-docs:serve pnpm nx run edit-docs:edit-docs
``` ```
### Building the Executable ### Building the Executable

2
apps/client/src/stylesheets/style.css
Unescape Escape View File

@ -328,7 +328,7 @@ button kbd {
--bs-dropdown-zindex: 999; --bs-dropdown-zindex: 999;
} }
body.desktop .dropdown-menu { body.desktop .dropdown-menu.show {
border: 1px solid var(--dropdown-border-color); border: 1px solid var(--dropdown-border-color);
box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity)); box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
animation: dropdown-menu-opening 100ms ease-in; animation: dropdown-menu-opening 100ms ease-in;

2
apps/client/src/stylesheets/theme-next/base.css
Unescape Escape View File

@ -89,7 +89,7 @@
* supported when this class is used. * supported when this class is used.
*/ */
.dropdown-menu:not(.static) { .dropdown-menu.show:not(.static) {
border-radius: var(--dropdown-border-radius); border-radius: var(--dropdown-border-radius);
padding: var(--menu-padding-size) !important; padding: var(--menu-padding-size) !important;
font-size: 0.9rem !important; font-size: 0.9rem !important;

27
apps/client/src/widgets/buttons/create_ai_chat_button.ts
Unescape Escape View File

@ -1,27 +0,0 @@
import { t } from "../../services/i18n.js";
import options from "../../services/options.js";
import CommandButtonWidget from "./command_button.js";
export default class CreateAiChatButton extends CommandButtonWidget {
constructor() {
super();
this.icon("bx bx-bot")
.title(t("ai.create_new_ai_chat"))
.titlePlacement("bottom")
.command("createAiChat")
.class("icon-action");
}
isEnabled() {
return options.get("aiEnabled") === "true";
}
async refreshWithNote() {
if (this.isEnabled()) {
this.$widget.show();
} else {
this.$widget.hide();
}
}
}

5
apps/client/src/widgets/buttons/create_pane_button.ts
Unescape Escape View File

@ -8,7 +8,10 @@ export default class CreatePaneButton extends OnClickButtonWidget {
this.icon("bx-dock-right") this.icon("bx-dock-right")
.title(t("create_pane_button.create_new_split")) .title(t("create_pane_button.create_new_split"))
.titlePlacement("bottom") .titlePlacement("bottom")
.onClick((widget) => widget.triggerCommand("openNewNoteSplit", { ntxId: widget.getClosestNtxId() })) .onClick((widget, e) => {
widget.triggerCommand("openNewNoteSplit", { ntxId: widget.getClosestNtxId() });
e.stopPropagation();
})
.class("icon-action"); .class("icon-action");
} }
} }

2
apps/client/src/widgets/buttons/note_actions.ts
Unescape Escape View File

@ -186,7 +186,7 @@ export default class NoteActionsWidget extends NoteContextAwareWidget {
this.$convertNoteIntoAttachmentButton.toggle(note.isEligibleForConversionToAttachment()); this.$convertNoteIntoAttachmentButton.toggle(note.isEligibleForConversionToAttachment());
this.toggleDisabled(this.$findInTextButton, ["text", "code", "book"].includes(note.type)); this.toggleDisabled(this.$findInTextButton, ["text", "code", "book", "mindMap"].includes(note.type));
this.toggleDisabled(this.$showAttachmentsButton, !isInOptions); this.toggleDisabled(this.$showAttachmentsButton, !isInOptions);
this.toggleDisabled(this.$showSourceButton, ["text", "code", "relationMap", "mermaid", "canvas", "mindMap", "geoMap"].includes(note.type)); this.toggleDisabled(this.$showSourceButton, ["text", "code", "relationMap", "mermaid", "canvas", "mindMap", "geoMap"].includes(note.type));

6
apps/client/src/widgets/find.ts
Unescape Escape View File

@ -188,7 +188,7 @@ export default class FindWidget extends NoteContextAwareWidget {
return; return;
} }
if (!["text", "code", "render"].includes(this.note?.type ?? "")) { if (!["text", "code", "render", "mindMap"].includes(this.note?.type ?? "")) {
return; return;
} }
@ -250,6 +250,8 @@ export default class FindWidget extends NoteContextAwareWidget {
case "text": case "text":
const readOnly = await this.noteContext?.isReadOnly(); const readOnly = await this.noteContext?.isReadOnly();
return readOnly ? this.htmlHandler : this.textHandler; return readOnly ? this.htmlHandler : this.textHandler;
case "mindMap":
return this.htmlHandler;
default: default:
console.warn("FindWidget: Unsupported note type for find widget", this.note?.type); console.warn("FindWidget: Unsupported note type for find widget", this.note?.type);
} }
@ -352,7 +354,7 @@ export default class FindWidget extends NoteContextAwareWidget {
} }
isEnabled() { isEnabled() {
return super.isEnabled() && ["text", "code", "render"].includes(this.note?.type ?? ""); return super.isEnabled() && ["text", "code", "render", "mindMap"].includes(this.note?.type ?? "");
} }
async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {

2
apps/client/src/widgets/find_in_html.ts
Unescape Escape View File

@ -85,7 +85,7 @@ export default class FindInHtml {
if (this.$results?.length) { if (this.$results?.length) {
const $current = this.$results.eq(this.currentIndex); const $current = this.$results.eq(this.currentIndex);
this.$results.removeClass(FIND_RESULT_SELECTED_CSS_CLASSNAME); this.$results.removeClass(FIND_RESULT_SELECTED_CSS_CLASSNAME);
$current[0].scrollIntoView(); $current[0].scrollIntoView({ block: 'center', inline: 'center'});
$current.addClass(FIND_RESULT_SELECTED_CSS_CLASSNAME); $current.addClass(FIND_RESULT_SELECTED_CSS_CLASSNAME);
} }
} }

39
apps/client/src/widgets/tab_row.ts
Unescape Escape View File

@ -378,16 +378,45 @@ export default class TabRowWidget extends BasicWidget {
} }
scrollTabContainer(direction: number, behavior: ScrollBehavior = "smooth") { scrollTabContainer(direction: number, behavior: ScrollBehavior = "smooth") {
const currentScrollLeft = this.$tabScrollingContainer[0]?.scrollLeft; this.$tabScrollingContainer[0].scrollBy({
this.$tabScrollingContainer[0].scrollTo({ left: direction,
left: currentScrollLeft + direction,
behavior behavior
}); });
}; };
setupScrollEvents() { setupScrollEvents() {
this.$tabScrollingContainer[0].addEventListener('wheel', (event) => { let deltaX = 0;
this.scrollTabContainer(event.deltaY * 1.5); let isScrolling = false;
const stepScroll = () => {
if (Math.abs(deltaX) > 5) {
const step = Math.round(deltaX * 0.2);
deltaX -= step;
this.scrollTabContainer(step, "instant");
requestAnimationFrame(stepScroll);
} else {
this.scrollTabContainer(deltaX, "instant");
deltaX = 0;
isScrolling = false;
}
};
this.$tabScrollingContainer[0].addEventListener('wheel', async (event) => {
if (!event.shiftKey && event.deltaX === 0) {
event.preventDefault();
// Clamp deltaX between TAB_CONTAINER_MIN_WIDTH and TAB_CONTAINER_MIN_WIDTH * 3
deltaX += Math.sign(event.deltaY) * Math.max(Math.min(Math.abs(event.deltaY), TAB_CONTAINER_MIN_WIDTH * 3), TAB_CONTAINER_MIN_WIDTH);
if (!isScrolling) {
isScrolling = true;
stepScroll();
}
} else if (event.shiftKey) {
event.preventDefault();
if (event.deltaY > 0) {
await appContext.tabManager.activateNextTabCommand();
} else {
await appContext.tabManager.activatePreviousTabCommand();
}
this.activeTabEl.scrollIntoView();
}
}); });
this.$scrollButtonLeft[0].addEventListener('click', () => this.scrollTabContainer(-200)); this.$scrollButtonLeft[0].addEventListener('click', () => this.scrollTabContainer(-200));

9
apps/client/src/widgets/type_widgets/mind_map.ts
Unescape Escape View File

@ -286,4 +286,13 @@ export default class MindMapWidget extends TypeWidget {
utils.downloadSvgAsPng(this.note.title, svg); utils.downloadSvgAsPng(this.note.title, svg);
} }
async executeWithContentElementEvent({ resolve, ntxId }: EventData<"executeWithContentElement">) {
if (!this.isNoteContext(ntxId)) {
return;
}
await this.initialized;
resolve(this.$content.find('.main-node-container'));
}
} }

2
apps/server-e2e/src/layout/tab_bar.spec.ts
Unescape Escape View File

@ -115,7 +115,7 @@ test("Search works when dismissing a tab", async ({ page, context }) => {
await app.getTab(0).click(); await app.getTab(0).click();
await app.openAndClickNoteActionMenu("Search in note"); await app.openAndClickNoteActionMenu("Search in note");
await expect(app.findAndReplaceWidget).toBeVisible(); await expect(app.findAndReplaceWidget.first()).toBeVisible();
}); });
test("New tab displays workspaces", async ({ page, context }) => { test("New tab displays workspaces", async ({ page, context }) => {

13
apps/server/src/assets/db/migrations/0215__content_structure.sql
Unescape Escape View File

@ -1,13 +0,0 @@
CREATE TABLE IF NOT EXISTS "blobs" (
`blobId` TEXT NOT NULL,
`content` TEXT NULL DEFAULT NULL,
`dateModified` TEXT NOT NULL,
`utcDateModified` TEXT NOT NULL,
PRIMARY KEY(`blobId`)
);
ALTER TABLE notes ADD blobId TEXT DEFAULT NULL;
ALTER TABLE note_revisions ADD blobId TEXT DEFAULT NULL;
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_note_revisions_blobId on note_revisions (blobId);

4
apps/server/src/assets/db/migrations/0217__drop_content_tables.sql
Unescape Escape View File

@ -1,4 +0,0 @@
DROP TABLE note_contents;
DROP TABLE note_revision_contents;
DELETE FROM entity_changes WHERE entityName IN ('note_contents', 'note_revision_contents');

26
apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql
Unescape Escape View File

@ -1,26 +0,0 @@
CREATE TABLE IF NOT EXISTS "revisions" (`revisionId` TEXT NOT NULL PRIMARY KEY,
`noteId` TEXT NOT NULL,
type TEXT DEFAULT '' NOT NULL,
mime TEXT DEFAULT '' NOT NULL,
`title` TEXT NOT NULL,
`isProtected` INT NOT NULL DEFAULT 0,
blobId TEXT DEFAULT NULL,
`utcDateLastEdited` TEXT NOT NULL,
`utcDateCreated` TEXT NOT NULL,
`utcDateModified` TEXT NOT NULL,
`dateLastEdited` TEXT NOT NULL,
`dateCreated` TEXT NOT NULL);
INSERT INTO revisions (revisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId)
SELECT noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId FROM note_revisions;
DROP TABLE note_revisions;
CREATE INDEX `IDX_revisions_noteId` ON `revisions` (`noteId`);
CREATE INDEX `IDX_revisions_utcDateCreated` ON `revisions` (`utcDateCreated`);
CREATE INDEX `IDX_revisions_utcDateLastEdited` ON `revisions` (`utcDateLastEdited`);
CREATE INDEX `IDX_revisions_dateCreated` ON `revisions` (`dateCreated`);
CREATE INDEX `IDX_revisions_dateLastEdited` ON `revisions` (`dateLastEdited`);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
UPDATE entity_changes SET entityName = 'revisions' WHERE entityName = 'note_revisions';

23
apps/server/src/assets/db/migrations/0219__attachments.sql
Unescape Escape View File

@ -1,23 +0,0 @@
CREATE TABLE IF NOT EXISTS "attachments"
(
attachmentId TEXT not null primary key,
ownerId TEXT not null,
role TEXT not null,
mime TEXT not null,
title TEXT not null,
isProtected INT not null DEFAULT 0,
position INT default 0 not null,
blobId TEXT DEFAULT null,
dateModified TEXT NOT NULL,
utcDateModified TEXT not null,
utcDateScheduledForErasureSince TEXT DEFAULT NULL,
isDeleted INT not null,
deleteId TEXT DEFAULT NULL);
CREATE INDEX IDX_attachments_ownerId_role
on attachments (ownerId, role);
CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince
on attachments (utcDateScheduledForErasureSince);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);

2
apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql
Unescape Escape View File

@ -1,2 +0,0 @@
DELETE FROM options WHERE name = 'hideIncludedImages_main';
DELETE FROM entity_changes WHERE entityName = 'options' AND entityId = 'hideIncludedImages_main';

2
apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql
Unescape Escape View File

@ -1,2 +0,0 @@
UPDATE options SET name = 'openNoteContexts' WHERE name = 'openTabs';
UPDATE entity_changes SET entityId = 'openNoteContexts' WHERE entityName = 'options' AND entityId = 'openTabs';

1
apps/server/src/assets/db/migrations/0223__NOOP.sql
Unescape Escape View File

@ -1 +0,0 @@
SELECT 1;

14
apps/server/src/assets/db/migrations/0224__fix_blobIds.sql
Unescape Escape View File

@ -1,14 +0,0 @@
UPDATE blobs SET blobId = REPLACE(blobId, '+', 'X');
UPDATE blobs SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE notes SET blobId = REPLACE(blobId, '+', 'X');
UPDATE notes SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE attachments SET blobId = REPLACE(blobId, '+', 'X');
UPDATE attachments SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE revisions SET blobId = REPLACE(blobId, '+', 'X');
UPDATE revisions SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'X') WHERE entityName = 'blobs';
UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'Y') WHERE entityName = 'blobs';

3
apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql
Unescape Escape View File

@ -1,3 +0,0 @@
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);

1
apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql
Unescape Escape View File

@ -1 +0,0 @@
UPDATE attributes SET value = 'contentAndAttachmentsAndRevisionsSize' WHERE name = 'orderBy' AND value = 'noteSize';

2
apps/server/src/assets/db/migrations/0227__disable_image_compression.sql
Unescape Escape View File

@ -1,2 +0,0 @@
-- emergency disabling of image compression since it appears to make problems in migration to 0.61
UPDATE options SET value = 'false' WHERE name = 'compressImages';

17
apps/server/src/assets/db/migrations/0228__fix_blobIds.sql
Unescape Escape View File

@ -1,17 +0,0 @@
-- + is normally replaced by X and / by Y, but this can temporarily cause UNIQUE key exception
-- this might create blob duplicates, but cleanup will eventually take care of it
UPDATE blobs SET blobId = REPLACE(blobId, '+', 'A');
UPDATE blobs SET blobId = REPLACE(blobId, '/', 'B');
UPDATE notes SET blobId = REPLACE(blobId, '+', 'A');
UPDATE notes SET blobId = REPLACE(blobId, '/', 'B');
UPDATE attachments SET blobId = REPLACE(blobId, '+', 'A');
UPDATE attachments SET blobId = REPLACE(blobId, '/', 'B');
UPDATE revisions SET blobId = REPLACE(blobId, '+', 'A');
UPDATE revisions SET blobId = REPLACE(blobId, '/', 'B');
UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'A') WHERE entityName = 'blobs';
UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'B') WHERE entityName = 'blobs';

14
apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql
Unescape Escape View File

@ -1,14 +0,0 @@
-- Add the oauth user data table
CREATE TABLE IF NOT EXISTS "user_data"
(
tmpID INT,
username TEXT,
email TEXT,
userIDEncryptedDataKey TEXT,
userIDVerificationHash TEXT,
salt TEXT,
derivedKey TEXT,
isSetup TEXT DEFAULT "false",
UNIQUE (tmpID),
PRIMARY KEY (tmpID)
);

46
apps/server/src/assets/db/migrations/0230__vector_embeddings.sql
Unescape Escape View File

@ -1,46 +0,0 @@
-- Add tables for vector embeddings storage and management
-- This migration adds embedding support to the main document.db database
-- Store embeddings for notes
CREATE TABLE IF NOT EXISTS "note_embeddings" (
"embedId" TEXT NOT NULL PRIMARY KEY,
"noteId" TEXT NOT NULL,
"providerId" TEXT NOT NULL,
"modelId" TEXT NOT NULL,
"dimension" INTEGER NOT NULL,
"embedding" BLOB NOT NULL,
"version" INTEGER NOT NULL DEFAULT 1,
"dateCreated" TEXT NOT NULL,
"utcDateCreated" TEXT NOT NULL,
"dateModified" TEXT NOT NULL,
"utcDateModified" TEXT NOT NULL
);
CREATE INDEX "IDX_note_embeddings_noteId" ON "note_embeddings" ("noteId");
CREATE INDEX "IDX_note_embeddings_providerId_modelId" ON "note_embeddings" ("providerId", "modelId");
-- Table to track which notes need embedding updates
CREATE TABLE IF NOT EXISTS "embedding_queue" (
"noteId" TEXT NOT NULL PRIMARY KEY,
"operation" TEXT NOT NULL, -- CREATE, UPDATE, DELETE
"dateQueued" TEXT NOT NULL,
"utcDateQueued" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"attempts" INTEGER NOT NULL DEFAULT 0,
"lastAttempt" TEXT NULL,
"error" TEXT NULL,
"failed" INTEGER NOT NULL DEFAULT 0,
"isProcessing" INTEGER NOT NULL DEFAULT 0
);
-- Table to store embedding provider configurations
CREATE TABLE IF NOT EXISTS "embedding_providers" (
"providerId" TEXT NOT NULL PRIMARY KEY,
"name" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"config" TEXT NOT NULL, -- JSON config object
"dateCreated" TEXT NOT NULL,
"utcDateCreated" TEXT NOT NULL,
"dateModified" TEXT NOT NULL,
"utcDateModified" TEXT NOT NULL
);

5
apps/server/src/assets/db/migrations/0231__session_store.sql
Unescape Escape View File

@ -1,5 +0,0 @@
CREATE TABLE IF NOT EXISTS sessions (
id TEXT PRIMARY KEY,
data TEXT,
expires INTEGER
);

4
apps/server/src/assets/db/migrations/0216__move_content_into_blobs.ts → apps/server/src/migrations/0216__move_content_into_blobs.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import sql from "../../../services/sql.js"; import sql from "../services/sql.js";
import utils from "../../../services/utils.js"; import utils from "../services/utils.js";
interface NoteContentsRow { interface NoteContentsRow {
noteId: string; noteId: string;

10
apps/server/src/assets/db/migrations/0220__migrate_images_to_attachments.ts → apps/server/src/migrations/0220__migrate_images_to_attachments.ts
Unescape Escape View File

@ -1,8 +1,8 @@
import becca from "../../../becca/becca.js"; import becca from "../becca/becca.js";
import becca_loader from "../../../becca/becca_loader.js"; import becca_loader from "../becca/becca_loader.js";
import cls from "../../../services/cls.js"; import cls from "../services/cls.js";
import log from "../../../services/log.js"; import log from "../services/log.js";
import sql from "../../../services/sql.js"; import sql from "../services/sql.js";
export default () => { export default () => {
cls.init(() => { cls.init(() => {

295
apps/server/src/migrations/migrations.ts
Unescape Escape View File

@ -0,0 +1,295 @@
/**
* @module
*
* Contains all the migrations that are run on the database.
*/
// Migrations should be kept in descending order, so the latest migration is first.
const MIGRATIONS: (SqlMigration | JsMigration)[] = [
// Session store
{
version: 231,
sql: /*sql*/`\
CREATE TABLE IF NOT EXISTS sessions (
id TEXT PRIMARY KEY,
data TEXT,
expires INTEGER
);
`
},
// Add tables for vector embeddings storage and management
// This migration adds embedding support to the main document.db database
{
version: 230,
sql: /*sql*/`\
-- Store embeddings for notes
CREATE TABLE IF NOT EXISTS "note_embeddings" (
"embedId" TEXT NOT NULL PRIMARY KEY,
"noteId" TEXT NOT NULL,
"providerId" TEXT NOT NULL,
"modelId" TEXT NOT NULL,
"dimension" INTEGER NOT NULL,
"embedding" BLOB NOT NULL,
"version" INTEGER NOT NULL DEFAULT 1,
"dateCreated" TEXT NOT NULL,
"utcDateCreated" TEXT NOT NULL,
"dateModified" TEXT NOT NULL,
"utcDateModified" TEXT NOT NULL
);
CREATE INDEX "IDX_note_embeddings_noteId" ON "note_embeddings" ("noteId");
CREATE INDEX "IDX_note_embeddings_providerId_modelId" ON "note_embeddings" ("providerId", "modelId");
-- Table to track which notes need embedding updates
CREATE TABLE IF NOT EXISTS "embedding_queue" (
"noteId" TEXT NOT NULL PRIMARY KEY,
"operation" TEXT NOT NULL, -- CREATE, UPDATE, DELETE
"dateQueued" TEXT NOT NULL,
"utcDateQueued" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"attempts" INTEGER NOT NULL DEFAULT 0,
"lastAttempt" TEXT NULL,
"error" TEXT NULL,
"failed" INTEGER NOT NULL DEFAULT 0,
"isProcessing" INTEGER NOT NULL DEFAULT 0
);
-- Table to store embedding provider configurations
CREATE TABLE IF NOT EXISTS "embedding_providers" (
"providerId" TEXT NOT NULL PRIMARY KEY,
"name" TEXT NOT NULL,
"priority" INTEGER NOT NULL DEFAULT 0,
"config" TEXT NOT NULL, -- JSON config object
"dateCreated" TEXT NOT NULL,
"utcDateCreated" TEXT NOT NULL,
"dateModified" TEXT NOT NULL,
"utcDateModified" TEXT NOT NULL
);
`
},
// add the oauth user data table
{
version: 229,
sql: /*sql*/`\
CREATE TABLE IF NOT EXISTS "user_data"
(
tmpID INT,
username TEXT,
email TEXT,
userIDEncryptedDataKey TEXT,
userIDVerificationHash TEXT,
salt TEXT,
derivedKey TEXT,
isSetup TEXT DEFAULT "false",
UNIQUE (tmpID),
PRIMARY KEY (tmpID)
);
`
},
// fix blob IDs
{
version: 228,
sql: /*sql*/`\
-- + is normally replaced by X and / by Y, but this can temporarily cause UNIQUE key exception
-- this might create blob duplicates, but cleanup will eventually take care of it
UPDATE blobs SET blobId = REPLACE(blobId, '+', 'A');
UPDATE blobs SET blobId = REPLACE(blobId, '/', 'B');
UPDATE notes SET blobId = REPLACE(blobId, '+', 'A');
UPDATE notes SET blobId = REPLACE(blobId, '/', 'B');
UPDATE attachments SET blobId = REPLACE(blobId, '+', 'A');
UPDATE attachments SET blobId = REPLACE(blobId, '/', 'B');
UPDATE revisions SET blobId = REPLACE(blobId, '+', 'A');
UPDATE revisions SET blobId = REPLACE(blobId, '/', 'B');
UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'A') WHERE entityName = 'blobs';
UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'B') WHERE entityName = 'blobs';
`
},
// disable image compression
{
version: 227,
sql: /*sql*/`\
-- emergency disabling of image compression since it appears to make problems in migration to 0.61
UPDATE options SET value = 'false' WHERE name = 'compressImages';
`
},
// rename note size label
{
version: 226,
sql: /*sql*/`\
UPDATE attributes SET value = 'contentAndAttachmentsAndRevisionsSize' WHERE name = 'orderBy' AND value = 'noteSize';
`
},
// create blob ID indices
{
version: 225,
sql: /*sql*/`\
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);
`
},
// fix blob IDs
{
version: 224,
sql: /*sql*/`\
UPDATE blobs SET blobId = REPLACE(blobId, '+', 'X');
UPDATE blobs SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE notes SET blobId = REPLACE(blobId, '+', 'X');
UPDATE notes SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE attachments SET blobId = REPLACE(blobId, '+', 'X');
UPDATE attachments SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE revisions SET blobId = REPLACE(blobId, '+', 'X');
UPDATE revisions SET blobId = REPLACE(blobId, '/', 'Y');
UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'X') WHERE entityName = 'blobs';
UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'Y') WHERE entityName = 'blobs';
`
},
// no operation
{
version: 223,
sql: /*sql*/`\
SELECT 1;
`
},
// rename open tabs to open note contexts
{
version: 222,
sql: /*sql*/`\
UPDATE options SET name = 'openNoteContexts' WHERE name = 'openTabs';
UPDATE entity_changes SET entityId = 'openNoteContexts' WHERE entityName = 'options' AND entityId = 'openTabs';
`
},
// remove hide included images option
{
version: 221,
sql: /*sql*/`\
DELETE FROM options WHERE name = 'hideIncludedImages_main';
DELETE FROM entity_changes WHERE entityName = 'options' AND entityId = 'hideIncludedImages_main';
`
},
// migrate images to attachments
{
version: 220,
module: () => import("./0220__migrate_images_to_attachments.js")
},
// attachments
{
version: 219,
sql: /*sql*/`\
CREATE TABLE IF NOT EXISTS "attachments"
(
attachmentId TEXT not null primary key,
ownerId TEXT not null,
role TEXT not null,
mime TEXT not null,
title TEXT not null,
isProtected INT not null DEFAULT 0,
position INT default 0 not null,
blobId TEXT DEFAULT null,
dateModified TEXT NOT NULL,
utcDateModified TEXT not null,
utcDateScheduledForErasureSince TEXT DEFAULT NULL,
isDeleted INT not null,
deleteId TEXT DEFAULT NULL);
CREATE INDEX IDX_attachments_ownerId_role
on attachments (ownerId, role);
CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince
on attachments (utcDateScheduledForErasureSince);
CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);
`
},
// rename note revision to revision
{
version: 218,
sql: /*sql*/`\
CREATE TABLE IF NOT EXISTS "revisions" (
revisionId TEXT NOT NULL PRIMARY KEY,
noteId TEXT NOT NULL,
type TEXT DEFAULT '' NOT NULL,
mime TEXT DEFAULT '' NOT NULL,
title TEXT NOT NULL,
isProtected INT NOT NULL DEFAULT 0,
blobId TEXT DEFAULT NULL,
utcDateLastEdited TEXT NOT NULL,
utcDateCreated TEXT NOT NULL,
utcDateModified TEXT NOT NULL,
dateLastEdited TEXT NOT NULL,
dateCreated TEXT NOT NULL
);
INSERT INTO revisions (revisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId)
SELECT noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId FROM note_revisions;
DROP TABLE note_revisions;
CREATE INDEX IDX_revisions_noteId ON revisions (noteId);
CREATE INDEX IDX_revisions_utcDateCreated ON revisions (utcDateCreated);
CREATE INDEX IDX_revisions_utcDateLastEdited ON revisions (utcDateLastEdited);
CREATE INDEX IDX_revisions_dateCreated ON revisions (dateCreated);
CREATE INDEX IDX_revisions_dateLastEdited ON revisions (dateLastEdited);
CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId);
UPDATE entity_changes SET entityName = 'revisions' WHERE entityName = 'note_revisions';
`
},
// drop content tables
{
version: 217,
sql: /*sql*/`\
DROP TABLE note_contents;
DROP TABLE note_revision_contents;
DELETE FROM entity_changes WHERE entityName IN ('note_contents', 'note_revision_contents');
`
},
{
version: 216,
module: async () => import("./0216__move_content_into_blobs.js")
},
// content structure
{
version: 215,
sql: /*sql*/`\
CREATE TABLE IF NOT EXISTS "blobs" (
blobId TEXT NOT NULL,
content TEXT NULL DEFAULT NULL,
dateModified TEXT NOT NULL,
utcDateModified TEXT NOT NULL,
PRIMARY KEY (blobId)
);
ALTER TABLE notes ADD blobId TEXT DEFAULT NULL;
ALTER TABLE note_revisions ADD blobId TEXT DEFAULT NULL;
CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId);
CREATE INDEX IF NOT EXISTS IDX_note_revisions_blobId on note_revisions (blobId);
`
}
];
export default MIGRATIONS;
interface Migration {
version: number;
}
interface SqlMigration extends Migration {
sql: string;
}
interface JsMigration extends Migration {
module: () => Promise<{ default: () => void }>;
}

2
apps/server/src/services/hidden_subtree_launcherbar.ts
Unescape Escape View File

@ -72,7 +72,7 @@ export default function buildLaunchBarConfig() {
id: "_lbLlmChat", id: "_lbLlmChat",
title: t("hidden-subtree.llm-chat-title"), title: t("hidden-subtree.llm-chat-title"),
type: "launcher", type: "launcher",
command: "createAiChat", builtinWidget: "aiChatLauncher",
icon: "bx bx-bot", icon: "bx bx-bot",
attributes: [ attributes: [
{ type: "label", name: "desktopOnly" } { type: "label", name: "desktopOnly" }

71
apps/server/src/services/migration.ts
Unescape Escape View File

@ -1,25 +1,19 @@
import backupService from "./backup.js"; import backupService from "./backup.js";
import sql from "./sql.js"; import sql from "./sql.js";
import fs from "fs";
import log from "./log.js"; import log from "./log.js";
import { crash } from "./utils.js"; import { crash } from "./utils.js";
import resourceDir from "./resource_dir.js";
import appInfo from "./app_info.js"; import appInfo from "./app_info.js";
import cls from "./cls.js"; import cls from "./cls.js";
import { t } from "i18next"; import { t } from "i18next";
import { join } from "path"; import MIGRATIONS from "../migrations/migrations.js";
interface MigrationInfo { interface MigrationInfo {
dbVersion: number; dbVersion: number;
name: string;
file: string;
type: "sql" | "js" | "ts" | string;
/** /**
* Contains the JavaScript/TypeScript migration as a callback method that must be called to trigger the migration. * If string, then the migration is an SQL script that will be executed.
* The method cannot be async since it runs in an SQL transaction. * If a function, then the migration is a JavaScript/TypeScript module that will be executed.
* For SQL migrations, this value is falsy.
*/ */
module?: () => void; migration: string | (() => void);
} }
async function migrate() { async function migrate() {
@ -37,7 +31,6 @@ async function migrate() {
); );
const migrations = await prepareMigrations(currentDbVersion); const migrations = await prepareMigrations(currentDbVersion);
migrations.sort((a, b) => a.dbVersion - b.dbVersion);
// all migrations are executed in one transaction - upgrade either succeeds, or the user can stay at the old version // all migrations are executed in one transaction - upgrade either succeeds, or the user can stay at the old version
// otherwise if half of the migrations succeed, user can't use any version - DB is too "new" for the old app, // otherwise if half of the migrations succeed, user can't use any version - DB is too "new" for the old app,
@ -76,53 +69,37 @@ async function migrate() {
} }
async function prepareMigrations(currentDbVersion: number): Promise<MigrationInfo[]> { async function prepareMigrations(currentDbVersion: number): Promise<MigrationInfo[]> {
const migrationFiles = fs.readdirSync(resourceDir.MIGRATIONS_DIR) ?? []; MIGRATIONS.sort((a, b) => a.version - b.version);
const migrations: MigrationInfo[] = []; const migrations: MigrationInfo[] = [];
for (const file of migrationFiles) { for (const migration of MIGRATIONS) {
const match = file.match(/^([0-9]{4})__([a-zA-Z0-9_ ]+)\.(sql|js|ts)$/); const dbVersion = migration.version;
if (!match) {
continue;
}
const dbVersion = parseInt(match[1]);
if (dbVersion > currentDbVersion) { if (dbVersion > currentDbVersion) {
const name = match[2]; if ("sql" in migration) {
const type = match[3]; migrations.push({
dbVersion,
const migration: MigrationInfo = { migration: migration.sql
dbVersion: dbVersion, });
name: name, } else {
file: file,
type: type
};
if (type === "js" || type === "ts") {
// Due to ESM imports, the migration file needs to be imported asynchronously and thus cannot be loaded at migration time (since migration is not asynchronous). // Due to ESM imports, the migration file needs to be imported asynchronously and thus cannot be loaded at migration time (since migration is not asynchronous).
// As such we have to preload the ESM. // As such we have to preload the ESM.
// Going back to the original approach but making it webpack-compatible migrations.push({
const importPath = join(resourceDir.MIGRATIONS_DIR, file); dbVersion,
migration.module = (await import(importPath)).default; migration: (await migration.module()).default
});
} }
migrations.push(migration);
} }
} }
return migrations; return migrations;
} }
function executeMigration(mig: MigrationInfo) { function executeMigration({ migration }: MigrationInfo) {
if (mig.module) { if (typeof migration === "string") {
console.log("Migration with JS module"); console.log(`Migration with SQL script: ${migration}`);
mig.module(); sql.executeScript(migration);
} else if (mig.type === "sql") {
const migrationSql = fs.readFileSync(`${resourceDir.MIGRATIONS_DIR}/${mig.file}`).toString("utf8");
console.log(`Migration with SQL script: ${migrationSql}`);
sql.executeScript(migrationSql);
} else { } else {
throw new Error(`Unknown migration type '${mig.type}'`); console.log("Migration with JS module");
} migration();
};
} }
function getDbVersion() { function getDbVersion() {

8
apps/server/src/services/resource_dir.ts
Unescape Escape View File

@ -14,16 +14,8 @@ if (!fs.existsSync(DB_INIT_DIR)) {
process.exit(1); process.exit(1);
} }
const MIGRATIONS_DIR = path.resolve(DB_INIT_DIR, "migrations");
if (!fs.existsSync(MIGRATIONS_DIR)) {
log.error(`Could not find migration directory: ${MIGRATIONS_DIR}`);
process.exit(1);
}
export default { export default {
RESOURCE_DIR, RESOURCE_DIR,
MIGRATIONS_DIR,
DB_INIT_DIR, DB_INIT_DIR,
ELECTRON_APP_ROOT_DIR ELECTRON_APP_ROOT_DIR
}; };

1
docs/Release Notes/Release Notes/v0.94.0.md
Unescape Escape View File

@ -59,6 +59,7 @@
* [Text notes: add a way to move up and down text lines via a keyboard shortcut](https://github.com/TriliumNext/Notes/issues/1002) by @dogfuntom * [Text notes: add a way to move up and down text lines via a keyboard shortcut](https://github.com/TriliumNext/Notes/issues/1002) by @dogfuntom
* [improve tab scroll UX by switching from instant to smooth behavior](https://github.com/TriliumNext/Notes/pull/2030) by @SiriusXT * [improve tab scroll UX by switching from instant to smooth behavior](https://github.com/TriliumNext/Notes/pull/2030) by @SiriusXT
* Calendar view: display calendar view if `#viewType=calendar` is set. * Calendar view: display calendar view if `#viewType=calendar` is set.
* [Mind map: add search support](https://github.com/TriliumNext/Notes/pull/2055) by @SiriusXT
## 📖 Documentation ## 📖 Documentation