@dhis2/analytics 26.0.7 → 26.0.9

package/build/es/visualizations/config/adapters/dhis_highcharts/getScatterData.js

@@ -6,7 +6,6 @@ export default function (series, store) {
     const y = Number((storeRows.find(item => item.includes(row) && item.includes(series[0].id)) || [])[2]);
     const x = Number((storeRows.find(item => item.includes(row) && item.includes(series[1].id)) || [])[2]);
     const name = metaDataItems[row].name;
-
     if (!isNaN(y) && !isNaN(x) && name) {
       return {
         y,

package/build/es/visualizations/config/adapters/dhis_highcharts/getSortedConfig.js

@@ -4,7 +4,6 @@ import { isTwoCategoryChartType } from '../../../../modules/visTypes.js';
 import getStackedData from './getStackedData.js';
 import getTwoCategorySplitSerieData from './getTwoCategorySplitSerieData.js';
 const sortOrderMap = new Map([[-1, 'ASC'], [1, 'DESC']]);
-
 function getIndexOrder(dataToBeSorted, layout) {
   const dataObjectsToBeSorted = dataToBeSorted.map((value, index) => ({
     index,
@@ -14,13 +13,13 @@ function getIndexOrder(dataToBeSorted, layout) {
   arraySort(dataObjectsToBeSorted, direction, 'value');
   return arrayPluck(dataObjectsToBeSorted, 'index');
 }
-
 function getTwoCategorySortedConfig(config, layout, stacked) {
   const series = config.series;
   const sortedConfig = Object.assign({}, config);
   const stackedData = getStackedData(series, layout);
-  const indexOrder = []; // loop through serie groups
+  const indexOrder = [];
 
+  // loop through serie groups
   sortedConfig.series = series.map((seriesObj, seriesIndex) => {
     if (seriesObj.custom.isTwoCategoryFakeSerie) {
       return seriesObj;
@@ -28,13 +27,13 @@ function getTwoCategorySortedConfig(config, layout, stacked) {
       seriesObj.custom.data = seriesObj.custom.data.map((groupObj, groupIndex) => {
         // sorting index computed on 1st serie data
         if (seriesIndex === 0) {
-          indexOrder[groupIndex] = getIndexOrder(stacked ? stackedData[groupIndex] : groupObj, layout); // reorder 2nd category labels only once
-          // based on the 1st serie group ordering
+          indexOrder[groupIndex] = getIndexOrder(stacked ? stackedData[groupIndex] : groupObj, layout);
 
+          // reorder 2nd category labels only once
+          // based on the 1st serie group ordering
           const groupCategoryLabels = config.xAxis[0].categories[groupIndex];
           sortedConfig.xAxis[0].categories[groupIndex] = groupCategoryLabels.map((value, index) => groupCategoryLabels[indexOrder[groupIndex][index]]);
         }
-
         return groupObj.map((value, index) => groupObj[indexOrder[groupIndex][index]]);
       });
       seriesObj.data = getTwoCategorySplitSerieData(seriesObj.custom.data);
@@ -43,25 +42,21 @@ function getTwoCategorySortedConfig(config, layout, stacked) {
   });
   return sortedConfig;
 }
-
 function getDefaultSortedConfig(config, layout, stacked) {
   var _config$xAxis;
-
   const categories = ((_config$xAxis = config.xAxis) === null || _config$xAxis === void 0 ? void 0 : _config$xAxis.length) && config.xAxis[0].categories;
   const series = config.series;
   const indexOrder = getIndexOrder(stacked ? getStackedData(series, layout) : series[0].data, layout);
   const sortedConfig = Object.assign({}, config);
-
   if (categories) {
     sortedConfig.xAxis[0].categories = indexOrder.map(index => categories[index]);
   }
-
-  sortedConfig.series = series.map(seriesObj => ({ ...seriesObj,
+  sortedConfig.series = series.map(seriesObj => ({
+    ...seriesObj,
     data: seriesObj.data.map((value, index) => seriesObj.data[indexOrder[index]])
   }));
   return sortedConfig;
 }
-
 export default function (config, layout, stacked) {
   if (isTwoCategoryChartType(layout.type) && layout.rows.length > 1) {
     return getTwoCategorySortedConfig(config, layout, stacked);

package/build/es/visualizations/config/adapters/dhis_highcharts/getStackedData.js

@@ -6,7 +6,6 @@ export default function (series, layout) {
     return getDefaultStackedData(series);
   }
 }
-
 function getDefaultStackedData(series, isZeroAsNull) {
   return series[0].data.map((value, index) => {
     return series.reduce((total, obj) => {
@@ -14,7 +13,6 @@ function getDefaultStackedData(series, isZeroAsNull) {
     }, 0);
   }).map(value => isZeroAsNull && value === 0 ? null : value);
 }
-
 function getTwoCategoryStackedData(series) {
   return series[0].custom.data.map((groupObj, groupIndex) => {
     return groupObj.map((value, index) => {

package/build/es/visualizations/config/adapters/dhis_highcharts/getTextAlignOption.js

@@ -14,16 +14,13 @@ const verticalAlignOptions = {
   [TEXT_ALIGN_CENTER]: 'middle',
   [TEXT_ALIGN_RIGHT]: 'bottom'
 };
-
 const getTextAlignOptions = (fontStyleKey, isVertical) => {
   switch (fontStyleKey) {
     case FONT_STYLE_HORIZONTAL_AXIS_TITLE:
     case FONT_STYLE_VERTICAL_AXIS_TITLE:
       return axisTitleAlignOptions;
-
     case FONT_STYLE_REGRESSION_LINE_LABEL:
       return isVertical ? verticalAlignOptions : defaultAlignOptions;
-
     case FONT_STYLE_VISUALIZATION_TITLE:
     case FONT_STYLE_VISUALIZATION_SUBTITLE:
     case FONT_STYLE_LEGEND:
@@ -31,5 +28,4 @@ const getTextAlignOptions = (fontStyleKey, isVertical) => {
       return defaultAlignOptions;
   }
 };
-
 export const getTextAlignOption = (option, fontStyleKey, isVertical) => getTextAlignOptions(fontStyleKey, isVertical)[option];

package/build/es/visualizations/config/adapters/dhis_highcharts/getTrimmedConfig.js

@@ -2,15 +2,12 @@ import arrayContains from 'd2-utilizr/lib/arrayContains';
 import arrayUnique from 'd2-utilizr/lib/arrayUnique';
 import { isTwoCategoryChartType } from '../../../../modules/visTypes.js';
 import getTwoCategorySplitSerieData from './getTwoCategorySplitSerieData.js';
-
 function arrayCleanUndefined(array) {
   return array.filter(item => item !== undefined);
 }
-
 function arrayNullsOnly(array) {
   return arrayContains(array, null) && arrayUnique(array).length === 1;
 }
-
 function getEmptySeriesIndexes(series) {
   const emptyIndexes = [];
   let seriesValues;
@@ -24,14 +21,12 @@ function getEmptySeriesIndexes(series) {
       // preserve 0 as valid value
       seriesValues.push(data[index] === undefined ? null : data[index]);
     });
-
     if (arrayNullsOnly(seriesValues)) {
       emptyIndexes.push(index);
     }
   });
   return emptyIndexes;
 }
-
 function getFirstLastValueIndexes(series) {
   let firstValueIndex = undefined;
   let lastValueIndex = 0;
@@ -42,13 +37,10 @@ function getFirstLastValueIndexes(series) {
     // without affecting the original
     data = seriesObj.data.slice();
     i = data.findIndex(value => value !== undefined && value !== null);
-
     if (i > -1) {
       firstValueIndex = firstValueIndex !== undefined ? Math.min(firstValueIndex, i) : i;
     }
-
     i = data.reverse().findIndex(value => value !== undefined && value !== null);
-
     if (i > -1) {
       lastValueIndex = Math.max(lastValueIndex, data.length - 1 - i);
     }
@@ -58,34 +50,26 @@ function getFirstLastValueIndexes(series) {
     lastValueIndex
   };
 }
-
 function cleanData(data, emptySeriesIndexes, firstValueIndex, lastValueIndex, hideEmptyRowItems) {
   let cleanedData;
-
   switch (hideEmptyRowItems) {
     case 'ALL':
       cleanedData = arrayCleanUndefined(data.map((value, index) => arrayContains(emptySeriesIndexes, index) ? undefined : value));
       break;
-
     case 'BEFORE_FIRST':
       cleanedData = data.slice(firstValueIndex);
       break;
-
     case 'AFTER_LAST':
       cleanedData = data.slice(0, lastValueIndex + 1);
       break;
-
     case 'BEFORE_FIRST_AFTER_LAST':
       cleanedData = data.slice(firstValueIndex, lastValueIndex + 1);
       break;
-
     default:
       cleanedData = data;
   }
-
   return cleanedData;
 }
-
 export default function (config, layout) {
   if (isTwoCategoryChartType(layout.type) && layout.rows.length > 1) {
     return getTwoCategoryTrimmedConfig(config, layout);
@@ -93,20 +77,17 @@ export default function (config, layout) {
     return getDefaultTrimmedConfig(config, layout);
   }
 }
-
 function getEmptySeriesGroupIndexes(series) {
   const emptyGroupIndexes = [];
   series[0].custom.data.forEach((groupObj, groupIndex) => {
     const seriesGroupValues = [];
     groupObj.forEach((_, index) => series.forEach(seriesObj => seriesGroupValues.push(seriesObj.custom.data[groupIndex][index])));
-
     if (arrayNullsOnly(seriesGroupValues)) {
       emptyGroupIndexes.push(groupIndex);
     }
   });
   return emptyGroupIndexes;
 }
-
 function getFirstLastGroupWithValuesIndexes(series) {
   let firstGroupWithValuesIndex = undefined;
   let lastGroupWithValuesIndex = 0;
@@ -130,11 +111,9 @@ function getFirstLastGroupWithValuesIndexes(series) {
     lastGroupWithValuesIndex
   };
 }
-
 function getTwoCategoryTrimmedConfig(config, layout) {
   const filteredSeries = config.series.filter(serieObj => !serieObj.custom.isTwoCategoryFakeSerie);
   const emptyGroupIndexes = getEmptySeriesGroupIndexes(filteredSeries);
-
   if (emptyGroupIndexes.length && config.xAxis && config.series) {
     const {
       firstGroupWithValuesIndex,
@@ -147,7 +126,6 @@ function getTwoCategoryTrimmedConfig(config, layout) {
         seriesObj.custom.data = cleanData(seriesObj.custom.data, emptyGroupIndexes, firstGroupWithValuesIndex, lastGroupWithValuesIndex, layout.hideEmptyRowItems);
         seriesObj.data = getTwoCategorySplitSerieData(seriesObj.custom.data);
       }
-
       return seriesObj;
     });
     const trimmedXAxis = config.xAxis.map(xAxis => {
@@ -162,19 +140,19 @@ function getTwoCategoryTrimmedConfig(config, layout) {
     return config;
   }
 }
-
 function getDefaultTrimmedConfig(config, layout) {
   const emptySeriesIndexes = getEmptySeriesIndexes(config.series);
-
   if (emptySeriesIndexes.length && config.xAxis && config.series) {
     const {
       firstValueIndex,
       lastValueIndex
     } = getFirstLastValueIndexes(config.series);
-    const trimmedSeries = config.series.map(seriesObj => ({ ...seriesObj,
+    const trimmedSeries = config.series.map(seriesObj => ({
+      ...seriesObj,
       data: cleanData(seriesObj.data, emptySeriesIndexes, firstValueIndex, lastValueIndex, layout.hideEmptyRowItems)
     }));
-    const trimmedXAxis = [{ ...config.xAxis,
+    const trimmedXAxis = [{
+      ...config.xAxis,
       categories: cleanData(config.xAxis[0].categories, emptySeriesIndexes, firstValueIndex, lastValueIndex, layout.hideEmptyRowItems)
     }];
     return Object.assign({}, config, {

package/build/es/visualizations/config/adapters/dhis_highcharts/getTwoCategorySplitSerieData.js

@@ -5,7 +5,6 @@ export default function getTwoCategorySplitSerieData(serieData) {
   let index = 0;
   serieData.forEach((groupData, groupIndex) => {
     groupData.map(point => splitSerieData.push([index++, point]));
-
     if (groupIndex + 1 < serieData.length) {
       splitSerieData.push([index - 0.5, null]);
     }

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

@@ -19,20 +19,18 @@ import getSubtitle from './subtitle/index.js';
 import getTitle from './title/index.js';
 import getXAxis from './xAxis/index.js';
 import getYAxis from './yAxis/index.js';
-
-const getTransformedLayout = layout => ({ ...layout,
+const getTransformedLayout = layout => ({
+  ...layout,
   type: String(layout.type).toUpperCase(),
   targetLineLabel: layout.targetLineLabel || layout.targetLineTitle,
   baseLineLabel: layout.baseLineLabel || layout.baseLineTitle
 });
-
-const getTransformedExtraOptions = extraOptions => ({ ...extraOptions,
+const getTransformedExtraOptions = extraOptions => ({
+  ...extraOptions,
   multiAxisTheme: extraOptions.multiAxisTheme || defaultMultiAxisTheme1
 });
-
 export default function (_ref) {
   var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _layout$seriesKey2$la, _config$xAxis;
-
   let {
     store,
     layout,
@@ -40,11 +38,8 @@ export default function (_ref) {
     extraConfig,
     extraOptions
   } = _ref;
-
   const _layout = getTransformedLayout(layout);
-
   const _extraOptions = getTransformedExtraOptions(extraOptions);
-
   const stacked = isStacked(_layout.type);
   const legendSets = extraOptions.legendSets;
   const series = store.generateData({
@@ -53,18 +48,14 @@ export default function (_ref) {
     categoryIds: _layout.rows && _layout.rows.length ? _layout.rows.map(row => row.dimension) : null,
     extraOptions: _extraOptions
   });
-
   if (_layout.type === VIS_TYPE_SCATTER) {
     var _layout$outlierAnalys;
-
     _extraOptions.scatterData = getScatterData(series, store);
     _extraOptions.scatterPoints = _extraOptions.scatterData.map(item => [item.x, item.y]);
-
     if ((_layout$outlierAnalys = _layout.outlierAnalysis) !== null && _layout$outlierAnalys !== void 0 && _layout$outlierAnalys.enabled) {
       _extraOptions.outlierHelper = getOutlierHelper(_extraOptions.scatterPoints, _layout.outlierAnalysis);
     }
   }
-
   let config = {
     // type etc
     chart: getChart(_layout, el, _extraOptions.dashboard),
@@ -110,8 +101,9 @@ export default function (_ref) {
       // disable exporting context menu
       enabled: false
     }
-  }; // get plot options for scatter
+  };
 
+  // get plot options for scatter
   if (_layout.type === VIS_TYPE_SCATTER) {
     const metaDataItems = store.data[0].metaData.items;
     const columnItems = _layout.columns[0].items;
@@ -131,42 +123,39 @@ export default function (_ref) {
         onClick: _extraOptions.onToggleContextualMenu
       } : {})
     });
-  } // hide empty categories
-
+  }
 
+  // hide empty categories
   if (_layout.hideEmptyRowItems !== 'NONE') {
     config = getTrimmedConfig(config, _layout);
-  } // sorting
-
+  }
 
+  // sorting
   if (_layout.sortOrder) {
     config = getSortedConfig(config, _layout, stacked);
-  } // DHIS2-1243 add trend lines after sorting
-  // trend line on pie and gauge does not make sense
-
+  }
 
+  // DHIS2-1243 add trend lines after sorting
+  // trend line on pie and gauge does not make sense
   if (isString(_layout.regressionType) && _layout.regressionType !== 'NONE' && !isRegressionIneligible(_layout.type) && _layout.type !== VIS_TYPE_SCATTER) {
     config.series = addTrendLines(_layout, config.series, stacked);
-  } // DHIS2-147 add legendset to Column and Bar
+  }
 
+  // DHIS2-147 add legendset to Column and Bar
   /*
    ** Note: This needs to go last, after all other data manipulation is done, as it changes
    ** the format of the data prop from an array of values to an array of objects with y and color props.
    */
 
-
   if (legendSets !== null && legendSets !== void 0 && legendSets.length && isLegendSetType(layout.type) && layout.type !== VIS_TYPE_GAUGE) {
     var _layout$legend2, _layout$legend3;
-
     if (((_layout$legend2 = _layout.legend) === null || _layout$legend2 === void 0 ? void 0 : _layout$legend2.strategy) === LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM) {
       config.series = config.series.map(seriesObj => {
         if (seriesObj.type === VIS_TYPE_LINE) {
           return seriesObj;
         }
-
         const legendSet = legendSets.find(legendSet => {
           var _store$data$0$metaDat;
-
           return legendSet.id === ((_store$data$0$metaDat = store.data[0].metaData.items[seriesObj.id]) === null || _store$data$0$metaDat === void 0 ? void 0 : _store$data$0$metaDat.legendSet);
         });
         return legendSet ? applyLegendSet(seriesObj, legendSet) : seriesObj;
@@ -174,18 +163,18 @@ export default function (_ref) {
     } else if (((_layout$legend3 = _layout.legend) === null || _layout$legend3 === void 0 ? void 0 : _layout$legend3.strategy) === LEGEND_DISPLAY_STRATEGY_FIXED) {
       config.series = config.series.map(seriesObj => seriesObj.type === VIS_TYPE_LINE ? seriesObj : applyLegendSet(seriesObj, legendSets[0]));
     }
-
     config.tooltip = getLegendSetTooltip();
-  } // flatten category groups
-
+  }
 
+  // flatten category groups
   if ((_config$xAxis = config.xAxis) !== null && _config$xAxis !== void 0 && _config$xAxis.length) {
-    config.xAxis = config.xAxis.map(xAxis => xAxis.categories ? { ...xAxis,
+    config.xAxis = config.xAxis.map(xAxis => xAxis.categories ? {
+      ...xAxis,
       categories: xAxis.categories.flat()
     } : xAxis);
-  } // force apply extra config
-
+  }
 
+  // force apply extra config
   Object.assign(config, extraConfig);
   return objectClean(config);
 }

package/build/es/visualizations/config/adapters/dhis_highcharts/legend.js

@@ -9,7 +9,6 @@ const DASHBOARD_LEGEND = {
   symbolPadding: 3,
   itemDistance: 10
 };
-
 function getItemStyle(fontStyle, dashboard) {
   return {
     itemStyle: Object.assign({}, {
@@ -17,19 +16,17 @@ function getItemStyle(fontStyle, dashboard) {
       fontWeight: 'normal'
     }, dashboard ? DASHBOARD_ITEM_STYLE : {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: "".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"),
+      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
       fontWeight: fontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal',
       fontStyle: fontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal'
     })
   };
 }
-
 function getLegend(fontStyle, dashboard, visType) {
   return Object.assign({}, dashboard ? DASHBOARD_LEGEND : {
     align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], FONT_STYLE_LEGEND, isVerticalType(visType))
   });
 }
-
 export default function (_ref) {
   let {
     isHidden,

package/build/es/visualizations/config/adapters/dhis_highcharts/legendSet.js

@@ -2,16 +2,14 @@ import isNumeric from 'd2-utilizr/lib/isNumeric';
 import i18n from '../../../../locales/index.js';
 import { getLegendByValueFromLegendSet } from '../../../../modules/legends.js';
 const OUT_OF_BOUNDS_COLOR = '#CCCCCC';
-
 const getLegend = (value, legendSet) => value && legendSet ? getLegendByValueFromLegendSet(legendSet, value) : {};
-
 export const applyLegendSet = function () {
   let seriesObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   let legendSet = arguments.length > 1 ? arguments[1] : undefined;
-  return !seriesObj.type ? { ...seriesObj,
+  return !seriesObj.type ? {
+    ...seriesObj,
     data: seriesObj.data.map(value => {
       var _getLegend, _getLegend2, _getLegend3, _getLegend4;
-
       return isNumeric(value) // Single category pass data as [value1, value2]
       ? {
         y: value,
@@ -27,11 +25,12 @@ export const applyLegendSet = function () {
         legendSet: legendSet.name
       } : value;
     })
-  } : { ...seriesObj
+  } : {
+    ...seriesObj
   };
 };
 export const getLegendSetTooltip = () => ({
   pointFormatter: function () {
-    return "<span style=\"color:".concat(this.color, "\">\u25CF</span> ").concat(this.series.name, ": <b>").concat(this.y, "</b><br>") + (this.legend ? "".concat(this.legendSet, ": <b>").concat(this.legend, "</b>") : "".concat(i18n.t('No legend for this series')));
+    return `<span style="color:${this.color}">●</span> ${this.series.name}: <b>${this.y}</b><br>` + (this.legend ? `${this.legendSet}: <b>${this.legend}</b>` : `${i18n.t('No legend for this series')}`);
   }
 });

package/build/es/visualizations/config/adapters/dhis_highcharts/pane/index.js

@@ -4,7 +4,6 @@ export default function (type) {
   switch (type) {
     case VIS_TYPE_GAUGE:
       return getGauge();
-
     default:
       return undefined;
   }

package/build/es/visualizations/config/adapters/dhis_highcharts/plotOptions.js

@@ -16,23 +16,18 @@ export default (_ref => {
       format: '{point.name}'
     }
   };
-
   const getLabels = (x, y) => tooltipData.filter(item => item.x === x && item.y === y).map(item => item.name);
-
   const getTooltip = (x, y) => {
     let labels = getLabels(x, y);
     const length = labels.length;
-
     if (length > MAX_LABELS) {
       labels = labels.slice(0, MAX_LABELS);
       labels.push(i18n.t('and {{amount}} more...', {
         amount: length - MAX_LABELS
       }));
     }
-
-    return "".concat(labels.map(label => "<b>".concat(label, "</b><br>")).join('')).concat(yAxisName, ": ").concat(y, "<br>").concat(xAxisName, ": ").concat(x);
+    return `${labels.map(label => `<b>${label}</b><br>`).join('')}${yAxisName}: ${y}<br>${xAxisName}: ${x}`;
   };
-
   switch (visType) {
     case VIS_TYPE_SCATTER:
       return {
@@ -48,7 +43,6 @@ export default (_ref => {
           boostThreshold: 1
         }
       };
-
     case VIS_TYPE_COLUMN:
     case VIS_TYPE_STACKED_COLUMN:
     case VIS_TYPE_BAR:
@@ -60,7 +54,6 @@ export default (_ref => {
             events: {
               click: function () {
                 var _this$graphic;
-
                 onClick((_this$graphic = this.graphic) === null || _this$graphic === void 0 ? void 0 : _this$graphic.element, {
                   category: this.category,
                   series: this.series.name
@@ -70,7 +63,6 @@ export default (_ref => {
           }
         }
       } : {};
-
     default:
       return {};
   }

package/build/es/visualizations/config/adapters/dhis_highcharts/series/gauge.js

@@ -3,7 +3,6 @@ import { getColorByValueFromLegendSet, LEGEND_DISPLAY_STYLE_TEXT } from '../../.
 const DEFAULT_FONT_SIZE = '28px';
 export default function (series, layout, legendSet) {
   var _layout$legend;
-
   return [{
     name: series[0].name,
     data: series[0].data,