Skip to content

fix: [DHIS2-16363] Navigate to Schedule tab when creating event after stage complete - #4618

Merged
simonadomnisoru merged 3 commits into
masterfrom
fix/DHIS2-16363-show-schedule-tab-after-stage-complete
Jul 1, 2026
Merged

fix: [DHIS2-16363] Navigate to Schedule tab when creating event after stage complete#4618
simonadomnisoru merged 3 commits into
masterfrom
fix/DHIS2-16363-show-schedule-tab-after-stage-complete

Conversation

@karolinelien

Copy link
Copy Markdown
Contributor

When a stage with "Ask user to create new event when stage is complete" is completed and the user
confirms they want to create a new event, they are navigated to the Report tab of the new event
workspace. The expected behaviour (per DHIS2-13801) is to land on the Schedule tab, since most users
want to schedule the follow-up rather than report immediately.

What is the fix?

In startCreateNewAfterCompletingEpic, tab: 'SCHEDULE' is added to the URL params when navigating to
/enrollmentEventNew. The NewEventWorkspace component already reads this param and initialises to the
correct tab — it was just never being passed.

Steps to verify

  1. Open a tracked entity enrolled in a program where a stage has "Ask user to create new event when
    stage is complete" enabled (e.g. WHO RMNCH).
  2. Create and complete an event in that stage. Confirm "Yes" on the modal.
  3. Select a stage if prompted.
  4. Verify the new event workspace opens on the Schedule tab, not the Report tab.

AI Assisted

… stage complete

When confirming "create new event" after completing a stage, the
navigation now includes tab=SCHEDULE so the new event workspace
opens on the Schedule tab instead of defaulting to Report.

AI Assisted
@github-actions

github-actions Bot commented Jun 18, 2026

Copy link
Copy Markdown

@karolinelien
karolinelien marked this pull request as ready for review June 18, 2026 09:57
@ameenhere
ameenhere requested review from a team and simonadomnisoru June 23, 2026 07:48
@ameenhere

Copy link
Copy Markdown
Contributor

Changes look sensible to me. Tagging frontend team for additional reinforcement.
Also the tests failing.. but that might not be due to this PR?

@simonadomnisoru simonadomnisoru left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look sensible to me. Tagging frontend team for additional reinforcement. Also the tests failing.. but that might not be due to this PR?

Looks good now! The Cypress failures were related to this PR, and I've pushed a fix for them.

…w-schedule-tab-after-stage-complete

# Conflicts:
#	i18n/en.pot
@sonarqubecloud

sonarqubecloud Bot commented Jul 1, 2026

Copy link
Copy Markdown

@simonadomnisoru
simonadomnisoru merged commit 0cba9a3 into master Jul 1, 2026
55 of 59 checks passed
@simonadomnisoru
simonadomnisoru deleted the fix/DHIS2-16363-show-schedule-tab-after-stage-complete branch July 1, 2026 15:15
dhis2-bot added a commit that referenced this pull request Jul 1, 2026
## [106.6.1](v106.6.0...v106.6.1) (2026-07-01)

### Bug Fixes

* [DHIS2-16363] Navigate to Schedule tab when creating event after stage complete ([#4618](#4618)) ([0cba9a3](0cba9a3))
@dhis2-bot

Copy link
Copy Markdown
Contributor

🎉 This PR is included in version 106.6.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants