Merge branch 'main' of https://github.com/TriliumNext/Trilium

apps/client/src/menus/context_menu.ts

@@ -26,6 +26,11 @@ export interface MenuCommandItem<T> {
     title: string;
     command?: T;
     type?: string;
+    /**
+     * The icon to display in the menu item.
+     *
+     * If not set, no icon is displayed and the item will appear shifted slightly to the left if there are other items with icons. To avoid this, use `bx bx-empty`.
+     */
     uiIcon?: string;
     badges?: MenuItemBadge[];
     templateNoteId?: string;

apps/client/src/services/attributes.ts

@@ -12,11 +12,12 @@ async function addLabel(noteId: string, name: string, value: string = "", isInhe
     });
 }
 
-export async function setLabel(noteId: string, name: string, value: string = "") {
+export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "label",
         name: name,
-        value: value
+        value: value,
+        isInheritable
     });
 }
 

apps/client/src/services/bulk_action.ts

@@ -15,6 +15,8 @@ import AddRelationBulkAction from "../widgets/bulk_actions/relation/add_relation
 import RenameNoteBulkAction from "../widgets/bulk_actions/note/rename_note.js";
 import { t } from "./i18n.js";
 import type FNote from "../entities/fnote.js";
+import toast from "./toast.js";
+import { BulkAction } from "@triliumnext/commons";
 
 const ACTION_GROUPS = [
     {
@@ -89,6 +91,17 @@ function parseActions(note: FNote) {
         .filter((action) => !!action);
 }
 
+export async function executeBulkActions(parentNoteId: string, actions: BulkAction[]) {
+    await server.post("bulk-action/execute", {
+        noteIds: [ parentNoteId ],
+        includeDescendants: true,
+        actions
+    });
+
+    await ws.waitForMaxKnownEntityChangeId();
+    toast.showMessage(t("bulk_actions.bulk_actions_executed"), 3000);
+}
+
 export default {
     addAction,
     parseActions,

apps/client/src/translations/en/translation.json

@@ -1958,7 +1958,9 @@
     "add-column-to-the-right": "Add column to the right",
     "edit-column": "Edit column",
     "delete_column_confirmation": "Are you sure you want to delete this column? The corresponding attribute will be removed from all notes.",
-    "delete-column": "Delete column"
+    "delete-column": "Delete column",
+    "new-column-label": "Label",
+    "new-column-relation": "Relation"
   },
   "book_properties_config": {
     "hide-weekends": "Hide weekends",

apps/client/src/widgets/view_widgets/table_view/bulk_actions.ts

@@ -1,53 +1,31 @@
-import { t } from "i18next";
-import attributes from "../../../services/attributes";
-import froca from "../../../services/froca";
-import server from "../../../services/server";
-import toast from "../../../services/toast";
-import ws from "../../../services/ws";
+import { executeBulkActions } from "../../../services/bulk_action.js";
 
 export async function renameColumn(parentNoteId: string, type: "label" | "relation", originalName: string, newName: string) {
     if (type === "label") {
-        return executeBulkAction(parentNoteId, {
+        return executeBulkActions(parentNoteId, [{
             name: "renameLabel",
             oldLabelName: originalName,
             newLabelName: newName
-        });
+        }]);
     } else {
-        return executeBulkAction(parentNoteId, {
+        return executeBulkActions(parentNoteId, [{
             name: "renameRelation",
             oldRelationName: originalName,
             newRelationName: newName
-        });
+        }]);
     }
 }
 
 export async function deleteColumn(parentNoteId: string, type: "label" | "relation", columnName: string) {
     if (type === "label") {
-        return executeBulkAction(parentNoteId, {
+        return executeBulkActions(parentNoteId, [{
             name: "deleteLabel",
             labelName: columnName
-        });
+        }]);
     } else {
-        return executeBulkAction(parentNoteId, {
+        return executeBulkActions(parentNoteId, [{
             name: "deleteRelation",
             relationName: columnName
-        });
+        }]);
     }
 }
-
-async function executeBulkAction(parentNoteId: string, action: {}) {
-    const bulkActionNote = await froca.getNote("_bulkAction");
-    if (!bulkActionNote) {
-        console.warn("Bulk action note not found");
-        return;
-    }
-
-    attributes.setLabel("_bulkAction", "action", JSON.stringify(action));
-    await server.post("bulk-action/execute", {
-        noteIds: [ parentNoteId ],
-        includeDescendants: true
-    });
-
-    await ws.waitForMaxKnownEntityChangeId();
-    toast.showMessage(t("bulk_actions.bulk_actions_executed"), 3000);
-}

apps/client/src/widgets/view_widgets/table_view/col_editing.ts

@@ -45,7 +45,8 @@ export default class TableColumnEditing extends Component {
             attr = {
                 type: "label",
                 name: `${type ?? "label"}:myLabel`,
-                value: "promoted,single,text"
+                value: "promoted,single,text",
+                isInheritable: true
             };
         }
 
@@ -78,20 +79,21 @@ export default class TableColumnEditing extends Component {
             return;
         }
 
-        const { name, type, value } = this.newAttribute;
+        const { name, value, isInheritable } = this.newAttribute;
 
         this.api.blockRedraw();
+        const isRename = (this.existingAttributeToEdit && this.existingAttributeToEdit.name !== name);
         try {
-            if (this.existingAttributeToEdit && this.existingAttributeToEdit.name !== name) {
-                const oldName = this.existingAttributeToEdit.name.split(":")[1];
-                const newName = name.split(":")[1];
-                await renameColumn(this.parentNote.noteId, type, oldName, newName);
+            if (isRename) {
+                const oldName = this.existingAttributeToEdit!.name.split(":")[1];
+                const [ type, newName ] = name.split(":");
+                await renameColumn(this.parentNote.noteId, type as "label" | "relation", oldName, newName);
             }
 
-            attributes.setLabel(this.parentNote.noteId, name, value);
-            if (this.existingAttributeToEdit) {
+            if (this.existingAttributeToEdit && (isRename || this.existingAttributeToEdit.isInheritable !== isInheritable)) {
                 attributes.removeOwnedLabelByName(this.parentNote, this.existingAttributeToEdit.name);
             }
+            attributes.setLabel(this.parentNote.noteId, name, value, isInheritable);
         } finally {
             this.api.restoreRedraw();
         }
@@ -133,17 +135,17 @@ export default class TableColumnEditing extends Component {
         return this.parentNote.getLabel(attrName);
     }
 
-    getAttributeFromField(field: string) {
+    getAttributeFromField(field: string): Attribute | undefined {
         const fAttribute = this.getFAttributeFromField(field);
         if (fAttribute) {
             return {
                 name: fAttribute.name,
                 value: fAttribute.value,
-                type: fAttribute.type
+                type: fAttribute.type,
+                isInheritable: fAttribute.isInheritable
             };
         }
         return undefined;
     }
 
 }
-

apps/client/src/widgets/view_widgets/table_view/context_menu.ts

@@ -139,11 +139,13 @@ function showHeaderContextMenu(_e: Event, tabulator: Tabulator) {
                 uiIcon: "bx bx-empty",
                 items: buildColumnItems(tabulator)
             },
+            { title: "----" },
             {
                 title: t("table_view.new-column"),
-                uiIcon: "bx bx-columns",
-                handler: () => getParentComponent(e)?.triggerCommand("addNewTableColumn", {})
+                uiIcon: "bx bx-empty",
+                enabled: false
             },
+            ...buildInsertSubmenu(e)
         ],
         selectMenuItemHandler() {},
         x: e.pageX,
@@ -246,23 +248,27 @@ function buildColumnItems(tabulator: Tabulator) {
     return items;
 }
 
-function buildInsertSubmenu(e: MouseEvent, referenceColumn: ColumnComponent, direction: "before" | "after"): MenuItem<unknown>[] {
+function buildInsertSubmenu(e: MouseEvent, referenceColumn?: ColumnComponent, direction?: "before" | "after"): MenuItem<unknown>[] {
     return [
         {
-            title: "Label",
+            title: t("table_view.new-column-label"),
+            uiIcon: "bx bx-hash",
             handler: () => {
                 getParentComponent(e)?.triggerCommand("addNewTableColumn", {
                     referenceColumn,
-                    type: "label"
+                    type: "label",
+                    direction
                 });
             }
         },
         {
-            title: "Relation",
+            title: t("table_view.new-column-relation"),
+            uiIcon: "bx bx-transfer",
             handler: () => {
                 getParentComponent(e)?.triggerCommand("addNewTableColumn", {
                     referenceColumn,
-                    type: "relation"
+                    type: "relation",
+                    direction
                 });
             }
         }

apps/client/src/widgets/view_widgets/table_view/index.ts

@@ -219,8 +219,8 @@ export default class TableView extends ViewMode<StateInfo> {
         }
 
         if (loadResults.getBranchRows().some(branch => branch.parentNoteId === this.parentNote.noteId || this.noteIds.includes(branch.parentNoteId ?? ""))
-            || loadResults.getNoteIds().some(noteId => this.noteIds.includes(noteId)
-            || loadResults.getAttributeRows().some(attr => this.noteIds.includes(attr.noteId!)))) {
+            || loadResults.getNoteIds().some(noteId => this.noteIds.includes(noteId))
+            || loadResults.getAttributeRows().some(attr => this.noteIds.includes(attr.noteId!))) {
             return await this.#manageRowsUpdate();
         }