(feat) O3-4040: Add delete ability to program enrollments #2133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dit" and "delete" options for individual programs
…t button and the new delete button
…ved(clicking on the overflow menu) to get to the "edit" button
|
@vasharma05 @denniskigen can you please review this for me |
brandones
changed the title
brandones
requested changes
Dec 15, 2024
There was a problem hiding this comment.
Nice work, @PiusKariuki ! The main thing is to clean up the user-facing text. We don't want to scare users by making them think they might be deleting a whole program, when they are in fact just deleting the patient's enrollment.
packages/esm-patient-programs-app/src/programs/program-actions-menu.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-programs-app/src/programs/delete-program.modal.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-programs-app/src/programs/delete-program.modal.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-programs-app/src/programs/delete-program.modal.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-programs-app/src/programs/delete-program.modal.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-programs-app/src/programs/delete-program.modal.tsx
Outdated
Show resolved
Hide resolved
…http request function
…http request function
…e enrollments resource before closing the modal
… cancel button is clicked" test
|
@brandones @denniskigen . I resolved the failing E2E and suggestions too. Please review and revert incase of any more feedback |
Comment on lines
27
to
29
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); |
There was a problem hiding this comment.
Also please note this.
Comment on lines
11
to
14
| jest.mock('@openmrs/esm-framework', () => ({ | ||
| showSnackbar: jest.fn(), | ||
| getCoreTranslation: jest.fn((key, defaultText) => defaultText), | ||
| })); |
There was a problem hiding this comment.
And please update the mocks
…to feat/delete-programs-feature
denniskigen
reviewed
Jan 8, 2025
Comment on lines
+71
to
+72
| expect(mockDeleteProgramEnrollment).toHaveBeenCalledTimes(1); | ||
| expect(mockDeleteProgramEnrollment).toHaveBeenCalledTimes(1); |
There was a problem hiding this comment.
Suggested change
| expect(mockDeleteProgramEnrollment).toHaveBeenCalledTimes(1); | |
| expect(mockDeleteProgramEnrollment).toHaveBeenCalledTimes(1); |
There was a problem hiding this comment.
Best to call this file programs-actions-menu.test.tsx. The component extension isn't required for tests.
| mockUseLayoutType.mockReturnValue('small-desktop'); // or 'large-desktop' or 'tablet' | ||
| }); | ||
|
|
||
| it('renders OverflowMenu with edit and delete actions', async () => { |
There was a problem hiding this comment.
Suggested change
| it('renders OverflowMenu with edit and delete actions', async () => { | |
| it('renders an overflow menu with edit and delete actions', async () => { |
Comment on lines
+36
to
+37
| const overFlowButton = screen.getByRole('button'); | ||
| await user.click(overFlowButton); |
There was a problem hiding this comment.
Suggested change
| const overFlowButton = screen.getByRole('button'); | |
| await user.click(overFlowButton); | |
| const overflowMenuButton = screen.getByRole('button', { name: /options/i }); | |
| await user.click(overflowMenuButton); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR adds DELETE ability to program enrollments
Screenshots
Related Issue
https://openmrs.atlassian.net/browse/O3-4040
Other