fix: handle value types and missing data to style by data item in event layers [DHIS2-19215]

src/components/dataItem/DataItemStyle.js

@@ -17,14 +17,14 @@ const DataItemStyle = ({ dataItem, style }) => {
 
     return (
         <div style={style}>
-            {numberValueTypes.includes(valueType) ? (
+            {!optionSet && numberValueTypes.includes(valueType) ? (
                 <NumericLegendStyle
                     dataItem={dataItem}
                     style={{ width: '100%' }}
                 />
             ) : null}
 
-            {booleanValueTypes.includes(valueType) ? (
+            {!optionSet && booleanValueTypes.includes(valueType) ? (
                 <BooleanStyle {...dataItem} />
             ) : null}
 

src/components/dataItem/StyleByDataItem.js

@@ -56,7 +56,7 @@ const StyleByDataItem = ({ program, programStage, error }) => {
         <div>
             <SelectField
                 label={i18n.t('Style by data item')}
-                value={styleDataItem ? styleDataItem.id : null}
+                value={styleDataItem ? styleDataItem.id : ITEM_NONE.id}
                 items={dataItems}
                 onChange={onChange}
                 dataTest="style-by-data-item-select"

src/components/map/layers/EventPopup.js

@@ -97,10 +97,18 @@ const EventPopup = ({
 
     const { type, coordinates: coord } = feature.geometry
     const { dataValues = [], occurredAt } = dataEvent?.events || {}
-    if (!dataValues.some((d) => d.dataElement === styleDataItem?.id)) {
+    const dataValueIndex = dataValues.findIndex(
+        (d) => d.dataElement === styleDataItem?.id
+    )
+    if (dataValueIndex !== -1) {
+        dataValues[dataValueIndex] = {
+            dataElement: styleDataItem?.id,
+            value: feature.properties.value,
+        }
+    } else {
         dataValues.push({
             dataElement: styleDataItem?.id,
-            value: feature.properties[styleDataItem?.id],
+            value: feature.properties.value,
         })
     }
 

src/constants/valueTypes.js

@@ -4,7 +4,6 @@
 
 // Number values types used for style by data item
 export const numberValueTypes = [
-    'AGE',
     'INTEGER',
     'INTEGER_NEGATIVE',
     'INTEGER_POSITIVE',