@graphcommerce/graphcms-ui 8.0.5-canary.8 → 8.0.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 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/HygraphAllPages.graphql

@@ -1,5 +1,11 @@
-query HygraphAllPages($first: Int = 1000) {
-  pages(first: $first) {
+query HygraphAllPages($first: Int = 100, $skip: Int) {
+  pages(first: $first, skip: $skip) {
     url
   }
+
+  pagesConnection {
+    aggregate {
+      count
+    }
+  }
 }

package/lib/getAllHygraphPages.ts

@@ -0,0 +1,41 @@
+import type { ApolloClient, NormalizedCacheObject, ApolloQueryResult } from '@apollo/client'
+import { HygraphAllPagesDocument, HygraphAllPagesQuery } from '../graphql'
+
+type Urls = { url: string }
+
+export async function getAllHygraphPages(
+  client: ApolloClient<NormalizedCacheObject>,
+  options: { pageSize?: number } = {},
+) {
+  const { pageSize = 100 } = options
+  const query = client.query({
+    query: HygraphAllPagesDocument,
+    variables: { first: pageSize },
+    fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+  })
+  const pages: Promise<ApolloQueryResult<HygraphAllPagesQuery>>[] = [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: HygraphAllPagesDocument,
+          variables: { first: pageSize, skip: pageSize * (i - 1) },
+          fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+        }),
+      )
+    }
+  }
+
+  const paths: Urls[] = (await Promise.all(pages))
+    .map((q) => q.data.pages)
+    .flat(1)
+    .map((page) => ({
+      url: page.url,
+    }))
+
+  return paths
+}

package/lib/hygraphPageContent.ts

@@ -1,5 +1,6 @@
 import { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql'
-import { HygraphAllPagesDocument, HygraphPagesQuery, HygraphPagesDocument } from '../graphql'
+import { HygraphPagesQuery, HygraphPagesDocument } from '../graphql'
+import { getAllHygraphPages } from './getAllHygraphPages'
 
 /**
  * Fetch the page content for the given urls.
@@ -28,10 +29,9 @@ async function pageContent(
   const alwaysCache = process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined
   const fetchPolicy = cached ? alwaysCache : undefined
 
-  const allRoutes = await client.query({ query: HygraphAllPagesDocument, fetchPolicy: alwaysCache })
-
+  const allRoutes = await getAllHygraphPages(client)
   // Only do the query when there the page is found in the allRoutes
-  const found = allRoutes.data.pages.some((page) => page.url === url)
+  const found = allRoutes.some((page) => page.url === url)
 
   return found
     ? client.query({ query: HygraphPagesDocument, variables: { url }, fetchPolicy })

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/graphcms-ui",
   "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,12 +12,12 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^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/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",