diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index f012798a9c..faf511051f 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -442,6 +442,16 @@
+
{#if !emptyString(flow.description)} -
- {defaultIfEmptyString(flow.description, 'No description')} +
+
{/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 e46e64c458..6ed7efcfa2 100644 --- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte @@ -55,6 +55,7 @@ } from '$lib/consts' import { sendUserToast } from '$lib/toast' import { scriptToHubUrl } from '$lib/hub' + import Urlize from '$lib/components/Urlize.svelte' let userSettings: UserSettings let script: Script | undefined @@ -411,8 +412,8 @@ /> {#if !emptyString(script.description)} -
- {defaultIfEmptyString(script.description, 'No description')} +
+
{/if}
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte index 074a1a0fbc..13bb97ec5c 100644 --- a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte @@ -5,7 +5,7 @@ import { onMount } from 'svelte' import { OauthService, SettingsService, UserService, WorkspaceService } from '$lib/gen' import { clearStores, usersWorkspaceStore, workspaceStore, userStore } from '$lib/stores' - import { classNames } from '$lib/utils' + import { classNames, parseQueryParams } from '$lib/utils' import { getUserExt } from '$lib/user' import { Button, Skeleton } from '$lib/components/common' import { WindmillIcon } from '$lib/components/icons' @@ -85,12 +85,21 @@ if ($workspaceStore) { goto(rd ?? '/') } else { + let workspaceTarget = parseQueryParams(rd ?? undefined)['workspace'] + if (rd && workspaceTarget) { + $workspaceStore = workspaceTarget + goto(rd) + return + } + if (!$usersWorkspaceStore) { try { usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces()) } catch {} } + const allWorkspaces = $usersWorkspaceStore?.workspaces + if (allWorkspaces?.length == 1) { $workspaceStore = allWorkspaces[0].id goto('/') diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte index f58e284a60..36e3ca235f 100644 --- a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte @@ -49,7 +49,8 @@ } if ($usersWorkspaceStore) { if (!$workspaceStore) { - switchWorkspace(localStorage.getItem('workspace')?.toString()) + const local = localStorage.getItem('workspace')?.toString() + switchWorkspace(local) } } else { const url = $page.url @@ -63,13 +64,14 @@ }) } - $: { + function handleListWorkspaces() { if (list_all_as_super_admin) { loadWorkspacesAsAdmin() } else { workspaces = $userWorkspaces } } + $: list_all_as_super_admin != undefined && handleListWorkspaces() $: adminsInstance = workspaces?.find((x) => x.id == 'admins') diff --git a/frontend/src/routes/user/login_callback/[client_name]/+page.svelte b/frontend/src/routes/user/login_callback/[client_name]/+page.svelte index 69bdd44b58..6177402c8c 100644 --- a/frontend/src/routes/user/login_callback/[client_name]/+page.svelte +++ b/frontend/src/routes/user/login_callback/[client_name]/+page.svelte @@ -10,6 +10,7 @@ import { getUserExt } from '$lib/user' import { logoutWithRedirect } from '$lib/logout' import WindmillIcon from '$lib/components/icons/WindmillIcon.svelte' + import { parseQueryParams } from '$lib/utils' let error = $page.url.searchParams.get('error') let clientName = $page.params.client_name @@ -40,6 +41,13 @@ $userStore = await getUserExt($workspaceStore) goto(rd ?? '/') } else { + let workspaceTarget = parseQueryParams(rd ?? undefined)['workspace'] + if (rd && workspaceTarget) { + $workspaceStore = workspaceTarget + goto(rd) + return + } + if (!$usersWorkspaceStore) { try { usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())