Merge pull request #3078 from appwrite/feat-project-specific-roles-plan-flag

feat: gate project-specific roles on supportsProjectSpecificRoles plag

Author: HarshMN2345

bun.lock

@@ -20,7 +20,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@5c7f8e5",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@82069e6",
         "@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

@@ -20,6 +20,5 @@ function isFlagEnabled(name: string) {
 
 export const flags = {
     multiDb: isFlagEnabled('multi-db'),
-    granularProjectAccess: isFlagEnabled('granular-project-access'),
     oauth2Server: isFlagEnabled('oauth2-server')
 };

src/lib/flags.ts

@@ -11,8 +11,6 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { isCloud, isSelfHosted } from '$lib/system';
     import { roles, buildProjectRole } from '$lib/stores/billing';
-    import { flags } from '$lib/flags';
-    import { user } from '$lib/stores/user';
     import InputSelect from '$lib/elements/forms/inputSelect.svelte';
     import Roles from '$lib/components/roles/roles.svelte';
     import { Icon, Popover, Layout } from '@appwrite.io/pink-svelte';
@@ -28,11 +26,7 @@
         oncreated?: (team: Models.Membership) => void;
     } = $props();
 
-    const supportsProjectRoles = $derived(
-        isCloud &&
-            flags.granularProjectAccess({ account: $user, organization: $organization }) &&
-            !!$currentPlan?.supportsOrganizationRoles
-    );
+    const supportsProjectRoles = $derived(isCloud && !!$currentPlan?.supportsProjectSpecificRoles);
 
     let email = $state('');
     let name = $state('');

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

@@ -20,10 +20,8 @@
     } from '$lib/helpers/tooltipContent';
     import { addNotification } from '$lib/stores/notifications';
     import { currentPlan, newMemberModal, organization } from '$lib/stores/organization';
-    import { flags } from '$lib/flags';
     import { isOwner } from '$lib/stores/roles';
     import { sdk } from '$lib/stores/sdk';
-    import { user } from '$lib/stores/user';
     import type { Models } from '@appwrite.io/console';
     import Delete from '../deleteMember.svelte';
     import Edit from './edit.svelte';
@@ -62,10 +60,8 @@
     $: isLimited = limit !== 0 && limit < Infinity;
     $: isButtonDisabled =
         isCloud && (($readOnly && !GRACE_PERIOD_OVERRIDE) || (isLimited && memberCount >= limit));
-    $: supportsProjectRoles =
-        isCloud &&
-        flags.granularProjectAccess({ account: $user, organization: $organization }) &&
-        $currentPlan?.supportsOrganizationRoles;
+    $: supportsOrgRoles = isCloud && !!$currentPlan?.supportsOrganizationRoles;
+    $: supportsProjectRoles = isCloud && !!$currentPlan?.supportsProjectSpecificRoles;
 
     const resend = async (member: Models.Membership) => {
         try {
@@ -223,7 +219,7 @@
                         </Button.Button>
                         <div style:min-width="232px" slot="tooltip">
                             <ActionMenu.Root>
-                                {#if supportsProjectRoles}
+                                {#if supportsOrgRoles || supportsProjectRoles}
                                     <ActionMenu.Item.Button
                                         trailingIcon={IconPencil}
                                         on:click={() => {

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

@@ -1,12 +1,11 @@
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
-import { flags } from '$lib/flags';
 import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load';
 import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url, params, route, depends, parent }) => {
-    const { account, organization } = await parent();
+    await parent();
     depends(Dependencies.ORGANIZATION);
     depends(Dependencies.MEMBERS);
 
@@ -15,22 +14,18 @@ export const load: PageLoad = async ({ url, params, route, depends, parent }) =>
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
-    const supportsProjectRoles = flags.granularProjectAccess({ account, organization });
-
     const [organizationMembers, orgProjects] = await Promise.all([
         sdk.forConsole.teams.listMemberships({
             teamId: params.organization,
             queries: [Query.limit(limit), Query.offset(offset)],
             search
         }),
-        supportsProjectRoles
-            ? sdk.forConsole
-                  .organization(params.organization)
-                  .listProjects({
-                      queries: [Query.limit(100), Query.equal('teamId', params.organization)]
-                  })
-                  .catch(() => null)
-            : null
+        sdk.forConsole
+            .organization(params.organization)
+            .listProjects({
+                queries: [Query.limit(100), Query.equal('teamId', params.organization)]
+            })
+            .catch(() => null)
     ]);
 
     return {

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

@@ -19,8 +19,6 @@
         buildProjectRole
     } from '$lib/stores/billing';
     import { isCloud, isSelfHosted } from '$lib/system';
-    import { flags } from '$lib/flags';
-    import { user } from '$lib/stores/user';
     import ProjectAccessSelector from '../projectAccessSelector.svelte';
 
     let {
@@ -33,11 +31,7 @@
         onupdated?: (membership: Models.Membership) => void;
     } = $props();
 
-    const supportsProjectRoles = $derived(
-        isCloud &&
-            flags.granularProjectAccess({ account: $user, organization: $organization }) &&
-            !!$currentPlan?.supportsOrganizationRoles
-    );
+    const supportsProjectRoles = $derived(isCloud && !!$currentPlan?.supportsProjectSpecificRoles);
     const defaultRole = isSelfHosted ? 'owner' : 'developer';
 
     let error = $state<string>(null);