Merge remote-tracking branch 'origin/main' into feature/table_view

; Conflicts: ; pnpm-lock.yaml
2025-11-04 20:36:13 +01:00 · 2025-07-04 21:47:26 +03:00
parent 1ebb70c4d2 300e5a5528
commit 4b86fedce1
17 changed files with 1300 additions and 1717 deletions
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -10,7 +10,7 @@
    "url": "https://github.com/TriliumNext/Notes"
  },
  "dependencies": {
-    "@eslint/js": "9.30.0",
+    "@eslint/js": "9.30.1",
    "@excalidraw/excalidraw": "0.18.0",
    "@fullcalendar/core": "6.1.18",
    "@fullcalendar/daygrid": "6.1.18",
@@ -33,7 +33,7 @@
    "dayjs-plugin-utc": "0.1.2",
    "debounce": "2.2.0",
    "draggabilly": "3.0.0",
-    "force-graph": "1.49.6",
+    "force-graph": "1.50.1",
    "globals": "16.3.0",
    "i18next": "25.3.0",
    "i18next-http-backend": "3.0.2",
@@ -47,7 +47,7 @@
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
    "marked": "16.0.0",
-    "mermaid": "11.7.0",
+    "mermaid": "11.8.0",
    "mind-elixir": "4.6.2",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
--- a/apps/client/src/services/note_types.ts
+++ b/apps/client/src/services/note_types.ts
@@ -8,18 +8,35 @@ const SEPARATOR = { title: "----" };

 async function getNoteTypeItems(command?: TreeCommandNames) {
    const items: MenuItem<TreeCommandNames>[] = [
+        // The suggested note type ordering method: insert the item into the corresponding group,
+        // then ensure the items within the group are ordered alphabetically.
+        // Please keep the order synced with the listing found also in aps/client/src/widgets/note_types.ts.
+
+        // The default note type (always the first item)
        { title: t("note_types.text"), command, type: "text", uiIcon: "bx bx-note" },
-        { title: t("note_types.code"), command, type: "code", uiIcon: "bx bx-code" },
-        { title: t("note_types.saved-search"), command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: t("note_types.relation-map"), command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
-        { title: t("note_types.note-map"), command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
-        { title: t("note_types.render-note"), command, type: "render", uiIcon: "bx bx-extension" },
+        
+        // Text notes group
        { title: t("note_types.book"), command, type: "book", uiIcon: "bx bx-book" },
-        { title: t("note_types.mermaid-diagram"), command, type: "mermaid", uiIcon: "bx bx-selection" },
+
+        // Graphic notes
        { title: t("note_types.canvas"), command, type: "canvas", uiIcon: "bx bx-pen" },
-        { title: t("note_types.web-view"), command, type: "webView", uiIcon: "bx bx-globe-alt" },
-        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" },
+        { title: t("note_types.mermaid-diagram"), command, type: "mermaid", uiIcon: "bx bx-selection" },
+        
+        // Map notes
        { title: t("note_types.geo-map"), command, type: "geoMap", uiIcon: "bx bx-map-alt" },
+        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" },
+        { title: t("note_types.note-map"), command, type: "noteMap", uiIcon: "bx bxs-network-chart" },
+        { title: t("note_types.relation-map"), command, type: "relationMap", uiIcon: "bx bxs-network-chart" },
+
+        // Misc note types
+        { title: t("note_types.render-note"), command, type: "render", uiIcon: "bx bx-extension" },
+        { title: t("note_types.saved-search"), command, type: "search", uiIcon: "bx bx-file-find" },
+        { title: t("note_types.web-view"), command, type: "webView", uiIcon: "bx bx-globe-alt" },
+
+        // Code notes
+        { title: t("note_types.code"), command, type: "code", uiIcon: "bx bx-code" },
+
+        // Templates
        ...await getBuiltInTemplates(command),
        ...await getUserTemplates(command)
    ];
--- a/apps/client/src/stylesheets/theme-next/dialogs.css
+++ b/apps/client/src/stylesheets/theme-next/dialogs.css
@@ -382,6 +382,10 @@ div.tn-tool-dialog {

 /* DELETE NOTE PREVIEW DIALOG */

+.delete-notes-dialog .modal-dialog {
+    --bs-modal-width: fit-content;
+}
+
 .delete-notes-list .note-path {
    padding-left: 8px;
 }
--- a/apps/client/src/stylesheets/theme-next/ribbon.css
+++ b/apps/client/src/stylesheets/theme-next/ribbon.css
@@ -46,6 +46,12 @@ div.promoted-attributes-container {
 .image-properties > div:first-child > span > strong {
    opacity: 0.65;
    font-weight: 500;
+    vertical-align: top;
+}
+
+.note-info-widget-table td,
+.file-properties-widget .file-table td {
+    vertical-align: top;
 }

 .file-properties-widget {
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -71,7 +71,7 @@ body.background-effects.platform-win32.layout-vertical #vertical-main-container
 /* #endregion */

 /* Matches when the left pane is collapsed */
-:has(.layout-vertical #left-pane.hidden-int) {
+#horizontal-main-container:has(#left-pane.hidden-int) {
    --center-pane-border-radius: 0;
    --tab-first-item-horiz-offset: 5px;
 }
--- a/apps/client/src/widgets/note_map.ts
+++ b/apps/client/src/widgets/note_map.ts
@@ -324,7 +324,13 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
        }

        const mapRootNoteId = this.getMapRootNoteId();
-        const data = await this.loadNotesAndRelations(mapRootNoteId);
+
+        const labelValues = (name: string) => this.note?.getLabels(name).map(l => l.value) ?? [];
+
+        const excludeRelations = labelValues("mapExcludeRelation");
+        const includeRelations = labelValues("mapIncludeRelation");
+
+        const data = await this.loadNotesAndRelations(mapRootNoteId, excludeRelations, includeRelations);

        const nodeLinkRatio = data.nodes.length / data.links.length;
        const magnifiedRatio = Math.pow(nodeLinkRatio, 1.5);
@@ -473,8 +479,10 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
        ctx.restore();
    }

-    async loadNotesAndRelations(mapRootNoteId: string): Promise<NotesAndRelationsData> {
-        const resp = await server.post<PostNotesMapResponse>(`note-map/${mapRootNoteId}/${this.mapType}`);
+    async loadNotesAndRelations(mapRootNoteId: string, excludeRelations: string[], includeRelations: string[]): Promise<NotesAndRelationsData> {
+        const resp = await server.post<PostNotesMapResponse>(`note-map/${mapRootNoteId}/${this.mapType}`, {
+            excludeRelations, includeRelations
+        });

        this.calculateNodeSizes(resp);

--- a/apps/client/src/widgets/note_type.ts
+++ b/apps/client/src/widgets/note_type.ts
@@ -19,6 +19,7 @@ interface NoteTypeMapping {
 const NOTE_TYPES: NoteTypeMapping[] = [
    // The suggested note type ordering method: insert the item into the corresponding group,
    // then ensure the items within the group are ordered alphabetically.
+    // Please keep the order synced with the listing found also in apps/client/src/services/note_types.ts.

    // The default note type (always the first item)
    { type: "text", mime: "text/html", title: t("note_types.text"), selectable: true },
--- a/apps/desktop-e2e/package.json
+++ b/apps/desktop-e2e/package.json
@@ -19,6 +19,6 @@
  },
  "devDependencies": {
    "dotenv": "17.0.1",
-    "electron": "37.1.0"
+    "electron": "37.2.0"
  }
 }
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -17,7 +17,7 @@
    "@types/electron-squirrel-startup": "1.0.2",
    "@triliumnext/server": "workspace:*",
    "copy-webpack-plugin": "13.0.0",
-    "electron": "37.1.0",
+    "electron": "37.2.0",
    "@electron-forge/cli": "7.8.1",
    "@electron-forge/maker-deb": "7.8.1",
    "@electron-forge/maker-dmg": "7.8.1",
--- a/apps/edit-docs/package.json
+++ b/apps/edit-docs/package.json
@@ -12,7 +12,7 @@
    "@triliumnext/desktop": "workspace:*",
    "@types/fs-extra": "11.0.4",
    "copy-webpack-plugin": "13.0.0",
-    "electron": "37.1.0",
+    "electron": "37.2.0",
    "fs-extra": "11.3.0"
  },
  "nx": {
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -59,7 +59,7 @@
    "debounce": "2.2.0",
    "debug": "4.4.1",
    "ejs": "3.1.10",
-    "electron": "37.1.0",
+    "electron": "37.2.0",
    "electron-debug": "4.1.0",
    "electron-window-state": "5.0.3",
    "escape-html": "1.0.3",
--- a/apps/server/src/routes/api/note_map.ts
+++ b/apps/server/src/routes/api/note_map.ts
@@ -110,6 +110,11 @@ function getLinkMap(req: Request) {
    const ignoreExcludeFromNoteMap = mapRootNote.isLabelTruthy("excludeFromNoteMap");
    let unfilteredNotes;

+    const toSet = (data: unknown) => new Set<string>(data instanceof Array ? data : []);
+
+    const excludeRelations = toSet(req.body.excludeRelations);
+    const includeRelations = toSet(req.body.includeRelations);
+
    if (mapRootNote.type === "search") {
        // for search notes, we want to consider the direct search results only without the descendants
        unfilteredNotes = mapRootNote.getSearchResultNotes();
@@ -152,6 +157,10 @@ function getLinkMap(req: Request) {
                }

                return !parentNote.getChildNotes().find((childNote) => childNote.noteId === rel.value);
+            } else if (includeRelations.size != 0 && !includeRelations.has(rel.name)) {
+                return false;
+            } else if (excludeRelations.has(rel.name)) {
+                return false;
            } else {
                return true;
            }
--- a/apps/server/src/services/builtin_attributes.ts
+++ b/apps/server/src/services/builtin_attributes.ts
@@ -45,6 +45,8 @@ export default [
    { type: "label", name: "pageSize" },
    { type: "label", name: "viewType" },
    { type: "label", name: "mapRootNoteId" },
+    { type: "label", name: "mapExcludeRelation" },
+    { type: "label", name: "mapIncludeRelation" },
    { type: "label", name: "bookmarkFolder" },
    { type: "label", name: "sorted" },
    { type: "label", name: "sortDirection" },