@trops/dash-core 0.1.443 → 0.1.445

package/dist/electron/index.js

@@ -30829,10 +30829,73 @@ const openaiController$1 = {
 
 var openaiController_1 = openaiController$1;
 
+/**
+ * upsertMenuItem.js
+ *
+ * Pure function that upserts a menu item into a list. Used by
+ * `menuItemsController.saveMenuItemForApplication` so the controller
+ * can stay free of business logic and the upsert is unit-testable
+ * without mocking Electron.
+ *
+ * Behavior:
+ *   - Replace any existing entry with the same id (string-coerced
+ *     match) instead of appending a duplicate.
+ *   - Heal pre-existing dupes already in the list. Walks from the
+ *     END so the LAST entry per id wins — that matches the user's
+ *     most recent intent (which would be the one they last saved).
+ *
+ * Without this, a dashboard install path that re-saves an existing
+ * folder (e.g. when the publisher's menuId matches the user's
+ * local folder id) creates a second record with the same id but
+ * different icon, and the sidebar nav renders both.
+ *
+ * @param {Array} items - existing menu items list
+ * @param {Object} menuItem - item to upsert
+ * @returns {Array} new list (input is not mutated)
+ */
+
+function upsertMenuItem$1(items, menuItem) {
+  // Step 1: heal pre-existing duplicates. Walk from the END so the
+  // LAST entry per id wins (matches "user's most recent intent").
+  const filtered = (Array.isArray(items) ? items : []).filter(
+    (mi) => mi !== null,
+  );
+  const seen = new Set();
+  const healed = [];
+  for (let i = filtered.length - 1; i >= 0; i -= 1) {
+    const m = filtered[i];
+    if (!m || m.id === undefined || m.id === null) {
+      healed.unshift(m);
+      continue;
+    }
+    const key = String(m.id);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    healed.unshift(m);
+  }
+  // Step 2: upsert the new item against the healed list.
+  if (menuItem && menuItem.id !== undefined && menuItem.id !== null) {
+    const existingIdx = healed.findIndex(
+      (mi) => mi && String(mi.id) === String(menuItem.id),
+    );
+    if (existingIdx >= 0) {
+      healed[existingIdx] = { ...healed[existingIdx], ...menuItem };
+    } else {
+      healed.push(menuItem);
+    }
+  } else if (menuItem) {
+    healed.push(menuItem);
+  }
+  return healed;
+}
+
+var upsertMenuItem_1 = { upsertMenuItem: upsertMenuItem$1 };
+
 const { app: app$5 } = require$$0$1;
 const path$7 = require$$1$2;
 const { writeFileSync } = require$$0$2;
 const { getFileContents: getFileContents$2 } = file;
+const { upsertMenuItem } = upsertMenuItem_1;
 
 const configFilename$1 = "menuItems.json";
 const appName$2 = "Dashboard";
@@ -30840,38 +30903,20 @@ const appName$2 = "Dashboard";
 const menuItemsController$1 = {
   saveMenuItemForApplication: (win, appId, menuItem) => {
     try {
-      // filename to the pages file (live pages)
       const filename = path$7.join(
         app$5.getPath("userData"),
         appName$2,
         appId,
         configFilename$1,
       );
-      const menuItemsArray = getFileContents$2(filename);
-
-      menuItemsArray.filter((mi) => mi !== null);
-
-      // add the menuItems object to the file
-      menuItemsArray.push(menuItem);
-
-      // write the new pages configuration back to the file
-      writeFileSync(filename, JSON.stringify(menuItemsArray, null, 2));
-
+      const raw = getFileContents$2(filename) || [];
+      const deduped = upsertMenuItem(raw, menuItem);
+      writeFileSync(filename, JSON.stringify(deduped, null, 2));
       console.log("[menuItemsController] Menu item saved successfully");
-
-      // Return the data for ipcMain.handle() - modern promise-based approach
-      return {
-        menuItems: menuItemsArray,
-        success: true,
-      };
+      return { menuItems: deduped, success: true };
     } catch (e) {
       console.error("[menuItemsController] Error saving menu item:", e);
-      // Return error object with empty menu items array
-      return {
-        error: true,
-        message: e.message,
-        menuItems: [],
-      };
+      return { error: true, message: e.message, menuItems: [] };
     }
   },
 
@@ -66597,6 +66642,7 @@ async function installDashboardFromRegistry$1(
   appId,
   packageName,
   widgetRegistry = null,
+  installOptions = {},
 ) {
   try {
     // 1. Look up the dashboard package in the registry
@@ -66763,7 +66809,9 @@ async function installDashboardFromRegistry$1(
       };
     }
 
-    // 6. Delegate to shared import pipeline
+    // 6. Delegate to shared import pipeline. User overrides (name /
+    // menuId from the install-time options modal) are forwarded so
+    // the workspace is named + filed where the user wants it.
     return await processDashboardConfig(
       win,
       appId,
@@ -66773,6 +66821,9 @@ async function installDashboardFromRegistry$1(
         source: "registry",
         registryPackage: packageName,
         installedVersion: registryPkg.version || null,
+        name: installOptions.name,
+        menuId: installOptions.menuId,
+        themeKey: installOptions.themeKey,
       },
     );
   } catch (error) {
@@ -76386,12 +76437,19 @@ const dashboardConfigApi$2 = {
    *
    * @param {string} appId - Application identifier
    * @param {string} packageName - Registry package name
+   * @param {Object} [options]
+   * @param {string} [options.name] - Override the workspace name
+   *   (defaults to the publisher's name). Does NOT change the
+   *   published scope.
+   * @param {string|number} [options.menuId] - Override the destination
+   *   folder. Defaults to the publisher's menuId.
    * @returns {Promise<Object>} Result with success, workspace, and summary
    */
-  installDashboardFromRegistry: (appId, packageName) =>
+  installDashboardFromRegistry: (appId, packageName, options = {}) =>
     ipcRenderer$9.invoke(DASHBOARD_CONFIG_INSTALL, {
       appId,
       packageName,
+      options,
     }),
 
   /**