-
Notifications
You must be signed in to change notification settings - Fork 232
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-4119: Search bar in service queues table should always be open plus table actions cleanup #1378
base: main
Are you sure you want to change the base?
Conversation
@@ -5,3 +5,11 @@ | |||
@include type.type-style('heading-compact-01'); | |||
color: $ui-05; | |||
} | |||
|
|||
.clear-queues-btn-desktop { | |||
padding-top: 4px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
padding-top: 4px; | |
padding-top: layout.$spacing-02; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some early feedback
} | ||
|
||
.clear-queues-btn-tablet { | ||
padding-top: 12px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
padding-top: 12px; | |
padding-top: layout.$spacing-04; |
@@ -170,7 +171,7 @@ function QueueDropdownFilter() { | |||
<div className={styles.filterContainer}> | |||
<Dropdown | |||
id="serviceFilter" | |||
titleText={t('filterByService', 'Filter by service:')} | |||
titleText={t('showPatientsWithStatus', 'Show patients with status:')} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert this. status and service are different. We need filters for both.
@@ -135,14 +135,15 @@ function DefaultQueueTable() { | |||
ExpandedRow={QueueTableExpandedRow} | |||
tableFilters={ | |||
<> | |||
<QueueDropdownFilter /> <StatusDropdownFilter /> | |||
<ClearQueueEntries queueEntries={filteredQueueEntries} /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mockup does not match the requirements. We need both a dropdown for filtering by service (queue) and a dropdown for filtering by status.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I just saw Ciaran's comment in the ticket about moving the QueueDropdownFilter into the header. We might want to do that in the same PR; otherwise the change will break functionality.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@chibongho so in the meantime we wait for the ticket to be created by Ciaran?
@mccarthyaaron @chibongho should we close this ticket for now, pending Ciaran's update? |
I think that makes sense, yeah. |
Requirements
Summary
This PR makes the search bar in the service queues table always open and makes some adjustments to the sign of the filter actions in the table toolbar as per the requirements of this ticket
Screenshots
DESKTOP
TABLET
Related Issue
https://openmrs.atlassian.net/browse/O3-4119
Other