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

fix resource picker in some rare context

Browse Source
This commit is contained in:
Ruben Fiszel
2023-10-28 20:54:59 +02:00
parent 82eaacb316
commit 12fec27eaa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lib/components/ArgInput.svelte
View File

@@ -434,7 +434,7 @@
<ResourcePicker
{disablePortal}
bind:value
resourceType={format.split('-').length > 1
resourceType={format && format.split('-').length > 1
? format.substring('resource-'.length)
: undefined}
{showSchemaExplorer}

10
frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/StaticInputEditor.svelte
View File

@@ -57,7 +57,7 @@
{:else if fieldType === 'tab-select'}
<TabSelectInput bind:componentInput />
{:else if fieldType === 'labeledresource'}
{#if componentInput?.value && typeof componentInput?.value == 'object' && 'label' in componentInput?.value}
{#if componentInput?.value && typeof componentInput?.value == 'object' && 'label' in componentInput?.value && (componentInput.value?.['value'] == undefined || typeof componentInput.value?.['value'] == 'string')}
<div class="flex flex-col gap-1 w-full">
<input
on:keydown|stopPropagation
@@ -66,7 +66,7 @@
bind:value={componentInput.value['label']}
/>
<ResourcePicker
initialValue={componentInput.value?.['value']?.split('$res:')[1] || ''}
initialValue={componentInput.value?.['value']?.split('$res:')?.[1] || ''}
on:change={(e) => {
let path = e.detail
if (componentInput) {
@@ -86,9 +86,9 @@
{:else if fieldType === 'color'}
<ColorInput bind:value={componentInput.value} />
{:else if fieldType === 'object' || fieldType == 'labeledselect'}
{#if format?.startsWith('resource-')}
{#if format?.startsWith('resource-') && (componentInput.value == undefined || typeof componentInput.value == 'string')}
<ResourcePicker
initialValue={componentInput.value?.split('$res:')[1] || ''}
initialValue={componentInput.value?.split('$res:')?.[1] || ''}
on:change={(e) => {
let path = e.detail
if (componentInput) {
@@ -99,7 +99,7 @@
}
}
}}
resourceType={format.split('-').length > 1
resourceType={format && format?.split('-').length > 1
? format.substring('resource-'.length)
: undefined}
showSchemaExplorer