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.

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

(fix) O3-4123: Improve queue entry removal UX and modal styling #1451

Conversation

harshthakkr
Copy link
Contributor

@harshthakkr harshthakkr commented Jan 18, 2025

Requirements

  • This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
  • My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
  • My work includes tests or is validated by existing tests.

Summary

This PR improves consistency in the UI by making the following adjustments:

  • Updated the Remove, Delete and Undo Transition action buttons to use a destructive style (red instead of green) for better visual clarity.
  • Adjusted the Remove, Delete and Undo Transition modals to have a consistent width of 'small', ensuring uniformity across similar components.

Screenshots

Remove modal

Before

Screenshot 2025-01-18 at 1 59 07 PM

After

Screenshot 2025-01-18 at 1 59 27 PM

Delete modal

Before

Screenshot 2025-01-18 at 1 59 52 PM

After

Screenshot 2025-01-18 at 2 00 07 PM

Undo Transition modal

Before

Screenshot 2025-01-18 at 2 00 48 PM

After

Screenshot 2025-01-18 at 2 01 03 PM

Related Issue

O3-4123

Note

The updates to the Transition string are applied only to the English language (i.e., en.json), as I am not familiar with other languages.

@denniskigen denniskigen requested a review from chibongho January 18, 2025 13:55
@harshthakkr harshthakkr force-pushed the fix/remove-patient-modal-width-and-action-button branch from 806fa78 to ace4226 Compare January 18, 2025 15:34
Copy link
Contributor

@chibongho chibongho left a comment

Choose a reason for hiding this comment

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

Thanks @harshthakkr , this looks great.

Once obvious todo would be to similarly improve the wording for the Delete and Undo Transition modals. That doesn't seem to be in scope for this ticket, so I filed a separate ticket for this. (We might need some discussions on the wordings before it's ready to be worked on.)

@harshthakkr harshthakkr force-pushed the fix/remove-patient-modal-width-and-action-button branch from ace4226 to c54e6f8 Compare January 21, 2025 14:29
@harshthakkr
Copy link
Contributor Author

@denniskigen, could you please review it? Thanks!

Copy link
Member

@denniskigen denniskigen left a comment

Choose a reason for hiding this comment

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

Looks mostly good save for a few inconsistencies.

@denniskigen denniskigen changed the title (fix) O3-4123: Remove, Delete, Undo Transition modals width and action button (fix) O3-4123: Improve queue entry removal UX and modal styling Jan 28, 2025
@harshthakkr harshthakkr force-pushed the fix/remove-patient-modal-width-and-action-button branch from 7869e66 to 3f37ec9 Compare January 29, 2025 05:12
@denniskigen
Copy link
Member

Thanks!

@denniskigen denniskigen merged commit 5de1685 into openmrs:main Jan 29, 2025
6 checks passed
@harshthakkr harshthakkr deleted the fix/remove-patient-modal-width-and-action-button branch January 29, 2025 07:53
Samstar10 pushed a commit to Samstar10/openmrs-esm-patient-management that referenced this pull request Feb 4, 2025
…mrs#1451)

* fix: modify the text and use destructive action button

* fix: Update modal instruction

* fix: Remove patient modal width

* fix: width of Delete and Undo transition modals

* test: Update test for queue-entry-confirm-action

* fix: Change name from isRemovePatient to isRemovingPatientFromQueue

* (chore) Update translations from Transifex (openmrs#1473)

Co-authored-by: OpenMRS Bot <[email protected]>

* fix: Requested changes

* Revert "fix: Requested changes"

This reverts commit 3f37ec9.

* fix: Requested changes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: OpenMRS Bot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants