Merge pull request #2600 from appwrite/feat-profiles-org-platform

Author: TorstenDittmann

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2752",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@5ce6dc7",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@4472521",
         "@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

@@ -29,7 +29,6 @@
     import { getPlatformInfo } from '$lib/helpers/platform';
     import { Status, type Models } from '@appwrite.io/console';
     import type { ComponentType } from 'svelte';
-    import { BillingPlan } from '$lib/constants';
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { sdk } from '$lib/stores/sdk';
@@ -97,7 +96,7 @@
     function isUnarchiveDisabled(): boolean {
         if (!organization || !currentPlan) return true;
 
-        if (organization.billingPlan === BillingPlan.FREE) {
+        if (isFreePlan(organization.billingPlan)) {
             const currentProjectCount = organization.projects?.length || 0;
             const projectLimit = currentPlan.projects || 0;
 
@@ -189,6 +188,7 @@
     }
 
     import { formatName as formatNameHelper } from '$lib/helpers/string';
+    import { isFreePlan } from '$lib/helpers/billing';
     function formatName(name: string, limit: number = 19) {
         return formatNameHelper(name, limit, $isSmallViewport);
     }

src/lib/components/archiveProject.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
     import { page } from '$app/state';
-    import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
     import { HeaderAlert } from '$lib/layout';
@@ -10,6 +9,7 @@
     import { backupsBannerId, showPolicyAlert } from '$lib/stores/database';
     import { IconX } from '@appwrite.io/pink-icons-svelte';
     import { Icon } from '@appwrite.io/pink-svelte';
+    import { isFreePlan } from '$lib/helpers/billing';
 
     function handleClose() {
         showPolicyAlert.set(false);
@@ -18,14 +18,14 @@
 </script>
 
 {#if $showPolicyAlert && isCloud && $organization?.$id && page.url.pathname.match(/\/databases\/database-[^/]+$/)}
-    {@const isFreePlan = $organization?.billingPlan === BillingPlan.FREE}
+    {@const isFree = isFreePlan($organization?.billingPlan)}
 
-    {@const subtitle = isFreePlan
+    {@const subtitle = isFree
         ? 'Upgrade your plan to ensure your data stays safe and backed up'
         : 'Protect your data by quickly adding a backup policy'}
 
-    {@const ctaText = isFreePlan ? 'Upgrade plan' : 'Create policy'}
-    {@const ctaURL = isFreePlan ? $upgradeURL : `${page.url.pathname}/backups`}
+    {@const ctaText = isFree ? 'Upgrade plan' : 'Create policy'}
+    {@const ctaURL = isFree ? $upgradeURL : `${page.url.pathname}/backups`}
 
     <HeaderAlert type="warning" title="Your database has no backup policy">
         <svelte:fragment>{subtitle}</svelte:fragment>
@@ -35,7 +35,7 @@
                     href={ctaURL}
                     secondary
                     fullWidthMobile
-                    event={isFreePlan ? 'backup_banner_upgrade' : 'backup_banner_add'}>
+                    event={isFree ? 'backup_banner_upgrade' : 'backup_banner_add'}>
                     <span class="text">{ctaText}</span>
                 </Button>
 

src/lib/components/backupDatabaseAlert.svelte

@@ -4,7 +4,7 @@
     import { onMount } from 'svelte';
     import { isCloud, isSelfHosted } from '$lib/system';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import type { BackupArchive, BackupRestoration } from '$lib/sdk/backups';
     import { goto, invalidate } from '$app/navigation';
     import { page } from '$app/state';
@@ -13,6 +13,7 @@
     import { getProjectId } from '$lib/helpers/project';
     import { toLocaleDate } from '$lib/helpers/date';
     import { Typography } from '@appwrite.io/pink-svelte';
+    import { isFreePlan } from '$lib/helpers/billing';
 
     const backupRestoreItems: {
         archives: Map<string, BackupArchive>;
@@ -125,7 +126,7 @@
 
     onMount(() => {
         // fast path: don't subscribe if org is on a free plan or is self-hosted.
-        if (isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE)) return;
+        if (isSelfHosted || (isCloud && isFreePlan($organization?.billingPlan))) return;
 
         return realtime.forProject(page.params.region, 'console', (response) => {
             if (!response.channels.includes(`projects.${getProjectId()}`)) return;

src/lib/components/backupRestoreBox.svelte

@@ -2,14 +2,14 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Click, trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
+    import { isFreePlan } from '$lib/helpers/billing';
     import { HeaderAlert } from '$lib/layout';
     import { hideBillingHeaderRoutes, readOnly, tierToPlan, upgradeURL } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
 </script>
 
-{#if $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)}
+{#if $organization?.$id && isFreePlan($organization?.billingPlan) && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)}
     <HeaderAlert
         type="error"
         title={`${$organization.name} usage has reached the ${tierToPlan($organization.billingPlan).name} plan limit`}>

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

@@ -2,14 +2,15 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Click, trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan, NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants';
+    import { NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
     import { activeHeaderAlert } from '$routes/(console)/store';
     import GradientBanner from '../gradientBanner.svelte';
     import { isSmallViewport } from '$lib/stores/viewport';
     import { Layout, Typography } from '@appwrite.io/pink-svelte';
     import { resolvedProfile } from '$lib/profiles/index.svelte';
+    import { isFreePlan } from '$lib/helpers/billing';
 
     let show = true;
 
@@ -24,7 +25,7 @@
     }
 </script>
 
-{#if show && $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && !page.url.pathname.includes(base + '/account')}
+{#if show && $organization?.$id && isFreePlan($organization?.billingPlan) && !page.url.pathname.includes(base + '/account')}
     <GradientBanner on:close={handleClose}>
         <Layout.Stack
             gap="m"

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

@@ -7,6 +7,7 @@
     import { abbreviateNumber, formatCurrency, isWithinSafeRange } from '$lib/helpers/numbers';
     import { BillingPlan } from '$lib/constants';
     import { Table, Typography } from '@appwrite.io/pink-svelte';
+    import { isFreePlan } from '$lib/helpers/billing';
 
     export let show = false;
     export let org: Organization;
@@ -17,7 +18,7 @@
         ? new Date(new Date().getFullYear(), new Date().getMonth() + 1, 1).toString()
         : org?.billingNextInvoiceDate;
 
-    $: isFree = org.billingPlan === BillingPlan.FREE;
+    $: isFree = isFreePlan(org.billingPlan);
 
     // equal or above means unlimited!
     const getCorrectSeatsCountValue = (count: number): string | number => {

src/lib/components/billing/usageRates.svelte

@@ -3,15 +3,15 @@
     import { upgradeURL } from '$lib/stores/billing';
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
     import Button from '$lib/elements/forms/button.svelte';
     import { Badge, Layout, Link, Typography } from '@appwrite.io/pink-svelte';
+    import { isFreePlan } from '$lib/helpers/billing';
 </script>
 
 <Base>
     <Layout.Stack gap="s">
         {#if isCloud}
-            {#if $organization?.billingPlan !== BillingPlan.FREE}
+            {#if !isFreePlan($organization?.billingPlan)}
                 <Typography.Text variant="m-600">Roles</Typography.Text>
                 <Typography.Text>Owner, Developer, Editor, Analyst and Billing.</Typography.Text>
                 <Typography.Text>

src/lib/components/roles/upgrade.svelte

@@ -0,0 +1,11 @@
+import { BillingPlan } from '@appwrite.io/console';
+
+export function isFreePlan(plan: BillingPlan | string): boolean {
+    switch (plan) {
+        case BillingPlan.Imaginebasic:
+        case BillingPlan.Tier0:
+            return true;
+        default:
+            return false;
+    }
+}