From 279a5686d16d005c22a680b8bc15913f0da75adf Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 22 Dec 2023 07:59:13 +0100 Subject: [PATCH] ata nits --- frontend/src/lib/ata/index.ts | 28 ++++++++++--------- frontend/src/lib/components/Editor.svelte | 13 +++++++-- .../lib/components/InputTransformForm.svelte | 3 -- .../src/lib/components/SimpleEditor.svelte | 6 ++-- .../src/lib/components/TemplateEditor.svelte | 4 +-- .../flows/content/ScriptEditorDrawer.svelte | 4 ++- .../src/lib/components/graph/FlowGraph.svelte | 2 -- .../(root)/(logged)/flows/add/+page.svelte | 2 +- .../flows/edit/[...path]/+page.svelte | 2 +- 9 files changed, 35 insertions(+), 29 deletions(-) diff --git a/frontend/src/lib/ata/index.ts b/frontend/src/lib/ata/index.ts index d381466ace..addb8c20c9 100644 --- a/frontend/src/lib/ata/index.ts +++ b/frontend/src/lib/ata/index.ts @@ -96,19 +96,21 @@ export const setupTypeAcquisition = (config: ATABootstrapConfig) => { // Make it so it won't get re-downloaded depsToGet.forEach((dep) => moduleMap.set(dep.raw, { state: 'loading' })) - const relativeDeps = depsToGet.filter((f) => isRelativePath(f.raw)) - relativeDeps.forEach(async (f) => { - let path = f.raw.startsWith('/') - ? '' - : '/' + config.scriptPath + (f.raw.startsWith('../') ? '/../' : '/.') + f.raw - let url = config.root + path - console.log('path', config.scriptPath, path, url) - const res = await fetch(url) - if (res.ok) { - config.delegate.localFile?.(await res.text(), f.raw) - } - }) - depsToGet = depsToGet.filter((f) => !isRelativePath(f.raw)) + if (depth == 0) { + const relativeDeps = depsToGet.filter((f) => isRelativePath(f.raw)) + relativeDeps.forEach(async (f) => { + let path = f.raw.startsWith('/') + ? '' + : '/' + config.scriptPath + (f.raw.startsWith('../') ? '/../' : '/.') + f.raw + let url = config.root + path + console.log('path', config.scriptPath, path, url) + const res = await fetch(url) + if (res.ok) { + config.delegate.localFile?.(await res.text(), f.raw) + } + }) + depsToGet = depsToGet.filter((f) => !isRelativePath(f.raw)) + } // Grab the module trees which gives us a list of files to download const trees = await Promise.all( diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index 4534b28491..28a7ed8ce0 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -770,7 +770,11 @@ const path = 'file://' + _path let uri = mUri.parse(path) languages.typescript.javascriptDefaults.addExtraLib(code, path) - await vscode.workspace.fs.writeFile(uri, new TextEncoder().encode(code)) + try { + await vscode.workspace.fs.writeFile(uri, new TextEncoder().encode(code)) + } catch (e) { + console.log('error writing file', e) + } } const addLocalFile = async (code: string, _path: string) => { @@ -982,7 +986,7 @@ websocketInterval && clearInterval(websocketInterval) } - let widgets: HTMLElement | undefined = document.getElementById('monaco-widgets-root') ?? undefined + // let widgets: HTMLElement | undefined = document.getElementById('monaco-widgets-root') ?? undefined let model: meditor.ITextModel | undefined = undefined let monacoBinding: MonacoBinding | undefined = undefined @@ -1089,7 +1093,7 @@ ...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets), model, fontSize: !small ? 14 : 12, - overflowWidgetsDomNode: widgets, + // overflowWidgetsDomNode: widgets, tabSize: lang == 'python' ? 4 : 2, folding }) @@ -1114,10 +1118,12 @@ }) editor.onDidBlurEditorText(() => { + console.log('blur') dispatch('blur') }) editor.onDidFocusEditorText(() => { + console.log('focus') dispatch('focus') editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, function () { @@ -1207,6 +1213,7 @@ let root = hostname + '/api/scripts_u/tokened_raw/' + $workspaceStore + '/' + token return root } + console.log('FOO') diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte index 89036f3e69..8a03164bee 100644 --- a/frontend/src/lib/components/InputTransformForm.svelte +++ b/frontend/src/lib/components/InputTransformForm.svelte @@ -94,10 +94,7 @@ ) arg.type = 'javascript' propertyType = 'static' - console.log('A') } else { - console.log('B') - if (arg.type === 'javascript' && propertyType === 'static') { arg.type = 'static' } diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte index c9cbc25a72..b57a7a914b 100644 --- a/frontend/src/lib/components/SimpleEditor.svelte +++ b/frontend/src/lib/components/SimpleEditor.svelte @@ -162,13 +162,13 @@ model = nmodel } model.updateOptions(updateOptions) - let widgets: HTMLElement | undefined = - document.getElementById('monaco-widgets-root') ?? undefined + // let widgets: HTMLElement | undefined = + // document.getElementById('monaco-widgets-root') ?? undefined editor = meditor.create(divEl as HTMLDivElement, { ...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets), model, - overflowWidgetsDomNode: widgets, + // overflowWidgetsDomNode: widgets, fontSize: small ? 12 : 14 }) diff --git a/frontend/src/lib/components/TemplateEditor.svelte b/frontend/src/lib/components/TemplateEditor.svelte index 6c158ab899..f636eb919c 100644 --- a/frontend/src/lib/components/TemplateEditor.svelte +++ b/frontend/src/lib/components/TemplateEditor.svelte @@ -407,7 +407,7 @@ let extraModel let width = 0 - let widgets: HTMLElement | undefined = document.getElementById('monaco-widgets-root') ?? undefined + // let widgets: HTMLElement | undefined = document.getElementById('monaco-widgets-root') ?? undefined let initialized = false @@ -447,7 +447,7 @@ editor = meditor.create(divEl as HTMLDivElement, { ...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets), model, - overflowWidgetsDomNode: widgets, + // overflowWidgetsDomNode: widgets, lineNumbers: 'off', fontSize, suggestOnTriggerCharacters: true, diff --git a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte index 3f5b303657..9eb469b63d 100644 --- a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte +++ b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte @@ -165,6 +165,8 @@ + + -
+ { diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte index 1014a0e60b..959ea29571 100644 --- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte @@ -189,7 +189,7 @@ } -
+