From 4942691a514bb97be6dd5e101af7280e963d797b Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 13 Apr 2023 19:23:29 +0200 Subject: [PATCH] consistent workspace query arg --- .../src/lib/components/FlowBuilder.svelte | 4 +- .../src/lib/components/ScriptBuilder.svelte | 2 +- .../InlineScriptEditorPanel.svelte | 5 +-- .../components/common/table/FlowRow.svelte | 4 +- .../components/common/table/ScriptRow.svelte | 4 +- frontend/src/lib/utils.ts | 2 +- .../src/routes/(root)/(logged)/+layout.svelte | 7 +++ .../(logged)/apps/get/[...path]/+page.svelte | 5 --- .../(logged)/flows/get/[...path]/+page.svelte | 7 +-- .../(logged)/flows/run/[...path]/+page.svelte | 2 +- .../(root)/(logged)/run/[...run]/+page.svelte | 44 +++++++------------ .../scripts/get/[...hash]/+page.svelte | 12 ++--- .../scripts/run/[...hash]/+page.svelte | 2 +- 13 files changed, 39 insertions(+), 61 deletions(-) diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte index c29adae01d..b967d3a3b2 100644 --- a/frontend/src/lib/components/FlowBuilder.svelte +++ b/frontend/src/lib/components/FlowBuilder.svelte @@ -118,10 +118,10 @@ } loadingSave = false if (leave) { - goto(`/flows/get/${$flowStore.path}?workspace_id=${$workspaceStore}`) + goto(`/flows/get/${$flowStore.path}?workspace=${$workspaceStore}`) } else if (initialPath !== $flowStore.path) { initialPath = $flowStore.path - goto(`/flows/edit/${$flowStore.path}?workspace_id=${$workspaceStore}`) + goto(`/flows/edit/${$flowStore.path}?workspace=${$workspaceStore}`) } } catch (err) { sendUserToast(`The flow could not be saved: ${err.body}`, true) diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index 32df2b3bc1..4fea2aa984 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -114,7 +114,7 @@ }) if (leave) { history.replaceState(history.state, '', `/scripts/edit/${newHash}`) - goto(`/scripts/get/${newHash}?workspace_id=${$workspaceStore}`) + goto(`/scripts/get/${newHash}?workspace=${$workspaceStore}`) } else { await goto(`/scripts/edit/${newHash}`) script.hash = newHash diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte index 8551a103d7..c3ac757602 100644 --- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte +++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte @@ -149,7 +149,7 @@ /> {/if} {:else if componentInput?.runnable?.type === 'runnableByPath' && componentInput?.runnable?.path} -
+
{#if componentInput.runnable.runType == 'script' || componentInput.runnable.runType == 'hubscript'}
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte index 3871fa139a..31ee3113e9 100644 --- a/frontend/src/lib/components/common/table/FlowRow.svelte +++ b/frontend/src/lib/components/common/table/FlowRow.svelte @@ -107,7 +107,7 @@ {/if} diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte index d0f106dd2f..5f4406c310 100644 --- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte @@ -34,9 +34,6 @@ import Dropdown from '$lib/components/Dropdown.svelte' import { goto } from '$app/navigation' - $: workspace_id = $page.url.searchParams.get('workspace') ?? $workspaceStore - $: not_same_workspace = workspace_id !== $workspaceStore - let job: Job | undefined const iconScale = 1 @@ -50,17 +47,17 @@ const SMALL_ICON_SCALE = 0.7 async function deleteCompletedJob(id: string): Promise { - await JobService.deleteCompletedJob({ workspace: workspace_id!, id }) + await JobService.deleteCompletedJob({ workspace: $workspaceStore!, id }) getLogs() } async function cancelJob(id: string) { try { if (forceCancel) { - await JobService.forceCancelQueuedJob({ workspace: workspace_id!, id, requestBody: {} }) + await JobService.forceCancelQueuedJob({ workspace: $workspaceStore!, id, requestBody: {} }) setTimeout(getLogs, 5000) } else { - await JobService.cancelQueuedJob({ workspace: workspace_id!, id, requestBody: {} }) + await JobService.cancelQueuedJob({ workspace: $workspaceStore!, id, requestBody: {} }) } sendUserToast(`job ${id} canceled`) } catch (err) { @@ -83,7 +80,7 @@ } $: { - if (workspace_id && $page.params.run && testJobLoader) { + if ($workspaceStore && $page.params.run && testJobLoader) { forceCancel = false getLogs() } @@ -98,19 +95,24 @@ bind:this={testJobLoader} bind:isLoading={testIsLoading} bind:job - workspaceOverride={workspace_id} + workspaceOverride={$workspaceStore} bind:notfound /> {#if notfound}
-

Job {$page.params.run} not found in {workspace_id}

+

Job {$page.params.run} not found in {$workspaceStore}

Are you in the right workspace?

{#each $userWorkspaces as workspace}
-
@@ -149,7 +151,6 @@ delete { $runFormStore = job?.args goto(`${stem}/edit/${route}${isScript ? `` : `?nodraft=true`}`) @@ -229,13 +221,7 @@ > {/if} {/if} - @@ -292,7 +278,7 @@ {/if} {job.script_path ?? (job.job_kind == 'dependencies' ? 'lock dependencies' : 'No path')} {#if job.script_hash} - {truncateHash(job.script_hash)} {/if} @@ -371,7 +357,7 @@ on:jobsLoaded={({ detail }) => { job = detail }} - workspaceId={workspace_id} + workspaceId={$workspaceStore} />
{/if} diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte index 802ea5fc07..8809cec5d2 100644 --- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte @@ -57,10 +57,6 @@ let shareModal: ShareModal - let queryId = $page.url.searchParams.get('workspace_id') - if (queryId && queryId != $workspaceStore) { - $workspaceStore = $page.url.searchParams.get('workspace_id')! - } $: loading = !script $: if ($workspaceStore) { @@ -179,7 +175,7 @@ { - await goto('/scripts/get/' + e.detail + `?workspace_id=${$workspaceStore}`) + await goto('/scripts/get/' + e.detail + `?workspace=${$workspaceStore}`) loadScript($page.params.hash) }} /> @@ -329,9 +325,9 @@ variant="contained" size="xs" startIcon={{ icon: faArrowLeft }} - href="/scripts/get/{script.parent_hashes[0]}?workspace_id={$workspaceStore}" + href="/scripts/get/{script.parent_hashes[0]}?workspace={$workspaceStore}" dropdownItems={script.parent_hashes.map((hash) => ({ - href: `/scripts/get/${hash}?workspace_id=${$workspaceStore}`, + href: `/scripts/get/${hash}?workspace=${$workspaceStore}`, label: hash }))} > @@ -352,7 +348,7 @@ {#if topHash} This hash is not HEAD (latest non-archived version at this path) : - Go to the HEAD of this path diff --git a/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte index a8fd61921e..04a3333459 100644 --- a/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte @@ -148,7 +148,7 @@ startIcon={{ icon: faEye }} disabled={script == undefined} variant="border" - href="/scripts/get/{script?.hash}?workspace_id={$workspaceStore}" + href="/scripts/get/{script?.hash}?workspace={$workspaceStore}" >Script