mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-22 00:02:38 +00:00
* perf(dynselect): only retrigger when helper-script args actually change Parse the inline helper's signature with the existing WASM parser and restrict the form-arg diff to keys the helper actually consumes. Typing into unrelated fields no longer queues a dynselect job every second. Falls back to the previous full-args comparison when the helper is deployed or parsing fails. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(dynselect): avoid double helper-script fetch on mount usePromise defaults to loadInit=true, so refresh() ran before the JobLoader child was bound (firing a no-op pending promise) and the $effect then fired a second refresh once the bind:this resolved. Disable loadInit so the effect owns the single first call. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(dynselect): use parser directly instead of inferArgs inferArgs mutates a Schema object we never use and goes through a shared cache; when fed an empty schema for non-main entrypoints the caller cannot reliably read back the resulting properties. Add parseEntrypointArgs that just runs the parser and returns the parameter name Set (or undefined when unknown / unsupported / has rest args / function not found). DynamicInput uses that and keeps the previous params in flight while the next parse is computing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(dynselect): support deployed helpers in smart retrigger Add getHelperEntrypointArgs which dispatches on HelperScript.source: inline parses immediately; deployed fetches the script (or the flow's inline dyn-select code) once and caches per (workspace, kind, path, entrypoint). Without this the /scripts/get/* run view fell back to the full-args comparison and still retriggered on unrelated fields. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(dynselect): zero-arg helpers report empty deps, not unknown Codex review flagged that a valid zero-parameter entrypoint was being treated as "couldn't determine signature" and falling back to the full-args comparison. Distinguish "function found with no params" from "function not found" via the parser's auto_kind field — only the latter sets it, so empty args + auto_kind=null means a real zero-arg helper and we return an empty Set (no retrigger on unrelated fields). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
221 lines
6.4 KiB
Svelte
221 lines
6.4 KiB
Svelte
<script lang="ts" module>
|
|
function validSelectObject(x): string | undefined {
|
|
if (typeof x != 'object') {
|
|
return JSON.stringify(x) + ' is not an object'
|
|
}
|
|
let keys = Object.keys(x)
|
|
if (!keys.includes('value') || !keys.includes('label')) {
|
|
return JSON.stringify(x) + ' does not contain value or label field'
|
|
}
|
|
if (typeof x['label'] != 'string') {
|
|
return JSON.stringify(x) + ' label is not a string'
|
|
}
|
|
return
|
|
}
|
|
</script>
|
|
|
|
<script lang="ts">
|
|
import { usePromise } from '$lib/svelte5Utils.svelte'
|
|
import JobLoader, { type Callbacks } from './JobLoader.svelte'
|
|
import Select from './select/Select.svelte'
|
|
import MultiSelect from './select/MultiSelect.svelte'
|
|
import { safeSelectItems } from './select/utils.svelte'
|
|
import Tooltip from './Tooltip.svelte'
|
|
import { Loader2 } from 'lucide-svelte'
|
|
import { type DynamicInput } from '$lib/utils'
|
|
import { deepEqual } from 'fast-equals'
|
|
import { untrack } from 'svelte'
|
|
import { getHelperEntrypointArgs } from '$lib/infer'
|
|
|
|
interface Props {
|
|
value?: any
|
|
helperScript?: DynamicInput.HelperScript
|
|
format: string
|
|
otherArgs?: Record<string, any>
|
|
name: string
|
|
}
|
|
|
|
let { value = $bindable(), helperScript, format, otherArgs: otherArgs }: Props = $props()
|
|
|
|
let [inputType, entrypoint] = $derived(format.includes('-') ? format.split('-', 2) : [format, ''])
|
|
|
|
let isMultiple = $derived(inputType === 'dynmultiselect')
|
|
let isSelect = $derived(inputType === 'dynselect' || inputType === 'dynmultiselect')
|
|
|
|
$effect.pre(() => {
|
|
if (isMultiple && value === undefined) {
|
|
value = []
|
|
}
|
|
})
|
|
|
|
let resultJobLoader: JobLoader | undefined = $state()
|
|
// loadInit:false — the $effect below owns the first refresh once
|
|
// resultJobLoader is bound; without this the promise is kicked off twice.
|
|
let _items = usePromise(getItemsFromOptions, { clearValueOnRefresh: false, loadInit: false })
|
|
let items = $derived(_items.value)
|
|
|
|
let filterText: string = $state('')
|
|
let open: boolean = $state(false)
|
|
|
|
async function getItemsFromOptions() {
|
|
return new Promise<{ label: string; value: any }[]>((resolve, reject) => {
|
|
let cb: Callbacks = {
|
|
doneResult({ result }) {
|
|
if (!result || !Array.isArray(result)) {
|
|
if (result?.error?.message && result?.error?.name) {
|
|
reject(
|
|
`Error in ${inputType} function execution: ` +
|
|
result?.error?.name +
|
|
' - ' +
|
|
result?.error?.message
|
|
)
|
|
} else {
|
|
reject('Result was not an array but ' + JSON.stringify(result, null, 2))
|
|
}
|
|
return
|
|
}
|
|
if (result.length == 0) resolve([])
|
|
|
|
if (result.every((x) => typeof x == 'string')) {
|
|
result = result.map((x) => ({ label: x, value: x }))
|
|
} else if (result.find((x) => validSelectObject(x) != undefined)) {
|
|
reject(validSelectObject(result.find((x) => validSelectObject(x) != undefined)))
|
|
return
|
|
}
|
|
resolve(result)
|
|
},
|
|
cancel: () => reject(),
|
|
doneError({ id, error }) {
|
|
reject(error)
|
|
}
|
|
}
|
|
resultJobLoader?.runDynamicInputScript(
|
|
entrypoint,
|
|
helperScript!,
|
|
{ ...otherArgs, filterText, _ENTRYPOINT_OVERRIDE: entrypoint },
|
|
cb
|
|
)
|
|
})
|
|
}
|
|
|
|
let neverLoaded = $state(true)
|
|
|
|
$effect(() => {
|
|
if (_items.value && value !== undefined && isSelect) {
|
|
if (isMultiple && Array.isArray(value) && Array.isArray(_items.value)) {
|
|
const availableValues = new Set(_items.value.map((x) => x.value))
|
|
const filteredValue = value.filter((v) => availableValues.has(v))
|
|
if (filteredValue.length !== value.length) {
|
|
value = filteredValue
|
|
}
|
|
} else if (!isMultiple && value !== undefined) {
|
|
if (!_items.value.find((x) => x.value == value)) {
|
|
value = undefined
|
|
}
|
|
}
|
|
}
|
|
})
|
|
|
|
let lastArgs = $state.snapshot(untrack(() => otherArgs))
|
|
|
|
let timeout: number | undefined = $state()
|
|
let nargs = $state($state.snapshot(untrack(() => otherArgs)))
|
|
$effect(() => {
|
|
otherArgs
|
|
untrack(() => clearTimeout(timeout))
|
|
timeout = setTimeout(() => {
|
|
nargs = $state.snapshot(otherArgs)
|
|
}, 1000)
|
|
})
|
|
|
|
// Parameter names declared by the helper function. When known, we restrict
|
|
// the change-detection to only those keys so typing in unrelated form fields
|
|
// no longer retriggers the dynselect job. `undefined` means we couldn't
|
|
// determine the signature → fall back to a full-args comparison.
|
|
let helperParams = $state<Set<string> | undefined>(undefined)
|
|
|
|
$effect(() => {
|
|
const script = helperScript
|
|
const ep = entrypoint
|
|
if (!script) {
|
|
helperParams = undefined
|
|
return
|
|
}
|
|
let cancelled = false
|
|
void getHelperEntrypointArgs(script, ep || undefined).then((params) => {
|
|
if (!cancelled) helperParams = params
|
|
})
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
})
|
|
|
|
function filterArgs(args: Record<string, any> | undefined) {
|
|
if (!args || !helperParams) return args
|
|
const filtered: Record<string, any> = {}
|
|
for (const k of helperParams) {
|
|
if (k in args) filtered[k] = args[k]
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
$effect(() => {
|
|
;[filterText, entrypoint, helperScript]
|
|
if (
|
|
resultJobLoader &&
|
|
(open || neverLoaded || !deepEqual(filterArgs(lastArgs), filterArgs(nargs)))
|
|
) {
|
|
neverLoaded = false
|
|
lastArgs = $state.snapshot(otherArgs)
|
|
_items.refresh()
|
|
}
|
|
})
|
|
</script>
|
|
|
|
{#if helperScript}
|
|
<JobLoader onlyResult bind:this={resultJobLoader} />
|
|
|
|
<div class="w-full flex-col flex">
|
|
{#if inputType === 'dynmultiselect'}
|
|
<MultiSelect
|
|
bind:value
|
|
items={safeSelectItems(items || [])}
|
|
placeholder="Select items"
|
|
noItemsMsg={_items.status === 'loading' ? 'Loading...' : 'No items found'}
|
|
disabled={_items.status === 'loading'}
|
|
/>
|
|
{:else if inputType === 'dynselect'}
|
|
<Select
|
|
bind:value
|
|
bind:open
|
|
{items}
|
|
bind:filterText
|
|
loading={!open && _items.status === 'loading'}
|
|
clearable
|
|
noItemsMsg={_items.status === 'loading' ? 'Loading...' : 'No items found'}
|
|
/>
|
|
{:else}
|
|
<!-- Future dynamic input types can be added here -->
|
|
<div class="text-red-400 text-sm">
|
|
Unsupported dynamic input type: {inputType}
|
|
</div>
|
|
{/if}
|
|
{#if _items.error}
|
|
<div class="text-red-400 text-2xs">
|
|
error: <Tooltip>{_items.error}</Tooltip>
|
|
</div>
|
|
{/if}
|
|
</div>
|
|
{:else}
|
|
<div class="flex flex-col gap-1 w-full">
|
|
<div class="text-xs text-primary"
|
|
>Dynamic input ({inputType}) is not available in this mode, write value directly</div
|
|
>
|
|
{#await import('$lib/components/JsonEditor.svelte')}
|
|
<Loader2 class="animate-spin" />
|
|
{:then Module}
|
|
<Module.default code={JSON.stringify(value, null, 2)} bind:value />
|
|
{/await}
|
|
</div>
|
|
{/if}
|