From cdf7a75c99956390ceda01dc6fcd9be132de078b Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 5 Feb 2023 00:01:08 +0100 Subject: [PATCH] frontend misc --- frontend/src/lib/components/ArgInput.svelte | 2 +- .../apps/components/buttons/AppButton.svelte | 4 +- .../components/dataDisplay/AppText.svelte | 4 +- .../helpers/RunnableComponent.svelte | 2 +- .../apps/editor/AppComponentInput.svelte | 4 +- .../components/apps/editor/AppEditor.svelte | 2 +- .../apps/editor/AppEditorHeader.svelte | 2 +- .../components/apps/editor/AppInputs.svelte | 70 +++++++++++-------- .../components/apps/editor/AppPreview.svelte | 2 +- .../components/apps/editor/GridEditor.svelte | 9 +-- .../EmptyInlineScript.svelte | 2 +- .../InlineScriptsPanel.svelte | 3 + .../InlineScriptsPanelList.svelte | 10 +-- .../settingsPanel/common/PanelSection.svelte | 8 ++- .../components/scriptEditor/LogPanel.svelte | 2 +- .../(logged)/apps/get/[...path]/+page.svelte | 2 +- .../user/(user)/workspaces/+page.svelte | 21 +++++- 17 files changed, 91 insertions(+), 58 deletions(-) diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte index 75c5f30d40..8fb31363a1 100644 --- a/frontend/src/lib/components/ArgInput.svelte +++ b/frontend/src/lib/components/ArgInput.svelte @@ -166,7 +166,7 @@ {/if} {#if editableSchema} -
+
{ diff --git a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte index e6baabe438..5820ce1b57 100644 --- a/frontend/src/lib/components/apps/components/buttons/AppButton.svelte +++ b/frontend/src/lib/components/apps/components/buttons/AppButton.svelte @@ -105,7 +105,9 @@ {color} {loading} > - {labelValue} + + {labelValue} + diff --git a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte index 013e776078..363131a023 100644 --- a/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte +++ b/frontend/src/lib/components/apps/components/dataDisplay/AppText.svelte @@ -67,8 +67,8 @@ No text
{:else} -
- +
+ {String(result)} {#if copyButton && result} diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte index 668940e995..b7335c270c 100644 --- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte +++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte @@ -342,7 +342,7 @@
{:else} -
+
{/if} diff --git a/frontend/src/lib/components/apps/editor/AppComponentInput.svelte b/frontend/src/lib/components/apps/editor/AppComponentInput.svelte index 044250c2d2..9cf8962f8c 100644 --- a/frontend/src/lib/components/apps/editor/AppComponentInput.svelte +++ b/frontend/src/lib/components/apps/editor/AppComponentInput.svelte @@ -7,7 +7,7 @@ {#if component?.componentInput?.type === 'runnable' && Object.keys(component?.componentInput?.fields ?? {}).length > 0} -
+
{component.id} {components[component.type].name} @@ -21,7 +21,7 @@ } return false }).length === 0} - No resource input + No resource input {:else} {#if $appStore.grid} -
+
{/if} diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte index 883aeb3106..6422f73c15 100644 --- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte @@ -458,7 +458,7 @@
-
+
In order to properly configure the app, you need to fill in the inputs below. - -{#each $lazyGrid as gridItem (gridItem.data.id)} - {#if gridItem.data.type === 'tablecomponent'} +
+ +
+
+ {#each $lazyGrid as gridItem (gridItem.data.id)}
- -
- {#each gridItem.data.actionButtons as actionButton (actionButton.id)} - - {/each} -
+ {#if gridItem.data.type === 'tablecomponent'} +
+ +
+ {#each gridItem.data.actionButtons as actionButton (actionButton.id)} + + {/each} +
+
+ {:else} + + {/if}
- {:else} - - {/if} -{/each} + {/each} +
{#if $app?.hiddenInlineScripts?.length > 0} - Background script inputs -
+
Background script inputs
+
{#each $app?.hiddenInlineScripts ?? [] as script, index (script.name)} - {script.name} +
+
{script.name}
- {#if resourceOnly && Object.keys(script.fields).filter((fieldKey) => { - const fields = script.fields - const field = fields[fieldKey] - return field.fieldType === 'object' && field.format?.startsWith('resource-') - }).length === 0} - No resource input - {:else} - - {/if} + {#if resourceOnly && Object.keys(script.fields).filter((fieldKey) => { + const fields = script.fields + const field = fields[fieldKey] + return field.fieldType === 'object' && field.format?.startsWith('resource-') + }).length === 0} + No resource input + {:else} + + {/if} +
{/each}
{/if} diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte index 619a31a01f..72f39c3b7e 100644 --- a/frontend/src/lib/components/apps/editor/AppPreview.svelte +++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte @@ -75,7 +75,7 @@ $: lockedClasses = isLocked ? '!max-h-[400px] overflow-hidden pointer-events-none' : '' -
+
-
+

{$summary}

{#if !$connectingInput.opened} @@ -131,7 +132,7 @@ >
-
+
Please choose a language:
{#each langs as lang} diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte index 611abc09a6..063204c580 100644 --- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte +++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte @@ -19,6 +19,9 @@ + {#if !selectedScriptComponentId} + Select a script on the left panel + {/if} {#each $lazyGrid as gridComponent, index (index)} {#if gridComponent.data.id === selectedScriptComponentId} import { Badge, Button } from '$lib/components/common' import { faPlus } from '@fortawesome/free-solid-svg-icons' + import { Plus } from 'lucide-svelte' import { getContext } from 'svelte' import type { AppEditorContext } from '../../types' import { getAllScriptNames } from '../../utils' @@ -61,6 +62,7 @@ } +
Runnables
@@ -105,7 +107,7 @@
- +
{#if runnables.imported.length > 0}
@@ -122,7 +124,7 @@ {/each}
{:else} -
No items
+
No imported scripts/flows
{/if}
@@ -134,8 +136,8 @@ smallPadding > -
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte index 389beb93bb..60292a42bd 100644 --- a/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte +++ b/frontend/src/lib/components/apps/editor/settingsPanel/common/PanelSection.svelte @@ -16,9 +16,11 @@ noPadding ? '' : smallPadding ? 'p-2' : 'p-4' )} > -
-
- {title} +
+
+ + {title} + {#if tooltip} {tooltip} diff --git a/frontend/src/lib/components/scriptEditor/LogPanel.svelte b/frontend/src/lib/components/scriptEditor/LogPanel.svelte index a807145b96..571a7b4f92 100644 --- a/frontend/src/lib/components/scriptEditor/LogPanel.svelte +++ b/frontend/src/lib/components/scriptEditor/LogPanel.svelte @@ -97,7 +97,7 @@ {#if previewIsLoading} {:else} - Test to see the result here' + Test to see the result here {/if}
{/if} diff --git a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte index 059485aec2..a9065c760d 100644 --- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte @@ -22,7 +22,7 @@ {#if app} -
+
x.id == 'admins') + onMount(() => { loadInvites() loadWorkspaces() @@ -83,13 +85,25 @@ {#if $superadmin} -
+
{/if} + + {#if adminsInstance} + + {/if} + {#if workspaces && $usersWorkspaceStore} {#if workspaces.length == 0}

@@ -97,7 +111,7 @@ workspace.

{/if} - {#each workspaces as workspace} + {#each workspaces.filter((x) => x.id != 'admins') as workspace}