UHM-7439, add queue table metrics #1118
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: -49.3 kB (-1%) Total Size: 3.53 MB
ℹ️ View Unchanged
|
mseaton
requested changes
Apr 30, 2024
packages/esm-service-queues-app/src/queue-table/queue-table-metrics.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-service-queues-app/src/queue-table/queue-table-metrics.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-service-queues-app/src/queue-table/queue-table-metrics-card.component.tsx
Show resolved
Hide resolved
|
Overall idea looks good to me. |
|
Thanks @mseaton and @chibongho ! I've got the queue statuses to render dynamically along with the number of queue entries for each status:
Next, I will work on the styling to see if I could get it to look close to the designs. Thanks! |
|
@mseaton , can I merge in this PR? Thanks! |
chibongho
reviewed
May 2, 2024
|
|
||
| return ( | ||
| <div className={styles.metricsBorder}> | ||
| <QueueTableMetricsCard value={queueEntries.length} headerLabel={t('totalPatients', 'Total Patients')} /> |
There was a problem hiding this comment.
use totalCount returned from useQueueEntries() instead. queueEntries.length is technically incorrect because the REST endpoint limits the max returned result count to 50 by default.
This also means the per-status metrics are not calculated correctly as is, but I don't really know what's the best solution to that. We have a related ticket regarding this.
There was a problem hiding this comment.
Thanks @chibongho ! I have updated the PR to use totalCount. Thanks!
There was a problem hiding this comment.
If the same totalCount can't be applied to the per-status counts @cioan , then one way to solve this would be via multiple calls to the queue-entry-metrics endpoint that is here: https://github.com/openmrs/openmrs-module-queue/blob/main/omod/src/main/java/org/openmrs/module/queue/web/QueueEntryMetricRestController.java . Not sure if this will be too much overhead with the multiple calls, but it would provide the most accurate data.
There was a problem hiding this comment.
Thanks @mseaton ! I was able to use the queue-entry-metrics REST API to provide an accurate count of the queue entries by status. Please review the updated PR. Thanks!
There was a problem hiding this comment.
Looking pretty good @cioan . A few additional comments to address
mseaton
requested changes
May 7, 2024
| const { t } = useTranslation(); | ||
|
|
||
| const allowedStatuses = selectedQueue.allowedStatuses; | ||
| const { totalCount } = useQueueEntries({ queue: selectedQueue.uuid, isEnded: false }); |
There was a problem hiding this comment.
Should this also use the metric endpoint for consistency?
There was a problem hiding this comment.
Sure, np. I have updated the PR.
| <QueueTableMetricsCard | ||
| queueUuid={selectedQueue.uuid} | ||
| serviceUuid={selectedQueue.service.uuid} | ||
| status={status.display} |
There was a problem hiding this comment.
Why are you passing in the status display name here? This should be status.uuid
There was a problem hiding this comment.
Changed to status.uuid. Thanks!
| return ( | ||
| <QueueTableMetricsCard | ||
| queueUuid={selectedQueue.uuid} | ||
| serviceUuid={selectedQueue.service.uuid} |
There was a problem hiding this comment.
serviceUuid is totally unnecessary - you are already passing in the queue, the service is redundant.
mseaton
approved these changes
May 7, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
@chibongho and @mseaton , before I go and implement all those configurable statuses and the number of patients in each table, just wanted to make sure if the following components are the right components to implement? Thanks!