feat: update queries and services to include module pagination for improved data retrieval

Author: nicosammito

src/packages/ce/src/datatype/services/Datatype.service.ts

@@ -36,6 +36,9 @@ export class DatatypeService extends ReactiveArrayService<DataType, DataTypeDepe
                     namespaceId: namespaceId,
                     projectId: projectId,
 
+                    firstModule: 50,
+                    afterModule: null,
+
                     firstDataType: 50,
                     afterDataType: null,
 
@@ -46,7 +49,7 @@ export class DatatypeService extends ReactiveArrayService<DataType, DataTypeDepe
                     afterRule: null,
                 }
             }).then(res => {
-                const nodes = res.data?.namespace?.project?.primaryRuntime?.dataTypes?.nodes ?? []
+                const nodes = res.data?.namespace?.project?.primaryRuntime?.modules?.nodes?.flatMap(module => module?.dataTypes?.nodes ?? []) ?? []
                 nodes.forEach(dataType => {
                     if (dataType && !this.hasById(dataType.id)) {
                         this.set(this.i++, new View(dataType))

src/packages/ce/src/datatype/services/queries/DataTypes.query.graphql

@@ -3,6 +3,8 @@
 query DataTypes (
     $namespaceId: NamespaceID!
     $projectId: NamespaceProjectID!
+    $firstModule: Int!
+    $afterModule: String
     $firstDataType: Int!
     $afterDataType: String
     $firstRule: Int!
@@ -11,11 +13,21 @@ query DataTypes (
     namespace(id: $namespaceId) {
         project(id: $projectId) {
             primaryRuntime {
-                dataTypes (first: $firstDataType, after: $afterDataType) {
+                modules(first: $firstModule, after: $afterModule) {
                     __typename
                     count
                     nodes {
-                        ...DataType
+                        dataTypes (first: $firstDataType, after: $afterDataType) {
+                            __typename
+                            count
+                            nodes {
+                                ...DataType
+                            }
+                            pageInfo {
+                                endCursor
+                                hasNextPage
+                            }
+                        }
                     }
                     pageInfo {
                         endCursor

src/packages/ce/src/flowtype/services/FlowType.service.ts

@@ -39,11 +39,14 @@ export class FlowTypeService extends ReactiveArrayService<FlowType, FlowTypeDepe
                     namespaceId: namespaceId,
                     projectId: projectId,
 
+                    firstModule: 50,
+                    afterModule: null,
+
                     firstFlowType: 50,
                     afterFlowType: null,
                 }
             }).then(res => {
-                const nodes = res.data?.namespace?.project?.primaryRuntime?.flowTypes?.nodes ?? []
+                const nodes = res.data?.namespace?.project?.primaryRuntime?.modules?.nodes?.flatMap(module => module?.flowTypes?.nodes ?? []) ?? []
                 nodes.forEach(flowType => {
                     if (flowType && !this.hasById(flowType.id)) {
                         this.set(this.i++, new View(flowType))

src/packages/ce/src/flowtype/services/queries/FlowTypes.query.graphql

@@ -3,16 +3,28 @@
 query FlowTypes (
     $namespaceId: NamespaceID!
     $projectId: NamespaceProjectID!
+    $firstModule: Int!
+    $afterModule: String
     $firstFlowType: Int!
     $afterFlowType: String
 ) {
     namespace(id: $namespaceId) {
         project(id: $projectId) {
             primaryRuntime {
-                flowTypes (first: $firstFlowType, after: $afterFlowType) {
+                modules(first: $firstModule, after: $afterModule) {
+                    __typename
                     count
                     nodes {
-                        ...FlowType
+                        flowTypes (first: $firstFlowType, after: $afterFlowType) {
+                            count
+                            nodes {
+                                ...FlowType
+                            }
+                            pageInfo {
+                                endCursor
+                                hasNextPage
+                            }
+                        }
                     }
                     pageInfo {
                         endCursor

src/packages/ce/src/function/services/Function.service.ts

@@ -39,14 +39,17 @@ export class FunctionService extends ReactiveArrayService<FunctionDefinition, Fu
                     namespaceId: namespaceId,
                     projectId: projectId,
 
+                    firstModule: 50,
+                    afterModule: null,
+
                     firstFunction: 50,
                     afterFunction: null,
 
                     firstParameterDefinition: 50,
                     afterParameterDefinition: null,
                 }
             }).then(res => {
-                const nodes = res.data?.namespace?.project?.primaryRuntime?.functionDefinitions?.nodes ?? []
+                const nodes = res.data?.namespace?.project?.primaryRuntime?.modules?.nodes?.flatMap(module => module?.functionDefinitions?.nodes ?? []) ?? []
                 nodes.forEach(functionD => {
                     if (functionD && !this.hasById(functionD.id)) {
                         this.set(this.i++, new View(functionD))

src/packages/ce/src/function/services/queries/Functions.query.graphql

@@ -3,6 +3,8 @@
 query Functions (
     $namespaceId: NamespaceID!
     $projectId: NamespaceProjectID!
+    $firstModule: Int!
+    $afterModule: String
     $firstFunction: Int!
     $afterFunction: String
     $firstParameterDefinition: Int!
@@ -11,10 +13,20 @@ query Functions (
     namespace(id: $namespaceId) {
         project(id: $projectId) {
             primaryRuntime {
-                functionDefinitions (first: $firstFunction, after: $afterFunction) {
+                modules(first: $firstModule, after: $afterModule) {
+                    __typename
                     count
                     nodes {
-                        ...Function
+                        functionDefinitions (first: $firstFunction, after: $afterFunction) {
+                            count
+                            nodes {
+                                ...Function
+                            }
+                            pageInfo {
+                                endCursor
+                                hasNextPage
+                            }
+                        }
                     }
                     pageInfo {
                         endCursor

src/packages/ce/src/runtime/services/fragments/Runtime.fragment.graphql

@@ -12,10 +12,7 @@ fragment Runtime on Runtime {
     createdAt
     updatedAt
     token
-    dataTypes {
-        count
-    }
-    flowTypes {
+    modules {
         count
     }
     projects {