Skip to content

Build your personal knowledge base with Trilium Notes

Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/board-improvements-2

Adorian Doran953675dafc15
diff --cc apps/client/src/widgets/collections/board/api.spec.ts
index fcea56e2fb,5e78805968..d1df4b0ec2
--- a/apps/client/src/widgets/collections/board/api.spec.ts
+++ b/apps/client/src/widgets/collections/board/api.spec.ts
@@@ -11,12 -10,11 +11,12 @@@ import froca from "../../../services/fr
import note_create from "../../../services/note_create";
import noteAttributeCache from "../../../services/note_attribute_cache";
import server from "../../../services/server";
+import ws from "../../../services/ws";
import { buildNote } from "../../../test/easy-froca";
import { BoardViewData } from ".";
-import BoardApi, { PendingColumnWrites } from "./api";
+import BoardApi, { getPendingWrites, PendingColumnWrites, releasePendingWrites } from "./api";
import { ColumnMap } from "./data";
- import { BOARD_TEMPLATE_ID, getStatusDefinition } from "./columns";
+ import { BOARD_TEMPLATE_ID, DEFAULT_COLUMN_ICON, getStatusDefinition } from "./columns";
vi.mock("../../../services/bulk_action", () => ({
executeBulkActions: vi.fn(async () => {})
diff --cc apps/client/src/widgets/collections/board/context_menu.spec.ts
index dbc3c4abbb,ef617ef4e9..803e0e8114
--- a/apps/client/src/widgets/collections/board/context_menu.spec.ts
+++ b/apps/client/src/widgets/collections/board/context_menu.spec.ts
@@@ -225,7 -211,6 +226,8 @@@ describe("Board item context menu", ()
const api = {
columns: [],
isColumnArchived: () => false,
- columnIcon: () => "bx bx-circle",
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => "",
insertRowAtPosition: vi.fn(async () => {})
} as unknown as BoardApi;
const items = openItemMenu(api);
@@@ -265,7 -251,6 +268,8 @@@
const api = {
columns: [],
isColumnArchived: () => false,
- columnIcon: () => "bx bx-circle",
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => "",
removeFromBoard: vi.fn()
} as unknown as BoardApi;
const deleteNotes = vi.spyOn(branches, "deleteNotes").mockResolvedValue(false);
@@@ -281,41 -266,8 +285,26 @@@
expect(deleteNotes).toHaveBeenCalledWith([ "branchId" ], false, false);
});
- it("shows each column with the icon its header wears", () => {
- const api = {
- columns: [ "To Do", "Done" ],
- isColumnArchived: () => false,
- columnIcon: (column: string) =>
- column === "To Do" ? "bx bx-list-ul" : "bx bx-check"
- } as unknown as BoardApi;
-
- const moveTo = openItemMenu(api).find(item =>
- item && "uiIcon" in item && item.uiIcon === "bx bx-transfer");
- if (!moveTo || !("items" in moveTo)) throw new Error("expected a move-to entry");
-
- expect((moveTo.items ?? []).map(item => item && "uiIcon" in item ? item.uiIcon : null))
- .toEqual([ "bx bx-list-ul", "bx bx-check" ]);
- });
-
+ it("copies a card into the board, after the one it was made from", async () => {
+ const api = {
+ columns: [ "To Do" ],
+ isColumnArchived: () => false,
- columnIcon: () => "bx bx-circle",
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => "",
+ duplicateItem: vi.fn(async () => {})
+ } as unknown as BoardApi;
+
+ const entry = openItemMenu(api).find(item =>
+ item && "uiIcon" in item && item.uiIcon === "bx bx-outline");
+ if (!entry || !("handler" in entry)) throw new Error("expected a duplicate entry");
+
+ await entry.handler?.(entry, {} as never);
+
+ expect(api.duplicateItem).toHaveBeenCalledWith(expect.any(String), "branchId");
+ });
+
/** Opens the menu a card offers, and hands back what it was given to show. */
- function openItemMenu(api: BoardApi) {
+ function openItemMenu(api: BoardApi, column = "To Do") {
const show = vi.spyOn(contextMenu, "show").mockImplementation(async () => {});
const event = {
preventDefault: () => {},
@@@ -329,56 -281,6 +318,59 @@@
return show.mock.calls.at(-1)?.[0].items ?? [];
}
+ /**
+ * The whole-way keys land on the same two entries wherever the card stands, so the menu names
+ * them. The one-column keys land somewhere different for every card and are left unnamed.
+ */
+ it("names the whole-way keys on the ends, and nothing on the columns beside", () => {
+ const api = {
+ columns: [ "To Do", "Doing", "Done", "Shipped" ],
+ isColumnArchived: () => false,
- columnIcon: () => "bx bx-circle"
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => ""
+ } as unknown as BoardApi;
+
+ const moveTo = openItemMenu(api, "Doing").find(item =>
+ item && "uiIcon" in item && item.uiIcon === "bx bx-transfer");
+ if (!moveTo || !("items" in moveTo)) throw new Error("expected a move-to entry");
+
+ expect((moveTo.items ?? []).map(item => item && "shortcut" in item ? item.shortcut : null))
+ .toEqual([ "Ctrl+Shift+Left", undefined, undefined, "Ctrl+Shift+Right" ]);
+ });
+
+ it("leaves the end a card already stands in bare", () => {
+ const api = {
+ columns: [ "To Do", "Doing", "Done" ],
+ isColumnArchived: () => false,
- columnIcon: () => "bx bx-circle"
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => ""
+ } as unknown as BoardApi;
+
+ const moveTo = openItemMenu(api, "To Do").find(item =>
+ item && "uiIcon" in item && item.uiIcon === "bx bx-transfer");
+ if (!moveTo || !("items" in moveTo)) throw new Error("expected a move-to entry");
+
+ expect((moveTo.items ?? []).map(item => item && "shortcut" in item ? item.shortcut : null))
+ .toEqual([ undefined, undefined, "Ctrl+Shift+Right" ]);
+ });
+
+ /** A hidden column is not one the keys reach, so the end is the last column drawn. */
+ it("counts the end over an archived column rather than onto it", () => {
+ const api = {
+ columns: [ "To Do", "Doing", "Parked" ],
+ isColumnArchived: (column: string) => column === "Parked",
- columnIcon: () => "bx bx-circle"
++ getColumnIcon: () => DEFAULT_COLUMN_ICON,
++ getColumnColorClass: () => ""
+ } as unknown as BoardApi;
+
+ const moveTo = openItemMenu(api, "To Do").find(item =>
+ item && "uiIcon" in item && item.uiIcon === "bx bx-transfer");
+ if (!moveTo || !("items" in moveTo)) throw new Error("expected a move-to entry");
+
+ expect((moveTo.items ?? []).map(item => item && "shortcut" in item ? item.shortcut : null))
+ .toEqual([ undefined, "Ctrl+Shift+Right", undefined ]);
+ });
+
it("marks the archived columns it offers to move a card to", () => {
const api = {
columns: [ "To Do", "Done" ],
diff --cc apps/client/src/widgets/collections/board/context_menu.ts
index 747ef60e45,66a2b2e491..5984c768f1
--- a/apps/client/src/widgets/collections/board/context_menu.ts
+++ b/apps/client/src/widgets/collections/board/context_menu.ts
@@@ -169,9 -149,9 +169,10 @@@ export function openNoteContextMenu(api
// fair thing to want; the badge is there so it is not a surprise when it goes.
items: api.columns.map(columnToMoveTo => ({
title: columnToMoveTo,
- uiIcon: api.columnIcon(columnToMoveTo),
+ uiIcon: api.getColumnIcon(columnToMoveTo),
+ iconColorClass: api.getColumnColorClass(columnToMoveTo),
enabled: columnToMoveTo !== column,
+ shortcut: endColumnKey(api, column, columnToMoveTo),
badges: api.isColumnArchived(columnToMoveTo)
? [ { title: t("board_view.archived-badge") } ]
: undefined,