@dhis2/analytics 21.0.0-alpha.3 → 21.0.0-alpha.4

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

@@ -76,7 +76,7 @@ function getTwoCategoryTrendLines(layout, series, isStacked) {
     });
   } else {
     series.forEach(seriesObj => {
-      const trendlineSerieId = `trendline-${seriesObj.id}`;
+      const trendlineSerieId = "trendline-".concat(seriesObj.id);
       newSeries.push(seriesObj);
 
       if (!seriesObj.custom.isTwoCategoryFakeSerie) {

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

@@ -18,7 +18,7 @@ const getPlotLineLabelStyle = fontStyle => ({
   y: -7,
   style: {
     color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-    fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+    fontSize: "".concat(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'
   }
@@ -103,7 +103,7 @@ export const getLabels = axis => {
   return {
     style: {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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'
     },

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

@@ -8,7 +8,7 @@ const getTitleStyle = (fontStyle, titleType, visType) => fontStyle ? {
   margin: 15,
   style: {
     color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-    fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+    fontSize: "".concat(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'
   }

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

@@ -20,7 +20,7 @@ function getItemStyle(fontStyle, dashboard) {
       fontWeight: 'normal'
     }, dashboard ? DASHBOARD_ITEM_STYLE : {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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'
     })
@@ -71,33 +71,22 @@ const formatLabel = ({
 
   if ((!seriesId || seriesId.startsWith('trendline')) && seriesType === getType(VIS_TYPE_LINE).type) {
     // trendline
-    result.push(`<span style="height: ${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 6.5}px; width: ${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px; background-color: ${seriesColor}; display: inline-block;"></span>`);
-    result.push(`<span style="margin-left: 8px" class="data-test-series-key-item-name">${seriesName}</span>`);
+    result.push("<span style=\"height: ".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 6.5, "px; width: ").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px; background-color: ").concat(seriesColor, "; display: inline-block;\"></span>"));
+    result.push("<span style=\"margin-left: 8px\" class=\"data-test-series-key-item-name\">".concat(seriesName, "</span>"));
   } else if (legendSet !== null && legendSet !== void 0 && (_legendSet$legends = legendSet.legends) !== null && _legendSet$legends !== void 0 && _legendSet$legends.length && isLegendSetType(visType) && seriesType !== getType(VIS_TYPE_LINE).type) {
     // item with legend set
-    legendSet.legends.sort((a, b) => a.startValue - b.startValue).forEach((legend, index) => result.push(`<svg xmlns="http://www.w3.org/2000/svg" width="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}" height="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}" version="1.1"  style="margin-right:-5px; z-index: ${legendSet.legends.length - index}" class="data-test-series-key-item-bullet">
-                    <circle cx="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" cy="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" r="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" fill="${legend.color}"></circle>
-                    </svg>`));
-    result.push(`<span style="margin-left: 8px" class="data-test-series-key-item-name">${seriesName}</span>`);
+    legendSet.legends.sort((a, b) => a.startValue - b.startValue).forEach((legend, index) => result.push("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "\" height=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "\" version=\"1.1\"  style=\"margin-right:-5px; z-index: ").concat(legendSet.legends.length - index, "\" class=\"data-test-series-key-item-bullet\">\n                    <circle cx=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" cy=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" r=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" fill=\"").concat(legend.color, "\"></circle>\n                    </svg>")));
+    result.push("<span style=\"margin-left: 8px\" class=\"data-test-series-key-item-name\">".concat(seriesName, "</span>"));
   } else {
     // regular item (not a trendline, no applied legend set)
     if ((seriesColor === null || seriesColor === void 0 ? void 0 : seriesColor.patternIndex) !== undefined) {
       const pattern = colorSets[COLOR_SET_PATTERNS].patterns[seriesColor.patternIndex];
-      result.push(`<svg xmlns="http://www.w3.org/2000/svg" style="height: ${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px; width: ${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px; display: inline-block; margin-right:5px" class="data-test-series-key-item-bullet">
-                <defs>
-                  <pattern id="pattern${seriesColor.patternIndex}" patternUnits="userSpaceOnUse" width="${pattern.width}" height="${pattern.height}">
-                    <path stroke="${pattern.color}" d="${pattern.path}"/>
-                  </pattern>
-                </defs>
-                <circle cx="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" cy="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" r="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" fill="url(#pattern${seriesColor.patternIndex})"/>
-              </svg>`);
+      result.push("<svg xmlns=\"http://www.w3.org/2000/svg\" style=\"height: ".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px; width: ").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px; display: inline-block; margin-right:5px\" class=\"data-test-series-key-item-bullet\">\n                <defs>\n                  <pattern id=\"pattern").concat(seriesColor.patternIndex, "\" patternUnits=\"userSpaceOnUse\" width=\"").concat(pattern.width, "\" height=\"").concat(pattern.height, "\">\n                    <path stroke=\"").concat(pattern.color, "\" d=\"").concat(pattern.path, "\"/>\n                  </pattern>\n                </defs>\n                <circle cx=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" cy=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" r=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" fill=\"url(#pattern").concat(seriesColor.patternIndex, ")\"/>\n              </svg>"));
     } else {
-      result.push(`<svg xmlns="http://www.w3.org/2000/svg" width="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}" height="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}" version="1.1"  style="margin-right:5px" class="data-test-series-key-item-bullet">
-                    <circle cx="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" cy="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" r="${fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2}" fill="${seriesColor}"></circle>
-                    </svg>`);
+      result.push("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"".concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "\" height=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], "\" version=\"1.1\"  style=\"margin-right:5px\" class=\"data-test-series-key-item-bullet\">\n                    <circle cx=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" cy=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" r=\"").concat(fontStyle[FONT_STYLE_OPTION_FONT_SIZE] / 2, "\" fill=\"").concat(seriesColor, "\"></circle>\n                    </svg>"));
     }
 
-    result.push(`<span class="data-test-series-key-item-name">${seriesName}</span>`);
+    result.push("<span class=\"data-test-series-key-item-name\">".concat(seriesName, "</span>"));
   }
 
   result.push('</div>');

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

@@ -28,6 +28,6 @@ export const applyLegendSet = (seriesObj = {}, legendSet) => !seriesObj.type ? {
 };
 export const getLegendSetTooltip = () => ({
   pointFormatter: function () {
-    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')}`);
+    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')));
   }
 });

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

@@ -29,7 +29,7 @@ export default (({
       }));
     }
 
-    return `${labels.map(label => `<b>${label}</b><br>`).join('')}${yAxisName}: ${y}<br>${xAxisName}: ${x}`;
+    return "".concat(labels.map(label => "<b>".concat(label, "</b><br>")).join('')).concat(yAxisName, ": ").concat(y, "<br>").concat(xAxisName, ": ").concat(x);
   };
 
   switch (visType) {

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

@@ -58,7 +58,7 @@ export default function (series, layout, metaData, dashboard) {
     style: {
       // DHIS2-578: dynamically truncate subtitle when it's taking more than 1 line
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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',
       whiteSpace: 'nowrap',

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

@@ -61,7 +61,7 @@ export default function (layout, metaData, dashboard) {
     align: getTextAlignOption(fontStyle[FONT_STYLE_OPTION_TEXT_ALIGN], FONT_STYLE_VISUALIZATION_TITLE, isVerticalType(layout.type)),
     style: {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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',
       whiteSpace: 'nowrap',

package/build/es/visualizations/config/adapters/dhis_highcharts/title/scatter.js

@@ -4,6 +4,6 @@ export default function (layout, metaData, dashboard) {
 
   if ((_layout$rows = layout.rows) !== null && _layout$rows !== void 0 && _layout$rows.length && (_layout$columns = layout.columns) !== null && _layout$columns !== void 0 && _layout$columns.length && !dashboard) {
     const columns = getFilterText(layout.columns, metaData).split(', ');
-    return `${getFilterText(layout.rows, metaData)}: ${columns[0]} - ${columns[1]}`;
+    return "".concat(getFilterText(layout.rows, metaData), ": ").concat(columns[0], " - ").concat(columns[1]);
   }
 }

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

@@ -23,7 +23,7 @@ export const getLabels = axis => {
   return {
     style: {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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'
     },

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

@@ -47,12 +47,12 @@ function getPlotLine(regressionLine = {}, defaultLabel) {
     color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR] || '#000',
     ...(label && {
       label: {
-        text: `${label}: ${value}`,
+        text: "".concat(label, ": ").concat(value),
         verticalAlign,
         y,
         style: {
           color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-          fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+          fontSize: "".concat(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'
         }
@@ -69,7 +69,7 @@ const getLabels = axis => {
     y: parseInt(fontStyle[FONT_STYLE_OPTION_FONT_SIZE], 10) + 7,
     style: {
       color: fontStyle[FONT_STYLE_OPTION_TEXT_COLOR],
-      fontSize: `${fontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`,
+      fontSize: "".concat(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'
     }

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

@@ -52,9 +52,9 @@ function getDefault(layout, series, extraOptions) {
           var _axis$title;
 
           rl.title = { ...rl.title,
-            text: `${rl.title.text} - ${((_axis$title = axis.title) === null || _axis$title === void 0 ? void 0 : _axis$title.text) || i18n.t('Axis {{axisId}}', {
+            text: "".concat(rl.title.text, " - ").concat(((_axis$title = axis.title) === null || _axis$title === void 0 ? void 0 : _axis$title.text) || i18n.t('Axis {{axisId}}', {
               axisId: axis.index + 1
-            })}`
+            }))
           };
         }
       });

package/build/es/visualizations/config/generators/dhis/singleValue.js

@@ -14,7 +14,7 @@ const generateValueSVG = ({
   const textSize = 300;
   const svgValue = document.createElementNS(svgNS, 'svg');
   svgValue.setAttribute('xmlns', svgNS);
-  svgValue.setAttribute('viewBox', `0 -${textSize + 50} ${textSize * 0.75 * formattedValue.length} ${textSize + 200}`);
+  svgValue.setAttribute('viewBox', "0 -".concat(textSize + 50, " ").concat(textSize * 0.75 * formattedValue.length, " ").concat(textSize + 200));
 
   if (y) {
     svgValue.setAttribute('y', y);
@@ -42,7 +42,7 @@ const generateValueSVG = ({
   if (subText) {
     const svgSubText = document.createElementNS(svgNS, 'svg');
     const subTextSize = 40;
-    svgSubText.setAttribute('viewBox', `0 -50 ${textSize * 0.75 * formattedValue.length} ${textSize + 200}`);
+    svgSubText.setAttribute('viewBox', "0 -50 ".concat(textSize * 0.75 * formattedValue.length, " ").concat(textSize + 200));
 
     if (y) {
       svgSubText.setAttribute('y', y);
@@ -136,7 +136,7 @@ const generateDVItem = (config, {
   const svgNS = 'http://www.w3.org/2000/svg';
   const svg = document.createElementNS(svgNS, 'svg');
   svg.setAttribute('xmlns', svgNS);
-  svg.setAttribute('viewBox', `0 0 ${width} ${height}`);
+  svg.setAttribute('viewBox', "0 0 ".concat(width, " ").concat(height));
   svg.setAttribute('width', '100%');
   svg.setAttribute('height', '100%');
   svg.setAttribute('data-test', 'visualization-container');
@@ -145,7 +145,7 @@ const generateDVItem = (config, {
   title.setAttribute('x', getXFromTextAlign(titleFontStyle[FONT_STYLE_OPTION_TEXT_ALIGN]));
   title.setAttribute('y', 28);
   title.setAttribute('text-anchor', getTextAnchorFromTextAlign(titleFontStyle[FONT_STYLE_OPTION_TEXT_ALIGN]));
-  title.setAttribute('font-size', `${titleFontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`);
+  title.setAttribute('font-size', "".concat(titleFontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"));
   title.setAttribute('font-weight', titleFontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal');
   title.setAttribute('font-style', titleFontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal');
   title.setAttribute('fill', titleFontStyle[FONT_STYLE_OPTION_TEXT_COLOR]);
@@ -162,7 +162,7 @@ const generateDVItem = (config, {
   subtitle.setAttribute('y', 28);
   subtitle.setAttribute('dy', 22);
   subtitle.setAttribute('text-anchor', getTextAnchorFromTextAlign(subtitleFontStyle[FONT_STYLE_OPTION_TEXT_ALIGN]));
-  subtitle.setAttribute('font-size', `${subtitleFontStyle[FONT_STYLE_OPTION_FONT_SIZE]}px`);
+  subtitle.setAttribute('font-size', "".concat(subtitleFontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"));
   subtitle.setAttribute('font-weight', subtitleFontStyle[FONT_STYLE_OPTION_BOLD] ? FONT_STYLE_OPTION_BOLD : 'normal');
   subtitle.setAttribute('font-style', subtitleFontStyle[FONT_STYLE_OPTION_ITALIC] ? FONT_STYLE_OPTION_ITALIC : 'normal');
   subtitle.setAttribute('fill', subtitleFontStyle[FONT_STYLE_OPTION_TEXT_COLOR]);

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

@@ -20,15 +20,15 @@ export default function ({
   const _generator = generators[outputFormat];
 
   if (_validator === validators.noValidation) {
-    onWarning(`No validation implementation for config input format "${inputFormat}"`);
+    onWarning("No validation implementation for config input format \"".concat(inputFormat, "\""));
   }
 
   if (!_adapter) {
-    onError(`No config tranformation implementation for format "${inputFormat}" to format "${outputFormat}"`);
+    onError("No config tranformation implementation for format \"".concat(inputFormat, "\" to format \"").concat(outputFormat, "\""));
   }
 
   if (!_generator) {
-    onError(`No visualization implementation for format ${outputFormat}`);
+    onError("No visualization implementation for format ".concat(outputFormat));
   }
 
   const DEFAULT_EXTRA_OPTIONS = {

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

@@ -30,7 +30,7 @@ function getDefault(acc, seriesIds, categoryIds, idValueMap, metaData) {
   seriesIds.forEach(seriesId => {
     const serieData = [];
     categoryIds.forEach(categoryId => {
-      const value = idValueMap.get(`${seriesId}-${categoryId}`); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get("".concat(seriesId, "-").concat(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
 

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

@@ -40,7 +40,7 @@ function getDefault(acc, series, categories, idValueMap, metaData) {
   series[0].forEach(serieItemId => {
     const serieData = [];
     categories[0].forEach(categoryItemId => {
-      const value = idValueMap.get(`${serieItemId}-${categoryItemId}`); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get("".concat(serieItemId, "-").concat(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

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

@@ -6,7 +6,7 @@ export default function (acc, series, categories, idValueMap, metaData) {
     categories[0].forEach(category1ItemId => {
       const groupData = [];
       categories[1].forEach(category2ItemId => {
-        const value = idValueMap.get(`${seriesItemId}-${category1ItemId}-${category2ItemId}`);
+        const value = idValueMap.get("".concat(seriesItemId, "-").concat(category1ItemId, "-").concat(category2ItemId));
         groupData.push(value === undefined ? null : parseFloat(value));
       });
       groupedData.push(groupData);

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

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

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

@@ -128,7 +128,7 @@ describe('getFilterText', () => {
         name: '02 of 2018',
         uid: '_201802_'
       };
-      expect(getFilterText(filters, metaData)).toEqual('Clinics, Hospital - Last 2 months');
+      expect(getFilterText(filters, metaData)).toEqual('Clinics, Hospital - 01 of 2018, 02 of 2018');
     });
   });
 });

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

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

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

@@ -2,7 +2,7 @@ import { getOuLevelAndGroupText } from '../../modules/getOuLevelAndGroupText';
 import { dimensionGetItems } from '../../modules/layout/dimensionGetItems';
 import { dimensionIs } from '../../modules/layout/dimensionIs';
 import { ouIdHelper } from '../../modules/ouIdHelper';
-import { DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from '../../modules/predefinedDimensions';
+import { DIMENSION_ID_ORGUNIT } from '../../modules/predefinedDimensions';
 export default function (filters, metaData) {
   if (!Array.isArray(filters) || !filters.length) {
     return '';
@@ -19,15 +19,7 @@ export default function (filters, metaData) {
     }) => ouIdHelper.hasGroupPrefix(id) || ouIdHelper.hasLevelPrefix(id))) {
       titleFragments.push(getOuLevelAndGroupText(filter, metaData));
     } else {
-      let filterItems = [];
-
-      if (dimensionIs(filter, DIMENSION_ID_PERIOD)) {
-        filterItems = items.map(({
-          id
-        }) => id);
-      } else {
-        filterItems = metaData.dimensions[filter.dimension];
-      }
+      const filterItems = metaData.dimensions[filter.dimension];
 
       if (Array.isArray(filterItems)) {
         l = filterItems.length;
@@ -42,9 +34,9 @@ export default function (filters, metaData) {
           } // 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;
-          }
+              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": "21.0.0-alpha.3",
+    "version": "21.0.0-alpha.4",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -35,7 +35,7 @@
         "@dhis2/cli-app-scripts": "^6.2.0",
         "@dhis2/cli-style": "^9.0.1",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^6.23.5",
+        "@dhis2/ui": "^7.7.2",
         "@sambego/storybook-state": "^2.0.1",
         "@storybook/addons": "^6.1.14",
         "@storybook/preset-create-react-app": "^3.1.7",

package/build/cjs/components/OrgUnitDimension/OrgUnitDimensionOld.js

@@ -1,244 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.defaultState = void 0;
-
-var _style = _interopRequireDefault(require("styled-jsx/style"));
-
-var _d2UiOrgUnitDialog = require("@dhis2/d2-ui-org-unit-dialog");
-
-var _ui = require("@dhis2/ui");
-
-var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _organisationUnits = require("../../api/organisationUnits");
-
-var _ouIdHelper = require("../../modules/ouIdHelper");
-
-var _predefinedDimensions = require("../../modules/predefinedDimensions");
-
-var _OrgUnitDimension = _interopRequireDefault(require("./styles/OrgUnitDimension.style"));
-
-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 }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-const defaultState = {
-  root: undefined,
-  roots: undefined,
-  // use "selected" property for cloning org units while user org unit(s) is (are) selected
-  selected: [],
-  ouLevels: [],
-  ouGroups: [],
-  showOrgUnitsTree: true
-};
-exports.defaultState = defaultState;
-
-class OrgUnitDimension extends _react.Component {
-  constructor(props) {
-    super(props);
-
-    _defineProperty(this, "showOrgUnitsTree", () => {
-      this.setState({
-        showOrgUnitsTree: true
-      });
-    });
-
-    _defineProperty(this, "hideOrgUnitsTree", () => {
-      this.setState({
-        showOrgUnitsTree: false
-      });
-    });
-
-    _defineProperty(this, "getUserOrgUnitsFromIds", ids => {
-      return _d2UiOrgUnitDialog.userOrgUnits.filter(ou => ids.includes(ou.id));
-    });
-
-    _defineProperty(this, "onLevelChange", event => {
-      const levelIds = event.target.value.filter(id => !!id);
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...this.props.ouItems.filter(ou => !_ouIdHelper.ouIdHelper.hasLevelPrefix(ou.id)), ...levelIds.map(id => {
-          const levelOu = this.state.ouLevels.find(ou => ou.id === id);
-          return { ...levelOu,
-            id: _ouIdHelper.ouIdHelper.addLevelPrefix(levelOu.id)
-          };
-        })]
-      });
-    });
-
-    _defineProperty(this, "onGroupChange", event => {
-      const groupIds = event.target.value.filter(id => !!id);
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...this.props.ouItems.filter(ou => !_ouIdHelper.ouIdHelper.hasGroupPrefix(ou.id)), ...groupIds.map(id => {
-          const groupOu = this.state.ouGroups.find(ou => ou.id === id);
-          return { ...groupOu,
-            id: _ouIdHelper.ouIdHelper.addGroupPrefix(id)
-          };
-        })]
-      });
-    });
-
-    _defineProperty(this, "onDeselectAllClick", () => this.props.onDeselect({
-      dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-      itemIdsToRemove: this.props.ouItems.map(ou => ou.id)
-    }));
-
-    _defineProperty(this, "loadOrgUnitTree", (d2, displayNameProperty) => {
-      (0, _organisationUnits.apiFetchOrganisationUnits)(d2, displayNameProperty).then(rootLevel => rootLevel.toArray()).then(roots => {
-        this.setState({
-          roots,
-          root: roots[0]
-        });
-      });
-    });
-
-    _defineProperty(this, "loadOrgUnitGroups", (d2, displayNameProperty) => {
-      (0, _organisationUnits.apiFetchOrganisationUnitGroups)(d2, displayNameProperty).then(organisationUnitGroups => this.setState({
-        ouGroups: organisationUnitGroups
-      }));
-    });
-
-    _defineProperty(this, "loadOrgUnitLevels", d2 => {
-      (0, _organisationUnits.apiFetchOrganisationUnitLevels)(d2).then(organisationUnitLevels => this.setState({
-        ouLevels: (0, _sortBy.default)(organisationUnitLevels, ['level'])
-      }));
-    });
-
-    _defineProperty(this, "handleOrgUnitClick", (event, orgUnit) => {
-      const selected = this.props.ouItems;
-
-      if (selected.some(ou => ou.path === orgUnit.path)) {
-        this.props.onDeselect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          itemIdsToRemove: [orgUnit.id]
-        });
-      } else {
-        this.props.onSelect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          items: [...selected, { ...orgUnit,
-            name: orgUnit.name || orgUnit.displayName
-          }]
-        });
-      }
-    });
-
-    _defineProperty(this, "handleUserOrgUnitClick", (event, checked) => {
-      if (checked) {
-        if (!this.state.selected.length) {
-          this.setState({
-            selected: this.props.ouItems.slice()
-          });
-        }
-
-        this.props.onSelect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          items: [...this.props.ouItems.filter(ou => this.userOrgUnitIds.includes(ou.id)), _d2UiOrgUnitDialog.userOrgUnits.find(ou => ou.id === event.target.name)]
-        });
-      } else {
-        if (this.props.ouItems.length === 1 && this.state.selected.length > 0) {
-          this.props.onSelect({
-            dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-            items: this.state.selected
-          });
-        } else {
-          this.props.onDeselect({
-            dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-            itemIdsToRemove: [event.target.name]
-          });
-        }
-      }
-    });
-
-    _defineProperty(this, "handleMultipleOrgUnitsSelect", orgUnits => {
-      const selected = this.props.ouItems;
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...selected, ...orgUnits.reduce((obj, ou) => {
-          // avoid duplicates when clicking "Select children" multiple times
-          if (!selected.find(i => i.id === ou.id)) {
-            obj.push({ ...ou,
-              name: ou.name || ou.displayName
-            });
-          }
-
-          return obj;
-        }, [])]
-      });
-    });
-
-    _defineProperty(this, "render", () => {
-      const ids = this.props.ouItems.map(ou => ou.id);
-      const selected = this.props.ouItems.filter(ou => !this.userOrgUnitIds.includes(ou.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(ou.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(ou.id));
-      const userOrgUnits = this.getUserOrgUnitsFromIds(ids);
-      const level = ids.filter(_ouIdHelper.ouIdHelper.hasLevelPrefix).map(_ouIdHelper.ouIdHelper.removePrefix);
-      const group = ids.filter(_ouIdHelper.ouIdHelper.hasGroupPrefix).map(_ouIdHelper.ouIdHelper.removePrefix);
-      return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, this.state.root && this.state.showOrgUnitsTree && /*#__PURE__*/_react.default.createElement(_d2UiOrgUnitDialog.OrgUnitSelector, {
-        d2: this.props.d2,
-        root: this.state.root,
-        roots: this.state.roots,
-        selected: selected,
-        userOrgUnits: userOrgUnits,
-        level: level,
-        group: group,
-        levelOptions: this.state.ouLevels,
-        groupOptions: this.state.ouGroups,
-        onLevelChange: this.onLevelChange,
-        onGroupChange: this.onGroupChange,
-        onDeselectAllClick: this.onDeselectAllClick,
-        handleUserOrgUnitClick: this.handleUserOrgUnitClick,
-        handleOrgUnitClick: this.handleOrgUnitClick,
-        handleMultipleOrgUnitsSelect: this.handleMultipleOrgUnitsSelect,
-        checkboxColor: "secondary",
-        deselectAllTooltipFontColor: _ui.colors.grey900,
-        deselectAllTooltipBackgroundColor: _ui.colors.grey300,
-        displayNameProperty: this.props.displayNameProperty,
-        isUserDataViewFallback: true
-      }), !this.state.root && /*#__PURE__*/_react.default.createElement("div", {
-        className: `jsx-${_OrgUnitDimension.default.__hash}` + " " + "loader"
-      }, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
-        id: _OrgUnitDimension.default.__hash
-      }, _OrgUnitDimension.default));
-    });
-
-    this.state = defaultState;
-    this.userOrgUnitIds = _d2UiOrgUnitDialog.userOrgUnits.map(ou => ou.id);
-    this.loadOrgUnitTree(props.d2, props.displayNameProperty);
-    this.loadOrgUnitGroups(props.d2, props.displayNameProperty);
-    this.loadOrgUnitLevels(props.d2);
-  }
-
-  componentDidUpdate(prevProps) {
-    const previousId = prevProps.current ? prevProps.current.id : null;
-    const currentId = this.props.current ? this.props.current.id : null; // remount org units selector component to ensure
-    // only selected org units are expanded
-
-    if (previousId !== currentId) {
-      this.hideOrgUnitsTree();
-      setTimeout(this.showOrgUnitsTree, 0);
-    }
-  }
-
-}
-
-OrgUnitDimension.propTypes = {
-  current: _propTypes.default.object,
-  d2: _propTypes.default.object,
-  displayNameProperty: _propTypes.default.string,
-  ouItems: _propTypes.default.array,
-  onDeselect: _propTypes.default.func,
-  onSelect: _propTypes.default.func
-};
-var _default = OrgUnitDimension;
-exports.default = _default;