From 611d90f7cbcc6fed769423f7aa2be0bd9da44939 Mon Sep 17 00:00:00 2001 From: Faton Ramadani Date: Wed, 21 Dec 2022 11:19:27 +0100 Subject: [PATCH] feat(frontend): Fix component synchro (#1038) * feat(frontend): Fix component synchro * feat(frontend): Fix isObject --- .../src/lib/components/TestJobLoader.svelte | 2 +- .../components/dataDisplay/AppBarChart.svelte | 3 +- .../components/dataDisplay/AppText.svelte | 2 +- .../components/dateInputs/AppDateInput.svelte | 23 ++- .../helpers/RunnableComponent.svelte | 48 +++--- .../numberInputs/AppNumberInput.svelte | 24 ++- .../components/selectInputs/AppSelect.svelte | 21 +-- .../apps/components/table/AppTable.svelte | 149 +++++++++--------- .../components/textInputs/AppTextInput.svelte | 19 +-- .../components/apps/editor/GridEditor.svelte | 13 +- .../componentsPanel/ComponentList.svelte | 19 ++- .../apps/editor/componentsPanel/data.ts | 46 +----- .../mainInput/RunnableSelector.svelte | 4 +- frontend/src/lib/components/apps/types.ts | 1 - frontend/src/lib/utils.ts | 57 ++++--- 15 files changed, 190 insertions(+), 241 deletions(-) diff --git a/frontend/src/lib/components/TestJobLoader.svelte b/frontend/src/lib/components/TestJobLoader.svelte index 37900f5b70..75eaa30f0e 100644 --- a/frontend/src/lib/components/TestJobLoader.svelte +++ b/frontend/src/lib/components/TestJobLoader.svelte @@ -130,7 +130,7 @@ }) if (previewJobUpdates.new_logs) { - job.logs = (job.logs ?? '').concat(previewJobUpdates.new_logs) + job.logs = (job?.logs ?? '').concat(previewJobUpdates.new_logs) } if ((previewJobUpdates.running ?? false) || (previewJobUpdates.completed ?? false)) { job = await JobService.getJob({ workspace: workspace!, id }) diff --git a/frontend/src/lib/components/apps/components/dataDisplay/AppBarChart.svelte b/frontend/src/lib/components/apps/components/dataDisplay/AppBarChart.svelte index 3d2ddb7d07..732be0acec 100644 --- a/frontend/src/lib/components/apps/components/dataDisplay/AppBarChart.svelte +++ b/frontend/src/lib/components/apps/components/dataDisplay/AppBarChart.svelte @@ -49,7 +49,8 @@ const options = { responsive: true, - animation: false + animation: false, + maintainAspectRatio: false } $: data = { diff --git a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte index 78b9d9048f..9043a2473f 100644 --- a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte +++ b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte @@ -14,7 +14,7 @@ let result: string = '' - + {#if result === ''}
diff --git a/frontend/src/lib/components/apps/components/dateInputs/AppDateInput.svelte b/frontend/src/lib/components/apps/components/dateInputs/AppDateInput.svelte index b4c20ef7f5..daae340ad2 100644 --- a/frontend/src/lib/components/apps/components/dateInputs/AppDateInput.svelte +++ b/frontend/src/lib/components/apps/components/dateInputs/AppDateInput.svelte @@ -32,18 +32,13 @@ - - + diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte index c4d5ba7854..ccb3305462 100644 --- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte +++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte @@ -36,7 +36,7 @@ let testIsLoading = false let runnableInputValues: Record = {} - $: mergedArgs = { ...args, ...extraQueryParams, ...runnableInputValues } + $: mergedArgs = { ...extraQueryParams, ...runnableInputValues, ...args } function setStaticInputsToArgs() { Object.entries(inputs ?? {}).forEach(([key, value]) => { @@ -51,9 +51,13 @@ $: inputs && setStaticInputsToArgs() function argMergedArgsValid(mergedArgs: Record, testJobLoader) { + if (!inputs) { + return false + } + if ( - Object.keys(inputs ?? {}).filter((k) => inputs[k].type !== 'user').length !== - Object.keys(runnableInputValues).length + Object.keys(inputs).length !== + Object.keys(mergedArgs).length - Object.keys(extraQueryParams).length ) { return false } @@ -211,22 +215,24 @@ bind:this={testJobLoader} /> -{#if schemaStripped !== undefined && (autoRefresh || forceSchemaDisplay)} - -{/if} - -{#if !runnable && autoRefresh} - - Please select a runnable - -{:else if autoRefresh === true} - {#if isValid} - - {:else} - - Please fill in all the inputs - +
+ {#if schemaStripped !== undefined && (autoRefresh || forceSchemaDisplay)} + {/if} -{:else} - -{/if} + + {#if !runnable && autoRefresh} + + Please select a runnable + + {:else if autoRefresh === true} + {#if isValid} + + {:else} + + Please fill in all the inputs + + {/if} + {:else} + + {/if} +
diff --git a/frontend/src/lib/components/apps/components/numberInputs/AppNumberInput.svelte b/frontend/src/lib/components/apps/components/numberInputs/AppNumberInput.svelte index c57c2d359e..6a914b3522 100644 --- a/frontend/src/lib/components/apps/components/numberInputs/AppNumberInput.svelte +++ b/frontend/src/lib/components/apps/components/numberInputs/AppNumberInput.svelte @@ -19,7 +19,7 @@ $: outputs = $worldStore?.outputsById[id] as { result: Output } - $: if(value || !value) { + $: if (value || !value) { // Disallow 'e' character in numbers // if(value && value.toString().includes('e')) { // value = +value.toString().replaceAll('e', '') @@ -32,18 +32,12 @@ - - + diff --git a/frontend/src/lib/components/apps/components/selectInputs/AppSelect.svelte b/frontend/src/lib/components/apps/components/selectInputs/AppSelect.svelte index 0e7cc05653..9c3399b9c0 100644 --- a/frontend/src/lib/components/apps/components/selectInputs/AppSelect.svelte +++ b/frontend/src/lib/components/apps/components/selectInputs/AppSelect.svelte @@ -17,12 +17,12 @@ let label: string let items: string[] let itemKey: string - + $: outputs = $worldStore?.outputsById[id] as { result: Output } - function onChange({detail}: CustomEvent) { + function onChange({ detail }: CustomEvent) { outputs?.result.set(detail?.[itemKey] || undefined) } @@ -32,20 +32,5 @@ - -