fix: AppDeployment permissions granted to all if none selected by def… (#6935)

Author: jdolle

.changeset/eight-planes-rule.md

@@ -0,0 +1,6 @@
+---
+'hive': patch
+---
+
+AppDeployment permissions granted to all if none selected by default in access token UI. Fix app
+deployments feature flag check

packages/services/api/src/modules/organization/resolvers/Organization.ts

@@ -1,3 +1,4 @@
+import { APP_DEPLOYMENTS_ENABLED } from '../../app-deployments/providers/app-deployments-enabled-token';
 import { Session } from '../../auth/lib/authz';
 import * as OrganizationAccessTokensPermissions from '../lib/organization-access-token-permissions';
 import * as OrganizationMemberPermissions from '../lib/organization-member-permissions';
@@ -207,9 +208,11 @@ export const Organization: Pick<
   availableMemberPermissionGroups: () => {
     return OrganizationMemberPermissions.permissionGroups;
   },
-  availableOrganizationAccessTokenPermissionGroups: async organization => {
+  availableOrganizationAccessTokenPermissionGroups: async (organization, _, { injector }) => {
     const permissionGroups = OrganizationAccessTokensPermissions.permissionGroups;
-    if (!organization.featureFlags.appDeployments) {
+    const isAppDeploymentsEnabled =
+      injector.get<boolean>(APP_DEPLOYMENTS_ENABLED) || organization.featureFlags.appDeployments;
+    if (!isAppDeploymentsEnabled) {
       return permissionGroups.filter(p => p.id !== 'app-deployments');
     }
     return permissionGroups;

packages/web/app/src/components/organization/members/resource-selector.tsx

@@ -317,7 +317,7 @@ export function ResourceSelector(props: {
               targetId: item.id,
               targetSlug: item.slug,
               appDeployments: {
-                mode: GraphQLSchema.ResourceAssignmentModeType.Granular,
+                mode: GraphQLSchema.ResourceAssignmentModeType.All,
                 appDeployments: [],
               },
               services: {

packages/web/app/src/components/organization/settings/access-tokens/create-access-token-sheet-content.tsx

@@ -324,6 +324,16 @@ export function CreateAccessTokenSheetContent(
                                       Granted on {permissionLevelToResourceName(group.level)}:
                                     </p>
                                     <ul className="flex list-none flex-wrap gap-1">
+                                      {!resolvedResources[group.level]?.length && (
+                                        <li>
+                                          <Badge
+                                            className="px-3 py-1 font-mono text-xs text-red-500"
+                                            variant="outline"
+                                          >
+                                            No {group.level} selected.
+                                          </Badge>
+                                        </li>
+                                      )}
                                       {resolvedResources[group.level].map(id => (
                                         <li key={id}>
                                           <Badge