@dhis2/analytics 24.10.12 → 24.10.13

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [24.10.13](https://github.com/dhis2/analytics/compare/v24.10.12...v24.10.13) (2024-06-27)
+
+
+### Bug Fixes
+
+* apply legend to all numeric and boolean types (DHIS2-17611) [24.x] ([#1687](https://github.com/dhis2/analytics/issues/1687)) ([9e3f166](https://github.com/dhis2/analytics/commit/9e3f1668aaef693393e5a7a46dc839f9aad5bce5))
+
 ## [24.10.12](https://github.com/dhis2/analytics/compare/v24.10.11...v24.10.12) (2024-06-25)
 
 

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

@@ -56,10 +56,9 @@ const PivotTableValueCell = _ref => {
       ref: cellRef,
       classes: [cellContent.cellType, isClickable && 'clickable']
     });
-  } // TODO: Add support for 'INTEGER' type (requires server changes)
+  }
 
-
-  const legendStyle = cellContent.cellType === _pivotTableConstants.CELL_TYPE_VALUE && cellContent.valueType === _valueTypes.VALUE_TYPE_NUMBER ? (0, _applyLegendSet.applyLegendSet)(cellContent.rawValue, cellContent.dxDimension, engine) : undefined;
+  const legendStyle = cellContent.cellType === _pivotTableConstants.CELL_TYPE_VALUE && ((0, _valueTypes.isNumericValueType)(cellContent.valueType) || (0, _valueTypes.isBooleanValueType)(cellContent.valueType)) ? (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/modules/renderValue.js

@@ -63,7 +63,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
 };
 
 const renderValue = (value, valueType, visualization) => {
-  if (!(0, _valueTypes.isNumericValueType)(valueType) || value === undefined) {
+  if (!((0, _valueTypes.isNumericValueType)(valueType) || (0, _valueTypes.isBooleanValueType)(valueType)) || value === undefined) {
     return String(value).replace(/[^\S\n]+/, ' ');
   }
 

package/build/cjs/modules/valueTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNumericValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
+exports.isNumericValueType = exports.isBooleanValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = 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
@@ -51,7 +51,12 @@ exports.VALUE_TYPE_ORGANISATION_UNIT = VALUE_TYPE_ORGANISATION_UNIT;
 const VALUE_TYPE_AGE = 'AGE';
 exports.VALUE_TYPE_AGE = VALUE_TYPE_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];
+const BOOLEAN_VALUE_TYPES = [VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY];
 
 const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
 
-exports.isNumericValueType = isNumericValueType;
+exports.isNumericValueType = isNumericValueType;
+
+const isBooleanValueType = type => BOOLEAN_VALUE_TYPES.includes(type);
+
+exports.isBooleanValueType = isBooleanValueType;

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.12",
+    "version": "24.10.13",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {