Merge pull request #667 from appwrite/fix-usage-broken-no-project

fix: usage page broken when no projects
appwrite · Dec 20, 2023 · b1957cb · b1957cb · vercel · Dec 20, 2023
2 parents a410880 + e1a7039
commit b1957cb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
@@ -185,15 +185,15 @@ export type AggregationList = {
 };
 
 export type AllowedRegions =
-    | 'eu-de'
-    | 'us-nyc'
-    | 'us-sfo'
-    | 'ap-in'
-    | 'eu-gb'
-    | 'eu-nl'
-    | 'ap-sg'
-    | 'ap-ca'
-    | 'ap-au'
+    | 'fra'
+    | 'nyc'
+    | 'sfo'
+    | 'blr'
+    | 'lon'
+    | 'ams'
+    | 'sgp'
+    | 'tor'
+    | 'syd'
     | 'default'; //TODO: remove after migration
 
 export type Region = {

diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte
@@ -39,7 +39,7 @@
                 id ?? ID.unique(),
                 name,
                 org.$id,
-                isCloud ? 'eu-de' : 'default'
+                isCloud ? 'fra' : 'default'
             );
             await invalidate(Dependencies.ACCOUNT);
             goto(`/console/project-${project.$id}`);

diff --git a/src/routes/console/organization-[organization]/createProjectCloud.svelte b/src/routes/console/organization-[organization]/createProjectCloud.svelte
@@ -52,7 +52,7 @@
         $createProject = {
             id: null,
             name: null,
-            region: 'eu-de'
+            region: 'fra'
         };
     });
 

diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -43,7 +43,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     const queries: string[] = [];
 
-    if (usage.projects.length > 0) {
+    if (usage?.projects?.length > 0) {
         queries.push(
             Query.equal(
                 '$id',

diff --git a/src/routes/console/organization-[organization]/wizard/store.ts b/src/routes/console/organization-[organization]/wizard/store.ts
@@ -7,5 +7,5 @@ export const createProject = writable<{
 }>({
     id: null,
     name: null,
-    region: 'eu-de'
+    region: 'fra'
 });