diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index c3e2675a6a..943529e304 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -76,6 +76,7 @@ export let initialArgs: Record = {} export let lockedLanguage = false export let showMeta: boolean = false + export let neverShowMeta: boolean = false export let diffDrawer: DiffDrawer | undefined = undefined export let savedScript: NewScriptWithDraft | undefined = undefined export let searchParams: URLSearchParams = new URLSearchParams() @@ -85,10 +86,11 @@ export let customUi: ScriptBuilderWhitelabelCustomUi = {} let metadataOpen = - showMeta || - (initialPath == '' && - searchParams.get('state') == undefined && - searchParams.get('collab') == undefined) + !neverShowMeta && + (showMeta || + (initialPath == '' && + searchParams.get('state') == undefined && + searchParams.get('collab') == undefined)) let editor: Editor | undefined = undefined let scriptEditor: ScriptEditor | undefined = undefined diff --git a/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte b/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte index 619fdd45f5..6145d87919 100644 --- a/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte +++ b/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte @@ -75,11 +75,10 @@ const queryParams = url.search const hash = url.hash replaceStateFn?.(`${window.location.pathname}${queryParams}${hash}`) - $worldStore.outputsById['ctx'].query.set( Object.fromEntries(new URLSearchParams(queryParams).entries()) ) - $worldStore.outputsById['ctx'].hash.set(url.hash) + $worldStore.outputsById['ctx'].hash.set(hash.substring(1)) $selected = resolvedPath === extractPathDetails() ? resolvedPath : undefined }, diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte index 812805ae13..8649b9b146 100644 --- a/frontend/src/lib/components/apps/editor/AppEditor.svelte +++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte @@ -120,7 +120,7 @@ groups: $userStore?.groups, username: $userStore?.username, query: Object.fromEntries($page.url.searchParams.entries()), - hash: $page.url.hash, + hash: $page.url.hash.substring(1), workspace: $workspaceStore, mode: 'editor', summary: $summaryStore, diff --git a/frontend/src/lib/components/flows/idUtils.ts b/frontend/src/lib/components/flows/idUtils.ts index 15d3dbba37..9fac644440 100644 --- a/frontend/src/lib/components/flows/idUtils.ts +++ b/frontend/src/lib/components/flows/idUtils.ts @@ -10,7 +10,8 @@ export const forbiddenIds: string[] = [ 'for', 'delete', 'while', - 'new' + 'new', + 'in' ] export function numberToChars(n: number) { 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 dfe7b36b8e..b1fdf13279 100644 --- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte @@ -51,7 +51,7 @@ username: $userStore?.username, groups: $userStore?.groups, query: Object.fromEntries($page.url.searchParams.entries()), - hash: $page.url.hash + hash: $page.url.hash.substring(1) }} workspace={$workspaceStore ?? ''} summary={app.summary} @@ -62,8 +62,13 @@ isEditor={false} noBackend={false} {hideRefreshBar} - replaceStateFn={(path) => replaceState(path, $page.state)} - gotoFn={(path, opt) => goto(path, opt)} + replaceStateFn={(path) => { + goto(path) + }} + gotoFn={(path, opt) => { + console.log(path, opt) + goto(path, opt) + }} /> {#if can_write && !hideEditBtn}
diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte index ce9a958a38..9e90e19548 100644 --- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte +++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte @@ -71,10 +71,9 @@ userStore.set(await getUserExt($page.params.workspace)) if (!$userStore && parsedSecret.jwt) { jwtError = true - sendUserToast("Could not authentify user with jwt token", true) + sendUserToast('Could not authentify user with jwt token', true) } } catch (e) { - console.warn('Anonymous user') } } @@ -121,17 +120,17 @@ >
{#if !jwtError} - { - // window.location.reload() - loadUser().then(() => { - loadApp() - }) - app = app - }} - popup - rd={$page.url.toString()} - /> + { + // window.location.reload() + loadUser().then(() => { + loadApp() + }) + app = app + }} + popup + rd={$page.url.toString()} + /> {/if}
{:else if app} @@ -151,7 +150,7 @@ groups: $userStore?.groups, username: $userStore?.username, query: Object.fromEntries($page.url.searchParams.entries()), - hash: $page.url.hash + hash: $page.url.hash.substring(1) }} workspace={$page.params.workspace} summary={app.summary} @@ -160,7 +159,7 @@ {breakpoint} policy={app.policy} isEditor={false} - replaceStateFn={(path) => replaceState(path, $page.state)} + replaceStateFn={(path) => goto(path)} gotoFn={(path, opt) => goto(path, opt)} />