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

fix delete tab subgrid

Browse Source
This commit is contained in:
Ruben Fiszel
2023-06-18 16:07:48 +02:00
parent 1d4afeeced
commit fd267cd70e
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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]
})

2
frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte
View File

@@ -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]
}

2
frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
View File

@@ -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]
}

3
frontend/src/lib/components/apps/editor/settingsPanel/GridPane.svelte
View File

@@ -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]
}

4
frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
View File

@@ -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
}