Merge pull request #2898 from appwrite/feat-baa

Feat baa

Author: lohanidamodar

bun.lock

@@ -20,7 +20,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@467cd21",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@24e07fc",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3",
         "@appwrite.io/pink-legacy": "^1.0.3",

package.json

@@ -428,6 +428,8 @@ export enum Submit {
     MessagingTopicSubscriberDelete = 'submit_messaging_topic_subscriber_delete',
     ApplyQuickFilter = 'submit_apply_quick_filter',
     RequestBAA = 'submit_request_baa',
+    BAAAddonEnable = 'submit_baa_addon_enable',
+    BAAAddonDisable = 'submit_baa_addon_disable',
     RequestSoc2 = 'submit_request_soc2',
     SiteCreate = 'submit_site_create',
     SiteDelete = 'submit_site_delete',

src/lib/actions/analytics.ts

@@ -85,7 +85,8 @@ export enum Dependencies {
     MESSAGING_TOPIC_SUBSCRIBERS = 'dependency:messaging_topic_subscribers',
     SITE = 'dependency:site',
     SITES = 'dependency:sites',
-    SITES_DOMAINS = 'dependency:sites_domains'
+    SITES_DOMAINS = 'dependency:sites_domains',
+    ADDONS = 'dependency:addons'
 }
 
 export const defaultScopes: string[] = [

src/lib/constants.ts

@@ -25,6 +25,7 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
     depends(Dependencies.CREDIT);
     depends(Dependencies.INVOICES);
     depends(Dependencies.ADDRESS);
+    depends(Dependencies.ADDONS);
     // aggregation reloads on page param changes
     depends(Dependencies.BILLING_AGGREGATION);
 

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

@@ -249,8 +249,17 @@
         };
 
         // addons (additional members, projects, etc.)
+        const billingAddonNames: Record<string, string> = {
+            addon_baa: 'HIPAA BAA'
+        };
+
         const addons = (currentAggregation?.resources || [])
-            .filter((r) => r.amount > 0 && currentPlan?.addons?.[r.resourceId]?.price > 0)
+            .filter(
+                (r) =>
+                    r.amount > 0 &&
+                    (currentPlan?.addons?.[r.resourceId]?.price > 0 ||
+                        r.resourceId.startsWith('addon_'))
+            )
             .map((addon) => ({
                 id: `addon-${addon.resourceId}`,
                 expandable: false,
@@ -260,7 +269,8 @@
                             ? 'Additional members'
                             : addon.resourceId === 'projects'
                               ? 'Additional projects'
-                              : `${addon.resourceId} overage (${formatNum(addon.value)})`,
+                              : (billingAddonNames[addon.resourceId] ??
+                                `${addon.resourceId} overage (${formatNum(addon.value)})`),
                     usage: '',
                     price: formatCurrency(addon.amount)
                 },

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

@@ -75,7 +75,7 @@
 
         {#if isCloud}
             <DownloadDPA />
-            <Baa locale={data.locale} countryList={data.countryList} />
+            <Baa addons={data.addons} addonPrice={data.addonPrice} />
             <Soc2 locale={data.locale} countryList={data.countryList} />
         {/if}
 

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

@@ -1,27 +1,45 @@
 import type { PageLoad } from './$types';
 import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Addon, Query } from '@appwrite.io/console';
 import { isCloud } from '$lib/system';
 
 export const load: PageLoad = async ({ depends, params, parent }) => {
     const { countryList, locale } = await parent();
     depends(Dependencies.ORGANIZATION);
+    depends(Dependencies.ADDONS);
 
-    const [projects, invoices] = await Promise.all([
+    const [projects, invoices, addons, addonPrice] = await Promise.all([
         sdk.forConsole.projects.list({
             queries: [Query.equal('teamId', params.organization), Query.select(['$id', 'name'])]
         }),
         isCloud
             ? sdk.forConsole.organizations.listInvoices({
                   organizationId: params.organization
               })
-            : undefined
+            : undefined,
+        isCloud
+            ? sdk.forConsole.organizations
+                  .listAddons({
+                      organizationId: params.organization
+                  })
+                  .catch(() => null)
+            : null,
+        isCloud
+            ? sdk.forConsole.organizations
+                  .getAddonPrice({
+                      organizationId: params.organization,
+                      addon: Addon.Baa
+                  })
+                  .catch(() => null)
+            : null
     ]);
 
     return {
         projects,
         invoices,
+        addons,
+        addonPrice,
         countryList,
         locale
     };