(refactor) Refactor Mark patient deceased form and Mark patient alive modal #1872
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
|
Size Change: -5.05 kB (-0.05%) Total Size: 11.2 MB ℹ️ View Unchanged
|
denniskigen
force-pushed
the
refactor/O3-3452
branch
from
37cefb0 to
ef236f4
Compare
denniskigen
requested review from
donaldkibet,
samuelmale,
vasharma05 and
jayasanka-sack
denniskigen
commented
Jun 19, 2024
packages/esm-patient-chart-app/src/actions-buttons/mark-patient-alive.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/actions-buttons/mark-patient-deceased.component.tsx
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/mark-patient-deceased/deceased-form.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/mark-patient-deceased/deceased-form.scss
Outdated
Show resolved
Hide resolved
Comment on lines
+235
to
+255
| "modals": [ | ||
| { | ||
| "name": "mark-patient-alive-modal", | ||
| "component": "markPatientAliveModal" | ||
| } | ||
| ], | ||
| "pages": [ | ||
| { | ||
| "component": "root", | ||
| "routeRegex": "^patient\/.+\/chart", | ||
| "online": true, | ||
| "offline": true | ||
| } | ||
| ], | ||
| "workspaces": [ | ||
| { | ||
| "name": "mark-patient-deceased-workspace-form", | ||
| "component": "markPatientDeceasedForm", | ||
| "title": "Mark patient deceased", | ||
| "type": "form" | ||
| } |
There was a problem hiding this comment.
@brandones the hints you added to the console about porting over modals and workspaces to use their respective corresponding keys in the routes.json file came in clutch! Thanks!
| markPatientDeceased(deathDate, patientUuid, causeOfDeath) | ||
| .then(() => { | ||
| closeWorkspace(); | ||
| window.location.reload(); |
There was a problem hiding this comment.
@ibacher, @brandones is there a better revalidation mechanism for the patient object? fetchCurrentPatient doesn't use SWR so I assume calling mutate with that key won't work. Triggering a full page reload here ensures that the patient's deceased status gets reflected in the Patient Header.
There was a problem hiding this comment.
Additionally, I've elected to not show a success notification here as it wouldn't stay on the screen long enough before the page reloads. Should I show it anyway and maybe set an artificial delay to communicate to the user explicitly that marking the patient as deceased succeeded?
There was a problem hiding this comment.
Currently not, but that's horrible. We should probably update usePatient() to return something similar to the mutate() hook (i.e., to force it to reload).
| )} | ||
| <div className={styles.container}> | ||
| <span className={styles.warningContainer}> | ||
| <WarningFilled aria-label={t('warning', 'Warning')} className={styles.warningIcon} size={20} /> |
There was a problem hiding this comment.
@ibacher should we switch to the new icons in the framework across the board?
There was a problem hiding this comment.
As much as possible! I haven't created a component for every SVG yet and there are some gaps (warning--filled is one of the icons not included in CarbonMRS and I'm not entirely certain we can just re-use Carbon icons, but it's something I'll look into).
denniskigen
commented
Jun 19, 2024
packages/esm-patient-chart-app/src/mark-patient-deceased/deceased-form.workspace.tsx
Outdated
Show resolved
Hide resolved
denniskigen
commented
Jun 19, 2024
packages/esm-patient-chart-app/src/deceased/confirmation-dialog.component.tsx
Outdated
Show resolved
Hide resolved
|
Would it be useful to show the cause-of-death here? |
denniskigen
force-pushed
the
refactor/O3-3452
branch
2 times, most recently
from
e0a3dca to
6ec2e7a
Compare
In the tooltip? I like the idea. |
denniskigen
force-pushed
the
refactor/O3-3452
branch
from
6ec2e7a to
2f3eb6d
Compare
|
@ibacher something like this? |
ibacher
approved these changes
Jun 21, 2024
|
Thanks, @ibacher! |
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 makes the following refactors to the
Mark patient deceased formandMark patient alivemodal:Mark patient deceased form
Mark patient alive modal
Screenshots
demo.mp4
Related Issue
https://openmrs.atlassian.net/browse/O3-3452
Other