@graphcommerce/hygraph-dynamic-rows 8.0.5-canary.8 → 8.0.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @graphcommerce/hygraph-dynamic-rows
 
+## 8.0.5
+
+### Patch Changes
+
+- [#2238](https://github.com/graphcommerce-org/graphcommerce/pull/2238) [`db86432`](https://github.com/graphcommerce-org/graphcommerce/commit/db864324277fd5fb680c66eaa87d211cd7be4905) - Changed query limit to 100 from a 1000 on HygraphAllPages and AllDynamicRows query and added pagination.
+  ([@Jessevdpoel](https://github.com/Jessevdpoel))
+
+## 8.0.5-canary.10
+
+## 8.0.5-canary.9
+
+### Patch Changes
+
+- [#2238](https://github.com/graphcommerce-org/graphcommerce/pull/2238) [`db86432`](https://github.com/graphcommerce-org/graphcommerce/commit/db864324277fd5fb680c66eaa87d211cd7be4905) - Changed query limit to 100 from a 1000 on HygraphAllPages and AllDynamicRows query and added pagination.
+  ([@Jessevdpoel](https://github.com/Jessevdpoel))
+
 ## 8.0.5-canary.8
 
 ## 8.0.5-canary.7

package/graphql/AllDynamicRows.graphql

@@ -1,5 +1,5 @@
-query AllDynamicRows {
-  dynamicRows(first: 1000) {
+query AllDynamicRows($first: Int = 100, $skip: Int) {
+  dynamicRows(first: $first, skip: $skip) {
     id
     conditions {
       __typename
@@ -8,4 +8,10 @@ query AllDynamicRows {
       ...ConditionAnd
     }
   }
+
+  pagesConnection {
+    aggregate {
+      count
+    }
+  }
 }

package/lib/getAllHygraphDynamicRows.ts

@@ -0,0 +1,42 @@
+import type { ApolloClient, NormalizedCacheObject, ApolloQueryResult } from '@apollo/client'
+import { AllDynamicRowsDocument, AllDynamicRowsQuery } from '../graphql'
+
+type DynamicRows = AllDynamicRowsQuery['dynamicRows']
+
+export async function getAllHygraphDynamicRows(
+  client: ApolloClient<NormalizedCacheObject>,
+  options: { pageSize?: number } = {},
+) {
+  const { pageSize = 100 } = options
+  const query = client.query({
+    query: AllDynamicRowsDocument,
+    variables: { first: pageSize },
+    fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+  })
+
+  const pages: Promise<ApolloQueryResult<AllDynamicRowsQuery>>[] = [query]
+
+  const { data } = await query
+  const totalPages = Math.ceil(data.pagesConnection.aggregate.count / pageSize) ?? 1
+  if (totalPages > 1) {
+    for (let i = 2; i <= totalPages; i++) {
+      pages.push(
+        client.query({
+          query: AllDynamicRowsDocument,
+          variables: { first: pageSize, skip: pageSize * (i - 1) },
+          fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+        }),
+      )
+    }
+  }
+
+  const dynamicRows: DynamicRows = (await Promise.all(pages))
+    .map((q) => q.data.dynamicRows)
+    .flat(1)
+    .map((row) => ({
+      id: row.id,
+      conditions: row.conditions,
+    }))
+
+  return dynamicRows
+}

package/lib/hygraphDynamicRows.ts

@@ -1,13 +1,13 @@
 import { HygraphPagesQuery } from '@graphcommerce/graphcms-ui'
 import { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql'
 import {
-  AllDynamicRowsDocument,
   ConditionTextFragment,
   ConditionNumberFragment,
   ConditionOrFragment,
   ConditionAndFragment,
   DynamicRowsDocument,
 } from '../graphql'
+import { getAllHygraphDynamicRows } from './getAllHygraphDynamicRows'
 
 /**
  * This generally works the same way as lodash get, however, when encountering an array it will
@@ -97,17 +97,16 @@ export async function hygraphDynamicRows(
   const alwaysCache = process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined
   const fetchPolicy = cached ? alwaysCache : undefined
 
-  const allRoutes = await client.query({ query: AllDynamicRowsDocument, fetchPolicy: alwaysCache })
+  const allRoutes = await getAllHygraphDynamicRows(client)
 
   // Get the required rowIds from the conditions
   const properties = { ...(await additionalProperties), url }
 
-  const rowIds = allRoutes.data.dynamicRows
+  const rowIds = allRoutes
     .filter((availableDynamicRow) =>
       availableDynamicRow.conditions.some((condition) => matchCondition(condition, properties)),
     )
     .map((row) => row.id)
-
   const dynamicRows =
     rowIds.length !== 0
       ? client.query({ query: DynamicRowsDocument, variables: { rowIds }, fetchPolicy })

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/hygraph-dynamic-rows",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.5-canary.8",
+  "version": "8.0.5",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,13 +12,13 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.0.5-canary.8",
-    "@graphcommerce/graphcms-ui": "^8.0.5-canary.8",
-    "@graphcommerce/graphql": "^8.0.5-canary.8",
-    "@graphcommerce/image": "^8.0.5-canary.8",
-    "@graphcommerce/next-ui": "^8.0.5-canary.8",
-    "@graphcommerce/prettier-config-pwa": "^8.0.5-canary.8",
-    "@graphcommerce/typescript-config-pwa": "^8.0.5-canary.8",
+    "@graphcommerce/eslint-config-pwa": "^8.0.5",
+    "@graphcommerce/graphcms-ui": "^8.0.5",
+    "@graphcommerce/graphql": "^8.0.5",
+    "@graphcommerce/image": "^8.0.5",
+    "@graphcommerce/next-ui": "^8.0.5",
+    "@graphcommerce/prettier-config-pwa": "^8.0.5",
+    "@graphcommerce/typescript-config-pwa": "^8.0.5",
     "@mui/material": "^5.10.16",
     "next": "*",
     "react": "^18.2.0",