From 549bf0d13ae9deda5b4e45a2fb240e443534dc01 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 18 Jun 2023 16:07:48 +0200
Subject: [PATCH] fix delete tab subgrid

---
 frontend/src/lib/components/apps/editor/appUtils.ts          | 5 ++---
 .../apps/editor/settingsPanel/ComponentPanel.svelte          | 2 +-
 .../apps/editor/settingsPanel/GridCondition.svelte           | 2 +-
 .../lib/components/apps/editor/settingsPanel/GridPane.svelte | 3 +--
 .../lib/components/apps/editor/settingsPanel/GridTab.svelte  | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/components/apps/editor/appUtils.ts b/frontend/src/lib/components/apps/editor/appUtils.ts
index 135bde2c22..bb748a3714 100644
--- a/frontend/src/lib/components/apps/editor/appUtils.ts
+++ b/frontend/src/lib/components/apps/editor/appUtils.ts
@@ -325,11 +325,10 @@ export function getAllSubgridsAndComponentIds(
 export function deleteGridItem(
 	app: App,
 	component: AppComponent,
-	parent: string | undefined,
-	shouldKeepSubGrid: boolean
+	parent: string | undefined
 ): string[] {
 	let [subgrids, components] = getAllSubgridsAndComponentIds(app, component)
-	if (app.subgrids && !shouldKeepSubGrid) {
+	if (app.subgrids) {
 		subgrids.forEach((id) => {
 			delete app.subgrids![id]
 		})
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
index 4d3dfea1a1..4ea54f5235 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
@@ -77,7 +77,7 @@
 		$selectedComponent = undefined
 		$focusedGrid = undefined
 		if (componentSettings?.item && !noGrid) {
-			let ids = deleteGridItem($app, componentSettings?.item.data, componentSettings?.parent, false)
+			let ids = deleteGridItem($app, componentSettings?.item.data, componentSettings?.parent)
 			for (const key of ids) {
 				delete $runnableComponents[key]
 			}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
index 8381794b24..7f93d0c945 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
@@ -79,7 +79,7 @@
 	function deleteSubgrid(index: number) {
 		let subgrid = `${component.id}-${index}`
 		for (const item of $app!.subgrids![subgrid]) {
-			const components = deleteGridItem($app, item.data, subgrid, false)
+			const components = deleteGridItem($app, item.data, subgrid)
 			for (const key in components) {
 				delete $runnableComponents[key]
 			}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridPane.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridPane.svelte
index a158f200bb..1f44393e1c 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridPane.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridPane.svelte
@@ -29,8 +29,7 @@
 	function deleteSubgrid(index: number) {
 		let subgrid = `${component.id}-${index}`
 		for (const item of $app!.subgrids![subgrid]) {
-			const components = deleteGridItem($app, item.data, subgrid, false)
-			console.log(components)
+			const components = deleteGridItem($app, item.data, subgrid)
 			for (const key in components) {
 				delete $runnableComponents[key]
 			}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
index f646d632c9..fde6f20d6f 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
@@ -63,7 +63,7 @@
 	function deleteSubgrid(index: number) {
 		let subgrid = `${component.id}-${index}`
 		for (const item of $app!.subgrids![subgrid]) {
-			const components = deleteGridItem($app, item.data, subgrid, false)
+			const components = deleteGridItem($app, item.data, subgrid)
 			for (const key in components) {
 				delete $runnableComponents[key]
 			}
@@ -87,7 +87,7 @@
 		})
 		items = items
 
-		delete $app!.subgrids![items.length]
+		delete $app!.subgrids![`${component.id}-${items.length}`]
 		$app = $app
 	}