@dhis2/app-service-data 3.2.6 → 3.2.7

package/build/cjs/react/hooks/useDataQuery.js

@@ -116,10 +116,6 @@ const useDataQuery = (query, {
       }) => data);
     }
 
-    if (!enabled) {
-      setEnabled(true);
-    }
-
     if (newVariables) {
       // Use cached hash if it exists
       const currentHash = variablesHash.current || (0, _stableVariablesHash.stableVariablesHash)(variables);
@@ -129,8 +125,11 @@ const useDataQuery = (query, {
       const mergedHash = (0, _stableVariablesHash.stableVariablesHash)(mergedVariables);
       const identical = currentHash === mergedHash;
 
-      if (identical) {
-        // If the variables are identical we'll need to trigger the refetch manually
+      if (identical && enabled) {
+        /**
+         * If the variables are identical and the query is enabled
+         * we'll need to trigger the refetch manually
+         */
         return queryRefetch({
           cancelRefetch: true,
           throwOnError: false
@@ -141,6 +140,11 @@ const useDataQuery = (query, {
         variablesHash.current = mergedHash;
         setVariables(mergedVariables);
       }
+    } // Enable the query after the variables have been set to prevent extra request
+
+
+    if (!enabled) {
+      setEnabled(true);
     } // This promise does not currently reject on errors
 
 

package/build/cjs/react/hooks/useDataQuery.test.js

@@ -507,6 +507,111 @@ describe('useDataQuery', () => {
     });
   });
   describe('return values: refetch', () => {
+    it('Should only trigger a single request when refetch is called on a lazy query with new variables', async () => {
+      const spy = jest.fn((type, query) => {
+        if (query.id === '1') {
+          return 42;
+        }
+
+        return 0;
+      });
+      const data = {
+        answer: spy
+      };
+      const query = {
+        x: {
+          resource: 'answer',
+          id: ({
+            id
+          }) => id
+        }
+      };
+
+      const wrapper = ({
+        children
+      }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+        data: data
+      }, children);
+
+      const {
+        result,
+        waitFor
+      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        lazy: true
+      }), {
+        wrapper
+      });
+      expect(spy).not.toHaveBeenCalled();
+      (0, _reactHooks.act)(() => {
+        result.current.refetch({
+          id: '1'
+        });
+      });
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
+      });
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+    it('Should only trigger a single request when refetch is called on a lazy query with identical variables', async () => {
+      const spy = jest.fn((type, query) => {
+        if (query.id === '1') {
+          return 42;
+        }
+
+        return 0;
+      });
+      const data = {
+        answer: spy
+      };
+      const query = {
+        x: {
+          resource: 'answer',
+          id: ({
+            id
+          }) => id
+        }
+      };
+
+      const wrapper = ({
+        children
+      }) => /*#__PURE__*/React.createElement(_CustomDataProvider.CustomDataProvider, {
+        data: data
+      }, children);
+
+      const {
+        result,
+        waitFor
+      } = (0, _reactHooks.renderHook)(() => (0, _useDataQuery.useDataQuery)(query, {
+        lazy: true,
+        variables: {
+          id: '1'
+        }
+      }), {
+        wrapper
+      });
+      expect(spy).not.toHaveBeenCalled();
+      (0, _reactHooks.act)(() => {
+        result.current.refetch({
+          id: '1'
+        });
+      });
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
+      });
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
     it('Should have a stable identity if the variables have not changed', async () => {
       const data = {
         answer: () => 42

package/build/es/react/hooks/useDataQuery.js

@@ -104,10 +104,6 @@ export const useDataQuery = (query, {
       }) => data);
     }
 
-    if (!enabled) {
-      setEnabled(true);
-    }
-
     if (newVariables) {
       // Use cached hash if it exists
       const currentHash = variablesHash.current || stableVariablesHash(variables);
@@ -117,8 +113,11 @@ export const useDataQuery = (query, {
       const mergedHash = stableVariablesHash(mergedVariables);
       const identical = currentHash === mergedHash;
 
-      if (identical) {
-        // If the variables are identical we'll need to trigger the refetch manually
+      if (identical && enabled) {
+        /**
+         * If the variables are identical and the query is enabled
+         * we'll need to trigger the refetch manually
+         */
         return queryRefetch({
           cancelRefetch: true,
           throwOnError: false
@@ -129,6 +128,11 @@ export const useDataQuery = (query, {
         variablesHash.current = mergedHash;
         setVariables(mergedVariables);
       }
+    } // Enable the query after the variables have been set to prevent extra request
+
+
+    if (!enabled) {
+      setEnabled(true);
     } // This promise does not currently reject on errors
 
 

package/build/es/react/hooks/useDataQuery.test.js

@@ -497,6 +497,111 @@ describe('useDataQuery', () => {
     });
   });
   describe('return values: refetch', () => {
+    it('Should only trigger a single request when refetch is called on a lazy query with new variables', async () => {
+      const spy = jest.fn((type, query) => {
+        if (query.id === '1') {
+          return 42;
+        }
+
+        return 0;
+      });
+      const data = {
+        answer: spy
+      };
+      const query = {
+        x: {
+          resource: 'answer',
+          id: ({
+            id
+          }) => id
+        }
+      };
+
+      const wrapper = ({
+        children
+      }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+
+      const {
+        result,
+        waitFor
+      } = renderHook(() => useDataQuery(query, {
+        lazy: true
+      }), {
+        wrapper
+      });
+      expect(spy).not.toHaveBeenCalled();
+      act(() => {
+        result.current.refetch({
+          id: '1'
+        });
+      });
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
+      });
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+    it('Should only trigger a single request when refetch is called on a lazy query with identical variables', async () => {
+      const spy = jest.fn((type, query) => {
+        if (query.id === '1') {
+          return 42;
+        }
+
+        return 0;
+      });
+      const data = {
+        answer: spy
+      };
+      const query = {
+        x: {
+          resource: 'answer',
+          id: ({
+            id
+          }) => id
+        }
+      };
+
+      const wrapper = ({
+        children
+      }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+        data: data
+      }, children);
+
+      const {
+        result,
+        waitFor
+      } = renderHook(() => useDataQuery(query, {
+        lazy: true,
+        variables: {
+          id: '1'
+        }
+      }), {
+        wrapper
+      });
+      expect(spy).not.toHaveBeenCalled();
+      act(() => {
+        result.current.refetch({
+          id: '1'
+        });
+      });
+      await waitFor(() => {
+        expect(result.current).toMatchObject({
+          loading: false,
+          called: true,
+          data: {
+            x: 42
+          }
+        });
+      });
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
     it('Should have a stable identity if the variables have not changed', async () => {
       const data = {
         answer: () => 42

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-data",
-    "version": "3.2.6",
+    "version": "3.2.7",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -22,7 +22,7 @@
         "build/**"
     ],
     "peerDependencies": {
-        "@dhis2/app-service-config": "3.2.6",
+        "@dhis2/app-service-config": "3.2.7",
         "@dhis2/cli-app-scripts": "^7.1.1",
         "prop-types": "^15.7.2",
         "react": "^16.8",