From 33ebe2da8e81476be62a2567d5012573a8a010b6 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Fri, 24 Feb 2023 18:49:06 +0100
Subject: [PATCH] fix(frontend): wip

---
 .../lib/components/apps/editor/appUtils.ts    | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/components/apps/editor/appUtils.ts b/frontend/src/lib/components/apps/editor/appUtils.ts
index 100883b18a..42385872d1 100644
--- a/frontend/src/lib/components/apps/editor/appUtils.ts
+++ b/frontend/src/lib/components/apps/editor/appUtils.ts
@@ -38,11 +38,19 @@ export function findGridItem(app: App, id: string): GridItem | undefined {
 }
 
 export function getNextGridItemId(app: App): string {
-	const all: string[] = []
+	const subgridsKeys = app.subgrids ? Object.keys(app.subgrids) : []
 
-	const newArr = all.map((element) => element.split('-')[0])
-	const k: string[] = [...new Set(newArr)]
-	const id = getNextId(k)
+	const newArr = subgridsKeys.map((element) => {
+		const matches = element.match(/^([a-z]+)-\d+$/i)
+		if (matches) {
+			return matches[1]
+		}
+		return element
+	})
+
+	const uniqueArr = [...new Set(newArr)]
+	const mainGridItemsIds = app.grid.map((item) => item.id)
+	const id = getNextId([...mainGridItemsIds, ...uniqueArr])
 
 	return id
 }
@@ -117,9 +125,10 @@ export function insertNewGridItem(
 	return id
 }
 
-
-
-export function getAllSubgridsAndComponentIds(app: App, component: AppComponent): [string[], string[]] {
+export function getAllSubgridsAndComponentIds(
+	app: App,
+	component: AppComponent
+): [string[], string[]] {
 	const subgrids: string[] = []
 	let components: string[] = [component.id]
 	if (app.subgrids && component.numberOfSubgrids) {
@@ -137,7 +146,11 @@ export function getAllSubgridsAndComponentIds(app: App, component: AppComponent)
 	return [subgrids, components]
 }
 
-export function deleteGridItem(app: App, component: AppComponent, parent: string | undefined): string[] {
+export function deleteGridItem(
+	app: App,
+	component: AppComponent,
+	parent: string | undefined
+): string[] {
 	let [subgrids, components] = getAllSubgridsAndComponentIds(app, component)
 	if (app.subgrids) {
 		subgrids.forEach((id) => {
@@ -158,7 +171,6 @@ export function deleteGridItem(app: App, component: AppComponent, parent: string
 	}
 
 	return components
-
 }
 
 export function duplicateGridItem(