update: better params for short-circuiting.

Author: ItzNotABug

src/lib/stores/billing.ts

@@ -300,12 +300,21 @@ export function checkForProjectLimitation(plan: string, id: PlanServices) {
     }
 }
 
-export function isServiceLimited(serviceId: PlanServices, plan: string, total: number) {
+export function isServiceLimited(
+    serviceId: PlanServices,
+    organization: Models.Organization,
+    total: number
+) {
+    // total validity
     if (!total) return false;
-    if (!plan) return false;
+
+    // org and plan validity!
+    if (!organization) return false;
+    if (!('billingPlanId' in organization)) return false;
+
     const limit = getServiceLimit(serviceId) || Infinity;
     const isLimited = limit !== 0 && limit < Infinity;
-    const hasUsageFees = checkForUsageFees(plan, serviceId);
+    const hasUsageFees = checkForUsageFees(organization.billingPlanId, serviceId);
     return isLimited && total >= limit && !hasUsageFees;
 }
 

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

@@ -25,9 +25,7 @@
 
     let showCreate = $state(false);
 
-    const isLimited = $derived(
-        isServiceLimited('databases', $organization?.billingPlanId, data.databases.total)
-    );
+    const isLimited = $derived(isServiceLimited('databases', $organization, data.databases.total));
 
     async function handleCreate(event: CustomEvent<Models.Database>) {
         showCreate = false;

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

@@ -68,11 +68,7 @@
             keys: ['c'],
             disabled:
                 $wizard.show ||
-                isServiceLimited(
-                    'functions',
-                    $organization?.billingPlanId,
-                    data.functions?.total
-                ) ||
+                isServiceLimited('functions', $organization, data.functions?.total) ||
                 !$canWriteFunctions,
             icon: IconPlus,
             group: 'functions'

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

@@ -79,11 +79,7 @@
             .some((param) => param.toLowerCase() === useCase.toLowerCase());
     };
 
-    $: buttonDisabled = isServiceLimited(
-        'functions',
-        $organization?.billingPlanId,
-        $functionsList?.total ?? 0
-    );
+    $: buttonDisabled = isServiceLimited('functions', $organization, $functionsList?.total ?? 0);
 </script>
 
 <Container>

src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte

@@ -26,8 +26,7 @@
     import { IconExternalLink } from '@appwrite.io/pink-icons-svelte';
 
     $: buttonDisabled =
-        isCloud &&
-        isServiceLimited('functions', $organization?.billingPlanId, $functionsList?.total);
+        isCloud && isServiceLimited('functions', $organization, $functionsList?.total);
 </script>
 
 <Container>

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

@@ -40,8 +40,7 @@
             },
             keys: ['c'],
             disabled:
-                isServiceLimited('sites', $organization?.billingPlanId, data.siteList?.total) ||
-                !$canWriteSites,
+                isServiceLimited('sites', $organization, data.siteList?.total) || !$canWriteSites,
             icon: IconPlus,
             group: 'sites'
         }