Merge branch 'master' into feat/datatable-pr1-toolbar

Author: BRaimbault

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [101.14.0](https://github.com/dhis2/maps-app/compare/v101.13.5...v101.14.0) (2026-07-02)
+
+
+### Features
+
+* add custom scale toggle for heat stress layers [DHIS2-20564] ([#3708](https://github.com/dhis2/maps-app/issues/3708)) ([ad788ac](https://github.com/dhis2/maps-app/commit/ad788acfa1dee904b83b7e7f1811d873b4faa00c))
+
+## [101.13.5](https://github.com/dhis2/maps-app/compare/v101.13.4...v101.13.5) (2026-06-30)
+
+
+### Bug Fixes
+
+* stop flooding logs with warnings when opening the Data dimension panel [DHIS2-20499] ([#3709](https://github.com/dhis2/maps-app/issues/3709)) ([95fbdda](https://github.com/dhis2/maps-app/commit/95fbdda4206916c5785749f94f3ecdb6213100e4))
+
 ## [101.13.4](https://github.com/dhis2/maps-app/compare/v101.13.3...v101.13.4) (2026-06-29)
 
 

cypress/integration/dataTable.cy.js

@@ -316,7 +316,7 @@ describe('data table', () => {
 
         // Sort by index and scroll to the top
         cy.get('button[title="Sort by Index"]').click()
-        cy.get('[data-test-id="virtuoso-scroller"]').scrollTo('top')
+        cy.get('[data-testid="virtuoso-scroller"]').scrollTo('top')
 
         checkTableCell({ row: 0, column: 0, expectedContent: '28' })
 

i18n/en.pot

@@ -407,6 +407,9 @@ msgstr "Max value is required"
 msgid "Valid classes are {{minSteps}} to {{maxSteps}}"
 msgstr "Valid classes are {{minSteps}} to {{maxSteps}}"
 
+msgid "Use custom legend"
+msgstr "Use custom legend"
+
 msgid "Facility buffer"
 msgstr "Facility buffer"
 
@@ -1911,3 +1914,11 @@ msgstr "End date is invalid"
 
 msgid "End date cannot be earlier than start date"
 msgstr "End date cannot be earlier than start date"
+
+msgctxt "Application title"
+msgid "__MANIFEST_APP_TITLE"
+msgstr "Maps"
+
+msgctxt "Application description"
+msgid "__MANIFEST_APP_DESCRIPTION"
+msgstr "DHIS2 Maps"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "maps-app",
-    "version": "101.13.4",
+    "version": "101.14.0",
     "description": "DHIS2 Maps",
     "license": "BSD-3-Clause",
     "author": "Bjørn Sandvik",
@@ -44,8 +44,8 @@
         "start-server-and-test": "^2.1.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^29.5.4",
-        "@dhis2/app-runtime": "^3.14.4",
+        "@dhis2/analytics": "^29.5.5",
+        "@dhis2/app-runtime": "^3.17.3",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",
         "@dhis2/maps-gl": "^4.2.8",
         "@dhis2/ui": "^10.16.3",
@@ -71,11 +71,11 @@
         "react-redux": "^9.3.0",
         "react-sortable-hoc": "^2.0.0",
         "react-virtualized": "^9.22.6",
-        "react-virtuoso": "^4.6.2",
+        "react-virtuoso": "^4.18.10",
         "redux": "^4.2.1",
         "redux-logger": "^3.0.6",
         "redux-thunk": "^2.4.2",
-        "simple-statistics": "^7.9.1",
+        "simple-statistics": "^7.9.3",
         "styled-jsx": "^4.0.1",
         "url-polyfill": "^1.1.14"
     },

src/components/core/styles/Checkbox.module.css

@@ -1,5 +1,5 @@
 .checkbox {
-    margin: var(--spacers-dp12) 0 var(--spacers-dp8);
+    margin: var(--spacers-dp16) 0 var(--spacers-dp8);
     display: flex;
     align-items: center;
 }

src/components/edit/earthEngine/EarthEngineDialog.jsx

@@ -69,6 +69,9 @@ const EarthEngineDialog = (props) => {
         () => getLayerSourceGrouping(layerId, managedLayerSources),
         [layerId, managedLayerSources]
     )
+    const layerConfig = useMemo(() => getEarthEngineLayer(layerId), [layerId])
+    const defaultStyle = layerConfig?.style
+    const customColorScaleName = layerConfig?.customColorScaleName
 
     const hasAggregations = !!(aggregations || defaultAggregations)
     const hasMultipleAggregations = !aggregations || aggregations.length > 1
@@ -354,6 +357,8 @@ const EarthEngineDialog = (props) => {
                     <StyleTab
                         unit={unit}
                         style={style}
+                        defaultStyle={defaultStyle}
+                        customColorScaleName={customColorScaleName}
                         showBelowMin={!maskOperator}
                         hasOrgUnitField={hasOrgUnitField}
                     />

src/components/edit/earthEngine/StyleSelect.jsx

@@ -30,7 +30,7 @@ export const getStyleSelectError = ({ min, max, steps, palette, ranges }) => {
     return undefined
 }
 
-const StyleSelect = ({ unit, style, setStyle }) => {
+const StyleSelect = ({ style, setStyle }) => {
     const { min, max, palette } = style
     const [steps, setSteps] = useState(palette.length)
 
@@ -58,9 +58,6 @@ const StyleSelect = ({ unit, style, setStyle }) => {
 
     return (
         <div>
-            <p>
-                {i18n.t('Unit')}: {unit}
-            </p>
             <div key="minmax" className={styles.flexInnerColumnFlow}>
                 <NumberField
                     label={i18n.t('Min')}
@@ -97,7 +94,6 @@ const StyleSelect = ({ unit, style, setStyle }) => {
 
 StyleSelect.propTypes = {
     setStyle: PropTypes.func.isRequired,
-    unit: PropTypes.string.isRequired,
     style: PropTypes.shape({
         max: PropTypes.number.isRequired,
         min: PropTypes.number.isRequired,

src/components/edit/earthEngine/StyleTab.jsx

@@ -1,16 +1,31 @@
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
-import React from 'react'
+import React, { useCallback } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { setCountFeaturesWithoutCoordinates } from '../../../actions/layerEdit.js'
+import {
+    setCountFeaturesWithoutCoordinates,
+    setStyle,
+} from '../../../actions/layerEdit.js'
 import { EE_BUFFER } from '../../../constants/layers.js'
+import {
+    getColorPalette,
+    defaultColorScaleName,
+    defaultClasses,
+} from '../../../util/colors.js'
 import { Checkbox } from '../../core/index.js'
 import BufferRadius from '../shared/BufferRadius.jsx'
 import styles from '../styles/LayerDialog.module.css'
 import LegendPreview from './LegendPreview.jsx'
 import StyleSelect from './StyleSelect.jsx'
 
-const StyleTab = ({ unit, style, showBelowMin, hasOrgUnitField }) => {
+const StyleTab = ({
+    unit,
+    style,
+    defaultStyle,
+    customColorScaleName,
+    showBelowMin,
+    hasOrgUnitField,
+}) => {
     const dispatch = useDispatch()
     const countFeaturesWithoutCoordinates = useSelector(
         (state) => state.layerEdit.countFeaturesWithoutCoordinates
@@ -22,10 +37,47 @@ const StyleTab = ({ unit, style, showBelowMin, hasOrgUnitField }) => {
         palette !== undefined &&
         palette.length < 10
 
+    const hasReferenceScale = !!defaultStyle?.ranges?.length
+    const useCustomScale = hasReferenceScale && !style?.ranges?.length
+
+    const handleScaleToggle = useCallback(
+        (checked) => {
+            if (checked) {
+                const { min, max } = defaultStyle ?? {}
+                dispatch(
+                    setStyle({
+                        min,
+                        max,
+                        palette: getColorPalette(
+                            customColorScaleName ?? defaultColorScaleName,
+                            defaultClasses
+                        ),
+                        ranges: null,
+                    })
+                )
+            } else {
+                dispatch(setStyle(defaultStyle))
+            }
+        },
+        [customColorScaleName, defaultStyle, dispatch]
+    )
+
     return (
         <div className={styles.flexColumnFlow}>
             <div className={styles.flexColumn}>
-                {isClassStyle && <StyleSelect unit={unit} style={style} />}
+                {unit && (
+                    <p>
+                        {i18n.t('Unit')}: {unit}
+                    </p>
+                )}
+                {hasReferenceScale && (
+                    <Checkbox
+                        label={i18n.t('Use custom legend')}
+                        checked={useCustomScale}
+                        onChange={handleScaleToggle}
+                    />
+                )}
+                {isClassStyle && <StyleSelect style={style} />}
                 <BufferRadius
                     label={i18n.t('Facility buffer')}
                     defaultRadius={EE_BUFFER}
@@ -40,7 +92,7 @@ const StyleTab = ({ unit, style, showBelowMin, hasOrgUnitField }) => {
                     }
                 />
             </div>
-            {isClassStyle && (
+            {(isClassStyle || (hasReferenceScale && !useCustomScale)) && (
                 <LegendPreview style={style} showBelowMin={showBelowMin} />
             )}
         </div>
@@ -49,6 +101,13 @@ const StyleTab = ({ unit, style, showBelowMin, hasOrgUnitField }) => {
 
 StyleTab.propTypes = {
     hasOrgUnitField: PropTypes.bool.isRequired,
+    customColorScaleName: PropTypes.string,
+    defaultStyle: PropTypes.shape({
+        max: PropTypes.number,
+        min: PropTypes.number,
+        palette: PropTypes.array,
+        ranges: PropTypes.array,
+    }),
     showBelowMin: PropTypes.bool,
     style: PropTypes.oneOfType([
         PropTypes.array,

src/components/edit/shared/styles/BufferRadius.module.css

@@ -1,5 +1,5 @@
 .buffer {
-    margin-top: var(--spacers-dp8);
+    margin-top: var(--spacers-dp16);
     clear: both;
     align-items: center;
 }

src/constants/__tests__/colorbrewer.spec.js

@@ -0,0 +1,33 @@
+import colorbrewer from '../colorbrewer.js'
+
+const baseNames = Object.keys(colorbrewer).filter(
+    (name) => !name.endsWith('_reverse')
+)
+
+describe('colorbrewer', () => {
+    test('every base scale has a corresponding _reverse entry', () => {
+        for (const name of baseNames) {
+            expect(colorbrewer[`${name}_reverse`]).toBeDefined()
+        }
+    })
+
+    test('_reverse entries are the mirror of their base scale', () => {
+        for (const name of baseNames) {
+            const base = colorbrewer[name]
+            const reversed = colorbrewer[`${name}_reverse`]
+            for (const bins of Object.keys(base)) {
+                expect(reversed[bins]).toEqual([...base[bins]].reverse())
+            }
+        }
+    })
+
+    test('_reverse entries do not mutate the base scale arrays', () => {
+        for (const name of baseNames) {
+            const base = colorbrewer[name]
+            const reversed = colorbrewer[`${name}_reverse`]
+            for (const bins of Object.keys(base)) {
+                expect(reversed[bins]).not.toBe(base[bins])
+            }
+        }
+    })
+})