From c84f92f65c0f44bba201791bc1da9c8e22644eb9 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 24 Feb 2023 07:27:22 +0100 Subject: [PATCH] fix subgrids final --- frontend/src/lib/components/AppConnect.svelte | 4 +- frontend/src/lib/components/Path.svelte | 19 +- .../src/lib/components/ResourceEditor.svelte | 2 +- .../src/lib/components/ScheduleEditor.svelte | 2 +- .../src/lib/components/ScriptBuilder.svelte | 2 +- .../src/lib/components/VariableEditor.svelte | 2 +- .../apps/components/layout/AppTabs.svelte | 2 +- .../apps/editor/AppEditorHeader.svelte | 2 +- .../apps/editor/settingsPanel/GridTab.svelte | 26 +- .../editor/settingsPanel/TableActions.svelte | 23 +- frontend/src/lib/components/apps/utils.ts | 5 +- .../flows/content/FlowSettings.svelte | 7 +- .../components/random_positive_adjetive.ts | 962 ++++++++++++++++++ 13 files changed, 1018 insertions(+), 40 deletions(-) create mode 100644 frontend/src/lib/components/random_positive_adjetive.ts diff --git a/frontend/src/lib/components/AppConnect.svelte b/frontend/src/lib/components/AppConnect.svelte index cdc87ff074..77dd9c0414 100644 --- a/frontend/src/lib/components/AppConnect.svelte +++ b/frontend/src/lib/components/AppConnect.svelte @@ -396,7 +396,7 @@ bind:error={pathError} bind:path initialPath="" - namePlaceholder="my_{resource_type}" + namePlaceholder="{resource_type}" kind="resource" /> @@ -433,7 +433,7 @@ {:else} diff --git a/frontend/src/lib/components/ScheduleEditor.svelte b/frontend/src/lib/components/ScheduleEditor.svelte index d71d7c3ae8..3f4847f048 100644 --- a/frontend/src/lib/components/ScheduleEditor.svelte +++ b/frontend/src/lib/components/ScheduleEditor.svelte @@ -180,7 +180,7 @@ bind:error={pathError} bind:path {initialPath} - namePlaceholder={'my_schedule'} + namePlaceholder="schedule" kind="schedule" />
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index 5e919e6732..539295c6ea 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -204,7 +204,7 @@ bind:path={script.path} {initialPath} on:enter={() => changeStep(2)} - namePlaceholder="my_script" + namePlaceholder="script" kind="script" />

Summary

diff --git a/frontend/src/lib/components/VariableEditor.svelte b/frontend/src/lib/components/VariableEditor.svelte index 7e768d6393..dbbedb9a03 100644 --- a/frontend/src/lib/components/VariableEditor.svelte +++ b/frontend/src/lib/components/VariableEditor.svelte @@ -148,7 +148,7 @@ bind:error={pathError} bind:path {initialPath} - namePlaceholder="my_variable" + namePlaceholder="variable" kind="variable" />
diff --git a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte index a9c01a1daf..47ea2e333a 100644 --- a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte +++ b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte @@ -23,7 +23,7 @@ $: selectedIndex = tabs?.indexOf(selected) ?? -1 - $: if (tabs && selected === '') { + $: if ((tabs && selected === '') || !tabs.includes(selected)) { selected = tabs[0] } diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte index 793ec8507c..d81a9eccf4 100644 --- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte @@ -241,7 +241,7 @@ bind:error={pathError} bind:path={newPath} initialPath="" - namePlaceholder="my_app" + namePlaceholder="app" kind="app" /> diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte index d7377a6adc..eeb28aa999 100644 --- a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte +++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte @@ -9,7 +9,7 @@ export let tabs: string[] export let subGrids: GridItem[][] - const { runnableComponents, staticOutputs, app } = + const { runnableComponents, staticOutputs, app, focusedGrid } = getContext('AppEditorContext') function addTab() { @@ -18,6 +18,7 @@ } function deleteSubgrid(index: number) { + $focusedGrid = undefined subGrids[index].forEach((x) => { deleteComponent(undefined, x.data, $app, $staticOutputs, $runnableComponents) }) @@ -25,22 +26,13 @@ subGrids.splice(index, 1) tabs = tabs subGrids = subGrids - $app = $app + $app.grid = $app.grid + $staticOutputs = $staticOutputs + $runnableComponents = $runnableComponents } 0 ? `(${tabs.length})` : ''}`}> - - -
- -
- - {component.id} - {/each} +
+
diff --git a/frontend/src/lib/components/apps/utils.ts b/frontend/src/lib/components/apps/utils.ts index 48621ebd99..f2658caf5f 100644 --- a/frontend/src/lib/components/apps/utils.ts +++ b/frontend/src/lib/components/apps/utils.ts @@ -20,13 +20,14 @@ export function deleteComponent(parentItems: GridItem[] | undefined, component: (component.subGrids ?? []).forEach((subgrid) => { if (subgrid) { subgrid.forEach((item) => { + console.log(item) if (item.data) { + console.log(item.data) deleteComponent(undefined, item.data, app, staticOutputs, runnableComponents) } }) } }) - if (parentItems) { let index = parentItems.findIndex((item) => item.data?.id === component.id) if (index != -1) { @@ -345,7 +346,7 @@ export function createNewGridItem(grid: GridItem[], id: string, data: AppCompone export function recursiveGetIds(gridItem: GridItem): string[] { const subGrids = gridItem.data.subGrids ?? [] const subGridIds = subGrids - .map((subGrid: GridItem[]) => subGrid.map(recursiveGetIds)) + .map((subGrid: GridItem[]) => subGrid?.map(recursiveGetIds) ?? []) .flat(Infinity) return [gridItem.data.id, ...subGridIds] } diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte index 559accf4f0..832f18f7fd 100644 --- a/frontend/src/lib/components/flows/content/FlowSettings.svelte +++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte @@ -42,12 +42,7 @@
- +