O3-2684: remove hard coded queue entry statuses #1568
Merged
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: -88 B (0%) Total Size: 10.3 MB ℹ️ View Unchanged
|
mseaton
approved these changes
Jan 8, 2024
There was a problem hiding this comment.
It is consistent with your other changes, but would be good to get someone more familiar with this to weigh in. @ibacher or @denniskigen ?
ibacher
reviewed
Jan 8, 2024
| default: | ||
| return ''; | ||
| if (queueEntry?.status) { | ||
| return `${queueEntry.status} - ${queueEntry.service}`; |
There was a problem hiding this comment.
Is the - here necessary? We kind of want to end up in a state where it's possible to display "Waiting for xxx", "Attending xxx", etc.
There was a problem hiding this comment.
My other thought here is that it would be a good idea to run this through the translation system:
return `${t(queueEntry.status)} ${t(queueEntry.service)}`This allows implementations to customize the text if they don't want to customize the concept.
There was a problem hiding this comment.
It should also be null-safe I realise. eg. we should prepare for the possibility that queueEntry.service could be null.
There was a problem hiding this comment.
Thanks @ibacher and @mseaton ! I have added the translate function, and also checked that queueEntry.service is not null.
@ibacher , the reason I added the '-' (hyphen) here is to be consistent with the other change we made to the service-queue:
https://github.com/openmrs/openmrs-esm-patient-management/blob/main/packages/esm-service-queues-app/src/helpers/functions.ts#L20
If there is a clearer pattern for displaying statuses, I am happy to update the code in both places so the queue statuses will be displayed in a consistent way. Please let me know. Thanks!
There was a problem hiding this comment.
It's an interesting point about the hyphen, @ibacher , but as @cioan pointed out we are making this consistent with another change we already made, and although I can see the desire to support the display strings of status + service to represent a phrase, I don't think we we to mandate this, if that makes any sense?
mogoodrich
approved these changes
Jan 9, 2024
There was a problem hiding this comment.
Looks good to me, thanks @cioan . Will also add @CynthiaKamau as a reviewer.
|
Thanks @cioan for this, could you share a screenshot of how this appears now? I have something like |
Sure @CynthiaKamau , here how it looks on the PIH test server now after we customized the queue entry statuses: |
CynthiaKamau
approved these changes
Jan 12, 2024
|
Thank you @CynthiaKamau ! |
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.
@mseaton , you were correct, there was another place, the visit header where the queue statuses were hard coded. Thanks!