From 4cc495530471dc489a184ca29a5b1c1e421b656d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 15 May 2025 15:03:44 +0530
Subject: [PATCH 1/2] fix: roles.

---
 .../deleteMember.svelte                       |  3 ++-
 .../members/+page.svelte                      | 27 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
index c2b446335..a7845fbb3 100644
--- a/src/routes/(console)/organization-[organization]/deleteMember.svelte
+++ b/src/routes/(console)/organization-[organization]/deleteMember.svelte
@@ -33,7 +33,6 @@
             if (isCloud && $organization) {
                 await checkForUsageLimit($organization);
             }
-            showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${selectedMember.userName || 'User'} was deleted from ${selectedMember.teamName}`
@@ -45,6 +44,8 @@
                 message: error.message
             });
             trackError(error, Submit.MemberDelete);
+        } finally {
+            showDelete = false;
         }
     };
 
diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index 2982da1fd..433d9d235 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -30,6 +30,8 @@
     import Delete from '../deleteMember.svelte';
     import type { PageData } from './$types';
     import Edit from './edit.svelte';
+    import { isCloud } from '$lib/system';
+    import { BillingPlan } from '$lib/constants';
 
     export let data: PageData;
 
@@ -74,8 +76,8 @@
             buttonText={$isOwner ? 'Invite' : ''}
             buttonMethod={() => newMemberModal.set(true)}
             customPillText="Members limited"
-            showPillMessage={!$currentPlan?.addons?.seats?.supported}
-            buttonDisabled={!$currentPlan?.addons?.seats?.supported} />
+            showPillMessage={isCloud && !$currentPlan?.addons?.seats?.supported}
+            buttonDisabled={isCloud && !$currentPlan?.addons?.seats?.supported} />
 
         <TableScroll>
             <TableHeader>
@@ -164,15 +166,18 @@
                                         <span class="icon-dots-horizontal" aria-hidden="true" />
                                     </button>
                                     <svelte:fragment slot="list">
-                                        <DropListItem
-                                            icon="pencil"
-                                            on:click={() => {
-                                                selectedMember = member;
-                                                showEdit = true;
-                                                showDropdown[index] = false;
-                                            }}>
-                                            Edit role
-                                        </DropListItem>
+                                        <!-- TODO: not good, we need data from backend! -->
+                                        {#if isCloud && $currentPlan.$id !== BillingPlan.FREE}
+                                            <DropListItem
+                                                icon="pencil"
+                                                on:click={() => {
+                                                    selectedMember = member;
+                                                    showEdit = true;
+                                                    showDropdown[index] = false;
+                                                }}>
+                                                Edit role
+                                            </DropListItem>
+                                        {/if}
                                         {#if member.invited && !member.joined}
                                             <DropListItem
                                                 icon="refresh"

From 881601757269b4df53a57db3d941381f199a6fe0 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 31 May 2025 10:50:25 +0530
Subject: [PATCH 2/2] add: `supportsOrganizationRoles` from `labs#2090`.

---
 src/lib/sdk/billing.ts                        |  1 +
 .../deleteMember.svelte                       |  3 +-
 .../members/+page.svelte                      | 31 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 9a4cdfe4f..95842f6c7 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -339,6 +339,7 @@ export type Plan = {
     backupPolicies: number;
     emailBranding: boolean;
     supportsCredits: boolean;
+    supportsOrganizationRoles: boolean;
     buildSize: number; // in MB
     deploymentSize: number; // in MB
 };
diff --git a/src/routes/(console)/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
index e9acbb1cd..f1f1f997a 100644
--- a/src/routes/(console)/organization-[organization]/deleteMember.svelte
+++ b/src/routes/(console)/organization-[organization]/deleteMember.svelte
@@ -34,6 +34,7 @@
             if (isCloud && $organization) {
                 await checkForUsageLimit($organization);
             }
+            showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${selectedMember.userName || 'User'} was deleted from ${selectedMember.teamName}`
@@ -42,8 +43,6 @@
         } catch (e) {
             error = e.message;
             trackError(e, Submit.MemberDelete);
-        } finally {
-            showDelete = false;
         }
     };
 
diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index 758dd335b..ce1d59ec8 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -8,14 +8,13 @@
     import Upgrade from '$lib/components/roles/upgrade.svelte';
     import { getRoleLabel } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import { newMemberModal, organization } from '$lib/stores/organization';
+    import { currentPlan, newMemberModal, organization } from '$lib/stores/organization';
     import { isOwner } from '$lib/stores/roles';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
     import Delete from '../deleteMember.svelte';
     import Edit from './edit.svelte';
     import { isCloud } from '$lib/system';
-    import { BillingPlan } from '$lib/constants';
     import {
         IconDotsHorizontal,
         IconInfo,
@@ -71,7 +70,11 @@
 <Container>
     <Layout.Stack direction="row" justifyContent="space-between">
         <Typography.Title>Members</Typography.Title>
-        <ConsoleButton on:mousedown={() => newMemberModal.set(true)} event="create_user" size="s">
+        <ConsoleButton
+            size="s"
+            event="create_user"
+            on:mousedown={() => newMemberModal.set(true)}
+            disabled={isCloud ? !$currentPlan?.addons?.seats?.supported : false}>
             <Icon size="s" icon={IconPlus} slot="start" />
             <span class="text">Invite</span>
         </ConsoleButton>
@@ -103,7 +106,7 @@
             <Table.Header.Cell column="mfa" {root}>2FA</Table.Header.Cell>
             <Table.Header.Cell column="actions" {root} />
         </svelte:fragment>
-        {#each data.organizationMembers.memberships as member, index}
+        {#each data.organizationMembers.memberships as member, index (member.$id)}
             <Table.Row.Base {root}>
                 <Table.Cell column="name" {root}>
                     <Layout.Stack direction="row" alignItems="center" gap="s">
@@ -138,15 +141,17 @@
                         </Button.Button>
                         <div style:min-width="232px" slot="tooltip">
                             <ActionMenu.Root>
-                                <ActionMenu.Item.Button
-                                    trailingIcon={IconPencil}
-                                    on:click={() => {
-                                        selectedMember = member;
-                                        showEdit = true;
-                                        showDropdown[index] = false;
-                                    }}>
-                                    Edit role
-                                </ActionMenu.Item.Button>
+                                {#if isCloud && $currentPlan?.supportsOrganizationRoles}
+                                    <ActionMenu.Item.Button
+                                        trailingIcon={IconPencil}
+                                        on:click={() => {
+                                            selectedMember = member;
+                                            showEdit = true;
+                                            showDropdown[index] = false;
+                                        }}>
+                                        Edit role
+                                    </ActionMenu.Item.Button>
+                                {/if}
                                 {#if member.invited && !member.joined}
                                     <ActionMenu.Item.Button
                                         trailingIcon={IconRefresh}