@dhis2/analytics 23.7.10 → 23.8.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

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/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,

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 () {
@@ -1260,6 +1380,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 +1436,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");
 

package/build/cjs/modules/dataTypes.js

@@ -5,14 +5,12 @@ 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.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;
 
 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';

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

@@ -9,14 +9,16 @@ var _times = _interopRequireDefault(require("lodash/times"));
 
 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; }
@@ -279,9 +281,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 +450,7 @@ class PivotTableEngine {
 
 
     return {
-      valueType: _pivotTableConstants.VALUE_TYPE_NUMBER,
+      valueType: _valueTypes.VALUE_TYPE_NUMBER,
       totalAggregationType: _pivotTableConstants.AGGREGATE_TYPE_SUM
     };
   }
@@ -607,7 +609,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 +1009,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.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;
 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';

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/AnalyticsResponse.js

@@ -1,3 +1,4 @@
+import { VALUE_TYPE_BOOLEAN, VALUE_TYPE_INTEGER, VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT } from '../../modules/valueTypes.js';
 import AnalyticsResponseHeader from './AnalyticsResponseHeader.js';
 const booleanMap = {
   0: 'No',
@@ -13,11 +14,11 @@ const DEFAULT_PREFIX_IGNORE_HEADERS = ['dy', ...DEFAULT_COLLECT_IGNORE_HEADERS];
 const getParseMiddleware = type => {
   switch (type) {
     case 'STRING':
-    case 'TEXT':
+    case VALUE_TYPE_TEXT:
       return value => "".concat(value);
 
-    case 'INTEGER':
-    case 'NUMBER':
+    case VALUE_TYPE_INTEGER:
+    case VALUE_TYPE_NUMBER:
       return value => !Number.isNaN(+value) && Number.isFinite(+value) ? parseFloat(+value) : value;
 
     default:
@@ -44,7 +45,7 @@ const isCollectHeader = (header, dimensions) => {
 const getPrefixedId = (id, prefix) => "".concat(prefix || '', " ").concat(id);
 
 const getNameByIdsByValueType = (id, valueType) => {
-  if (valueType === 'BOOLEAN') {
+  if (valueType === VALUE_TYPE_BOOLEAN) {
     return booleanMap[id];
   }
 

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

@@ -1,3 +1,4 @@
+import { VALUE_TYPE_TEXT } from '../../../modules/valueTypes.js';
 import AnalyticsResponseHeader from '../AnalyticsResponseHeader.js';
 let responseHeader;
 let expectedResponseHeader;
@@ -24,7 +25,7 @@ describe('AnalyticsResponseHeader', () => {
       const header = {
         name: 'cejWyOfXge6',
         column: 'Gender',
-        valueType: 'TEXT',
+        valueType: VALUE_TYPE_TEXT,
         type: 'java.lang.String',
         hidden: false,
         meta: true,

package/build/es/api/dimensions.js

@@ -1,6 +1,5 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
-import { ALL_ID // CHART_AGGREGATE_AGGREGATABLE_TYPES,
-, INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes.js';
+import { ALL_ID, INDICATORS, DATA_ELEMENTS, DATA_SETS, PROGRAM_INDICATORS, EVENT_DATA_ITEMS, PROGRAM_DATA_ELEMENT, PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes.js';
 import { onError } from './index.js'; // Query definitions
 
 export const dimensionsQuery = {

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

@@ -1,7 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { useRef } from 'react';
 import { applyLegendSet } from '../../modules/pivotTable/applyLegendSet.js';
-import { VALUE_TYPE_NUMBER, CELL_TYPE_VALUE } from '../../modules/pivotTable/pivotTableConstants.js';
+import { CELL_TYPE_VALUE } from '../../modules/pivotTable/pivotTableConstants.js';
+import { VALUE_TYPE_NUMBER } from '../../modules/valueTypes.js';
 import { PivotTableCell } from './PivotTableCell.js';
 import { PivotTableEmptyCell } from './PivotTableEmptyCell.js';
 import { usePivotTableEngine } from './PivotTableEngineContext.js';

package/build/es/index.js

@@ -45,7 +45,9 @@ export { layoutGetDimensionIdItemIdsObject } from './modules/layout/layoutGetDim
 export { layoutHasDataDimension } from './modules/layout/layoutHasDataDimension.js';
 export { layoutHasDimension } from './modules/layout/layoutHasDimension.js';
 export { layoutHasDynamicDimension } from './modules/layout/layoutHasDynamicDimension.js';
-export { layoutHasPeriodDimension } from './modules/layout/layoutHasPeriodDimension.js';
+export { layoutHasPeriodDimension } from './modules/layout/layoutHasPeriodDimension.js'; // Modules: valueTypes
+
+export { VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, VALUE_TYPE_TEXT, VALUE_TYPE_LONG_TEXT, VALUE_TYPE_LETTER, VALUE_TYPE_PHONE_NUMBER, VALUE_TYPE_EMAIL, VALUE_TYPE_USERNAME, VALUE_TYPE_URL, VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY, VALUE_TYPE_DATE, VALUE_TYPE_TIME, VALUE_TYPE_DATETIME, VALUE_TYPE_ORGANISATION_UNIT } from './modules/valueTypes.js';
 export { AXIS, AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS, DEFAULT_AXIS_IDS } from './modules/layout/axis.js';
 export { axisGetAllItems } from './modules/layout/axisGetAllItems.js';
 export { axisGetDimension } from './modules/layout/axisGetDimension.js';
@@ -79,9 +81,9 @@ export { createVisualization } from './visualizations/index.js'; // Modules: fon
 
 export { FONT_STYLE_VISUALIZATION_TITLE, FONT_STYLE_VISUALIZATION_SUBTITLE, FONT_STYLE_HORIZONTAL_AXIS_TITLE, FONT_STYLE_VERTICAL_AXIS_TITLE, FONT_STYLE_LEGEND, FONT_STYLE_AXIS_LABELS, FONT_STYLE_REGRESSION_LINE_LABEL, FONT_STYLE_OPTION_FONT, FONT_STYLE_OPTION_FONT_SIZE, FONT_STYLE_OPTION_BOLD, FONT_STYLE_OPTION_ITALIC, FONT_STYLE_OPTION_UNDERLINE, FONT_STYLE_OPTION_TEXT_COLOR, FONT_STYLE_OPTION_TEXT_ALIGN, TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, defaultFontStyle, getFontSizeOptions, getTextAlignOptions, deleteFontStyleOption } from './modules/fontStyle.js'; // Modules: legend
 
-export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_FILL, LEGEND_DISPLAY_STYLE_TEXT } from './modules/legends.js'; // Modules: pivotTable
+export { LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_FILL, LEGEND_DISPLAY_STYLE_TEXT } from './modules/legends.js'; // Modules: general
 
-export { renderValue as formatValue } from './modules/pivotTable/renderValue.js'; // Utils: colorSets
+export { renderValue as formatValue } from './modules/renderValue.js'; // Utils: colorSets
 
 export { COLOR_SET_DEFAULT, COLOR_SET_BRIGHT, COLOR_SET_DARK, COLOR_SET_GRAY, COLOR_SET_COLOR_BLIND, COLOR_SET_PATTERNS, colorSets } from './visualizations/util/colors/colorSets.js'; // Utils: periods
 

package/build/es/modules/dataTypes.js

@@ -1,5 +1,4 @@
 import i18n from '../locales/index.js';
-export const CHART_AGGREGATE_AGGREGATABLE_TYPES = ['BOOLEAN', 'TRUE_ONLY', 'INTEGER', 'INTEGER_POSITIVE', 'INTEGER_NEGATIVE', 'INTEGER_ZERO_OR_POSITIVE', 'NUMBER', 'UNIT_INTERVAL', 'PERCENTAGE'];
 export const ALL_ID = 'ALL';
 export const INDICATORS = 'INDICATOR';
 export const DATA_ELEMENTS = 'DATA_ELEMENT';

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

@@ -2,10 +2,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import times from 'lodash/times';
 import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
+import { renderValue } from '../renderValue.js';
+import { VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT } from '../valueTypes.js';
 import { AdaptiveClippingController } from './AdaptiveClippingController.js';
 import { parseValue } from './parseValue.js';
-import { AGGREGATE_TYPE_NA, AGGREGATE_TYPE_AVERAGE, AGGREGATE_TYPE_SUM, CELL_TYPE_VALUE, CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL, SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMPACT, DISPLAY_DENSITY_OPTION_NORMAL, DISPLAY_DENSITY_PADDING_NORMAL, FONT_SIZE_OPTION_SMALL, FONT_SIZE_SMALL, FONT_SIZE_OPTION_LARGE, FONT_SIZE_LARGE, FONT_SIZE_OPTION_NORMAL, FONT_SIZE_NORMAL, VALUE_TYPE_NUMBER, NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGUNIT, DIMENSION_TYPE_PERIOD, VALUE_TYPE_TEXT, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
-import { renderValue } from './renderValue.js';
+import { AGGREGATE_TYPE_NA, AGGREGATE_TYPE_AVERAGE, AGGREGATE_TYPE_SUM, CELL_TYPE_VALUE, CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL, SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMPACT, DISPLAY_DENSITY_OPTION_NORMAL, DISPLAY_DENSITY_PADDING_NORMAL, FONT_SIZE_OPTION_SMALL, FONT_SIZE_SMALL, FONT_SIZE_OPTION_LARGE, FONT_SIZE_LARGE, FONT_SIZE_OPTION_NORMAL, FONT_SIZE_NORMAL, NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE, DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGUNIT, DIMENSION_TYPE_PERIOD, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
 const dataFields = ['value', 'numerator', 'denominator', 'factor', 'multiplier', 'divisor'];
 const defaultOptions = {
   hideEmptyColumns: false,

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

@@ -6,8 +6,6 @@ export const CELL_TYPE_TOTAL = 'total';
 export const AGGREGATE_TYPE_SUM = 'SUM';
 export const AGGREGATE_TYPE_AVERAGE = 'AVERAGE';
 export const AGGREGATE_TYPE_NA = 'N/A';
-export const VALUE_TYPE_TEXT = 'TEXT';
-export const VALUE_TYPE_NUMBER = 'NUMBER';
 export const NUMBER_TYPE_VALUE = 'VALUE';
 export const NUMBER_TYPE_ROW_PERCENTAGE = 'ROW_PERCENTAGE';
 export const NUMBER_TYPE_COLUMN_PERCENTAGE = 'COLUMN_PERCENTAGE';

package/build/es/modules/{pivotTable/renderValue.js → renderValue.js}

@@ -1,4 +1,5 @@
-import { NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE, VALUE_TYPE_NUMBER } from './pivotTableConstants.js';
+import { NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE } from './pivotTable/pivotTableConstants.js';
+import { VALUE_TYPE_NUMBER } from './valueTypes.js';
 
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
 

package/build/es/modules/valueTypes.js

@@ -0,0 +1,23 @@
+/* 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
+*/
+export const VALUE_TYPE_NUMBER = 'NUMBER';
+export const VALUE_TYPE_UNIT_INTERVAL = 'UNIT_INTERVAL';
+export const VALUE_TYPE_PERCENTAGE = 'PERCENTAGE';
+export const VALUE_TYPE_INTEGER = 'INTEGER';
+export const VALUE_TYPE_INTEGER_POSITIVE = 'INTEGER_POSITIVE';
+export const VALUE_TYPE_INTEGER_NEGATIVE = 'INTEGER_NEGATIVE';
+export const VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = 'INTEGER_ZERO_OR_POSITIVE';
+export const VALUE_TYPE_TEXT = 'TEXT';
+export const VALUE_TYPE_LONG_TEXT = 'LONG_TEXT';
+export const VALUE_TYPE_LETTER = 'LETTER';
+export const VALUE_TYPE_PHONE_NUMBER = 'PHONE_NUMBER';
+export const VALUE_TYPE_EMAIL = 'EMAIL';
+export const VALUE_TYPE_USERNAME = 'USERNAME';
+export const VALUE_TYPE_URL = 'URL';
+export const VALUE_TYPE_BOOLEAN = 'BOOLEAN';
+export const VALUE_TYPE_TRUE_ONLY = 'TRUE_ONLY';
+export const VALUE_TYPE_DATE = 'DATE';
+export const VALUE_TYPE_TIME = 'TIME';
+export const VALUE_TYPE_DATETIME = 'DATETIME';
+export const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';

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

@@ -1,5 +1,5 @@
-import { VALUE_TYPE_TEXT } from '../../../../../modules/pivotTable/pivotTableConstants.js';
-import { renderValue } from '../../../../../modules/pivotTable/renderValue.js';
+import { renderValue } from '../../../../../modules/renderValue.js';
+import { VALUE_TYPE_TEXT } from '../../../../../modules/valueTypes.js';
 import { INDICATOR_FACTOR_100 } from '../index.js';
 export default function (value, layout, metaData) {
   const valueType = metaData.items[metaData.dimensions.dx[0]].valueType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "23.7.10",
+    "version": "23.8.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {