Merge pull request #2981 from appwrite/feat/project-premium-geo-db-addon

feat: add Premium Geo DB addon to project settings

Author: lohanidamodar

playwright.config.ts

@@ -13,7 +13,7 @@ const config: PlaywrightTestConfig = {
     webServer: {
         timeout: 120000,
         env: {
-            PUBLIC_APPWRITE_ENDPOINT: 'https://stage.cloud.appwrite.io/v1',
+            PUBLIC_APPWRITE_ENDPOINT: 'https://cloud.staging.appwrite.io/v1',
             PUBLIC_CONSOLE_MODE: 'cloud',
             PUBLIC_APPWRITE_MULTI_REGION: 'true',
             PUBLIC_STRIPE_KEY:

src/routes/(console)/organization-[organization]/billing/planSummary.svelte

@@ -299,7 +299,9 @@
         // on the resource entry. Once the cloud rollout is complete this map can
         // be removed entirely.
         const billingAddonNamesFallback: Record<string, string> = {
-            addon_baa: 'HIPAA BAA'
+            addon_baa: 'HIPAA BAA',
+            addon_premiumGeoDB: 'Premium Geo DB',
+            addon_premiumGeoDBOrg: 'Premium Geo DB'
         };
 
         const addons = (currentAggregation?.resources || [])
@@ -466,6 +468,21 @@
                         priceFormatter: ({ amount }) => formatCurrency(amount),
                         includeProgress: false
                     }),
+                    ...resources
+                        .filter((r) => r.resourceId?.startsWith('addon_') && (r.amount ?? 0) > 0)
+                        .map((addon) =>
+                            createRow({
+                                id: `addon-${addon.resourceId}`,
+                                label:
+                                    addon.name ||
+                                    billingAddonNamesFallback[addon.resourceId] ||
+                                    addon.resourceId,
+                                resource: addon,
+                                usageFormatter: ({ value }) => formatNum(value),
+                                priceFormatter: ({ amount }) => formatCurrency(amount),
+                                includeProgress: false
+                            })
+                        ),
                     createRow({
                         id: 'usage-details',
                         label: `<a href="${base}/project-${String(projectData.region || 'default')}-${projectData.$id}/settings/usage" style="text-decoration: underline; color: var(--fgcolor-accent-neutral);">Usage details</a>`,

src/routes/(console)/project-[region]-[project]/settings/+page.svelte

@@ -18,7 +18,9 @@
     import UpdateVariables from '../updateVariables.svelte';
     import { page } from '$app/state';
     import UpdateLabels from './updateLabels.svelte';
+    import PremiumGeoDB from './premiumGeoDB.svelte';
     import UpdateOAuth2Server from './updateOAuth2Server.svelte';
+    import { isCloud } from '$lib/system';
     import type { PageData } from './$types';
     import { Alert } from '@appwrite.io/pink-svelte';
     import { flags } from '$lib/flags';
@@ -104,6 +106,9 @@
         {/if}
         <UpdateServices />
         <UpdateInstallations {...data.installations} limit={data.limit} offset={data.offset} />
+        {#if isCloud && $canWriteProjects}
+            <PremiumGeoDB addons={data.addons} addonPrice={data.addonPrice} />
+        {/if}
         <UpdateVariables
             {sdkCreateVariable}
             {sdkUpdateVariable}

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

@@ -1,6 +1,7 @@
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
+import { isCloud } from '$lib/system';
 import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Addon, Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 function isReadonlySettingsPermissionError(error: unknown): boolean {
@@ -11,26 +12,41 @@ function isReadonlySettingsPermissionError(error: unknown): boolean {
 export const load: PageLoad = async ({ depends, url, params }) => {
     depends(Dependencies.PROJECT_VARIABLES);
     depends(Dependencies.PROJECT_INSTALLATIONS);
+    depends(Dependencies.ADDONS);
 
     const limit = PAGE_LIMIT;
     const offset = Number(url.searchParams.get('offset') ?? 0);
     const variablesOffset = Number(url.searchParams.get('variablesOffset') ?? 0);
     const projectSdk = sdk.forProject(params.region, params.project);
-    const [variablesResult, installationsResult] = await Promise.allSettled([
-        projectSdk.projectApi.listVariables({
-            queries: [Query.limit(limit), Query.offset(variablesOffset)]
-        }),
-        projectSdk.vcs.listInstallations({
-            queries: [Query.limit(limit), Query.offset(offset)]
-        })
-    ]);
+    const [variablesResult, installationsResult, addonsResult, addonPriceResult] =
+        await Promise.allSettled([
+            projectSdk.projectApi.listVariables({
+                queries: [Query.limit(limit), Query.offset(variablesOffset)]
+            }),
+            projectSdk.vcs.listInstallations({
+                queries: [Query.limit(limit), Query.offset(offset)]
+            }),
+            isCloud
+                ? sdk
+                      .forConsoleIn(params.region)
+                      .projects.listAddons({ projectId: params.project })
+                      .catch(() => null)
+                : Promise.resolve(null),
+            isCloud
+                ? sdk
+                      .forConsoleIn(params.region)
+                      .projects.getAddonPrice({
+                          projectId: params.project,
+                          addon: Addon.Premiumgeodb
+                      })
+                      .catch(() => null)
+                : Promise.resolve(null)
+        ]);
 
     const variables =
         variablesResult.status === 'fulfilled'
             ? variablesResult.value
             : (() => {
-                  // Read-only users can be blocked from write-adjacent settings APIs.
-                  // Only silence those permission errors so genuine load failures still surface.
                   if (!isReadonlySettingsPermissionError(variablesResult.reason)) {
                       throw variablesResult.reason;
                   }
@@ -45,8 +61,6 @@ export const load: PageLoad = async ({ depends, url, params }) => {
         installationsResult.status === 'fulfilled'
             ? installationsResult.value
             : (() => {
-                  // Read-only users can be blocked from write-adjacent settings APIs.
-                  // Only silence those permission errors so genuine load failures still surface.
                   if (!isReadonlySettingsPermissionError(installationsResult.reason)) {
                       throw installationsResult.reason;
                   }
@@ -57,11 +71,16 @@ export const load: PageLoad = async ({ depends, url, params }) => {
                   };
               })();
 
+    const addons = addonsResult.status === 'fulfilled' ? addonsResult.value : null;
+    const addonPrice = addonPriceResult.status === 'fulfilled' ? addonPriceResult.value : null;
+
     return {
         limit,
         offset,
         variablesOffset,
         variables,
-        installations
+        installations,
+        addons,
+        addonPrice
     };
 };