@dhis2/analytics 28.0.3 → 28.0.5

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -108,11 +108,10 @@ const buildDimensionLookup = (visualization, metadata, headers) => {
     dataHeaders
   };
 };
-const lookup = (dataRow, dimensionLookup, _ref) => {
-  let {
-    doColumnSubtotals,
-    doRowSubtotals
-  } = _ref;
+const lookup = (dataRow, dimensionLookup, {
+  doColumnSubtotals,
+  doRowSubtotals
+}) => {
   let row = 0;
   for (const headerIndex of dimensionLookup.rowHeaders) {
     const idx = dimensionLookup.headerDimensions[headerIndex].itemIds.indexOf(dataRow[headerIndex]);
@@ -142,15 +141,14 @@ const lookup = (dataRow, dimensionLookup, _ref) => {
     row
   };
 };
-const applyTotalAggregationType = (_ref2, overrideTotalAggregationType) => {
-  let {
-    totalAggregationType,
-    value,
-    numerator,
-    denominator,
-    multiplier,
-    divisor
-  } = _ref2;
+const applyTotalAggregationType = ({
+  totalAggregationType,
+  value,
+  numerator,
+  denominator,
+  multiplier,
+  divisor
+}, overrideTotalAggregationType) => {
   switch (overrideTotalAggregationType || totalAggregationType) {
     case AGGREGATE_TYPE_NA:
       return VALUE_NA;
@@ -209,12 +207,11 @@ export class PivotTableEngine {
     this.rowDepth = this.dimensionLookup.rows.length || (this.visualization.showDimensionLabels ? 1 : 0);
     this.buildMatrix();
   }
-  getRaw(_ref3) {
+  getRaw({
+    row,
+    column
+  }) {
     var _headers$find, _headers$find2;
-    let {
-      row,
-      column
-    } = _ref3;
     const cellType = this.getRawCellType({
       row,
       column
@@ -300,18 +297,16 @@ export class PivotTableEngine {
     }
     return rawCell;
   }
-  getCumulative(_ref4) {
-    let {
-      row,
-      column
-    } = _ref4;
+  getCumulative({
+    row,
+    column
+  }) {
     return this.accumulators.rows[row][column];
   }
-  get(_ref5) {
-    let {
-      row,
-      column
-    } = _ref5;
+  get({
+    row,
+    column
+  }) {
     const mappedRow = this.rowMap[row],
       mappedColumn = this.columnMap[column];
     if (!mappedRow && mappedRow !== 0 || !mappedColumn && mappedColumn !== 0) {
@@ -322,11 +317,10 @@ export class PivotTableEngine {
       column: mappedColumn
     });
   }
-  getRawCellType(_ref6) {
-    let {
-      row,
-      column
-    } = _ref6;
+  getRawCellType({
+    row,
+    column
+  }) {
     const isRowTotal = this.doRowTotals && column === this.dataWidth - 1;
     const isColumnTotal = this.doColumnTotals && row === this.dataHeight - 1;
     if (isRowTotal || isColumnTotal) {
@@ -339,11 +333,10 @@ export class PivotTableEngine {
     }
     return CELL_TYPE_VALUE;
   }
-  getCellType(_ref7) {
-    let {
-      row,
-      column
-    } = _ref7;
+  getCellType({
+    row,
+    column
+  }) {
     row = this.rowMap[row];
     column = this.columnMap[column];
     return this.getRawCellType({
@@ -373,21 +366,19 @@ export class PivotTableEngine {
       return i18n.t(this.dimensionLookup.rows[rowLevel].meta.name);
     }
   }
-  getCellDxDimension(_ref8) {
-    let {
-      row,
-      column
-    } = _ref8;
+  getCellDxDimension({
+    row,
+    column
+  }) {
     return this.getRawCellDxDimension({
       row: this.rowMap[row],
       column: this.columnMap[column]
     });
   }
-  getRawCellDxDimension(_ref9) {
-    let {
-      row,
-      column
-    } = _ref9;
+  getRawCellDxDimension({
+    row,
+    column
+  }) {
     if (!this.data[row]) {
       return undefined;
     }
@@ -484,12 +475,11 @@ export class PivotTableEngine {
   getRowHeader(row) {
     return this.getRawRowHeader(this.rowMap[row]);
   }
-  getDependantTotalCells(_ref10) {
+  getDependantTotalCells({
+    row,
+    column
+  }) {
     var _this$dimensionLookup, _this$dimensionLookup2;
-    let {
-      row,
-      column
-    } = _ref10;
     const rowSubtotalSize = ((_this$dimensionLookup = this.dimensionLookup.columns[0]) === null || _this$dimensionLookup === void 0 ? void 0 : _this$dimensionLookup.size) + 1;
     const rowSubtotal = rowSubtotalSize && this.doRowSubtotals && {
       row,
@@ -687,11 +677,10 @@ export class PivotTableEngine {
     // (numberType option default is VALUE)
     return visualization.numberType && visualization.numberType !== NUMBER_TYPE_VALUE && AGGREGATE_TYPE_SUM;
   }
-  finalizeTotal(_ref11) {
-    let {
-      row,
-      column
-    } = _ref11;
+  finalizeTotal({
+    row,
+    column
+  }) {
     if (!this.data[row]) {
       return;
     }

package/build/es/modules/pivotTable/clipAxis.js

@@ -1,12 +1,11 @@
 import times from 'lodash/times';
-export const clipAxis = _ref => {
-  let {
-    position,
-    size,
-    step,
-    totalCount,
-    headerCount
-  } = _ref;
+export const clipAxis = ({
+  position,
+  size,
+  step,
+  totalCount,
+  headerCount
+}) => {
   // position: scroll Y position
   // size: height of table container
   // step: height of cell in px

package/build/es/modules/pivotTable/clipPartitionedAxis.js

@@ -1,13 +1,12 @@
-export const clipPartitionedAxis = _ref => {
-  let {
-    partitionSize,
-    partitions,
-    axisMap,
-    widthMap,
-    viewportWidth,
-    viewportPosition,
-    totalWidth
-  } = _ref;
+export const clipPartitionedAxis = ({
+  partitionSize,
+  partitions,
+  axisMap,
+  widthMap,
+  viewportWidth,
+  viewportPosition,
+  totalWidth
+}) => {
   const partition = Math.floor(viewportPosition / partitionSize);
   if (partitions[partition] === undefined) {
     return {

package/build/es/modules/pivotTable/getHeaderForDisplay.js

@@ -6,15 +6,14 @@ const headerStacksAreEqual = (a, b, limit) => {
   }
   return true;
 };
-export const getHeaderForDisplay = _ref => {
-  let {
-    start,
-    count,
-    index,
-    dimensionLevel,
-    getHeader,
-    showHierarchy
-  } = _ref;
+export const getHeaderForDisplay = ({
+  start,
+  count,
+  index,
+  dimensionLevel,
+  getHeader,
+  showHierarchy
+}) => {
   const header = getHeader(index);
   const showHeader = index === start || !headerStacksAreEqual(header, getHeader(index - 1), dimensionLevel);
   if (!showHeader) {

package/build/es/modules/pivotTable/measureText.js

@@ -8,19 +8,17 @@ const getContext = fontSize => {
   ctx.font = `${fontSize}px Roboto, Arial, sans-serif`;
   return ctx;
 };
-const measureText = function (text) {
-  let fontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
+const measureText = (text, fontSize = 11) => {
   const ctx = getContext(fontSize);
   const textMetrics = ctx.measureText(text);
   return textMetrics.width;
 };
-export const measureTextWithWrapping = (text, _ref) => {
-  let {
-    fontSize = 11,
-    maxWidth = CLIPPED_CELL_MAX_SIZE,
-    justifyBuffer = WRAPPED_TEXT_JUSTIFY_BUFFER,
-    lineHeight = WRAPPED_TEXT_LINE_HEIGHT
-  } = _ref;
+export const measureTextWithWrapping = (text, {
+  fontSize = 11,
+  maxWidth = CLIPPED_CELL_MAX_SIZE,
+  justifyBuffer = WRAPPED_TEXT_JUSTIFY_BUFFER,
+  lineHeight = WRAPPED_TEXT_LINE_HEIGHT
+}) => {
   if (!text) {
     return {
       width: 0,

package/build/es/modules/pivotTable/useParentSize.js

@@ -4,8 +4,7 @@ const initialState = {
   width: 0,
   height: 0
 };
-export const useParentSize = function (elementRef, renderCounter) {
-  let initialSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : initialState;
+export const useParentSize = (elementRef, renderCounter, initialSize = initialState) => {
   const [size, setSize] = useState({
     width: initialSize.width || 0,
     height: initialSize.height || 0

package/build/es/modules/pivotTable/useScrollPosition.js

@@ -1,7 +1,6 @@
 import debounce from 'lodash/debounce';
 import { useState, useCallback, useEffect } from 'react';
-export const useScrollPosition = function (containerRef) {
-  let debounceWait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+export const useScrollPosition = (containerRef, debounceWait = 10) => {
   const [scrollPosition, setScrollPosition] = useState({
     x: 0,
     y: 0

package/build/es/modules/pivotTable/useTableClipping.js

@@ -2,13 +2,12 @@ import { useMemo } from 'react';
 import { clipPartitionedAxis } from './clipPartitionedAxis.js';
 import { CLIPPED_AXIS_PARTITION_SIZE_PX } from './pivotTableConstants.js';
 import { useScrollPosition } from './useScrollPosition.js';
-export const useTableClipping = _ref => {
-  let {
-    containerRef,
-    width,
-    height,
-    engine
-  } = _ref;
+export const useTableClipping = ({
+  containerRef,
+  width,
+  height,
+  engine
+}) => {
   const scrollPosition = useScrollPosition(containerRef);
   const lineHeight = engine.fontSize + engine.cellPadding * 2 + 2;
   const rows = useMemo(() => {

package/build/es/modules/relativeItems/index.js

@@ -1,7 +1,4 @@
 import { getRelativePeriodIds } from '../../components/PeriodDimension/utils/relativePeriods.js';
 import { ouIdHelper, USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN } from '../ouIdHelper/index.js';
 import { DIMENSION_ID_ASSIGNED_CATEGORIES, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from '../predefinedDimensions.js';
-export const hasRelativeItems = function (dimension) {
-  let itemIds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return dimension === DIMENSION_ID_ASSIGNED_CATEGORIES || dimension === DIMENSION_ID_ORGUNIT && Array.isArray(itemIds) && itemIds.some(id => ouIdHelper.hasLevelPrefix(id) || ouIdHelper.hasGroupPrefix(id) || [USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN].includes(id)) || dimension === DIMENSION_ID_PERIOD && Array.isArray(itemIds) && itemIds.some(id => getRelativePeriodIds().includes(id));
-};
+export const hasRelativeItems = (dimension, itemIds = []) => dimension === DIMENSION_ID_ASSIGNED_CATEGORIES || dimension === DIMENSION_ID_ORGUNIT && Array.isArray(itemIds) && itemIds.some(id => ouIdHelper.hasLevelPrefix(id) || ouIdHelper.hasGroupPrefix(id) || [USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN].includes(id)) || dimension === DIMENSION_ID_PERIOD && Array.isArray(itemIds) && itemIds.some(id => getRelativePeriodIds().includes(id));

package/build/es/modules/renderValue.js

@@ -1,8 +1,7 @@
 import { NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE } from './pivotTable/pivotTableConstants.js';
 import { isNumericValueType, isBooleanValueType } from './valueTypes.js';
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
-export const separateDigitGroups = function (stringValue) {
-  let decimalSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '.';
+export const separateDigitGroups = (stringValue, decimalSeparator = '.') => {
   const isNegative = stringValue[0] === '-';
   const [integer, remainder] = stringValue.replace(/^-/, '').split('.');
   const groups = [];

package/build/es/modules/utils.js

@@ -20,4 +20,12 @@ export const useDidUpdateEffect = (fn, inputs) => {
       didMountRef.current = true;
     }
   }, inputs);
-};
+};
+
+/**
+ * Check if a value is numeric
+ *
+ * @param param Value to be checked
+ * @returns {boolean} Returns true when the `param` is a numeric value
+ */
+export const isNumeric = param => typeof param !== 'symbol' && !isNaN(parseFloat(param)) && isFinite(param);

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

@@ -188,8 +188,7 @@ function gaussianElimination(a, o) {
 //              N * Σ(X^2) - Σ(X)^2
 //
 // correlation = N * Σ(XY) - Σ(X) * Σ (Y) / √ (  N * Σ(X^2) - Σ(X) ) * ( N * Σ(Y^2) - Σ(Y)^2 ) ) )
-export function linear(data) {
-  let decimalPlaces = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+export function linear(data, decimalPlaces = 2) {
   const sum = [0, 0, 0, 0, 0],
     results = [];
   let N = data.length;
@@ -238,10 +237,7 @@ export function linear(data) {
 }
 
 // Code extracted from https://github.com/Tom-Alexander/regression-js/
-function polynomial(data) {
-  let order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
-  let extrapolate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  let decimalPlaces = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 2;
+function polynomial(data, order = 2, extrapolate = 0, decimalPlaces = 2) {
   const lhs = [],
     rhs = [],
     results = [],
@@ -322,8 +318,7 @@ function polynomial(data) {
 // Based on
 // - http://commons.apache.org/proper/commons-math/download_math.cgi LoesInterpolator.java
 // - https://gist.github.com/avibryant/1151823
-function loess(data) {
-  let bandwidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.25;
+function loess(data, bandwidth = 0.25) {
   const xval = data.map(pair => {
     return pair[0];
   });

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

@@ -1,7 +1,7 @@
-import isNumeric from 'd2-utilizr/lib/isNumeric';
 import isString from 'd2-utilizr/lib/isString';
 import objectClean from 'd2-utilizr/lib/objectClean';
 import { FONT_STYLE_AXIS_LABELS, FONT_STYLE_REGRESSION_LINE_LABEL, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_TEXT_ALIGN, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, mergeFontStyleWithDefault } from '../../../../modules/fontStyle.js';
+import { isNumeric } from '../../../../modules/utils.js';
 import { isVerticalType } from '../../../../modules/visTypes.js';
 import getFormatter from './getFormatter.js';
 import { getTextAlignOption } from './getTextAlignOption.js';
@@ -68,11 +68,8 @@ export const getMaxValue = (maxValue, dataValues, outlierLineMax) => {
   }
   return dataValues !== null && dataValues !== void 0 && dataValues.every(value => value < DEFAULT_MIN_VALUE) ? DEFAULT_MIN_VALUE : undefined;
 };
-export const getRegressionLine = function () {
+export const getRegressionLine = (regressionLine = {}, visType, isVertical) => {
   var _regressionLine$title, _regressionLine$title2;
-  let regressionLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let visType = arguments.length > 1 ? arguments[1] : undefined;
-  let isVertical = arguments.length > 2 ? arguments[2] : undefined;
   const fontStyle = mergeFontStyleWithDefault((_regressionLine$title = regressionLine.title) === null || _regressionLine$title === void 0 ? void 0 : _regressionLine$title.fontStyle, FONT_STYLE_REGRESSION_LINE_LABEL);
   const plotLineStyle = getPlotLineStyle(fontStyle);
   const plotLineLabelStyle = getPlotLineLabelStyle(fontStyle);

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

@@ -12,9 +12,7 @@ export function getIdAxisMap(customAxes) {
     return map;
   }, {});
 }
-export function getFullIdAxisMap() {
-  let customAxes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let series = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+export function getFullIdAxisMap(customAxes = [], series = []) {
   const idAxisMap = getIdAxisMap(customAxes.filter(axisItem => series.find(seriesItem => seriesItem.id === axisItem.dimensionItem)));
 
   // adds first axis ids to seriesAxisMap
@@ -33,8 +31,7 @@ export function getFullIdAxisMap() {
 // }
 export function getAxisIdsMap(customAxes, series) {
   const fullIdAxisMap = getFullIdAxisMap(customAxes, series);
-  return Object.entries(fullIdAxisMap).reduce((map, _ref) => {
-    let [id, axis] = _ref;
+  return Object.entries(fullIdAxisMap).reduce((map, [id, axis]) => {
     if (!(axis in map)) {
       map[axis] = [];
     }

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

@@ -1,13 +1,12 @@
 import { VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import getSingleValueCustomSVGOptions from './singleValue/index.js';
-export default function getCustomSVGOptions(_ref) {
-  let {
-    extraConfig,
-    layout,
-    extraOptions,
-    metaData,
-    series
-  } = _ref;
+export default function getCustomSVGOptions({
+  extraConfig,
+  layout,
+  extraOptions,
+  metaData,
+  series
+}) {
   const baseOptions = {
     visualizationType: layout.type
   };

package/build/es/visualizations/config/adapters/dhis_highcharts/customSVGOptions/singleValue/getSingleValueBackgroundColor.js

@@ -1,7 +1,6 @@
 import { LEGEND_DISPLAY_STYLE_FILL } from '../../../../../../modules/legends.js';
 import { getSingleValueLegendColor } from './getSingleValueLegendColor.js';
-export function getSingleValueBackgroundColor(legendOptions, legendSets, value) {
-  let defaultColor = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'transparent';
+export function getSingleValueBackgroundColor(legendOptions, legendSets, value, defaultColor = 'transparent') {
   const legendColor = getSingleValueLegendColor(legendOptions, legendSets, value);
   return legendColor && legendOptions.style === LEGEND_DISPLAY_STYLE_FILL ? legendColor : defaultColor;
 }

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

@@ -2,13 +2,12 @@ import { colors } from '@dhis2/ui';
 import { getSingleValueFormattedValue } from './getSingleValueFormattedValue.js';
 import { getSingleValueSubtext } from './getSingleValueSubtext.js';
 import { getSingleValueTextColor } from './getSingleValueTextColor.js';
-export default function getSingleValueCustomSVGOptions(_ref) {
-  let {
-    layout,
-    extraOptions,
-    metaData,
-    series
-  } = _ref;
+export default function getSingleValueCustomSVGOptions({
+  layout,
+  extraOptions,
+  metaData,
+  series
+}) {
   const {
     dashboard,
     icon

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

@@ -1,4 +1,4 @@
-import isNumeric from 'd2-utilizr/lib/isNumeric';
+import { isNumeric } from '../../../../modules/utils.js';
 export default function (axis) {
   const decimals = axis.decimals;
   return isNumeric(decimals) ? {

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

@@ -1,4 +1,4 @@
-import isNumeric from 'd2-utilizr/lib/isNumeric';
+import { isNumeric } from '../../../../modules/utils.js';
 export default function (axis) {
   const steps = axis.steps;
   return isNumeric(steps) ? steps : undefined;

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

@@ -14,10 +14,9 @@ function getEmptySeriesIndexes(series) {
   let seriesValues;
   series[0].data.forEach((value, index) => {
     seriesValues = [];
-    series.forEach(_ref => {
-      let {
-        data
-      } = _ref;
+    series.forEach(({
+      data
+    }) => {
       // handle undefined values due to empty (or shorter) serie data
       // preserve 0 as valid value
       seriesValues.push(data[index] === undefined ? null : data[index]);

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

@@ -33,15 +33,14 @@ const getTransformedExtraOptions = extraOptions => ({
   ...extraOptions,
   multiAxisTheme: extraOptions.multiAxisTheme || defaultMultiAxisTheme1
 });
-export default function (_ref) {
+export default function ({
+  store,
+  layout,
+  el,
+  extraConfig,
+  extraOptions
+}) {
   var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _layout$seriesKey2$la, _config$xAxis;
-  let {
-    store,
-    layout,
-    el,
-    extraConfig,
-    extraOptions
-  } = _ref;
   const _layout = getTransformedLayout(layout);
   const _extraOptions = getTransformedExtraOptions(extraOptions);
   const stacked = isStacked(_layout.type);

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

@@ -27,13 +27,12 @@ function getLegend(fontStyle, dashboard, visType) {
     align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], FONT_STYLE_LEGEND, isVerticalType(visType))
   });
 }
-export default function (_ref) {
-  let {
-    isHidden,
-    fontStyle,
-    visType,
-    dashboard
-  } = _ref;
+export default function ({
+  isHidden,
+  fontStyle,
+  visType,
+  dashboard
+}) {
   const mergedFontStyle = mergeFontStyleWithDefault(fontStyle, FONT_STYLE_LEGEND);
   return isHidden || visType === VIS_TYPE_SCATTER ? {
     enabled: false

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

@@ -1,33 +1,29 @@
-import isNumeric from 'd2-utilizr/lib/isNumeric';
 import i18n from '../../../../locales/index.js';
 import { getLegendByValueFromLegendSet } from '../../../../modules/legends.js';
+import { isNumeric } from '../../../../modules/utils.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,
-    data: seriesObj.data.map(value => {
-      var _getLegend, _getLegend2, _getLegend3, _getLegend4;
-      return isNumeric(value) // Single category pass data as [value1, value2]
-      ? {
-        y: value,
-        color: ((_getLegend = getLegend(value, legendSet)) === null || _getLegend === void 0 ? void 0 : _getLegend.color) || OUT_OF_BOUNDS_COLOR,
-        legend: ((_getLegend2 = getLegend(value, legendSet)) === null || _getLegend2 === void 0 ? void 0 : _getLegend2.name) || '-',
-        legendSet: legendSet.name
-      } : Array.isArray(value) // Dual category pass data as [[position1, value1], [position2, value2]]
-      ? {
-        x: value[0],
-        y: value[1],
-        color: ((_getLegend3 = getLegend(value[1], legendSet)) === null || _getLegend3 === void 0 ? void 0 : _getLegend3.color) || OUT_OF_BOUNDS_COLOR,
-        legend: ((_getLegend4 = getLegend(value[1], legendSet)) === null || _getLegend4 === void 0 ? void 0 : _getLegend4.name) || '-',
-        legendSet: legendSet.name
-      } : value;
-    })
-  } : {
-    ...seriesObj
-  };
+export const applyLegendSet = (seriesObj = {}, legendSet) => !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,
+      color: ((_getLegend = getLegend(value, legendSet)) === null || _getLegend === void 0 ? void 0 : _getLegend.color) || OUT_OF_BOUNDS_COLOR,
+      legend: ((_getLegend2 = getLegend(value, legendSet)) === null || _getLegend2 === void 0 ? void 0 : _getLegend2.name) || '-',
+      legendSet: legendSet.name
+    } : Array.isArray(value) // Dual category pass data as [[position1, value1], [position2, value2]]
+    ? {
+      x: value[0],
+      y: value[1],
+      color: ((_getLegend3 = getLegend(value[1], legendSet)) === null || _getLegend3 === void 0 ? void 0 : _getLegend3.color) || OUT_OF_BOUNDS_COLOR,
+      legend: ((_getLegend4 = getLegend(value[1], legendSet)) === null || _getLegend4 === void 0 ? void 0 : _getLegend4.name) || '-',
+      legendSet: legendSet.name
+    } : value;
+  })
+} : {
+  ...seriesObj
 };
 export const getLegendSetTooltip = () => ({
   pointFormatter: function () {

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

@@ -1,15 +1,14 @@
 import i18n from '../../../../locales/index.js';
 import { VIS_TYPE_COLUMN, VIS_TYPE_SCATTER, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR } from '../../../../modules/visTypes.js';
 const MAX_LABELS = 10;
-export default _ref => {
-  let {
-    visType,
-    xAxisName,
-    yAxisName,
-    showLabels,
-    tooltipData,
-    onClick
-  } = _ref;
+export default ({
+  visType,
+  xAxisName,
+  yAxisName,
+  showLabels,
+  tooltipData,
+  onClick
+}) => {
   const series = {
     dataLabels: {
       enabled: showLabels,