Merge pull request #20 from Gateway-DAO/feat/add-count

chore: added count for templates and data models
GatewayLabs · Oct 16, 2023 · 863833c · 863833c
2 parents 4036b3c + 3ebd594
commit 863833c
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 32 deletions.
diff --git a/src/app/(light)/dashboard/org/[username]/data-models/page.tsx b/src/app/(light)/dashboard/org/[username]/data-models/page.tsx
@@ -17,8 +17,11 @@ export default async function DashboardOrgDataModelsPage(props: any) {
       })
     )?.dataModels ?? [];
 
-  // const count = (await (await privateApi).myDataRequestTemplatesCount())
-  //   .myDataRequestTemplatesCount;
+  const count = (
+    await privateApi.myDataModelsCountOrg({
+      orgGatewayId: pathnameOrg,
+    })
+  ).myDataModelsCount;
 
-  return <DataModelsTable data={requestsData} totalCount={0} />;
+  return <DataModelsTable data={requestsData} totalCount={count} />;
 }
diff --git a/src/app/(light)/dashboard/org/[username]/request-templates/page.tsx b/src/app/(light)/dashboard/org/[username]/request-templates/page.tsx
@@ -15,8 +15,11 @@ export default async function DashboardOrgDataRequestTemplatesPage(props: any) {
       })
     )?.dataRequestTemplates ?? [];
 
-  const count = (await (await privateApi).myDataRequestTemplatesCount())
-    .myDataRequestTemplatesCount;
+  const count = (
+    await privateApi.myDataRequestTemplatesCountOrg({
+      orgGatewayId: pathnameOrg,
+    })
+  ).myDataRequestTemplatesCount;
 
   return <RequestTemplatesTable data={requestsData} totalCount={count} />;
 }
diff --git a/src/app/(light)/dashboard/user/data-models/page.tsx b/src/app/(light)/dashboard/user/data-models/page.tsx
@@ -16,8 +16,8 @@ export default async function DashboardUserDataModelsPage() {
         take: 5,
       })
     )?.dataModels ?? [];
-  // const count = (await (await privateApi).myDataRequestTemplatesCount())
-  //   .myDataRequestTemplatesCount;
 
-  return <DataModelsTable data={requestsData} totalCount={0} />;
+  const count = (await privateApi.myDataModelsCount()).myDataModelsCount;
+
+  return <DataModelsTable data={requestsData} totalCount={count} />;
 }
diff --git a/src/app/(light)/dashboard/user/request-templates/page.tsx b/src/app/(light)/dashboard/user/request-templates/page.tsx
@@ -16,7 +16,7 @@ export default async function DashboardUserDataRequestTemplatesPage() {
         take: 5,
       })
     )?.dataRequestTemplates ?? [];
-  const count = (await (await privateApi).myDataRequestTemplatesCount())
+  const count = (await privateApi.myDataRequestTemplatesCount())
     .myDataRequestTemplatesCount;
 
   return <RequestTemplatesTable data={requestsData} totalCount={count} />;

diff --git a/src/services/protocol/queries/dataModels.gql b/src/services/protocol/queries/dataModels.gql
@@ -21,3 +21,11 @@ query dataModelsByOrg($organizationId: String, $skip: Int, $take: Int) {
     createdAt
   }
 }
+
+query myDataModelsCount {
+  myDataModelsCount
+}
+
+query myDataModelsCountOrg($orgGatewayId: String) {
+  myDataModelsCount(orgGatewayId: $orgGatewayId)
+}
diff --git a/src/services/protocol/queries/dataRequestTemplates.gql b/src/services/protocol/queries/dataRequestTemplates.gql
diff --git a/src/services/protocol/queries/requestTemplates.gql b/src/services/protocol/queries/requestTemplates.gql
@@ -21,3 +21,7 @@ query dataRequestTemplatesByOrg(
 query myDataRequestTemplatesCount {
   myDataRequestTemplatesCount
 }
+
+query myDataRequestTemplatesCountOrg($orgGatewayId: String) {
+  myDataRequestTemplatesCount(orgGatewayId: $orgGatewayId)
+}