@dhis2/analytics 23.7.9 → 23.8.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [23.8.1](https://github.com/dhis2/analytics/compare/v23.8.0...v23.8.1) (2022-05-05)
+
+
+### Bug Fixes
+
+* dimension types ([#1217](https://github.com/dhis2/analytics/issues/1217)) ([96231fc](https://github.com/dhis2/analytics/commit/96231fcfe348117b39d2f084c35731b05038da98))
+
+# [23.8.0](https://github.com/dhis2/analytics/compare/v23.7.10...v23.8.0) (2022-05-04)
+
+
+### Features
+
+* export constants for all value types ([#1216](https://github.com/dhis2/analytics/issues/1216)) ([d637002](https://github.com/dhis2/analytics/commit/d6370026ba653096f0781478c255b931925823c8))
+
+## [23.7.10](https://github.com/dhis2/analytics/compare/v23.7.9...v23.7.10) (2022-04-28)
+
+
+### Bug Fixes
+
+* set repetition in filter ([#1212](https://github.com/dhis2/analytics/issues/1212)) ([8510cba](https://github.com/dhis2/analytics/commit/8510cbaa68eac3902215d6db8508478b046d59b2))
+
 ## [23.7.9](https://github.com/dhis2/analytics/compare/v23.7.8...v23.7.9) (2022-04-26)
 
 

package/build/cjs/api/analytics/AnalyticsRequest.js

@@ -92,7 +92,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
 
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
-        var _f$programStage, _f$items2;
+        var _f$programStage, _f$repetition, _f$repetition$indexes;
 
         let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? "".concat(f.programStage.id, ".").concat(f.dimension) : f.dimension;
 
@@ -100,7 +100,15 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
           filterString += ":".concat(f.filter);
         }
 
-        request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
+          f.repetition.indexes.forEach(index => {
+            request = request.addFilter(filterString.replace(/\./, "[".concat(index, "].")));
+          });
+        } else {
+          var _f$items2;
+
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+        }
       }
     });
     return request;

package/build/cjs/api/analytics/AnalyticsResponse.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _valueTypes = require("../../modules/valueTypes.js");
+
 var _AnalyticsResponseHeader = _interopRequireDefault(require("./AnalyticsResponseHeader.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,11 +25,11 @@ const DEFAULT_PREFIX_IGNORE_HEADERS = ['dy', ...DEFAULT_COLLECT_IGNORE_HEADERS];
 const getParseMiddleware = type => {
   switch (type) {
     case 'STRING':
-    case 'TEXT':
+    case _valueTypes.VALUE_TYPE_TEXT:
       return value => "".concat(value);
 
-    case 'INTEGER':
-    case 'NUMBER':
+    case _valueTypes.VALUE_TYPE_INTEGER:
+    case _valueTypes.VALUE_TYPE_NUMBER:
       return value => !Number.isNaN(+value) && Number.isFinite(+value) ? parseFloat(+value) : value;
 
     default:
@@ -54,7 +56,7 @@ const isCollectHeader = (header, dimensions) => {
 const getPrefixedId = (id, prefix) => "".concat(prefix || '', " ").concat(id);
 
 const getNameByIdsByValueType = (id, valueType) => {
-  if (valueType === 'BOOLEAN') {
+  if (valueType === _valueTypes.VALUE_TYPE_BOOLEAN) {
     return booleanMap[id];
   }
 

package/build/cjs/api/analytics/__tests__/AnalyticsResponseHeader.spec.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _valueTypes = require("../../../modules/valueTypes.js");
+
 var _AnalyticsResponseHeader = _interopRequireDefault(require("../AnalyticsResponseHeader.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,7 +31,7 @@ describe('AnalyticsResponseHeader', () => {
       const header = {
         name: 'cejWyOfXge6',
         column: 'Gender',
-        valueType: 'TEXT',
+        valueType: _valueTypes.VALUE_TYPE_TEXT,
         type: 'java.lang.String',
         hidden: false,
         meta: true,

package/build/cjs/api/dimensions.js

@@ -57,13 +57,13 @@ const dataItemsQuery = {
   }) => {
     const filters = []; // TODO: Extract all of this logic out of the query?
 
-    if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === _dataTypes.EVENT_DATA_ITEMS) {
-      filters.push("dimensionItemType:in:[".concat(_dataTypes.PROGRAM_DATA_ELEMENT, ",").concat(_dataTypes.PROGRAM_ATTRIBUTE, "]"));
-    } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== _dataTypes.ALL_ID) {
+    if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM) {
+      filters.push("dimensionItemType:in:[".concat(_dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, ",").concat(_dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE, "]"));
+    } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push("dimensionItemType:eq:".concat(filter.dataType));
     }
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID && [_dataTypes.EVENT_DATA_ITEMS, _dataTypes.PROGRAM_INDICATORS].includes(filter.dataType)) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL && [_dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM, _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR].includes(filter.dataType)) {
       filters.push("programId:eq:".concat(filter.group));
     }
 
@@ -91,7 +91,7 @@ const indicatorsQuery = {
   }) => {
     const filters = [];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push("indicatorGroups.id:eq:".concat(filter.group));
     }
 
@@ -128,10 +128,10 @@ const dataElementsQuery = {
     searchTerm,
     page
   }) => {
-    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.ALL_ID ? 'id' : 'dimensionItem~rename(id)';
+    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['domainType:eq:AGGREGATE'];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push("dataElementGroups.id:eq:".concat(filter.group));
     }
 
@@ -194,10 +194,10 @@ const dataElementOperandsQuery = {
     searchTerm,
     page
   }) => {
-    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.ALL_ID ? 'id' : 'dimensionItem~rename(id)';
+    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === _dataTypes.DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = [];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
     }
 
@@ -229,7 +229,7 @@ const dataSetsQuery = {
       filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== _dataTypes.DIMENSION_TYPE_ALL) {
       filters.push("id:eq:".concat(filter.group));
     }
 
@@ -299,7 +299,7 @@ const apiFetchOptions = ({
   page
 }) => {
   switch (filter === null || filter === void 0 ? void 0 : filter.dataType) {
-    case _dataTypes.INDICATORS:
+    case _dataTypes.DIMENSION_TYPE_INDICATOR:
       {
         return fetchIndicators({
           dataEngine,
@@ -310,7 +310,7 @@ const apiFetchOptions = ({
         });
       }
 
-    case _dataTypes.DATA_ELEMENTS:
+    case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
       {
         if (filter.subGroup === _dataTypes.TOTALS) {
           return fetchDataElements({
@@ -331,7 +331,7 @@ const apiFetchOptions = ({
         }
       }
 
-    case _dataTypes.DATA_SETS:
+    case _dataTypes.DIMENSION_TYPE_DATA_SET:
       {
         return fetchDataSets({
           dataEngine,
@@ -357,10 +357,10 @@ exports.apiFetchOptions = apiFetchOptions;
 
 const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
   // indicatorGroups does not support shortName
-  const name = dataType === _dataTypes.INDICATORS ? 'displayName' : nameProp;
+  const name = dataType === _dataTypes.DIMENSION_TYPE_INDICATOR ? 'displayName' : nameProp;
 
   switch (dataType) {
-    case _dataTypes.INDICATORS:
+    case _dataTypes.DIMENSION_TYPE_INDICATOR:
       {
         const indicatorGroupsData = await dataEngine.query({
           indicatorGroups: indicatorGroupsQuery
@@ -373,7 +373,7 @@ const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return indicatorGroupsData.indicatorGroups.indicatorGroups;
       }
 
-    case _dataTypes.DATA_ELEMENTS:
+    case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
       {
         const dataElementGroupsData = await dataEngine.query({
           dataElementGroups: dataElementGroupsQuery
@@ -386,7 +386,7 @@ const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return dataElementGroupsData.dataElementGroups.dataElementGroups;
       }
 
-    case _dataTypes.DATA_SETS:
+    case _dataTypes.DIMENSION_TYPE_DATA_SET:
       {
         const response = await dataEngine.query({
           data: dataSetsQuery
@@ -399,8 +399,8 @@ const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return response.data.dataSets;
       }
 
-    case _dataTypes.EVENT_DATA_ITEMS:
-    case _dataTypes.PROGRAM_INDICATORS:
+    case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
+    case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
       {
         const programsData = await dataEngine.query({
           programs: programsQuery

package/build/cjs/components/DataDimension/{DataTypesSelector.js → DataTypeSelector.js}

@@ -17,11 +17,11 @@ var _index = _interopRequireDefault(require("../../locales/index.js"));
 
 var _dataTypes = require("../../modules/dataTypes.js");
 
-var _DataTypesSelectorStyle = _interopRequireDefault(require("./styles/DataTypesSelector.style.js"));
+var _DataTypeSelectorStyle = _interopRequireDefault(require("./styles/DataTypeSelector.style.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const DataTypes = ({
+const DataTypeSelector = ({
   currentDataType,
   onChange,
   dataTest
@@ -29,32 +29,32 @@ const DataTypes = ({
   var _dataTypes$currentDat;
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_DataTypesSelectorStyle.default.__hash) + " " + "container"
+    className: "jsx-".concat(_DataTypeSelectorStyle.default.__hash) + " " + "container"
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
     label: _index.default.t('Data Type'),
     dataTest: dataTest,
-    selected: ((_dataTypes$currentDat = _dataTypes.dataTypes[currentDataType]) === null || _dataTypes$currentDat === void 0 ? void 0 : _dataTypes$currentDat.id) || _dataTypes.ALL_ID,
+    selected: ((_dataTypes$currentDat = _dataTypes.dataTypeMap[currentDataType]) === null || _dataTypes$currentDat === void 0 ? void 0 : _dataTypes$currentDat.id) || _dataTypes.DIMENSION_TYPE_ALL,
     onChange: ref => onChange(ref.selected),
     dense: true
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
-    value: _dataTypes.ALL_ID,
-    key: _dataTypes.ALL_ID,
+    value: _dataTypes.DIMENSION_TYPE_ALL,
+    key: _dataTypes.DIMENSION_TYPE_ALL,
     label: _index.default.t('All types'),
     dataTest: "".concat(dataTest, "-option-all")
-  }), Object.values(_dataTypes.dataTypes).map(type => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
+  }), Object.values(_dataTypes.dataTypeMap).map(type => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: type.id,
     key: type.id,
     label: type.getName(),
     dataTest: "".concat(dataTest, "-option-").concat(type.id)
   }))), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: _DataTypesSelectorStyle.default.__hash
-  }, _DataTypesSelectorStyle.default));
+    id: _DataTypeSelectorStyle.default.__hash
+  }, _DataTypeSelectorStyle.default));
 };
 
-DataTypes.propTypes = {
+DataTypeSelector.propTypes = {
   currentDataType: _propTypes.default.string.isRequired,
   onChange: _propTypes.default.func.isRequired,
   dataTest: _propTypes.default.string
 };
-var _default = DataTypes;
+var _default = DataTypeSelector;
 exports.default = _default;

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

@@ -33,7 +33,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const GroupsSelector = ({
+const GroupSelector = ({
   dataType,
   currentGroup,
   onGroupChange,
@@ -47,8 +47,8 @@ const GroupsSelector = ({
   const dataEngine = (0, _appRuntime.useDataEngine)();
   const [groups, setGroups] = (0, _react.useState)([]);
   const [isLoading, setIsLoading] = (0, _react.useState)(true);
-  const defaultGroup = (_dataTypes$dataType = _dataTypes.dataTypes[dataType]) === null || _dataTypes$dataType === void 0 ? void 0 : _dataTypes$dataType.defaultGroup;
-  const subGroupType = (_dataTypes$dataType2 = _dataTypes.dataTypes[dataType]) === null || _dataTypes$dataType2 === void 0 ? void 0 : _dataTypes$dataType2.subGroup;
+  const defaultGroup = (_dataTypes$dataType = _dataTypes.dataTypeMap[dataType]) === null || _dataTypes$dataType === void 0 ? void 0 : _dataTypes$dataType.defaultGroup;
+  const subGroupType = (_dataTypes$dataType2 = _dataTypes.dataTypeMap[dataType]) === null || _dataTypes$dataType2 === void 0 ? void 0 : _dataTypes$dataType2.subGroup;
 
   const fetchGroups = async () => {
     setIsLoading(true);
@@ -67,16 +67,16 @@ const GroupsSelector = ({
   }, _GroupSelectorStyle.default), /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_GroupSelectorStyle.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(),
+    label: (_dataTypes$dataType3 = _dataTypes.dataTypeMap[dataType]) === null || _dataTypes$dataType3 === void 0 ? void 0 : _dataTypes$dataType3.getGroupLabel(),
     dataTest: "".concat(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,
+    placeholder: !currentGroup && (_dataTypes$dataType4 = _dataTypes.dataTypeMap[dataType]) !== null && _dataTypes$dataType4 !== void 0 && _dataTypes$dataType4.getPlaceholder ? _dataTypes.dataTypeMap[dataType].getPlaceholder() : null,
     onChange: ref => onGroupChange(ref.selected),
     dense: true,
-    empty: ((_dataTypes$dataType5 = _dataTypes.dataTypes[dataType]) === null || _dataTypes$dataType5 === void 0 ? void 0 : _dataTypes$dataType5.getGroupEmptyLabel()) || _index.default.t('No data'),
-    loadingText: ((_dataTypes$dataType6 = _dataTypes.dataTypes[dataType]) === null || _dataTypes$dataType6 === void 0 ? void 0 : _dataTypes$dataType6.getGroupLoadingLabel()) || _index.default.t('Loading'),
+    empty: ((_dataTypes$dataType5 = _dataTypes.dataTypeMap[dataType]) === null || _dataTypes$dataType5 === void 0 ? void 0 : _dataTypes$dataType5.getGroupEmptyLabel()) || _index.default.t('No data'),
+    loadingText: ((_dataTypes$dataType6 = _dataTypes.dataTypeMap[dataType]) === null || _dataTypes$dataType6 === void 0 ? void 0 : _dataTypes$dataType6.getGroupLoadingLabel()) || _index.default.t('Loading'),
     loading: isLoading
-  }, (_dataTypes$dataType7 = _dataTypes.dataTypes[dataType]) !== null && _dataTypes$dataType7 !== void 0 && _dataTypes$dataType7.defaultGroup ? /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
+  }, (_dataTypes$dataType7 = _dataTypes.dataTypeMap[dataType]) !== null && _dataTypes$dataType7 !== void 0 && _dataTypes$dataType7.defaultGroup ? /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: defaultGroup.id,
     key: defaultGroup.id,
     label: defaultGroup.getName(),
@@ -97,7 +97,7 @@ const GroupsSelector = ({
   }));
 };
 
-GroupsSelector.propTypes = {
+GroupSelector.propTypes = {
   dataType: _propTypes.default.string.isRequired,
   displayNameProp: _propTypes.default.string.isRequired,
   onGroupChange: _propTypes.default.func.isRequired,
@@ -106,5 +106,5 @@ GroupsSelector.propTypes = {
   currentSubGroup: _propTypes.default.string,
   dataTest: _propTypes.default.string
 };
-var _default = GroupsSelector;
+var _default = GroupSelector;
 exports.default = _default;

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

@@ -35,7 +35,7 @@ var _DimensionSelectorStyle = _interopRequireDefault(require("../styles/Dimensio
 
 var _TransferOption = require("../TransferOption.js");
 
-var _DataTypesSelector = _interopRequireDefault(require("./DataTypesSelector.js"));
+var _DataTypeSelector = _interopRequireDefault(require("./DataTypeSelector.js"));
 
 var _GroupSelector = _interopRequireDefault(require("./GroupSelector.js"));
 
@@ -70,11 +70,11 @@ const LeftHeader = ({
   dense: true,
   initialFocus: true,
   type: 'search'
-}), /*#__PURE__*/_react.default.createElement(_DataTypesSelector.default, {
+}), /*#__PURE__*/_react.default.createElement(_DataTypeSelector.default, {
   currentDataType: dataType,
   onChange: setDataType,
   dataTest: "".concat(dataTest, "-data-types-select-field")
-}), _dataTypes.dataTypes[dataType] && /*#__PURE__*/_react.default.createElement(_GroupSelector.default, {
+}), _dataTypes.dataTypeMap[dataType] && /*#__PURE__*/_react.default.createElement(_GroupSelector.default, {
   dataType: dataType,
   displayNameProp: displayNameProp,
   currentGroup: group,
@@ -138,23 +138,23 @@ const SourceEmptyPlaceholder = ({
       message = noItemsMessage;
     } else {
       switch (dataType) {
-        case _dataTypes.INDICATORS:
+        case _dataTypes.DIMENSION_TYPE_INDICATOR:
           message = _index.default.t('No indicators found');
           break;
 
-        case _dataTypes.DATA_ELEMENTS:
+        case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
           message = _index.default.t('No data elements found');
           break;
 
-        case _dataTypes.DATA_SETS:
+        case _dataTypes.DIMENSION_TYPE_DATA_SET:
           message = _index.default.t('No data sets found');
           break;
 
-        case _dataTypes.EVENT_DATA_ITEMS:
+        case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
           message = _index.default.t('No event data items found');
           break;
 
-        case _dataTypes.PROGRAM_INDICATORS:
+        case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
           message = _index.default.t('No program indicators found');
           break;
 
@@ -165,31 +165,31 @@ const SourceEmptyPlaceholder = ({
     }
   } else if (!loading && !options.length && searchTerm) {
     switch (dataType) {
-      case _dataTypes.INDICATORS:
+      case _dataTypes.DIMENSION_TYPE_INDICATOR:
         message = _index.default.t('No indicators found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case _dataTypes.DATA_ELEMENTS:
+      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
         message = _index.default.t('No data elements found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case _dataTypes.DATA_SETS:
+      case _dataTypes.DIMENSION_TYPE_DATA_SET:
         message = _index.default.t('No data sets found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case _dataTypes.EVENT_DATA_ITEMS:
+      case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
         message = _index.default.t('No event data items found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case _dataTypes.PROGRAM_INDICATORS:
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
         message = _index.default.t('No program indicators found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
@@ -232,7 +232,7 @@ const ItemSelector = ({
   const [state, setState] = (0, _react.useState)({
     searchTerm: '',
     filter: {
-      dataType: _dataTypes.ALL_ID
+      dataType: _dataTypes.DIMENSION_TYPE_ALL
     },
     options: [],
     loading: true,
@@ -266,7 +266,7 @@ const ItemSelector = ({
     const newOptions = [];
     (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.forEach(item => {
       if (item.dimensionItemType === _dataSets.REPORTING_RATE) {
-        if (state.filter.subGroup && state.filter.subGroup !== _dataTypes.ALL_ID) {
+        if (state.filter.subGroup && state.filter.subGroup !== _dataTypes.DIMENSION_TYPE_ALL) {
           const metric = _dataSets.DATA_SETS_CONSTANTS.find(item => item.id === state.filter.subGroup);
 
           newOptions.push({
@@ -354,39 +354,39 @@ const ItemSelector = ({
     var _dataTypes$itemType;
 
     switch (itemType) {
-      case _dataTypes.DATA_ELEMENT_OPERAND:
-        return _dataTypes.dataTypes[_dataTypes.DATA_ELEMENTS].getItemName();
+      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
+        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_DATA_ELEMENT].getItemName();
 
       case _dataSets.REPORTING_RATE:
-        return _dataTypes.dataTypes[_dataTypes.DATA_SETS].getItemName();
+        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_DATA_SET].getItemName();
 
-      case _dataTypes.PROGRAM_DATA_ELEMENT:
-      case _dataTypes.PROGRAM_ATTRIBUTE:
-        return _dataTypes.dataTypes[_dataTypes.EVENT_DATA_ITEMS].getItemName();
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
+        return _dataTypes.dataTypeMap[_dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
 
       default:
-        return (_dataTypes$itemType = _dataTypes.dataTypes[itemType]) === null || _dataTypes$itemType === void 0 ? void 0 : _dataTypes$itemType.getItemName();
+        return (_dataTypes$itemType = _dataTypes.dataTypeMap[itemType]) === null || _dataTypes$itemType === void 0 ? void 0 : _dataTypes$itemType.getItemName();
     }
   };
 
   const getIcon = itemType => {
     switch (itemType) {
-      case _dataTypes.INDICATORS:
+      case _dataTypes.DIMENSION_TYPE_INDICATOR:
         return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionIndicator16, null);
 
-      case _dataTypes.DATA_ELEMENT_OPERAND:
-      case _dataTypes.DATA_ELEMENTS:
+      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
+      case _dataTypes.DIMENSION_TYPE_DATA_ELEMENT:
         return _DataElementIcon.default;
 
       case _dataSets.REPORTING_RATE:
         return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionDataSet16, null);
 
-      case _dataTypes.EVENT_DATA_ITEMS:
-      case _dataTypes.PROGRAM_DATA_ELEMENT:
-      case _dataTypes.PROGRAM_ATTRIBUTE:
+      case _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM:
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
         return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionEventDataItem16, null);
 
-      case _dataTypes.PROGRAM_INDICATORS:
+      case _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR:
         return /*#__PURE__*/_react.default.createElement(_ui.IconDimensionProgramIndicator16, null);
 
       default:
@@ -417,7 +417,7 @@ const ItemSelector = ({
         setFilter({ ...state.filter,
           dataType,
           group: null,
-          subGroup: dataType === _dataTypes.DATA_ELEMENTS ? _dataTypes.TOTALS : null
+          subGroup: dataType === _dataTypes.DIMENSION_TYPE_DATA_ELEMENT ? _dataTypes.TOTALS : null
         });
       },
       group: state.filter.group,
@@ -453,7 +453,7 @@ const ItemSelector = ({
       icon: getIcon(getItemType(props.value
       /* eslint-disable-line react/prop-types */
       )),
-      tooltipText: state.filter.dataType === _dataTypes.ALL_ID ? getTooltipText(getItemType(props.value
+      tooltipText: state.filter.dataType === _dataTypes.DIMENSION_TYPE_ALL ? getTooltipText(getItemType(props.value
       /* eslint-disable-line react/prop-types */
       )) : undefined,
       dataTest: "".concat(dataTest, "-transfer-option")

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

@@ -32,15 +32,15 @@ const MetricSelector = ({
     className: "jsx-".concat(_MetricSelectorStyle.default.__hash) + " " + "metric-container"
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectField, {
     label: _index.default.t('Metric type'),
-    selected: currentValue || _dataTypes.ALL_ID,
+    selected: currentValue || _dataTypes.DIMENSION_TYPE_ALL,
     onChange: ref => onChange(ref.selected),
     dense: true,
     dataTest: dataTest
   }, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
-    value: _dataTypes.ALL_ID,
-    key: _dataTypes.ALL_ID,
+    value: _dataTypes.DIMENSION_TYPE_ALL,
+    key: _dataTypes.DIMENSION_TYPE_ALL,
     label: _index.default.t('All metrics'),
-    dataTest: "".concat(dataTest, "-option-").concat(_dataTypes.ALL_ID)
+    dataTest: "".concat(dataTest, "-option-").concat(_dataTypes.DIMENSION_TYPE_ALL)
   }), _dataSets.DATA_SETS_CONSTANTS.map(option => /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
     value: option.id,
     key: option.id,

package/build/cjs/components/PivotTable/PivotTableValueCell.js

@@ -13,6 +13,8 @@ var _applyLegendSet = require("../../modules/pivotTable/applyLegendSet.js");
 
 var _pivotTableConstants = require("../../modules/pivotTable/pivotTableConstants.js");
 
+var _valueTypes = require("../../modules/valueTypes.js");
+
 var _PivotTableCell = require("./PivotTableCell.js");
 
 var _PivotTableEmptyCell = require("./PivotTableEmptyCell.js");
@@ -56,7 +58,7 @@ const PivotTableValueCell = ({
   } // TODO: Add support for 'INTEGER' type (requires server changes)
 
 
-  const legendStyle = cellContent.cellType === _pivotTableConstants.CELL_TYPE_VALUE && cellContent.valueType === _pivotTableConstants.VALUE_TYPE_NUMBER ? (0, _applyLegendSet.applyLegendSet)(cellContent.rawValue, cellContent.dxDimension, engine) : undefined;
+  const legendStyle = cellContent.cellType === _pivotTableConstants.CELL_TYPE_VALUE && cellContent.valueType === _valueTypes.VALUE_TYPE_NUMBER ? (0, _applyLegendSet.applyLegendSet)(cellContent.rawValue, cellContent.dxDimension, engine) : undefined;
   const width = engine.adaptiveClippingController.columns.sizes[engine.columnMap[column]].size;
   const height = engine.adaptiveClippingController.rows.sizes[engine.rowMap[row]].size;
   const style = { ...legendStyle,