@dhis2/analytics 20.6.3 → 21.0.0-alpha.2

package/build/es/components/PivotTable/PivotTableCell.js

@@ -18,12 +18,12 @@ export const PivotTableCell = /*#__PURE__*/React.forwardRef(({
   const engine = usePivotTableEngine();
   style.width = style.minWidth = style.maxWidth = style.width;
   style.height = style.minHeight = style.maxHeight = style.height || engine.fontSize + engine.cellPadding * 2 + 2;
-  const className = classnames(classes, "fontsize-".concat(engine.visualization.fontSize), "displaydensity-".concat(engine.visualization.displayDensity));
+  const className = classnames(classes, `fontsize-${engine.visualization.fontSize}`, `displaydensity-${engine.visualization.displayDensity}`);
   return isHeader ? /*#__PURE__*/React.createElement("th", _extends({
     style: style,
     "data-test": dataTest
   }, props, {
-    className: "jsx-".concat(cellStyle.__hash) + " " + (props && props.className != null && props.className || className || "")
+    className: `jsx-${cellStyle.__hash}` + " " + (props && props.className != null && props.className || className || "")
   }), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: cellStyle.__hash
   }, cellStyle), children) : /*#__PURE__*/React.createElement("td", _extends({
@@ -31,7 +31,7 @@ export const PivotTableCell = /*#__PURE__*/React.forwardRef(({
     style: style,
     "data-test": dataTest
   }, props, {
-    className: "jsx-".concat(cellStyle.__hash) + " " + (props && props.className != null && props.className || className || "")
+    className: `jsx-${cellStyle.__hash}` + " " + (props && props.className != null && props.className || className || "")
   }), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: cellStyle.__hash
   }, cellStyle), children);

package/build/es/components/PivotTable/PivotTableColumnHeaderCell.js

@@ -52,10 +52,10 @@ export const PivotTableColumnHeaderCell = ({
       }, /*#__PURE__*/React.createElement(_JSXStyle, {
         id: cellStyle.__hash
       }, cellStyle), /*#__PURE__*/React.createElement("div", {
-        className: "jsx-".concat(cellStyle.__hash) + " " + "column-header-inner"
+        className: `jsx-${cellStyle.__hash}` + " " + "column-header-inner"
       }, /*#__PURE__*/React.createElement("span", {
         "data-test": "visualization-column-header",
-        className: "jsx-".concat(cellStyle.__hash) + " " + "column-header-label"
+        className: `jsx-${cellStyle.__hash}` + " " + "column-header-label"
       }, header.label), isSortable ? /*#__PURE__*/React.createElement(PivotTableSortIcon, {
         index: index,
         sortBy: sortBy

package/build/es/components/PivotTable/PivotTableContainer.js

@@ -17,11 +17,11 @@ export const PivotTableContainer = /*#__PURE__*/React.forwardRef(({
     },
     ref: ref,
     "data-test": "visualization-container",
-    className: "jsx-".concat(tableStyle.__hash) + " " + "pivot-table-container"
+    className: `jsx-${tableStyle.__hash}` + " " + "pivot-table-container"
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
     id: tableStyle.__hash
   }, tableStyle), width === 0 || height === 0 ? null : /*#__PURE__*/React.createElement("table", {
-    className: "jsx-".concat(tableStyle.__hash) + " " + (classnames({
+    className: `jsx-${tableStyle.__hash}` + " " + (classnames({
       'fixed-headers': engine.options.fixColumnHeaders && engine.options.fixRowHeaders,
       'fixed-column-headers': engine.options.fixColumnHeaders && !engine.options.fixRowHeaders,
       'fixed-row-headers': engine.options.fixRowHeaders && !engine.options.fixColumnHeaders

package/build/es/components/PivotTable/PivotTableSortIcon.js

@@ -14,11 +14,11 @@ export const PivotTableSortIcon = ({
   const engine = usePivotTableEngine();
   const SortIcon = (sortBy === null || sortBy === void 0 ? void 0 : sortBy.column) === index ? sortBy.order === SORT_ORDER_ASCENDING ? SortIconAscending : SortIconDescending : SortIconIdle;
   return /*#__PURE__*/React.createElement("span", {
-    className: "jsx-".concat(sortIconStyle.__hash) + " " + "fontsize-".concat(engine.visualization.fontSize)
+    className: `jsx-${sortIconStyle.__hash}` + " " + `fontsize-${engine.visualization.fontSize}`
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
     id: sortIconStyle.__hash
   }, sortIconStyle), /*#__PURE__*/React.createElement(SortIcon, {
-    className: "jsx-".concat(sortIconStyle.__hash)
+    className: `jsx-${sortIconStyle.__hash}`
   }));
 };
 PivotTableSortIcon.propTypes = {

package/build/es/components/PivotTable/PivotTableTitleRow.js

@@ -17,7 +17,7 @@ export const PivotTableTitleRow = ({
     setPosition(Math.max(0, Math.min(scrollPosition.x, totalWidth - containerWidth)));
   }, [containerWidth, scrollPosition.x, totalWidth]);
   return /*#__PURE__*/React.createElement("tr", {
-    className: "jsx-".concat(cellStyle.__hash)
+    className: `jsx-${cellStyle.__hash}`
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
     id: cellStyle.__hash
   }, cellStyle), /*#__PURE__*/React.createElement(PivotTableCell, {
@@ -31,7 +31,7 @@ export const PivotTableTitleRow = ({
       textAlign: 'center'
     },
     "data-test": "visualization-title",
-    className: "jsx-".concat(cellStyle.__hash)
+    className: `jsx-${cellStyle.__hash}`
   }, title)));
 };
 PivotTableTitleRow.propTypes = {

package/build/es/components/PivotTable/styles/PivotTable.style.js

@@ -1,8 +1,8 @@
 import { colors } from '@dhis2/ui';
 import { BORDER_COLOR, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_NORMAL, DISPLAY_DENSITY_PADDING_COMFORTABLE, FONT_SIZE_SMALL, FONT_SIZE_NORMAL, FONT_SIZE_LARGE } from '../../../modules/pivotTable/pivotTableConstants';
-export const table = ["div.pivot-table-container{font-family:'Roboto',Arial,sans-serif;overflow:auto;color:".concat(colors.grey900, ";}"), "table{border-spacing:0;white-space:nowrap;box-sizing:border-box;text-align:center;border:1px solid ".concat(BORDER_COLOR, ";border-width:1px 1px 0 0;}"), "table.fixed-headers{border-width:0 0 0 1px;}", "table.fixed-headers tr th,table.fixed-headers tr td{border-width:0 1px 1px 0;}", "table.fixed-column-headers{border-width:0 1px 0 0;}", "table.fixed-column-headers tr th,table.fixed-column-headers tr td{border-width:0 0 1px 1px;}", "table.fixed-headers thead tr:first-of-type th,table.fixed-column-headers thead tr:first-of-type th{border-top:1px solid ".concat(BORDER_COLOR, ";}"), "table.fixed-row-headers{border-width:0 0 1px 1px;}", "table.fixed-row-headers tr th,table.fixed-row-headers tr td{border-width:1px 1px 0 0;}"];
+export const table = [`div.pivot-table-container{font-family:'Roboto',Arial,sans-serif;overflow:auto;color:${colors.grey900};}`, `table{border-spacing:0;white-space:nowrap;box-sizing:border-box;text-align:center;border:1px solid ${BORDER_COLOR};border-width:1px 1px 0 0;}`, "table.fixed-headers{border-width:0 0 0 1px;}", "table.fixed-headers tr th,table.fixed-headers tr td{border-width:0 1px 1px 0;}", "table.fixed-column-headers{border-width:0 1px 0 0;}", "table.fixed-column-headers tr th,table.fixed-column-headers tr td{border-width:0 0 1px 1px;}", `table.fixed-headers thead tr:first-of-type th,table.fixed-column-headers thead tr:first-of-type th{border-top:1px solid ${BORDER_COLOR};}`, "table.fixed-row-headers{border-width:0 0 1px 1px;}", "table.fixed-row-headers tr th,table.fixed-row-headers tr td{border-width:1px 1px 0 0;}"];
 table.__hash = "712241344";
-export const cell = ["td.jsx-1789008308,th.jsx-1789008308{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ".concat(BORDER_COLOR, ";border-width:0 0 1px 1px;cursor:default;}"), "th.fixed-header.jsx-1789008308{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", ".fontsize-SMALL.jsx-1789008308{font-size:".concat(FONT_SIZE_SMALL, "px;line-height:").concat(FONT_SIZE_SMALL, "px;}"), ".fontsize-NORMAL.jsx-1789008308{font-size:".concat(FONT_SIZE_NORMAL, "px;line-height:").concat(FONT_SIZE_NORMAL, "px;}"), ".fontsize-LARGE.jsx-1789008308{font-size:".concat(FONT_SIZE_LARGE, "px;line-height:").concat(FONT_SIZE_LARGE, "px;}"), ".displaydensity-COMPACT.jsx-1789008308{padding:".concat(DISPLAY_DENSITY_PADDING_COMPACT, "px;}"), ".displaydensity-NORMAL.jsx-1789008308{padding:".concat(DISPLAY_DENSITY_PADDING_NORMAL, "px;}"), ".displaydensity-COMFORTABLE.jsx-1789008308{padding:".concat(DISPLAY_DENSITY_PADDING_COMFORTABLE, "px;}"), ".column-header.jsx-1789008308{background-color:#dae6f8;}", "div.column-header-inner.jsx-1789008308{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title.jsx-1789008308{font-weight:bold;background-color:#cddaed;}", ".row-header.jsx-1789008308{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-1789008308{text-align:left;}", ".empty-header.jsx-1789008308{background-color:#cddaed;}", ".total-header.jsx-1789008308{background-color:#bac6d8;}", ".value.jsx-1789008308{background-color:#ffffff;}", ".TEXT.jsx-1789008308{text-align:left;}", ".NUMBER.jsx-1789008308{text-align:right;}", ".clickable.jsx-1789008308{cursor:pointer;}", ".value.jsx-1789008308:hover{background-color:#f3f3f3;}", ".subtotal.jsx-1789008308{background-color:#f4f4f4;}", ".total.jsx-1789008308{background-color:#d8d8d8;}", ".column-header-label.jsx-1789008308{overflow:hidden;text-overflow:ellipsis;}"];
+export const cell = [`td.jsx-1789008308,th.jsx-1789008308{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ${BORDER_COLOR};border-width:0 0 1px 1px;cursor:default;}`, "th.fixed-header.jsx-1789008308{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", `.fontsize-SMALL.jsx-1789008308{font-size:${FONT_SIZE_SMALL}px;line-height:${FONT_SIZE_SMALL}px;}`, `.fontsize-NORMAL.jsx-1789008308{font-size:${FONT_SIZE_NORMAL}px;line-height:${FONT_SIZE_NORMAL}px;}`, `.fontsize-LARGE.jsx-1789008308{font-size:${FONT_SIZE_LARGE}px;line-height:${FONT_SIZE_LARGE}px;}`, `.displaydensity-COMPACT.jsx-1789008308{padding:${DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.displaydensity-NORMAL.jsx-1789008308{padding:${DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.displaydensity-COMFORTABLE.jsx-1789008308{padding:${DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".column-header.jsx-1789008308{background-color:#dae6f8;}", "div.column-header-inner.jsx-1789008308{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title.jsx-1789008308{font-weight:bold;background-color:#cddaed;}", ".row-header.jsx-1789008308{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-1789008308{text-align:left;}", ".empty-header.jsx-1789008308{background-color:#cddaed;}", ".total-header.jsx-1789008308{background-color:#bac6d8;}", ".value.jsx-1789008308{background-color:#ffffff;}", ".TEXT.jsx-1789008308{text-align:left;}", ".NUMBER.jsx-1789008308{text-align:right;}", ".clickable.jsx-1789008308{cursor:pointer;}", ".value.jsx-1789008308:hover{background-color:#f3f3f3;}", ".subtotal.jsx-1789008308{background-color:#f4f4f4;}", ".total.jsx-1789008308{background-color:#d8d8d8;}", ".column-header-label.jsx-1789008308{overflow:hidden;text-overflow:ellipsis;}"];
 cell.__hash = "1789008308";
-export const sortIcon = [".fontsize-SMALL.jsx-2877616992{height:".concat(FONT_SIZE_SMALL, "px;margin-bottom:1px;margin-left:5px;}"), ".fontsize-NORMAL.jsx-2877616992{height:".concat(FONT_SIZE_NORMAL, "px;max-height:11px;margin-bottom:2px;margin-left:6px;}"), ".fontsize-LARGE.jsx-2877616992{height:".concat(FONT_SIZE_LARGE, "px;margin-bottom:2px;margin-left:7px;}")];
+export const sortIcon = [`.fontsize-SMALL.jsx-2877616992{height:${FONT_SIZE_SMALL}px;margin-bottom:1px;margin-left:5px;}`, `.fontsize-NORMAL.jsx-2877616992{height:${FONT_SIZE_NORMAL}px;max-height:11px;margin-bottom:2px;margin-left:6px;}`, `.fontsize-LARGE.jsx-2877616992{height:${FONT_SIZE_LARGE}px;margin-bottom:2px;margin-left:7px;}`];
 sortIcon.__hash = "2877616992";

package/build/es/components/TransferOption.js

@@ -1,7 +1,7 @@
 import _JSXStyle from "styled-jsx/style";
-import propTypes from '@dhis2/prop-types';
 import { Tooltip } from '@dhis2/ui';
 import cx from 'classnames';
+import propTypes from 'prop-types';
 import React from 'react';
 import styles from './styles/TransferOption.style';
 export const TransferOption = ({
@@ -32,17 +32,17 @@ export const TransferOption = ({
         value
       }, event);
     },
-    "data-test": "".concat(dataTest, "-content"),
-    className: "jsx-".concat(styles.__hash) + " " + (cx('chip', {
+    "data-test": `${dataTest}-content`,
+    className: `jsx-${styles.__hash}` + " " + (cx('chip', {
       highlighted,
       disabled,
       selected,
       inactive: active !== undefined && !active
     }) || "")
   }, /*#__PURE__*/React.createElement("span", {
-    className: "jsx-".concat(styles.__hash) + " " + "icon"
+    className: `jsx-${styles.__hash}` + " " + "icon"
   }, icon), /*#__PURE__*/React.createElement("span", {
-    className: "jsx-".concat(styles.__hash) + " " + "label"
+    className: `jsx-${styles.__hash}` + " " + "label"
   }, label), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
@@ -52,7 +52,7 @@ export const TransferOption = ({
     "data-test": dataTest,
     className: "wrapper"
   }, tooltipText ? /*#__PURE__*/React.createElement(Tooltip, {
-    key: "".concat(value),
+    key: `${value}`,
     content: tooltipText,
     placement: 'top',
     openDelay: 750,

package/build/es/components/styles/DimensionSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers, colors } from '@dhis2/ui';
-const _defaultExport = [".filterContainer.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(spacers.dp12, ";margin-top:").concat(spacers.dp8, ";}"), ".emptyList.jsx-2057111968{text-align:center;font-size:14px;line-height:16px;margin:".concat(spacers.dp24, " 0 0;color:").concat(colors.grey700, ";}"), ".rightHeader.jsx-2057111968{font-size:14px;font-weight:400;}", ".leftHeader.jsx-2057111968{padding:".concat(spacers.dp12, " ").concat(spacers.dp4, ";}"), ".info-container.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:".concat(spacers.dp8, ";padding:").concat(spacers.dp8, ";background-color:").concat(colors.grey200, ";border-radius:3px;}"), ".info-text.jsx-2057111968{padding-left:".concat(spacers.dp8, ";color:").concat(colors.grey900, ";font-size:12px;line-height:16px;}")];
+const _defaultExport = [`.filterContainer.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp12};margin-top:${spacers.dp8};}`, `.emptyList.jsx-2057111968{text-align:center;font-size:14px;line-height:16px;margin:${spacers.dp24} 0 0;color:${colors.grey700};}`, ".rightHeader.jsx-2057111968{font-size:14px;font-weight:400;}", `.leftHeader.jsx-2057111968{padding:${spacers.dp12} ${spacers.dp4};}`, `.info-container.jsx-2057111968{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp8};padding:${spacers.dp8};background-color:${colors.grey200};border-radius:3px;}`, `.info-text.jsx-2057111968{padding-left:${spacers.dp8};color:${colors.grey900};font-size:12px;line-height:16px;}`];
 _defaultExport.__hash = "2057111968";
 export default _defaultExport;

package/build/es/components/styles/TransferOption.style.js

@@ -1,4 +1,4 @@
 import { colors, spacers, theme } from '@dhis2/ui';
-const _defaultExport = [".wrapper.jsx-3199850788:last-child{margin-bottom:".concat(spacers.dp4, ";}"), ".chip.jsx-3199850788{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:".concat(colors.grey200, ";font-size:14px;line-height:16px;padding:2px ").concat(spacers.dp8, " 2px ").concat(spacers.dp4, ";margin:").concat(spacers.dp4, " ").concat(spacers.dp8, " 0 ").concat(spacers.dp8, ";border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}"), ".chip.jsx-3199850788:hover{background:".concat(colors.grey300, ";}"), ".selected.jsx-3199850788{background:".concat(theme.secondary100, ";color:").concat(theme.secondary900, ";}"), ".selected.jsx-3199850788 .icon path{fill:".concat(theme.secondary700, ";}"), ".selected.jsx-3199850788:hover{background:#c9edeb;}", ".highlighted.jsx-3199850788,.highlighted.jsx-3199850788:hover{background:".concat(theme.secondary800, ";color:").concat(colors.white, ";}"), ".highlighted.jsx-3199850788 .icon path{fill:".concat(colors.white, ";}"), ".disabled.jsx-3199850788{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-3199850788{opacity:0.3;}", ".icon.jsx-3199850788,.label.jsx-3199850788{line-height:18px;}", ".icon.jsx-3199850788{margin-right:".concat(spacers.dp4, ";display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;padding-top:1px;}"), ".label.jsx-3199850788{font-size:14px;}"];
+const _defaultExport = [`.wrapper.jsx-3199850788:last-child{margin-bottom:${spacers.dp4};}`, `.chip.jsx-3199850788{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;background:${colors.grey200};font-size:14px;line-height:16px;padding:2px ${spacers.dp8} 2px ${spacers.dp4};margin:${spacers.dp4} ${spacers.dp8} 0 ${spacers.dp8};border-radius:3px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `.chip.jsx-3199850788:hover{background:${colors.grey300};}`, `.selected.jsx-3199850788{background:${theme.secondary100};color:${theme.secondary900};}`, `.selected.jsx-3199850788 .icon path{fill:${theme.secondary700};}`, ".selected.jsx-3199850788:hover{background:#c9edeb;}", `.highlighted.jsx-3199850788,.highlighted.jsx-3199850788:hover{background:${theme.secondary800};color:${colors.white};}`, `.highlighted.jsx-3199850788 .icon path{fill:${colors.white};}`, ".disabled.jsx-3199850788{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-3199850788{opacity:0.3;}", ".icon.jsx-3199850788,.label.jsx-3199850788{line-height:18px;}", `.icon.jsx-3199850788{margin-right:${spacers.dp4};display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;padding-top:1px;}`, ".label.jsx-3199850788{font-size:14px;}"];
 _defaultExport.__hash = "3199850788";
 export default _defaultExport;

package/build/es/index.js

@@ -16,7 +16,7 @@ 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
 

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

@@ -101,6 +101,11 @@
     "Options": "Options",
     "Hide": "Hide",
     "Update": "Update",
+    "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",
     "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/locales/zh/translations.json

@@ -91,13 +91,13 @@
     "No maps found. Click New map to get started.": "未找到地图。单击新地图开始。",
     "No maps found. Try adjusting your search or filter options to find what you're looking for.": "未找到地图。尝试调整您的搜索或过滤选项以找到您要查找的内容。",
     "New map": "新地图",
-    "Open an event report": "",
-    "Loading event reports": "",
-    "Couldn't load event reports": "",
-    "There was a problem loading event reports. Try again or contact your system administrator.": "",
-    "No event reports found. Click New event report to get started.": "",
-    "No event reports found. Try adjusting your search or filter options to find what you're looking for.": "",
-    "New event report": "",
+    "Open an event report": "打开事件报告",
+    "Loading event reports": "加载事件报告",
+    "Couldn't load event reports": "无法加载事件报告",
+    "There was a problem loading event reports. Try again or contact your system administrator.": "加载事件报告时出现问题。重试或联系您的系统管理员。",
+    "No event reports found. Click New event report to get started.": "未找到事件报告。单击新建事件报告开始。",
+    "No event reports found. Try adjusting your search or filter options to find what you're looking for.": "未找到事件报告。尝试调整您的搜索或过滤选项以找到您要查找的内容。",
+    "New event report": "新建事件报告",
     "Options": "选项",
     "Hide": "隐藏",
     "Update": "更新",

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]);