@trops/dash-core 0.1.353 → 0.1.354

package/dist/index.js

@@ -53729,13 +53729,27 @@ var WidgetPopoutInner = function WidgetPopoutInner(_ref2) {
         }
         setWorkspace(target);
 
-        // `widgetId` carries the layout item's uuid (globally unique
-        // across pages/containers) but older callers may still pass a
-        // bare numeric id. Match uuid first, then fall back to id.
-        // Without the uuid match, widgets on a non-first page get
-        // masked by same-numeric-id widgets in the main layout.
+        // `widgetId` carries the layout item's uuid. That uuid is
+        //   `${dashboardId}-${component}-${id}`
+        // but the dashboardId prefix can differ between the main
+        // window's LayoutModel instance and the one rebuilt here,
+        // so we match on several shapes to be robust:
+        //
+        //   1. full uuid match (preferred)
+        //   2. trailing `component-id` suffix (strip dashboardId)
+        //   3. bare numeric id (legacy callers that pre-date uuid)
+        //
+        // Extract the suffix once: everything after the first "-"
+        // when the string starts with a dashboard-looking prefix.
+        var tail = String(widgetId).split("-").slice(-2).join("-");
         var matches = function matches(item) {
-          return item.uuid === widgetId || item.id === widgetId;
+          if (item.uuid === widgetId) return true;
+          if (item.uuid && item.uuid.endsWith("-" + tail)) return true;
+          var itemTail = "".concat(item.component, "-").concat(item.id);
+          if (itemTail === widgetId) return true;
+          if (itemTail === tail) return true;
+          if (item.id === widgetId) return true;
+          return false;
         };
         var widget = target.layout.find(matches);
         if (!widget && target.pages && Array.isArray(target.pages)) {
@@ -53759,6 +53773,38 @@ var WidgetPopoutInner = function WidgetPopoutInner(_ref2) {
           widget = target.sidebarLayout.find(matches);
         }
         if (!widget) {
+          // Diagnostic dump — helps pinpoint id/uuid mismatches when
+          // the user reports a "Widget not available" popout.
+          var dump = {
+            searchedFor: widgetId,
+            suffix: tail,
+            mainLayout: (target.layout || []).map(function (i) {
+              return {
+                id: i.id,
+                uuid: i.uuid,
+                component: i.component
+              };
+            }),
+            pages: (target.pages || []).map(function (p) {
+              return {
+                pageId: p.id,
+                items: (p.layout || []).map(function (i) {
+                  return {
+                    id: i.id,
+                    uuid: i.uuid,
+                    component: i.component
+                  };
+                })
+              };
+            }),
+            sidebar: (target.sidebarLayout || []).map(function (i) {
+              return {
+                id: i.id,
+                uuid: i.uuid,
+                component: i.component
+              };
+            })
+          };
           setError("Widget not found in workspace");
           return;
         }