@dhis2/analytics 23.7.9 → 23.8.1

package/build/cjs/index.js

@@ -363,6 +363,126 @@ Object.defineProperty(exports, "layoutHasPeriodDimension", {
     return _layoutHasPeriodDimension.layoutHasPeriodDimension;
   }
 });
+Object.defineProperty(exports, "VALUE_TYPE_NUMBER", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_NUMBER;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_UNIT_INTERVAL", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_UNIT_INTERVAL;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_PERCENTAGE", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_PERCENTAGE;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_INTEGER", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_INTEGER;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_INTEGER_POSITIVE", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_INTEGER_POSITIVE;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_INTEGER_NEGATIVE", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_INTEGER_NEGATIVE;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_TEXT", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_TEXT;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_LONG_TEXT", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_LONG_TEXT;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_LETTER", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_LETTER;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_PHONE_NUMBER", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_PHONE_NUMBER;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_EMAIL", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_EMAIL;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_USERNAME", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_USERNAME;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_URL", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_URL;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_BOOLEAN", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_BOOLEAN;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_TRUE_ONLY", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_TRUE_ONLY;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_DATE", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_DATE;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_TIME", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_TIME;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_DATETIME", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_DATETIME;
+  }
+});
+Object.defineProperty(exports, "VALUE_TYPE_ORGANISATION_UNIT", {
+  enumerable: true,
+  get: function () {
+    return _valueTypes.VALUE_TYPE_ORGANISATION_UNIT;
+  }
+});
 Object.defineProperty(exports, "AXIS", {
   enumerable: true,
   get: function () {
@@ -1179,6 +1299,102 @@ Object.defineProperty(exports, "VisualizationOptions", {
     return _VisualizationOptions.default;
   }
 });
+Object.defineProperty(exports, "DIMENSION_TYPE_INDICATOR", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_INDICATOR;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_DATA_ELEMENT", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_DATA_ELEMENT;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_DATA_SET", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_DATA_SET;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_EVENT_DATA_ITEM", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_EVENT_DATA_ITEM;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_PROGRAM_INDICATOR", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_PROGRAM_DATA_ELEMENT", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_PROGRAM_DATA_ELEMENT;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_PROGRAM_ATTRIBUTE", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_PROGRAM_ATTRIBUTE;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_DATA_ELEMENT_OPERAND", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_OPERAND;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_CATEGORY", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_CATEGORY;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_ALL", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_ALL;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_DATA", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_DATA;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_ORGANISATION_UNIT", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_ORGANISATION_UNIT;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_PERIOD", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_PERIOD;
+  }
+});
+Object.defineProperty(exports, "DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET", {
+  enumerable: true,
+  get: function () {
+    return _dataTypes.DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET;
+  }
+});
 
 require("./locales/index.js");
 
@@ -1260,6 +1476,8 @@ var _layoutHasDynamicDimension = require("./modules/layout/layoutHasDynamicDimen
 
 var _layoutHasPeriodDimension = require("./modules/layout/layoutHasPeriodDimension.js");
 
+var _valueTypes = require("./modules/valueTypes.js");
+
 var _axis2 = require("./modules/layout/axis.js");
 
 var _axisGetAllItems = require("./modules/layout/axisGetAllItems.js");
@@ -1314,7 +1532,7 @@ var _fontStyle = require("./modules/fontStyle.js");
 
 var _legends = require("./modules/legends.js");
 
-var _renderValue = require("./modules/pivotTable/renderValue.js");
+var _renderValue = require("./modules/renderValue.js");
 
 var _colorSets = require("./visualizations/util/colors/colorSets.js");
 
@@ -1326,6 +1544,8 @@ var _fixedPeriods = require("./components/PeriodDimension/utils/fixedPeriods.js"
 
 var _VisualizationOptions = _interopRequireDefault(require("./components/Options/VisualizationOptions.js"));
 
+var _dataTypes = require("./modules/dataTypes.js");
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 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; }

package/build/cjs/modules/dataTypes.js

@@ -5,32 +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 = exports.CHART_AGGREGATE_AGGREGATABLE_TYPES = 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 CHART_AGGREGATE_AGGREGATABLE_TYPES = ['BOOLEAN', 'TRUE_ONLY', 'INTEGER', 'INTEGER_POSITIVE', 'INTEGER_NEGATIVE', 'INTEGER_ZERO_OR_POSITIVE', 'NUMBER', 'UNIT_INTERVAL', 'PERCENTAGE'];
-exports.CHART_AGGREGATE_AGGREGATABLE_TYPES = CHART_AGGREGATE_AGGREGATABLE_TYPES;
-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';
@@ -44,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,
@@ -70,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,
@@ -83,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'),
@@ -110,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,16 +7,20 @@ 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");
+
+var _valueTypes = require("../valueTypes.js");
+
 var _AdaptiveClippingController = require("./AdaptiveClippingController.js");
 
 var _parseValue = require("./parseValue.js");
 
 var _pivotTableConstants = require("./pivotTableConstants.js");
 
-var _renderValue = require("./renderValue.js");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -37,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;
@@ -264,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 {
@@ -279,9 +283,9 @@ class PivotTableEngine {
     const dataRow = this.data[row][column];
     let rawValue = cellType === _pivotTableConstants.CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
     let renderedValue = rawValue;
-    const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || _pivotTableConstants.VALUE_TYPE_TEXT;
+    const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || _valueTypes.VALUE_TYPE_TEXT;
 
-    if (valueType === _pivotTableConstants.VALUE_TYPE_NUMBER) {
+    if (valueType === _valueTypes.VALUE_TYPE_NUMBER) {
       rawValue = (0, _parseValue.parseValue)(rawValue);
 
       switch (this.visualization.numberType) {
@@ -448,7 +452,7 @@ class PivotTableEngine {
 
 
     return {
-      valueType: _pivotTableConstants.VALUE_TYPE_NUMBER,
+      valueType: _valueTypes.VALUE_TYPE_NUMBER,
       totalAggregationType: _pivotTableConstants.AGGREGATE_TYPE_SUM
     };
   }
@@ -607,7 +611,7 @@ class PivotTableEngine {
         totalCell.valueType = currentValueType;
       }
 
-      if ((dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) === _pivotTableConstants.VALUE_TYPE_NUMBER) {
+      if ((dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) === _valueTypes.VALUE_TYPE_NUMBER) {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
@@ -1007,7 +1011,7 @@ class PivotTableEngine {
         return 1 * order;
       }
 
-      if (valueA.valueType === _pivotTableConstants.VALUE_TYPE_NUMBER && valueB.valueType === _pivotTableConstants.VALUE_TYPE_NUMBER) {
+      if (valueA.valueType === _valueTypes.VALUE_TYPE_NUMBER && valueB.valueType === _valueTypes.VALUE_TYPE_NUMBER) {
         return (valueA.rawValue - valueB.rawValue) * order;
       }
 

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.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_TEXT = 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;
@@ -20,10 +20,6 @@ const AGGREGATE_TYPE_AVERAGE = 'AVERAGE';
 exports.AGGREGATE_TYPE_AVERAGE = AGGREGATE_TYPE_AVERAGE;
 const AGGREGATE_TYPE_NA = 'N/A';
 exports.AGGREGATE_TYPE_NA = AGGREGATE_TYPE_NA;
-const VALUE_TYPE_TEXT = 'TEXT';
-exports.VALUE_TYPE_TEXT = VALUE_TYPE_TEXT;
-const VALUE_TYPE_NUMBER = 'NUMBER';
-exports.VALUE_TYPE_NUMBER = VALUE_TYPE_NUMBER;
 const NUMBER_TYPE_VALUE = 'VALUE';
 exports.NUMBER_TYPE_VALUE = NUMBER_TYPE_VALUE;
 const NUMBER_TYPE_ROW_PERCENTAGE = 'ROW_PERCENTAGE';
@@ -65,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/cjs/modules/{pivotTable/renderValue.js → renderValue.js}

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.renderValue = void 0;
 
-var _pivotTableConstants = require("./pivotTableConstants.js");
+var _pivotTableConstants = require("./pivotTable/pivotTableConstants.js");
+
+var _valueTypes = require("./valueTypes.js");
 
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
 
@@ -63,7 +65,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
 };
 
 const renderValue = (value, valueType, visualization) => {
-  if (valueType !== _pivotTableConstants.VALUE_TYPE_NUMBER || value === undefined) {
+  if (valueType !== _valueTypes.VALUE_TYPE_NUMBER || value === undefined) {
     return String(value).replace(/[^\S\n]+/, ' ');
   }
 

package/build/cjs/modules/valueTypes.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_NUMBER = void 0;
+
+/* These types match the types in the backend
+  https://github.com/dhis2/dhis2-core/blob/master/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
+*/
+const VALUE_TYPE_NUMBER = 'NUMBER';
+exports.VALUE_TYPE_NUMBER = VALUE_TYPE_NUMBER;
+const VALUE_TYPE_UNIT_INTERVAL = 'UNIT_INTERVAL';
+exports.VALUE_TYPE_UNIT_INTERVAL = VALUE_TYPE_UNIT_INTERVAL;
+const VALUE_TYPE_PERCENTAGE = 'PERCENTAGE';
+exports.VALUE_TYPE_PERCENTAGE = VALUE_TYPE_PERCENTAGE;
+const VALUE_TYPE_INTEGER = 'INTEGER';
+exports.VALUE_TYPE_INTEGER = VALUE_TYPE_INTEGER;
+const VALUE_TYPE_INTEGER_POSITIVE = 'INTEGER_POSITIVE';
+exports.VALUE_TYPE_INTEGER_POSITIVE = VALUE_TYPE_INTEGER_POSITIVE;
+const VALUE_TYPE_INTEGER_NEGATIVE = 'INTEGER_NEGATIVE';
+exports.VALUE_TYPE_INTEGER_NEGATIVE = VALUE_TYPE_INTEGER_NEGATIVE;
+const VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = 'INTEGER_ZERO_OR_POSITIVE';
+exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE;
+const VALUE_TYPE_TEXT = 'TEXT';
+exports.VALUE_TYPE_TEXT = VALUE_TYPE_TEXT;
+const VALUE_TYPE_LONG_TEXT = 'LONG_TEXT';
+exports.VALUE_TYPE_LONG_TEXT = VALUE_TYPE_LONG_TEXT;
+const VALUE_TYPE_LETTER = 'LETTER';
+exports.VALUE_TYPE_LETTER = VALUE_TYPE_LETTER;
+const VALUE_TYPE_PHONE_NUMBER = 'PHONE_NUMBER';
+exports.VALUE_TYPE_PHONE_NUMBER = VALUE_TYPE_PHONE_NUMBER;
+const VALUE_TYPE_EMAIL = 'EMAIL';
+exports.VALUE_TYPE_EMAIL = VALUE_TYPE_EMAIL;
+const VALUE_TYPE_USERNAME = 'USERNAME';
+exports.VALUE_TYPE_USERNAME = VALUE_TYPE_USERNAME;
+const VALUE_TYPE_URL = 'URL';
+exports.VALUE_TYPE_URL = VALUE_TYPE_URL;
+const VALUE_TYPE_BOOLEAN = 'BOOLEAN';
+exports.VALUE_TYPE_BOOLEAN = VALUE_TYPE_BOOLEAN;
+const VALUE_TYPE_TRUE_ONLY = 'TRUE_ONLY';
+exports.VALUE_TYPE_TRUE_ONLY = VALUE_TYPE_TRUE_ONLY;
+const VALUE_TYPE_DATE = 'DATE';
+exports.VALUE_TYPE_DATE = VALUE_TYPE_DATE;
+const VALUE_TYPE_TIME = 'TIME';
+exports.VALUE_TYPE_TIME = VALUE_TYPE_TIME;
+const VALUE_TYPE_DATETIME = 'DATETIME';
+exports.VALUE_TYPE_DATETIME = VALUE_TYPE_DATETIME;
+const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
+exports.VALUE_TYPE_ORGANISATION_UNIT = VALUE_TYPE_ORGANISATION_UNIT;

package/build/cjs/visualizations/config/adapters/dhis_dhis/value/index.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 
-var _pivotTableConstants = require("../../../../../modules/pivotTable/pivotTableConstants.js");
+var _renderValue = require("../../../../../modules/renderValue.js");
 
-var _renderValue = require("../../../../../modules/pivotTable/renderValue.js");
+var _valueTypes = require("../../../../../modules/valueTypes.js");
 
 var _index = require("../index.js");
 
 function _default(value, layout, metaData) {
   const valueType = metaData.items[metaData.dimensions.dx[0]].valueType;
   const indicatorType = metaData.items[metaData.dimensions.dx[0]].indicatorType;
-  let formattedValue = (0, _renderValue.renderValue)(value, valueType || _pivotTableConstants.VALUE_TYPE_TEXT, {
+  let formattedValue = (0, _renderValue.renderValue)(value, valueType || _valueTypes.VALUE_TYPE_TEXT, {
     digitGroupSeparator: layout.digitGroupSeparator,
     skipRounding: layout.skipRounding
   }); // only show the percentage symbol for per cent

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

@@ -79,7 +79,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
 
         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;
 
@@ -87,7 +87,15 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
           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;