From 33faf12feea23962418ee527e3ddee1d41dd5bcc Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 4 Jan 2023 05:07:18 +0100 Subject: [PATCH] fix apps UX nits --- frontend/Caddyfile | 5 ----- frontend/src/lib/components/Editor.svelte | 10 +++++----- .../src/lib/components/apps/editor/AppEditor.svelte | 2 +- .../apps/editor/contextPanel/ContextPanel.svelte | 2 +- .../inlineScriptsPanel/InlineScriptEditor.svelte | 4 ++-- .../inlineScriptsPanel/InlineScriptsPanel.svelte | 2 +- .../apps/editor/settingsPanel/ComponentPanel.svelte | 5 ++++- .../apps/editor/settingsPanel/SelectedRunnable.svelte | 4 ++-- frontend/src/lib/components/apps/utils.ts | 2 +- 9 files changed, 17 insertions(+), 19 deletions(-) diff --git a/frontend/Caddyfile b/frontend/Caddyfile index 1ac9ce1e69..d18bc1c756 100644 --- a/frontend/Caddyfile +++ b/frontend/Caddyfile @@ -1,12 +1,7 @@ -{ - auto_https off -} - http://localhost { bind {$ADDRESS} reverse_proxy /api/* http://localhost:8000 reverse_proxy /* http://localhost:3000 - reverse_proxy /ws/* http://localhost:3001 } https://localhost { diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index 95485aba7c..2714936103 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -40,6 +40,8 @@ noSuggestionDiagnostics: true, noSyntaxValidation: true }) + languages.typescript.typescriptDefaults.setExtraLibs([]) + meditor.defineTheme('myTheme', { base: 'vs', inherit: true, @@ -201,7 +203,6 @@ isTrusted: true }, - // workspaceFolder: { uri: Uri.parse(`/tmp/${name}`), name: 'tmp', index: 0 }, initializationOptions, middleware: { workspace: { @@ -409,10 +410,9 @@ const model = meditor.createModel(code, lang, mUri.parse(uri)) model.updateOptions(updateOptions) - editor = meditor.create( - divEl as HTMLDivElement, - editorConfig(model, code, lang, automaticLayout, fixedOverflowWidgets) - ) + editor = meditor.create(divEl as HTMLDivElement, { + ...editorConfig(model, code, lang, automaticLayout, fixedOverflowWidgets) + }) let timeoutModel: NodeJS.Timeout | undefined = undefined editor.onDidChangeModelContent((event) => { diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte index bdbed8d7a7..64dd1831cc 100644 --- a/frontend/src/lib/components/apps/editor/AppEditor.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte @@ -169,7 +169,7 @@ {#if $selectedComponent !== undefined} {:else} -
No component selected.
+
No component selected.
{/if} diff --git a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte index b4362dbde4..f3f1791f72 100644 --- a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte +++ b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte @@ -43,7 +43,7 @@
{#each panels as [componentId, outputs] (componentId)} {#if outputs.length > 0 && $worldStore?.outputsById[componentId]} diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte index ff3487022b..63be7c1475 100644 --- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte +++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte @@ -54,7 +54,7 @@ -
+
{#if name !== undefined} @@ -102,7 +102,7 @@ class="flex flex-1 grow h-full" lang={scriptLangToEditorLang(inlineScript?.language)} bind:code={inlineScript.content} - fixedOverflowWidgets={false} + fixedOverflowWidgets={true} on:change={async (e) => { if (inlineScript) { const oldSchema = JSON.stringify(inlineScript.schema) diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte index e85c3d0d36..ead2996c55 100644 --- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte +++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte @@ -12,7 +12,7 @@ let selectedScriptComponentId: string | undefined = undefined - + diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte index a5ca1f6491..a6beaaa0ea 100644 --- a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte +++ b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentPanel.svelte @@ -93,7 +93,10 @@ declare const ${k} = ${JSON.stringify(v)}; {#if component}
{#if component.componentInput} - + {/if} -
+
{#if appInput.runnable?.type === 'runnableByName'} {appInput.runnable.name} @@ -49,7 +49,7 @@ {appInput.runnable.path} {/if} -
+
{#if appInput.runnable?.type === 'runnableByName' && appInput.runnable.inlineScript}