diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json index f3693e853..d436cc078 100644 --- a/apps/client/src/translations/en/translation.json +++ b/apps/client/src/translations/en/translation.json @@ -1970,6 +1970,7 @@ "delete_row": "Delete row" }, "board_view": { - "delete-note": "Delete Note" + "delete-note": "Delete Note", + "move-to": "Move to" } } diff --git a/apps/client/src/widgets/view_widgets/board_view/api.ts b/apps/client/src/widgets/view_widgets/board_view/api.ts new file mode 100644 index 000000000..af87668ae --- /dev/null +++ b/apps/client/src/widgets/view_widgets/board_view/api.ts @@ -0,0 +1,12 @@ +import attributes from "../../../services/attributes"; + +export default class BoardApi { + + constructor(public columns: string[]) { + } + + async changeColumn(noteId: string, newColumn: string) { + await attributes.setLabel(noteId, "status", newColumn); + } + +} diff --git a/apps/client/src/widgets/view_widgets/board_view/config.ts b/apps/client/src/widgets/view_widgets/board_view/config.ts index def136da7..92dd99f5f 100644 --- a/apps/client/src/widgets/view_widgets/board_view/config.ts +++ b/apps/client/src/widgets/view_widgets/board_view/config.ts @@ -1,4 +1,4 @@ -interface BoardColumnData { +export interface BoardColumnData { value: string; } diff --git a/apps/client/src/widgets/view_widgets/board_view/context_menu.ts b/apps/client/src/widgets/view_widgets/board_view/context_menu.ts index c6bd99ddb..03d8099dd 100644 --- a/apps/client/src/widgets/view_widgets/board_view/context_menu.ts +++ b/apps/client/src/widgets/view_widgets/board_view/context_menu.ts @@ -2,8 +2,14 @@ import contextMenu from "../../../menus/context_menu.js"; import link_context_menu from "../../../menus/link_context_menu.js"; import branches from "../../../services/branches.js"; import { t } from "../../../services/i18n.js"; +import BoardApi from "./api.js"; -export function showNoteContextMenu($container: JQuery) { +interface ShowNoteContextMenuArgs { + $container: JQuery; + api: BoardApi; +} + +export function showNoteContextMenu({ $container, api }: ShowNoteContextMenuArgs) { $container.on("contextmenu", ".board-note", (event) => { event.preventDefault(); event.stopPropagation(); @@ -19,6 +25,15 @@ export function showNoteContextMenu($container: JQuery) { items: [ ...link_context_menu.getItems(), { title: "----" }, + { + title: t("board_view.move-to"), + uiIcon: "bx bx-transfer", + items: api.columns.map(column => ({ + title: column, + handler: () => api.changeColumn(noteId, column) + })) + }, + { title: "----" }, { title: t("board_view.delete-note"), uiIcon: "bx bx-trash", diff --git a/apps/client/src/widgets/view_widgets/board_view/index.ts b/apps/client/src/widgets/view_widgets/board_view/index.ts index f399dca03..d1f8a8108 100644 --- a/apps/client/src/widgets/view_widgets/board_view/index.ts +++ b/apps/client/src/widgets/view_widgets/board_view/index.ts @@ -8,6 +8,7 @@ import appContext, { EventData } from "../../../components/app_context"; import { BoardData } from "./config"; import SpacedUpdate from "../../../services/spaced_update"; import { showNoteContextMenu } from "./context_menu"; +import BoardApi from "./api"; const TPL = /*html*/`
@@ -127,6 +128,7 @@ export default class BoardView extends ViewMode { private draggedBranch: any = null; private draggedNoteElement: JQuery | null = null; private persistentData: BoardData; + private api?: BoardApi; constructor(args: ViewModeArgs) { super(args, "board"); @@ -134,7 +136,6 @@ export default class BoardView extends ViewMode { this.$root = $(TPL); setupHorizontalScrollViaWheel(this.$root); this.$container = this.$root.find(".board-view-container"); - showNoteContextMenu(this.$container); this.spacedUpdate = new SpacedUpdate(() => this.onSave(), 5_000); this.persistentData = { columns: [] @@ -155,6 +156,12 @@ export default class BoardView extends ViewMode { this.persistentData = persistedData; const data = await getBoardData(this.parentNote, "status", persistedData); + const columns = Array.from(data.byColumn.keys()) || []; + this.api = new BoardApi(columns); + showNoteContextMenu({ + $container: this.$container, + api: this.api + }); if (data.newPersistedData) { this.persistentData = data.newPersistedData; @@ -317,7 +324,7 @@ export default class BoardView extends ViewMode { try { // Handle column change if (currentColumn !== column) { - await attributeService.setLabel(draggedNote.noteId, "status", column); + await this.api?.changeColumn(draggedNote.noteId, column); } // Handle position change (works for both same column and different column moves)