@dhis2/analytics 20.6.4 → 21.0.0-alpha.3

package/build/es/index.js

@@ -16,13 +16,13 @@ export { default as LegendKey } from './components/LegendKey/LegendKey'; // Api
 
 export { default as Analytics } from './api/analytics/Analytics';
 export { apiFetchDimensions, apiFetchRecommendedIds } from './api/dimensions';
-export { apiFetchOrganisationUnitLevels, apiFetchOrganisationUnitRoots, apiFetchOrganisationUnit } from './api/organisationUnits-dataEngine'; // Modules: axis
+export { apiFetchOrganisationUnitLevels, apiFetchOrganisationUnitRoots, apiFetchOrganisationUnit } from './api/organisationUnits'; // Modules: axis
 
 export { getAxisName, getAxisNameByLayoutType, hasCustomAxes } from './modules/axis'; // Modules: predefined dimensions
 
 export { DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT, DIMENSION_ID_ASSIGNED_CATEGORIES, DIMENSION_PROP_NO_ITEMS, filterOutPredefinedDimensions, getPredefinedDimensionProp, getDimensionById, getPredefinedDimensions, getFixedDimensions, getDynamicDimensions } from './modules/predefinedDimensions'; // Modules: ou utils
 
-export { ouIdHelper } from './modules/ouIdHelper';
+export { ouIdHelper, USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN } from './modules/ouIdHelper';
 export { convertOuLevelsToUids } from './modules/ouLevelUtils'; // Modules: adapted ui layout
 
 export { getAdaptedUiLayoutByType } from './modules/getAdaptedUiLayoutByType'; // Modules: relativeItems

package/build/es/locales/en/translations.json

@@ -101,6 +101,21 @@
     "Options": "Options",
     "Hide": "Hide",
     "Update": "Update",
+    "{{count}} org units": "{{count}} org unit",
+    "{{count}} org units_plural": "{{count}} org units",
+    "{{count}} levels": "{{count}} level",
+    "{{count}} levels_plural": "{{count}} levels",
+    "{{count}} groups": "{{count}} group",
+    "{{count}} groups_plural": "{{count}} groups",
+    "{{count}} user org units": "{{count}} user org unit",
+    "{{count}} user org units_plural": "{{count}} user org units",
+    "Nothing selected": "Nothing selected",
+    "User organisation unit": "User organisation unit",
+    "User sub-units": "User sub-units",
+    "User sub-x2-units": "User sub-x2-units",
+    "Select a level": "Select a level",
+    "Select a group": "Select a group",
+    "Deselect all": "Deselect all",
     "Period type": "Period type",
     "Year": "Year",
     "Select year": "Select year",

package/build/es/locales/ru/translations.json

@@ -76,7 +76,7 @@
     "There was a problem loading items. Try again or contact your system administrator.": "",
     "No items found. Create a new to get started.": "",
     "No items found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "Create new": "",
+    "Create new": "Создать новый",
     "Open a visualization": "",
     "Loading visualizations": "",
     "Couldn't load visualizations": "",

package/build/es/modules/axis.js

@@ -33,7 +33,7 @@ export const getAxisNameByLayoutType = (axisId, layoutType) => {
   const name = getAxisNamesByLayoutType(layoutType)[axisId];
 
   if (!name) {
-    throw new Error("".concat(axisId, " is not a valid axis id"));
+    throw new Error(`${axisId} is not a valid axis id`);
   }
 
   return name;

package/build/es/modules/layoutUiRules/rules.js

@@ -101,7 +101,7 @@ const getRulesByVisType = visType => {
   const rules = visTypeToRules[visType];
 
   if (!rules) {
-    throw new Error("".concat(visType, " is not a known visualization type"));
+    throw new Error(`${visType} is not a known visualization type`);
   }
 
   return rules;

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

@@ -1,5 +1,8 @@
 const LEVEL_ID_PREFIX = 'LEVEL';
 const GROUP_ID_PREFIX = 'OU_GROUP';
+export const USER_ORG_UNIT = 'USER_ORGUNIT';
+export const USER_ORG_UNIT_CHILDREN = 'USER_ORGUNIT_CHILDREN';
+export const USER_ORG_UNIT_GRANDCHILDREN = 'USER_ORGUNIT_GRANDCHILDREN';
 
 const hasGroupPrefix = id => id.substr(0, GROUP_ID_PREFIX.length) === GROUP_ID_PREFIX;
 
@@ -12,8 +15,8 @@ const stripGroupPrefix = id => hasGroupPrefix(id) ? id.substr(GROUP_ID_PREFIX.le
 const removePrefix = id => stripGroupPrefix(stripLevelPrefix(id));
 
 export const ouIdHelper = Object.freeze({
-  addLevelPrefix: id => "".concat(LEVEL_ID_PREFIX, "-").concat(removePrefix(id)),
-  addGroupPrefix: id => "".concat(GROUP_ID_PREFIX, "-").concat(removePrefix(id)),
+  addLevelPrefix: id => `${LEVEL_ID_PREFIX}-${removePrefix(id)}`,
+  addGroupPrefix: id => `${GROUP_ID_PREFIX}-${removePrefix(id)}`,
   removePrefix,
   hasGroupPrefix,
   hasLevelPrefix

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

@@ -354,7 +354,7 @@ export class PivotTableEngine {
     }
 
     if (rowLevel === lastRowLevel && this.dimensionLookup.rows[lastRowLevel] && columnLevel === lastColumnLevel && this.dimensionLookup.columns[lastColumnLevel]) {
-      return "".concat(this.dimensionLookup.rows[lastRowLevel].meta.name, " / ").concat(this.dimensionLookup.columns[lastColumnLevel].meta.name);
+      return `${this.dimensionLookup.rows[lastRowLevel].meta.name} / ${this.dimensionLookup.columns[lastColumnLevel].meta.name}`;
     }
 
     if (lastRowLevel === -1) {
@@ -948,12 +948,12 @@ export class PivotTableEngine {
 
   sort(column, order) {
     if (order !== SORT_ORDER_ASCENDING && order !== SORT_ORDER_DESCENDING) {
-      console.warn("Invalid sort order ".concat(order));
+      console.warn(`Invalid sort order ${order}`);
       return;
     }
 
     if (!this.isSortable(column)) {
-      console.warn("Invalid sort column ".concat(column));
+      console.warn(`Invalid sort column ${column}`);
       return;
     }
 

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

@@ -7,7 +7,7 @@ const getContext = fontSize => {
   }
 
   const ctx = canvas.getContext('2d');
-  ctx.font = "".concat(fontSize, "px Roboto, Arial, sans-serif");
+  ctx.font = `${fontSize}px Roboto, Arial, sans-serif`;
   return ctx;
 };
 

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

@@ -1,4 +1,4 @@
 import { getRelativePeriodIds } from '../../components/PeriodDimension/utils/relativePeriods';
-import { ouIdHelper } from '../ouIdHelper';
+import { ouIdHelper, USER_ORG_UNIT, USER_ORG_UNIT_CHILDREN, USER_ORG_UNIT_GRANDCHILDREN } from '../ouIdHelper';
 import { DIMENSION_ID_ASSIGNED_CATEGORIES, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from '../predefinedDimensions';
-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_ORGUNIT', 'USER_ORGUNIT_CHILDREN', 'USER_ORGUNIT_GRAND_CHILDREN'].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/visTypes.js

@@ -71,7 +71,7 @@ export const getDisplayNameByVisType = visType => {
   const displayName = visTypeDisplayNames[visType];
 
   if (!displayName) {
-    throw new Error("".concat(visType, " is not a valid visualization type"));
+    throw new Error(`${visType} is not a valid visualization type`);
   }
 
   return displayName;

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-".concat(seriesObj.id);
+      const trendlineSerieId = `trendline-${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: "".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'
   }
@@ -103,7 +103,7 @@ export const getLabels = axis => {
   return {
     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'
     },

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: "".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'
   }

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: "".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'
     })
@@ -71,22 +71,33 @@ const formatLabel = ({
 
   if ((!seriesId || seriesId.startsWith('trendline')) && seriesType === getType(VIS_TYPE_LINE).type) {
     // trendline
-    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>"));
+    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>`);
   } 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=\"".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>"));
+    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>`);
   } 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: ".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>"));
+      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>`);
     } else {
-      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(`<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("<span class=\"data-test-series-key-item-name\">".concat(seriesName, "</span>"));
+    result.push(`<span class="data-test-series-key-item-name">${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:".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/plotOptions.js

@@ -29,7 +29,7 @@ export default (({
       }));
     }
 
-    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) {

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: "".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',
       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: "".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',
       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 "".concat(getFilterText(layout.rows, metaData), ": ").concat(columns[0], " - ").concat(columns[1]);
+    return `${getFilterText(layout.rows, metaData)}: ${columns[0]} - ${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: "".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'
     },

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: "".concat(label, ": ").concat(value),
+        text: `${label}: ${value}`,
         verticalAlign,
         y,
         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'
         }
@@ -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: "".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'
     }

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: "".concat(rl.title.text, " - ").concat(((_axis$title = axis.title) === null || _axis$title === void 0 ? void 0 : _axis$title.text) || i18n.t('Axis {{axisId}}', {
+            text: `${rl.title.text} - ${((_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 -".concat(textSize + 50, " ").concat(textSize * 0.75 * formattedValue.length, " ").concat(textSize + 200));
+  svgValue.setAttribute('viewBox', `0 -${textSize + 50} ${textSize * 0.75 * formattedValue.length} ${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 ".concat(textSize * 0.75 * formattedValue.length, " ").concat(textSize + 200));
+    svgSubText.setAttribute('viewBox', `0 -50 ${textSize * 0.75 * formattedValue.length} ${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 ".concat(width, " ").concat(height));
+  svg.setAttribute('viewBox', `0 0 ${width} ${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', "".concat(titleFontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"));
+  title.setAttribute('font-size', `${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', "".concat(subtitleFontStyle[FONT_STYLE_OPTION_FONT_SIZE], "px"));
+  subtitle.setAttribute('font-size', `${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 \"".concat(inputFormat, "\""));
+    onWarning(`No validation implementation for config input format "${inputFormat}"`);
   }
 
   if (!_adapter) {
-    onError("No config tranformation implementation for format \"".concat(inputFormat, "\" to format \"").concat(outputFormat, "\""));
+    onError(`No config tranformation implementation for format "${inputFormat}" to format "${outputFormat}"`);
   }
 
   if (!_generator) {
-    onError("No visualization implementation for format ".concat(outputFormat));
+    onError(`No visualization implementation for format ${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("".concat(seriesId, "-").concat(categoryId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${seriesId}-${categoryId}`); // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
 

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("".concat(serieItemId, "-").concat(categoryItemId)); // DHIS2-1261: 0 is a valid value
+      const value = idValueMap.get(`${serieItemId}-${categoryItemId}`); // DHIS2-1261: 0 is a valid value
       // undefined value means the key was not found within the rows
       // in that case null is returned as value in the serie
       // this is to keep the correct indexes for the values within the serie array

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("".concat(seriesItemId, "-").concat(category1ItemId, "-").concat(category2ItemId));
+        const value = idValueMap.get(`${seriesItemId}-${category1ItemId}-${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 \"".concat(inputFormat, "\""));
+    warning(`Validation not supported for data input format "${inputFormat}"`);
   }
 
   if (!_adapter) {
-    error("Data tranformation from \"".concat(inputFormat, "\" to \"").concat(outputFormat, "\" is not supported"));
+    error(`Data tranformation from "${inputFormat}" to "${outputFormat}" is not supported`);
   }
 
   this.data = data;

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

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

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

@@ -42,9 +42,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": "20.6.4",
+    "version": "21.0.0-alpha.3",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -44,6 +44,7 @@
         "enzyme-adapter-react-16": "^1.15.6",
         "fs-extra": "^10.0.0",
         "jest-enzyme": "^7.0.2",
+        "prop-types": "^15",
         "styled-jsx": "3.3.2",
         "typeface-roboto": "^0.0.75"
     },