improve oneOf handling

windmill-labs · Dec 19, 2024 · d45cdf8 · d45cdf8
1 parent cfd93a3
commit d45cdf8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
@@ -658,11 +658,11 @@
 					<div class="flex flex-col gap-2 w-full">
 						{#if oneOf && oneOf.length >= 2}
 							<ToggleButtonGroup
+								bind:selected={oneOfSelected}
 								on:selected={() => {
-									value = {}
+									value = { label: oneOfSelected }
 									redraw += 1
 								}}
-								bind:selected={oneOfSelected}
 							>
 								{#each oneOf as obj}
 									<ToggleButton value={obj.title} label={obj.title} />
@@ -680,10 +680,8 @@
 													{disablePortal}
 													{disabled}
 													schema={{
-														properties: Object.fromEntries(
-															Object.entries(obj.properties).filter(([k, v]) => k !== 'label')
-														),
-														order: obj.order?.filter((k) => k !== 'label') ?? undefined,
+														properties: obj.properties,
+														order: obj.order,
 														$schema: '',
 														required: obj.required ?? [],
 														type: 'object'
@@ -703,11 +701,10 @@
 													{onlyMaskPassword}
 													{disablePortal}
 													{disabled}
+													schemaSkippedValues={['label']}
 													schema={{
-														properties: Object.fromEntries(
-															Object.entries(obj.properties).filter(([k, v]) => k !== 'label')
-														),
-														order: obj.order?.filter((k) => k !== 'label') ?? undefined,
+														properties: obj.properties,
+														order: obj.order,
 														$schema: '',
 														required: obj.required ?? [],
 														type: 'object'

diff --git a/frontend/src/lib/components/schema/SchemaFormDND.svelte b/frontend/src/lib/components/schema/SchemaFormDND.svelte
@@ -14,6 +14,7 @@
 	export let onlyMaskPassword: boolean = false
 	export let disablePortal: boolean = false
 	export let disabled: boolean = false
+	export let schemaSkippedValues: string[] = []
 
 	const dispatch = createEventDispatcher()
 	const flipDurationMs = 200
@@ -65,6 +66,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
 <SchemaForm
+	{schemaSkippedValues}
 	on:click
 	on:change
 	on:reorder