(fix) O3-3543: Fix test types search in the lab order workspace #1910
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
denniskigen
force-pushed
the
lab-order-search-bar
branch
from
baf6d6a to
f36a72f
Compare
denniskigen
reviewed
Jul 12, 2024
There was a problem hiding this comment.
I've taken the liberty to add a few more useful refactors, @arodidev.
| @@ -103,7 +103,13 @@ function TestTypeSearchResults({ searchTerm, openOrderForm, focusAndClearSearchI | |||
| )} | |||
| <div className={styles.resultsContainer}> | |||
| {testTypes.map((testType) => ( | |||
| <TestTypeSearchResultItem key={testType.conceptUuid} testType={testType} openOrderForm={openOrderForm} /> | |||
| <> | |||
There was a problem hiding this comment.
Suggested change
| <> | |
| <React.fragment key={testType.conceptUuid}> |
packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.scss
Show resolved
Hide resolved
packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.scss
Show resolved
Hide resolved
denniskigen
force-pushed
the
lab-order-search-bar
branch
from
16506e2 to
808c91f
Compare
|
So, I've hijacked @arodidev's PR to fix an issue with the search that involves factoring out the filtering logic from the useTestTypes hook and moving it into the TestTypesSearch component: Beforebroken-filtering.mp4Afterfiltering.mp4 |
denniskigen
changed the title
denniskigen
changed the title
denniskigen
reviewed
Jul 15, 2024
| @@ -11,7 +11,7 @@ import { | |||
| type LabOrderBasketItem, | |||
| launchPatientWorkspace, | |||
| } from '@openmrs/esm-patient-common-lib'; | |||
| import { TestTypeSearch } from './test-type-search'; | |||
| import { TestTypeSearch } from './test-type-search.component'; | |||
There was a problem hiding this comment.
Renamed to match our naming conventions.
| @@ -66,37 +66,3 @@ describe('useTestTypes is configurable', () => { | |||
| expect(result.current.testTypes).toEqual([expect.objectContaining({ label: 'Configured concept' })]); | |||
| }); | |||
| }); | |||
|
|
|||
| describe('useTestTypes filters by text', () => { | |||
There was a problem hiding this comment.
Removed since we're no longer handling filtering in the hook.
| {testTypes.map((testType) => ( | ||
| <TestTypeSearchResultItem key={testType.conceptUuid} testType={testType} openOrderForm={openOrderForm} /> | ||
| {filteredTestTypes.map((testType, index) => ( | ||
| <TestTypeSearchResultItem key={index} openOrderForm={openOrderForm} t={t} testType={testType} /> |
There was a problem hiding this comment.
Ideally the key should come from the data from the backend, but we need to fix the issue with duplicates first.
ibacher
approved these changes
Jul 15, 2024
packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.scss
Outdated
Show resolved
Hide resolved
3 tasks
arodidev
pushed a commit
to arodidev/openmrs-esm-patient-chart
that referenced
this pull request
Jul 16, 2024
…nmrs#1909) * (test) Fix flaky behaviour in Programs and Conditions form tests * Try something else * Fixup (test) Fix yet more flakiness in ConditionsForm tests (chore) Bump React Form Engine library (openmrs#1913) (chore) Bump RFE lib (chore) Update translations from Transifex (openmrs#1906) Co-authored-by: OpenMRS Bot <[email protected]> (fix) O3-2995: Allow empty quantity to dispense and prescription refills in Drug Order Form (openmrs#1754) Co-authored-by: Dennis Kigen <[email protected]> (fix) O3-3543: Fix test types search in the lab order workspace (openmrs#1910) * added fragment * Other useful mods * Factor out filtering from useTestTypes hook * Review feedback --------- Co-authored-by: Dennis Kigen <[email protected]> (fix) O3-3545: Remove duplicate lab tests in lab order workspace (openmrs#1916) * (fix) O3-3545: Remove duplicate copies of labs * Fixup --------- Co-authored-by: Dennis Kigen <[email protected]> Bump loader-utils from 2.0.2 to 2.0.4 (openmrs#1918) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.4. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md) - [Commits](webpack/loader-utils@v2.0.2...v2.0.4) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (feat) Replace fuzzy search with simple filter for test types
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 fixes various issues related to the test types search in the Lab Order workspace.
Screenshots
Before
broken-filtering.mp4
After
filtering.mp4
Related Issue
https://openmrs.atlassian.net/browse/O3-3543
Other
We need to address the issue of duplicate concepts in the test types response from the backend. The backend lists 48 concepts, but the frontend shows 60. This might be due to an issue on our end.