From ed7a4e08689dc68aa44106be71e62d99f403d379 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Wed, 26 Jul 2023 17:58:10 +0200
Subject: [PATCH] fix: budget alerts

---
 src/lib/stores/organization.ts                        |  2 +-
 .../billing/budgetAlert.svelte                        | 11 +++++------
 .../billing/budgetCap.svelte                          |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index 9bba513b9..4dbc4e60a 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -5,7 +5,7 @@ import type { Models } from '@appwrite.io/console';
 export type Organization = Models.Team<Record<string, unknown>> & {
     billingBudget: number;
     billingPlan: string;
-    budgetAlert: number[];
+    budgetAlerts: number[];
     paymentMethodId: string;
     backupPaymentMethodId: string;
     billingCurrentInvoiceDate: string;
diff --git a/src/routes/console/organization-[organization]/billing/budgetAlert.svelte b/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
index ebca38da5..f078e6504 100644
--- a/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/console/organization-[organization]/billing/budgetAlert.svelte
@@ -33,14 +33,14 @@
     ];
 
     onMount(() => {
-        alerts = $organization?.budgetAlert ?? [];
+        alerts = $organization?.budgetAlerts ?? [];
     });
 
     function addAlert() {
         if (alerts.some((alert) => alert === selectedAlert)) {
             return;
         }
-        if (alerts.length < 2) {
+        if (alerts.length <= 2) {
             alerts = [...alerts, selectedAlert ? selectedAlert : parseInt(search)];
             search = '';
             selectedAlert = null;
@@ -54,6 +54,7 @@
                 $organization.billingBudget,
                 alerts
             );
+
             invalidate(Dependencies.ORGANIZATION);
 
             addNotification({
@@ -72,9 +73,7 @@
         }
     }
 
-    $: isButtonDisabled = symmetricDifference(alerts, $organization.budgetAlert).length === 0;
-
-    $: console.log($organization.budgetAlert, alerts);
+    $: isButtonDisabled = symmetricDifference(alerts, $organization.budgetAlerts).length === 0;
 </script>
 
 <Form onSubmit={updateBudget}>
@@ -111,7 +110,7 @@
                         <TableCellHead width={30} />
                     </TableHeader>
                     <TableBody>
-                        {#each alerts as alert}
+                        {#each alerts.sort() as alert}
                             <TableRow>
                                 <TableCellText title="Percentage">
                                     {alert}%
diff --git a/src/routes/console/organization-[organization]/billing/budgetCap.svelte b/src/routes/console/organization-[organization]/billing/budgetCap.svelte
index ce254e9e5..f16024d92 100644
--- a/src/routes/console/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/console/organization-[organization]/billing/budgetCap.svelte
@@ -24,7 +24,7 @@
             await sdk.forConsole.billing.updateBudget(
                 $organization.$id,
                 budget,
-                $organization.budgetAlert
+                $organization.budgetAlerts
             );
             invalidate(Dependencies.ORGANIZATION);
             addNotification({