Merge branch 'zadam:master' into master

LICENSE

@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.js.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.js.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

README.md

@@ -1,8 +1,12 @@
 # Trilium Notes
 
+## Trilium is in maintenance mode - see details in https://github.com/zadam/trilium/issues/4620
+
 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md)
 
-Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
+Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. 
+
+See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
 
 <a href="https://github.com/zadam/trilium/wiki/Screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
 

db/migrations/0215__content_structure.sql

@@ -8,3 +8,6 @@ CREATE TABLE IF NOT EXISTS "blobs" (
 
 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);

db/migrations/0218__rename_note_revision_to_revision.sql

@@ -21,5 +21,6 @@ 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';

db/migrations/0219__attachments.sql

@@ -19,3 +19,5 @@ CREATE INDEX IDX_attachments_ownerId_role
 
 CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince
     on attachments (utcDateScheduledForErasureSince);
+
+CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId);

libraries/ckeditor/ckeditor-content.css

@@ -5,8 +5,8 @@
 }
 
 /*
- * CKEditor 5 (v40.1.0) content styles.
+ * CKEditor 5 (v41.0.0) content styles.
- * Generated on Mon, 20 Nov 2023 08:41:49 GMT.
+ * Generated on Fri, 26 Jan 2024 10:23:49 GMT.
  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/installation/advanced/content-styles.html
  */
 
@@ -42,18 +42,6 @@
     overflow-wrap: break-word;
     position: relative;
 }
-/* @ckeditor/ckeditor5-table/theme/tablecaption.css */
-.ck-content .table > figcaption {
-    display: table-caption;
-    caption-side: top;
-    word-break: break-word;
-    text-align: center;
-    color: var(--ck-color-selector-caption-text);
-    background-color: var(--ck-color-selector-caption-background);
-    padding: .6em;
-    font-size: .75em;
-    outline-offset: -1px;
-}
 /* @ckeditor/ckeditor5-table/theme/table.css */
 .ck-content .table {
     margin: 0.9em auto;
@@ -87,12 +75,17 @@
 .ck-content[dir="ltr"] .table th {
     text-align: left;
 }
-/* @ckeditor/ckeditor5-media-embed/theme/mediaembed.css */
+/* @ckeditor/ckeditor5-table/theme/tablecaption.css */
-.ck-content .media {
+.ck-content .table > figcaption {
-    clear: both;
+    display: table-caption;
-    margin: 0.9em 0;
+    caption-side: top;
-    display: block;
+    word-break: break-word;
-    min-width: 15em;
+    text-align: center;
+    color: var(--ck-color-selector-caption-text);
+    background-color: var(--ck-color-selector-caption-background);
+    padding: .6em;
+    font-size: .75em;
+    outline-offset: -1px;
 }
 /* @ckeditor/ckeditor5-page-break/theme/pagebreak.css */
 .ck-content .page-break {
@@ -130,6 +123,13 @@
     -ms-user-select: none;
     user-select: none;
 }
+/* @ckeditor/ckeditor5-media-embed/theme/mediaembed.css */
+.ck-content .media {
+    clear: both;
+    margin: 0.9em 0;
+    display: block;
+    min-width: 15em;
+}
 /* @ckeditor/ckeditor5-list/theme/todolist.css */
 .ck-content .todo-list {
     list-style: none;
@@ -280,6 +280,42 @@
 .ck-editor__editable.ck-content .todo-list .todo-list__label.todo-list__label_without-description input[type=checkbox] {
     position: absolute;
 }
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol {
+    list-style-type: decimal;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol {
+    list-style-type: lower-latin;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol {
+    list-style-type: lower-roman;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol ol {
+    list-style-type: upper-latin;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ol ol ol ol ol {
+    list-style-type: upper-roman;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul {
+    list-style-type: disc;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul {
+    list-style-type: circle;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul ul {
+    list-style-type: square;
+}
+/* @ckeditor/ckeditor5-list/theme/list.css */
+.ck-content ul ul ul ul {
+    list-style-type: square;
+}
 /* @ckeditor/ckeditor5-image/theme/image.css */
 .ck-content .image {
     display: table;
@@ -318,17 +354,6 @@
     flex-shrink: 1;
     max-width: 100%;
 }
-/* @ckeditor/ckeditor5-image/theme/imagecaption.css */
-.ck-content .image > figcaption {
-    display: table-caption;
-    caption-side: bottom;
-    word-break: break-word;
-    color: var(--ck-color-image-caption-text);
-    background-color: var(--ck-color-image-caption-background);
-    padding: .6em;
-    font-size: .75em;
-    outline-offset: -1px;
-}
 /* @ckeditor/ckeditor5-image/theme/imageresize.css */
 .ck-content img.image_resized {
     height: auto;
@@ -347,67 +372,16 @@
 .ck-content .image.image_resized > figcaption {
     display: block;
 }
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+/* @ckeditor/ckeditor5-image/theme/imagecaption.css */
-.ck-content .marker-yellow {
+.ck-content .image > figcaption {
-    background-color: var(--ck-highlight-marker-yellow);
+    display: table-caption;
-}
+    caption-side: bottom;
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+    word-break: break-word;
-.ck-content .marker-green {
+    color: var(--ck-color-image-caption-text);
-    background-color: var(--ck-highlight-marker-green);
+    background-color: var(--ck-color-image-caption-background);
-}
+    padding: .6em;
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+    font-size: .75em;
-.ck-content .marker-pink {
+    outline-offset: -1px;
-    background-color: var(--ck-highlight-marker-pink);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-blue {
-    background-color: var(--ck-highlight-marker-blue);
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-red {
-    color: var(--ck-highlight-pen-red);
-    background-color: transparent;
-}
-/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-green {
-    color: var(--ck-highlight-pen-green);
-    background-color: transparent;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol {
-    list-style-type: decimal;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol {
-    list-style-type: lower-latin;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol {
-    list-style-type: lower-roman;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol ol {
-    list-style-type: upper-latin;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ol ol ol ol ol {
-    list-style-type: upper-roman;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul {
-    list-style-type: disc;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul {
-    list-style-type: circle;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul ul {
-    list-style-type: square;
-}
-/* @ckeditor/ckeditor5-list/theme/list.css */
-.ck-content ul ul ul ul {
-    list-style-type: square;
 }
 /* @ckeditor/ckeditor5-image/theme/imagestyle.css */
 .ck-content .image-style-block-align-left,
@@ -470,6 +444,32 @@
 .ck-content .image-inline.image-style-align-right {
     margin-left: var(--ck-inline-image-style-spacing);
 }
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-yellow {
+    background-color: var(--ck-highlight-marker-yellow);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-green {
+    background-color: var(--ck-highlight-marker-green);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-pink {
+    background-color: var(--ck-highlight-marker-pink);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-blue {
+    background-color: var(--ck-highlight-marker-blue);
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-red {
+    color: var(--ck-highlight-pen-red);
+    background-color: transparent;
+}
+/* @ckeditor/ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-green {
+    color: var(--ck-highlight-pen-green);
+    background-color: transparent;
+}
 /* @ckeditor/ckeditor5-block-quote/theme/blockquote.css */
 .ck-content blockquote {
     overflow: hidden;

src/public/app/services/branches.js

@@ -107,6 +107,13 @@ async function deleteNotes(branchIdsToDelete, forceDeleteAllClones = false) {
         return false;
     }
 
+    try {
+        await activateParentNotePath();
+    }
+    catch (e) {
+        console.error(e);
+    }
+
     const taskId = utils.randomString(10);
 
     let counter = 0;
@@ -134,6 +141,16 @@ async function deleteNotes(branchIdsToDelete, forceDeleteAllClones = false) {
     return true;
 }
 
+async function activateParentNotePath() {
+    // this is not perfect, maybe we should find the next/previous sibling, but that's more complex
+    const activeContext = appContext.tabManager.getActiveContext();
+    const parentNotePathArr = activeContext.notePathArray.slice(0, -1);
+
+    if (parentNotePathArr.length > 0) {
+        activeContext.setNote(parentNotePathArr.join("/"));
+    }
+}
+
 async function moveNodeUpInHierarchy(node) {
     if (hoistedNoteService.isHoistedNode(node)
         || hoistedNoteService.isTopLevelNode(node)

src/public/app/widgets/containers/right_pane_container.js

@@ -8,10 +8,13 @@ export default class RightPaneContainer extends FlexContainer {
         this.id('right-pane');
         this.css('height', '100%');
         this.collapsible();
+
+        this.rightPaneHidden = false;
     }
 
     isEnabled() {
         return super.isEnabled()
+            && !this.rightPaneHidden
             && this.children.length > 0
             && !!this.children.find(ch => ch.isEnabled() && ch.canBeShown());
     }
@@ -44,4 +47,10 @@ export default class RightPaneContainer extends FlexContainer {
             splitService.setupRightPaneResizer();
         }
     }
+
+    toggleRightPaneEvent() {
+        this.rightPaneHidden = !this.rightPaneHidden;
+
+        this.reEvaluateRightPaneVisibilityCommand();
+    }
 }

src/public/app/widgets/note_tree.js

@@ -1091,7 +1091,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
             return;
         }
 
-        const nodeCtx = this.#getActiveNodeCtx();
+        const activeNode = this.getActiveNode();
+        const activeNodeFocused = activeNode?.hasFocus();
+        const activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
 
         const refreshCtx = {
             noteIdsToUpdate: new Set(),
@@ -1108,7 +1110,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
 
         await this.#executeTreeUpdates(refreshCtx, loadResults);
 
-        await this.#setActiveNode(nodeCtx, movedActiveNode, parentsOfAddedNodes);
+        await this.#setActiveNode(activeNotePath, activeNodeFocused, movedActiveNode, parentsOfAddedNodes);
 
         if (refreshCtx.noteIdsToReload.size > 0 || refreshCtx.noteIdsToUpdate.size > 0) {
             // workaround for https://github.com/mar10/fancytree/issues/1054
@@ -1257,73 +1259,42 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         }
     }
 
-    #getActiveNodeCtx() {
+    async #setActiveNode(activeNotePath, activeNodeFocused, movedActiveNode, parentsOfAddedNodes) {
-        const nodeCtx = {
-            activeNotePath: null,
-            activeNodeFocused: null,
-            nextNotePath: null
-        };
-
-        const activeNode = this.getActiveNode();
-        nodeCtx.activeNodeFocused = activeNode?.hasFocus();
-        nodeCtx.activeNotePath = activeNode ? treeService.getNotePath(activeNode) : null;
-        const nextNode = activeNode ? (activeNode.getNextSibling() || activeNode.getPrevSibling() || activeNode.getParent()) : null;
-        nodeCtx.nextNotePath = nextNode ? treeService.getNotePath(nextNode) : null;
-        return nodeCtx;
-    }
-
-    async #setActiveNode(nodeCtx, movedActiveNode, parentsOfAddedNodes) {
         if (movedActiveNode) {
             for (const parentNode of parentsOfAddedNodes) {
                 const foundNode = (parentNode.getChildren() || []).find(child => child.data.noteId === movedActiveNode.data.noteId);
                 if (foundNode) {
-                    nodeCtx.activeNotePath = treeService.getNotePath(foundNode);
+                    activeNotePath = treeService.getNotePath(foundNode);
                     break;
                 }
             }
         }
 
-        if (!nodeCtx.activeNotePath) {
+        if (!activeNotePath) {
             return;
         }
 
-        let node = await this.expandToNote(nodeCtx.activeNotePath, false);
+        let node = await this.expandToNote(activeNotePath, false);
-        if (node && node.data.noteId !== treeService.getNoteIdFromUrl(nodeCtx.activeNotePath)) {
+
+        if (node && node.data.noteId !== treeService.getNoteIdFromUrl(activeNotePath)) {
             // if the active note has been moved elsewhere then it won't be found by the path,
             // so we switch to the alternative of trying to find it by noteId
-            const notesById = this.getNodesByNoteId(treeService.getNoteIdFromUrl(nodeCtx.activeNotePath));
+            const notesById = this.getNodesByNoteId(treeService.getNoteIdFromUrl(activeNotePath));
 
             // if there are multiple clones, then we'd rather not activate anyone
             node = notesById.length === 1 ? notesById[0] : null;
         }
 
-        if (node) {
+        if (!node) {
-            if (nodeCtx.activeNodeFocused) {
+            return;
+        }
+
+        if (activeNodeFocused) {
             // needed by Firefox: https://github.com/zadam/trilium/issues/1865
             this.tree.$container.focus();
         }
 
-            await node.setActive(true, {noEvents: true, noFocus: !nodeCtx.activeNodeFocused});
+        await node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
-        } else {
-            // this is used when the original note has been deleted, and we want to move the focus to the note above/below
-            node = await this.expandToNote(nodeCtx.nextNotePath, false);
-
-            if (node) {
-                // FIXME: this is conceptually wrong
-                //        here note tree is responsible for updating global state of the application
-                //        this should be done by NoteContext / TabManager and note tree should only listen to
-                //        changes in active note and just set the "active" state
-                // We don't await since that can bring up infinite cycles when e.g. custom widget does some backend requests which wait for max sync ID processed
-                appContext.tabManager.getActiveContext().setNote(nodeCtx.nextNotePath).then(() => {
-                    const newActiveNode = this.getActiveNode();
-
-                    // return focus if the previously active node was also focused
-                    if (newActiveNode && nodeCtx.activeNodeFocused) {
-                        newActiveNode.setFocus(true);
-                    }
-                });
-            }
-        }
     }
 
     sortChildren(node) {

src/public/app/widgets/title_bar_buttons.js

@@ -30,9 +30,14 @@ const TPL = `
         height: 40px;
         width: 40px;
     }
+    
     .title-bar-buttons .top-btn.active{
         background-color:var(--accented-background-color);
     }
+
+    .title-bar-buttons .btn.focus, .title-bar-buttons .btn:focus {
+        box-shadow: none;
+    }
     </style>
 
     <!-- divs act as a hitbox for the buttons, making them clickable on corners -->

src/public/app/widgets/type_widgets/options/text_notes/highlights_list.js

@@ -18,6 +18,8 @@ const TPL = `
     <h5>Highlights List visibility</h5>
 
     <p>You can hide the highlights widget per-note by adding a <code>#hideHighlightWidget</code> label.</p>
+    
+    <p>You can configure a keyboard shortcut for quickly toggling the right pane (including Highlights) in the Options -> Shortcuts (name "toggleRightPane").</p>
 </div>`;
 
 export default class HighlightsListOptions extends OptionsWidget {

src/public/app/widgets/type_widgets/options/text_notes/table_of_contents.js

@@ -11,6 +11,8 @@ const TPL = `
     </div>
     
     <p>You can also use this option to effectively disable TOC by setting a very high number.</p>
+    
+    <p>You can configure a keyboard shortcut for quickly toggling the right pane (including TOC) in the Options -> Shortcuts (name "toggleRightPane").</p>
 </div>`;
 
 export default class TableOfContentsOptions extends OptionsWidget {

src/public/stylesheets/ckeditor-theme.css

@@ -3,6 +3,7 @@ body {
 
     --ck-color-base-text: var(--main-text-color);
     --ck-color-base-foreground: var(--accented-background-color);
+    --ck-color-base-background: var(--main-background-color);
     --ck-color-focus-border: var(--main-border-color);
     --ck-color-text: var(--main-text-color);
     --ck-color-shadow-drop: var(--main-background-color);

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2024-01-12T00:02:50+01:00", buildRevision: "17e063f01d3b6c7a601630feaa96191d26095650" };
+module.exports = { buildDate:"2024-01-21T23:49:23+01:00", buildRevision: "4f8073daa7cff1b8b6737ae45792b2e87c2adf33" };

src/services/cls.js

@@ -48,6 +48,14 @@ function isEntityEventsDisabled() {
     return !!namespace.get('disableEntityEvents');
 }
 
+function setMigrationRunning(running) {
+    namespace.set('migrationRunning', !!running);
+}
+
+function isMigrationRunning() {
+    return !!namespace.get('migrationRunning');
+}
+
 function disableSlowQueryLogging(disable) {
     namespace.set('disableSlowQueryLogging', disable);
 }
@@ -102,5 +110,7 @@ module.exports = {
     putEntityChange,
     ignoreEntityChangeIds,
     disableSlowQueryLogging,
-    isSlowQueryLoggingDisabled
+    isSlowQueryLoggingDisabled,
+    setMigrationRunning,
+    isMigrationRunning
 };

src/services/keyboard_actions.js

@@ -494,9 +494,16 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         separator: "Other"
     },
 
+    {
+        actionName: "toggleRightPane",
+        defaultShortcuts: [],
+        description: "Toggle the display of the right pane, which includes Table of Contents and Highlights",
+        scope: "window"
+    },
     {
         actionName: "printActiveNote",
         defaultShortcuts: [],
+        description: "Print active note",
         scope: "window"
     },
     {

src/services/migration.js

@@ -5,12 +5,13 @@ const log = require('./log.js');
 const utils = require('./utils.js');
 const resourceDir = require('./resource_dir.js');
 const appInfo = require('./app_info.js');
+const cls = require('./cls.js');
 
 async function migrate() {
     const currentDbVersion = getDbVersion();
 
     if (currentDbVersion < 214) {
-        log.error("Direct migration from your current version is not supported. Please upgrade to the latest v0.60.X first and only then to this version.");
+        log.error("Direct migration from your current version is not supported. Please upgrade to the latest v0.60.4 first and only then to this version.");
 
         utils.crash();
         return;
@@ -18,7 +19,7 @@ async function migrate() {
 
     // backup before attempting migration
     await backupService.backupNow(
-        // creating a special backup for versions 0.60.X, the changes in 0.61 are major.
+        // creating a special backup for version 0.60.4, the changes in 0.61 are major.
         currentDbVersion === 214
             ? `before-migration-v060`
             : 'before-migration'
@@ -51,6 +52,9 @@ async function migrate() {
     // 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,
     // and too old for the new app version.
+
+    cls.setMigrationRunning(true);
+
     sql.transactional(() => {
         for (const mig of migrations) {
             try {

src/services/notes.js

@@ -895,6 +895,11 @@ function scanForLinks(note, content) {
  * Things which have to be executed after updating content, but asynchronously (separate transaction)
  */
 async function asyncPostProcessContent(note, content) {
+    if (cls.isMigrationRunning()) {
+        // this is rarely needed for migrations, but can cause trouble by e.g. triggering downloads
+        return;
+    }
+
     if (note.hasStringContent() && !utils.isString(content)) {
         content = content.toString();
     }