diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte index 97eda9f42..3154a1af2 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte @@ -5,7 +5,8 @@ export const promptDeleteUser = (id: string) => { showDelete.set(true); - goto(`${base}/project-${get(project).$id}/auth/user-${id}`); + const p = get(project); + goto(`${base}/project-${p.region}-${p.$id}/auth/user-${id}`); }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte index 13ca40706..ea18ea0ca 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte @@ -15,6 +15,7 @@ let selectedMembership: Models.Membership; let showDelete = false; + const region = page.params.region; const project = page.params.project; @@ -37,7 +38,7 @@ {#each data.memberships.memberships as membership} + href={`${base}/project-${region}-${project}/auth/teams/team-${membership.teamId}`}> diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte index 9e9f35912..0ed4c8b4c 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte @@ -63,14 +63,13 @@ { id: 'deliveredAt', title: 'Delivered at', type: 'datetime', width: { min: 120 } } ]); + const region = page.params.region; const project = page.params.project; async function handleDelete() { showDelete = false; - const promises = selected.map((id) => - sdk.forProject(page.params.region, page.params.project).messaging.delete(id) - ); + const promises = selected.map((id) => sdk.forProject(region, project).messaging.delete(id)); try { await Promise.all(promises); @@ -134,7 +133,7 @@ + href={`${base}/project-${region}-${project}/messaging/message-${message.$id}`}> {#each $columns as column (column.id)} {#if column.id === '$id'} @@ -213,9 +212,7 @@ - diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte index 09e53b779..8f72eea6b 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte @@ -3,9 +3,10 @@ let showDelete = writable(false); - export const promptDeleteUser = (id: string) => { + export const promptDeleteProvider = (id: string) => { showDelete.set(true); - goto(`${base}/project-${get(project).$id}/auth/user-${id}`); + const p = get(project); + goto(`${base}/project-${p.region}-${p.$id}/messaging/providers/provider-${id}`); }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte index 1da34450c..c8f5a49b2 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte @@ -28,6 +28,7 @@ export let data: PageData; + const region = page.params.region; const project = page.params.project; const columns = writable([ { id: '$id', title: 'Topic ID', type: 'string', width: 200 }, @@ -64,7 +65,9 @@ ]); const topicCreated = async (event: CustomEvent>>) => { - await goto(`${base}/project-${project}/messaging/topics/topic-${event.detail.$id}`); + await goto( + `${base}/project-${region}-${project}/messaging/topics/topic-${event.detail.$id}` + ); }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/grid.svelte b/src/routes/(console)/project-[region]-[project]/storage/grid.svelte index 6d6fffae5..dbdc549a3 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/grid.svelte @@ -9,6 +9,7 @@ export let data: PageData; export let showCreate = false; + const region = page.params.region; const project = page.params.project; @@ -20,7 +21,7 @@ service="buckets" on:click={() => (showCreate = true)}> {#each data.buckets.buckets as bucket} - + {bucket.name} {#if !bucket.enabled}