feat(api): Organization.projects and Projects.targets (#6812)

Author: n1ru4l

integration-tests/testkit/flow.ts

@@ -298,10 +298,12 @@ export function getOrganizationProjects(selector: OrganizationSelectorInput, aut
       query getOrganizationProjects($selector: OrganizationSelectorInput!) {
         organization(reference: { bySelector: $selector }) {
           projects {
-            nodes {
-              id
-              slug
-              name
+            edges {
+              node {
+                id
+                slug
+                name
+              }
             }
           }
         }

integration-tests/testkit/schema-policy.ts

@@ -9,10 +9,12 @@ export const OrganizationAndProjectsWithSchemaPolicy = graphql(`
         id
       }
       projects {
-        nodes {
-          id
-          schemaPolicy {
+        edges {
+          node {
             id
+            schemaPolicy {
+              id
+            }
           }
         }
       }

integration-tests/testkit/seed.ts

@@ -223,7 +223,7 @@ export function initSeed() {
                 token,
               ).then(r => r.expectNoGraphQLErrors());
 
-              const projects = projectsResult.organization?.projects.nodes;
+              const projects = projectsResult.organization?.projects.edges.map(edge => edge.node);
 
               if (!projects) {
                 throw new Error(`Could not get projects for org ${organization.slug}`);

integration-tests/tests/api/policy/policy-crud.spec.ts

@@ -28,8 +28,8 @@ describe('Policy CRUD', () => {
         }).then(r => r.expectNoGraphQLErrors());
 
         expect(result.organization?.schemaPolicy).toBe(null);
-        expect(result.organization?.projects.nodes).toHaveLength(1);
-        expect(result.organization?.projects.nodes[0].schemaPolicy).toBeNull();
+        expect(result.organization?.projects.edges).toHaveLength(1);
+        expect(result.organization?.projects.edges[0].node.schemaPolicy).toBeNull();
       },
     );
 
@@ -123,8 +123,8 @@ describe('Policy CRUD', () => {
           authToken: ownerToken,
         }).then(r => r.expectNoGraphQLErrors());
 
-        expect(result.organization?.projects.nodes).toHaveLength(1);
-        expect(result.organization?.projects.nodes[0].schemaPolicy).toBeNull();
+        expect(result.organization?.projects.edges).toHaveLength(1);
+        expect(result.organization?.projects.edges[0].node.schemaPolicy).toBeNull();
       },
     );
 
@@ -179,8 +179,8 @@ describe('Policy CRUD', () => {
       }).then(r => r.expectNoGraphQLErrors());
 
       expect(result.organization?.schemaPolicy).toBe(null);
-      expect(result.organization?.projects.nodes).toHaveLength(1);
-      expect(result.organization?.projects.nodes[0].schemaPolicy).toBeNull();
+      expect(result.organization?.projects.edges).toHaveLength(1);
+      expect(result.organization?.projects.edges[0].node.schemaPolicy).toBeNull();
 
       const upsertResult = await setOrganizationSchemaPolicy(VALID_POLICY, true);
 

packages/services/api/src/modules/project/module.graphql.mappers.ts

@@ -1,4 +1,3 @@
 import type { Project } from '../../shared/entities';
 
-export type ProjectConnectionMapper = readonly Project[];
 export type ProjectMapper = Project;

packages/services/api/src/modules/project/module.graphql.ts

@@ -3,7 +3,6 @@ import { gql } from 'graphql-modules';
 export default gql`
   extend type Query {
     project(reference: ProjectReferenceInput! @tag(name: "public")): Project @tag(name: "public")
-    projects(selector: OrganizationSelectorInput!): ProjectConnection!
   }
 
   extend type Mutation {
@@ -85,7 +84,7 @@ export default gql`
   }
 
   extend type Organization {
-    projects: ProjectConnection!
+    projects: ProjectConnection! @tag(name: "public")
     viewerCanCreateProject: Boolean!
     projectBySlug(projectSlug: String!): Project
   }
@@ -122,9 +121,14 @@ export default gql`
     viewerCanDelete: Boolean!
   }
 
+  type ProjectEdge {
+    node: Project! @tag(name: "public")
+    cursor: String! @tag(name: "public")
+  }
+
   type ProjectConnection {
-    nodes: [Project!]!
-    total: Int!
+    edges: [ProjectEdge!]! @tag(name: "public")
+    pageInfo: PageInfo! @tag(name: "public")
   }
 
   input CreateProjectInput {

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

@@ -6,8 +6,23 @@ export const Organization: Pick<
   OrganizationResolvers,
   'projectBySlug' | 'projects' | 'viewerCanCreateProject' | '__isTypeOf'
 > = {
-  projects: (organization, _, { injector }) => {
-    return injector.get(ProjectManager).getProjects({ organizationId: organization.id });
+  projects: async (organization, _, { injector }) => {
+    const projects = await injector
+      .get(ProjectManager)
+      .getProjects({ organizationId: organization.id });
+
+    return {
+      edges: projects.map(node => ({
+        cursor: '',
+        node,
+      })),
+      pageInfo: {
+        hasNextPage: false,
+        hasPreviousPage: false,
+        endCursor: '',
+        startCursor: '',
+      },
+    };
   },
   viewerCanCreateProject: async (organization, _arg, { injector }) => {
     return injector.get(Session).canPerformAction({

packages/services/api/src/modules/project/resolvers/ProjectConnection.ts

@@ -1,4 +1,3 @@
 import type { Target } from '../../shared/entities';
 
-export type TargetConnectionMapper = readonly Target[];
 export type TargetMapper = Target;