@trackunit/react-graphql-hooks 2.10.10 → 2.10.11

package/index.cjs.js

@@ -249,6 +249,13 @@ const createDirectionAwareUnion = (direction) => {
     }
     return unionEdgesByNodeKey;
 };
+/**
+ * An empty previous result becomes undefined, which Apollo treats as "no update". Writing `{}` to the cache would log
+ * missing fields.
+ */
+const emptyAsUndefined = (value) => value === undefined || value === null || sharedUtils.objectKeys(value).length === 0
+    ? undefined
+    : value;
 /**
  * Creates an update query handler for Apollo's fetchMore.
  * Handles aborted requests and merges new data with existing data.
@@ -257,19 +264,16 @@ const createUpdateQueryHandler = (params) => {
     return (_previousResult, { fetchMoreResult }) => {
         if (params.abortSignal.aborted) {
             // https://github.com/apollographql/apollo-client/issues/8677
-            if (params.prev !== undefined && params.prev !== null) {
-                return sharedUtils.objectKeys(params.prev).length === 0
-                    ? undefined
-                    : params.prev;
-            }
-            return undefined;
+            return emptyAsUndefined(params.prev);
         }
-        // Apollo can return undefined fetchMoreResult when the query document
-        // changes and triggers a spurious re-execution (e.g. dynamic query
-        // rebuilt from visibleColumns). Skip the update and keep previous data.
+        // Apollo passes no fetchMoreResult when the response carried only GraphQL
+        // errors, or when the query document changes and triggers a spurious
+        // re-execution (e.g. dynamic query rebuilt from visibleColumns). Keep the
+        // previous result: on the cached path Apollo writes it back, on the
+        // no-cache path (pollInterval) it reports it as the query's data.
         if (fetchMoreResult === undefined || fetchMoreResult === null) {
             params.onLoadingComplete();
-            return _previousResult;
+            return emptyAsUndefined(_previousResult);
         }
         // Type assertion required: Apollo's fetchMoreResult has complex internal types
         // that need to be cast to our TData generic for type-safe usage
@@ -480,6 +484,10 @@ const usePaginationQuery = (document, props) => {
         const signal = abortController.signal;
         const filteredRelayVars = Object.fromEntries(Object.entries(variables).filter(([key]) => declaredVarNames.has(key)));
         const fetchMoreVariables = { ...stableVariables, ...filteredRelayVars };
+        const reportError = (error) => {
+            dispatch({ type: "SET_ERROR", payload: error });
+            onErrorRef.current?.(error);
+        };
         fetchMore({
             variables: fetchMoreVariables,
             updateQuery: createUpdateQueryHandler({
@@ -514,13 +522,18 @@ const usePaginationQuery = (document, props) => {
                 },
                 onLoadingComplete: () => setIsLoading(false),
             }),
-        }).catch(error => {
+        }).then(result => {
+            const hasData = result.data !== undefined && result.data !== null;
+            if (signal.aborted || hasData || result.errors === undefined || result.errors.length === 0) {
+                return;
+            }
+            reportError(new client.ApolloError({ graphQLErrors: result.errors }));
+        }, error => {
             setIsLoading(false);
             if (signal.aborted) {
                 return;
             }
-            dispatch({ type: "SET_ERROR", payload: error });
-            onErrorRef.current?.(error);
+            reportError(error);
         });
     }, [
         props.skip,

package/index.esm.js

@@ -1,7 +1,7 @@
 import 'react/jsx-runtime';
 import { registerTranslations } from '@trackunit/i18n-library-translation';
 import { useCallback, useMemo, useState, useReducer, useRef, useEffect } from 'react';
-import { useLazyQuery as useLazyQuery$1, NetworkStatus, useQuery as useQuery$1 } from '@apollo/client';
+import { useLazyQuery as useLazyQuery$1, NetworkStatus, ApolloError, useQuery as useQuery$1 } from '@apollo/client';
 import { omit, isEqual } from 'es-toolkit';
 import { defaultPageSize, useRelayPagination, useWatch } from '@trackunit/react-components';
 import { truthy, objectKeys } from '@trackunit/shared-utils';
@@ -247,6 +247,13 @@ const createDirectionAwareUnion = (direction) => {
     }
     return unionEdgesByNodeKey;
 };
+/**
+ * An empty previous result becomes undefined, which Apollo treats as "no update". Writing `{}` to the cache would log
+ * missing fields.
+ */
+const emptyAsUndefined = (value) => value === undefined || value === null || objectKeys(value).length === 0
+    ? undefined
+    : value;
 /**
  * Creates an update query handler for Apollo's fetchMore.
  * Handles aborted requests and merges new data with existing data.
@@ -255,19 +262,16 @@ const createUpdateQueryHandler = (params) => {
     return (_previousResult, { fetchMoreResult }) => {
         if (params.abortSignal.aborted) {
             // https://github.com/apollographql/apollo-client/issues/8677
-            if (params.prev !== undefined && params.prev !== null) {
-                return objectKeys(params.prev).length === 0
-                    ? undefined
-                    : params.prev;
-            }
-            return undefined;
+            return emptyAsUndefined(params.prev);
         }
-        // Apollo can return undefined fetchMoreResult when the query document
-        // changes and triggers a spurious re-execution (e.g. dynamic query
-        // rebuilt from visibleColumns). Skip the update and keep previous data.
+        // Apollo passes no fetchMoreResult when the response carried only GraphQL
+        // errors, or when the query document changes and triggers a spurious
+        // re-execution (e.g. dynamic query rebuilt from visibleColumns). Keep the
+        // previous result: on the cached path Apollo writes it back, on the
+        // no-cache path (pollInterval) it reports it as the query's data.
         if (fetchMoreResult === undefined || fetchMoreResult === null) {
             params.onLoadingComplete();
-            return _previousResult;
+            return emptyAsUndefined(_previousResult);
         }
         // Type assertion required: Apollo's fetchMoreResult has complex internal types
         // that need to be cast to our TData generic for type-safe usage
@@ -478,6 +482,10 @@ const usePaginationQuery = (document, props) => {
         const signal = abortController.signal;
         const filteredRelayVars = Object.fromEntries(Object.entries(variables).filter(([key]) => declaredVarNames.has(key)));
         const fetchMoreVariables = { ...stableVariables, ...filteredRelayVars };
+        const reportError = (error) => {
+            dispatch({ type: "SET_ERROR", payload: error });
+            onErrorRef.current?.(error);
+        };
         fetchMore({
             variables: fetchMoreVariables,
             updateQuery: createUpdateQueryHandler({
@@ -512,13 +520,18 @@ const usePaginationQuery = (document, props) => {
                 },
                 onLoadingComplete: () => setIsLoading(false),
             }),
-        }).catch(error => {
+        }).then(result => {
+            const hasData = result.data !== undefined && result.data !== null;
+            if (signal.aborted || hasData || result.errors === undefined || result.errors.length === 0) {
+                return;
+            }
+            reportError(new ApolloError({ graphQLErrors: result.errors }));
+        }, error => {
             setIsLoading(false);
             if (signal.aborted) {
                 return;
             }
-            dispatch({ type: "SET_ERROR", payload: error });
-            onErrorRef.current?.(error);
+            reportError(error);
         });
     }, [
         props.skip,

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@trackunit/react-graphql-hooks",
-  "version": "2.10.10",
+  "version": "2.10.11",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
     "node": ">=24.x"
   },
   "dependencies": {
-    "@trackunit/i18n-library-translation": "2.8.6",
+    "@trackunit/i18n-library-translation": "2.8.7",
     "@trackunit/shared-utils": "1.19.6",
     "es-toolkit": "^1.52.0",
-    "@trackunit/react-components": "3.8.4"
+    "@trackunit/react-components": "3.8.5"
   },
   "peerDependencies": {
     "@apollo/client": "^3.13.8",

package/src/usePaginationQuery.d.ts

@@ -7,6 +7,10 @@ import { type UpdateQueryOptions } from "./utils/createUpdateQueryHandler";
 export type PaginationQuery<TData> = {
     data: TData | undefined;
     loading: boolean;
+    /**
+     * Set when the last page request failed: a network error, or a response that carried GraphQL errors and no data.
+     * Partial data with GraphQL errors is merged into `data` and does not set `error`.
+     */
     error?: unknown;
     lastFetchedData?: TData;
     pagination: RelayTableSupport;