@dhis2/analytics 23.8.0 → 23.8.1

package/build/es/modules/dataTypes.js

@@ -1,13 +1,20 @@
 import i18n from '../locales/index.js';
-export const ALL_ID = 'ALL';
-export const INDICATORS = 'INDICATOR';
-export const DATA_ELEMENTS = 'DATA_ELEMENT';
-export const DATA_SETS = 'DATA_SET';
-export const EVENT_DATA_ITEMS = 'EVENT_DATA_ITEM';
-export const PROGRAM_INDICATORS = 'PROGRAM_INDICATOR';
-export const PROGRAM_DATA_ELEMENT = 'PROGRAM_DATA_ELEMENT';
-export const PROGRAM_ATTRIBUTE = 'PROGRAM_ATTRIBUTE';
-export const DATA_ELEMENT_OPERAND = 'DATA_ELEMENT_OPERAND';
+export const DIMENSION_TYPE_ALL = 'ALL';
+export const DIMENSION_TYPE_INDICATOR = 'INDICATOR';
+export const DIMENSION_TYPE_DATA_ELEMENT = 'DATA_ELEMENT';
+export const DIMENSION_TYPE_DATA_SET = 'DATA_SET';
+export const DIMENSION_TYPE_EVENT_DATA_ITEM = 'EVENT_DATA_ITEM';
+export const DIMENSION_TYPE_PROGRAM_INDICATOR = 'PROGRAM_INDICATOR';
+export const DIMENSION_TYPE_PROGRAM_DATA_ELEMENT = 'PROGRAM_DATA_ELEMENT';
+export const DIMENSION_TYPE_PROGRAM_ATTRIBUTE = 'PROGRAM_ATTRIBUTE';
+export const DIMENSION_TYPE_DATA_ELEMENT_OPERAND = 'DATA_ELEMENT_OPERAND';
+export const DIMENSION_TYPE_CATEGORY = 'CATEGORY';
+export const DIMENSION_TYPE_CATEGORY_OPTION_GROUP_SET = 'CATEGORY_OPTION_GROUP_SET';
+export const DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = 'DATA_ELEMENT_GROUP_SET';
+export const DIMENSION_TYPE_DATA = 'DATA_X';
+export const DIMENSION_TYPE_PERIOD = 'PERIOD';
+export const DIMENSION_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
+export const DIMENSION_TYPE_ORGANISATION_UNIT_GROUP_SET = 'ORGANISATION_UNIT_GROUP_SET';
 export const TOTALS = 'totals';
 export const DETAIL = 'detail';
 export const SUB_GROUP_DETAIL = 'DETAIL';
@@ -17,25 +24,25 @@ const getProgramText = () => i18n.t('Program');
 
 const getSelectProgramText = () => i18n.t('Select a program');
 
-export const dataTypes = {
-  [INDICATORS]: {
-    id: INDICATORS,
+export const dataTypeMap = {
+  [DIMENSION_TYPE_INDICATOR]: {
+    id: DIMENSION_TYPE_INDICATOR,
     getName: () => i18n.t('Indicators'),
     getGroupLabel: () => i18n.t('Indicator group'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => i18n.t('All groups')
     },
     getItemName: () => i18n.t('Indicator'),
     getGroupEmptyLabel: () => i18n.t('No indicator groups found'),
     getGroupLoadingLabel: () => i18n.t('Loading indicator groups')
   },
-  [DATA_ELEMENTS]: {
-    id: DATA_ELEMENTS,
+  [DIMENSION_TYPE_DATA_ELEMENT]: {
+    id: DIMENSION_TYPE_DATA_ELEMENT,
     getName: () => i18n.t('Data elements'),
     getGroupLabel: () => i18n.t('Data element group'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => i18n.t('All groups')
     },
     subGroup: SUB_GROUP_DETAIL,
@@ -43,12 +50,12 @@ export const dataTypes = {
     getGroupEmptyLabel: () => i18n.t('No data element groups found'),
     getGroupLoadingLabel: () => i18n.t('Loading data element groups')
   },
-  [DATA_SETS]: {
-    id: DATA_SETS,
+  [DIMENSION_TYPE_DATA_SET]: {
+    id: DIMENSION_TYPE_DATA_SET,
     getName: () => i18n.t('Data sets'),
     getGroupLabel: () => i18n.t('Data set'),
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => i18n.t('All data sets')
     },
     subGroup: SUB_GROUP_METRIC,
@@ -56,26 +63,26 @@ export const dataTypes = {
     getGroupEmptyLabel: () => i18n.t('No data sets found'),
     getGroupLoadingLabel: () => i18n.t('Loading data sets')
   },
-  [EVENT_DATA_ITEMS]: {
-    id: EVENT_DATA_ITEMS,
+  [DIMENSION_TYPE_EVENT_DATA_ITEM]: {
+    id: DIMENSION_TYPE_EVENT_DATA_ITEM,
     getName: () => i18n.t('Event data items'),
     getGroupLabel: getProgramText,
     getPlaceholder: getSelectProgramText,
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => i18n.t('All programs')
     },
     getItemName: () => i18n.t('Event data item'),
     getGroupEmptyLabel: () => i18n.t('No programs found'),
     getGroupLoadingLabel: () => i18n.t('Loading programs')
   },
-  [PROGRAM_INDICATORS]: {
-    id: PROGRAM_INDICATORS,
+  [DIMENSION_TYPE_PROGRAM_INDICATOR]: {
+    id: DIMENSION_TYPE_PROGRAM_INDICATOR,
     getName: () => i18n.t('Program indicators'),
     getGroupLabel: getProgramText,
     getPlaceholder: getSelectProgramText,
     defaultGroup: {
-      id: ALL_ID,
+      id: DIMENSION_TYPE_ALL,
       getName: () => i18n.t('All programs')
     },
     getItemName: () => i18n.t('Program indicator'),
@@ -84,9 +91,9 @@ export const dataTypes = {
   }
 };
 export function defaultGroupId(dataType) {
-  return dataTypes[dataType].defaultGroup ? dataTypes[dataType].defaultGroup.id : '';
+  return dataTypeMap[dataType].defaultGroup ? dataTypeMap[dataType].defaultGroup.id : '';
 }
 export function defaultGroupDetail(dataType) {
-  return dataTypes[dataType].groupDetail ? dataTypes[dataType].groupDetail.default : '';
+  return dataTypeMap[dataType].groupDetail ? dataTypeMap[dataType].groupDetail.default : '';
 }
-export const DEFAULT_DATATYPE_ID = INDICATORS;
+export const DEFAULT_DATATYPE_ID = DIMENSION_TYPE_INDICATOR;

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

@@ -1,12 +1,13 @@
 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; }
 
 import times from 'lodash/times';
+import { DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD } from '../dataTypes.js';
 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, 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';
+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, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
 const dataFields = ['value', 'numerator', 'denominator', 'factor', 'multiplier', 'divisor'];
 const defaultOptions = {
   hideEmptyColumns: false,
@@ -251,7 +252,7 @@ export class PivotTableEngine {
     });
     const headers = [...this.getRawRowHeader(row), ...this.getRawColumnHeader(column)];
     const peId = (_headers$find = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === 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) === DIMENSION_TYPE_ORGUNIT)) === null || _headers$find2 === void 0 ? void 0 : _headers$find2.uid;
+    const ouId = (_headers$find2 = headers.find(header => (header === null || header === void 0 ? void 0 : header.dimensionItemType) === 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/es/modules/pivotTable/pivotTableConstants.js

@@ -26,8 +26,4 @@ export const CLIPPED_CELL_MAX_SIZE = 360;
 export const CLIPPED_CELL_MIN_SIZE = 36;
 export const WRAPPED_TEXT_JUSTIFY_BUFFER = 25;
 export const WRAPPED_TEXT_LINE_HEIGHT = 1.0;
-export const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;
-export const DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET = 'DATA_ELEMENT_GROUP_SET';
-export const DIMENSION_TYPE_DATA = 'DATA_X';
-export const DIMENSION_TYPE_PERIOD = 'PERIOD';
-export const DIMENSION_TYPE_ORGUNIT = 'ORGANISATION_UNIT';
+export const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;

package/package.json

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