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

; Conflicts:
;	pnpm-lock.yaml

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)
     ];

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;
 }

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 {

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;
 }

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);
 

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 },