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-4119: Search bar in service queues table should always be open plus table actions cleanup #1378

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

mccarthyaaron
Copy link
Contributor

@mccarthyaaron mccarthyaaron commented Nov 18, 2024

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 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

desktop

TABLET

tablet

Related Issue

https://openmrs.atlassian.net/browse/O3-4119

Other

@@ -5,3 +5,11 @@
@include type.type-style('heading-compact-01');
color: $ui-05;
}

.clear-queues-btn-desktop {
padding-top: 4px;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
padding-top: 4px;
padding-top: layout.$spacing-02;

Copy link
Member

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;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
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:')}
Copy link
Contributor

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} />
Copy link
Contributor

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.

Copy link
Contributor

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.

Copy link
Contributor Author

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?

@brandones
Copy link
Contributor

@mccarthyaaron @chibongho should we close this ticket for now, pending Ciaran's update?

@chibongho
Copy link
Contributor

@mccarthyaaron @chibongho should we close this ticket for now, pending Ciaran's update?

I think that makes sense, yeah.

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