fix: correct selecting "all" app deployments when creating an access token (#6924)

Author: jdolle

.changeset/late-rules-fail.md

@@ -0,0 +1,5 @@
+---
+'hive': patch
+---
+
+Fix selecting "All" app deployments in target when creating an access token

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

@@ -207,8 +207,12 @@ export const Organization: Pick<
   availableMemberPermissionGroups: () => {
     return OrganizationMemberPermissions.permissionGroups;
   },
-  availableOrganizationAccessTokenPermissionGroups: () => {
-    return OrganizationAccessTokensPermissions.permissionGroups;
+  availableOrganizationAccessTokenPermissionGroups: async organization => {
+    const permissionGroups = OrganizationAccessTokensPermissions.permissionGroups;
+    if (!organization.featureFlags.appDeployments) {
+      return permissionGroups.filter(p => p.id !== 'app-deployments');
+    }
+    return permissionGroups;
   },
   accessTokens: async (organization, args, { injector }) => {
     return injector.get(OrganizationAccessTokens).getPaginated({

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

@@ -517,7 +517,7 @@ export function ResourceSelector(props: {
     const targetId = targetState.activeTarget.targetSelection.targetId;
 
     if (
-      targetState.activeTarget.targetSelection.services.mode ===
+      targetState.activeTarget.targetSelection.appDeployments.mode ===
       GraphQLSchema.ResourceAssignmentModeType.All
     ) {
       return {
@@ -700,25 +700,30 @@ export function ResourceSelector(props: {
                     )}
                   </span>
                   {/** Service All / Granular Toggle */}
-                  {serviceState && serviceState !== 'none' && (
-                    <div className="ml-auto text-xs">
-                      <button
-                        className={cn(serviceState.selection !== '*' && 'text-orange-500')}
-                        onClick={serviceState.setGranular}
-                      >
-                        Select
-                      </button>
-                      {' / '}
-                      <button
-                        className={cn('mr-1', serviceState.selection === '*' && 'text-orange-500')}
-                        onClick={serviceState.setAll}
-                      >
-                        All
-                      </button>
-                    </div>
-                  )}
+                  {serviceState &&
+                    serviceState !== 'none' &&
+                    serviceAppsState === ServicesAppsState.service && (
+                      <div className="ml-auto text-xs">
+                        <button
+                          className={cn(serviceState.selection !== '*' && 'text-orange-500')}
+                          onClick={serviceState.setGranular}
+                        >
+                          Select
+                        </button>
+                        {' / '}
+                        <button
+                          className={cn(
+                            'mr-1',
+                            serviceState.selection === '*' && 'text-orange-500',
+                          )}
+                          onClick={serviceState.setAll}
+                        >
+                          All
+                        </button>
+                      </div>
+                    )}
                   {/** Apps All / Granular Toggle */}
-                  {appsState && (
+                  {appsState && serviceAppsState === ServicesAppsState.apps && (
                     <div className="ml-auto text-xs">
                       <button
                         className={cn(appsState.selection !== '*' && 'text-orange-500')}
@@ -949,7 +954,7 @@ export function ResourceSelector(props: {
                           </div>
                         ) : appsState.selection === '*' ? (
                           <div className="text-muted-foreground px-2 text-xs">
-                            Access to all services in target granted.
+                            Access to all apps in target granted.
                           </div>
                         ) : (
                           <>

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

@@ -171,6 +171,14 @@ export function CreateAccessTokenSheetContent(
       }
       return;
     }
+    if (result.error) {
+      toast({
+        variant: 'destructive',
+        title: 'An error occured',
+        description: 'Something went wrong. Try again later.',
+      });
+      return;
+    }
   }
 
   return (

packages/web/docs/src/content/gateway/logging-and-error-handling.mdx

@@ -74,7 +74,8 @@ only log info, warn and error messages.
 By default, Hive Gateway uses the built-in `console` logger. However, you can also integrate Hive
 Gateway with [Winston](https://github.com/winstonjs/winston) on Node.js environments.
 
-You need to install `winston` and `@graphql-hive/logger-winston` packages to use Winston with Hive Gateway.
+You need to install `winston` and `@graphql-hive/logger-winston` packages to use Winston with Hive
+Gateway.
 
 ```sh npm2yarn
 npm i winston @graphql-hive/logger-winston