@dhis2/analytics 24.0.6 → 24.0.9

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [24.0.9](https://github.com/dhis2/analytics/compare/v24.0.8...v24.0.9) (2022-09-08)
+
+
+### Bug Fixes
+
+* enable onShare callback and allow refresh AboutAOUnit (DHIS2-13667) ([#1332](https://github.com/dhis2/analytics/issues/1332)) ([80c2819](https://github.com/dhis2/analytics/commit/80c2819c62773947d7a3a2c3daa643f563e75880))
+
+## [24.0.8](https://github.com/dhis2/analytics/compare/v24.0.7...v24.0.8) (2022-09-06)
+
+
+### Bug Fixes
+
+* prevent empty values from displaying a legend color ([#1335](https://github.com/dhis2/analytics/issues/1335)) ([5b6567e](https://github.com/dhis2/analytics/commit/5b6567e75ea1d5252f314108998ff24f181f182b))
+
+## [24.0.7](https://github.com/dhis2/analytics/compare/v24.0.6...v24.0.7) (2022-08-27)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([3246bf2](https://github.com/dhis2/analytics/commit/3246bf2b5eba3ea94b43fcd0dc6d6de4e7b60e46))
+
 ## [24.0.6](https://github.com/dhis2/analytics/compare/v24.0.5...v24.0.6) (2022-08-26)
 
 

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

@@ -70,7 +70,7 @@ const getUnsubscribeMutation = (type, id) => ({
   type: 'delete'
 });
 
-const AboutAOUnit = _ref3 => {
+const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   var _data$ao$createdBy;
 
   let {
@@ -117,6 +117,9 @@ const AboutAOUnit = _ref3 => {
       });
     }
   }, [id, refetch]);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    refresh: refetch
+  }), [refetch]);
 
   const getAccessLevelString = access => {
     const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -233,8 +236,8 @@ const AboutAOUnit = _ref3 => {
   }, _d2I18n.default.t('Subscribe')))))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _AboutAOUnitStyle.default.__hash
   }, _AboutAOUnitStyle.default));
-};
-
+});
+AboutAOUnit.displayName = 'AboutUnit';
 AboutAOUnit.propTypes = {
   id: _propTypes.default.string.isRequired,
   type: _propTypes.default.string.isRequired

package/build/cjs/components/FileMenu/FileMenu.js

@@ -51,7 +51,7 @@ const FileMenu = _ref => {
     onSave,
     onSaveAs,
     onRename,
-    //    onShare,
+    onShare,
     onDelete,
     onError,
     onTranslate
@@ -106,10 +106,10 @@ const FileMenu = _ref => {
 
       case 'sharing':
         return /*#__PURE__*/_react.default.createElement(_ui.SharingDialog, {
-          open: true,
           type: fileType,
           id: fileObject.id,
-          onClose: onDialogClose
+          onClose: onDialogClose,
+          onSave: onShare
         });
 
       case 'getlink':
@@ -265,6 +265,7 @@ FileMenu.defaultProps = {
   onOpen: Function.prototype,
   onRename: Function.prototype,
   onSaveAs: Function.prototype,
+  onShare: Function.prototype,
   onTranslate: Function.prototype
 };
 FileMenu.propTypes = {
@@ -280,7 +281,7 @@ FileMenu.propTypes = {
   onRename: _propTypes.default.func,
   onSave: _propTypes.default.func,
   onSaveAs: _propTypes.default.func,
-  //    onShare: PropTypes.func,
+  onShare: _propTypes.default.func,
   onTranslate: _propTypes.default.func
 };
 var _default = FileMenu;

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

@@ -83,6 +83,7 @@
     "Name": "Ім'я",
     "Description": "Змалювання",
     "Rename": "Перейменувати",
+    "{{objectName}} (copy)": "",
     "Save {{fileType}} as": "",
     "event report": "звіт про подію",
     "line list": "",
@@ -129,14 +130,14 @@
     "Created": "Створено",
     "Last updated": "Останнє оновлення",
     "Type": "Тип",
-    "Clear filters": "",
+    "Clear filters": "Очистити фільтри",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "Відкрити",
     "Couldn't load items": "",
     "There was a problem loading items. Try again or contact your system administrator.": "",
     "No items found. Create a new to get started.": "",
     "No items found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "Create new": "",
+    "Create new": "Створити новий",
     "Open a visualization": "",
     "Loading visualizations": "",
     "Couldn't load visualizations": "",

package/build/cjs/modules/__tests__/getColorByValueFromLegendSet.spec.js

@@ -0,0 +1,162 @@
+"use strict";
+
+var _legends = require("../legends.js");
+
+const positiveLegendSet = {
+  legends: [{
+    startValue: 65,
+    endValue: 75,
+    color: '#2171b5',
+    id: 'ZuBlFGK8U7D',
+    name: '65 - 74'
+  }, {
+    startValue: 35,
+    endValue: 45,
+    color: '#9ecae1',
+    id: 'XTmLeJHmd3m',
+    name: '35 - 44'
+  }, {
+    startValue: 75,
+    endValue: 85,
+    color: '#08519c',
+    id: 'VPEprgLdi1g',
+    name: '75 - 84'
+  }, {
+    startValue: 25,
+    endValue: 35,
+    color: '#c6dbef',
+    id: 'CqUnYcUy2eb',
+    name: '25 - 34'
+  }, {
+    startValue: 15,
+    endValue: 25,
+    color: '#deebf7',
+    id: 'evLlhbRsG6e',
+    name: '15 - 24'
+  }, {
+    startValue: 0,
+    endValue: 5,
+    color: '#FFFFFF',
+    id: 'GHcJ24t8oEs',
+    name: '0 - 4'
+  }, {
+    startValue: 85,
+    endValue: 150,
+    color: '#08306b',
+    id: 'dPFk7tcCg7U',
+    name: '85+'
+  }, {
+    startValue: 45,
+    endValue: 55,
+    color: '#6baed6',
+    id: 'uHBR7cbKoy3',
+    name: '45 - 54'
+  }, {
+    startValue: 5,
+    endValue: 15,
+    color: '#f7fbff',
+    id: 'RUD8IwOsXEW',
+    name: '5 - 14'
+  }, {
+    startValue: 55,
+    endValue: 65,
+    color: '#4292c6',
+    id: 'UojF9VGBvnE',
+    name: '55 - 64'
+  }],
+  name: 'Positive'
+};
+const negativeLegendSet = {
+  legends: [{
+    startValue: -48,
+    endValue: -36,
+    color: '#fecc5c',
+    id: 'TR60hS8mQag',
+    name: '-48 - -36'
+  }, {
+    startValue: -1000,
+    endValue: -60,
+    color: '#D10AFF',
+    id: 'nxCTJlHd9V2',
+    name: 'Critically low'
+  }, {
+    startValue: -24,
+    endValue: -12,
+    color: '#f03b20',
+    id: 'JOYfGUtyLJF',
+    name: '-24 - -12'
+  }, {
+    startValue: -60,
+    endValue: -48,
+    color: '#ffffb2',
+    id: 'JodoDUR31ig',
+    name: '-60 - -48'
+  }, {
+    startValue: -12,
+    endValue: 0,
+    color: '#bd0026',
+    id: 'rFFEKuATWaZ',
+    name: '-12 - 0'
+  }, {
+    startValue: 0,
+    endValue: 10000,
+    color: '#A3A3A3',
+    id: 'rOD16kf9YzA',
+    name: 'Out of bounds'
+  }, {
+    startValue: -36,
+    endValue: -24,
+    color: '#fd8d3c',
+    id: 'i682LxWmGQ6',
+    name: '-36 - -24'
+  }],
+  name: 'Negative'
+};
+const tests = [{
+  legendSet: positiveLegendSet,
+  value: 60,
+  expected: '#4292c6'
+}, {
+  legendSet: positiveLegendSet,
+  value: '60.0',
+  expected: '#4292c6'
+}, {
+  legendSet: positiveLegendSet,
+  value: 0,
+  expected: '#FFFFFF'
+}, {
+  legendSet: positiveLegendSet,
+  value: '',
+  expected: null
+}, {
+  legendSet: positiveLegendSet,
+  value: ' ',
+  expected: null
+}, {
+  legendSet: positiveLegendSet,
+  value: 'ABC',
+  expected: null
+}, {
+  legendSet: negativeLegendSet,
+  value: -50,
+  expected: '#ffffb2'
+}, {
+  legendSet: negativeLegendSet,
+  value: '-50.0',
+  expected: '#ffffb2'
+}, {
+  legendSet: negativeLegendSet,
+  value: 0,
+  expected: '#A3A3A3'
+}, {
+  legendSet: negativeLegendSet,
+  value: '',
+  expected: null
+}];
+describe('getColorByValueFromLegendSet', () => {
+  tests.forEach(t => {
+    it("Legend set: ".concat(t.legendSet.name, ", value: ").concat(t.value, ", expected: ").concat(t.expected), () => {
+      expect((0, _legends.getColorByValueFromLegendSet)(t.legendSet, t.value)).toEqual(t.expected);
+    });
+  });
+});

package/build/cjs/modules/legends.js

@@ -16,8 +16,8 @@ exports.LEGEND_DISPLAY_STYLE_TEXT = LEGEND_DISPLAY_STYLE_TEXT;
 const getLegendByValueFromLegendSet = (legendSet, value) => {
   var _legendSet$legends;
 
-  return legendSet === null || legendSet === void 0 ? void 0 : (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
-  );
+  return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0 ? void 0 : (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
+  ) : null;
 };
 
 exports.getLegendByValueFromLegendSet = getLegendByValueFromLegendSet;

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

@@ -5,7 +5,7 @@ import { Button, CircularLoader, IconChevronDown24, IconChevronUp24, IconClock16
 import cx from 'classnames';
 import moment from 'moment';
 import PropTypes from 'prop-types';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState, forwardRef, useImperativeHandle } from 'react';
 import { formatList } from '../../modules/list.js';
 import styles from './styles/AboutAOUnit.style.js';
 import { getTranslatedString, AOTypeMap } from './utils.js';
@@ -46,7 +46,7 @@ const getUnsubscribeMutation = (type, id) => ({
   type: 'delete'
 });
 
-const AboutAOUnit = _ref3 => {
+const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
   var _data$ao$createdBy;
 
   let {
@@ -93,6 +93,9 @@ const AboutAOUnit = _ref3 => {
       });
     }
   }, [id, refetch]);
+  useImperativeHandle(ref, () => ({
+    refresh: refetch
+  }), [refetch]);
 
   const getAccessLevelString = access => {
     const re = new RegExp("(?<accessLevel>".concat(READ_AND_WRITE, "?)"));
@@ -209,8 +212,8 @@ const AboutAOUnit = _ref3 => {
   }, i18n.t('Subscribe')))))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
-};
-
+});
+AboutAOUnit.displayName = 'AboutUnit';
 AboutAOUnit.propTypes = {
   id: PropTypes.string.isRequired,
   type: PropTypes.string.isRequired

package/build/es/components/FileMenu/FileMenu.js

@@ -25,7 +25,7 @@ export const FileMenu = _ref => {
     onSave,
     onSaveAs,
     onRename,
-    //    onShare,
+    onShare,
     onDelete,
     onError,
     onTranslate
@@ -80,10 +80,10 @@ export const FileMenu = _ref => {
 
       case 'sharing':
         return /*#__PURE__*/React.createElement(SharingDialog, {
-          open: true,
           type: fileType,
           id: fileObject.id,
-          onClose: onDialogClose
+          onClose: onDialogClose,
+          onSave: onShare
         });
 
       case 'getlink':
@@ -237,6 +237,7 @@ FileMenu.defaultProps = {
   onOpen: Function.prototype,
   onRename: Function.prototype,
   onSaveAs: Function.prototype,
+  onShare: Function.prototype,
   onTranslate: Function.prototype
 };
 FileMenu.propTypes = {
@@ -252,7 +253,7 @@ FileMenu.propTypes = {
   onRename: PropTypes.func,
   onSave: PropTypes.func,
   onSaveAs: PropTypes.func,
-  //    onShare: PropTypes.func,
+  onShare: PropTypes.func,
   onTranslate: PropTypes.func
 };
 export default FileMenu;

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

@@ -83,6 +83,7 @@
     "Name": "Ім'я",
     "Description": "Змалювання",
     "Rename": "Перейменувати",
+    "{{objectName}} (copy)": "",
     "Save {{fileType}} as": "",
     "event report": "звіт про подію",
     "line list": "",
@@ -129,14 +130,14 @@
     "Created": "Створено",
     "Last updated": "Останнє оновлення",
     "Type": "Тип",
-    "Clear filters": "",
+    "Clear filters": "Очистити фільтри",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "Відкрити",
     "Couldn't load items": "",
     "There was a problem loading items. Try again or contact your system administrator.": "",
     "No items found. Create a new to get started.": "",
     "No items found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "Create new": "",
+    "Create new": "Створити новий",
     "Open a visualization": "",
     "Loading visualizations": "",
     "Couldn't load visualizations": "",

package/build/es/modules/__tests__/getColorByValueFromLegendSet.spec.js

@@ -0,0 +1,159 @@
+import { getColorByValueFromLegendSet } from '../legends.js';
+const positiveLegendSet = {
+  legends: [{
+    startValue: 65,
+    endValue: 75,
+    color: '#2171b5',
+    id: 'ZuBlFGK8U7D',
+    name: '65 - 74'
+  }, {
+    startValue: 35,
+    endValue: 45,
+    color: '#9ecae1',
+    id: 'XTmLeJHmd3m',
+    name: '35 - 44'
+  }, {
+    startValue: 75,
+    endValue: 85,
+    color: '#08519c',
+    id: 'VPEprgLdi1g',
+    name: '75 - 84'
+  }, {
+    startValue: 25,
+    endValue: 35,
+    color: '#c6dbef',
+    id: 'CqUnYcUy2eb',
+    name: '25 - 34'
+  }, {
+    startValue: 15,
+    endValue: 25,
+    color: '#deebf7',
+    id: 'evLlhbRsG6e',
+    name: '15 - 24'
+  }, {
+    startValue: 0,
+    endValue: 5,
+    color: '#FFFFFF',
+    id: 'GHcJ24t8oEs',
+    name: '0 - 4'
+  }, {
+    startValue: 85,
+    endValue: 150,
+    color: '#08306b',
+    id: 'dPFk7tcCg7U',
+    name: '85+'
+  }, {
+    startValue: 45,
+    endValue: 55,
+    color: '#6baed6',
+    id: 'uHBR7cbKoy3',
+    name: '45 - 54'
+  }, {
+    startValue: 5,
+    endValue: 15,
+    color: '#f7fbff',
+    id: 'RUD8IwOsXEW',
+    name: '5 - 14'
+  }, {
+    startValue: 55,
+    endValue: 65,
+    color: '#4292c6',
+    id: 'UojF9VGBvnE',
+    name: '55 - 64'
+  }],
+  name: 'Positive'
+};
+const negativeLegendSet = {
+  legends: [{
+    startValue: -48,
+    endValue: -36,
+    color: '#fecc5c',
+    id: 'TR60hS8mQag',
+    name: '-48 - -36'
+  }, {
+    startValue: -1000,
+    endValue: -60,
+    color: '#D10AFF',
+    id: 'nxCTJlHd9V2',
+    name: 'Critically low'
+  }, {
+    startValue: -24,
+    endValue: -12,
+    color: '#f03b20',
+    id: 'JOYfGUtyLJF',
+    name: '-24 - -12'
+  }, {
+    startValue: -60,
+    endValue: -48,
+    color: '#ffffb2',
+    id: 'JodoDUR31ig',
+    name: '-60 - -48'
+  }, {
+    startValue: -12,
+    endValue: 0,
+    color: '#bd0026',
+    id: 'rFFEKuATWaZ',
+    name: '-12 - 0'
+  }, {
+    startValue: 0,
+    endValue: 10000,
+    color: '#A3A3A3',
+    id: 'rOD16kf9YzA',
+    name: 'Out of bounds'
+  }, {
+    startValue: -36,
+    endValue: -24,
+    color: '#fd8d3c',
+    id: 'i682LxWmGQ6',
+    name: '-36 - -24'
+  }],
+  name: 'Negative'
+};
+const tests = [{
+  legendSet: positiveLegendSet,
+  value: 60,
+  expected: '#4292c6'
+}, {
+  legendSet: positiveLegendSet,
+  value: '60.0',
+  expected: '#4292c6'
+}, {
+  legendSet: positiveLegendSet,
+  value: 0,
+  expected: '#FFFFFF'
+}, {
+  legendSet: positiveLegendSet,
+  value: '',
+  expected: null
+}, {
+  legendSet: positiveLegendSet,
+  value: ' ',
+  expected: null
+}, {
+  legendSet: positiveLegendSet,
+  value: 'ABC',
+  expected: null
+}, {
+  legendSet: negativeLegendSet,
+  value: -50,
+  expected: '#ffffb2'
+}, {
+  legendSet: negativeLegendSet,
+  value: '-50.0',
+  expected: '#ffffb2'
+}, {
+  legendSet: negativeLegendSet,
+  value: 0,
+  expected: '#A3A3A3'
+}, {
+  legendSet: negativeLegendSet,
+  value: '',
+  expected: null
+}];
+describe('getColorByValueFromLegendSet', () => {
+  tests.forEach(t => {
+    it("Legend set: ".concat(t.legendSet.name, ", value: ").concat(t.value, ", expected: ").concat(t.expected), () => {
+      expect(getColorByValueFromLegendSet(t.legendSet, t.value)).toEqual(t.expected);
+    });
+  });
+});

package/build/es/modules/legends.js

@@ -5,8 +5,8 @@ export const LEGEND_DISPLAY_STYLE_TEXT = 'TEXT';
 export const getLegendByValueFromLegendSet = (legendSet, value) => {
   var _legendSet$legends;
 
-  return legendSet === null || legendSet === void 0 ? void 0 : (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
-  );
+  return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0 ? void 0 : (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
+  ) : null;
 };
 export const getColorByValueFromLegendSet = (legendSet, value) => {
   const legend = getLegendByValueFromLegendSet(legendSet, value);

package/package.json

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