@dhis2/app-service-data 3.2.7 → 3.3.0

package/build/cjs/__tests__/integration.test.js

@@ -10,8 +10,8 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-describe('Testing custom data provider and useQuery hook', () => {
-  it('Should render without failing', async () => {
+describe('<DataQuery />', () => {
+  it('should render without failing', async () => {
     const data = {
       answer: 42
     };
@@ -22,18 +22,8 @@ describe('Testing custom data provider and useQuery hook', () => {
       data: data
     }, children);
 
-    const renderFunction = jest.fn(({
-      loading,
-      error,
-      data
-    }) => {
-      if (loading) return 'loading';
-      if (error) return /*#__PURE__*/React.createElement("div", null, "error: ", error.message);
-      return /*#__PURE__*/React.createElement("div", null, "data: ", data && data.answer);
-    });
-    const {
-      getByText
-    } = (0, _react.render)( /*#__PURE__*/React.createElement(_react3.DataQuery, {
+    const renderFunction = jest.fn(() => null);
+    (0, _react.render)( /*#__PURE__*/React.createElement(_react3.DataQuery, {
       query: {
         answer: {
           resource: 'answer'
@@ -42,24 +32,21 @@ describe('Testing custom data provider and useQuery hook', () => {
     }, renderFunction), {
       wrapper
     });
-    expect(getByText(/loading/i)).not.toBeUndefined();
     expect(renderFunction).toHaveBeenCalledTimes(1);
     expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
       called: true,
       loading: true
     }));
     await (0, _react.waitFor)(() => {
-      getByText(/data: /i);
+      expect(renderFunction).toHaveBeenCalledTimes(2);
+      expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
+        called: true,
+        loading: false,
+        data
+      }));
     });
-    expect(getByText(/data: /i)).toHaveTextContent("data: ".concat(data.answer));
-    expect(renderFunction).toHaveBeenCalledTimes(2);
-    expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
-      called: true,
-      loading: false,
-      data
-    }));
   });
-  it('Should render an error', async () => {
+  it('should render an error', async () => {
     const expectedError = new Error('Something went wrong');
     const data = {
       test: () => {
@@ -73,18 +60,8 @@ describe('Testing custom data provider and useQuery hook', () => {
       data: data
     }, children);
 
-    const renderFunction = jest.fn(({
-      loading,
-      error,
-      data
-    }) => {
-      if (loading) return 'loading';
-      if (error) return /*#__PURE__*/React.createElement("div", null, "error: ", error.message);
-      return /*#__PURE__*/React.createElement("div", null, "data: ", data && data.test);
-    });
-    const {
-      getByText
-    } = (0, _react.render)( /*#__PURE__*/React.createElement(_react3.DataQuery, {
+    const renderFunction = jest.fn(() => null);
+    (0, _react.render)( /*#__PURE__*/React.createElement(_react3.DataQuery, {
       query: {
         test: {
           resource: 'test'
@@ -93,21 +70,18 @@ describe('Testing custom data provider and useQuery hook', () => {
     }, renderFunction), {
       wrapper
     });
-    expect(getByText(/loading/i)).not.toBeUndefined();
     expect(renderFunction).toHaveBeenCalledTimes(1);
     expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
       called: true,
       loading: true
     }));
     await (0, _react.waitFor)(() => {
-      getByText(/error: /i);
+      expect(renderFunction).toHaveBeenCalledTimes(2);
+      expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
+        called: true,
+        loading: false,
+        error: expectedError
+      }));
     });
-    expect(renderFunction).toHaveBeenCalledTimes(2);
-    expect(getByText(/error: /i)).toHaveTextContent("error: ".concat(expectedError.message));
-    expect(renderFunction).toHaveBeenLastCalledWith(expect.objectContaining({
-      called: true,
-      loading: false,
-      error: expectedError
-    }));
   });
 });

package/build/cjs/__tests__/mutations.test.js

@@ -2,82 +2,73 @@
 
 var _react = require("@testing-library/react");
 
-var _react2 = _interopRequireDefault(require("react"));
+var React = _interopRequireWildcard(require("react"));
 
 var _react3 = require("../react");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-const mockBackend = {
-  target: jest.fn((type, query) => {
-    expect(query.resource).toBe('target');
-    expect(type).toBe('create');
-    expect(query.data).toMatchObject({
-      question: '?'
-    });
-    return Promise.resolve({
-      answer: 42
-    });
-  })
-};
-describe('Test mutations', () => {
-  it('Should call the mock callback', async () => {
-    let doMutation;
-    const renderFunction = jest.fn(([mutate, {
-      called,
-      loading,
-      error,
-      data
-    }]) => {
-      doMutation = mutate;
-      if (!called) return 'uncalled';
-      if (loading) return 'loading';
-      if (error) return /*#__PURE__*/_react2.default.createElement("div", null, "error: ", error.message);
-      if (data) return /*#__PURE__*/_react2.default.createElement("div", null, "data: ", data.answer);
-    });
-    const testMutation = {
-      resource: 'target',
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+describe('<DataMutation />', () => {
+  it('should render without failing', async () => {
+    const endpointSpy = jest.fn(() => Promise.resolve(42));
+    const mutation = {
+      resource: 'answer',
       type: 'create',
       data: {
         question: '?'
       }
     };
-    const {
-      getByText
-    } = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_react3.CustomDataProvider, {
-      data: mockBackend
-    }, /*#__PURE__*/_react2.default.createElement(_react3.DataMutation, {
-      mutation: testMutation
-    }, renderFunction)));
-    expect(getByText(/uncalled/i)).not.toBeUndefined();
-    expect(renderFunction).toHaveBeenCalledTimes(1);
-    expect(mockBackend.target).not.toHaveBeenCalled();
-    expect(renderFunction).toHaveBeenLastCalledWith([expect.any(Function), {
+    const data = {
+      answer: endpointSpy
+    };
+
+    const wrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(_react3.CustomDataProvider, {
+      data: data
+    }, children);
+
+    const renderSpy = jest.fn(() => null);
+    (0, _react.render)( /*#__PURE__*/React.createElement(_react3.DataMutation, {
+      mutation: mutation
+    }, renderSpy), {
+      wrapper
+    });
+    expect(endpointSpy).toHaveBeenCalledTimes(0);
+    expect(renderSpy).toHaveBeenCalledTimes(1);
+    expect(renderSpy).toHaveBeenLastCalledWith([expect.any(Function), expect.objectContaining({
       called: false,
       loading: false,
       engine: expect.any(Object)
-    }]);
-    expect(doMutation).not.toBeUndefined();
-    (0, _react.act)(() => {
-      doMutation && doMutation();
+    })]);
+    await (0, _react.act)(async () => {
+      const firstRenderSpyCall = renderSpy.mock.calls[0];
+      const firstRenderSpyArgument = firstRenderSpyCall[0];
+      const [mutate] = firstRenderSpyArgument;
+      await mutate();
+    });
+    (0, _react.waitFor)(() => {
+      expect(endpointSpy).toHaveBeenCalledTimes(1);
+      expect(renderSpy).toHaveBeenCalledTimes(2);
+      expect(renderSpy).toHaveBeenLastCalledWith([expect.any(Function), expect.objectContaining({
+        called: true,
+        loading: true,
+        engine: expect.any(Object)
+      })]);
+    });
+    (0, _react.waitFor)(() => {
+      expect(endpointSpy).toHaveBeenCalledTimes(1);
+      expect(renderSpy).toHaveBeenCalledTimes(3);
+      expect(renderSpy).toHaveBeenLastCalledWith([expect.any(Function), expect.objectContaining({
+        called: true,
+        loading: false,
+        data: {
+          answer: 42
+        },
+        engine: expect.any(Object)
+      })]);
     });
-    expect(renderFunction).toHaveBeenCalledTimes(2);
-    expect(renderFunction).toHaveBeenLastCalledWith([doMutation, {
-      called: true,
-      loading: true,
-      engine: expect.any(Object)
-    }]);
-    expect(mockBackend.target).toHaveBeenCalledTimes(1);
-    await (0, _react.waitFor)(() => getByText(/data: /i));
-    expect(renderFunction).toHaveBeenCalledTimes(3);
-    expect(renderFunction).toHaveBeenLastCalledWith([doMutation, {
-      called: true,
-      loading: false,
-      data: {
-        answer: 42
-      },
-      engine: expect.any(Object)
-    }]);
-    expect(getByText(/data: /i)).toHaveTextContent("data: 42");
   });
 });

package/build/cjs/links/CustomDataLink.js

@@ -30,7 +30,7 @@ class CustomDataLink {
 
     const customResource = this.data[query.resource];
 
-    if (!customResource) {
+    if (customResource === undefined) {
       if (this.failOnMiss) {
         throw new Error("No data provided for resource type ".concat(query.resource, "!"));
       }

package/build/cjs/links/RestAPILink/queryToRequestOptions/multipartFormDataMatchers.js

@@ -3,14 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSvgConversion = exports.isAppInstall = exports.isStaticContentUpload = exports.isMessageConversationAttachment = exports.isFileResourceUpload = void 0;
+exports.isSvgConversion = exports.isAppInstall = exports.isStaticContentUpload = exports.isMessageConversationAttachment = exports.isFileResourceUpload = exports.isDataValue = void 0;
 
 /*
  * Requests that expect a "multipart/form-data" Content-Type have been collected by scanning
  * the developer documentation:
  * https://docs.dhis2.org/master/en/developer/html/dhis2_developer_manual_full.html
  */
-// POST to 'fileResources' (upload a file resource)
+// Post to 'dataValues' (send/update a data value; endpoint doesn't support JSON)
+// For file-uploads too
+const isDataValue = (type, {
+  resource
+}) => type === 'create' && (resource === 'dataValues' || resource === 'dataValues/file'); // POST to 'fileResources' (upload a file resource)
+
+
+exports.isDataValue = isDataValue;
+
 const isFileResourceUpload = (type, {
   resource
 }) => type === 'create' && resource === 'fileResources'; // POST to 'messageConversations/attachments' (upload a message conversation attachment)

package/build/cjs/links/RestAPILink/queryToRequestOptions/multipartFormDataMatchers.test.js

@@ -2,6 +2,23 @@
 
 var _multipartFormDataMatchers = require("./multipartFormDataMatchers");
 
+describe('isDataValue', () => {
+  it('returns true for a POST to "dataValues"', () => {
+    expect((0, _multipartFormDataMatchers.isDataValue)('create', {
+      resource: 'dataValues'
+    })).toEqual(true);
+  });
+  it('returns true for a POST to "dataValues/file"', () => {
+    expect((0, _multipartFormDataMatchers.isDataValue)('create', {
+      resource: 'dataValues/file'
+    })).toEqual(true);
+  });
+  it('returns false for a POST to a different resource', () => {
+    expect((0, _multipartFormDataMatchers.isDataValue)('create', {
+      resource: 'somethingElse'
+    })).toEqual(false);
+  });
+});
 describe('isFileResourceUpload', () => {
   it('returns true for a POST to "fileResources"', () => {
     expect((0, _multipartFormDataMatchers.isFileResourceUpload)('create', {

package/build/cjs/links/RestAPILink/queryToRequestOptions/textPlainMatchers.js

@@ -36,7 +36,7 @@ exports.isCreateFeedbackMessage = isCreateFeedbackMessage;
 const isCreateInterpretation = (type, {
   resource
 }) => {
-  const pattern = /^interpretations\/(?:reportTable|chart|visualization|map|eventReport|eventChart|dataSetReport)\/[a-zA-Z0-9]{11}$/;
+  const pattern = /^interpretations\/(?:reportTable|chart|visualization|map|eventVisualization|eventReport|eventChart|dataSetReport)\/[a-zA-Z0-9]{11}$/;
   return type === 'create' && pattern.test(resource);
 }; // PUT to `interpretations/${id}` (update an interpretation)