@dhis2/analytics 20.6.3 → 21.0.0-alpha.2

package/build/es/api/dimensions.js

@@ -1,6 +1,6 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
-import { ALL_ID // CHART_AGGREGATE_AGGREGATABLE_TYPES,
-, INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes';
+import { ALL_ID, // CHART_AGGREGATE_AGGREGATABLE_TYPES,
+INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes';
 import { onError } from './index'; // Query definitions
 
 export const dimensionsQuery = {
@@ -8,8 +8,8 @@ export const dimensionsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name),dimensionType,dataDimensionType"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name),dimensionType,dataDimensionType`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
@@ -22,11 +22,11 @@ const recommendedDimensionsQuery = {
     const dimensions = [];
 
     if (dxIds.length) {
-      dimensions.push("dx:".concat(dxIds.join(';')));
+      dimensions.push(`dx:${dxIds.join(';')}`);
     }
 
     if (ouIds.length) {
-      dimensions.push("ou:".concat(ouIds.join(';')));
+      dimensions.push(`ou:${ouIds.join(';')}`);
     }
 
     return {
@@ -46,22 +46,22 @@ export const dataItemsQuery = {
     const filters = []; // TODO: Extract all of this logic out of the query?
 
     if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === EVENT_DATA_ITEMS) {
-      filters.push("dimensionItemType:in:[".concat(PROGRAM_DATA_ELEMENT, ",").concat(PROGRAM_ATTRIBUTE, "]"));
+      filters.push(`dimensionItemType:in:[${PROGRAM_DATA_ELEMENT},${PROGRAM_ATTRIBUTE}]`);
     } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== ALL_ID) {
-      filters.push("dimensionItemType:eq:".concat(filter.dataType));
+      filters.push(`dimensionItemType:eq:${filter.dataType}`);
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID && [EVENT_DATA_ITEMS, PROGRAM_INDICATORS].includes(filter.dataType)) {
-      filters.push("programId:eq:".concat(filter.group));
+      filters.push(`programId:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return objectClean({
-      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -79,16 +79,16 @@ export const indicatorsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("indicatorGroups.id:eq:".concat(filter.group));
+      filters.push(`indicatorGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "id,".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -100,8 +100,8 @@ export const indicatorGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
@@ -117,16 +117,16 @@ export const dataElementsQuery = {
     const filters = ['domainType:eq:AGGREGATE'];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("dataElementGroups.id:eq:".concat(filter.group));
+      filters.push(`dataElementGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -138,16 +138,16 @@ export const dataElementGroupsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 };
 export const itemsByDimensionQuery = {
-  resource: "dimensions",
+  resource: `dimensions`,
   id: ({
     id
-  }) => "".concat(id, "/items"),
+  }) => `${id}/items`,
   params: ({
     searchTerm,
     page,
@@ -156,12 +156,12 @@ export const itemsByDimensionQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "id,".concat(nameProp, "~rename(name)"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `id,${nameProp}~rename(name)`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -180,16 +180,16 @@ export const dataElementOperandsQuery = {
     const filters = [];
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
+      filters.push(`dataElement.dataElementGroups.id:eq:${filter.group}`);
     }
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     return {
-      fields: "".concat(idField, ",").concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `${idField},${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: true,
       page
@@ -207,16 +207,16 @@ export const dataSetsQuery = {
     const filters = [];
 
     if (searchTerm) {
-      filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
+      filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
 
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
-      filters.push("id:eq:".concat(filter.group));
+      filters.push(`id:eq:${filter.group}`);
     }
 
     const query = {
-      fields: "dimensionItem~rename(id),".concat(nameProp, "~rename(name),dimensionItemType"),
-      order: "".concat(nameProp, ":asc"),
+      fields: `dimensionItem~rename(id),${nameProp}~rename(name),dimensionItemType`,
+      order: `${nameProp}:asc`,
       filter: filters,
       paging: false
     };
@@ -234,8 +234,8 @@ export const programsQuery = {
   params: ({
     nameProp
   }) => ({
-    fields: "id,".concat(nameProp, "~rename(name)"),
-    order: "".concat(nameProp, ":asc"),
+    fields: `id,${nameProp}~rename(name)`,
+    order: `${nameProp}:asc`,
     paging: false
   })
 }; // Fetch functions

package/build/es/api/organisationUnits.js

@@ -1,49 +1,99 @@
 import { onError } from './index';
-export const apiFetchOrganisationUnitRoot = d2 => {
-  const endPoint = '/organisationUnits';
-  const fields = ['id', 'displayName', 'name'];
-  const url = "".concat(endPoint, "?paging=false&userDataViewFallback=true&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnits
-  }) => organisationUnits[0]).catch(onError);
-};
-/**
- * Fetch organisation units
- * @returns {Promise<T | never>}
- */
-
-export const apiFetchOrganisationUnits = (d2, displayNameProperty) => {
-  const fields = ['id', 'path', "".concat(displayNameProperty, "~rename(displayName)"), 'children::isNotEmpty'];
-  return d2.models.organisationUnits.list({
-    paging: false,
+const orgUnitLevelsQuery = {
+  resource: 'organisationUnitLevels',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: `id,level,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
+};
+const orgUnitGroupsQuery = {
+  resource: 'organisationUnitGroups',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: `id,${displayNameProp}~rename(displayName),name`,
+    paging: false
+  })
+};
+const orgUnitRootsQuery = {
+  resource: 'organisationUnits',
+  params: {
+    fields: 'id,displayName,name',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+const orgUnitsQuery = {
+  resource: 'organisationUnits',
+  params: ({
+    displayNameProp
+  }) => ({
+    fields: `id,path,${displayNameProp}~rename(displayName),children::isNotEmpty`,
     level: 1,
-    fields: fields.join(','),
-    userDataViewFallback: true
+    userDataViewFallback: true,
+    paging: false
+  })
+};
+const orgUnitQuery = {
+  resource: 'organisationUnits',
+  id: ({
+    id
+  }) => id,
+  params: {
+    fields: 'id,level,displayName~rename(name),path,parent[id,displayName~rename(name)],children[level]',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+export const apiFetchOrganisationUnitLevels = async dataEngine => {
+  const orgUnitLevelsData = await dataEngine.query({
+    orgUnitLevels: orgUnitLevelsQuery
+  }, {
+    onError
   });
+  return orgUnitLevelsData.orgUnitLevels.organisationUnitLevels;
 };
-/**
- * Fetch organisation unit groups
- * @returns {*}
- */
-
-export const apiFetchOrganisationUnitGroups = (d2, displayNameProperty) => {
-  const endPoint = '/organisationUnitGroups';
-  const fields = ['id', "".concat(displayNameProperty, "~rename(displayName)"), 'name'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitGroups
-  }) => organisationUnitGroups).catch(onError);
-};
-/**
- * Fetch organisation unit levels
- * @returns {*}
- */
+export const apiFetchOrganisationUnitGroups = async (dataEngine, displayNameProp) => {
+  const orgUnitGroupsData = await dataEngine.query({
+    orgUnitGroups: orgUnitGroupsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitGroupsData.orgUnitGroups.organisationUnitGroups;
+};
+export const apiFetchOrganisationUnitRoots = async dataEngine => {
+  const orgUnitRootsData = await dataEngine.query({
+    orgUnitRoots: orgUnitRootsQuery
+  }, {
+    onError
+  });
+  return orgUnitRootsData.orgUnitRoots.organisationUnits;
+}; // TODO: Unused, previously used to load all org units for the tree, but that is done by the ui component internally now, remove?
 
-export const apiFetchOrganisationUnitLevels = d2 => {
-  const endPoint = '/organisationUnitLevels';
-  const fields = ['id', 'displayName', 'name', 'level'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitLevels
-  }) => organisationUnitLevels).catch(onError);
+export const apiFetchOrganisationUnits = async (dataEngine, displayNameProp) => {
+  const orgUnitsData = await dataEngine.query({
+    orgUnits: orgUnitsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitsData.orgUnits.organisationUnits;
+};
+export const apiFetchOrganisationUnit = async (dataEngine, id) => {
+  const orgUnitData = await dataEngine.query({
+    orgUnit: orgUnitQuery
+  }, {
+    variables: {
+      id
+    },
+    onError
+  });
+  return orgUnitData.orgUnit;
 };

package/build/es/components/DataDimension/DataTypesSelector.js

@@ -14,7 +14,7 @@ const DataTypes = ({
   var _dataTypes$currentDat;
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "container"
+    className: `jsx-${styles.__hash}` + " " + "container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: i18n.t('Data Type'),
     dataTest: dataTest,
@@ -25,12 +25,12 @@ const DataTypes = ({
     value: ALL_ID,
     key: ALL_ID,
     label: i18n.t('All types'),
-    dataTest: "".concat(dataTest, "-option-all")
+    dataTest: `${dataTest}-option-all`
   }), Object.values(dataTypes).map(type => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: type.id,
     key: type.id,
     label: type.getName(),
-    dataTest: "".concat(dataTest, "-option-").concat(type.id)
+    dataTest: `${dataTest}-option-${type.id}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

package/build/es/components/DataDimension/DetailSelector.js

@@ -18,7 +18,7 @@ export const DetailSelector = ({
 }) => {
   const options = getOptions();
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "detail-container"
+    className: `jsx-${styles.__hash}` + " " + "detail-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     dataTest: dataTest,
     label: i18n.t('Disaggregation'),
@@ -29,7 +29,7 @@ export const DetailSelector = ({
     value: option[0],
     key: option[0],
     label: option[1],
-    dataTest: "".concat(dataTest, "-option-").concat(option[0])
+    dataTest: `${dataTest}-option-${option[0]}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

package/build/es/components/DataDimension/GroupSelector.js

@@ -38,14 +38,14 @@ const GroupsSelector = ({
     fetchGroups();
   }, [dataType]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "container"
+    className: `jsx-${styles.__hash}` + " " + "container"
   }, /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "group-container"
+    className: `jsx-${styles.__hash}` + " " + "group-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: (_dataTypes$dataType3 = dataTypes[dataType]) === null || _dataTypes$dataType3 === void 0 ? void 0 : _dataTypes$dataType3.getGroupLabel(),
-    dataTest: "".concat(dataTest, "-groups-select-field"),
+    dataTest: `${dataTest}-groups-select-field`,
     selected: currentGroup || defaultGroup.id,
     placeholder: !currentGroup && (_dataTypes$dataType4 = dataTypes[dataType]) !== null && _dataTypes$dataType4 !== void 0 && _dataTypes$dataType4.getPlaceholder ? dataTypes[dataType].getPlaceholder() : null,
     onChange: ref => onGroupChange(ref.selected),
@@ -57,20 +57,20 @@ const GroupsSelector = ({
     value: defaultGroup.id,
     key: defaultGroup.id,
     label: defaultGroup.getName(),
-    dataTest: "".concat(dataTest, "-groups-select-field-option-").concat(defaultGroup.id)
+    dataTest: `${dataTest}-groups-select-field-option-${defaultGroup.id}`
   }) : null, !isLoading ? groups.map(item => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: item.id,
     key: item.id,
     label: item.name,
-    dataTest: "".concat(dataTest, "-groups-select-field-option-").concat(item.id)
+    dataTest: `${dataTest}-groups-select-field-option-${item.id}`
   })) : null)), subGroupType === SUB_GROUP_DETAIL && /*#__PURE__*/React.createElement(DetailSelector, {
     currentValue: currentSubGroup,
     onChange: onSubGroupChange,
-    dataTest: "".concat(dataTest, "-sub-group-select-field")
+    dataTest: `${dataTest}-sub-group-select-field`
   }), subGroupType === SUB_GROUP_METRIC && /*#__PURE__*/React.createElement(MetricSelector, {
     currentValue: currentSubGroup,
     onChange: onSubGroupChange,
-    dataTest: "".concat(dataTest, "-sub-group-select-field")
+    dataTest: `${dataTest}-sub-group-select-field`
   }));
 };
 

package/build/es/components/DataDimension/ItemSelector.js

@@ -31,21 +31,21 @@ const LeftHeader = ({
   displayNameProp,
   dataTest
 }) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-  className: "jsx-".concat(styles.__hash) + " " + "leftHeader"
+  className: `jsx-${styles.__hash}` + " " + "leftHeader"
 }, /*#__PURE__*/React.createElement(InputField, {
   value: searchTerm,
   onChange: ({
     value
   }) => setSearchTerm(value),
   placeholder: i18n.t('Search by data item name'),
-  dataTest: "".concat(dataTest, "-filter-input-field"),
+  dataTest: `${dataTest}-filter-input-field`,
   dense: true,
   initialFocus: true,
   type: 'search'
 }), /*#__PURE__*/React.createElement(DataTypeSelector, {
   currentDataType: dataType,
   onChange: setDataType,
-  dataTest: "".concat(dataTest, "-data-types-select-field")
+  dataTest: `${dataTest}-data-types-select-field`
 }), dataTypes[dataType] && /*#__PURE__*/React.createElement(GroupSelector, {
   dataType: dataType,
   displayNameProp: displayNameProp,
@@ -72,7 +72,7 @@ LeftHeader.propTypes = {
 };
 
 const EmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-  className: "jsx-".concat(styles.__hash) + " " + "emptyList"
+  className: `jsx-${styles.__hash}` + " " + "emptyList"
 }, i18n.t('No items selected')), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: styles.__hash
 }, styles));
@@ -80,13 +80,13 @@ const EmptySelection = () => /*#__PURE__*/React.createElement(React.Fragment, nu
 const RightHeader = ({
   infoText
 }) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-  className: "jsx-".concat(styles.__hash) + " " + "rightHeader"
+  className: `jsx-${styles.__hash}` + " " + "rightHeader"
 }, i18n.t('Selected Items')), infoText && /*#__PURE__*/React.createElement("div", {
-  className: "jsx-".concat(styles.__hash) + " " + "info-container"
+  className: `jsx-${styles.__hash}` + " " + "info-container"
 }, /*#__PURE__*/React.createElement("div", {
-  className: "jsx-".concat(styles.__hash)
+  className: `jsx-${styles.__hash}`
 }, /*#__PURE__*/React.createElement(IconInfo16, null)), /*#__PURE__*/React.createElement("span", {
-  className: "jsx-".concat(styles.__hash) + " " + "info-text"
+  className: `jsx-${styles.__hash}` + " " + "info-text"
 }, infoText)), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: styles.__hash
 }, styles));
@@ -177,7 +177,7 @@ const SourceEmptyPlaceholder = ({
 
   return message && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
     "data-test": dataTest,
-    className: "jsx-".concat(styles.__hash) + " " + "emptyList"
+    className: `jsx-${styles.__hash}` + " " + "emptyList"
   }, message), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
@@ -241,16 +241,16 @@ const ItemSelector = ({
         if (state.filter.subGroup && state.filter.subGroup !== ALL_ID) {
           const metric = DATA_SETS_CONSTANTS.find(item => item.id === state.filter.subGroup);
           newOptions.push({
-            label: "".concat(item.name, " - ").concat(metric.getName()),
-            value: "".concat(item.id, ".").concat(metric.id),
+            label: `${item.name} - ${metric.getName()}`,
+            value: `${item.id}.${metric.id}`,
             disabled: item.disabled,
             type: item.dimensionItemType
           });
         } else {
           DATA_SETS_CONSTANTS.forEach(metric => {
             newOptions.push({
-              label: "".concat(item.name, " - ").concat(metric.getName()),
-              value: "".concat(item.id, ".").concat(metric.id),
+              label: `${item.name} - ${metric.getName()}`,
+              value: `${item.id}.${metric.id}`,
               disabled: item.disabled,
               type: item.dimensionItemType
             });
@@ -379,7 +379,7 @@ const ItemSelector = ({
       options: state.options,
       noItemsMessage: noItemsMessage,
       dataType: state.filter.dataType,
-      dataTest: "".concat(dataTest, "-empty-source")
+      dataTest: `${dataTest}-empty-source`
     }),
     onEndReached: onEndReached,
     leftHeader: /*#__PURE__*/React.createElement(LeftHeader, {
@@ -406,7 +406,7 @@ const ItemSelector = ({
       searchTerm: state.searchTerm,
       setSearchTerm: setSearchTerm,
       displayNameProp: displayNameProp,
-      dataTest: "".concat(dataTest, "-left-header")
+      dataTest: `${dataTest}-left-header`
     }),
     enableOrderChange: true,
     height: TRANSFER_HEIGHT,
@@ -427,9 +427,9 @@ const ItemSelector = ({
       tooltipText: state.filter.dataType === ALL_ID ? getTooltipText(getItemType(props.value
       /* eslint-disable-line react/prop-types */
       )) : undefined,
-      dataTest: "".concat(dataTest, "-transfer-option")
+      dataTest: `${dataTest}-transfer-option`
     })),
-    dataTest: "".concat(dataTest, "-transfer")
+    dataTest: `${dataTest}-transfer`
   });
 };
 

package/build/es/components/DataDimension/MetricSelector.js

@@ -12,7 +12,7 @@ export const MetricSelector = ({
   dataTest
 }) => {
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "metric-container"
+    className: `jsx-${styles.__hash}` + " " + "metric-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: i18n.t('Metric type'),
     selected: currentValue || ALL_ID,
@@ -23,12 +23,12 @@ export const MetricSelector = ({
     value: ALL_ID,
     key: ALL_ID,
     label: i18n.t('All metrics'),
-    dataTest: "".concat(dataTest, "-option-").concat(ALL_ID)
+    dataTest: `${dataTest}-option-${ALL_ID}`
   }), DATA_SETS_CONSTANTS.map(option => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: option.id,
     key: option.id,
     label: option.getName(),
-    dataTest: "".concat(dataTest, "-option-").concat(option.id)
+    dataTest: `${dataTest}-option-${option.id}`
   }))), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

package/build/es/components/DataDimension/styles/DataTypesSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers } from '@dhis2/ui';
-const _defaultExport = [".container.jsx-3368926978{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;border-bottom:0;padding:".concat(spacers.dp12, " 0 0;}")];
+const _defaultExport = [`.container.jsx-3368926978{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;border-bottom:0;padding:${spacers.dp12} 0 0;}`];
 _defaultExport.__hash = "3368926978";
 export default _defaultExport;

package/build/es/components/DataDimension/styles/DetailSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers } from '@dhis2/ui';
-const _defaultExport = [".detail-container.jsx-2733301753{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;padding-left:".concat(spacers.dp4, ";width:40%;}")];
+const _defaultExport = [`.detail-container.jsx-2733301753{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;padding-left:${spacers.dp4};width:40%;}`];
 _defaultExport.__hash = "2733301753";
 export default _defaultExport;

package/build/es/components/DataDimension/styles/GroupSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers } from '@dhis2/ui';
-const _defaultExport = [".container.jsx-2205421678{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;min-height:53px;padding-left:".concat(spacers.dp16, ";margin-top:").concat(spacers.dp12, ";}"), ".group-container.jsx-2205421678{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}"];
+const _defaultExport = [`.container.jsx-2205421678{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;min-height:53px;padding-left:${spacers.dp16};margin-top:${spacers.dp12};}`, ".group-container.jsx-2205421678{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}"];
 _defaultExport.__hash = "2205421678";
 export default _defaultExport;

package/build/es/components/DataDimension/styles/MetricSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers } from '@dhis2/ui';
-const _defaultExport = [".metric-container.jsx-3752467532{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;padding-left:".concat(spacers.dp4, ";width:50%;}")];
+const _defaultExport = [`.metric-container.jsx-3752467532{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column;padding-left:${spacers.dp4};width:50%;}`];
 _defaultExport.__hash = "3752467532";
 export default _defaultExport;