Skip to content

Commit 7713dd1

Browse files
committed
fix: avoid duplicate fetching
1 parent 91d2927 commit 7713dd1

File tree

3 files changed

+5
-26
lines changed

3 files changed

+5
-26
lines changed

src/lib/components/billing/alerts/selectProjectCloud.svelte

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import { page } from '$app/state';
1212
import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
1313
import { currentPlan } from '$lib/stores/organization';
14-
import { Query } from '@appwrite.io/console';
1514
1615
let {
1716
showSelectProject = $bindable(false),
@@ -24,21 +23,8 @@
2423
let projects = $state<Array<Models.Project>>([]);
2524
let error = $state<string | null>(null);
2625
27-
onMount(async () => {
28-
if (page.data.organization?.$id) {
29-
try {
30-
const orgProjects = await sdk.forConsole.projects.list([
31-
Query.equal('teamId', page.data.organization.$id),
32-
Query.limit(1000)
33-
]);
34-
projects = orgProjects.projects;
35-
} catch (e) {
36-
error = 'Failed to load projects';
37-
projects = [];
38-
}
39-
} else {
40-
projects = [];
41-
}
26+
onMount(() => {
27+
projects = page.data.allProjects?.projects || [];
4228
});
4329
4430
let projectsToArchive = $derived(
@@ -48,7 +34,7 @@
4834
async function updateSelected() {
4935
try {
5036
await sdk.forConsole.billing.updateSelectedProjects(
51-
page.data.organization.$id,
37+
projects[0].teamId,
5238
selectedProjects
5339
);
5440
showSelectProject = false;

src/lib/stores/billing.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,7 @@ export async function checkForProjectsLimit(org: Organization, orgProjectCount?:
326326
if (org.projects?.length > 0) return;
327327

328328
let projectCount = orgProjectCount;
329-
if (projectCount === undefined) {
330-
const orgProjects = await sdk.forConsole.projects.list([
331-
Query.equal('teamId', org.$id),
332-
Query.limit(1000)
333-
]);
334-
projectCount = orgProjects.projects.length;
335-
}
329+
if (projectCount === undefined) return;
336330

337331
if (plan.projects > 0 && projectCount > plan.projects) {
338332
headerAlert.add({

src/routes/(console)/organization-[organization]/+page.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import { currentPlan, regions as regionsStore } from '$lib/stores/organization';
4242
import SelectProjectCloud from '$lib/components/billing/alerts/selectProjectCloud.svelte';
4343
import { toLocaleDate } from '$lib/helpers/date';
44-
import { BillingPlan } from '$lib/constants';
4544
4645
export let data;
4746
@@ -168,7 +167,7 @@
168167
</DropList>
169168
</div>
170169

171-
{#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > $currentPlan.projects && $canWriteProjects && data.organization.billingPlan === BillingPlan.FREE}
170+
{#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > $currentPlan.projects && $canWriteProjects}
172171
<Alert.Inline
173172
title={`${data.projects.total - data.organization.projects.length} projects will be archived on ${toLocaleDate(billingProjectsLimitDate)}`}>
174173
<Typography.Text>

0 commit comments

Comments
 (0)