@dhis2/analytics 24.10.11 → 24.10.13

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

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { useRef } from 'react';
 import { applyLegendSet } from '../../modules/pivotTable/applyLegendSet.js';
 import { CELL_TYPE_VALUE } from '../../modules/pivotTable/pivotTableConstants.js';
-import { VALUE_TYPE_NUMBER } from '../../modules/valueTypes.js';
+import { isNumericValueType, isBooleanValueType } from '../../modules/valueTypes.js';
 import { PivotTableCell } from './PivotTableCell.js';
 import { PivotTableEmptyCell } from './PivotTableEmptyCell.js';
 import { usePivotTableEngine } from './PivotTableEngineContext.js';
@@ -35,10 +35,9 @@ export const PivotTableValueCell = _ref => {
       ref: cellRef,
       classes: [cellContent.cellType, isClickable && 'clickable']
     });
-  } // TODO: Add support for 'INTEGER' type (requires server changes)
+  }
 
-
-  const legendStyle = cellContent.cellType === CELL_TYPE_VALUE && cellContent.valueType === VALUE_TYPE_NUMBER ? applyLegendSet(cellContent.rawValue, cellContent.dxDimension, engine) : undefined;
+  const legendStyle = cellContent.cellType === CELL_TYPE_VALUE && (isNumericValueType(cellContent.valueType) || isBooleanValueType(cellContent.valueType)) ? 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/es/modules/renderValue.js

@@ -1,5 +1,5 @@
 import { NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE } from './pivotTable/pivotTableConstants.js';
-import { isNumericValueType } from './valueTypes.js';
+import { isNumericValueType, isBooleanValueType } from './valueTypes.js';
 
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
 
@@ -53,7 +53,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
 };
 
 export const renderValue = (value, valueType, visualization) => {
-  if (!isNumericValueType(valueType) || value === undefined) {
+  if (!(isNumericValueType(valueType) || isBooleanValueType(valueType)) || value === undefined) {
     return String(value).replace(/[^\S\n]+/, ' ');
   }
 

package/build/es/modules/valueTypes.js

@@ -23,4 +23,6 @@ export const VALUE_TYPE_DATETIME = 'DATETIME';
 export const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
 export const VALUE_TYPE_AGE = 'AGE';
 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];
-export const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
+const BOOLEAN_VALUE_TYPES = [VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY];
+export const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
+export const isBooleanValueType = type => BOOLEAN_VALUE_TYPES.includes(type);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "24.10.11",
+    "version": "24.10.13",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -59,7 +59,7 @@
     },
     "dependencies": {
         "@dhis2/d2-ui-rich-text": "^7.4.0",
-        "@dhis2/multi-calendar-dates": "1.0.0",
+        "@dhis2/multi-calendar-dates": "^1.2.2",
         "classnames": "^2.3.1",
         "d2-utilizr": "^0.2.16",
         "d3-color": "^1.2.3",