@dhis2/analytics 23.13.13 → 24.0.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [24.0.0](https://github.com/dhis2/analytics/compare/v23.13.13...v24.0.0) (2022-08-22)
+
+
+### Bug Fixes
+
+* add support for Maps app (LIBS-339) ([#1322](https://github.com/dhis2/analytics/issues/1322)) ([b92717d](https://github.com/dhis2/analytics/commit/b92717d941d7bdb15394cecd663fa7fa9b1a57f2))
+
+
+### BREAKING CHANGES
+
+* the type prop changed from the plural version to the singular, this requires updating the apps that use the AboutAOUnit component.
+
 ## [23.13.13](https://github.com/dhis2/analytics/compare/v23.13.12...v23.13.13) (2022-08-22)
 
 

package/build/cjs/components/AboutAOUnit/AboutAOUnit.js

@@ -25,6 +25,8 @@ var _list = require("../../modules/list.js");
 
 var _AboutAOUnitStyle = _interopRequireDefault(require("./styles/AboutAOUnit.style.js"));
 
+var _utils = require("./utils.js");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
@@ -36,7 +38,7 @@ const READ_AND_WRITE = 'rw';
 
 const getQueries = type => ({
   ao: {
-    resource: type,
+    resource: _utils.AOTypeMap[type].apiEndpoint,
     id: _ref => {
       let {
         id
@@ -59,22 +61,24 @@ const getQueries = type => ({
 });
 
 const getSubscribeMutation = (type, id) => ({
-  resource: "".concat(type, "/").concat(id, "/subscriber"),
+  resource: "".concat(_utils.AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
   type: 'create'
 });
 
 const getUnsubscribeMutation = (type, id) => ({
-  resource: "".concat(type, "/").concat(id, "/subscriber"),
+  resource: "".concat(_utils.AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
   type: 'delete'
 });
 
 const AboutAOUnit = _ref3 => {
+  var _data$ao$createdBy;
+
   let {
     type,
     id
   } = _ref3;
   const [isExpanded, setIsExpanded] = (0, _react.useState)(true);
-  const queries = (0, _react.useMemo)(() => getQueries(type), []);
+  const queries = (0, _react.useMemo)(() => getQueries(type), [type]);
   const {
     data,
     loading: dataIsLoading,
@@ -82,8 +86,8 @@ const AboutAOUnit = _ref3 => {
   } = (0, _appRuntime.useDataQuery)(queries, {
     lazy: true
   });
-  const subscribeMutation = (0, _react.useMemo)(() => getSubscribeMutation(type, id), []);
-  const unsubscribeMutation = (0, _react.useMemo)(() => getUnsubscribeMutation(type, id), []);
+  const subscribeMutation = (0, _react.useMemo)(() => getSubscribeMutation(type, id), [type, id]);
+  const unsubscribeMutation = (0, _react.useMemo)(() => getUnsubscribeMutation(type, id), [type, id]);
   const [subscribe, {
     loading: subscribeIsLoading
   }] = (0, _appRuntime.useDataMutation)(subscribeMutation, {
@@ -112,7 +116,7 @@ const AboutAOUnit = _ref3 => {
         id
       });
     }
-  }, [type, id, refetch]);
+  }, [id, refetch]);
 
   const getAccessLevelString = access => {
     const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -159,7 +163,7 @@ const AboutAOUnit = _ref3 => {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "header"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "title"
-  }, _d2I18n.default.t('About this visualization')), isExpanded ? /*#__PURE__*/_react.default.createElement(_ui.IconChevronUp24, {
+  }, (0, _utils.getTranslatedString)(type, 'unitTitle')), isExpanded ? /*#__PURE__*/_react.default.createElement(_ui.IconChevronUp24, {
     color: _ui.colors.grey700
   }) : /*#__PURE__*/_react.default.createElement(_ui.IconChevronDown24, {
     color: _ui.colors.grey700
@@ -189,9 +193,11 @@ const AboutAOUnit = _ref3 => {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconUser16, {
     color: _ui.colors.grey700
-  }), _d2I18n.default.t('Created {{time}} by {{author}}', {
+  }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? _d2I18n.default.t('Created {{time}} by {{author}}', {
     time: (0, _moment.default)(data.ao.created).fromNow(),
     author: data.ao.createdBy.displayName
+  }) : _d2I18n.default.t('Created {{time}}', {
+    time: (0, _moment.default)(data.ao.created).fromNow()
   })), /*#__PURE__*/_react.default.createElement("p", {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconView16, {

package/build/cjs/components/AboutAOUnit/utils.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTranslatedString = exports.AO_TYPE_VISUALIZATION = exports.AO_TYPE_MAP = exports.AO_TYPE_EVENT_VISUALIZATION = exports.AOTypeMap = void 0;
+
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const AO_TYPE_VISUALIZATION = 'visualization';
+exports.AO_TYPE_VISUALIZATION = AO_TYPE_VISUALIZATION;
+const AO_TYPE_MAP = 'map';
+exports.AO_TYPE_MAP = AO_TYPE_MAP;
+const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
+exports.AO_TYPE_EVENT_VISUALIZATION = AO_TYPE_EVENT_VISUALIZATION;
+const AOTypeMap = {
+  [AO_TYPE_VISUALIZATION]: {
+    apiEndpoint: 'visualizations'
+  },
+  [AO_TYPE_MAP]: {
+    apiEndpoint: 'maps'
+  },
+  [AO_TYPE_EVENT_VISUALIZATION]: {
+    apiEndpoint: 'eventVisualizations'
+  }
+};
+exports.AOTypeMap = AOTypeMap;
+const NO_TYPE = 'NO_TYPE';
+const texts = {
+  [AO_TYPE_MAP]: {
+    unitTitle: _d2I18n.default.t('About this map')
+  },
+  [AO_TYPE_EVENT_VISUALIZATION]: {
+    unitTitle: _d2I18n.default.t('About this line list')
+  },
+  [AO_TYPE_VISUALIZATION]: {
+    unitTitle: _d2I18n.default.t('About this visualization')
+  },
+  [NO_TYPE]: {
+    unitTitle: _d2I18n.default.t('About this visualization')
+  }
+};
+
+const getTranslatedString = (type, key) => (texts[type] || texts[NO_TYPE])[key];
+
+exports.getTranslatedString = getTranslatedString;

package/build/cjs/locales/en/translations.json

@@ -5,10 +5,10 @@
     "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
     "Shared with {{commaSeparatedListOfUsersAndGroups}}": "Shared with {{commaSeparatedListOfUsersAndGroups}}",
     "Not shared with any users or groups": "Not shared with any users or groups",
-    "About this visualization": "About this visualization",
     "No description": "No description",
     "Last updated {{time}}": "Last updated {{time}}",
     "Created {{time}} by {{author}}": "Created {{time}} by {{author}}",
+    "Created {{time}}": "Created {{time}}",
     "Viewed {{count}} times": "Viewed 1 time",
     "Viewed {{count}} times_plural": "Viewed {{count}} times",
     "Notifications": "Notifications",
@@ -16,6 +16,9 @@
     "Unsubscribe": "Unsubscribe",
     "Subscribe to get updates about new interpretations.": "Subscribe to get updates about new interpretations.",
     "Subscribe": "Subscribe",
+    "About this map": "About this map",
+    "About this line list": "About this line list",
+    "About this visualization": "About this visualization",
     "This app could not retrieve required data.": "This app could not retrieve required data.",
     "Network error": "Network error",
     "Data Type": "Data Type",

package/build/es/components/AboutAOUnit/AboutAOUnit.js

@@ -8,12 +8,13 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useMemo, useState } from 'react';
 import { formatList } from '../../modules/list.js';
 import styles from './styles/AboutAOUnit.style.js';
+import { getTranslatedString, AOTypeMap } from './utils.js';
 const READ_ONLY = 'r';
 const READ_AND_WRITE = 'rw';
 
 const getQueries = type => ({
   ao: {
-    resource: type,
+    resource: AOTypeMap[type].apiEndpoint,
     id: _ref => {
       let {
         id
@@ -36,22 +37,24 @@ const getQueries = type => ({
 });
 
 const getSubscribeMutation = (type, id) => ({
-  resource: "".concat(type, "/").concat(id, "/subscriber"),
+  resource: "".concat(AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
   type: 'create'
 });
 
 const getUnsubscribeMutation = (type, id) => ({
-  resource: "".concat(type, "/").concat(id, "/subscriber"),
+  resource: "".concat(AOTypeMap[type].apiEndpoint, "/").concat(id, "/subscriber"),
   type: 'delete'
 });
 
 const AboutAOUnit = _ref3 => {
+  var _data$ao$createdBy;
+
   let {
     type,
     id
   } = _ref3;
   const [isExpanded, setIsExpanded] = useState(true);
-  const queries = useMemo(() => getQueries(type), []);
+  const queries = useMemo(() => getQueries(type), [type]);
   const {
     data,
     loading: dataIsLoading,
@@ -59,8 +62,8 @@ const AboutAOUnit = _ref3 => {
   } = useDataQuery(queries, {
     lazy: true
   });
-  const subscribeMutation = useMemo(() => getSubscribeMutation(type, id), []);
-  const unsubscribeMutation = useMemo(() => getUnsubscribeMutation(type, id), []);
+  const subscribeMutation = useMemo(() => getSubscribeMutation(type, id), [type, id]);
+  const unsubscribeMutation = useMemo(() => getUnsubscribeMutation(type, id), [type, id]);
   const [subscribe, {
     loading: subscribeIsLoading
   }] = useDataMutation(subscribeMutation, {
@@ -89,7 +92,7 @@ const AboutAOUnit = _ref3 => {
         id
       });
     }
-  }, [type, id, refetch]);
+  }, [id, refetch]);
 
   const getAccessLevelString = access => {
     const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -136,7 +139,7 @@ const AboutAOUnit = _ref3 => {
     className: "jsx-".concat(styles.__hash) + " " + "header"
   }, /*#__PURE__*/React.createElement("span", {
     className: "jsx-".concat(styles.__hash) + " " + "title"
-  }, i18n.t('About this visualization')), isExpanded ? /*#__PURE__*/React.createElement(IconChevronUp24, {
+  }, getTranslatedString(type, 'unitTitle')), isExpanded ? /*#__PURE__*/React.createElement(IconChevronUp24, {
     color: colors.grey700
   }) : /*#__PURE__*/React.createElement(IconChevronDown24, {
     color: colors.grey700
@@ -166,9 +169,11 @@ const AboutAOUnit = _ref3 => {
     className: "jsx-".concat(styles.__hash) + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconUser16, {
     color: colors.grey700
-  }), i18n.t('Created {{time}} by {{author}}', {
+  }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? i18n.t('Created {{time}} by {{author}}', {
     time: moment(data.ao.created).fromNow(),
     author: data.ao.createdBy.displayName
+  }) : i18n.t('Created {{time}}', {
+    time: moment(data.ao.created).fromNow()
   })), /*#__PURE__*/React.createElement("p", {
     className: "jsx-".concat(styles.__hash) + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconView16, {

package/build/es/components/AboutAOUnit/utils.js

@@ -0,0 +1,31 @@
+import i18n from '@dhis2/d2-i18n';
+export const AO_TYPE_VISUALIZATION = 'visualization';
+export const AO_TYPE_MAP = 'map';
+export const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
+export const AOTypeMap = {
+  [AO_TYPE_VISUALIZATION]: {
+    apiEndpoint: 'visualizations'
+  },
+  [AO_TYPE_MAP]: {
+    apiEndpoint: 'maps'
+  },
+  [AO_TYPE_EVENT_VISUALIZATION]: {
+    apiEndpoint: 'eventVisualizations'
+  }
+};
+const NO_TYPE = 'NO_TYPE';
+const texts = {
+  [AO_TYPE_MAP]: {
+    unitTitle: i18n.t('About this map')
+  },
+  [AO_TYPE_EVENT_VISUALIZATION]: {
+    unitTitle: i18n.t('About this line list')
+  },
+  [AO_TYPE_VISUALIZATION]: {
+    unitTitle: i18n.t('About this visualization')
+  },
+  [NO_TYPE]: {
+    unitTitle: i18n.t('About this visualization')
+  }
+};
+export const getTranslatedString = (type, key) => (texts[type] || texts[NO_TYPE])[key];

package/build/es/locales/en/translations.json

@@ -5,10 +5,10 @@
     "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
     "Shared with {{commaSeparatedListOfUsersAndGroups}}": "Shared with {{commaSeparatedListOfUsersAndGroups}}",
     "Not shared with any users or groups": "Not shared with any users or groups",
-    "About this visualization": "About this visualization",
     "No description": "No description",
     "Last updated {{time}}": "Last updated {{time}}",
     "Created {{time}} by {{author}}": "Created {{time}} by {{author}}",
+    "Created {{time}}": "Created {{time}}",
     "Viewed {{count}} times": "Viewed 1 time",
     "Viewed {{count}} times_plural": "Viewed {{count}} times",
     "Notifications": "Notifications",
@@ -16,6 +16,9 @@
     "Unsubscribe": "Unsubscribe",
     "Subscribe to get updates about new interpretations.": "Subscribe to get updates about new interpretations.",
     "Subscribe": "Subscribe",
+    "About this map": "About this map",
+    "About this line list": "About this line list",
+    "About this visualization": "About this visualization",
     "This app could not retrieve required data.": "This app could not retrieve required data.",
     "Network error": "Network error",
     "Data Type": "Data Type",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.13.13",
+    "version": "24.0.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -35,7 +35,7 @@
         "@dhis2/cli-app-scripts": "^9.0.1",
         "@dhis2/cli-style": "^10.4.1",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^8.4.2",
+        "@dhis2/ui": "^8.4.9",
         "@sambego/storybook-state": "^2.0.1",
         "@storybook/addons": "^6.5.9",
         "@storybook/preset-create-react-app": "^3.1.7",
@@ -62,7 +62,7 @@
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",
-        "highcharts": "^10.1.0",
+        "highcharts": "^10.2.0",
         "lodash": "^4.17.21",
         "mathjs": "^9.4.2",
         "react-beautiful-dnd": "^10.1.1",