@dhis2/analytics 26.0.7 → 26.0.9

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

@@ -4,68 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _isString = _interopRequireDefault(require("d2-utilizr/lib/isString"));
-
 var _objectClean = _interopRequireDefault(require("d2-utilizr/lib/objectClean"));
-
 var _legends = require("../../../../modules/legends.js");
-
 var _index = require("../../../../modules/outliers/index.js");
-
 var _visTypes = require("../../../../modules/visTypes.js");
-
 var _themes = require("../../../util/colors/themes.js");
-
 var _addTrendLines = _interopRequireWildcard(require("./addTrendLines.js"));
-
 var _chart = _interopRequireDefault(require("./chart.js"));
-
 var _getScatterData = _interopRequireDefault(require("./getScatterData.js"));
-
 var _getSortedConfig = _interopRequireDefault(require("./getSortedConfig.js"));
-
 var _getTrimmedConfig = _interopRequireDefault(require("./getTrimmedConfig.js"));
-
 var _legend = _interopRequireDefault(require("./legend.js"));
-
 var _legendSet = require("./legendSet.js");
-
 var _noData = _interopRequireDefault(require("./noData.js"));
-
 var _index2 = _interopRequireDefault(require("./pane/index.js"));
-
 var _plotOptions = _interopRequireDefault(require("./plotOptions.js"));
-
 var _index3 = _interopRequireDefault(require("./series/index.js"));
-
 var _index4 = _interopRequireDefault(require("./subtitle/index.js"));
-
 var _index5 = _interopRequireDefault(require("./title/index.js"));
-
 var _index6 = _interopRequireDefault(require("./xAxis/index.js"));
-
 var _index7 = _interopRequireDefault(require("./yAxis/index.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; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 || _themes.defaultMultiAxisTheme1
 });
-
 function _default(_ref) {
   var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _layout$seriesKey2$la, _config$xAxis;
-
   let {
     store,
     layout,
@@ -73,11 +47,8 @@ function _default(_ref) {
     extraConfig,
     extraOptions
   } = _ref;
-
   const _layout = getTransformedLayout(layout);
-
   const _extraOptions = getTransformedExtraOptions(extraOptions);
-
   const stacked = (0, _visTypes.isStacked)(_layout.type);
   const legendSets = extraOptions.legendSets;
   const series = store.generateData({
@@ -86,18 +57,14 @@ function _default(_ref) {
     categoryIds: _layout.rows && _layout.rows.length ? _layout.rows.map(row => row.dimension) : null,
     extraOptions: _extraOptions
   });
-
   if (_layout.type === _visTypes.VIS_TYPE_SCATTER) {
     var _layout$outlierAnalys;
-
     _extraOptions.scatterData = (0, _getScatterData.default)(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 = (0, _index.getOutlierHelper)(_extraOptions.scatterPoints, _layout.outlierAnalysis);
     }
   }
-
   let config = {
     // type etc
     chart: (0, _chart.default)(_layout, el, _extraOptions.dashboard),
@@ -143,8 +110,9 @@ function _default(_ref) {
       // disable exporting context menu
       enabled: false
     }
-  }; // get plot options for scatter
+  };
 
+  // get plot options for scatter
   if (_layout.type === _visTypes.VIS_TYPE_SCATTER) {
     const metaDataItems = store.data[0].metaData.items;
     const columnItems = _layout.columns[0].items;
@@ -164,42 +132,39 @@ function _default(_ref) {
         onClick: _extraOptions.onToggleContextualMenu
       } : {})
     });
-  } // hide empty categories
-
+  }
 
+  // hide empty categories
   if (_layout.hideEmptyRowItems !== 'NONE') {
     config = (0, _getTrimmedConfig.default)(config, _layout);
-  } // sorting
-
+  }
 
+  // sorting
   if (_layout.sortOrder) {
     config = (0, _getSortedConfig.default)(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 ((0, _isString.default)(_layout.regressionType) && _layout.regressionType !== 'NONE' && !(0, _addTrendLines.isRegressionIneligible)(_layout.type) && _layout.type !== _visTypes.VIS_TYPE_SCATTER) {
     config.series = (0, _addTrendLines.default)(_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 && (0, _visTypes.isLegendSetType)(layout.type) && layout.type !== _visTypes.VIS_TYPE_GAUGE) {
     var _layout$legend2, _layout$legend3;
-
     if (((_layout$legend2 = _layout.legend) === null || _layout$legend2 === void 0 ? void 0 : _layout$legend2.strategy) === _legends.LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM) {
       config.series = config.series.map(seriesObj => {
         if (seriesObj.type === _visTypes.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 ? (0, _legendSet.applyLegendSet)(seriesObj, legendSet) : seriesObj;
@@ -207,18 +172,18 @@ function _default(_ref) {
     } else if (((_layout$legend3 = _layout.legend) === null || _layout$legend3 === void 0 ? void 0 : _layout$legend3.strategy) === _legends.LEGEND_DISPLAY_STRATEGY_FIXED) {
       config.series = config.series.map(seriesObj => seriesObj.type === _visTypes.VIS_TYPE_LINE ? seriesObj : (0, _legendSet.applyLegendSet)(seriesObj, legendSets[0]));
     }
-
     config.tooltip = (0, _legendSet.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 (0, _objectClean.default)(config);
 }

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

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _fontStyle = require("../../../../modules/fontStyle.js");
-
 var _visTypes = require("../../../../modules/visTypes.js");
-
 var _getTextAlignOption = require("./getTextAlignOption.js");
-
 const DASHBOARD_ITEM_STYLE = {
   fontSize: '11px',
   fontWeight: 500
@@ -19,7 +15,6 @@ const DASHBOARD_LEGEND = {
   symbolPadding: 3,
   itemDistance: 10
 };
-
 function getItemStyle(fontStyle, dashboard) {
   return {
     itemStyle: Object.assign({}, {
@@ -27,19 +22,17 @@ function getItemStyle(fontStyle, dashboard) {
       fontWeight: 'normal'
     }, dashboard ? DASHBOARD_ITEM_STYLE : {
       color: fontStyle[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: "".concat(fontStyle[_fontStyle.FONT_STYLE_OPTION_FONT_SIZE], "px"),
+      fontSize: `${fontStyle[_fontStyle.FONT_STYLE_OPTION_FONT_SIZE]}px`,
       fontWeight: fontStyle[_fontStyle.FONT_STYLE_OPTION_BOLD] ? _fontStyle.FONT_STYLE_OPTION_BOLD : 'normal',
       fontStyle: fontStyle[_fontStyle.FONT_STYLE_OPTION_ITALIC] ? _fontStyle.FONT_STYLE_OPTION_ITALIC : 'normal'
     })
   };
 }
-
 function getLegend(fontStyle, dashboard, visType) {
   return Object.assign({}, dashboard ? DASHBOARD_LEGEND : {
     align: (0, _getTextAlignOption.getTextAlignOption)(fontStyle[_fontStyle.FONT_STYLE_OPTION_TEXT_ALIGN], _fontStyle.FONT_STYLE_LEGEND, (0, _visTypes.isVerticalType)(visType))
   });
 }
-
 function _default(_ref) {
   let {
     isHidden,

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

@@ -4,26 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLegendSetTooltip = exports.applyLegendSet = void 0;
-
 var _isNumeric = _interopRequireDefault(require("d2-utilizr/lib/isNumeric"));
-
 var _index = _interopRequireDefault(require("../../../../locales/index.js"));
-
 var _legends = require("../../../../modules/legends.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const OUT_OF_BOUNDS_COLOR = '#CCCCCC';
-
 const getLegend = (value, legendSet) => value && legendSet ? (0, _legends.getLegendByValueFromLegendSet)(legendSet, value) : {};
-
 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 (0, _isNumeric.default)(value) // Single category pass data as [value1, value2]
       ? {
         y: value,
@@ -39,16 +32,14 @@ const applyLegendSet = function () {
         legendSet: legendSet.name
       } : value;
     })
-  } : { ...seriesObj
+  } : {
+    ...seriesObj
   };
 };
-
 exports.applyLegendSet = applyLegendSet;
-
 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(_index.default.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>` : `${_index.default.t('No legend for this series')}`);
   }
 });
-
 exports.getLegendSetTooltip = getLegendSetTooltip;

package/build/cjs/visualizations/config/adapters/dhis_highcharts/noData.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function _default() {
   return {
     style: {

package/build/cjs/visualizations/config/adapters/dhis_highcharts/pane/gauge.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 const DEFAULT_PANE_SIZE = '100%';
-
 function _default() {
   return {
     center: ['50%', '85%'],

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

@@ -4,18 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _visTypes = require("../../../../../modules/visTypes.js");
-
 var _gauge = _interopRequireDefault(require("./gauge.js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _default(type) {
   switch (type) {
     case _visTypes.VIS_TYPE_GAUGE:
       return (0, _gauge.default)();
-
     default:
       return undefined;
   }

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

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _index = _interopRequireDefault(require("../../../../locales/index.js"));
-
 var _visTypes = require("../../../../modules/visTypes.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const MAX_LABELS = 10;
-
 var _default = _ref => {
   let {
     visType,
@@ -28,23 +23,18 @@ var _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(_index.default.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 _visTypes.VIS_TYPE_SCATTER:
       return {
@@ -60,7 +50,6 @@ var _default = _ref => {
           boostThreshold: 1
         }
       };
-
     case _visTypes.VIS_TYPE_COLUMN:
     case _visTypes.VIS_TYPE_STACKED_COLUMN:
     case _visTypes.VIS_TYPE_BAR:
@@ -72,7 +61,6 @@ var _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
@@ -82,10 +70,8 @@ var _default = _ref => {
           }
         }
       } : {};
-
     default:
       return {};
   }
 };
-
 exports.default = _default;

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

@@ -4,16 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _ui = require("@dhis2/ui");
-
 var _legends = require("../../../../../modules/legends.js");
-
 const DEFAULT_FONT_SIZE = '28px';
-
 function _default(series, layout, legendSet) {
   var _layout$legend;
-
   return [{
     name: series[0].name,
     data: series[0].data,

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/index.js

@@ -4,37 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _ui = require("@dhis2/ui");
-
 var _axis = require("../../../../../modules/axis.js");
-
 var _axisHasRelativeItems = require("../../../../../modules/layout/axisHasRelativeItems.js");
-
 var _legends = require("../../../../../modules/legends.js");
-
 var _visTypes = require("../../../../../modules/visTypes.js");
-
 var _axisId = require("../../../../util/axisId.js");
-
 var _colorSets = require("../../../../util/colors/colorSets.js");
-
 var _gradientColorGenerator = require("../../../../util/colors/gradientColorGenerator.js");
-
 var _customAxes = require("../customAxes.js");
-
 var _getCumulativeData = _interopRequireDefault(require("../getCumulativeData.js"));
-
 var _type = _interopRequireDefault(require("../type.js"));
-
 var _gauge = _interopRequireDefault(require("./gauge.js"));
-
 var _pie = _interopRequireDefault(require("./pie.js"));
-
 var _scatter = _interopRequireDefault(require("./scatter.js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const DEFAULT_ANIMATION_DURATION = 200;
 const HIGHCHARTS_TYPE_COLUMN = 'column';
 const HIGHCHARTS_TYPE_BAR = 'bar';
@@ -42,22 +26,17 @@ const HIGHCHARTS_TYPE_PERCENT = 'percent';
 const HIGHCHARTS_TYPE_NORMAL = 'normal';
 const INCREASED_Z_INDEX = 1;
 const epiCurveTypes = [HIGHCHARTS_TYPE_COLUMN, HIGHCHARTS_TYPE_BAR];
-
 function getAnimation(option, fallback) {
   return typeof option === 'number' ? option : fallback;
 }
-
 function getColor(colors, index) {
   return colors[index] || getColor(colors, index - colors.length);
 }
-
 function getPatternIndex(index) {
   return index < 10 ? index : getPatternIndex(index - 10);
 }
-
 function getIndexColorPatternMap(series, layout, extraOptions) {
   var _colorSets$layout$col;
-
   const colors = ((_colorSets$layout$col = _colorSets.colorSets[layout.colorSet]) === null || _colorSets$layout$col === void 0 ? void 0 : _colorSets$layout$col.colors) || extraOptions.colors;
   return series.reduce((map, s, index) => {
     map[index] = layout.colorSet === _colorSets.COLOR_SET_PATTERNS ? {
@@ -66,12 +45,9 @@ function getIndexColorPatternMap(series, layout, extraOptions) {
     return map;
   }, {});
 }
-
 function getIdColorMap(series, layout, extraOptions) {
   var _layout$series;
-
   const filteredSeries = (_layout$series = layout.series) === null || _layout$series === void 0 ? void 0 : _layout$series.filter(layoutSeriesItem => series.some(seriesItem => seriesItem.id === layoutSeriesItem.dimensionItem));
-
   if ((0, _visTypes.isDualAxisType)(layout.type) && (0, _axis.hasCustomAxes)(filteredSeries) && !(0, _axisHasRelativeItems.axisHasRelativeItems)(layout.columns)) {
     const axisIdsMap = (0, _customAxes.getAxisIdsMap)(layout.series, series);
     const theme = extraOptions.multiAxisTheme;
@@ -96,7 +72,6 @@ function getIdColorMap(series, layout, extraOptions) {
     }, {});
   }
 }
-
 function getDefault(_ref) {
   let {
     series,
@@ -112,16 +87,15 @@ function getDefault(_ref) {
   const indexColorPatternMap = getIndexColorPatternMap(series, layout, extraOptions);
   series.forEach((seriesObj, index) => {
     var _seriesObj$custom, _layout$series2, _metaData$seriesObj$i;
-
     // show values
     if (!seriesObj.dataLabels && (layout.showValues || layout.showData)) {
       seriesObj.dataLabels = {
         enabled: true,
         color: _ui.colors.grey900
       };
-    } // stacked
-
+    }
 
+    // stacked
     if (isStacked && !(seriesObj !== null && seriesObj !== void 0 && (_seriesObj$custom = seriesObj.custom) !== null && _seriesObj$custom !== void 0 && _seriesObj$custom.isTwoCategoryFakeSerie)) {
       // DHIS2-1060: stacked charts can optionally be shown as 100% stacked charts
       if (layout.percentStackedValues === true) {
@@ -131,14 +105,11 @@ function getDefault(_ref) {
         seriesObj.stacking = HIGHCHARTS_TYPE_NORMAL;
       }
     }
-
     const matchedObject = (_layout$series2 = layout.series) === null || _layout$series2 === void 0 ? void 0 : _layout$series2.find(item => item.dimensionItem === seriesObj.id);
-
     if (matchedObject && !(0, _axisHasRelativeItems.axisHasRelativeItems)(layout.columns)) {
       // Checks if the item has custom options
       if (matchedObject.type) {
         seriesObj.type = (0, _type.default)(matchedObject.type).type;
-
         if (matchedObject.type === _visTypes.VIS_TYPE_LINE) {
           seriesObj.zIndex = INCREASED_Z_INDEX; // Custom options, item type Line
         }
@@ -147,31 +118,31 @@ function getDefault(_ref) {
       }
     } else if (layout.type === _visTypes.VIS_TYPE_LINE) {
       seriesObj.zIndex = INCREASED_Z_INDEX; // No custom options, visType Line
-    } // DHIS2-2101
-    // show bar/column chart as EPI curve (basically remove spacing between bars/columns)
-
+    }
 
+    // DHIS2-2101
+    // show bar/column chart as EPI curve (basically remove spacing between bars/columns)
     if (layout.noSpaceBetweenColumns && epiCurveTypes.includes((0, _type.default)(layout.type).type)) {
       seriesObj.pointPadding = 0;
       seriesObj.groupPadding = 0;
-    } // color
-
+    }
 
+    // color
     if ((0, _visTypes.isYearOverYear)(layout.type)) {
       // YearOverYear: Fetch colors directly from color sets
       seriesObj.color = indexColorPatternMap[index];
     } else {
       // Default: Either generate colors or fetch from color sets
       seriesObj.color = idColorMap[seriesObj.id];
-    } // axis number
-
+    }
 
-    seriesObj.yAxis = (0, _visTypes.isDualAxisType)(layout.type) && !(0, _axisHasRelativeItems.axisHasRelativeItems)(layout.columns) ? (0, _axisId.getAxisStringFromId)(fullIdAxisMap[seriesObj.id]) : (0, _axisId.getAxisStringFromId)(0); // custom names for "year over year" series
+    // axis number
+    seriesObj.yAxis = (0, _visTypes.isDualAxisType)(layout.type) && !(0, _axisHasRelativeItems.axisHasRelativeItems)(layout.columns) ? (0, _axisId.getAxisStringFromId)(fullIdAxisMap[seriesObj.id]) : (0, _axisId.getAxisStringFromId)(0);
 
+    // custom names for "year over year" series
     if (extraOptions.yearlySeries) {
       seriesObj.name = extraOptions.yearlySeries[index];
     }
-
     seriesObj.legendSet = (0, _legends.getLegendSetByDisplayStrategy)({
       displayStrategy,
       legendSets,
@@ -180,15 +151,14 @@ function getDefault(_ref) {
     seriesObj.marker = {
       enabled: false
     };
-  }); // DHIS2-701: use cumulative values
+  });
 
+  // DHIS2-701: use cumulative values
   if (layout.cumulativeValues === true) {
     series = (0, _getCumulativeData.default)(series, layout);
   }
-
   return series;
 }
-
 function _default(_ref2) {
   let {
     series,
@@ -199,20 +169,16 @@ function _default(_ref2) {
     legendSets,
     displayStrategy
   } = _ref2;
-
   switch (layout.type) {
     case _visTypes.VIS_TYPE_PIE:
       series = (0, _pie.default)(series, Object.values(getIdColorMap(series, layout, extraOptions)));
       break;
-
     case _visTypes.VIS_TYPE_GAUGE:
       series = (0, _gauge.default)(series, layout, extraOptions.legendSets[0]);
       break;
-
     case _visTypes.VIS_TYPE_SCATTER:
       series = (0, _scatter.default)(extraOptions);
       break;
-
     default:
       series = getDefault({
         series,
@@ -224,7 +190,6 @@ function _default(_ref2) {
         displayStrategy
       });
   }
-
   series.forEach(seriesObj => {
     // animation
     seriesObj.animation = {

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/pie.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function _default(series, colors) {
   return [{
     colorByPoint: true,

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/scatter.js

@@ -4,23 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _index = _interopRequireDefault(require("../../../../../locales/index.js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const DEFAULT_COLOR = '#a8bf24';
 const OUTLIER_COLOR = 'red';
 const POINT_MARKER_SYMBOL = 'circle';
-
 var _default = extraOptions => {
   const series = [];
-
   if (extraOptions.outlierHelper) {
     var _helper$vars$normaliz;
-
     const helper = extraOptions.outlierHelper;
-    helper.detectOutliers(); // points
+    helper.detectOutliers();
+
+    // points
 
     helper.inlierPoints.length && series.push({
       data: helper.inlierPoints,
@@ -41,7 +37,9 @@ var _default = extraOptions => {
         radius: 4
       },
       color: OUTLIER_COLOR
-    }); // thresholds
+    });
+
+    // thresholds
 
     helper.thresholds.forEach(obj => {
       series.push({
@@ -57,7 +55,9 @@ var _default = extraOptions => {
           headerFormat: ''
         }
       });
-    }); // regression
+    });
+
+    // regression
 
     ((_helper$vars$normaliz = helper.vars.normalizationHelper) === null || _helper$vars$normaliz === void 0 ? void 0 : _helper$vars$normaliz.regression) && series.push({
       data: helper.vars.normalizationHelper.regression.points,
@@ -84,8 +84,6 @@ var _default = extraOptions => {
       color: DEFAULT_COLOR
     });
   }
-
   return series;
 };
-
 exports.default = _default;