@dhis2/analytics 20.6.2 → 21.0.0-alpha.1

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;

package/build/es/components/DimensionMenu.js

@@ -49,7 +49,7 @@ const DimensionMenu = ({
     key: "remove-menu-item",
     onClick: onClick,
     label: i18n.t('Remove'),
-    dataTest: "".concat(dataTest, "-item-remove-").concat(dimensionId)
+    dataTest: `${dataTest}-item-remove-${dimensionId}`
   }); // Assigned categories
 
 
@@ -58,8 +58,8 @@ const DimensionMenu = ({
       if (!isAssignedCategoriesInLayout) {
         menuItems.push( /*#__PURE__*/React.createElement(MenuItem, {
           label: assignedCategoriesItemLabel,
-          key: "assigned-categories-item-".concat(dimensionId),
-          dataTest: "".concat(dataTest, "-item-co-menu")
+          key: `assigned-categories-item-${dimensionId}`,
+          dataTest: `${dataTest}-item-co-menu`
         }, assignedCategoriesAvailableDestinations.map(destination => /*#__PURE__*/React.createElement(MenuItem, {
           key: destination,
           onClick: () => {
@@ -67,22 +67,22 @@ const DimensionMenu = ({
             onClose();
           },
           label: getAxisItemLabel(getAxisNameByLayoutType(destination, getLayoutTypeByVisType(visType))),
-          dataTest: "".concat(dataTest, "-item-action-co-to-").concat(destination)
+          dataTest: `${dataTest}-item-action-co-to-${destination}`
         }))));
       } else {
         menuItems.push( /*#__PURE__*/React.createElement(MenuItem, {
-          key: "assigned-categories-item-".concat(dimensionId),
+          key: `assigned-categories-item-${dimensionId}`,
           onClick: () => {
             assignedCategoriesItemHandler();
             onClose();
           },
           label: assignedCategoriesItemLabel,
-          dataTest: "".concat(dataTest, "-item-remove-co")
+          dataTest: `${dataTest}-item-remove-co`
         }));
       }
     } else {
       menuItems.push( /*#__PURE__*/React.createElement(Tooltip, {
-        key: "assigned-categories-item-".concat(dimensionId),
+        key: `assigned-categories-item-${dimensionId}`,
         content: getUnavailableLabel(visType),
         "aria-label": "disabled",
         classes: classes
@@ -90,7 +90,7 @@ const DimensionMenu = ({
         disabled: true,
         dense: true,
         label: assignedCategoriesItemLabel,
-        dataTest: "".concat(dataTest, "-item-co-menu")
+        dataTest: `${dataTest}-item-co-menu`
       })));
     }
   } // divider
@@ -98,7 +98,7 @@ const DimensionMenu = ({
 
   menuItems.length && menuItems.push(getDividerItem('assigned-categories-divider'));
   menuItems.push(...applicableAxisIds.map(axisId => /*#__PURE__*/React.createElement(MenuItem, {
-    key: "".concat(dimensionId, "-to-").concat(axisId),
+    key: `${dimensionId}-to-${axisId}`,
     onClick: () => {
       axisItemHandler({
         dimensionId,
@@ -110,7 +110,7 @@ const DimensionMenu = ({
       onClose();
     },
     label: getAxisItemLabel(getAxisNameByLayoutType(axisId, getLayoutTypeByVisType(visType)), isDimensionInLayout),
-    dataTest: "".concat(dataTest, "-item-action-").concat(dimensionId, "-to-").concat(axisId)
+    dataTest: `${dataTest}-item-action-${dimensionId}-to-${axisId}`
   }))); // remove item
 
   if (isDimensionInLayout) {

package/build/es/components/DimensionsPanel/List/DimensionItem.js

@@ -88,20 +88,20 @@ class DimensionItem extends Component {
       id: id,
       isDeactivated: isDeactivated,
       onClick: onClick,
-      dataTest: "".concat(dataTest, "-button-").concat(id)
+      dataTest: `${dataTest}-button-${id}`
     }, /*#__PURE__*/React.createElement("div", {
       style: styles.iconWrapper
     }, Icon), /*#__PURE__*/React.createElement("div", {
       style: styles.labelWrapper
     }, Label, /*#__PURE__*/React.createElement(RecommendedIcon, {
       isRecommended: isRecommended,
-      dataTest: "".concat(dataTest, "-recommended-icon")
+      dataTest: `${dataTest}-recommended-icon`
     })), isLocked && /*#__PURE__*/React.createElement("div", {
       style: styles.iconWrapper
     }, /*#__PURE__*/React.createElement(IconLock16, null))), onOptionsClick ? /*#__PURE__*/React.createElement("div", {
       style: styles.optionsWrapper,
       ref: optionsRef,
-      "data-test": "".concat(dataTest, "-menu-").concat(id)
+      "data-test": `${dataTest}-menu-${id}`
     }, this.state.mouseOver && !isDeactivated && !isLocked ? /*#__PURE__*/React.createElement(OptionsButton, {
       style: styles.optionsButton,
       onClick: this.onOptionsClick(id, optionsRef)

package/build/es/components/DimensionsPanel/List/DimensionList.js

@@ -41,21 +41,21 @@ class DimensionList extends Component {
     const fixedDimensions = this.getDimensionItemsByFilter(dimension => Object.values(getFixedDimensions()).some(fixedDim => fixedDim.id === dimension.id));
     const nonPredefinedDimensions = this.getDimensionItemsByFilter(dimension => !Object.values(getPredefinedDimensions()).some(predefDim => predefDim.id === dimension.id));
     return /*#__PURE__*/React.createElement("div", {
-      className: "jsx-".concat(styles.__hash) + " " + "container"
+      className: `jsx-${styles.__hash}` + " " + "container"
     }, /*#__PURE__*/React.createElement("div", {
-      className: "jsx-".concat(styles.__hash) + " " + "wrapper"
+      className: `jsx-${styles.__hash}` + " " + "wrapper"
     }, fixedDimensions !== null && fixedDimensions !== void 0 && fixedDimensions.length ? /*#__PURE__*/React.createElement("div", {
-      className: "jsx-".concat(styles.__hash) + " " + "section"
+      className: `jsx-${styles.__hash}` + " " + "section"
     }, /*#__PURE__*/React.createElement("h3", {
-      className: "jsx-".concat(styles.__hash) + " " + "header"
+      className: `jsx-${styles.__hash}` + " " + "header"
     }, i18n.t('Main dimensions')), /*#__PURE__*/React.createElement("ul", {
-      className: "jsx-".concat(styles.__hash) + " " + "list"
+      className: `jsx-${styles.__hash}` + " " + "list"
     }, fixedDimensions)) : null, nonPredefinedDimensions !== null && nonPredefinedDimensions !== void 0 && nonPredefinedDimensions.length ? /*#__PURE__*/React.createElement("div", {
-      className: "jsx-".concat(styles.__hash) + " " + "section"
+      className: `jsx-${styles.__hash}` + " " + "section"
     }, /*#__PURE__*/React.createElement("h3", {
-      className: "jsx-".concat(styles.__hash) + " " + "header"
+      className: `jsx-${styles.__hash}` + " " + "header"
     }, i18n.t('Your dimensions')), /*#__PURE__*/React.createElement("ul", {
-      className: "jsx-".concat(styles.__hash) + " " + "list"
+      className: `jsx-${styles.__hash}` + " " + "list"
     }, nonPredefinedDimensions)) : null), /*#__PURE__*/React.createElement(_JSXStyle, {
       id: styles.__hash
     }, styles));

package/build/es/components/DimensionsPanel/List/styles/DimensionList.style.js

@@ -1,5 +1,5 @@
 import { colors, spacers } from '@dhis2/ui';
-const _defaultExport = [".container.jsx-2067921157{position:relative;-webkit-flex:1 1 0%;-ms-flex:1 1 0%;flex:1 1 0%;min-height:30vh;}", ".wrapper.jsx-2067921157{position:absolute;width:100%;height:100%;overflow:auto;margin-top:0;padding:0;}", ".list.jsx-2067921157{margin:0;padding:0;}", ".header.jsx-2067921157{text-transform:uppercase;font-size:11px;color:".concat(colors.grey700, ";margin:5px 0;-webkit-letter-spacing:0.3px;-moz-letter-spacing:0.3px;-ms-letter-spacing:0.3px;letter-spacing:0.3px;}"), ".section.jsx-2067921157:not(:last-child){margin-bottom:".concat(spacers.dp24, ";}")];
+const _defaultExport = [".container.jsx-2067921157{position:relative;-webkit-flex:1 1 0%;-ms-flex:1 1 0%;flex:1 1 0%;min-height:30vh;}", ".wrapper.jsx-2067921157{position:absolute;width:100%;height:100%;overflow:auto;margin-top:0;padding:0;}", ".list.jsx-2067921157{margin:0;padding:0;}", `.header.jsx-2067921157{text-transform:uppercase;font-size:11px;color:${colors.grey700};margin:5px 0;-webkit-letter-spacing:0.3px;-moz-letter-spacing:0.3px;-ms-letter-spacing:0.3px;letter-spacing:0.3px;}`, `.section.jsx-2067921157:not(:last-child){margin-bottom:${spacers.dp24};}`];
 _defaultExport.__hash = "2067921157";
 // Fix for vertical flex scrolling in Firefox/Safari:
 // Wrap the list in a div with position:relative (and flex:1 instead of on the list)

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

@@ -11,7 +11,7 @@ export const styles = {
   textField: {
     marginBottom: '6px',
     background: colors.white,
-    border: "1px solid ".concat(colors.grey400),
+    border: `1px solid ${colors.grey400}`,
     borderRadius: '5px'
   }
 };

package/build/es/components/DynamicDimension/DynamicDimension.js

@@ -53,7 +53,7 @@ export const DynamicDimension = ({
     name: "dynamic-dimension-selection-type-selector",
     dense: true
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "automatic"
+    className: `jsx-${styles.__hash}` + " " + "automatic"
   }, /*#__PURE__*/React.createElement(Radio, {
     key: 'AUTOMATIC',
     label: i18n.t('Automatically include all items'),
@@ -62,11 +62,11 @@ export const DynamicDimension = ({
     checked: allIsSelected,
     dataTest: 'dynamic-dimension-selection-type-automatic'
   }), /*#__PURE__*/React.createElement("p", {
-    className: "jsx-".concat(styles.__hash) + " " + "help-text"
+    className: `jsx-${styles.__hash}` + " " + "help-text"
   }, i18n.t('Select all {{- dimensionTitle}} items. With this option, new items added in the future will be automatically included.', {
     dimensionTitle
   }))), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "manual"
+    className: `jsx-${styles.__hash}` + " " + "manual"
   }, /*#__PURE__*/React.createElement(Radio, {
     key: 'MANUAL',
     label: i18n.t('Manually select items...'),
@@ -85,7 +85,7 @@ export const DynamicDimension = ({
     onFetch: fetchItems,
     onSelect: onSelectItems,
     rightFooter: rightFooter,
-    dataTest: "".concat(dimensionTitle.replace(/\s+/g, '-').toLowerCase(), "-dimension")
+    dataTest: `${dimensionTitle.replace(/\s+/g, '-').toLowerCase()}-dimension`
   }), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

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

@@ -16,7 +16,7 @@ const LeftHeader = ({
   filter,
   setFilter
 }) => /*#__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: filter,
   onChange: ({
@@ -35,13 +35,13 @@ 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));
 
 const RightHeader = () => /*#__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')), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: styles.__hash
 }, styles));
@@ -63,7 +63,7 @@ const SourceEmptyPlaceholder = ({
   }
 
   return message && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("p", {
-    className: "jsx-".concat(styles.__hash) + " " + "emptyList"
+    className: `jsx-${styles.__hash}` + " " + "emptyList"
   }, message), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));
@@ -173,9 +173,9 @@ const ItemSelector = ({
     rightFooter: rightFooter,
     renderOption: props => /*#__PURE__*/React.createElement(TransferOption, _extends({}, props, {
       icon: GenericIcon,
-      dataTest: "".concat(dataTest, "-transfer-option")
+      dataTest: `${dataTest}-transfer-option`
     })),
-    dataTest: "".concat(dataTest, "-transfer")
+    dataTest: `${dataTest}-transfer`
   });
 };
 

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

@@ -1,4 +1,4 @@
 import { spacers, colors } from '@dhis2/ui';
-const _defaultExport = [".automatic.jsx-1315229031{margin-bottom:".concat(spacers.dp12, ";}"), ".manual.jsx-1315229031{margin-bottom:".concat(spacers.dp8, ";}"), ".help-text.jsx-1315229031{font-size:14px;padding-left:23px;color:".concat(colors.grey700, ";margin:0;}")];
+const _defaultExport = [`.automatic.jsx-1315229031{margin-bottom:${spacers.dp12};}`, `.manual.jsx-1315229031{margin-bottom:${spacers.dp8};}`, `.help-text.jsx-1315229031{font-size:14px;padding-left:23px;color:${colors.grey700};margin:0;}`];
 _defaultExport.__hash = "1315229031";
 export default _defaultExport;