@trops/dash-core 0.1.230 → 0.1.231

package/dist/index.js

@@ -6277,7 +6277,7 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
 
   // --- Create logic (DASH-191: moved above useEffect so ref captures actual function) ---
   var handleCreate = React.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _state$customization, name, menuId, theme, result, _window$mainApi, installResult, updatedWorkspace, _window$mainApi2, template, layoutObj, widgetOrder, cells, _loop, i, workspace, _t;
+    var _state$customization, name, menuId, theme, result, _window$mainApi, installResult, updatedWorkspace, _window$mainApi2, template, layoutObj, widgetOrder, cells, widgetItems, nextId, _loop, i, fullLayout, workspace, _t;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -6344,13 +6344,15 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
           }
           throw new Error("No layout template selected.");
         case 8:
-          layoutObj = createLayoutFromTemplate(template, menuId || 1); // Place widgets into grid cells
+          layoutObj = createLayoutFromTemplate(template, menuId || 1); // Place widgets into grid cells as proper layout items
           widgetOrder = state.layout.widgetOrder || [];
           cells = template.cells.filter(function (c) {
             return !c.hide;
           });
+          widgetItems = [];
+          nextId = 2; // grid container is ID 1
           _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop(i) {
-            var widget;
+            var widget, widgetKey;
             return _regeneratorRuntime.wrap(function (_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -6358,7 +6360,18 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
                     return (w.name || w.key) === widgetOrder[i];
                   });
                   if (widget && layoutObj.grid[cells[i].key]) {
-                    layoutObj.grid[cells[i].key].component = widget.component || widget.name || widget.key;
+                    widgetKey = widget.component || widget.name || widget.key;
+                    widgetItems.push({
+                      id: nextId,
+                      component: widgetKey,
+                      parent: 1,
+                      order: i + 1,
+                      hasChildren: 0,
+                      scrollable: true,
+                      workspace: "layout"
+                    });
+                    layoutObj.grid[cells[i].key].component = nextId;
+                    nextId++;
                   }
                 case 1:
                 case "end":
@@ -6378,12 +6391,13 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
           _context2.next = 9;
           break;
         case 11:
+          fullLayout = [layoutObj].concat(widgetItems);
           if (!onCreateWorkspace) {
             _context2.next = 13;
             break;
           }
           _context2.next = 12;
-          return onCreateWorkspace(layoutObj, theme, name.trim());
+          return onCreateWorkspace(fullLayout, theme, name.trim());
         case 12:
           result = _context2.sent;
           _context2.next = 15;
@@ -6397,7 +6411,7 @@ var WizardCustomizeStep = function WizardCustomizeStep(_ref) {
             name: name.trim(),
             menuId: menuId || 1,
             themeKey: theme,
-            layout: [layoutObj]
+            layout: fullLayout
           };
           _context2.next = 14;
           return window.mainApi.workspace.saveWorkspaceForApplication(appId, workspace);
@@ -48111,14 +48125,15 @@ var DashboardStageInner = function DashboardStageInner(_ref2) {
   function handleClickNewFromEmpty() {
     setIsLayoutPickerOpen(true);
   }
-  function handleCreateFromTemplate(layoutObj) {
+  function handleCreateFromTemplate(layoutObjOrArray) {
     var themeKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var name = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     try {
+      var layout = Array.isArray(layoutObjOrArray) ? layoutObjOrArray : [layoutObjOrArray];
       var newWorkspace = WorkspaceModel({
-        layout: [layoutObj],
+        layout: layout,
         themeKey: themeKey,
-        menuId: layoutObj.menuId,
+        menuId: layout[0].menuId,
         name: name || undefined
       });
       handleOpenTab(newWorkspace);