Skip to content

Commit f6b9d35

Browse files
committed
Load platform data on relevant pages
1 parent a46d5c2 commit f6b9d35

5 files changed

Lines changed: 39 additions & 26 deletions

File tree

src/lib/layout/shell.svelte

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
if (!activeProject || hasOnboardingDismissed(activeProject.$id, $user)) return undefined;
7272
7373
const platforms = page.data.platforms as Models.PlatformList | undefined;
74+
if (!platforms) return undefined;
75+
7476
const { pingCount } = activeProject;
7577
let percentage = 33;
7678

src/routes/(console)/project-[region]-[project]/+layout.ts

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,22 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
4141
// organization can be null if not in the filtered list!
4242
const includedInBasePlans = plansInfo.has(organization?.billingPlanId);
4343

44-
const [org, rawRegionalConsoleVariables, rolesResult, , platformList, keyList] =
45-
await Promise.all([
46-
!organization
47-
? // TODO: @itznotabug - teams.get with Models.Organization?
48-
(sdk.forConsole.teams.get({
49-
teamId: project.teamId
50-
}) as Promise<Models.Organization>)
51-
: organization,
52-
sdk.forConsoleIn(project.region).console.variables(),
53-
isCloud
54-
? sdk.forConsole.organizations.getScopes({
55-
organizationId: project.teamId
56-
})
57-
: null,
58-
59-
loadAvailableRegions(project.teamId),
60-
projectSdk.listPlatforms(),
61-
projectSdk.listKeys()
62-
]);
44+
const [org, rawRegionalConsoleVariables, rolesResult] = await Promise.all([
45+
!organization
46+
? // TODO: @itznotabug - teams.get with Models.Organization?
47+
(sdk.forConsole.teams.get({
48+
teamId: project.teamId
49+
}) as Promise<Models.Organization>)
50+
: organization,
51+
sdk.forConsoleIn(project.region).console.variables(),
52+
isCloud
53+
? sdk.forConsole.organizations.getScopes({
54+
organizationId: project.teamId
55+
})
56+
: null,
57+
58+
loadAvailableRegions(project.teamId)
59+
]);
6360

6461
const regionalConsoleVariables = normalizeConsoleVariables(rawRegionalConsoleVariables);
6562

@@ -128,8 +125,6 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
128125

129126
return {
130127
project,
131-
platforms: platformList,
132-
keys: keyList,
133128
organization,
134129
regionalConsoleVariables,
135130
roles,
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<script lang="ts">
2-
import { page } from '$app/state';
32
import Onboard from '../overview/onboard.svelte';
3+
import type { PageProps } from './$types';
4+
5+
let { data }: PageProps = $props();
46
</script>
57

68
<svelte:head>
79
<title>Console - Appwrite</title>
810
</svelte:head>
911

10-
<Onboard platforms={page.data.platforms.platforms} pingCount={page.data.project.pingCount} />
12+
<Onboard platforms={data.platforms.platforms} pingCount={data.project.pingCount} />
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Dependencies } from '$lib/constants';
2+
import { sdk } from '$lib/stores/sdk';
3+
import type { PageLoad } from './$types';
4+
5+
export const load: PageLoad = async ({ params, depends }) => {
6+
depends(Dependencies.PROJECT);
7+
8+
return {
9+
platforms: await sdk.forProject(params.region, params.project).project.listPlatforms()
10+
};
11+
};
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import { Dependencies } from '$lib/constants';
2+
import { sdk } from '$lib/stores/sdk';
13
import type { PageLoad } from './$types';
24

3-
export const load: PageLoad = async ({ parent }) => {
4-
const { platforms } = await parent();
5+
export const load: PageLoad = async ({ params, depends }) => {
6+
depends(Dependencies.PROJECT);
7+
58
return {
6-
platforms
9+
platforms: await sdk.forProject(params.region, params.project).project.listPlatforms()
710
};
811
};

0 commit comments

Comments
 (0)