@dhis2/analytics 23.8.0 → 23.8.1

package/build/cjs/modules/dataTypes.js

@@ -5,30 +5,44 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultGroupId = defaultGroupId;
 exports.defaultGroupDetail = defaultGroupDetail;
-exports.DEFAULT_DATATYPE_ID = exports.dataTypes = exports.SUB_GROUP_METRIC = exports.SUB_GROUP_DETAIL = exports.DETAIL = exports.TOTALS = exports.DATA_ELEMENT_OPERAND = exports.PROGRAM_ATTRIBUTE = exports.PROGRAM_DATA_ELEMENT = exports.PROGRAM_INDICATORS = exports.EVENT_DATA_ITEMS = exports.DATA_SETS = exports.DATA_ELEMENTS = exports.INDICATORS = exports.ALL_ID = void 0;
+exports.DEFAULT_DATATYPE_ID = exports.dataTypeMap = exports.SUB_GROUP_METRIC = exports.SUB_GROUP_DETAIL = exports.DETAIL = exports.TOTALS = exports.DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET = exports.DIMENSION_TYPE_ORGANISATION_UNIT = exports.DIMENSION_TYPE_PERIOD = exports.DIMENSION_TYPE_DATA = exports.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = exports.DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET = exports.DIMENSION_TYPE_CATEGORY = exports.DIMENSION_TYPE_DATA_ELEMENT_OPERAND = exports.DIMENSION_TYPE_PROGRAM_ATTRIBUTE = exports.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT = exports.DIMENSION_TYPE_PROGRAM_INDICATOR = exports.DIMENSION_TYPE_EVENT_DATA_ITEM = exports.DIMENSION_TYPE_DATA_SET = exports.DIMENSION_TYPE_DATA_ELEMENT = exports.DIMENSION_TYPE_INDICATOR = exports.DIMENSION_TYPE_ALL = void 0;
 
 var _index = _interopRequireDefault(require("../locales/index.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ALL_ID = 'ALL';
-exports.ALL_ID = ALL_ID;
-const INDICATORS = 'INDICATOR';
-exports.INDICATORS = INDICATORS;
-const DATA_ELEMENTS = 'DATA_ELEMENT';
-exports.DATA_ELEMENTS = DATA_ELEMENTS;
-const DATA_SETS = 'DATA_SET';
-exports.DATA_SETS = DATA_SETS;
-const EVENT_DATA_ITEMS = 'EVENT_DATA_ITEM';
-exports.EVENT_DATA_ITEMS = EVENT_DATA_ITEMS;
-const PROGRAM_INDICATORS = 'PROGRAM_INDICATOR';
-exports.PROGRAM_INDICATORS = PROGRAM_INDICATORS;
-const PROGRAM_DATA_ELEMENT = 'PROGRAM_DATA_ELEMENT';
-exports.PROGRAM_DATA_ELEMENT = PROGRAM_DATA_ELEMENT;
-const PROGRAM_ATTRIBUTE = 'PROGRAM_ATTRIBUTE';
-exports.PROGRAM_ATTRIBUTE = PROGRAM_ATTRIBUTE;
-const DATA_ELEMENT_OPERAND = 'DATA_ELEMENT_OPERAND';
-exports.DATA_ELEMENT_OPERAND = DATA_ELEMENT_OPERAND;
+const DIMENSION_TYPE_ALL = 'ALL';
+exports.DIMENSION_TYPE_ALL = DIMENSION_TYPE_ALL;
+const DIMENSION_TYPE_INDICATOR = 'INDICATOR';
+exports.DIMENSION_TYPE_INDICATOR = DIMENSION_TYPE_INDICATOR;
+const DIMENSION_TYPE_DATA_ELEMENT = 'DATA_ELEMENT';
+exports.DIMENSION_TYPE_DATA_ELEMENT = DIMENSION_TYPE_DATA_ELEMENT;
+const DIMENSION_TYPE_DATA_SET = 'DATA_SET';
+exports.DIMENSION_TYPE_DATA_SET = DIMENSION_TYPE_DATA_SET;
+const DIMENSION_TYPE_EVENT_DATA_ITEM = 'EVENT_DATA_ITEM';
+exports.DIMENSION_TYPE_EVENT_DATA_ITEM = DIMENSION_TYPE_EVENT_DATA_ITEM;
+const DIMENSION_TYPE_PROGRAM_INDICATOR = 'PROGRAM_INDICATOR';
+exports.DIMENSION_TYPE_PROGRAM_INDICATOR = DIMENSION_TYPE_PROGRAM_INDICATOR;
+const DIMENSION_TYPE_PROGRAM_DATA_ELEMENT = 'PROGRAM_DATA_ELEMENT';
+exports.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT = DIMENSION_TYPE_PROGRAM_DATA_ELEMENT;
+const DIMENSION_TYPE_PROGRAM_ATTRIBUTE = 'PROGRAM_ATTRIBUTE';
+exports.DIMENSION_TYPE_PROGRAM_ATTRIBUTE = DIMENSION_TYPE_PROGRAM_ATTRIBUTE;
+const DIMENSION_TYPE_DATA_ELEMENT_OPERAND = 'DATA_ELEMENT_OPERAND';
+exports.DIMENSION_TYPE_DATA_ELEMENT_OPERAND = DIMENSION_TYPE_DATA_ELEMENT_OPERAND;
+const DIMENSION_TYPE_CATEGORY = 'CATEGORY';
+exports.DIMENSION_TYPE_CATEGORY = DIMENSION_TYPE_CATEGORY;
+const DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET = 'CATEGORY_OPTION_GROUP_SET';
+exports.DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET = DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET;
+const DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = 'DATA_ELEMENT_GROUP_SET';
+exports.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET;
+const DIMENSION_TYPE_DATA = 'DATA_X';
+exports.DIMENSION_TYPE_DATA = DIMENSION_TYPE_DATA;
+const DIMENSION_TYPE_PERIOD = 'PERIOD';
+exports.DIMENSION_TYPE_PERIOD = DIMENSION_TYPE_PERIOD;
+const DIMENSION_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
+exports.DIMENSION_TYPE_ORGANISATION_UNIT = DIMENSION_TYPE_ORGANISATION_UNIT;
+const DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET = 'ORGANISATION_UNIT_GROUP_SET';
+exports.DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET = DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET;
 const TOTALS = 'totals';
 exports.TOTALS = TOTALS;
 const DETAIL = 'detail';
@@ -42,25 +56,25 @@ const getProgramText = () => _index.default.t('Program');
 
 const getSelectProgramText = () => _index.default.t('Select a program');
 
-const dataTypes = {
-  [INDICATORS]: {
-    id: INDICATORS,
+const dataTypeMap = {
+  [DIMENSION_TYPE_INDICATOR]: {
+    id: DIMENSION_TYPE_INDICATOR,
     getName: () => _index.default.t('Indicators'),
     getGroupLabel: () => _index.default.t('Indicator group'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => _index.default.t('All groups')
     },
     getItemName: () => _index.default.t('Indicator'),
     getGroupEmptyLabel: () => _index.default.t('No indicator groups found'),
     getGroupLoadingLabel: () => _index.default.t('Loading indicator groups')
   },
-  [DATA_ELEMENTS]: {
-    id: DATA_ELEMENTS,
+  [DIMENSION_TYPE_DATA_ELEMENT]: {
+    id: DIMENSION_TYPE_DATA_ELEMENT,
     getName: () => _index.default.t('Data elements'),
     getGroupLabel: () => _index.default.t('Data element group'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => _index.default.t('All groups')
     },
     subGroup: SUB_GROUP_DETAIL,
@@ -68,12 +82,12 @@ const dataTypes = {
     getGroupEmptyLabel: () => _index.default.t('No data element groups found'),
     getGroupLoadingLabel: () => _index.default.t('Loading data element groups')
   },
-  [DATA_SETS]: {
-    id: DATA_SETS,
+  [DIMENSION_TYPE_DATA_SET]: {
+    id: DIMENSION_TYPE_DATA_SET,
     getName: () => _index.default.t('Data sets'),
     getGroupLabel: () => _index.default.t('Data set'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => _index.default.t('All data sets')
     },
     subGroup: SUB_GROUP_METRIC,
@@ -81,26 +95,26 @@ const dataTypes = {
     getGroupEmptyLabel: () => _index.default.t('No data sets found'),
     getGroupLoadingLabel: () => _index.default.t('Loading data sets')
   },
-  [EVENT_DATA_ITEMS]: {
-    id: EVENT_DATA_ITEMS,
+  [DIMENSION_TYPE_EVENT_DATA_ITEM]: {
+    id: DIMENSION_TYPE_EVENT_DATA_ITEM,
     getName: () => _index.default.t('Event data items'),
     getGroupLabel: getProgramText,
     getPlaceholder: getSelectProgramText,
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => _index.default.t('All programs')
     },
     getItemName: () => _index.default.t('Event data item'),
     getGroupEmptyLabel: () => _index.default.t('No programs found'),
     getGroupLoadingLabel: () => _index.default.t('Loading programs')
   },
-  [PROGRAM_INDICATORS]: {
-    id: PROGRAM_INDICATORS,
+  [DIMENSION_TYPE_PROGRAM_INDICATOR]: {
+    id: DIMENSION_TYPE_PROGRAM_INDICATOR,
     getName: () => _index.default.t('Program indicators'),
     getGroupLabel: getProgramText,
     getPlaceholder: getSelectProgramText,
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => _index.default.t('All programs')
     },
     getItemName: () => _index.default.t('Program indicator'),
@@ -108,15 +122,15 @@ const dataTypes = {
     getGroupLoadingLabel: () => _index.default.t('Loading programs')
   }
 };
-exports.dataTypes = dataTypes;
+exports.dataTypeMap = dataTypeMap;
 
 function defaultGroupId(dataType) {
-  return dataTypes[dataType].defaultGroup ? dataTypes[dataType].defaultGroup.id : '';
+  return dataTypeMap[dataType].defaultGroup ? dataTypeMap[dataType].defaultGroup.id : '';
 }
 
 function defaultGroupDetail(dataType) {
-  return dataTypes[dataType].groupDetail ? dataTypes[dataType].groupDetail.default : '';
+  return dataTypeMap[dataType].groupDetail ? dataTypeMap[dataType].groupDetail.default : '';
 }
 
-const DEFAULT_DATATYPE_ID = INDICATORS;
+const DEFAULT_DATATYPE_ID = DIMENSION_TYPE_INDICATOR;
 exports.DEFAULT_DATATYPE_ID = DEFAULT_DATATYPE_ID;

package/build/cjs/modules/pivotTable/PivotTableEngine.js

@@ -7,6 +7,8 @@ exports.PivotTableEngine = void 0;
 
 var _times = _interopRequireDefault(require("lodash/times"));
 
+var _dataTypes = require("../dataTypes.js");
+
 var _predefinedDimensions = require("../predefinedDimensions.js");
 
 var _renderValue = require("../renderValue.js");
@@ -39,7 +41,7 @@ const defaultVisualizationProps = {
   displayDensity: _pivotTableConstants.DISPLAY_DENSITY_OPTION_NORMAL
 };
 
-const isDxDimension = dimensionItem => [_pivotTableConstants.DIMENSION_TYPE_DATA, _pivotTableConstants.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET].includes(dimensionItem.dimensionType);
+const isDxDimension = dimensionItem => [_dataTypes.DIMENSION_TYPE_DATA, _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET].includes(dimensionItem.dimensionType);
 
 const countFromDisaggregates = list => {
   let count = 1;
@@ -266,8 +268,8 @@ class PivotTableEngine {
       column
     });
     const headers = [...this.getRawRowHeader(row), ...this.getRawColumnHeader(column)];
-    const peId = (_headers$find = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === _pivotTableConstants.DIMENSION_TYPE_PERIOD)) === null || _headers$find === void 0 ? void 0 : _headers$find.uid;
-    const ouId = (_headers$find2 = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === _pivotTableConstants.DIMENSION_TYPE_ORGUNIT)) === null || _headers$find2 === void 0 ? void 0 : _headers$find2.uid;
+    const peId = (_headers$find = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === _dataTypes.DIMENSION_TYPE_PERIOD)) === null || _headers$find === void 0 ? void 0 : _headers$find.uid;
+    const ouId = (_headers$find2 = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === _dataTypes.DIMENSION_TYPE_ORGANISATION_UNIT)) === null || _headers$find2 === void 0 ? void 0 : _headers$find2.uid;
 
     if (!this.data[row] || !this.data[row][column]) {
       return {

package/build/cjs/modules/pivotTable/pivotTableConstants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DIMENSION_TYPE_ORGUNIT = exports.DIMENSION_TYPE_PERIOD = exports.DIMENSION_TYPE_DATA = exports.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = exports.CLIPPED_AXIS_PARTITION_SIZE_PX = exports.WRAPPED_TEXT_LINE_HEIGHT = exports.WRAPPED_TEXT_JUSTIFY_BUFFER = exports.CLIPPED_CELL_MIN_SIZE = exports.CLIPPED_CELL_MAX_SIZE = exports.DISPLAY_DENSITY_PADDING_COMFORTABLE = exports.DISPLAY_DENSITY_OPTION_COMFORTABLE = exports.DISPLAY_DENSITY_PADDING_NORMAL = exports.DISPLAY_DENSITY_OPTION_NORMAL = exports.DISPLAY_DENSITY_PADDING_COMPACT = exports.DISPLAY_DENSITY_OPTION_COMPACT = exports.FONT_SIZE_LARGE = exports.FONT_SIZE_OPTION_LARGE = exports.FONT_SIZE_NORMAL = exports.FONT_SIZE_OPTION_NORMAL = exports.FONT_SIZE_SMALL = exports.FONT_SIZE_OPTION_SMALL = exports.BORDER_COLOR = exports.NUMBER_TYPE_COLUMN_PERCENTAGE = exports.NUMBER_TYPE_ROW_PERCENTAGE = exports.NUMBER_TYPE_VALUE = exports.AGGREGATE_TYPE_NA = exports.AGGREGATE_TYPE_AVERAGE = exports.AGGREGATE_TYPE_SUM = exports.CELL_TYPE_TOTAL = exports.CELL_TYPE_SUBTOTAL = exports.CELL_TYPE_VALUE = exports.SORT_ORDER_DESCENDING = exports.SORT_ORDER_ASCENDING = void 0;
+exports.CLIPPED_AXIS_PARTITION_SIZE_PX = exports.WRAPPED_TEXT_LINE_HEIGHT = exports.WRAPPED_TEXT_JUSTIFY_BUFFER = exports.CLIPPED_CELL_MIN_SIZE = exports.CLIPPED_CELL_MAX_SIZE = exports.DISPLAY_DENSITY_PADDING_COMFORTABLE = exports.DISPLAY_DENSITY_OPTION_COMFORTABLE = exports.DISPLAY_DENSITY_PADDING_NORMAL = exports.DISPLAY_DENSITY_OPTION_NORMAL = exports.DISPLAY_DENSITY_PADDING_COMPACT = exports.DISPLAY_DENSITY_OPTION_COMPACT = exports.FONT_SIZE_LARGE = exports.FONT_SIZE_OPTION_LARGE = exports.FONT_SIZE_NORMAL = exports.FONT_SIZE_OPTION_NORMAL = exports.FONT_SIZE_SMALL = exports.FONT_SIZE_OPTION_SMALL = exports.BORDER_COLOR = exports.NUMBER_TYPE_COLUMN_PERCENTAGE = exports.NUMBER_TYPE_ROW_PERCENTAGE = exports.NUMBER_TYPE_VALUE = exports.AGGREGATE_TYPE_NA = exports.AGGREGATE_TYPE_AVERAGE = exports.AGGREGATE_TYPE_SUM = exports.CELL_TYPE_TOTAL = exports.CELL_TYPE_SUBTOTAL = exports.CELL_TYPE_VALUE = exports.SORT_ORDER_DESCENDING = exports.SORT_ORDER_ASCENDING = void 0;
 const SORT_ORDER_ASCENDING = 1;
 exports.SORT_ORDER_ASCENDING = SORT_ORDER_ASCENDING;
 const SORT_ORDER_DESCENDING = -1;
@@ -61,12 +61,4 @@ exports.WRAPPED_TEXT_JUSTIFY_BUFFER = WRAPPED_TEXT_JUSTIFY_BUFFER;
 const WRAPPED_TEXT_LINE_HEIGHT = 1.0;
 exports.WRAPPED_TEXT_LINE_HEIGHT = WRAPPED_TEXT_LINE_HEIGHT;
 const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;
-exports.CLIPPED_AXIS_PARTITION_SIZE_PX = CLIPPED_AXIS_PARTITION_SIZE_PX;
-const DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = 'DATA_ELEMENT_GROUP_SET';
-exports.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET;
-const DIMENSION_TYPE_DATA = 'DATA_X';
-exports.DIMENSION_TYPE_DATA = DIMENSION_TYPE_DATA;
-const DIMENSION_TYPE_PERIOD = 'PERIOD';
-exports.DIMENSION_TYPE_PERIOD = DIMENSION_TYPE_PERIOD;
-const DIMENSION_TYPE_ORGUNIT = 'ORGANISATION_UNIT';
-exports.DIMENSION_TYPE_ORGUNIT = DIMENSION_TYPE_ORGUNIT;
+exports.CLIPPED_AXIS_PARTITION_SIZE_PX = CLIPPED_AXIS_PARTITION_SIZE_PX;

package/build/es/api/dimensions.js

@@ -1,5 +1,5 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
-import { ALL_ID, INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes.js';
+import { DIMENSION_TYPE_ALL, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes.js';
 import { onError } from './index.js'; // Query definitions
 
 export const dimensionsQuery = {
@@ -44,13 +44,13 @@ export const dataItemsQuery = {
   }) => {
     const filters = []; // TODO: Extract all of this logic out of the query?
 
-    if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === EVENT_DATA_ITEMS) {
-      filters.push("dimensionItemType:in:[".concat(PROGRAM_DATA_ELEMENT, ",").concat(PROGRAM_ATTRIBUTE, "]"));
-    } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== ALL_ID) {
+    if ((filter === null || filter === void 0 ? void 0 : filter.dataType) === DIMENSION_TYPE_EVENT_DATA_ITEM) {
+      filters.push("dimensionItemType:in:[".concat(DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, ",").concat(DIMENSION_TYPE_PROGRAM_ATTRIBUTE, "]"));
+    } else if (filter !== null && filter !== void 0 && filter.dataType && filter.dataType !== DIMENSION_TYPE_ALL) {
       filters.push("dimensionItemType:eq:".concat(filter.dataType));
     }
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID && [EVENT_DATA_ITEMS, PROGRAM_INDICATORS].includes(filter.dataType)) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL && [DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR].includes(filter.dataType)) {
       filters.push("programId:eq:".concat(filter.group));
     }
 
@@ -77,7 +77,7 @@ export const indicatorsQuery = {
   }) => {
     const filters = [];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
       filters.push("indicatorGroups.id:eq:".concat(filter.group));
     }
 
@@ -112,10 +112,10 @@ export const dataElementsQuery = {
     searchTerm,
     page
   }) => {
-    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === ALL_ID ? 'id' : 'dimensionItem~rename(id)';
+    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = ['domainType:eq:AGGREGATE'];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
       filters.push("dataElementGroups.id:eq:".concat(filter.group));
     }
 
@@ -175,10 +175,10 @@ export const dataElementOperandsQuery = {
     searchTerm,
     page
   }) => {
-    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === ALL_ID ? 'id' : 'dimensionItem~rename(id)';
+    const idField = (filter === null || filter === void 0 ? void 0 : filter.group) === DIMENSION_TYPE_ALL ? 'id' : 'dimensionItem~rename(id)';
     const filters = [];
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
       filters.push("dataElement.dataElementGroups.id:eq:".concat(filter.group));
     }
 
@@ -209,7 +209,7 @@ export const dataSetsQuery = {
       filters.push("".concat(nameProp, ":ilike:").concat(searchTerm));
     }
 
-    if (filter !== null && filter !== void 0 && filter.group && filter.group !== ALL_ID) {
+    if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL) {
       filters.push("id:eq:".concat(filter.group));
     }
 
@@ -270,7 +270,7 @@ export const apiFetchOptions = ({
   page
 }) => {
   switch (filter === null || filter === void 0 ? void 0 : filter.dataType) {
-    case INDICATORS:
+    case DIMENSION_TYPE_INDICATOR:
       {
         return fetchIndicators({
           dataEngine,
@@ -281,7 +281,7 @@ export const apiFetchOptions = ({
         });
       }
 
-    case DATA_ELEMENTS:
+    case DIMENSION_TYPE_DATA_ELEMENT:
       {
         if (filter.subGroup === TOTALS) {
           return fetchDataElements({
@@ -302,7 +302,7 @@ export const apiFetchOptions = ({
         }
       }
 
-    case DATA_SETS:
+    case DIMENSION_TYPE_DATA_SET:
       {
         return fetchDataSets({
           dataEngine,
@@ -325,10 +325,10 @@ export const apiFetchOptions = ({
 };
 export const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
   // indicatorGroups does not support shortName
-  const name = dataType === INDICATORS ? 'displayName' : nameProp;
+  const name = dataType === DIMENSION_TYPE_INDICATOR ? 'displayName' : nameProp;
 
   switch (dataType) {
-    case INDICATORS:
+    case DIMENSION_TYPE_INDICATOR:
       {
         const indicatorGroupsData = await dataEngine.query({
           indicatorGroups: indicatorGroupsQuery
@@ -341,7 +341,7 @@ export const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return indicatorGroupsData.indicatorGroups.indicatorGroups;
       }
 
-    case DATA_ELEMENTS:
+    case DIMENSION_TYPE_DATA_ELEMENT:
       {
         const dataElementGroupsData = await dataEngine.query({
           dataElementGroups: dataElementGroupsQuery
@@ -354,7 +354,7 @@ export const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return dataElementGroupsData.dataElementGroups.dataElementGroups;
       }
 
-    case DATA_SETS:
+    case DIMENSION_TYPE_DATA_SET:
       {
         const response = await dataEngine.query({
           data: dataSetsQuery
@@ -367,8 +367,8 @@ export const apiFetchGroups = async (dataEngine, dataType, nameProp) => {
         return response.data.dataSets;
       }
 
-    case EVENT_DATA_ITEMS:
-    case PROGRAM_INDICATORS:
+    case DIMENSION_TYPE_EVENT_DATA_ITEM:
+    case DIMENSION_TYPE_PROGRAM_INDICATOR:
       {
         const programsData = await dataEngine.query({
           programs: programsQuery

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

@@ -3,10 +3,10 @@ import { SingleSelectField, SingleSelectOption } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
-import { ALL_ID, dataTypes } from '../../modules/dataTypes.js';
-import styles from './styles/DataTypesSelector.style.js';
+import { DIMENSION_TYPE_ALL, dataTypeMap as dataTypes } from '../../modules/dataTypes.js';
+import styles from './styles/DataTypeSelector.style.js';
 
-const DataTypes = ({
+const DataTypeSelector = ({
   currentDataType,
   onChange,
   dataTest
@@ -18,12 +18,12 @@ const DataTypes = ({
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: i18n.t('Data Type'),
     dataTest: dataTest,
-    selected: ((_dataTypes$currentDat = dataTypes[currentDataType]) === null || _dataTypes$currentDat === void 0 ? void 0 : _dataTypes$currentDat.id) || ALL_ID,
+    selected: ((_dataTypes$currentDat = dataTypes[currentDataType]) === null || _dataTypes$currentDat === void 0 ? void 0 : _dataTypes$currentDat.id) || DIMENSION_TYPE_ALL,
     onChange: ref => onChange(ref.selected),
     dense: true
   }, /*#__PURE__*/React.createElement(SingleSelectOption, {
-    value: ALL_ID,
-    key: ALL_ID,
+    value: DIMENSION_TYPE_ALL,
+    key: DIMENSION_TYPE_ALL,
     label: i18n.t('All types'),
     dataTest: "".concat(dataTest, "-option-all")
   }), Object.values(dataTypes).map(type => /*#__PURE__*/React.createElement(SingleSelectOption, {
@@ -36,9 +36,9 @@ const DataTypes = ({
   }, styles));
 };
 
-DataTypes.propTypes = {
+DataTypeSelector.propTypes = {
   currentDataType: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
   dataTest: PropTypes.string
 };
-export default DataTypes;
+export default DataTypeSelector;

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

@@ -5,12 +5,12 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 import { apiFetchGroups } from '../../api/dimensions.js';
 import i18n from '../../locales/index.js';
-import { dataTypes, SUB_GROUP_DETAIL, SUB_GROUP_METRIC } from '../../modules/dataTypes.js';
+import { dataTypeMap as dataTypes, SUB_GROUP_DETAIL, SUB_GROUP_METRIC } from '../../modules/dataTypes.js';
 import { DetailSelector } from './DetailSelector.js';
 import { MetricSelector } from './MetricSelector.js';
 import styles from './styles/GroupSelector.style.js';
 
-const GroupsSelector = ({
+const GroupSelector = ({
   dataType,
   currentGroup,
   onGroupChange,
@@ -74,7 +74,7 @@ const GroupsSelector = ({
   }));
 };
 
-GroupsSelector.propTypes = {
+GroupSelector.propTypes = {
   dataType: PropTypes.string.isRequired,
   displayNameProp: PropTypes.string.isRequired,
   onGroupChange: PropTypes.func.isRequired,
@@ -83,4 +83,4 @@ GroupsSelector.propTypes = {
   currentSubGroup: PropTypes.string,
   dataTest: PropTypes.string
 };
-export default GroupsSelector;
+export default GroupSelector;

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

@@ -11,12 +11,12 @@ import DataElementIcon from '../../assets/DimensionItemIcons/DataElementIcon.js'
 import GenericIcon from '../../assets/DimensionItemIcons/GenericIcon.js';
 import i18n from '../../locales/index.js';
 import { DATA_SETS_CONSTANTS, REPORTING_RATE } from '../../modules/dataSets.js';
-import { ALL_ID, dataTypes, DATA_ELEMENTS, DATA_ELEMENT_OPERAND, DATA_SETS, EVENT_DATA_ITEMS, PROGRAM_INDICATORS, INDICATORS, TOTALS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE } from '../../modules/dataTypes.js';
+import { dataTypeMap as dataTypes, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_INDICATOR, TOTALS, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE } from '../../modules/dataTypes.js';
 import { TRANSFER_HEIGHT, TRANSFER_OPTIONS_WIDTH, TRANSFER_SELECTED_WIDTH } from '../../modules/dimensionSelectorHelper.js';
 import { useDebounce, useDidUpdateEffect } from '../../modules/utils.js';
 import styles from '../styles/DimensionSelector.style.js';
 import { TransferOption } from '../TransferOption.js';
-import DataTypeSelector from './DataTypesSelector.js';
+import DataTypeSelector from './DataTypeSelector.js';
 import GroupSelector from './GroupSelector.js';
 
 const LeftHeader = ({
@@ -110,23 +110,23 @@ const SourceEmptyPlaceholder = ({
       message = noItemsMessage;
     } else {
       switch (dataType) {
-        case INDICATORS:
+        case DIMENSION_TYPE_INDICATOR:
           message = i18n.t('No indicators found');
           break;
 
-        case DATA_ELEMENTS:
+        case DIMENSION_TYPE_DATA_ELEMENT:
           message = i18n.t('No data elements found');
           break;
 
-        case DATA_SETS:
+        case DIMENSION_TYPE_DATA_SET:
           message = i18n.t('No data sets found');
           break;
 
-        case EVENT_DATA_ITEMS:
+        case DIMENSION_TYPE_EVENT_DATA_ITEM:
           message = i18n.t('No event data items found');
           break;
 
-        case PROGRAM_INDICATORS:
+        case DIMENSION_TYPE_PROGRAM_INDICATOR:
           message = i18n.t('No program indicators found');
           break;
 
@@ -137,31 +137,31 @@ const SourceEmptyPlaceholder = ({
     }
   } else if (!loading && !options.length && searchTerm) {
     switch (dataType) {
-      case INDICATORS:
+      case DIMENSION_TYPE_INDICATOR:
         message = i18n.t('No indicators found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case DATA_ELEMENTS:
+      case DIMENSION_TYPE_DATA_ELEMENT:
         message = i18n.t('No data elements found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case DATA_SETS:
+      case DIMENSION_TYPE_DATA_SET:
         message = i18n.t('No data sets found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case EVENT_DATA_ITEMS:
+      case DIMENSION_TYPE_EVENT_DATA_ITEM:
         message = i18n.t('No event data items found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
         break;
 
-      case PROGRAM_INDICATORS:
+      case DIMENSION_TYPE_PROGRAM_INDICATOR:
         message = i18n.t('No program indicators found for "{{- searchTerm}}"', {
           searchTerm: searchTerm
         });
@@ -204,7 +204,7 @@ const ItemSelector = ({
   const [state, setState] = useState({
     searchTerm: '',
     filter: {
-      dataType: ALL_ID
+      dataType: DIMENSION_TYPE_ALL
     },
     options: [],
     loading: true,
@@ -238,7 +238,7 @@ const ItemSelector = ({
     const newOptions = [];
     (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.forEach(item => {
       if (item.dimensionItemType === REPORTING_RATE) {
-        if (state.filter.subGroup && state.filter.subGroup !== ALL_ID) {
+        if (state.filter.subGroup && state.filter.subGroup !== DIMENSION_TYPE_ALL) {
           const metric = DATA_SETS_CONSTANTS.find(item => item.id === state.filter.subGroup);
           newOptions.push({
             label: "".concat(item.name, " - ").concat(metric.getName()),
@@ -325,15 +325,15 @@ const ItemSelector = ({
     var _dataTypes$itemType;
 
     switch (itemType) {
-      case DATA_ELEMENT_OPERAND:
-        return dataTypes[DATA_ELEMENTS].getItemName();
+      case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
+        return dataTypes[DIMENSION_TYPE_DATA_ELEMENT].getItemName();
 
       case REPORTING_RATE:
-        return dataTypes[DATA_SETS].getItemName();
+        return dataTypes[DIMENSION_TYPE_DATA_SET].getItemName();
 
-      case PROGRAM_DATA_ELEMENT:
-      case PROGRAM_ATTRIBUTE:
-        return dataTypes[EVENT_DATA_ITEMS].getItemName();
+      case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
+      case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
+        return dataTypes[DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
 
       default:
         return (_dataTypes$itemType = dataTypes[itemType]) === null || _dataTypes$itemType === void 0 ? void 0 : _dataTypes$itemType.getItemName();
@@ -342,22 +342,22 @@ const ItemSelector = ({
 
   const getIcon = itemType => {
     switch (itemType) {
-      case INDICATORS:
+      case DIMENSION_TYPE_INDICATOR:
         return /*#__PURE__*/React.createElement(IconDimensionIndicator16, null);
 
-      case DATA_ELEMENT_OPERAND:
-      case DATA_ELEMENTS:
+      case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
+      case DIMENSION_TYPE_DATA_ELEMENT:
         return DataElementIcon;
 
       case REPORTING_RATE:
         return /*#__PURE__*/React.createElement(IconDimensionDataSet16, null);
 
-      case EVENT_DATA_ITEMS:
-      case PROGRAM_DATA_ELEMENT:
-      case PROGRAM_ATTRIBUTE:
+      case DIMENSION_TYPE_EVENT_DATA_ITEM:
+      case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
+      case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
         return /*#__PURE__*/React.createElement(IconDimensionEventDataItem16, null);
 
-      case PROGRAM_INDICATORS:
+      case DIMENSION_TYPE_PROGRAM_INDICATOR:
         return /*#__PURE__*/React.createElement(IconDimensionProgramIndicator16, null);
 
       default:
@@ -388,7 +388,7 @@ const ItemSelector = ({
         setFilter({ ...state.filter,
           dataType,
           group: null,
-          subGroup: dataType === DATA_ELEMENTS ? TOTALS : null
+          subGroup: dataType === DIMENSION_TYPE_DATA_ELEMENT ? TOTALS : null
         });
       },
       group: state.filter.group,
@@ -424,7 +424,7 @@ const ItemSelector = ({
       icon: getIcon(getItemType(props.value
       /* eslint-disable-line react/prop-types */
       )),
-      tooltipText: state.filter.dataType === ALL_ID ? getTooltipText(getItemType(props.value
+      tooltipText: state.filter.dataType === DIMENSION_TYPE_ALL ? getTooltipText(getItemType(props.value
       /* eslint-disable-line react/prop-types */
       )) : undefined,
       dataTest: "".concat(dataTest, "-transfer-option")

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

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
 import { DATA_SETS_CONSTANTS } from '../../modules/dataSets.js';
-import { ALL_ID } from '../../modules/dataTypes.js';
+import { DIMENSION_TYPE_ALL } from '../../modules/dataTypes.js';
 import styles from './styles/MetricSelector.style.js';
 export const MetricSelector = ({
   currentValue,
@@ -15,15 +15,15 @@ export const MetricSelector = ({
     className: "jsx-".concat(styles.__hash) + " " + "metric-container"
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     label: i18n.t('Metric type'),
-    selected: currentValue || ALL_ID,
+    selected: currentValue || DIMENSION_TYPE_ALL,
     onChange: ref => onChange(ref.selected),
     dense: true,
     dataTest: dataTest
   }, /*#__PURE__*/React.createElement(SingleSelectOption, {
-    value: ALL_ID,
-    key: ALL_ID,
+    value: DIMENSION_TYPE_ALL,
+    key: DIMENSION_TYPE_ALL,
     label: i18n.t('All metrics'),
-    dataTest: "".concat(dataTest, "-option-").concat(ALL_ID)
+    dataTest: "".concat(dataTest, "-option-").concat(DIMENSION_TYPE_ALL)
   }), DATA_SETS_CONSTANTS.map(option => /*#__PURE__*/React.createElement(SingleSelectOption, {
     value: option.id,
     key: option.id,

package/build/es/index.js

@@ -90,4 +90,5 @@ export { COLOR_SET_DEFAULT, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, CO
 export { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FINANCIAL, FYNOV, FYOCT, FYJUL, FYAPR } from './components/PeriodDimension/utils/index.js';
 export { getRelativePeriodsOptionsById } from './components/PeriodDimension/utils/relativePeriods.js';
 export { getFixedPeriodsOptionsById } from './components/PeriodDimension/utils/fixedPeriods.js';
-export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';
+export { default as VisualizationOptions } from './components/Options/VisualizationOptions.js';
+export { DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_CATEGORY, DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET, DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD, DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET } from './modules/dataTypes.js';