@dhis2/app-service-data 3.2.5 → 3.2.9

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/build/types/links/RestAPILink/queryToRequestOptions/textPlainMatchers.d.ts

@@ -1,7 +1,8 @@
 import { ResolvedResourceQuery, FetchType } from '../../../engine';
 export declare const isReplyToMessageConversation: (type: FetchType, { resource }: ResolvedResourceQuery) => boolean;
 export declare const isCreateFeedbackMessage: (type: FetchType, { resource }: ResolvedResourceQuery) => boolean;
-export declare const isCreateOrUpdateInterpretation: (type: FetchType, { resource, id }: ResolvedResourceQuery) => boolean;
+export declare const isCreateInterpretation: (type: FetchType, { resource }: ResolvedResourceQuery) => boolean;
+export declare const isUpdateInterpretation: (type: FetchType, { resource, id }: ResolvedResourceQuery) => boolean;
 export declare const isCommentOnInterpretation: (type: FetchType, { resource }: ResolvedResourceQuery) => boolean;
 export declare const isInterpretationCommentUpdate: (type: FetchType, { resource, id }: ResolvedResourceQuery) => boolean;
 export declare const isAddOrUpdateSystemOrUserSetting: (type: FetchType, { resource }: ResolvedResourceQuery) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-data",
-    "version": "3.2.5",
+    "version": "3.2.9",
     "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.5",
+        "@dhis2/app-service-config": "3.2.9",
         "@dhis2/cli-app-scripts": "^7.1.1",
         "prop-types": "^15.7.2",
         "react": "^16.8",