fix: apply legend to all numeric and boolean types (DHIS2-17611) (#1683)

* fix: apply to all numeric and boolean types * chore: remove obsolete comment, remove test file * chore: add back i18n, weird issue
dhis2 · Jun 26, 2024 · e93b106 · e93b106
1 parent e1ef741
commit e93b106
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n"
-"PO-Revision-Date: 2024-01-25T12:05:03.360Z\n"
+"POT-Creation-Date: 2024-06-26T14:09:30.876Z\n"
+"PO-Revision-Date: 2024-06-26T14:09:30.876Z\n"
 
 msgid "view only"
 msgstr "view only"

diff --git a/src/components/PivotTable/PivotTableValueCell.js b/src/components/PivotTable/PivotTableValueCell.js
@@ -2,7 +2,10 @@ 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'
@@ -43,10 +46,10 @@ export const PivotTableValueCell = ({
         )
     }
 
-    // TODO: Add support for 'INTEGER' type (requires server changes)
     const legendStyle =
         cellContent.cellType === CELL_TYPE_VALUE &&
-        cellContent.valueType === VALUE_TYPE_NUMBER
+        (isNumericValueType(cellContent.valueType) ||
+            isBooleanValueType(cellContent.valueType))
             ? applyLegendSet(
                   cellContent.rawValue,
                   cellContent.dxDimension,

diff --git a/src/modules/renderValue.js b/src/modules/renderValue.js
@@ -2,7 +2,7 @@ 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,10 @@ 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]+/, ' ')
     }
 

diff --git a/src/modules/valueTypes.js b/src/modules/valueTypes.js
@@ -34,4 +34,7 @@ const NUMERIC_VALUE_TYPES = [
     VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE,
 ]
 
+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)