Skip to content
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

Jump to bottom

fix: [DHIS2-18668] remove delete button in enrollment event pages #3941

Merged
merged 5 commits into from
Jan 16, 2025
Merged

fix: [DHIS2-18668] remove delete button in enrollment event pages #3941

merged 5 commits into from
Jan 16, 2025

Conversation

eirikhaugstulen
Copy link
Contributor

Summary:

  • Added readOnlyMode prop to OverflowMenu component
  • Hide the entire overflow menu when readOnlyMode is true and changelog is disabled
  • Hide only the Delete action when readOnlyMode is true but changelog is enabled
  • Verified readOnlyMode settings in DefaultPageLayout files:
    • true for add/edit event pages (to hide Delete)
    • false for enrollment dashboard (to show Delete)

@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner January 16, 2025 00:34
simonadomnisoru
simonadomnisoru approved these changes Jan 16, 2025
View reviewed changes
Copy link
Contributor

@simonadomnisoru simonadomnisoru left a comment

Choose a reason for hiding this comment

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

Great job 👏 ! Could you please remove the Cypress scenario “You can delete a tracked entity from the profile widget” from the edit and new event pages before moving to QA? Thanks!

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 16, 2025 •
edited
Loading

🚀 Deployed on https://deploy-preview-3941.capture.netlify.dhis2.org

geethaalwan
geethaalwan approved these changes Jan 16, 2025
View reviewed changes
Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

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

Tested successfully on 2.42,2.41.4,2.40.7,2.39.9 versions

@eirikhaugstulen eirikhaugstulen added testing e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud and removed testing labels Jan 16, 2025
@eirikhaugstulen eirikhaugstulen merged commit aef3400 into master Jan 16, 2025
38 of 40 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/fix/DHIS2-18668-remove-delete-te-from-enrollment-events branch January 16, 2025 22:32
dhis2-bot added a commit that referenced this pull request Jan 16, 2025
@dhis2-bot
chore(release): cut 101.21.6 [skip release]
eb4a0a1 
## [101.21.6](v101.21.5...v101.21.6) (2025-01-16)

### Bug Fixes

* [DHIS2-18668] remove delete tei button in enrollment event pages ([#3941](#3941)) ([aef3400](aef3400))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.21.6 🎉

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
Reviewers

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

Assignees
No one assigned
Labels
e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud released testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@eirikhaugstulen @dhis2-bot @simonadomnisoru @geethaalwan