windmill-components 1.511.1 → 1.531.0

package/package/components/apps/editor/appUtils.js

@@ -1,6 +1,6 @@
 import { ccomponents, components, getRecommendedDimensionsByComponent } from './component';
 import { gridColumns } from '../gridUtils';
-import { allItems } from '../utils';
+import { allItems, processSubcomponents } from '../utils';
 import { get } from 'svelte/store';
 import { deepMergeWithPriority } from '../../../utils';
 import { sendUserToast } from '../../../toast';
@@ -453,43 +453,11 @@ export function copyComponent(app, item, parentGrid, subgrids, alreadyVisited) {
         alreadyVisited.push(item.id);
     }
     const newItem = insertNewGridItem(app, (id) => {
-        if (item.data.type === 'tablecomponent') {
-            return {
-                ...item.data,
-                id,
-                actionButtons: item.data.actionButtons.map((x) => ({
-                    ...x,
-                    id: x.id.replace(`${item.id}_`, `${id}_`)
-                })) ?? []
-            };
-        }
-        else if (item.data.type === 'aggridcomponent' ||
-            item.data.type === 'aggridcomponentee' ||
-            item.data.type === 'dbexplorercomponent' ||
-            item.data.type === 'aggridinfinitecomponent' ||
-            item.data.type === 'aggridinfinitecomponentee') {
-            return {
-                ...item.data,
-                id,
-                actionButtons: (item.data.actions ?? []).map((x) => ({
-                    ...x,
-                    id: x.id.replace(`${item.id}_`, `${id}_`)
-                })) ?? []
-            };
-        }
-        else if (item.data.type === 'menucomponent') {
-            return {
-                ...item.data,
-                id,
-                menuItems: item.data.menuItems.map((x) => ({
-                    ...x,
-                    id: x.id.replace(`${item.id}_`, `${id}_`)
-                })) ?? []
-            };
-        }
-        else {
-            return { ...item.data, id };
-        }
+        let newComponent = { ...item.data, id };
+        processSubcomponents(newComponent, (c) => {
+            c.id = c.id.replace(item.id + '_', id + '_');
+        });
+        return newComponent;
     }, parentGrid, Object.fromEntries(gridColumns.map((column) => [column, item[column]])));
     for (let i = 0; i < (item?.data?.numberOfSubgrids ?? 0); i++) {
         subgrids[`${item.id}-${i}`].forEach((subgridItem) => {
@@ -501,19 +469,9 @@ export function copyComponent(app, item, parentGrid, subgrids, alreadyVisited) {
 export function getAllSubgridsAndComponentIds(app, component) {
     const subgrids = [];
     let components = [component.id];
-    if (component.type === 'tablecomponent') {
-        components.push(...component.actionButtons?.map((x) => x.id));
-    }
-    if (component.type === 'aggridcomponent' ||
-        component.type === 'aggridcomponentee' ||
-        component.type === 'dbexplorercomponent' ||
-        component.type === 'aggridinfinitecomponent' ||
-        component.type === 'aggridinfinitecomponentee') {
-        components.push(...(component.actions?.map((x) => x.id) ?? []));
-    }
-    if (component.type === 'menucomponent') {
-        components.push(...component.menuItems?.map((x) => x.id));
-    }
+    processSubcomponents(component, (c) => {
+        components.push(c.id);
+    });
     if (app.subgrids && component.numberOfSubgrids) {
         for (let i = 0; i < component.numberOfSubgrids; i++) {
             const key = `${component.id}-${i}`;
@@ -534,21 +492,11 @@ export function getAllGridItems(app) {
     return app.grid
         .concat(Object.values(app.subgrids ?? {}).flat())
         .map((x) => {
-        if (x?.data?.type === 'tablecomponent') {
-            return [x, ...x?.data?.actionButtons?.map((x) => ({ data: x, id: x.id }))];
-        }
-        else if ((x?.data?.type === 'aggridcomponent' ||
-            x?.data?.type === 'aggridcomponentee' ||
-            x?.data?.type === 'dbexplorercomponent' ||
-            x?.data?.type === 'aggridinfinitecomponent' ||
-            x?.data?.type === 'aggridinfinitecomponentee') &&
-            Array.isArray(x?.data?.actions)) {
-            return [x, ...x?.data?.actions?.map((x) => ({ data: x, id: x.id }))];
-        }
-        else if (x?.data?.type === 'menucomponent') {
-            return [x, ...x?.data?.menuItems?.map((x) => ({ data: x, id: x.id }))];
-        }
-        return [x];
+        let r = [];
+        processSubcomponents(x.data, (c) => {
+            r.push({ data: c, id: c.id });
+        });
+        return [x, ...r];
     })
         .flat();
 }
@@ -929,10 +877,11 @@ export function isContainer(type) {
 export function subGridIndexKey(type, id, world) {
     switch (type) {
         case 'containercomponent':
-        case 'verticalsplitpanescomponent':
-        case 'horizontalsplitpanescomponent':
         case 'listcomponent':
             return 0;
+        case 'verticalsplitpanescomponent':
+        case 'horizontalsplitpanescomponent':
+            return world?.outputsById?.[id]?.selectedPaneIndex?.peak() ?? 0;
         case 'tabscomponent': {
             return world?.outputsById?.[id]?.selectedTabIndex?.peak() ?? 0;
         }