kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(frontend): Fix next id

Browse Source
This commit is contained in:
Faton Ramadani
2023-02-24 18:51:50 +01:00
committed by Ruben Fiszel
parent e85322ea6b
commit 04cdc6dcc9
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/lib/components/apps/editor/appUtils.ts
View File

@@ -3,6 +3,7 @@ import type { App, FocusedGrid, GridItem } from '../types'
import { Component, getRecommendedDimensionsByComponent, type AppComponent } from './component'
import gridHelp from '@windmill-labs/svelte-grid/src/utils/helper'
import { gridColumns } from '../gridUtils'
import { allItems } from '../utils'
function findGridItemById(
root: GridItem[],
@@ -38,19 +39,9 @@ export function findGridItem(app: App, id: string): GridItem | undefined {
}
export function getNextGridItemId(app: App): string {
const subgridsKeys = app.subgrids ? Object.keys(app.subgrids) : []
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])
const subgridsKeys = allItems(app.grid, app.subgrids).map((x) => x.id)
const withoutDash = subgridsKeys.map((element) => element.split('-')[0])
const id = getNextId([...new Set(withoutDash)])
return id
}