Skip to content

fix: preserve saved dates and default period when editing/adding thematic and event layers [DHIS2-21516] [DHIS2-21517] #3653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BRaimbault wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix: preserve saved dates and default period when editing/adding thematic and event layers [DHIS2-21516] [DHIS2-21517] #3653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab524a
fix: preserve saved start/end dates when editing event layer [DHIS2-2…
BRaimbault May 19, 2026
4148bda
fix: don't inherit period from single thematic layer when adding new …
BRaimbault May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/edit/event/EventDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/components/edit/thematic/ThematicDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ const ThematicDialog = ({
orgUnits,
systemSettings,
syncFromOtherLayers,
shouldSyncFromOtherLayers,
})
)
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down
2 changes: 2 additions & 0 deletions src/components/edit/thematic/initializeThematicLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ const initializePeriods = (
defaultRenderingStrategy,
systemSettings,
syncFromOtherLayers,
shouldSyncFromOtherLayers,
}
) => {
if (filters || (startDate !== undefined && endDate !== undefined)) {
Expand All @@ -76,6 +77,7 @@ const initializePeriods = (
const defaultPeriods = getDefaultPeriods(systemSettings)

if (
shouldSyncFromOtherLayers &&
syncFromOtherLayers({
renderingStrategy: renderingStrategy || defaultRenderingStrategy,
})
Expand Down
Loading