diff --git a/frontend/src/global.d.ts b/frontend/src/global.d.ts index 05d64563a0..e6cd83aeb2 100644 --- a/frontend/src/global.d.ts +++ b/frontend/src/global.d.ts @@ -37,7 +37,7 @@ declare module 'svelte-grid' { export interface Props { fillSpace?: boolean - items: FilledItem[] + items: FilledItem[], rowHeight: number cols: [number, number][] gap?: [number, number] @@ -59,7 +59,7 @@ declare module 'svelte-grid' { pointerup: CustomEvent<{ id: string }> }, Slots - > {} + > { } } declare module 'svelte-grid/build/helper/index.mjs' { diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte index d644272bb1..cc0c1c90f8 100644 --- a/frontend/src/lib/components/InputTransformForm.svelte +++ b/frontend/src/lib/components/InputTransformForm.svelte @@ -27,6 +27,7 @@ export let pickForField: string | undefined = undefined export let variableEditor: VariableEditor | undefined = undefined export let itemPicker: ItemPicker | undefined = undefined + export let noVariablePicker = false let monaco: SimpleEditor | undefined = undefined let monacoTemplate: TemplateEditor | undefined = undefined diff --git a/frontend/src/lib/components/SchemaEditor.svelte b/frontend/src/lib/components/SchemaEditor.svelte index 896ce5d10b..00781a782f 100644 --- a/frontend/src/lib/components/SchemaEditor.svelte +++ b/frontend/src/lib/components/SchemaEditor.svelte @@ -16,6 +16,9 @@ const dispatch = createEventDispatcher() export let schema: Schema = emptySchema() + if (!schema) { + schema = emptySchema() + } let schemaModal: SchemaModal let schemaString: string = '' diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte index 794069eaf9..18950c3e13 100644 --- a/frontend/src/lib/components/SchemaForm.svelte +++ b/frontend/src/lib/components/SchemaForm.svelte @@ -25,6 +25,7 @@ export let shouldHideNoInputs: boolean = false export let compact = false export let password: string | undefined = undefined + export let noVariablePicker = false let clazz: string = '' export { clazz as class } @@ -48,8 +49,8 @@ $: schema?.properties && removeExtraKey() let pickForField: string | undefined - let itemPicker: ItemPicker - let variableEditor: VariableEditor + let itemPicker: ItemPicker | undefined = undefined + let variableEditor: VariableEditor | undefined = undefined
@@ -66,6 +67,7 @@ bind:extraLib {variableEditor} {itemPicker} + {noVariablePicker} bind:pickForField /> {:else if typeof args == 'object'} @@ -102,40 +104,42 @@ {/if}
- { - if (pickForField) { - if (inputTransform) { - args[pickForField].value = '$var:' + path - } else { - args[pickForField] = '$var:' + path +{#if !noVariablePicker} + { + if (pickForField) { + if (inputTransform) { + args[pickForField].value = '$var:' + path + } else { + args[pickForField] = '$var:' + path + } } - } - }} - itemName="Variable" - extraField="name" - loadItems={async () => - (await VariableService.listVariable({ workspace: $workspaceStore ?? '' })).map((x) => ({ - name: x.path, - ...x - }))} -> -
+ (await VariableService.listVariable({ workspace: $workspaceStore ?? '' })).map((x) => ({ + name: x.path, + ...x + }))} > - -
-
+ + +
- + +{/if} diff --git a/frontend/src/lib/components/TestJobLoader.svelte b/frontend/src/lib/components/TestJobLoader.svelte index fb9ad68611..cf23bbdef3 100644 --- a/frontend/src/lib/components/TestJobLoader.svelte +++ b/frontend/src/lib/components/TestJobLoader.svelte @@ -162,7 +162,7 @@ notfound = false } catch (err) { intervalId && clearIntervalAsync(intervalId!) - isLoading = false + clearCurrentJob() if (err.status === 404) { notfound = true } diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte index c881f83bfc..16df3cd3e2 100644 --- a/frontend/src/lib/components/Toggle.svelte +++ b/frontend/src/lib/components/Toggle.svelte @@ -1,4 +1,5 @@ - -