From d1833f1cde913b540cadd6b8596d5603bcbd2e38 Mon Sep 17 00:00:00 2001 From: Brandon Istenes Date: Wed, 9 Oct 2024 13:51:38 -0400 Subject: [PATCH] BREAKING: O3-2563 Rename esm-patient-labs-app to esm-patient-tests-app (#1935) --- .tx/config | 18 ++-- README.md | 2 +- .../README.md | 82 ++++++++++--------- .../jest.config.js | 0 .../package.json | 6 +- .../src/config-schema.ts | 3 + .../src/constants.ts | 0 .../src/index.ts | 5 +- .../add-lab-order/add-lab-order.scss | 0 .../add-lab-order/add-lab-order.test.tsx | 0 .../add-lab-order/add-lab-order.workspace.tsx | 2 +- .../lab-order-form.component.tsx | 0 .../add-lab-order/lab-order-form.scss | 0 .../src/lab-orders/add-lab-order/lab-order.ts | 0 .../test-type-search.component.tsx | 0 .../add-lab-order/test-type-search.scss | 0 .../add-lab-order/useTestTypes.test.ts | 0 .../lab-orders/add-lab-order/useTestTypes.ts | 0 .../src/lab-orders/api.ts | 6 +- .../lab-icon.component.tsx | 0 .../lab-order-basket-item-tile.component.tsx | 0 .../lab-order-basket-item-tile.scss | 0 .../lab-order-basket-panel.extension.tsx | 0 .../lab-order-basket-panel.scss | 0 .../lab-order-basket-panel.test.tsx | 4 +- .../lab-order-basket.scss | 0 .../src/routes.json | 9 +- .../src/test-results/dashboard.meta.ts | 0 .../test-results/filter/filter-context.tsx | 2 +- .../src/test-results/filter/filter-reducer.ts | 6 +- .../filter/filter-set.component.tsx | 0 .../src/test-results/filter/filter-set.scss | 0 .../src/test-results/filter/filter-types.ts | 0 .../src/test-results/filter/index.ts | 0 .../grouped-timeline-types.ts | 0 .../grouped-timeline.component.tsx | 0 .../grouped-timeline/grouped-timeline.scss | 0 .../test-results/grouped-timeline/index.ts | 0 .../grouped-timeline/useObstreeData.ts | 2 +- .../src/test-results/helpers.ts | 0 .../individual-results-table.component.tsx | 0 .../individual-results-table.scss | 0 .../individual-results-table.test.tsx | 0 .../loadPatientTestData/helpers.ts | 0 .../loadPatientTestData/loadPatientData.ts | 16 ++-- .../usePatientResultsData.ts | 0 .../overview/common-datatable.component.tsx | 0 .../overview/common-datatable.scss | 0 .../overview/common-overview.component.tsx | 0 .../overview/common-overview.scss | 0 .../overview/external-overview.extension.tsx | 0 .../overview/external-overview.scss | 0 .../overview/overview.component.tsx | 4 +- .../overview/recent-overview.component.tsx | 2 +- .../overview/recent-overview.scss | 0 .../test-results/overview/useOverviewData.ts | 0 .../test-results/panel-timeline/helpers.tsx | 0 .../panel-timeline-component.tsx | 1 + .../panel-timeline/timeline-results.modal.tsx | 0 .../panel-timeline/timeline.component.tsx | 11 ++- .../test-results/panel-timeline/timeline.scss | 0 .../src/test-results/panel-timeline/types.ts | 0 .../test-results/panel-timeline/useScroll.ts | 0 .../src/test-results/panel-view/helper.tsx | 4 +- .../panel-view/panel-view.component.tsx | 0 .../test-results/panel-view/panel-view.scss | 0 .../panel-view/panel.component.tsx | 0 .../test-results/panel-view/result-panel.scss | 0 .../test-results/panel-view/usePanelData.tsx | 0 .../print-modal/print-modal.extension.tsx | 0 .../test-results/print-modal/print-modal.scss | 0 .../src/test-results/results-viewer/index.ts | 0 .../results-viewer/mock-concept-tree.ts | 0 .../results-viewer/results-viewer-router.tsx | 0 .../results-viewer.extension.tsx | 0 .../results-viewer/results-viewer.scss | 0 .../src/test-results/tablet-overlay/index.ts | 0 .../tablet-overlay.component.tsx | 0 .../tablet-overlay/tablet-overlay.scss | 0 .../tree-view/tree-view-wrapper.component.tsx | 0 .../tree-view/tree-view.component.tsx | 6 +- .../trendline/range-selector.component.tsx | 0 .../trendline/trendline-resource.tsx | 4 +- .../trendline/trendline.component.tsx | 0 .../src/test-results/trendline/trendline.scss | 0 .../filter-empty-data-illustration.tsx | 0 .../filter-empty-state.component.tsx | 2 +- .../resetFiltersEmptyState/index.scss | 0 .../src/types.ts | 0 .../translations/am.json | 0 .../translations/ar.json | 0 .../translations/en.json | 2 + .../translations/es.json | 0 .../translations/fr.json | 0 .../translations/he.json | 0 .../translations/hi_IN.json | 0 .../translations/km.json | 0 .../translations/qu.json | 0 .../translations/zh.json | 0 .../translations/zh_CN.json | 0 .../tsconfig.json | 0 .../webpack.config.js | 0 yarn.lock | 42 +++++----- 103 files changed, 129 insertions(+), 112 deletions(-) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/README.md (56%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/jest.config.js (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/package.json (91%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/config-schema.ts (99%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/constants.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/index.ts (94%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/add-lab-order.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/add-lab-order.test.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx (98%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/lab-order-form.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/lab-order-form.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/lab-order.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/test-type-search.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/test-type-search.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/useTestTypes.test.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/add-lab-order/useTestTypes.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/api.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-icon.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/lab-orders/lab-order-basket-panel/lab-order-basket.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/routes.json (98%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/dashboard.meta.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/filter-context.tsx (98%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/filter-reducer.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/filter-set.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/filter-set.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/filter-types.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/filter/index.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/grouped-timeline/grouped-timeline-types.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/grouped-timeline/grouped-timeline.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/grouped-timeline/grouped-timeline.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/grouped-timeline/index.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/grouped-timeline/useObstreeData.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/helpers.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/individual-results-table/individual-results-table.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/individual-results-table/individual-results-table.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/individual-results-table/individual-results-table.test.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/loadPatientTestData/helpers.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/loadPatientTestData/loadPatientData.ts (99%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/loadPatientTestData/usePatientResultsData.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/common-datatable.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/common-datatable.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/common-overview.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/common-overview.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/external-overview.extension.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/external-overview.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/overview.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/recent-overview.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/recent-overview.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/overview/useOverviewData.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/helpers.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/panel-timeline-component.tsx (99%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/timeline-results.modal.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/timeline.component.tsx (93%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/timeline.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/types.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-timeline/useScroll.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/helper.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/panel-view.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/panel-view.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/panel.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/result-panel.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/panel-view/usePanelData.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/print-modal/print-modal.extension.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/print-modal/print-modal.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/results-viewer/index.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/results-viewer/mock-concept-tree.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/results-viewer/results-viewer-router.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/results-viewer/results-viewer.extension.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/results-viewer/results-viewer.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/tablet-overlay/index.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/tablet-overlay/tablet-overlay.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/tablet-overlay/tablet-overlay.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/tree-view/tree-view-wrapper.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/tree-view/tree-view.component.tsx (98%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/trendline/range-selector.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/trendline/trendline-resource.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/trendline/trendline.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/trendline/trendline.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-data-illustration.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/test-results/ui-elements/resetFiltersEmptyState/index.scss (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/src/types.ts (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/am.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/ar.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/en.json (98%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/es.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/fr.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/he.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/hi_IN.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/km.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/qu.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/zh.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/translations/zh_CN.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/tsconfig.json (100%) rename packages/{esm-patient-labs-app => esm-patient-tests-app}/webpack.config.js (100%) diff --git a/.tx/config b/.tx/config index 691c5dfe86..69e5e87e6e 100644 --- a/.tx/config +++ b/.tx/config @@ -100,15 +100,6 @@ replace_edited_strings = false keep_translations = false resource_name = esm-patient-immunizations-app -[o:openmrs:p:openmrs3:r:esm-patient-labs-app] -file_filter = packages/esm-patient-labs-app/translations/.json -source_file = packages/esm-patient-labs-app/translations/en.json -source_lang = en -type = KEYVALUEJSON -replace_edited_strings = false -keep_translations = false -resource_name = esm-patient-labs-app - [o:openmrs:p:openmrs3:r:esm-patient-lists-app] file_filter = packages/esm-patient-lists-app/translations/.json source_file = packages/esm-patient-lists-app/translations/en.json @@ -154,6 +145,15 @@ replace_edited_strings = false keep_translations = false resource_name = esm-patient-programs-app +[o:openmrs:p:openmrs3:r:esm-patient-tests-app] +file_filter = packages/esm-patient-tests-app/translations/.json +source_file = packages/esm-patient-tests-app/translations/en.json +source_lang = en +type = KEYVALUEJSON +replace_edited_strings = false +keep_translations = false +resource_name = esm-patient-tests-app + [o:openmrs:p:openmrs3:r:esm-patient-vitals-app] file_filter = packages/esm-patient-vitals-app/translations/.json source_file = packages/esm-patient-vitals-app/translations/en.json diff --git a/README.md b/README.md index a7c9fd9c00..026c3b21a8 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ The `openmrs-esm-patient-chart` is a frontend module for the OpenMRS SPA. It con - [Conditions](packages/esm-patient-conditions-app/README.md) - [Forms](packages/esm-patient-forms-app/README.md) - [Immunizations](packages/esm-patient-immunizations-app/README.md) -- [Labs](packages/esm-patient-labs-app/README.md) - [Medications](packages/esm-patient-medications-app/README.md) - [Notes](packages/esm-patient-notes-app/README.md) - [Patient banner](packages/esm-patient-banner-app/README.md) - [Patient chart](packages/esm-patient-chart-app/README.md) - [Programs](packages/esm-patient-programs-app/README.md) +- [Tests](packages/esm-patient-tests-app/README.md) - [Vitals](packages/esm-patient-vitals-app/README.md) In addition to these widgets, two other microfrontends exist that encapsulate cross-cutting concerns. These are: diff --git a/packages/esm-patient-labs-app/README.md b/packages/esm-patient-tests-app/README.md similarity index 56% rename from packages/esm-patient-labs-app/README.md rename to packages/esm-patient-tests-app/README.md index 8d203bb6b3..0d93bb3d79 100644 --- a/packages/esm-patient-labs-app/README.md +++ b/packages/esm-patient-tests-app/README.md @@ -1,65 +1,71 @@ -# esm-patient-labs-app +# esm-patient-tests-app -Functionality for viewing test results and ordering labs. +Functionality for viewing test results and ordering tests, whether lab tests, radiology, or otherwise. ## Test Results -It provides tabular and chart-based overviews of the test results available for a patient. - -IMPORTANT NOTE: To have data show up in this view, your concepts just need to have "Type: Test" or "Type: LabSet". -If you are seeing strange things showing up, like Temperature, in the Test Results viewer, then you probably just need to change the Type for your Temperature concept to something other than "Test", like finding. +It provides tabular and chart-based overviews of the test results available for a patient. +IMPORTANT NOTE: To have data show up in this view, your concepts just need to have "Type: Test" or "Type: LabSet". +If you are seeing strange things showing up, like Temperature, in the Test Results viewer, then you probably just need to change the Type for your Temperature concept to something other than "Test", such as "Finding." ## How to Configure the Lab Filter View -The Lab Filter feature enables you to set up custom filter views - eg based on standard medical hierarchies, or even based on your own custom ideas (e.g. "Our Favorite HIV-Related Tests"), like this: + +The Lab Filter feature enables you to set up custom filter views - eg based on standard medical hierarchies, or even based on your own custom concepts (e.g. "Our Favorite HIV-Related Tests"), like this: image -To configure your own Lab Filters, you need to use Labs, LabSets, and ConvSets (Convenience Sets) in your Concept Dictionary. +To configure your own Lab Filters, you need to use Labs, LabSets, and ConvSets (Convenience Sets) in your Concept Dictionary. Below, we will walk through the steps taken to set up [**this OpenMRS Example Lab Filter**](https://app.openconceptlab.org/#/orgs/openmrs/collections/ExampleLabFilter/). -### 1. Decide what you want. -In this example, we wanted a layout like: - * Bloodwork - * Hematology - * CBC - * Lymphocytes (%) - * Neutrophils (%) - * Hemoglobin - * Mean corpuscular volume (MCV) - * Hematocrit - * Red blood cells - * Platelets - * White blood cells - * Chemistry - * Serum Electrolytes - * Serum calcium - * Serum carbon dioxide - * Serum chloride - * Serum potassium - * Serum sodium +### 1. Decide what you want + +In this example, we wanted a layout like: + +* Bloodwork + * Hematology + * CBC + * Lymphocytes (%) + * Neutrophils (%) + * Hemoglobin + * Mean corpuscular volume (MCV) + * Hematocrit + * Red blood cells + * Platelets + * White blood cells + * Chemistry + * Serum Electrolytes + * Serum calcium + * Serum carbon dioxide + * Serum chloride + * Serum potassium + * Serum sodium ### 2. Create the "parents" as concepts with type = ConvSet - * Bloodwork --> Create as a custom concept, type = ConvSet - * Hematology --> Create as a custom concept, type = ConvSet - * Chemistry --> Create as a custom concept, type = ConvSet +* Bloodwork --> Create as a custom concept, type = ConvSet + * Hematology --> Create as a custom concept, type = ConvSet + * Chemistry --> Create as a custom concept, type = ConvSet ### 3. Add the "children" Set Members to each parent - * Bloodwork - * Hematology --> Add concept as a Set Member to "Bloodwork" - * CBC --> Add concept as a Set Member to "Hematology" - * Chemistry --> Add concept as a Set Member to "Bloodwork" - * Serum Electrolytes --> Add concept as a Set Member to "Chemistry" + +* Bloodwork + * Hematology --> Add concept as a Set Member to "Bloodwork" + * CBC --> Add concept as a Set Member to "Hematology" + * Chemistry --> Add concept as a Set Member to "Bloodwork" + * Serum Electrolytes --> Add concept as a Set Member to "Chemistry" _Note1: As of March 2022, Set Members cannot be added to concepts through the Term Browser, but you can either use your EMR directly or the OpenMRS Dictionary Manager._ _Note2: if you don't already have all the "children" concepts, e.g. CBC, Serum Electrolytes, you may have to add these specifically into your dictionary first._ ### 4. Check your work + Review your concepts to see that the hierarchy all looks right in the Dictionary/Collection. In the above example (which was created using the OpenMRS Dictionary Manager), you can see that _Bloodwork_ now correctly contains _Hematology_ and _Chemistry_. + image ### 5. Update the config-schema file with your ConvSet codes -Go here to add the UUIDs for each of your ConvSet concepts which you want to show up in the Lab Results filters: -https://github.com/openmrs/openmrs-esm-patient-chart/blob/master/packages/esm-patient-labs-app/src/config-schema.ts#L3 + +Go here to add the UUIDs for each of your ConvSet concepts which you want to show up in the Lab Results filters: + diff --git a/packages/esm-patient-labs-app/jest.config.js b/packages/esm-patient-tests-app/jest.config.js similarity index 100% rename from packages/esm-patient-labs-app/jest.config.js rename to packages/esm-patient-tests-app/jest.config.js diff --git a/packages/esm-patient-labs-app/package.json b/packages/esm-patient-tests-app/package.json similarity index 91% rename from packages/esm-patient-labs-app/package.json rename to packages/esm-patient-tests-app/package.json index 5c2ce45356..0e6751a8b3 100644 --- a/packages/esm-patient-labs-app/package.json +++ b/packages/esm-patient-tests-app/package.json @@ -1,9 +1,9 @@ { - "name": "@openmrs/esm-patient-labs-app", + "name": "@openmrs/esm-patient-tests-app", "version": "8.2.0", "license": "MPL-2.0", - "description": "Patient lab order and test results microfrontend for the OpenMRS SPA", - "browser": "dist/openmrs-esm-patient-labs-app.js", + "description": "Patient test order and results microfrontend for the OpenMRS SPA", + "browser": "dist/openmrs-esm-patient-tests-app.js", "main": "src/index.ts", "source": true, "scripts": { diff --git a/packages/esm-patient-labs-app/src/config-schema.ts b/packages/esm-patient-tests-app/src/config-schema.ts similarity index 99% rename from packages/esm-patient-labs-app/src/config-schema.ts rename to packages/esm-patient-tests-app/src/config-schema.ts index f851627b9d..17dfa0b109 100644 --- a/packages/esm-patient-labs-app/src/config-schema.ts +++ b/packages/esm-patient-tests-app/src/config-schema.ts @@ -80,15 +80,18 @@ export interface ObsTreeEntry { conceptUuid: string; defaultOpen: boolean; } + export interface LabTestReason { uuid: string; label?: string; } + export interface OrderReason { labTestUuid: string; required: boolean; orderReasons: Array; } + export interface ConfigObject { resultsViewerConcepts: Array; orders: { diff --git a/packages/esm-patient-labs-app/src/constants.ts b/packages/esm-patient-tests-app/src/constants.ts similarity index 100% rename from packages/esm-patient-labs-app/src/constants.ts rename to packages/esm-patient-tests-app/src/constants.ts diff --git a/packages/esm-patient-labs-app/src/index.ts b/packages/esm-patient-tests-app/src/index.ts similarity index 94% rename from packages/esm-patient-labs-app/src/index.ts rename to packages/esm-patient-tests-app/src/index.ts index 2a027504b6..2f1d0e0452 100644 --- a/packages/esm-patient-labs-app/src/index.ts +++ b/packages/esm-patient-tests-app/src/index.ts @@ -4,7 +4,6 @@ import { getAsyncLifecycle, getSyncLifecycle, messageOmrsServiceWorker, - translateFrom, } from '@openmrs/esm-framework'; import { createDashboardLink } from '@openmrs/esm-patient-common-lib'; import { configSchema } from './config-schema'; @@ -12,10 +11,10 @@ import { dashboardMeta } from './test-results/dashboard.meta'; import externalOverviewComponent from './test-results/overview/external-overview.extension'; import resultsViewerComponent from './test-results/results-viewer'; -const moduleName = '@openmrs/esm-patient-labs-app'; +const moduleName = '@openmrs/esm-patient-tests-app'; const options = { - featureName: 'patient-labs', + featureName: 'patient-tests', moduleName, }; diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.scss b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.scss rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.scss diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx similarity index 98% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx index 2a7dc0129a..eedcd66017 100644 --- a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx +++ b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx @@ -1,6 +1,6 @@ import React, { type ComponentProps, useCallback, useState } from 'react'; import classNames from 'classnames'; -import capitalize from 'lodash-es/capitalize'; +import { capitalize } from 'lodash-es'; import { useTranslation } from 'react-i18next'; import { Button } from '@carbon/react'; import { diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.component.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.scss b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order-form.scss rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order-form.scss diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order.ts b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order.ts similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/lab-order.ts rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/lab-order.ts diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.component.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/test-type-search.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.component.tsx rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/test-type-search.component.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.scss b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/test-type-search.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.scss rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/test-type-search.scss diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/useTestTypes.test.ts b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/useTestTypes.test.ts rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.test.ts diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/useTestTypes.ts b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.ts similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/add-lab-order/useTestTypes.ts rename to packages/esm-patient-tests-app/src/lab-orders/add-lab-order/useTestTypes.ts diff --git a/packages/esm-patient-labs-app/src/lab-orders/api.ts b/packages/esm-patient-tests-app/src/lab-orders/api.ts similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/api.ts rename to packages/esm-patient-tests-app/src/lab-orders/api.ts index 391c6d9f36..17b5b9f525 100644 --- a/packages/esm-patient-labs-app/src/lab-orders/api.ts +++ b/packages/esm-patient-tests-app/src/lab-orders/api.ts @@ -1,9 +1,9 @@ -import useSWR, { mutate } from 'swr'; import { useCallback, useMemo } from 'react'; -import useSWRImmutable from 'swr/immutable'; import { chunk } from 'lodash-es'; -import { type FetchResponse, openmrsFetch, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework'; +import useSWR, { mutate } from 'swr'; +import useSWRImmutable from 'swr/immutable'; import type { LabOrderBasketItem, OrderPost, PatientOrderFetchResponse } from '@openmrs/esm-patient-common-lib'; +import { type FetchResponse, openmrsFetch, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework'; import { type ConfigObject } from '../config-schema'; export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0'; diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-icon.component.tsx b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-icon.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-icon.component.tsx rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-icon.component.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.scss b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.scss rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.scss diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx index 52513ed35e..ca6d7eadbb 100644 --- a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx +++ b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { screen, render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import LabOrderBasketPanel from './lab-order-basket-panel.extension'; +import { screen, render } from '@testing-library/react'; import { type LabOrderBasketItem, type OrderBasketItem } from '@openmrs/esm-patient-common-lib'; +import LabOrderBasketPanel from './lab-order-basket-panel.extension'; const mockUseOrderBasket = jest.fn(); diff --git a/packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket.scss b/packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket.scss similarity index 100% rename from packages/esm-patient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket.scss rename to packages/esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket.scss diff --git a/packages/esm-patient-labs-app/src/routes.json b/packages/esm-patient-tests-app/src/routes.json similarity index 98% rename from packages/esm-patient-labs-app/src/routes.json rename to packages/esm-patient-tests-app/src/routes.json index e999edb316..2fcc6ca502 100644 --- a/packages/esm-patient-labs-app/src/routes.json +++ b/packages/esm-patient-tests-app/src/routes.json @@ -26,10 +26,6 @@ "slots": ["patient-chart-results-viewer-slot", "patient-chart-test-results-dashboard-slot"], "component": "resultsViewer" }, - { - "name": "print-modal", - "component": "printModal" - }, { "name": "lab-order-panel", "component": "labOrderPanel", @@ -41,9 +37,12 @@ { "name": "timeline-results-modal", "component": "timelineResultsModal" + }, + { + "name": "print-modal", + "component": "printModal" } ], - "pages": [], "workspaces": [ { "name": "add-lab-order", diff --git a/packages/esm-patient-labs-app/src/test-results/dashboard.meta.ts b/packages/esm-patient-tests-app/src/test-results/dashboard.meta.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/dashboard.meta.ts rename to packages/esm-patient-tests-app/src/test-results/dashboard.meta.ts diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-context.tsx b/packages/esm-patient-tests-app/src/test-results/filter/filter-context.tsx similarity index 98% rename from packages/esm-patient-labs-app/src/test-results/filter/filter-context.tsx rename to packages/esm-patient-tests-app/src/test-results/filter/filter-context.tsx index 264dd428b9..321d0ebdd7 100644 --- a/packages/esm-patient-labs-app/src/test-results/filter/filter-context.tsx +++ b/packages/esm-patient-tests-app/src/test-results/filter/filter-context.tsx @@ -1,5 +1,5 @@ import React, { createContext, useReducer, useEffect, useMemo } from 'react'; -import isObject from 'lodash/isObject'; +import { isObject } from 'lodash-es'; import { parseTime } from '../panel-timeline/helpers'; import { type TreeNode, diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-reducer.ts b/packages/esm-patient-tests-app/src/test-results/filter/filter-reducer.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/filter/filter-reducer.ts rename to packages/esm-patient-tests-app/src/test-results/filter/filter-reducer.ts index e629f3fef3..dc82fc2f30 100644 --- a/packages/esm-patient-labs-app/src/test-results/filter/filter-reducer.ts +++ b/packages/esm-patient-tests-app/src/test-results/filter/filter-reducer.ts @@ -1,10 +1,10 @@ import { + ReducerActionType, + type LowestNode, type ReducerAction, type ReducerState, - ReducerActionType, - type TreeParents, type TreeNode, - type LowestNode, + type TreeParents, } from './filter-types'; export const getName = (prefix, name) => { diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx b/packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/filter/filter-set.component.tsx rename to packages/esm-patient-tests-app/src/test-results/filter/filter-set.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-set.scss b/packages/esm-patient-tests-app/src/test-results/filter/filter-set.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/filter/filter-set.scss rename to packages/esm-patient-tests-app/src/test-results/filter/filter-set.scss diff --git a/packages/esm-patient-labs-app/src/test-results/filter/filter-types.ts b/packages/esm-patient-tests-app/src/test-results/filter/filter-types.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/filter/filter-types.ts rename to packages/esm-patient-tests-app/src/test-results/filter/filter-types.ts diff --git a/packages/esm-patient-labs-app/src/test-results/filter/index.ts b/packages/esm-patient-tests-app/src/test-results/filter/index.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/filter/index.ts rename to packages/esm-patient-tests-app/src/test-results/filter/index.ts diff --git a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline-types.ts b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline-types.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline-types.ts rename to packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline-types.ts diff --git a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline.component.tsx b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline.component.tsx rename to packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline.scss b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/grouped-timeline/grouped-timeline.scss rename to packages/esm-patient-tests-app/src/test-results/grouped-timeline/grouped-timeline.scss diff --git a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/index.ts b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/index.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/grouped-timeline/index.ts rename to packages/esm-patient-tests-app/src/test-results/grouped-timeline/index.ts diff --git a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/useObstreeData.ts b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/grouped-timeline/useObstreeData.ts rename to packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts index 63dcd8757b..4281aba00a 100644 --- a/packages/esm-patient-labs-app/src/test-results/grouped-timeline/useObstreeData.ts +++ b/packages/esm-patient-tests-app/src/test-results/grouped-timeline/useObstreeData.ts @@ -1,7 +1,7 @@ -import { usePatient, openmrsFetch, restBaseUrl, type FetchResponse } from '@openmrs/esm-framework'; import { useMemo } from 'react'; import useSWR from 'swr'; import useSWRInfinite from 'swr/infinite'; +import { usePatient, openmrsFetch, restBaseUrl, type FetchResponse } from '@openmrs/esm-framework'; import { assessValue, exist } from '../loadPatientTestData/helpers'; export const getName = (prefix: string | undefined, name: string) => { diff --git a/packages/esm-patient-labs-app/src/test-results/helpers.ts b/packages/esm-patient-tests-app/src/test-results/helpers.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/helpers.ts rename to packages/esm-patient-tests-app/src/test-results/helpers.ts diff --git a/packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.component.tsx b/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.component.tsx rename to packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.scss b/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.scss rename to packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.scss diff --git a/packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.test.tsx b/packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.test.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/individual-results-table/individual-results-table.test.tsx rename to packages/esm-patient-tests-app/src/test-results/individual-results-table/individual-results-table.test.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/loadPatientTestData/helpers.ts b/packages/esm-patient-tests-app/src/test-results/loadPatientTestData/helpers.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/loadPatientTestData/helpers.ts rename to packages/esm-patient-tests-app/src/test-results/loadPatientTestData/helpers.ts diff --git a/packages/esm-patient-labs-app/src/test-results/loadPatientTestData/loadPatientData.ts b/packages/esm-patient-tests-app/src/test-results/loadPatientTestData/loadPatientData.ts similarity index 99% rename from packages/esm-patient-labs-app/src/test-results/loadPatientTestData/loadPatientData.ts rename to packages/esm-patient-tests-app/src/test-results/loadPatientTestData/loadPatientData.ts index dc0f18dba8..6e9fced6bb 100644 --- a/packages/esm-patient-labs-app/src/test-results/loadPatientTestData/loadPatientData.ts +++ b/packages/esm-patient-tests-app/src/test-results/loadPatientTestData/loadPatientData.ts @@ -1,3 +1,11 @@ +import { uniq } from 'lodash-es'; +import { + type PatientData, + type ObsRecord, + type ConceptUuid, + type ObsUuid, + type ObsMetaInfo, +} from '@openmrs/esm-patient-common-lib'; import { getEntryConceptClassUuid, getUserDataFromCache, @@ -6,14 +14,6 @@ import { extractMetaInformation, addUserDataToCache, } from './helpers'; -import { - type PatientData, - type ObsRecord, - type ConceptUuid, - type ObsUuid, - type ObsMetaInfo, -} from '@openmrs/esm-patient-common-lib'; -import uniq from 'lodash-es/uniq'; function parseSingleObsData( testConceptNameMap: Record, diff --git a/packages/esm-patient-labs-app/src/test-results/loadPatientTestData/usePatientResultsData.ts b/packages/esm-patient-tests-app/src/test-results/loadPatientTestData/usePatientResultsData.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/loadPatientTestData/usePatientResultsData.ts rename to packages/esm-patient-tests-app/src/test-results/loadPatientTestData/usePatientResultsData.ts diff --git a/packages/esm-patient-labs-app/src/test-results/overview/common-datatable.component.tsx b/packages/esm-patient-tests-app/src/test-results/overview/common-datatable.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/common-datatable.component.tsx rename to packages/esm-patient-tests-app/src/test-results/overview/common-datatable.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/overview/common-datatable.scss b/packages/esm-patient-tests-app/src/test-results/overview/common-datatable.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/common-datatable.scss rename to packages/esm-patient-tests-app/src/test-results/overview/common-datatable.scss diff --git a/packages/esm-patient-labs-app/src/test-results/overview/common-overview.component.tsx b/packages/esm-patient-tests-app/src/test-results/overview/common-overview.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/common-overview.component.tsx rename to packages/esm-patient-tests-app/src/test-results/overview/common-overview.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/overview/common-overview.scss b/packages/esm-patient-tests-app/src/test-results/overview/common-overview.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/common-overview.scss rename to packages/esm-patient-tests-app/src/test-results/overview/common-overview.scss diff --git a/packages/esm-patient-labs-app/src/test-results/overview/external-overview.extension.tsx b/packages/esm-patient-tests-app/src/test-results/overview/external-overview.extension.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/external-overview.extension.tsx rename to packages/esm-patient-tests-app/src/test-results/overview/external-overview.extension.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/overview/external-overview.scss b/packages/esm-patient-tests-app/src/test-results/overview/external-overview.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/external-overview.scss rename to packages/esm-patient-tests-app/src/test-results/overview/external-overview.scss diff --git a/packages/esm-patient-labs-app/src/test-results/overview/overview.component.tsx b/packages/esm-patient-tests-app/src/test-results/overview/overview.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/overview.component.tsx rename to packages/esm-patient-tests-app/src/test-results/overview/overview.component.tsx index d073c80f39..cddf3562f7 100644 --- a/packages/esm-patient-labs-app/src/test-results/overview/overview.component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/overview/overview.component.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import useOverviewData from './useOverviewData'; -import CommonOverview from './common-overview.component'; import { DataTableSkeleton } from '@carbon/react'; import { navigate } from '@openmrs/esm-framework'; +import CommonOverview from './common-overview.component'; +import useOverviewData from './useOverviewData'; const defaultOpenTimeline = (patientUuid, panelUuid) => { const url = `/patient/${patientUuid}/testresults/timeline/${panelUuid}`; diff --git a/packages/esm-patient-labs-app/src/test-results/overview/recent-overview.component.tsx b/packages/esm-patient-tests-app/src/test-results/overview/recent-overview.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/recent-overview.component.tsx rename to packages/esm-patient-tests-app/src/test-results/overview/recent-overview.component.tsx index 7885fe2e15..e4c58238b2 100644 --- a/packages/esm-patient-labs-app/src/test-results/overview/recent-overview.component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/overview/recent-overview.component.tsx @@ -3,10 +3,10 @@ import { useTranslation } from 'react-i18next'; import { Button, DataTableSkeleton } from '@carbon/react'; import { EmptyState } from '@openmrs/esm-patient-common-lib'; import { ArrowRightIcon, useLayoutType } from '@openmrs/esm-framework'; -import styles from './recent-overview.scss'; import useOverviewData from './useOverviewData'; import CommonOverview from './common-overview.component'; import { navigateToResults, navigateToTimeline, navigateToTrendline } from '../helpers'; +import styles from './recent-overview.scss'; const RECENT_COUNT = 5; diff --git a/packages/esm-patient-labs-app/src/test-results/overview/recent-overview.scss b/packages/esm-patient-tests-app/src/test-results/overview/recent-overview.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/recent-overview.scss rename to packages/esm-patient-tests-app/src/test-results/overview/recent-overview.scss diff --git a/packages/esm-patient-labs-app/src/test-results/overview/useOverviewData.ts b/packages/esm-patient-tests-app/src/test-results/overview/useOverviewData.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/overview/useOverviewData.ts rename to packages/esm-patient-tests-app/src/test-results/overview/useOverviewData.ts diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/helpers.tsx b/packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/helpers.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/helpers.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/panel-timeline-component.tsx b/packages/esm-patient-tests-app/src/test-results/panel-timeline/panel-timeline-component.tsx similarity index 99% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/panel-timeline-component.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/panel-timeline-component.tsx index f16aac916d..4399a10cd0 100644 --- a/packages/esm-patient-labs-app/src/test-results/panel-timeline/panel-timeline-component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/panel-timeline/panel-timeline-component.tsx @@ -25,6 +25,7 @@ const PanelTimelineComponent: React.FC = ({ activeP allTimes.map((time) => observations.find((obs) => obs.effectiveDateTime === time)), ]), ); + if (!activePanel) { return

{t('panelTimelineInstructions', 'Select a panel to view the timeline')}

; } diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline-results.modal.tsx b/packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline-results.modal.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline-results.modal.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline-results.modal.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline.component.tsx b/packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline.component.tsx similarity index 93% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline.component.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline.component.tsx index 5d75d2c741..719eb94f46 100644 --- a/packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline.component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline.component.tsx @@ -1,9 +1,10 @@ import React from 'react'; import classNames from 'classnames'; +import { useTranslation } from 'react-i18next'; import { EmptyState } from '@openmrs/esm-patient-common-lib'; import { PaddingContainer, TimeSlots, Grid, RowStartCell, GridItems, ShadowBox } from './helpers'; import { type ParsedTimeType } from '../filter/filter-types'; -import type { ObsRecord } from '../../types'; +import { type ObsRecord } from '../../types'; import useScrollIndicator from './useScroll'; import styles from './timeline.scss'; @@ -107,6 +108,7 @@ const DataRows: React.FC = ({ timeColumns, rowData, sortedTimes, ); export const Timeline: React.FC = ({ parsedTime, rowData, panelName, sortedTimes, testUuid }) => { + const { t } = useTranslation(); const [xIsScrolled, yIsScrolled, containerRef] = useScrollIndicator(0, 32); const { yearColumns, dayColumns, timeColumns } = parsedTime; @@ -137,7 +139,12 @@ export const Timeline: React.FC = ({ parsedTime, rowData, panelN ); - return ; + return ( + + ); }; export default Timeline; diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline.scss b/packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/timeline.scss rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/timeline.scss diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/types.ts b/packages/esm-patient-tests-app/src/test-results/panel-timeline/types.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/types.ts rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/types.ts diff --git a/packages/esm-patient-labs-app/src/test-results/panel-timeline/useScroll.ts b/packages/esm-patient-tests-app/src/test-results/panel-timeline/useScroll.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-timeline/useScroll.ts rename to packages/esm-patient-tests-app/src/test-results/panel-timeline/useScroll.ts diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/helper.tsx b/packages/esm-patient-tests-app/src/test-results/panel-view/helper.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/helper.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-view/helper.tsx index b6efc4c61c..1586f65457 100644 --- a/packages/esm-patient-labs-app/src/test-results/panel-view/helper.tsx +++ b/packages/esm-patient-tests-app/src/test-results/panel-view/helper.tsx @@ -1,6 +1,6 @@ -import styles from './result-panel.scss'; -import { type Concept, type ConceptMeta, type FHIRObservationResource, observationInterpretation } from '../../types'; import { type OBSERVATION_INTERPRETATION } from '@openmrs/esm-patient-common-lib'; +import { type Concept, type ConceptMeta, type FHIRObservationResource, observationInterpretation } from '../../types'; +import styles from './result-panel.scss'; export const getConceptUuid = (obs: FHIRObservationResource) => obs?.code.coding[0].code; diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/panel-view.component.tsx b/packages/esm-patient-tests-app/src/test-results/panel-view/panel-view.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/panel-view.component.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-view/panel-view.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/panel-view.scss b/packages/esm-patient-tests-app/src/test-results/panel-view/panel-view.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/panel-view.scss rename to packages/esm-patient-tests-app/src/test-results/panel-view/panel-view.scss diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/panel.component.tsx b/packages/esm-patient-tests-app/src/test-results/panel-view/panel.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/panel.component.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-view/panel.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/result-panel.scss b/packages/esm-patient-tests-app/src/test-results/panel-view/result-panel.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/result-panel.scss rename to packages/esm-patient-tests-app/src/test-results/panel-view/result-panel.scss diff --git a/packages/esm-patient-labs-app/src/test-results/panel-view/usePanelData.tsx b/packages/esm-patient-tests-app/src/test-results/panel-view/usePanelData.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/panel-view/usePanelData.tsx rename to packages/esm-patient-tests-app/src/test-results/panel-view/usePanelData.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/print-modal/print-modal.extension.tsx b/packages/esm-patient-tests-app/src/test-results/print-modal/print-modal.extension.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/print-modal/print-modal.extension.tsx rename to packages/esm-patient-tests-app/src/test-results/print-modal/print-modal.extension.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/print-modal/print-modal.scss b/packages/esm-patient-tests-app/src/test-results/print-modal/print-modal.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/print-modal/print-modal.scss rename to packages/esm-patient-tests-app/src/test-results/print-modal/print-modal.scss diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/index.ts b/packages/esm-patient-tests-app/src/test-results/results-viewer/index.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/results-viewer/index.ts rename to packages/esm-patient-tests-app/src/test-results/results-viewer/index.ts diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/mock-concept-tree.ts b/packages/esm-patient-tests-app/src/test-results/results-viewer/mock-concept-tree.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/results-viewer/mock-concept-tree.ts rename to packages/esm-patient-tests-app/src/test-results/results-viewer/mock-concept-tree.ts diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer-router.tsx b/packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer-router.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer-router.tsx rename to packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer-router.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx b/packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer.extension.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.extension.tsx rename to packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer.extension.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.scss b/packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/results-viewer/results-viewer.scss rename to packages/esm-patient-tests-app/src/test-results/results-viewer/results-viewer.scss diff --git a/packages/esm-patient-labs-app/src/test-results/tablet-overlay/index.ts b/packages/esm-patient-tests-app/src/test-results/tablet-overlay/index.ts similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/tablet-overlay/index.ts rename to packages/esm-patient-tests-app/src/test-results/tablet-overlay/index.ts diff --git a/packages/esm-patient-labs-app/src/test-results/tablet-overlay/tablet-overlay.component.tsx b/packages/esm-patient-tests-app/src/test-results/tablet-overlay/tablet-overlay.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/tablet-overlay/tablet-overlay.component.tsx rename to packages/esm-patient-tests-app/src/test-results/tablet-overlay/tablet-overlay.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/tablet-overlay/tablet-overlay.scss b/packages/esm-patient-tests-app/src/test-results/tablet-overlay/tablet-overlay.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/tablet-overlay/tablet-overlay.scss rename to packages/esm-patient-tests-app/src/test-results/tablet-overlay/tablet-overlay.scss diff --git a/packages/esm-patient-labs-app/src/test-results/tree-view/tree-view-wrapper.component.tsx b/packages/esm-patient-tests-app/src/test-results/tree-view/tree-view-wrapper.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/tree-view/tree-view-wrapper.component.tsx rename to packages/esm-patient-tests-app/src/test-results/tree-view/tree-view-wrapper.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/tree-view/tree-view.component.tsx b/packages/esm-patient-tests-app/src/test-results/tree-view/tree-view.component.tsx similarity index 98% rename from packages/esm-patient-labs-app/src/test-results/tree-view/tree-view.component.tsx rename to packages/esm-patient-tests-app/src/test-results/tree-view/tree-view.component.tsx index cc895e4750..d38f28ae5e 100644 --- a/packages/esm-patient-labs-app/src/test-results/tree-view/tree-view.component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/tree-view/tree-view.component.tsx @@ -1,16 +1,16 @@ -import React, { useContext, useEffect, useState } from 'react'; +import React, { useContext, useState } from 'react'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; import { AccordionSkeleton, DataTableSkeleton, Button, Layer } from '@carbon/react'; import { useLayoutType, TreeViewAltIcon } from '@openmrs/esm-framework'; import { EmptyState } from '@openmrs/esm-patient-common-lib'; +import { type viewOpts } from '../../types'; import FilterSet, { FilterContext } from '../filter'; import GroupedTimeline from '../grouped-timeline'; +import IndividualResultsTable from '../individual-results-table/individual-results-table.component'; import TabletOverlay from '../tablet-overlay'; import Trendline from '../trendline/trendline.component'; import usePanelData from '../panel-view/usePanelData'; -import { type viewOpts } from '../../types'; -import IndividualResultsTable from '../individual-results-table/individual-results-table.component'; import styles from '../results-viewer/results-viewer.scss'; interface TreeViewProps { diff --git a/packages/esm-patient-labs-app/src/test-results/trendline/range-selector.component.tsx b/packages/esm-patient-tests-app/src/test-results/trendline/range-selector.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/trendline/range-selector.component.tsx rename to packages/esm-patient-tests-app/src/test-results/trendline/range-selector.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/trendline/trendline-resource.tsx b/packages/esm-patient-tests-app/src/test-results/trendline/trendline-resource.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/trendline/trendline-resource.tsx rename to packages/esm-patient-tests-app/src/test-results/trendline/trendline-resource.tsx index 4a68df5088..ede7baad75 100644 --- a/packages/esm-patient-labs-app/src/test-results/trendline/trendline-resource.tsx +++ b/packages/esm-patient-tests-app/src/test-results/trendline/trendline-resource.tsx @@ -1,7 +1,7 @@ -import useSWR from 'swr'; -import { assessValue } from '../loadPatientTestData/helpers'; import { useMemo } from 'react'; +import useSWR from 'swr'; import { type FetchResponse, openmrsFetch, showSnackbar, restBaseUrl } from '@openmrs/esm-framework'; +import { assessValue } from '../loadPatientTestData/helpers'; import { type TreeNode } from '../filter/filter-types'; function computeTrendlineData(treeNode: TreeNode): Array { diff --git a/packages/esm-patient-labs-app/src/test-results/trendline/trendline.component.tsx b/packages/esm-patient-tests-app/src/test-results/trendline/trendline.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/trendline/trendline.component.tsx rename to packages/esm-patient-tests-app/src/test-results/trendline/trendline.component.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/trendline/trendline.scss b/packages/esm-patient-tests-app/src/test-results/trendline/trendline.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/trendline/trendline.scss rename to packages/esm-patient-tests-app/src/test-results/trendline/trendline.scss diff --git a/packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-data-illustration.tsx b/packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-data-illustration.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-data-illustration.tsx rename to packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-data-illustration.tsx diff --git a/packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx b/packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx rename to packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx index 70a06e945d..7b9788c41e 100644 --- a/packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx +++ b/packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/filter-empty-state.component.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { Layer, Tile } from '@carbon/react'; import { useTranslation } from 'react-i18next'; -import styles from './index.scss'; import FilterEmptyDataIllustration from './filter-empty-data-illustration'; +import styles from './index.scss'; export interface EmptyStateProps { clearFilter(): void; diff --git a/packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/index.scss b/packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/index.scss similarity index 100% rename from packages/esm-patient-labs-app/src/test-results/ui-elements/resetFiltersEmptyState/index.scss rename to packages/esm-patient-tests-app/src/test-results/ui-elements/resetFiltersEmptyState/index.scss diff --git a/packages/esm-patient-labs-app/src/types.ts b/packages/esm-patient-tests-app/src/types.ts similarity index 100% rename from packages/esm-patient-labs-app/src/types.ts rename to packages/esm-patient-tests-app/src/types.ts diff --git a/packages/esm-patient-labs-app/translations/am.json b/packages/esm-patient-tests-app/translations/am.json similarity index 100% rename from packages/esm-patient-labs-app/translations/am.json rename to packages/esm-patient-tests-app/translations/am.json diff --git a/packages/esm-patient-labs-app/translations/ar.json b/packages/esm-patient-tests-app/translations/ar.json similarity index 100% rename from packages/esm-patient-labs-app/translations/ar.json rename to packages/esm-patient-tests-app/translations/ar.json diff --git a/packages/esm-patient-labs-app/translations/en.json b/packages/esm-patient-tests-app/translations/en.json similarity index 98% rename from packages/esm-patient-labs-app/translations/en.json rename to packages/esm-patient-tests-app/translations/en.json index 6ee6845107..ddf2a0cbc5 100644 --- a/packages/esm-patient-labs-app/translations/en.json +++ b/packages/esm-patient-tests-app/translations/en.json @@ -12,6 +12,7 @@ "closeSearchBar": "Close search", "data": "data", "dataLoadError": "Data load error", + "dataTimeline": "Data Timeline", "dataTimelineText": "Data timeline", "date": "Date", "dateCollected": "Displaying date collected", @@ -86,6 +87,7 @@ "tests": "Tests", "testType": "Test type", "timeline": "Timeline", + "timelineData_lower": "timeline data", "tree": "Tree", "trend": "Trend", "trendline": "Trendline", diff --git a/packages/esm-patient-labs-app/translations/es.json b/packages/esm-patient-tests-app/translations/es.json similarity index 100% rename from packages/esm-patient-labs-app/translations/es.json rename to packages/esm-patient-tests-app/translations/es.json diff --git a/packages/esm-patient-labs-app/translations/fr.json b/packages/esm-patient-tests-app/translations/fr.json similarity index 100% rename from packages/esm-patient-labs-app/translations/fr.json rename to packages/esm-patient-tests-app/translations/fr.json diff --git a/packages/esm-patient-labs-app/translations/he.json b/packages/esm-patient-tests-app/translations/he.json similarity index 100% rename from packages/esm-patient-labs-app/translations/he.json rename to packages/esm-patient-tests-app/translations/he.json diff --git a/packages/esm-patient-labs-app/translations/hi_IN.json b/packages/esm-patient-tests-app/translations/hi_IN.json similarity index 100% rename from packages/esm-patient-labs-app/translations/hi_IN.json rename to packages/esm-patient-tests-app/translations/hi_IN.json diff --git a/packages/esm-patient-labs-app/translations/km.json b/packages/esm-patient-tests-app/translations/km.json similarity index 100% rename from packages/esm-patient-labs-app/translations/km.json rename to packages/esm-patient-tests-app/translations/km.json diff --git a/packages/esm-patient-labs-app/translations/qu.json b/packages/esm-patient-tests-app/translations/qu.json similarity index 100% rename from packages/esm-patient-labs-app/translations/qu.json rename to packages/esm-patient-tests-app/translations/qu.json diff --git a/packages/esm-patient-labs-app/translations/zh.json b/packages/esm-patient-tests-app/translations/zh.json similarity index 100% rename from packages/esm-patient-labs-app/translations/zh.json rename to packages/esm-patient-tests-app/translations/zh.json diff --git a/packages/esm-patient-labs-app/translations/zh_CN.json b/packages/esm-patient-tests-app/translations/zh_CN.json similarity index 100% rename from packages/esm-patient-labs-app/translations/zh_CN.json rename to packages/esm-patient-tests-app/translations/zh_CN.json diff --git a/packages/esm-patient-labs-app/tsconfig.json b/packages/esm-patient-tests-app/tsconfig.json similarity index 100% rename from packages/esm-patient-labs-app/tsconfig.json rename to packages/esm-patient-tests-app/tsconfig.json diff --git a/packages/esm-patient-labs-app/webpack.config.js b/packages/esm-patient-tests-app/webpack.config.js similarity index 100% rename from packages/esm-patient-labs-app/webpack.config.js rename to packages/esm-patient-tests-app/webpack.config.js diff --git a/yarn.lock b/yarn.lock index 818d587695..ca9dca747b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6112,21 +6112,17 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-labs-app@workspace:packages/esm-patient-labs-app": +"@openmrs/esm-patient-lists-app@workspace:packages/esm-patient-lists-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-labs-app@workspace:packages/esm-patient-labs-app" + resolution: "@openmrs/esm-patient-lists-app@workspace:packages/esm-patient-lists-app" dependencies: - "@carbon/charts": "npm:^1.5.2" - "@carbon/charts-react": "npm:^1.5.2" - "@carbon/react": "npm:^1.12.0" + "@carbon/react": "npm:^1.33.1" "@openmrs/esm-patient-common-lib": "workspace:*" - d3: "npm:^7.6.1" - fuzzy: "npm:^0.1.3" - lodash-es: "npm:^4.17.21" webpack: "npm:^5.94.0" peerDependencies: "@openmrs/esm-framework": 5.x "@openmrs/esm-patient-common-lib": 8.x + dayjs: 1.x react: 18.x react-i18next: 11.x react-router-dom: 6.x @@ -6135,12 +6131,13 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-lists-app@workspace:packages/esm-patient-lists-app": +"@openmrs/esm-patient-medications-app@workspace:packages/esm-patient-medications-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-lists-app@workspace:packages/esm-patient-lists-app" + resolution: "@openmrs/esm-patient-medications-app@workspace:packages/esm-patient-medications-app" dependencies: - "@carbon/react": "npm:^1.33.1" + "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" + lodash-es: "npm:^4.17.21" webpack: "npm:^5.94.0" peerDependencies: "@openmrs/esm-framework": 5.x @@ -6154,11 +6151,10 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-medications-app@workspace:packages/esm-patient-medications-app": +"@openmrs/esm-patient-notes-app@workspace:packages/esm-patient-notes-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-medications-app@workspace:packages/esm-patient-medications-app" + resolution: "@openmrs/esm-patient-notes-app@workspace:packages/esm-patient-notes-app" dependencies: - "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" lodash-es: "npm:^4.17.21" webpack: "npm:^5.94.0" @@ -6174,10 +6170,11 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-notes-app@workspace:packages/esm-patient-notes-app": +"@openmrs/esm-patient-orders-app@workspace:packages/esm-patient-orders-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-notes-app@workspace:packages/esm-patient-notes-app" + resolution: "@openmrs/esm-patient-orders-app@workspace:packages/esm-patient-orders-app" dependencies: + "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" lodash-es: "npm:^4.17.21" webpack: "npm:^5.94.0" @@ -6193,9 +6190,9 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-orders-app@workspace:packages/esm-patient-orders-app": +"@openmrs/esm-patient-programs-app@workspace:packages/esm-patient-programs-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-orders-app@workspace:packages/esm-patient-orders-app" + resolution: "@openmrs/esm-patient-programs-app@workspace:packages/esm-patient-programs-app" dependencies: "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" @@ -6213,18 +6210,21 @@ __metadata: languageName: unknown linkType: soft -"@openmrs/esm-patient-programs-app@workspace:packages/esm-patient-programs-app": +"@openmrs/esm-patient-tests-app@workspace:packages/esm-patient-tests-app": version: 0.0.0-use.local - resolution: "@openmrs/esm-patient-programs-app@workspace:packages/esm-patient-programs-app" + resolution: "@openmrs/esm-patient-tests-app@workspace:packages/esm-patient-tests-app" dependencies: + "@carbon/charts": "npm:^1.5.2" + "@carbon/charts-react": "npm:^1.5.2" "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" + d3: "npm:^7.6.1" + fuzzy: "npm:^0.1.3" lodash-es: "npm:^4.17.21" webpack: "npm:^5.94.0" peerDependencies: "@openmrs/esm-framework": 5.x "@openmrs/esm-patient-common-lib": 8.x - dayjs: 1.x react: 18.x react-i18next: 11.x react-router-dom: 6.x