@dhis2/analytics 28.0.2 → 28.0.3

package/build/cjs/__demo__/DataDimension.stories.js

@@ -19,8 +19,8 @@ const Wrapper = story => /*#__PURE__*/_react.default.createElement(_appServiceCo
     }
   }
 }, /*#__PURE__*/_react.default.createElement(_appRuntime.DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42",
+  apiVersion: "42"
 }, story()));
 var _default = exports.default = {
   title: 'DataDimension',

package/build/cjs/__demo__/OpenFileDialog.stories.js

@@ -10,8 +10,8 @@ var _OpenFileDialog = require("../components/OpenFileDialog/OpenFileDialog.js");
 var _visTypes = require("../modules/visTypes.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const Wrapper = story => /*#__PURE__*/_react.default.createElement(_appRuntime.DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story());
 const user = {
   displayName: 'John Traore',

package/build/cjs/__demo__/OrgUnitDimension.stories.js

@@ -11,8 +11,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const Wrapper = story => /*#__PURE__*/_react.default.createElement(_appRuntime.DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story());
 const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
 var _default = exports.default = {

package/build/cjs/__demo__/PeriodDimension.stories.js

@@ -15,8 +15,8 @@ const Wrapper = story => /*#__PURE__*/_react.default.createElement(_appServiceCo
     systemInfo: {}
   }
 }, /*#__PURE__*/_react.default.createElement(_appRuntime.DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story()));
 const selectedPeriods = [{
   id: 'LAST_12_MONTHS',

package/build/cjs/components/TranslationDialog/TranslationModal/TranslationModal.js

@@ -23,7 +23,7 @@ const TranslationModal = _ref => {
   } = _ref;
   const [translations, setTranslations] = (0, _react.useState)([]);
   const endpointPath = new URL(objectToTranslate.href).pathname;
-  const endpointPathMatch = endpointPath.match(/api\/\d+\/(?<resource>.+)/);
+  const endpointPathMatch = endpointPath.match(/api\/(?:\d+\/)?(?<resource>.+)/);
   const resource = endpointPathMatch !== null && endpointPathMatch !== void 0 && endpointPathMatch.groups ? endpointPathMatch.groups.resource : null;
   const {
     translationsData,

package/build/cjs/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js

@@ -0,0 +1,52 @@
+"use strict";
+
+var _ui = require("@dhis2/ui");
+var _enzyme = require("enzyme");
+var _react = _interopRequireDefault(require("react"));
+var _TranslationModal = require("../TranslationModal.js");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const mockUseTranslationResults = jest.fn(() => ({
+  translationsData: undefined,
+  fetching: false
+}));
+jest.mock('../useTranslationsResults.js', () => ({
+  useTranslationsResults: args => mockUseTranslationResults(args)
+}));
+describe('The Translation Dialog component', () => {
+  let shallowTranslationModal;
+  let props;
+  const onClose = jest.fn();
+  const onTranslationSaved = jest.fn();
+  const getTranslationModalComponent = props => {
+    if (!shallowTranslationModal) {
+      shallowTranslationModal = (0, _enzyme.shallow)(/*#__PURE__*/_react.default.createElement(_TranslationModal.TranslationModal, props));
+    }
+    return shallowTranslationModal;
+  };
+  beforeEach(() => {
+    shallowTranslationModal = undefined;
+    props = {
+      fieldsToTranslate: ['name', 'description'],
+      objectToTranslate: {
+        name: 'Test object',
+        href: 'https://dhis2.tld/path/api/visualization/object-id'
+      },
+      onClose,
+      onTranslationSaved
+    };
+  });
+  it('renders a Modal component', () => {
+    expect(getTranslationModalComponent(props).find(_ui.Modal)).toHaveLength(1);
+  });
+  it("renders a ModalTitle containing the object's name", () => {
+    expect(getTranslationModalComponent(props).find(_ui.ModalTitle).childAt(0).text()).toEqual(`Translate: ${props.objectToTranslate.name}`);
+  });
+  test.each(['https://dhis2.tld/path/api/visualization/object-id', 'https://dhis2.tld/path/api/42/visualization/object-id'])('uses the correct resource for the translation endpoint', href => {
+    props.objectToTranslate.href = href;
+    getTranslationModalComponent(props);
+    expect(mockUseTranslationResults).toHaveBeenCalled();
+    expect(mockUseTranslationResults).toHaveBeenCalledWith({
+      resource: 'visualization/object-id'
+    });
+  });
+});

package/build/es/__demo__/DataDimension.stories.js

@@ -10,8 +10,8 @@ const Wrapper = story => /*#__PURE__*/React.createElement(ConfigProvider, {
     }
   }
 }, /*#__PURE__*/React.createElement(DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42",
+  apiVersion: "42"
 }, story()));
 export default {
   title: 'DataDimension',

package/build/es/__demo__/OpenFileDialog.stories.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { OpenFileDialog } from '../components/OpenFileDialog/OpenFileDialog.js';
 import { VIS_TYPE_GROUP_ALL, VIS_TYPE_GROUP_CHARTS, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_COLUMN, VIS_TYPE_BAR, VIS_TYPE_LINE_LIST } from '../modules/visTypes.js';
 const Wrapper = story => /*#__PURE__*/React.createElement(DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story());
 const user = {
   displayName: 'John Traore',

package/build/es/__demo__/OrgUnitDimension.stories.js

@@ -2,8 +2,8 @@ import { DataProvider } from '@dhis2/app-runtime';
 import React, { useState } from 'react';
 import OrgUnitDimension from '../components/OrgUnitDimension/OrgUnitDimension.js';
 const Wrapper = story => /*#__PURE__*/React.createElement(DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story());
 const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
 

package/build/es/__demo__/PeriodDimension.stories.js

@@ -8,8 +8,8 @@ const Wrapper = story => /*#__PURE__*/React.createElement(ConfigProvider, {
     systemInfo: {}
   }
 }, /*#__PURE__*/React.createElement(DataProvider, {
-  baseUrl: "https://test.e2e.dhis2.org/analytics-41dev/",
-  apiVersion: "41"
+  baseUrl: "https://test.e2e.dhis2.org/anly-42/",
+  apiVersion: "42"
 }, story()));
 const selectedPeriods = [{
   id: 'LAST_12_MONTHS',

package/build/es/components/TranslationDialog/TranslationModal/TranslationModal.js

@@ -14,7 +14,7 @@ export const TranslationModal = _ref => {
   } = _ref;
   const [translations, setTranslations] = useState([]);
   const endpointPath = new URL(objectToTranslate.href).pathname;
-  const endpointPathMatch = endpointPath.match(/api\/\d+\/(?<resource>.+)/);
+  const endpointPathMatch = endpointPath.match(/api\/(?:\d+\/)?(?<resource>.+)/);
   const resource = endpointPathMatch !== null && endpointPathMatch !== void 0 && endpointPathMatch.groups ? endpointPathMatch.groups.resource : null;
   const {
     translationsData,

package/build/es/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js

@@ -0,0 +1,49 @@
+import { ModalTitle, Modal } from '@dhis2/ui';
+import { shallow } from 'enzyme';
+import React from 'react';
+import { TranslationModal } from '../TranslationModal.js';
+const mockUseTranslationResults = jest.fn(() => ({
+  translationsData: undefined,
+  fetching: false
+}));
+jest.mock('../useTranslationsResults.js', () => ({
+  useTranslationsResults: args => mockUseTranslationResults(args)
+}));
+describe('The Translation Dialog component', () => {
+  let shallowTranslationModal;
+  let props;
+  const onClose = jest.fn();
+  const onTranslationSaved = jest.fn();
+  const getTranslationModalComponent = props => {
+    if (!shallowTranslationModal) {
+      shallowTranslationModal = shallow(/*#__PURE__*/React.createElement(TranslationModal, props));
+    }
+    return shallowTranslationModal;
+  };
+  beforeEach(() => {
+    shallowTranslationModal = undefined;
+    props = {
+      fieldsToTranslate: ['name', 'description'],
+      objectToTranslate: {
+        name: 'Test object',
+        href: 'https://dhis2.tld/path/api/visualization/object-id'
+      },
+      onClose,
+      onTranslationSaved
+    };
+  });
+  it('renders a Modal component', () => {
+    expect(getTranslationModalComponent(props).find(Modal)).toHaveLength(1);
+  });
+  it("renders a ModalTitle containing the object's name", () => {
+    expect(getTranslationModalComponent(props).find(ModalTitle).childAt(0).text()).toEqual(`Translate: ${props.objectToTranslate.name}`);
+  });
+  test.each(['https://dhis2.tld/path/api/visualization/object-id', 'https://dhis2.tld/path/api/42/visualization/object-id'])('uses the correct resource for the translation endpoint', href => {
+    props.objectToTranslate.href = href;
+    getTranslationModalComponent(props);
+    expect(mockUseTranslationResults).toHaveBeenCalled();
+    expect(mockUseTranslationResults).toHaveBeenCalledWith({
+      resource: 'visualization/object-id'
+    });
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "28.0.2",
+    "version": "28.0.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {