fix: preserve program/enrollment period type on TE layer reload [DHIS2-19205]

src/loaders/__tests__/trackedEntityLoader.spec.js

@@ -0,0 +1,56 @@
+import { parseJsonConfig } from '../trackedEntityLoader.js'
+
+jest.mock('../../components/map/MapApi.js', () => ({
+    loadEarthEngineWorker: jest.fn(),
+}))
+
+describe('parseJsonConfig', () => {
+    it('extracts periodType when relationships is null', () => {
+        const config = {
+            config: JSON.stringify({
+                relationships: null,
+                periodType: 'program',
+            }),
+        }
+        parseJsonConfig(config)
+        expect(config.periodType).toBe('program')
+        expect(config.relationshipType).toBeUndefined()
+        expect(config.config).toBeUndefined()
+    })
+
+    it('extracts both periodType and relationship fields when relationships is set', () => {
+        const config = {
+            config: JSON.stringify({
+                relationships: {
+                    type: 'rel-type-id',
+                    pointColor: '#ff0000',
+                    pointRadius: 5,
+                    lineColor: '#0000ff',
+                    relationshipOutsideProgram: true,
+                },
+                periodType: 'program',
+            }),
+        }
+        parseJsonConfig(config)
+        expect(config.periodType).toBe('program')
+        expect(config.relationshipType).toBe('rel-type-id')
+        expect(config.relatedPointColor).toBe('#ff0000')
+        expect(config.relatedPointRadius).toBe(5)
+        expect(config.relationshipLineColor).toBe('#0000ff')
+        expect(config.relationshipOutsideProgram).toBe(true)
+        expect(config.config).toBeUndefined()
+    })
+
+    it('does nothing when config.config is absent', () => {
+        const config = { layer: 'trackedEntity' }
+        parseJsonConfig(config)
+        expect(config).toEqual({ layer: 'trackedEntity' })
+    })
+
+    it('does not throw and leaves config intact on malformed JSON', () => {
+        const config = { config: 'not-valid-json' }
+        expect(() => parseJsonConfig(config)).not.toThrow()
+        expect(config.periodType).toBeUndefined()
+        expect(config.config).toBeUndefined()
+    })
+})

src/loaders/trackedEntityLoader.js

@@ -109,22 +109,29 @@ const toGeoJson = (instances) =>
         },
     }))
 
-const parseJsonConfig = (config) => {
-    if (config.config && typeof config.config === 'string') {
-        try {
-            const customConfig = JSON.parse(config.config)
-            config.relationshipType = customConfig.relationships.type
-            config.relatedPointColor = customConfig.relationships.pointColor
-            config.relatedPointRadius = customConfig.relationships.pointRadius
-            config.relationshipLineColor = customConfig.relationships.lineColor
+export const parseJsonConfig = (config) => {
+    if (!config.config || typeof config.config !== 'string') {
+        return
+    }
+
+    try {
+        const { relationships, periodType } = JSON.parse(config.config)
+
+        if (relationships) {
+            config.relationshipType = relationships.type
+            config.relatedPointColor = relationships.pointColor
+            config.relatedPointRadius = relationships.pointRadius
+            config.relationshipLineColor = relationships.lineColor
             config.relationshipOutsideProgram =
-                customConfig.relationships.relationshipOutsideProgram
-            config.periodType = customConfig.periodType
-        } catch (e) {
-            // Failed to load JSON relationship config, assuming no relationships
+                relationships.relationshipOutsideProgram
         }
-        delete config.config
+
+        config.periodType = periodType
+    } catch (e) {
+        // Malformed config JSON
     }
+
+    delete config.config
 }
 
 const fetchRelationshipData = async ({