@dhis2/analytics 26.0.7 → 26.0.9

package/build/es/visualizations/store/adapters/dhis_dhis/index.js

@@ -1,7 +1,6 @@
 import { VIS_TYPE_SINGLE_VALUE } from '../../../../modules/visTypes.js';
 import getSingleValue from './singleValue.js';
 const VALUE_ID = 'value';
-
 function getHeaderIdIndexMap(headers) {
   const map = new Map();
   headers.forEach((header, index) => {
@@ -9,11 +8,9 @@ function getHeaderIdIndexMap(headers) {
   });
   return map;
 }
-
 function getPrefixedId(row, header) {
   return (header.isPrefix ? header.name + '_' : '') + row[header.index];
 }
-
 function getIdValueMap(rows, seriesHeader, categoryHeader, valueIndex) {
   const map = new Map();
   let key;
@@ -25,15 +22,15 @@ function getIdValueMap(rows, seriesHeader, categoryHeader, valueIndex) {
   });
   return map;
 }
-
 function getDefault(acc, seriesIds, categoryIds, idValueMap, metaData) {
   seriesIds.forEach(seriesId => {
     const serieData = [];
     categoryIds.forEach(categoryId => {
-      const value = idValueMap.get("".concat(seriesId, "-").concat(categoryId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${seriesId}-${categoryId}`);
+
+      // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
-
       serieData.push(value === undefined ? null : parseFloat(value));
     });
     acc.push({
@@ -44,17 +41,14 @@ function getDefault(acc, seriesIds, categoryIds, idValueMap, metaData) {
   });
   return acc;
 }
-
 function getValueFunction(type) {
   switch (type) {
     case VIS_TYPE_SINGLE_VALUE:
       return getSingleValue;
-
     default:
       return getDefault;
   }
 }
-
 export default function (_ref) {
   let {
     type,

package/build/es/visualizations/store/adapters/dhis_highcharts/index.js

@@ -6,11 +6,9 @@ import getPie from './pie.js';
 import getTwoCategory from './twoCategory.js';
 import getYearOnYear from './yearOnYear.js';
 const VALUE_ID = 'value';
-
 function arrayNullsOnly(array) {
   return arrayContains(array, null) && arrayUnique(array).length === 1;
 }
-
 function getHeaderIdIndexMap(headers) {
   const map = new Map();
   headers.forEach((header, index) => {
@@ -18,11 +16,9 @@ function getHeaderIdIndexMap(headers) {
   });
   return map;
 }
-
 function getPrefixedId(row, header) {
   return (header.isPrefix ? header.name + '_' : '') + row[header.index];
 }
-
 function getIdValueMap(rows, seriesHeader, categoryHeaders, valueIndex) {
   const map = new Map();
   let key;
@@ -33,26 +29,27 @@ function getIdValueMap(rows, seriesHeader, categoryHeaders, valueIndex) {
     map.set(key, value);
   });
   return map;
-} // 1 series, 1 category
-
+}
 
+// 1 series, 1 category
 function getDefault(acc, series, categories, idValueMap, metaData) {
   series[0].forEach(serieItemId => {
     const serieData = [];
     categories[0].forEach(categoryItemId => {
-      const value = idValueMap.get("".concat(serieItemId, "-").concat(categoryItemId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${serieItemId}-${categoryItemId}`);
+
+      // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
       // this is to keep the correct indexes for the values within the serie array
-
       serieData.push(value === undefined ? null : parseFloat(value));
-    }); // if the whole serie has no data, do not return a list of null values
-    // otherwise Highcharts thinks that data is available and does not show the "No data to display" message
+    });
 
+    // if the whole serie has no data, do not return a list of null values
+    // otherwise Highcharts thinks that data is available and does not show the "No data to display" message
     if (arrayNullsOnly(serieData)) {
       serieData.length = 0;
     }
-
     acc.push({
       id: serieItemId,
       name: metaData.items[serieItemId].name,
@@ -61,28 +58,22 @@ function getDefault(acc, series, categories, idValueMap, metaData) {
   });
   return acc;
 }
-
 function getSeriesFunction(type, categoryIds) {
   if (isTwoCategoryChartType(type) && categoryIds.length === 2) {
     return getTwoCategory;
   }
-
   switch (type) {
     case VIS_TYPE_PIE:
       return getPie;
-
     case VIS_TYPE_GAUGE:
       return getGauge;
-
     case VIS_TYPE_YEAR_OVER_YEAR_COLUMN:
     case VIS_TYPE_YEAR_OVER_YEAR_LINE:
       return getYearOnYear;
-
     default:
       return getDefault;
   }
 }
-
 export default function (_ref) {
   let {
     type,

package/build/es/visualizations/store/adapters/dhis_highcharts/pie.js

@@ -1,7 +1,6 @@
 export default function (acc, series, categories, idValueMap, metaData) {
   series[0].forEach(serieItemId => {
     const value = idValueMap.get(serieItemId);
-
     if (value) {
       acc.push({
         id: serieItemId,

package/build/es/visualizations/store/adapters/dhis_highcharts/twoCategory.js

@@ -1,23 +1,24 @@
-import getTwoCategorySplitSerieData from '../../../config/adapters/dhis_highcharts/getTwoCategorySplitSerieData.js'; // 1 series, 2 categories
+import getTwoCategorySplitSerieData from '../../../config/adapters/dhis_highcharts/getTwoCategorySplitSerieData.js';
 
+// 1 series, 2 categories
 export default function (acc, series, categories, idValueMap, metaData) {
   series[0].forEach(seriesItemId => {
     const groupedData = [];
     categories[0].forEach(category1ItemId => {
       const groupData = [];
       categories[1].forEach(category2ItemId => {
-        const value = idValueMap.get("".concat(seriesItemId, "-").concat(category1ItemId, "-").concat(category2ItemId));
+        const value = idValueMap.get(`${seriesItemId}-${category1ItemId}-${category2ItemId}`);
         groupData.push(value === undefined ? null : parseFloat(value));
       });
       groupedData.push(groupData);
     });
-    const serieData = getTwoCategorySplitSerieData(groupedData); // avoid a list of null values
+    const serieData = getTwoCategorySplitSerieData(groupedData);
 
+    // avoid a list of null values
     if (serieData.every(e => e === null)) {
       serieData.length = 0;
       groupedData.length = 0;
     }
-
     acc.push({
       id: seriesItemId,
       name: metaData.items[seriesItemId].name,

package/build/es/visualizations/store/adapters/dhis_highcharts/yearOnYear.js

@@ -1,15 +1,15 @@
 export default function (acc, series, categories, idValueMap, metaData, extraOptions) {
   var _extraOptions$xAxisLa;
-
   const seriesData = Array.from({
     length: (extraOptions === null || extraOptions === void 0 ? void 0 : (_extraOptions$xAxisLa = extraOptions.xAxisLabels) === null || _extraOptions$xAxisLa === void 0 ? void 0 : _extraOptions$xAxisLa.length) || 0
   }, () => null);
   categories[0].forEach(categoryItemId => {
     const position = extraOptions.periodKeyAxisIndexMap[categoryItemId];
-    const value = idValueMap.get(categoryItemId); // DHIS2-1261: 0 is a valid value
+    const value = idValueMap.get(categoryItemId);
+
+    // DHIS2-1261: 0 is a valid value
     // undefined value means the key was not found within the rows
     // in that case null is returned as value in the serie for highcharts
-
     seriesData[position] = value === undefined ? null : parseFloat(value);
   });
   acc.push({

package/build/es/visualizations/store/index.js

@@ -10,21 +10,15 @@ export default function (_ref) {
     error,
     warning
   } = _ref;
-
   const _validator = validators[inputFormat] || validators.noValidation;
-
   const _adapter = adapters[inputFormat + '_' + outputFormat];
-
   if (_validator === validators.noValidation) {
-    warning("Validation not supported for data input format \"".concat(inputFormat, "\""));
+    warning(`Validation not supported for data input format "${inputFormat}"`);
   }
-
   if (!_adapter) {
-    error("Data tranformation from \"".concat(inputFormat, "\" to \"").concat(outputFormat, "\" is not supported"));
+    error(`Data tranformation from "${inputFormat}" to "${outputFormat}" is not supported`);
   }
-
   this.data = data;
-
   this.generateData = _ref2 => {
     let {
       type,

package/build/es/visualizations/store/validators/dhis/index.js

@@ -2,84 +2,73 @@ import isArray from 'd2-utilizr/lib/isArray';
 import isObject from 'd2-utilizr/lib/isObject';
 import isString from 'd2-utilizr/lib/isString';
 const MODULE = 'Data validator: ';
-
 function getMessage(text) {
   return MODULE + text;
 }
-
 function validateHeader(header, error) {
   if (!isObject(header)) {
     error(getMessage('Header is not an object'));
   }
-
   if (header.meta) {
     if (!isString(header.name)) {
       error(getMessage('Header name is not a string'));
     }
   }
 }
-
 function validateRowValue(rowValue, error) {
   if (!isString(rowValue)) {
     error(getMessage('Row value is not a string'));
   }
 }
-
 function validateRow(row, headersLength, error) {
   if (!isArray(row)) {
     error(getMessage('Data row is not an array'));
   }
-
   if (row.length !== headersLength) {
     error(getMessage('Data row length is invalid'));
   }
-
   row.forEach(rowValue => validateRowValue(rowValue, error));
 }
-
 export default function (_ref) {
   let {
     data,
     error,
     warning
   } = _ref;
-
   if (!isObject(data)) {
     error(getMessage('Data is not an object'));
-  } // headers
+  }
 
+  // headers
 
   if (!isArray(data.headers)) {
     error(getMessage('Response headers is not an array'));
   }
-
   if (!data.headers.length > 1) {
     error(getMessage('At least two response headers required'));
   }
+  data.headers.forEach(header => validateHeader(header, error));
 
-  data.headers.forEach(header => validateHeader(header, error)); // meta data
+  // meta data
 
   if (!isObject(data.metaData)) {
     error(getMessage('Metadata is not an object'));
   }
-
   if (!isObject(data.metaData.items)) {
     error(getMessage('Metadata items is not an object'));
   }
-
   if (!isObject(data.metaData.dimensions)) {
     error(getMessage('Metadata dimensions is not an object'));
-  } // data
+  }
 
+  // data
 
   if (!isArray(data.rows)) {
     warning(getMessage('Data rows is not an array'));
   }
-
   if (!data.rows.length) {
     warning(getMessage('No data rows provided'));
   }
-
   data.rows.forEach(row => validateRow(row, data.headers.length, error));
   return data;
 }

package/build/es/visualizations/store/validators/index.js

@@ -1,7 +1,5 @@
 import dhis from './dhis/index.js';
-
 const noValidation = data => data;
-
 export default {
   dhis,
   noValidation

package/build/es/visualizations/util/axisId.js

@@ -1,2 +1,2 @@
 const AXIS_ID_PREFIX = 'AXIS_';
-export const getAxisStringFromId = id => "".concat(AXIS_ID_PREFIX).concat(id);
+export const getAxisStringFromId = id => `${AXIS_ID_PREFIX}${id}`;

package/build/es/visualizations/util/colors/gradientColorGenerator.js

@@ -2,22 +2,17 @@ export const generateColors = (start, end, steps) => {
   if (!end || !steps || steps < 2) {
     return [start];
   }
-
   const stepFactor = 1 / (steps - 1),
-        result = [];
-
+    result = [];
   for (let step = 0; step < steps; step++) {
     const color1 = convertHexToRGB(start),
-          color2 = convertHexToRGB(end),
-          factor = stepFactor * step;
+      color2 = convertHexToRGB(end),
+      factor = stepFactor * step;
     const rgbArray = color1.slice();
     rgbArray.forEach((part, index, array) => array[index] = Math.round(part + factor * (color2[index] - color1[index])));
     result.push(convertRGBToHex(rgbArray));
   }
-
   return result;
 };
-
 const convertRGBToHex = rgb => '#' + ((1 << 24) + (rgb[0] << 16) + (rgb[1] << 8) + rgb[2]).toString(16).slice(1);
-
 const convertHexToRGB = hex => hex.replace(/^#/, '').match(/.{1,2}/g).map(val => parseInt(val, 16));

package/build/es/visualizations/util/getFilterText.js

@@ -7,13 +7,11 @@ export default function (filters, metaData) {
   if (!Array.isArray(filters) || !filters.length) {
     return '';
   }
-
   const titleFragments = [];
   let i;
   let l;
   filters.forEach(filter => {
     const items = dimensionGetItems(filter);
-
     if (dimensionIs(filter, DIMENSION_ID_ORGUNIT) && items.some(_ref => {
       let {
         id
@@ -23,25 +21,24 @@ export default function (filters, metaData) {
       titleFragments.push(getOuLevelAndGroupText(filter, metaData));
     } else {
       const filterItems = metaData.dimensions[filter.dimension];
-
       if (Array.isArray(filterItems)) {
         l = filterItems.length;
         let id;
         const sectionParts = [];
-
         for (i = 0; i < l; i++) {
-          id = filterItems[i]; // if the value is present in items take the name to show from there
+          id = filterItems[i];
 
+          // if the value is present in items take the name to show from there
           if (metaData.items[id]) {
             sectionParts.push(metaData.items[id].name);
-          } // otherwise use the values directly
+          }
+          // otherwise use the values directly
           // this is a temporary fix to avoid app crashing when using filters with data items in EV
           else {
             sectionParts.push(metaData.items[filter.dimension].name + ': ' + filterItems.join(', '));
             break;
           }
         }
-
         titleFragments.push(sectionParts.join(', '));
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.0.7",
+    "version": "26.0.9",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -37,9 +37,9 @@
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/ui": "^8.4.11",
         "@sambego/storybook-state": "^2.0.1",
-        "@storybook/addons": "^6.5.9",
+        "@storybook/addons": "^6.5.16",
         "@storybook/preset-create-react-app": "^3.1.7",
-        "@storybook/react": "^6.1.14",
+        "@storybook/react": "^6.5.16",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^12.1.5",
         "enzyme": "^3.9.0",
@@ -47,8 +47,7 @@
         "fs-extra": "^10.1.0",
         "jest-enzyme": "^7.0.2",
         "prop-types": "^15",
-        "styled-jsx": "^4.0.1",
-        "typeface-roboto": "^0.0.75"
+        "styled-jsx": "^4.0.1"
     },
     "peerDependencies": {
         "@dhis2/app-runtime": "^3",
@@ -60,7 +59,7 @@
         "styled-jsx": "^4.0.1"
     },
     "dependencies": {
-        "@dhis2/d2-ui-rich-text": "^7.4.0",
+        "@dhis2/d2-ui-rich-text": "^7.4.1",
         "@dhis2/multi-calendar-dates": "1.0.0",
         "@dnd-kit/core": "^6.0.7",
         "@dnd-kit/sortable": "^7.0.2",
@@ -70,7 +69,7 @@
         "crypto-js": "^4.1.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",
-        "highcharts": "^10.2.0",
+        "highcharts": "^10.3.3",
         "lodash": "^4.17.21",
         "mathjs": "^9.4.2",
         "react-beautiful-dnd": "^10.1.1",