@dhis2/analytics 23.8.0 → 23.8.3

package/build/cjs/modules/__tests__/renderValue.spec.js

@@ -0,0 +1,289 @@
+"use strict";
+
+var _pivotTableConstants = require("../pivotTable/pivotTableConstants.js");
+
+var _renderValue = require("../renderValue.js");
+
+var _valueTypes = require("../valueTypes.js");
+
+const DGS_COMMA = 'COMMA';
+const DGS_SPACE = 'SPACE';
+const DGS_NONE = 'NONE';
+const tests = [// Numbers
+{
+  value: 1000.5,
+  expected: '1 000.5',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 33777889.55,
+  expected: '33,777,889.5',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_COMMA
+}, {
+  value: 33777889.556,
+  expected: '33 777 889.6',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 33777889.556,
+  expected: '33 777 889.5560000017',
+  // float issue?
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 33777889.56,
+  expected: '33777889.6',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_NONE
+}, {
+  value: 0.0005,
+  expected: '0',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 0.109,
+  expected: '0.11',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 1.101,
+  expected: '1.1',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 1.101,
+  expected: '1.1010000000',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 0.0005,
+  expected: '0.0005000000',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  round: false,
+  dgs: DGS_SPACE
+}, // Numbers showing as column/row percentage
+{
+  value: 0.234,
+  expected: '23.4%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 0.234,
+  expected: '23.4%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 0.000234,
+  expected: '0.02%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 0.0000432,
+  expected: '0%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 0.000234,
+  expected: '0.0234%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: -0.0234,
+  expected: '-2.3%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: -0.0234,
+  expected: '-2.34%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 0.450048675309,
+  expected: '45.0048675309%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 77.893,
+  expected: '7 789.3%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 77.893,
+  expected: '7,789.3%',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_COMMA
+}, // Integers
+{
+  value: 99777888,
+  expected: '99 777 888',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: -99777888,
+  expected: '-99 777 888',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: -9977888,
+  expected: '-9977888',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER,
+  round: true,
+  dgs: DGS_NONE
+}, {
+  value: 345,
+  expected: '345',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_POSITIVE,
+  round: true,
+  dgs: DGS_COMMA
+}, {
+  value: 334445577,
+  expected: '334,445,577',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_POSITIVE,
+  round: false,
+  dgs: DGS_COMMA
+}, {
+  value: -44555777,
+  expected: '-44 555 777',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_NEGATIVE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: -4445577,
+  expected: '-4,445,577',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_NEGATIVE,
+  round: false,
+  dgs: DGS_COMMA
+}, {
+  value: -445577,
+  expected: '-445577',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_NEGATIVE,
+  round: true,
+  dgs: DGS_NONE
+}, {
+  value: -4445577,
+  expected: '-4,445,577',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE,
+  round: false,
+  dgs: DGS_COMMA
+}, {
+  value: 57,
+  expected: '5 700%',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 557,
+  expected: '55700%',
+  valueType: _valueTypes.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_NONE
+}, // Percentage
+{
+  value: 5,
+  expected: '5',
+  valueType: _valueTypes.VALUE_TYPE_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, {
+  value: 53,
+  expected: '53',
+  valueType: _valueTypes.VALUE_TYPE_PERCENTAGE,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 53,
+  expected: '5 300%',
+  valueType: _valueTypes.VALUE_TYPE_PERCENTAGE,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_SPACE
+}, // Unit interval
+{
+  value: 4,
+  expected: '4',
+  valueType: _valueTypes.VALUE_TYPE_UNIT_INTERVAL,
+  round: true,
+  dgs: DGS_COMMA
+}, {
+  value: 4600,
+  expected: '4 600',
+  valueType: _valueTypes.VALUE_TYPE_UNIT_INTERVAL,
+  round: false,
+  dgs: DGS_SPACE
+}, {
+  value: 46,
+  expected: '4,600%',
+  valueType: _valueTypes.VALUE_TYPE_UNIT_INTERVAL,
+  numberType: _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE,
+  round: true,
+  dgs: DGS_COMMA
+}, // Texts
+{
+  value: 'This    string has multiple whitespace     characters',
+  expected: 'This string has multiple whitespace     characters',
+  valueType: _valueTypes.VALUE_TYPE_TEXT
+}, {
+  value: 'Characters          \n',
+  expected: 'Characters \n',
+  valueType: _valueTypes.VALUE_TYPE_TEXT
+}, {
+  value: 'Characters          \nmorecharacters   here',
+  expected: 'Characters \nmorecharacters   here',
+  valueType: _valueTypes.VALUE_TYPE_TEXT
+}, // Undefined values
+{
+  value: undefined,
+  expected: 'undefined',
+  valueType: _valueTypes.VALUE_TYPE_NUMBER
+}, {
+  value: undefined,
+  expected: 'undefined',
+  valueType: _valueTypes.VALUE_TYPE_TEXT
+}];
+describe('renderValue', () => {
+  tests.forEach(t => {
+    const testname = "valueType: ".concat(t.valueType, ", value: ").concat(t.value, ", dgs: ").concat(t.dgs, ", round: ").concat(t.round, ", isPercent: ").concat([_pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE, _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE].includes(t.numberType));
+    it(testname, () => {
+      const actual = (0, _renderValue.renderValue)(t.value, t.valueType, {
+        skipRounding: !t.round,
+        digitGroupSeparator: t.dgs,
+        numberType: t.numberType
+      });
+      expect(actual).toEqual(t.expected);
+    });
+  });
+});

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/cjs/modules/renderValue.js

@@ -11,7 +11,7 @@ var _valueTypes = require("./valueTypes.js");
 
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
 
-const defaultDecimalSeparator = '.';
+const decimalSeparator = '.';
 
 const separateDigitGroups = (stringValue, decimalSeparator) => {
   const isNegative = stringValue[0] === '-';
@@ -65,17 +65,17 @@ const toFixedPrecisionString = (value, skipRounding) => {
 };
 
 const renderValue = (value, valueType, visualization) => {
-  if (valueType !== _valueTypes.VALUE_TYPE_NUMBER || value === undefined) {
+  if (!(0, _valueTypes.isNumericValueType)(valueType) || value === undefined) {
     return String(value).replace(/[^\S\n]+/, ' ');
   }
 
   if (visualization.numberType === _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE || visualization.numberType === _pivotTableConstants.NUMBER_TYPE_COLUMN_PERCENTAGE) {
-    return trimTrailingZeros(toFixedPrecisionString(value * 100, visualization.skipRounding)) + '%';
+    const stringValue = trimTrailingZeros(toFixedPrecisionString(value * 100, visualization.skipRounding));
+    return separateDigitGroups(stringValue, decimalSeparator).join(getSeparator(visualization)) + '%';
+  } else {
+    const stringValue = toFixedPrecisionString(value, visualization.skipRounding);
+    return separateDigitGroups(stringValue, decimalSeparator).join(getSeparator(visualization));
   }
-
-  const stringValue = toFixedPrecisionString(value, visualization.skipRounding);
-  const digitGroups = separateDigitGroups(stringValue, defaultDecimalSeparator);
-  return digitGroups.join(getSeparator(visualization));
 };
 
 exports.renderValue = renderValue;

package/build/cjs/modules/valueTypes.js

@@ -3,7 +3,7 @@
 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;
+exports.isNumericValueType = 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
@@ -47,4 +47,9 @@ 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;
+exports.VALUE_TYPE_ORGANISATION_UNIT = VALUE_TYPE_ORGANISATION_UNIT;
+const NUMERIC_VALUE_TYPES = [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];
+
+const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
+
+exports.isNumericValueType = isNumericValueType;