From 2ece1eb475ea0298a7ad83a5eac46a047478b339 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 5 Feb 2023 10:03:03 +0100
Subject: [PATCH] frontend misc

---
 frontend/src/lib/components/FlowBuilder.svelte |  2 +-
 .../src/lib/components/HighlightCode.svelte    |  8 +++++++-
 .../src/lib/components/ScriptBuilder.svelte    |  2 +-
 .../InlineScriptEditorPanel.svelte             |  4 +++-
 .../lib/components/common/table/FlowRow.svelte |  4 ++--
 .../components/common/table/ScriptRow.svelte   |  4 ++--
 frontend/src/lib/user.ts                       |  2 +-
 frontend/src/lib/utils.ts                      |  2 +-
 .../(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  |  2 +-
 .../scripts/get/[...hash]/+page.svelte         | 18 ++++++++++++++----
 .../scripts/run/[...hash]/+page.svelte         |  5 +++--
 frontend/src/routes/+layout.svelte             |  2 +-
 15 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index a782843c22..5b9f8c0f0f 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -113,7 +113,7 @@
 			}
 		}
 		sendUserToast(`Success! flow saved at ${$flowStore.path}`)
-		goto(`/flows/get/${$flowStore.path}`)
+		goto(`/flows/get/${$flowStore.path}?workspace_id=${$workspaceStore}`)
 	}
 
 	let timeout: NodeJS.Timeout | undefined = undefined
diff --git a/frontend/src/lib/components/HighlightCode.svelte b/frontend/src/lib/components/HighlightCode.svelte
index 0ab75b9882..ff88547371 100644
--- a/frontend/src/lib/components/HighlightCode.svelte
+++ b/frontend/src/lib/components/HighlightCode.svelte
@@ -26,4 +26,10 @@
 	$: lang = getLang(language)
 </script>
 
-<Highlight className="nowrap {$$props.class}" language={lang} {code} />
+{#if code?.length < 5000}
+	<Highlight className="nowrap {$$props.class}" language={lang} {code} />
+{:else}
+	<pre class="overflow-auto max-h-screen {$$props.class}"
+		><code class="language-{language}">{code}</code></pre
+	>
+{/if}
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index bf4dac6971..fd175d16d7 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -85,7 +85,7 @@
 			})
 			sendUserToast(`Success! New script version created with hash ${newHash}`)
 			await goto(`/scripts/edit/${newHash}?step=2`)
-			goto(`/scripts/get/${newHash}`)
+			goto(`/scripts/get/${newHash}?workspace_id=${$workspaceStore}`)
 		} catch (error) {
 			sendUserToast(`Impossible to save the script: ${error.body}`, true)
 		}
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte
index af7eca9e7b..3b0feb3f02 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditorPanel.svelte
@@ -4,6 +4,7 @@
 	import FlowModuleScript from '$lib/components/flows/content/FlowModuleScript.svelte'
 	import FlowPathViewer from '$lib/components/flows/content/FlowPathViewer.svelte'
 	import { inferArgs } from '$lib/infer'
+	import { workspaceStore } from '$lib/stores'
 	import { emptySchema, getScriptByPath } from '$lib/utils'
 	import { faCodeBranch, faExternalLinkAlt, faEye, faPen } from '@fortawesome/free-solid-svg-icons'
 	import type { AppInput, ResultAppInput } from '../../inputType'
@@ -120,7 +121,8 @@
 							startIcon={{ icon: faEye }}
 							endIcon={{ icon: faExternalLinkAlt }}
 							target="_blank"
-							href="/flows/get/{componentInput?.['runnable']?.path}">Details page</Button
+							href="/flows/get/{componentInput?.['runnable']?.path}?workspace_id={$workspaceStore}"
+							>Details page</Button
 						>
 					</div>
 					<FlowPathViewer path={componentInput.runnable.path} />
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index 75030d73f9..40743a14dd 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -91,7 +91,7 @@
 			{/if}
 
 			<Button
-				href="/flows/get/{path}"
+				href="/flows/get/{path}?workspace_id={$workspaceStore}"
 				color="light"
 				variant="border"
 				size="xs"
@@ -118,7 +118,7 @@
 				{
 					displayName: 'View flow',
 					icon: faEye,
-					href: `/flows/get/${path}`
+					href: `/flows/get/${path}?workspace_id=${$workspaceStore}`
 				},
 				{
 					displayName: 'Edit',
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index 5e18e93f29..5a6faf06a2 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -110,7 +110,7 @@
 			{/if}
 
 			<Button
-				href="/scripts/get/{hash}"
+				href="/scripts/get/{hash}?workspace_id={$workspaceStore}"
 				color="light"
 				variant="border"
 				size="xs"
@@ -136,7 +136,7 @@
 				{
 					displayName: 'View script',
 					icon: faEye,
-					href: `/scripts/get/${hash}`
+					href: `/scripts/get/${hash}?workspace_id=${$workspaceStore}`
 				},
 
 				{
diff --git a/frontend/src/lib/user.ts b/frontend/src/lib/user.ts
index c2738c9860..3986436115 100644
--- a/frontend/src/lib/user.ts
+++ b/frontend/src/lib/user.ts
@@ -4,7 +4,7 @@ import { superadmin, type UserExt } from './stores.js'
 
 export async function refreshSuperadmin(): Promise<void> {
     if (get(superadmin) == undefined) {
-        UserService.globalWhoami().then((x) => {
+        await UserService.globalWhoami().then((x) => {
             if (x.super_admin) {
                 superadmin.set(x.email)
             } else {
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index c669de6500..d006ff423c 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -475,7 +475,7 @@ export function scriptPathToHref(path: string): string {
 	if (path.startsWith('hub/')) {
 		return 'https://hub.windmill.dev/from_version/' + path.substring(4)
 	} else {
-		return `/scripts/get/${path}`
+		return `/scripts/get/${path}?workspace_id=${get(workspaceStore)}`
 	}
 }
 
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 a9065c760d..8915c1537b 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
@@ -14,6 +14,11 @@
 		app = await AppService.getAppByPath({ workspace: $workspaceStore!, path: $page.params.path })
 	}
 
+	let queryId = $page.url.searchParams.get('workspace_id')
+	if (queryId && queryId != $workspaceStore) {
+		$workspaceStore = $page.url.searchParams.get('workspace_id')!
+	}
+
 	$: if ($workspaceStore) {
 		loadApp()
 	}
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 5b5f18d908..e3a05de6f8 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -51,6 +51,11 @@
 	let path = $page.params.path
 	let shareModal: ShareModal
 
+	let queryId = $page.url.searchParams.get('workspace_id')
+	if (queryId && queryId != $workspaceStore) {
+		$workspaceStore = $page.url.searchParams.get('workspace_id')!
+	}
+
 	$: {
 		if ($workspaceStore && $userStore) {
 			loadFlow()
@@ -150,7 +155,7 @@
 <MoveDrawer
 	bind:this={moveDrawer}
 	on:update={async (e) => {
-		await goto('/flows/get/' + e.detail)
+		await goto('/flows/get/' + e.detail + `?workspace_id=${$workspaceStore}`)
 		loadFlow()
 		loadSchedule()
 	}}
diff --git a/frontend/src/routes/(root)/(logged)/flows/run/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/run/[...path]/+page.svelte
index 421c57adc8..25d23453cd 100644
--- a/frontend/src/routes/(root)/(logged)/flows/run/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/run/[...path]/+page.svelte
@@ -94,7 +94,7 @@
 									disabled={flow == undefined}
 									btnClasses="mr-4"
 									variant="border"
-									href="/flows/get/{flow?.path}">View flow</Button
+									href="/flows/get/{flow?.path}?workspace_id={$workspaceStore}">View flow</Button
 								>
 							</div>
 							<div>
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 5c86ced7ac..56dc5e9a5f 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -277,7 +277,7 @@
 					{/if}
 					{job.script_path ?? (job.job_kind == 'dependencies' ? 'lock dependencies' : 'No path')}
 					{#if job.script_hash}
-						<a href="/scripts/get/{job.script_hash}"
+						<a href="/scripts/get/{job.script_hash}?workspace_id={workspace_id}}"
 							><Badge color="gray">{truncateHash(job.script_hash)}</Badge></a
 						>
 					{/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 145076340b..382734bdd1 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -65,6 +65,11 @@
 
 	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) {
 		loadScript($page.params.hash)
@@ -182,7 +187,7 @@
 <MoveDrawer
 	bind:this={moveDrawer}
 	on:update={async (e) => {
-		await goto('/scripts/get/' + e.detail)
+		await goto('/scripts/get/' + e.detail + `?workspace_id=${$workspaceStore}`)
 		loadScript($page.params.hash)
 	}}
 />
@@ -327,14 +332,17 @@
 						variant="contained"
 						size="xs"
 						startIcon={{ icon: faArrowLeft }}
-						href="/scripts/get/{script.parent_hashes[0]}"
+						href="/scripts/get/{script.parent_hashes[0]}?workspace_id={$workspaceStore}"
 					>
 						<svelte:fragment slot="main">
 							Previous version ({script.parent_hashes.length})
 						</svelte:fragment>
 
 						{#each script.parent_hashes as hash}
-							<ButtonPopupItem href="/scripts/get/{hash}" btnClasses="!m-0">
+							<ButtonPopupItem
+								href="/scripts/get/{hash}?workspace_id={$workspaceStore}"
+								btnClasses="!m-0"
+							>
 								{hash}
 							</ButtonPopupItem>
 						{/each}
@@ -354,7 +362,9 @@
 					{#if topHash}
 						<Alert type="warning" title="Not HEAD">
 							This hash is not HEAD (latest non-archived version at this path) :
-							<a href="/scripts/get/{topHash}">Go to the HEAD of this path</a>
+							<a href="/scripts/get/{topHash}?workspace_id={$workspaceStore}"
+								>Go to the HEAD of this path</a
+							>
 						</Alert>
 					{/if}
 					{#if script.archived && !topHash}
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 786f19d222..a32932933b 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/run/[...hash]/+page.svelte
@@ -31,7 +31,7 @@
 			script = await ScriptService.getScriptByHash({ workspace: $workspaceStore!, hash })
 			if (script.schema == undefined) {
 				script.schema = emptySchema()
-				inferArgs(script.language, script.content, script.schema)
+				await inferArgs(script.language, script.content, script.schema)
 				script = script
 			}
 			if (script.path && script.archived) {
@@ -119,7 +119,8 @@
 									disabled={script == undefined}
 									btnClasses="mr-4"
 									variant="border"
-									href="/scripts/get/{script?.hash}">View script</Button
+									href="/scripts/get/{script?.hash}?workspace_id={$workspaceStore}"
+									>View script</Button
 								>
 							</div>
 							<div>
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 9fba26925b..b104359eb5 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -11,7 +11,7 @@
 
 	// Default toast options
 	const toastOptions = {
-		duration: 10000, // duration of progress bar tween to the `next` value
+		duration: 5000, // duration of progress bar tween to the `next` value
 		initial: 1, // initial progress bar value
 		next: 0, // next progress value
 		pausable: true, // pause progress bar tween on mouse hover