From 5ab524adf933231d843a3e0bead46d1f01a29548 Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Tue, 19 May 2026 13:06:03 +0200
Subject: [PATCH 1/2] fix: preserve saved start/end dates when editing event
 layer [DHIS2-21516]

---
 src/components/edit/event/EventDialog.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/edit/event/EventDialog.jsx b/src/components/edit/event/EventDialog.jsx
index 5296b41ee..d521b846d 100644
--- a/src/components/edit/event/EventDialog.jsx
+++ b/src/components/edit/event/EventDialog.jsx
@@ -146,7 +146,7 @@ class EventDialog extends Component {
         }
 
         // Set default dates
-        if (!backupPeriodsDates) {
+        if (!hasDate && !backupPeriodsDates) {
             const defaultDates = getDefaultDatesInCalendar()
             setStartDate(defaultDates.startDate)
             setEndDate(defaultDates.endDate)

From 4148bdaa906925ea8e7b72b266134f033647fe9a Mon Sep 17 00:00:00 2001
From: Bruno Raimbault <bruno@dhis2.org>
Date: Tue, 19 May 2026 13:32:00 +0200
Subject: [PATCH 2/2] fix: don't inherit period from single thematic layer when
 adding new thematic layer [DHIS2-21517]

---
 src/components/edit/thematic/ThematicDialog.jsx         | 1 +
 src/components/edit/thematic/initializeThematicLayer.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/components/edit/thematic/ThematicDialog.jsx b/src/components/edit/thematic/ThematicDialog.jsx
index 0043c53e3..cb759bdc8 100644
--- a/src/components/edit/thematic/ThematicDialog.jsx
+++ b/src/components/edit/thematic/ThematicDialog.jsx
@@ -119,6 +119,7 @@ const ThematicDialog = ({
                 orgUnits,
                 systemSettings,
                 syncFromOtherLayers,
+                shouldSyncFromOtherLayers,
             })
         )
         // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/components/edit/thematic/initializeThematicLayer.js b/src/components/edit/thematic/initializeThematicLayer.js
index f973c65ee..cfea39c73 100644
--- a/src/components/edit/thematic/initializeThematicLayer.js
+++ b/src/components/edit/thematic/initializeThematicLayer.js
@@ -67,6 +67,7 @@ const initializePeriods = (
         defaultRenderingStrategy,
         systemSettings,
         syncFromOtherLayers,
+        shouldSyncFromOtherLayers,
     }
 ) => {
     if (filters || (startDate !== undefined && endDate !== undefined)) {
@@ -76,6 +77,7 @@ const initializePeriods = (
     const defaultPeriods = getDefaultPeriods(systemSettings)
 
     if (
+        shouldSyncFromOtherLayers &&
         syncFromOtherLayers({
             renderingStrategy: renderingStrategy || defaultRenderingStrategy,
         })