@jobber/hooks 2.6.2 → 2.6.3

package/dist/useCollectionQuery/useCollectionQuery.js

@@ -17,6 +17,7 @@ function useCollectionQuery({ query, queryOptions, getCollectionByPath, subscrip
     const isMounted = (0, useIsMounted_1.useIsMounted)();
     const [loadingRefresh, setLoadingRefresh] = (0, react_1.useState)(false);
     const [loadingNextPage, setLoadingNextPage] = (0, react_1.useState)(false);
+    const [hookError, setHookError] = (0, react_1.useState)();
     const loadingInitialContent = loading && !loadingRefresh && !loadingNextPage;
     const isSearching = !!((_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.variables) === null || _a === void 0 ? void 0 : _a.searchTerm);
     const refresh = (0, react_1.useCallback)(() => {
@@ -55,13 +56,17 @@ function useCollectionQuery({ query, queryOptions, getCollectionByPath, subscrip
             return;
         }
         setLoadingNextPage(true);
+        setHookError(undefined);
         fetchMore({
             variables: {
                 cursor: pageInfo.endCursor,
             },
             updateQuery: (prev, { fetchMoreResult }) => fetchMoreUpdateQueryHandler(prev, fetchMoreResult, getCollectionByPath),
         })
-            .catch(err => formatters_1.config.errorNotifier("FetchMore Error", err))
+            .catch(err => {
+            formatters_1.config.errorNotifier("FetchMore Error", err);
+            setHookError(err);
+        })
             .finally(() => {
             if (isMounted.current) {
                 setLoadingNextPage(false);
@@ -81,15 +86,21 @@ function useCollectionQuery({ query, queryOptions, getCollectionByPath, subscrip
         if (subscription == undefined)
             return;
         const subscriptionOptions = subscription.options || {};
-        return subscribeToMore(Object.assign(Object.assign({}, subscriptionOptions), { document: subscription.document, updateQuery: (prev, { subscriptionData }) => subscribeToMoreHandler(isSearching, prev, getCollectionByPath, subscriptionData === null || subscriptionData === void 0 ? void 0 : subscriptionData.data, subscription.getNodeByPath), onError: err => formatters_1.config.errorNotifier("Subscribe to More Error", err) }));
+        // Reset this state so we can handle errors from the subscription
+        setHookError(undefined);
+        return subscribeToMore(Object.assign(Object.assign({}, subscriptionOptions), { document: subscription.document, updateQuery: (prev, { subscriptionData }) => subscribeToMoreHandler(isSearching, prev, getCollectionByPath, subscriptionData === null || subscriptionData === void 0 ? void 0 : subscriptionData.data, subscription.getNodeByPath), onError: err => {
+                formatters_1.config.errorNotifier("Subscribe to More Error", err);
+                setHookError(err);
+            } }));
     }, 
     // Disabling this linter so we can force this only run once. If we didn't
     // do this we would need to ensure subscription, subscribeToMore, and getNodeByPath
     // all use useCallback.
     [(_b = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.variables) === null || _b === void 0 ? void 0 : _b.searchTerm]);
+    const combinedError = error || hookError;
     return {
         data,
-        error,
+        error: combinedError,
         refresh,
         loadingRefresh,
         nextPage,

package/dist/useCollectionQuery/useCollectionQuery.test.js

@@ -213,6 +213,36 @@ describe("useCollectionQuery", () => {
                     yield (0, react_hooks_1.act)(test_utilities_1.wait);
                 }));
             });
+            describe("when there is an error", () => {
+                it("should update the error state", () => __awaiter(void 0, void 0, void 0, function* () {
+                    const mockError = new Error("Failed to fetch more items");
+                    const { result } = (0, react_hooks_1.renderHook)(() => useCollectionQueryHook(query), {
+                        wrapper: (0, test_utilities_1.wrapper)([
+                            (0, test_utilities_1.buildListRequestMock)(query, responseMock),
+                            {
+                                request: {
+                                    query: query,
+                                    variables: { cursor: "MZ" },
+                                },
+                                error: mockError,
+                            },
+                            (0, test_utilities_1.buildListRequestMockForNextPage)(query, responseMock),
+                        ]),
+                    });
+                    yield (0, react_hooks_1.act)(test_utilities_1.wait);
+                    (0, react_hooks_1.act)(() => {
+                        result.current.nextPage();
+                    });
+                    yield (0, react_hooks_1.act)(test_utilities_1.wait);
+                    expect(result.current.error).toEqual(mockError);
+                    // should clear the error after a successful fetch
+                    (0, react_hooks_1.act)(() => {
+                        result.current.nextPage();
+                    });
+                    yield (0, react_hooks_1.act)(test_utilities_1.wait);
+                    expect(result.current.error).toBeUndefined();
+                }));
+            });
         });
         describe("#refresh", () => {
             describe("when refresh is called while it's still loadingRefresh", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jobber/hooks",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -45,5 +45,5 @@
     "@apollo/client": "^3.0.0",
     "react": "^18"
   },
-  "gitHead": "1194eb4d0f37470aa801a35ee5b9f0b8f62604c3"
+  "gitHead": "6e42ff7d712d09ecd2214b0fccae8c39bc51afec"
 }