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

feat: [DHIS2-17878][DHIS2-17048] Add overflow menu with actions to stages&events #3756

Merged
merged 7 commits into from
Sep 6, 2024
Merged

feat: [DHIS2-17878][DHIS2-17048] Add overflow menu with actions to stages&events #3756

merged 7 commits into from
Sep 6, 2024

Conversation

eirikhaugstulen
Copy link
Contributor

Summary:

  • Add an overflow button on the end of each row in the stages & events widget
  • Add a Delete-action
  • Add a Skip-action
  • Add an Unskip-action

@eirikhaugstulen eirikhaugstulen changed the title feat: [DHIS2-17048] Add overflow menu with actions to stages&events feat: [DHIS2-17878][DHIS2-17048] Add overflow menu with actions to stages&events Aug 12, 2024
henrikmv
henrikmv reviewed Aug 13, 2024
View reviewed changes
Copy link
Contributor

@henrikmv henrikmv left a comment

Choose a reason for hiding this comment

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

Nice @eirikhaugstulen! I could not find anything important, but I am not in a position to approve, so I am leaving this review without approval for now. Please ask for another review from someone else as well.

.../components/WidgetStagesAndEvents/Stages/Stage/StageDetail/EventRow/SkipAction/SkipAction.js Outdated Show resolved Hide resolved
@eirikhaugstulen eirikhaugstulen marked this pull request as ready for review August 14, 2024 07:56
@eirikhaugstulen eirikhaugstulen requested a review from a team as a code owner August 14, 2024 07:56
@eirikhaugstulen
Copy link
Contributor Author

Tests are on their way, but thought you could have a look at the code in the meantime 👍

@eirikhaugstulen
Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…
f91e99a 
…t/DHIS2-17048-add-skip-event-functionality-for-stages-and-events

# Conflicts:
#	i18n/en.pot
#	src/core_modules/capture-core/components/Buttons/OverflowButton.component.js
#	src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
@eirikhaugstulen
fix: pr-comments
e53ba85
@eirikhaugstulen
Copy link
Contributor Author

Thanks for the review @simonadomnisoru! I implemented your changes and also added some more validation on whether the user has write access and so on.

@simonadomnisoru
Copy link
Contributor

Tests are on their way, but thought you could have a look at the code in the meantime 👍

@eirikhaugstulen, solid work, the code looks good now 👏 ! Once you add some cypress tests I'll approve

@eirikhaugstulen
Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…
cfd1557 
…t/DHIS2-17048-add-skip-event-functionality-for-stages-and-events
@eirikhaugstulen
Merge remote-tracking branch 'refs/remotes/origin/master' into eh/fea…
6d7dbe0 
…t/DHIS2-17048-add-skip-event-functionality-for-stages-and-events

# Conflicts:
#	src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
@eirikhaugstulen
chore: cypress tests
ae4ea70
@eirikhaugstulen
Copy link
Contributor Author

@simonadomnisoru tests should be working now 👍

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 3, 2024

🚀 Deployed on https://deploy-preview-3756--dhis2-capture.netlify.app

geethaalwan
geethaalwan approved these changes Sep 5, 2024
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.2,2.40.5,2.39.7 versions

@eirikhaugstulen eirikhaugstulen merged commit 12af138 into master Sep 6, 2024
39 checks passed
@eirikhaugstulen eirikhaugstulen deleted the eh/feat/DHIS2-17048-add-skip-event-functionality-for-stages-and-events branch September 6, 2024 07:18
dhis2-bot added a commit that referenced this pull request Sep 9, 2024
@dhis2-bot
chore(release): cut 101.4.0 [skip release]
f6b7f3d 
# [101.4.0](v101.3.3...v101.4.0) (2024-09-09)

### Features

* [DHIS2-17878][DHIS2-17048] Add overflow menu with actions to stages&events ([#3756](#3756)) ([12af138](12af138))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.4.0 🎉

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

@henrikmv henrikmv henrikmv left review comments

@geethaalwan geethaalwan geethaalwan approved these changes

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

Assignees
No one assigned
Labels
released testing
Projects
None yet
Milestone
No milestone
Development

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