@dhis2/analytics 20.6.4 → 21.0.0-alpha.3

package/build/cjs/api/organisationUnits.js

@@ -3,66 +3,120 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.apiFetchOrganisationUnitLevels = exports.apiFetchOrganisationUnitGroups = exports.apiFetchOrganisationUnits = exports.apiFetchOrganisationUnitRoot = void 0;
+exports.apiFetchOrganisationUnit = exports.apiFetchOrganisationUnits = exports.apiFetchOrganisationUnitRoots = exports.apiFetchOrganisationUnitGroups = exports.apiFetchOrganisationUnitLevels = void 0;
 
 var _index = require("./index");
 
-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(_index.onError);
+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,
+    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
+  }
 };
-/**
- * Fetch organisation units
- * @returns {Promise<T | never>}
- */
 
+const apiFetchOrganisationUnitLevels = async dataEngine => {
+  const orgUnitLevelsData = await dataEngine.query({
+    orgUnitLevels: orgUnitLevelsQuery
+  }, {
+    onError: _index.onError
+  });
+  return orgUnitLevelsData.orgUnitLevels.organisationUnitLevels;
+};
 
-exports.apiFetchOrganisationUnitRoot = apiFetchOrganisationUnitRoot;
+exports.apiFetchOrganisationUnitLevels = apiFetchOrganisationUnitLevels;
 
-const apiFetchOrganisationUnits = (d2, displayNameProperty) => {
-  const fields = ['id', 'path', "".concat(displayNameProperty, "~rename(displayName)"), 'children::isNotEmpty'];
-  return d2.models.organisationUnits.list({
-    paging: false,
-    level: 1,
-    fields: fields.join(','),
-    userDataViewFallback: true
+const apiFetchOrganisationUnitGroups = async (dataEngine, displayNameProp) => {
+  const orgUnitGroupsData = await dataEngine.query({
+    orgUnitGroups: orgUnitGroupsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError: _index.onError
   });
+  return orgUnitGroupsData.orgUnitGroups.organisationUnitGroups;
 };
-/**
- * Fetch organisation unit groups
- * @returns {*}
- */
 
+exports.apiFetchOrganisationUnitGroups = apiFetchOrganisationUnitGroups;
+
+const apiFetchOrganisationUnitRoots = async dataEngine => {
+  const orgUnitRootsData = await dataEngine.query({
+    orgUnitRoots: orgUnitRootsQuery
+  }, {
+    onError: _index.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?
 
-exports.apiFetchOrganisationUnits = apiFetchOrganisationUnits;
 
-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(_index.onError);
-};
-/**
- * Fetch organisation unit levels
- * @returns {*}
- */
+exports.apiFetchOrganisationUnitRoots = apiFetchOrganisationUnitRoots;
 
+const apiFetchOrganisationUnits = async (dataEngine, displayNameProp) => {
+  const orgUnitsData = await dataEngine.query({
+    orgUnits: orgUnitsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError: _index.onError
+  });
+  return orgUnitsData.orgUnits.organisationUnits;
+};
 
-exports.apiFetchOrganisationUnitGroups = apiFetchOrganisationUnitGroups;
+exports.apiFetchOrganisationUnits = apiFetchOrganisationUnits;
 
-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(_index.onError);
+const apiFetchOrganisationUnit = async (dataEngine, id) => {
+  const orgUnitData = await dataEngine.query({
+    orgUnit: orgUnitQuery
+  }, {
+    variables: {
+      id
+    },
+    onError: _index.onError
+  });
+  return orgUnitData.orgUnit;
 };
 
-exports.apiFetchOrganisationUnitLevels = apiFetchOrganisationUnitLevels;
+exports.apiFetchOrganisationUnit = apiFetchOrganisationUnit;

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

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

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

@@ -33,7 +33,7 @@ const DetailSelector = ({
 }) => {
   const options = getOptions();
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_DetailSelector.default.__hash) + " " + "detail-container"
+    className: `jsx-${_DetailSelector.default.__hash}` + " " + "detail-container"
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
     dataTest: dataTest,
     label: _index.default.t('Disaggregation'),
@@ -44,7 +44,7 @@ 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.default.createElement(_style.default, {
     id: _DetailSelector.default.__hash
   }, _DetailSelector.default));

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

@@ -27,9 +27,9 @@ var _MetricSelector = require("./MetricSelector");
 
 var _GroupSelector = _interopRequireDefault(require("./styles/GroupSelector.style"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -61,14 +61,14 @@ const GroupsSelector = ({
     fetchGroups();
   }, [dataType]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_GroupSelector.default.__hash) + " " + "container"
+    className: `jsx-${_GroupSelector.default.__hash}` + " " + "container"
   }, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _GroupSelector.default.__hash
   }, _GroupSelector.default), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_GroupSelector.default.__hash) + " " + "group-container"
+    className: `jsx-${_GroupSelector.default.__hash}` + " " + "group-container"
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
     label: (_dataTypes$dataType3 = _dataTypes.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.dataTypes[dataType]) !== null && _dataTypes$dataType4 !== void 0 && _dataTypes$dataType4.getPlaceholder ? _dataTypes.dataTypes[dataType].getPlaceholder() : null,
     onChange: ref => onGroupChange(ref.selected),
@@ -80,20 +80,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.default.createElement(_ui.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 === _dataTypes.SUB_GROUP_DETAIL && /*#__PURE__*/_react.default.createElement(_DetailSelector.DetailSelector, {
     currentValue: currentSubGroup,
     onChange: onSubGroupChange,
-    dataTest: "".concat(dataTest, "-sub-group-select-field")
+    dataTest: `${dataTest}-sub-group-select-field`
   }), subGroupType === _dataTypes.SUB_GROUP_METRIC && /*#__PURE__*/_react.default.createElement(_MetricSelector.MetricSelector, {
     currentValue: currentSubGroup,
     onChange: onSubGroupChange,
-    dataTest: "".concat(dataTest, "-sub-group-select-field")
+    dataTest: `${dataTest}-sub-group-select-field`
   }));
 };
 

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

@@ -39,9 +39,9 @@ var _DataTypesSelector = _interopRequireDefault(require("./DataTypesSelector"));
 
 var _GroupSelector = _interopRequireDefault(require("./GroupSelector"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -59,21 +59,21 @@ const LeftHeader = ({
   displayNameProp,
   dataTest
 }) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "leftHeader"
+  className: `jsx-${_DimensionSelector.default.__hash}` + " " + "leftHeader"
 }, /*#__PURE__*/_react.default.createElement(_ui.InputField, {
   value: searchTerm,
   onChange: ({
     value
   }) => setSearchTerm(value),
   placeholder: _index.default.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.default.createElement(_DataTypesSelector.default, {
   currentDataType: dataType,
   onChange: setDataType,
-  dataTest: "".concat(dataTest, "-data-types-select-field")
+  dataTest: `${dataTest}-data-types-select-field`
 }), _dataTypes.dataTypes[dataType] && /*#__PURE__*/_react.default.createElement(_GroupSelector.default, {
   dataType: dataType,
   displayNameProp: displayNameProp,
@@ -100,7 +100,7 @@ LeftHeader.propTypes = {
 };
 
 const EmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "emptyList"
+  className: `jsx-${_DimensionSelector.default.__hash}` + " " + "emptyList"
 }, _index.default.t('No items selected')), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: _DimensionSelector.default.__hash
 }, _DimensionSelector.default));
@@ -108,13 +108,13 @@ const EmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.de
 const RightHeader = ({
   infoText
 }) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "rightHeader"
+  className: `jsx-${_DimensionSelector.default.__hash}` + " " + "rightHeader"
 }, _index.default.t('Selected Items')), infoText && /*#__PURE__*/_react.default.createElement("div", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "info-container"
+  className: `jsx-${_DimensionSelector.default.__hash}` + " " + "info-container"
 }, /*#__PURE__*/_react.default.createElement("div", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash)
+  className: `jsx-${_DimensionSelector.default.__hash}`
 }, /*#__PURE__*/_react.default.createElement(_ui.IconInfo16, null)), /*#__PURE__*/_react.default.createElement("span", {
-  className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "info-text"
+  className: `jsx-${_DimensionSelector.default.__hash}` + " " + "info-text"
 }, infoText)), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: _DimensionSelector.default.__hash
 }, _DimensionSelector.default));
@@ -205,7 +205,7 @@ const SourceEmptyPlaceholder = ({
 
   return message && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     "data-test": dataTest,
-    className: "jsx-".concat(_DimensionSelector.default.__hash) + " " + "emptyList"
+    className: `jsx-${_DimensionSelector.default.__hash}` + " " + "emptyList"
   }, message), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _DimensionSelector.default.__hash
   }, _DimensionSelector.default));
@@ -270,16 +270,16 @@ const ItemSelector = ({
           const metric = _dataSets.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 {
           _dataSets.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
             });
@@ -408,7 +408,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.default.createElement(LeftHeader, {
@@ -435,7 +435,7 @@ const ItemSelector = ({
       searchTerm: state.searchTerm,
       setSearchTerm: setSearchTerm,
       displayNameProp: displayNameProp,
-      dataTest: "".concat(dataTest, "-left-header")
+      dataTest: `${dataTest}-left-header`
     }),
     enableOrderChange: true,
     height: _dimensionSelectorHelper.TRANSFER_HEIGHT,
@@ -456,9 +456,9 @@ const ItemSelector = ({
       tooltipText: state.filter.dataType === _dataTypes.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/cjs/components/DataDimension/MetricSelector.js

@@ -29,7 +29,7 @@ const MetricSelector = ({
   dataTest
 }) => {
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_MetricSelector.default.__hash) + " " + "metric-container"
+    className: `jsx-${_MetricSelector.default.__hash}` + " " + "metric-container"
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
     label: _index.default.t('Metric type'),
     selected: currentValue || _dataTypes.ALL_ID,
@@ -40,12 +40,12 @@ const MetricSelector = ({
     value: _dataTypes.ALL_ID,
     key: _dataTypes.ALL_ID,
     label: _index.default.t('All metrics'),
-    dataTest: "".concat(dataTest, "-option-").concat(_dataTypes.ALL_ID)
+    dataTest: `${dataTest}-option-${_dataTypes.ALL_ID}`
   }), _dataSets.DATA_SETS_CONSTANTS.map(option => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: option.id,
     key: option.id,
     label: option.getName(),
-    dataTest: "".concat(dataTest, "-option-").concat(option.id)
+    dataTest: `${dataTest}-option-${option.id}`
   }))), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _MetricSelector.default.__hash
   }, _MetricSelector.default));

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@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(_ui.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:${_ui.spacers.dp12} 0 0;}`];
 _defaultExport.__hash = "3368926978";
 var _default = _defaultExport;
 exports.default = _default;

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@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(_ui.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:${_ui.spacers.dp4};width:40%;}`];
 _defaultExport.__hash = "2733301753";
 var _default = _defaultExport;
 exports.default = _default;

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const _defaultExport = [".container.jsx-2205421678{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;min-height:53px;padding-left:".concat(_ui.spacers.dp16, ";margin-top:").concat(_ui.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:${_ui.spacers.dp16};margin-top:${_ui.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";
 var _default = _defaultExport;
 exports.default = _default;

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@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(_ui.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:${_ui.spacers.dp4};width:50%;}`];
 _defaultExport.__hash = "3752467532";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/components/DimensionMenu.js

@@ -67,7 +67,7 @@ const DimensionMenu = ({
     key: "remove-menu-item",
     onClick: onClick,
     label: _index.default.t('Remove'),
-    dataTest: "".concat(dataTest, "-item-remove-").concat(dimensionId)
+    dataTest: `${dataTest}-item-remove-${dimensionId}`
   }); // Assigned categories
 
 
@@ -76,8 +76,8 @@ const DimensionMenu = ({
       if (!isAssignedCategoriesInLayout) {
         menuItems.push( /*#__PURE__*/_react.default.createElement(_ui.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.default.createElement(_ui.MenuItem, {
           key: destination,
           onClick: () => {
@@ -85,22 +85,22 @@ const DimensionMenu = ({
             onClose();
           },
           label: getAxisItemLabel((0, _axis.getAxisNameByLayoutType)(destination, (0, _visTypeToLayoutType.getLayoutTypeByVisType)(visType))),
-          dataTest: "".concat(dataTest, "-item-action-co-to-").concat(destination)
+          dataTest: `${dataTest}-item-action-co-to-${destination}`
         }))));
       } else {
         menuItems.push( /*#__PURE__*/_react.default.createElement(_ui.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.default.createElement(_ui.Tooltip, {
-        key: "assigned-categories-item-".concat(dimensionId),
+        key: `assigned-categories-item-${dimensionId}`,
         content: getUnavailableLabel(visType),
         "aria-label": "disabled",
         classes: classes
@@ -108,7 +108,7 @@ const DimensionMenu = ({
         disabled: true,
         dense: true,
         label: assignedCategoriesItemLabel,
-        dataTest: "".concat(dataTest, "-item-co-menu")
+        dataTest: `${dataTest}-item-co-menu`
       })));
     }
   } // divider
@@ -116,7 +116,7 @@ const DimensionMenu = ({
 
   menuItems.length && menuItems.push(getDividerItem('assigned-categories-divider'));
   menuItems.push(...applicableAxisIds.map(axisId => /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
-    key: "".concat(dimensionId, "-to-").concat(axisId),
+    key: `${dimensionId}-to-${axisId}`,
     onClick: () => {
       axisItemHandler({
         dimensionId,
@@ -128,7 +128,7 @@ const DimensionMenu = ({
       onClose();
     },
     label: getAxisItemLabel((0, _axis.getAxisNameByLayoutType)(axisId, (0, _visTypeToLayoutType.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/cjs/components/DimensionsPanel/DimensionsPanel.js

@@ -17,9 +17,9 @@ var _DimensionList = _interopRequireDefault(require("./List/DimensionList"));
 
 var _DimensionsPanel = require("./styles/DimensionsPanel.style");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

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

@@ -23,9 +23,9 @@ var _RecommendedIcon = _interopRequireDefault(require("./RecommendedIcon"));
 
 var _DimensionItem = require("./styles/DimensionItem.style");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -109,20 +109,20 @@ class DimensionItem extends _react.Component {
       id: id,
       isDeactivated: isDeactivated,
       onClick: onClick,
-      dataTest: "".concat(dataTest, "-button-").concat(id)
+      dataTest: `${dataTest}-button-${id}`
     }, /*#__PURE__*/_react.default.createElement("div", {
       style: _DimensionItem.styles.iconWrapper
     }, Icon), /*#__PURE__*/_react.default.createElement("div", {
       style: _DimensionItem.styles.labelWrapper
     }, Label, /*#__PURE__*/_react.default.createElement(_RecommendedIcon.default, {
       isRecommended: isRecommended,
-      dataTest: "".concat(dataTest, "-recommended-icon")
+      dataTest: `${dataTest}-recommended-icon`
     })), isLocked && /*#__PURE__*/_react.default.createElement("div", {
       style: _DimensionItem.styles.iconWrapper
     }, /*#__PURE__*/_react.default.createElement(_ui.IconLock16, null))), onOptionsClick ? /*#__PURE__*/_react.default.createElement("div", {
       style: _DimensionItem.styles.optionsWrapper,
       ref: optionsRef,
-      "data-test": "".concat(dataTest, "-menu-").concat(id)
+      "data-test": `${dataTest}-menu-${id}`
     }, this.state.mouseOver && !isDeactivated && !isLocked ? /*#__PURE__*/_react.default.createElement(_OptionsButton.default, {
       style: _DimensionItem.styles.optionsButton,
       onClick: this.onOptionsClick(id, optionsRef)

package/build/cjs/components/DimensionsPanel/List/DimensionLabel.js

@@ -13,9 +13,9 @@ var _predefinedDimensions = require("../../../modules/predefinedDimensions");
 
 var _DimensionLabel = require("./styles/DimensionLabel.style");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }