fix app deployments pagination and feature flag (#7352)

Author: jdolle

.changeset/curly-birds-itch.md

@@ -0,0 +1,5 @@
+---
+'hive': patch
+---
+
+Correctly check the global environment feature flag in for app deployments and fix app deployment pagination

packages/services/api/src/modules/organization/providers/organization-access-tokens.ts

@@ -8,6 +8,7 @@ import {
 import * as GraphQLSchema from '../../../__generated__/types';
 import { Organization, Project } from '../../../shared/entities';
 import { isUUID } from '../../../shared/is-uuid';
+import { APP_DEPLOYMENTS_ENABLED } from '../../app-deployments/providers/app-deployments-enabled-token';
 import { AuditLogRecorder } from '../../audit-logs/providers/audit-log-recorder';
 import {
   getPermissionGroup,
@@ -154,6 +155,7 @@ export class OrganizationAccessTokens {
     private members: OrganizationMembers,
     logger: Logger,
     @Inject(OTEL_TRACING_ENABLED) private otelTracingEnabled: boolean,
+    @Inject(APP_DEPLOYMENTS_ENABLED) private appDeploymentsEnabled: boolean,
   ) {
     this.logger = logger.child({
       source: 'OrganizationAccessTokens',
@@ -891,11 +893,12 @@ export class OrganizationAccessTokens {
   }
 
   private createFeatureFlagPermissionFilter(organization: Organization) {
-    const isAppDeplymentsEnabled = organization.featureFlags.appDeployments;
+    const isAppDeploymentsEnabled =
+      organization.featureFlags.appDeployments || this.appDeploymentsEnabled;
     const isOTELTracingEnabled = organization.featureFlags.otelTracing || this.otelTracingEnabled;
 
     return (id: Permission) =>
-      (!isAppDeplymentsEnabled && id.startsWith('appDeployment:')) ||
+      (!isAppDeploymentsEnabled && id.startsWith('appDeployment:')) ||
       (!isOTELTracingEnabled && id.startsWith('traces:'))
         ? false
         : true;

packages/web/app/src/pages/target-app-version.tsx

@@ -40,7 +40,6 @@ const TargetAppsVersionQuery = graphql(`
     $appName: String!
     $appVersion: String!
     $first: Int
-    $after: String
     $documentsFilter: AppDeploymentDocumentsFilterInput
   ) {
     target(
@@ -58,6 +57,48 @@ const TargetAppsVersionQuery = graphql(`
         id
         name
         version
+        documents(first: $first, filter: $documentsFilter) {
+          pageInfo {
+            hasNextPage
+            endCursor
+          }
+          edges {
+            node {
+              hash
+              body
+              operationName
+              insightsHash
+            }
+          }
+        }
+      }
+    }
+  }
+`);
+
+const TargetAppsVersionFetchMoreQuery = graphql(`
+  query TargetAppsVersionFetchMore(
+    $organizationSlug: String!
+    $projectSlug: String!
+    $targetSlug: String!
+    $appName: String!
+    $appVersion: String!
+    $first: Int
+    $after: String
+    $documentsFilter: AppDeploymentDocumentsFilterInput
+  ) {
+    target(
+      reference: {
+        bySelector: {
+          organizationSlug: $organizationSlug
+          projectSlug: $projectSlug
+          targetSlug: $targetSlug
+        }
+      }
+    ) {
+      id
+      appDeployment(appName: $appName, appVersion: $appVersion) {
+        id
         documents(first: $first, after: $after, filter: $documentsFilter) {
           pageInfo {
             hasNextPage
@@ -108,7 +149,6 @@ function TargetAppVersionContent(props: {
       appName: props.appName,
       appVersion: props.appVersion,
       first: 20,
-      after: null,
       documentsFilter: {
         operationName: debouncedSearch,
       },
@@ -335,14 +375,17 @@ function TargetAppVersionContent(props: {
                   ) {
                     setIsLoadingMore(true);
                     void client
-                      .query(TargetAppsVersionQuery, {
+                      .query(TargetAppsVersionFetchMoreQuery, {
                         organizationSlug: props.organizationSlug,
                         projectSlug: props.projectSlug,
                         targetSlug: props.targetSlug,
                         appName: props.appName,
                         appVersion: props.appVersion,
                         first: 20,
                         after: data?.data?.target?.appDeployment?.documents.pageInfo?.endCursor,
+                        documentsFilter: {
+                          operationName: debouncedSearch,
+                        },
                       })
                       .toPromise()
                       .finally(() => {