Merge pull request #1549 from merico-dev/1548-when-deleting-a-view-it…

…s-panels-are-deleted-but-not-their-layouts

1548 when deleting a view its panels are deleted but not their layouts

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "13.42.3",
+  "version": "13.42.4",
   "description": "",
   "main": "index.js",
   "scripts": {

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "13.42.3",
+  "version": "13.42.4",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

dashboard/src/dashboard-editor/model/layouts/layouts.ts

@@ -52,6 +52,11 @@ export const LayoutsModel = types
         layoutSet.removeByPanelID(panelID);
       });
     },
+    removeByPanelIDs(panelIDs: string[]) {
+      self.list.forEach((layoutSet) => {
+        layoutSet.removeByPanelIDs(panelIDs);
+      });
+    },
     setCurrentLayoutWrapperWidth(v: number) {
       self.currentLayoutWrapperWidth = v;
     },

dashboard/src/dashboard-editor/model/views/index.ts

@@ -5,6 +5,7 @@ import { PanelsModelInstance } from '../panels';
 
 import { ViewDivisionConfigSnapshotIn, ViewMetaInstance, ViewModalConfigSnapshotIn } from '~/model';
 import { ViewModel, ViewModelInstance } from './view';
+import { LayoutsModelInstance } from '../layouts';
 
 export const ViewsModel = types
   .compose(
@@ -45,13 +46,20 @@ export const ViewsModel = types
           } as const),
       );
     },
+    get contentModel() {
+      // @ts-expect-error getRoot type, reading panels
+      return getRoot(self).content;
+    },
   }))
   .actions((self) => ({
     setIDOfVIE(id: string) {
       self.idOfVIE = id;
       self.visibleViewIDs.length = 0;
       self.visibleViewIDs.push(id);
     },
+    resetIDOfVIE() {
+      this.setIDOfVIE(self.current[0].id);
+    },
     replace(current: Array<ViewRenderModelInstance>) {
       self.current.replace(current);
     },
@@ -88,11 +96,13 @@ export const ViewsModel = types
         return;
       }
       const view = self.current[index];
-      // @ts-expect-error getRoot type, reading panels
-      const panels: PanelsModelInstance = getRoot(self).content.panels;
+      const panels: PanelsModelInstance = self.contentModel.panels;
+      const layouts: LayoutsModelInstance = self.contentModel.layouts;
 
       panels.removeByIDs(view.panelIDs);
+      layouts.removeByPanelIDs(view.panelIDs);
       self.current.splice(index, 1);
+      this.resetIDOfVIE();
     },
     replaceByIndex(index: number, replacement: ViewRenderModelInstance) {
       self.current.splice(index, 1, replacement);
@@ -109,7 +119,7 @@ export const ViewsModel = types
         return;
       }
       this.removeByID(self.idOfVIE);
-      this.setIDOfVIE(self.current[0].id);
+      this.resetIDOfVIE();
     },
   }));
 

dashboard/src/model/meta-model/dashboard/content/layout/layout-set.ts

@@ -75,6 +75,14 @@ export const LayoutSetMeta = types
         self.list.splice(i, 1);
       }
     },
+    removeByPanelIDs(panelIDs: string[]) {
+      while (panelIDs.length > 0) {
+        const id = panelIDs.pop();
+        if (id) {
+          this.removeByPanelID(id);
+        }
+      }
+    },
     updateLayoutItem(item: Layout) {
       const layoutItem = self.list.find((o) => o.id === item.i);
       if (!layoutItem) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "13.42.3",
+  "version": "13.42.4",
   "private": true,
   "workspaces": [
     "api",

settings-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "13.42.3",
+  "version": "13.42.4",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

website/package.json

@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "13.42.3",
+  "version": "13.42.4",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"