@dhis2/analytics 24.0.5 → 24.0.8

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [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)
+
+
+### Bug Fixes
+
+* change default value for Save as (DHIS2-13328) ([#1325](https://github.com/dhis2/analytics/issues/1325)) ([1957c51](https://github.com/dhis2/analytics/commit/1957c519a47998f3ae637836861a88dac0ec5110))
+
 ## [24.0.5](https://github.com/dhis2/analytics/compare/v24.0.4...v24.0.5) (2022-08-26)
 
 

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

@@ -24,10 +24,10 @@ const visObject = {
   href: 'http://localhost:8080/api/32/visualizations/a8LrqsBQlHP',
   id: 'a8LrqsBQlHP',
   created: '2012-11-05T09:17:23.388',
-  name: 'ANC: 1-3 dropout rate Yearly copy1',
+  name: 'ANC: 1-3 dropout rate Yearly',
   publicAccess: '--------',
   displayDescription: 'some _italic (10%)_ and some *bold (10%)*',
-  displayName: 'ANC: 1-3 dropout rate Yearly copy1',
+  displayName: 'ANC: 1-3 dropout rate Yearly',
   description: 'some _italic (10%)_ and some *bold (10%)*',
   externalAccess: false,
   access: {

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

@@ -30,7 +30,9 @@ const SaveAsDialog = _ref => {
     onClose,
     onSaveAs
   } = _ref;
-  const [name, setName] = (0, _react.useState)(object === null || object === void 0 ? void 0 : object.name);
+  const [name, setName] = (0, _react.useState)(object !== null && object !== void 0 && object.displayName || object !== null && object !== void 0 && object.name ? _index.default.t('{{objectName}} (copy)', {
+    objectName: object.name
+  }) : '');
   const [description, setDescription] = (0, _react.useState)(object === null || object === void 0 ? void 0 : object.description); // the actual API request is done in the app
 
   const saveObjectAs = () => {
@@ -83,6 +85,7 @@ exports.SaveAsDialog = SaveAsDialog;
 SaveAsDialog.propTypes = {
   object: _propTypes.default.shape({
     description: _propTypes.default.string,
+    displayName: _propTypes.default.string,
     name: _propTypes.default.string
   }),
   type: _propTypes.default.oneOf(_utils.supportedFileTypes),

package/build/cjs/components/FileMenu/__tests__/SaveAsDialog.spec.js

@@ -44,7 +44,7 @@ describe('The FileMenu - SaveAsDialog component', () => {
   });
   it('renders a InputField for name with prefilled value from the object prop', () => {
     const nameInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Name');
-    expect(nameInputField.prop('value')).toEqual(props.object.name);
+    expect(nameInputField.prop('value')).toEqual('Save as name test (copy)');
   });
   it('renders a TextAreaField for description with prefilled value from the object prop', () => {
     const descriptionInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Description');
@@ -53,7 +53,7 @@ describe('The FileMenu - SaveAsDialog component', () => {
   it('calls the onSaveAs callback when the Save button is clicked', () => {
     getSaveAsDialogComponent(props).find(_ui.Button).at(1).simulate('click');
     expect(onSaveAs).toHaveBeenCalledWith({
-      name: props.object.name,
+      name: 'Save as name test (copy)',
       description: props.object.description
     });
   });

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

@@ -81,6 +81,7 @@
     "Name": "Name",
     "Description": "Description",
     "Rename": "Rename",
+    "{{objectName}} (copy)": "{{objectName}} (copy)",
     "Save {{fileType}} as": "Save {{fileType}} as",
     "event report": "event report",
     "line list": "line list",

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/__demo__/FileMenu.stories.js

@@ -16,10 +16,10 @@ const visObject = {
   href: 'http://localhost:8080/api/32/visualizations/a8LrqsBQlHP',
   id: 'a8LrqsBQlHP',
   created: '2012-11-05T09:17:23.388',
-  name: 'ANC: 1-3 dropout rate Yearly copy1',
+  name: 'ANC: 1-3 dropout rate Yearly',
   publicAccess: '--------',
   displayDescription: 'some _italic (10%)_ and some *bold (10%)*',
-  displayName: 'ANC: 1-3 dropout rate Yearly copy1',
+  displayName: 'ANC: 1-3 dropout rate Yearly',
   description: 'some _italic (10%)_ and some *bold (10%)*',
   externalAccess: false,
   access: {

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

@@ -11,7 +11,9 @@ export const SaveAsDialog = _ref => {
     onClose,
     onSaveAs
   } = _ref;
-  const [name, setName] = useState(object === null || object === void 0 ? void 0 : object.name);
+  const [name, setName] = useState(object !== null && object !== void 0 && object.displayName || object !== null && object !== void 0 && object.name ? i18n.t('{{objectName}} (copy)', {
+    objectName: object.name
+  }) : '');
   const [description, setDescription] = useState(object === null || object === void 0 ? void 0 : object.description); // the actual API request is done in the app
 
   const saveObjectAs = () => {
@@ -62,6 +64,7 @@ export const SaveAsDialog = _ref => {
 SaveAsDialog.propTypes = {
   object: PropTypes.shape({
     description: PropTypes.string,
+    displayName: PropTypes.string,
     name: PropTypes.string
   }),
   type: PropTypes.oneOf(supportedFileTypes),

package/build/es/components/FileMenu/__tests__/SaveAsDialog.spec.js

@@ -36,7 +36,7 @@ describe('The FileMenu - SaveAsDialog component', () => {
   });
   it('renders a InputField for name with prefilled value from the object prop', () => {
     const nameInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Name');
-    expect(nameInputField.prop('value')).toEqual(props.object.name);
+    expect(nameInputField.prop('value')).toEqual('Save as name test (copy)');
   });
   it('renders a TextAreaField for description with prefilled value from the object prop', () => {
     const descriptionInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Description');
@@ -45,7 +45,7 @@ describe('The FileMenu - SaveAsDialog component', () => {
   it('calls the onSaveAs callback when the Save button is clicked', () => {
     getSaveAsDialogComponent(props).find(Button).at(1).simulate('click');
     expect(onSaveAs).toHaveBeenCalledWith({
-      name: props.object.name,
+      name: 'Save as name test (copy)',
       description: props.object.description
     });
   });

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

@@ -81,6 +81,7 @@
     "Name": "Name",
     "Description": "Description",
     "Rename": "Rename",
+    "{{objectName}} (copy)": "{{objectName}} (copy)",
     "Save {{fileType}} as": "Save {{fileType}} as",
     "event report": "event report",
     "line list": "line list",

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.5",
+    "version": "24.0.8",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {