feat: add heatmap layer [DHIS2-240]

cypress/integration/requestsErrors.cy.js

@@ -1,11 +1,27 @@
 import { getRequest } from '../support/requests.js'
 import {
-    assertIntercepts,
     EXTENDED_TIMEOUT,
+    assertIntercepts,
     getDhis2Version,
 } from '../support/util.js'
 
+const clearAndLogin = () => {
+    cy.clearCookies()
+    cy.clearLocalStorage()
+
+    const username = Cypress.env('dhis2Username')
+    const password = Cypress.env('dhis2Password')
+    const baseUrl = Cypress.env('dhis2BaseUrl')
+
+    cy.loginByApi({ username, password, baseUrl })
+        .its('status')
+        .should('equal', 200)
+
+    cy.wait(100) // eslint-disable-line cypress/no-unnecessary-waiting
+}
+
 const commonTriggerFn = () => {
+    clearAndLogin()
     cy.reload(true)
 }
 
@@ -16,7 +32,7 @@ describe('Error handling check for all layer types', () => {
         assertIntercepts({
             intercepts: [getRequest('getMap', id)],
             commonTriggerFn: () => {
-                cy.visit(`#/${id}`)
+                cy.visit(`/?id=${id}`)
             },
         })
     })
@@ -43,41 +59,13 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         assertIntercepts({
             intercepts: [
                 {
-                    intercepts: [
-                        {
-                            ...getRequest('getThematic_Analytics1'),
-                            error: 'network',
-                        },
-                        {
-                            ...getRequest('getThematic_Analytics2'),
-                            error: 'network',
-                        },
-                    ],
-                    alias: 'getThematic_AnalyticsGroup',
-                    assertFn: () => {
-                        commonAssertFn({ error: 'network' })
-                    },
-                },
-                {
-                    intercepts: [
-                        {
-                            ...getRequest('getThematic_Analytics1'),
-                            error: 409,
-                        },
-                        {
-                            ...getRequest('getThematic_Analytics2'),
-                            error: 'network',
-                        },
-                    ],
-                    alias: 'getThematic_AnalyticsGroup',
-                    assertFn: () => {
-                        commonAssertFn({ error: 409 })
-                    },
+                    ...getRequest('getThematic_Analytics1'),
+                    errors: ['network', 409],
                 },
                 {
                     ...getRequest('getThematic_Analytics2'),
@@ -120,7 +108,7 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         assertIntercepts({
             intercepts: [
@@ -238,14 +226,15 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         assertIntercepts({
             intercepts: [
                 {
                     ...getRequest('getEventsStandard_Analytics1'),
                     triggerFn: () => {
-                        cy.reload(true)
+                        clearAndLogin()
+                        cy.visit(`/?id=${id}`)
                         cy.wait(10000) // eslint-disable-line cypress/no-unnecessary-waiting
                     },
                     errors: ['network', 409], // !TODO: Improve messages
@@ -263,7 +252,8 @@ describe('Error handling check for all layer types', () => {
                 {
                     ...getRequest('getEventsStandard_Analytics2'),
                     triggerFn: () => {
-                        cy.reload(true)
+                        clearAndLogin()
+                        cy.visit(`/?id=${id}`)
                         cy.getByDataTest('layercard')
                             .find('[data-test="layerlegend"]', EXTENDED_TIMEOUT)
                             .should('exist')
@@ -311,7 +301,7 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         const serverVersion = getDhis2Version()
         let layerSpecificRequests
@@ -376,7 +366,7 @@ describe('Error handling check for all layer types', () => {
         // E2E - Facilities Layer [kIAUN3dInEz]
         const id = 'kIAUN3dInEz'
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         const commonAssertFn = ({ error }) => {
             const errorMessage = {
@@ -435,7 +425,7 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         assertIntercepts({
             intercepts: [
@@ -483,7 +473,7 @@ describe('Error handling check for all layer types', () => {
                 .should('be.visible')
         }
 
-        cy.visit(`#/${id}`)
+        cy.visit(`/?id=${id}`)
 
         assertIntercepts({
             intercepts: [

cypress/support/generateTestMatrix.js

@@ -1,35 +1,155 @@
 const fs = require('fs')
 const path = require('path')
 
-const getAllFiles = (dirPath, arrayOfFiles = []) => {
+const NUMBER_OF_GROUPS = 5
+const CYPRESS_FILES = {
+    'cypress/integration/basemaps.cy.js': { include: true, duration: 60 },
+    'cypress/integration/dataDownload.cy.js': { include: true, duration: 60 },
+    'cypress/integration/dataTable.cy.js': { include: true, duration: 60 },
+    'cypress/integration/fetcherrors.cy.js': { include: true, duration: 30 },
+    'cypress/integration/filemenu.cy.js': { include: true, duration: 90 },
+    'cypress/integration/interpretations.cy.js': {
+        include: true,
+        duration: 45,
+    },
+    'cypress/integration/keyboard.cy.js': { include: true, duration: 30 },
+    'cypress/integration/manageLayerSources.cy.js': {
+        include: true,
+        duration: 45,
+    },
+    'cypress/integration/mapDownload.cy.js': { include: true, duration: 15 },
+    'cypress/integration/orgUnitInfo.cy.js': { include: true, duration: 15 },
+    'cypress/integration/plugin.cy.js': { include: true, duration: 15 },
+    'cypress/integration/pushAnalytics.cy.js': { include: true, duration: 15 },
+    'cypress/integration/requests.cy.js': { include: true, duration: 120 },
+    'cypress/integration/requestsErrors.cy.js': {
+        include: false,
+        duration: 480,
+    },
+    'cypress/integration/routes.cy.js': { include: true, duration: 120 },
+    'cypress/integration/systemsettings.cy.js': {
+        include: true,
+        duration: 45,
+    },
+    'cypress/integration/ui.cy.js': { include: true, duration: 30 },
+    'cypress/integration/usersettings.cy.js': { include: true, duration: 45 },
+    'cypress/integration/layers/eventlayer.cy.js': {
+        include: true,
+        duration: 210,
+    },
+    'cypress/integration/layers/multilayers.cy.js': {
+        include: true,
+        duration: 15,
+    },
+    'cypress/integration/layers/externallayer.cy.js': {
+        include: true,
+        duration: 15,
+    },
+    'cypress/integration/layers/orgunitlayer.cy.js': {
+        include: true,
+        duration: 30,
+    },
+    'cypress/integration/layers/facilitylayer.cy.js': {
+        include: true,
+        duration: 30,
+    },
+    'cypress/integration/layers/thematiclayer.cy.js': {
+        include: true,
+        duration: 240,
+    },
+    'cypress/integration/layers/geojsonlayer.cy.js': {
+        include: true,
+        duration: 30,
+    },
+    'cypress/integration/layers/trackedentitylayer.cy.js': {
+        include: true,
+        duration: 60,
+    },
+}
+
+const filterFn = (fullPath) =>
+    CYPRESS_FILES[fullPath] ? CYPRESS_FILES[fullPath].include : true // include files by default
+
+const getAllFiles = (dirPath, arrayOfFiles = [], filterFn = () => true) => {
     const files = fs.readdirSync(dirPath)
 
     files.forEach((file) => {
-        if (fs.statSync(path.join(dirPath, file)).isDirectory()) {
-            arrayOfFiles = getAllFiles(path.join(dirPath, file), arrayOfFiles)
-        } else if (path.extname(file) === '.js') {
-            arrayOfFiles.push(path.join(dirPath, file))
+        const fullPath = path.join(dirPath, file)
+        const stats = fs.statSync(fullPath)
+
+        if (stats.isDirectory()) {
+            arrayOfFiles = getAllFiles(fullPath, arrayOfFiles, filterFn)
+        } else if (path.extname(file) === '.js' && filterFn(fullPath)) {
+            arrayOfFiles.push(fullPath)
         }
     })
 
     return arrayOfFiles
 }
 
-const createGroups = (files, numberOfGroups = 5) => {
-    const groups = []
+const createGroupsStandard = (files, numberOfGroups = NUMBER_OF_GROUPS) => {
+    let groups = []
     for (let i = 0; i < numberOfGroups; i++) {
         groups.push([])
     }
 
     files.forEach((file, index) => {
         groups[index % numberOfGroups].push(file)
     })
+    groups = groups.map((group, index) => ({ id: index + 1, tests: group }))
+    return groups
+}
+
+const createGroupsByDuration = (files, numberOfGroups = NUMBER_OF_GROUPS) => {
+    const durations = Object.values(CYPRESS_FILES)
+        .map((f) => f.duration)
+        .filter((d) => typeof d === 'number' && !isNaN(d))
+    const avgDuration =
+        durations.reduce((sum, d) => sum + d, 0) / durations.length
+
+    const enriched = files.map((f) => {
+        const meta = CYPRESS_FILES[f] ?? {}
+        return {
+            file: f,
+            duration:
+                typeof meta.duration === 'number' ? meta.duration : avgDuration,
+        }
+    })
+    // Sort longest duration first (greedy assignment works better this way)
+    enriched.sort((a, b) => b.duration - a.duration)
+
+    const groups = Array.from({ length: numberOfGroups }, (_, i) => ({
+        id: i + 1,
+        tests: [],
+        totalDuration: 0,
+    }))
+    for (const f of enriched) {
+        groups.sort((a, b) => a.totalDuration - b.totalDuration)
+        groups[0].tests.push(f.file)
+        groups[0].totalDuration += f.duration
+    }
+    return groups
+}
 
-    return groups.map((group, index) => ({ id: index + 1, tests: group }))
+const createGroups = (files, numberOfGroups = NUMBER_OF_GROUPS) => {
+    if (!files.length || numberOfGroups < 1) {
+        return []
+    }
+
+    const durations = Object.values(CYPRESS_FILES)
+        .map((f) => f.duration)
+        .filter((d) => typeof d === 'number' && !isNaN(d))
+    const adjustedNumberOfGroups = Math.min(files.length, numberOfGroups)
+
+    if (durations.length === 0) {
+        return createGroupsStandard(files, adjustedNumberOfGroups)
+    } else {
+        return createGroupsByDuration(files, adjustedNumberOfGroups)
+    }
 }
 
 const cypressSpecsPath = './cypress/integration'
-const specs = getAllFiles(cypressSpecsPath)
+const specs = getAllFiles(cypressSpecsPath, [], filterFn)
 const groupedSpecs = createGroups(specs)
 
 console.log(JSON.stringify(groupedSpecs))

i18n/en.pot

@@ -407,6 +407,9 @@ msgstr "Group events"
 msgid "View all events"
 msgstr "View all events"
 
+msgid "View heat map"
+msgstr "View heat map"
+
 msgid "Radius"
 msgstr "Radius"
 

package.json

@@ -45,7 +45,7 @@
         "@dhis2/analytics": "^28.0.4",
         "@dhis2/app-runtime": "^3.14.4",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",
-        "@dhis2/maps-gl": "^4.1.2",
+        "@dhis2/maps-gl": "git+https://github.com/d2-ci/maps-gl.git#5d8967b0b70c49968c390edd29ef04b9576ae3c0",
         "@dhis2/ui": "^10.9.0",
         "@turf/centroid": "^6.5.0",
         "abortcontroller-polyfill": "^1.7.5",

src/actions/layerEdit.js

@@ -123,6 +123,12 @@ export const setFallbackCoordinateField = (fieldId) => ({
     fieldId,
 })
 
+// Set if event heatmap should be used (event)
+export const setEventHeatmap = (checked) => ({
+    type: types.LAYER_EDIT_EVENT_HEATMAP_SET,
+    checked,
+})
+
 // Set if event clustering should be used (event)
 export const setEventClustering = (checked) => ({
     type: types.LAYER_EDIT_EVENT_CLUSTERING_SET,

src/actions/layers.js

@@ -48,6 +48,20 @@ export const changeLayerOpacity = (id, opacity) => ({
     opacity,
 })
 
+// Set overlay heat intensity
+export const changeLayerIntensity = (id, heatIntensity) => ({
+    type: types.LAYER_CHANGE_INTENSITY,
+    id,
+    heatIntensity,
+})
+
+// Set overlay heat radius
+export const changeLayerRadius = (id, heatRadius) => ({
+    type: types.LAYER_CHANGE_RADIUS,
+    id,
+    heatRadius,
+})
+
 // Change ordering of overlays
 export const sortLayers = ({ oldIndex, newIndex }) => ({
     type: types.LAYER_SORT,