feat(toolbar): enhance toolbar actions with metadata and ROI grouping

Author: PierreRaybaut

src/actions/registry.ts

@@ -288,6 +288,9 @@ export function buildStaticActions(
       menuPath: "Edit/Metadata/Add metadata…",
       iconUrl: getEditIconUrl("metadata_add.svg"),
       beginGroup: true,
+      toolbar: true,
+      toolbarGroup: "metadata-edit",
+      toolbarOrder: 0,
       enabled: (s) => ready(s) && s.selectedIds.length > 0,
       run: cb.onAddMetadata,
     },
@@ -296,6 +299,9 @@ export function buildStaticActions(
       label: t("Import metadata…"),
       menuPath: "Edit/Metadata/Import metadata…",
       iconUrl: getEditIconUrl("metadata_import.svg"),
+      toolbar: true,
+      toolbarGroup: "metadata-edit",
+      toolbarOrder: 1,
       enabled: (s) => ready(s) && s.selectedIds.length === 1,
       run: cb.onImportMetadata,
     },
@@ -304,6 +310,9 @@ export function buildStaticActions(
       label: t("Export metadata…"),
       menuPath: "Edit/Metadata/Export metadata…",
       iconUrl: getEditIconUrl("metadata_export.svg"),
+      toolbar: true,
+      toolbarGroup: "metadata-edit",
+      toolbarOrder: 2,
       enabled: (s) => ready(s) && s.selectedIds.length === 1,
       run: cb.onExportMetadata,
     },
@@ -313,6 +322,9 @@ export function buildStaticActions(
       menuPath: "Edit/Metadata/Delete object metadata",
       iconUrl: getEditIconUrl("metadata_delete.svg"),
       beginGroup: true,
+      toolbar: true,
+      toolbarGroup: "metadata-del",
+      toolbarOrder: 0,
       enabled: (s) => ready(s) && s.selectedIds.length > 0,
       run: cb.onDeleteMetadata,
     },
@@ -777,6 +789,9 @@ export function buildRoiActions(
       menuPath: "ROI/Copy ROI",
       iconUrl: getRoiIconUrl("roi_copy"),
       beginGroup: true,
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 0,
       enabled: readyWithRoi,
       run: cb.onCopy,
     },
@@ -785,6 +800,9 @@ export function buildRoiActions(
       label: t("Paste ROI"),
       menuPath: "ROI/Paste ROI",
       iconUrl: getRoiIconUrl("roi_paste"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 1,
       enabled: readyWithClipboard,
       run: cb.onPaste,
     },
@@ -793,6 +811,9 @@ export function buildRoiActions(
       label: t("Import ROI…"),
       menuPath: "ROI/Import ROI…",
       iconUrl: getRoiIconUrl("roi_import"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 2,
       enabled: ready,
       run: cb.onImport,
     },
@@ -801,6 +822,9 @@ export function buildRoiActions(
       label: t("Export ROI…"),
       menuPath: "ROI/Export ROI…",
       iconUrl: getRoiIconUrl("roi_export"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 3,
       enabled: readyWithRoi,
       run: cb.onExport,
     },
@@ -945,6 +969,9 @@ export function buildImageRoiActions(
       menuPath: "ROI/Copy ROI",
       iconUrl: getRoiIconUrl("roi_copy"),
       beginGroup: true,
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 0,
       enabled: readyWithRoi,
       run: cb.onCopy,
     },
@@ -953,6 +980,9 @@ export function buildImageRoiActions(
       label: t("Paste ROI"),
       menuPath: "ROI/Paste ROI",
       iconUrl: getRoiIconUrl("roi_paste"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 1,
       enabled: readyWithClipboard,
       run: cb.onPaste,
     },
@@ -961,6 +991,9 @@ export function buildImageRoiActions(
       label: t("Import ROI…"),
       menuPath: "ROI/Import ROI…",
       iconUrl: getRoiIconUrl("roi_import"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 2,
       enabled: ready,
       run: cb.onImport,
     },
@@ -969,6 +1002,9 @@ export function buildImageRoiActions(
       label: t("Export ROI…"),
       menuPath: "ROI/Export ROI…",
       iconUrl: getRoiIconUrl("roi_export"),
+      toolbar: true,
+      toolbarGroup: "roi",
+      toolbarOrder: 3,
       enabled: readyWithRoi,
       run: cb.onExport,
     },

src/actions/types.ts

@@ -60,8 +60,18 @@ export type ToolbarItem =
 
 /** Toolbar group ordering, mirroring DataLab desktop's toolbar layout:
  *  the HDF5 workspace actions (main toolbar) come first, then the
- *  per-object file / edit / metadata actions (panel toolbar). */
-export const TOOLBAR_GROUP_ORDER = ["file-h5", "file", "edit", "metadata"];
+ *  per-object file / edit / metadata / ROI actions (panel toolbar). The
+ *  metadata block is split into three sub-groups to reproduce desktop's
+ *  internal separators (copy/paste | add/import/export | delete). */
+export const TOOLBAR_GROUP_ORDER = [
+  "file-h5",
+  "file",
+  "edit",
+  "metadata",
+  "metadata-edit",
+  "metadata-del",
+  "roi",
+];
 
 export interface MenuNode {
   /** Canonical English structural label (menu-path segment). Used as a

tests/ts/actions/buildToolbar.test.ts

@@ -57,6 +57,23 @@ describe("buildToolbarItems", () => {
     expect(ids(items)).toBe("f,|,e,|,m");
   });
 
+  it("reproduces the full desktop PANEL_TOOLBAR layout", () => {
+    // One representative action per group, shuffled; the helper must
+    // restore the desktop order with a separator between each group,
+    // including the metadata sub-groups (copy/paste | add/import/export |
+    // delete) and the trailing ROI group.
+    const items = buildToolbarItems([
+      action("roi", { toolbar: true, toolbarGroup: "roi" }),
+      action("del", { toolbar: true, toolbarGroup: "metadata-del" }),
+      action("h5", { toolbar: true, toolbarGroup: "file-h5" }),
+      action("meta", { toolbar: true, toolbarGroup: "metadata" }),
+      action("edit", { toolbar: true, toolbarGroup: "edit" }),
+      action("metaedit", { toolbar: true, toolbarGroup: "metadata-edit" }),
+      action("file", { toolbar: true, toolbarGroup: "file" }),
+    ]);
+    expect(ids(items)).toBe("h5,|,file,|,edit,|,meta,|,metaedit,|,del,|,roi");
+  });
+
   it("inserts a separator only between groups (never leading/trailing)", () => {
     const items = buildToolbarItems([
       action("f1", { toolbar: true, toolbarGroup: "file", toolbarOrder: 0 }),