@openmrs/esm-patient-tests-app 11.3.1-patch.9310 → 11.3.1-patch.9508
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +19 -22
- package/dist/1119.js +1 -1
- package/dist/1197.js +1 -1
- package/dist/{6231.js → 1477.js} +1 -1
- package/dist/1477.js.map +1 -0
- package/dist/1638.js +1 -1
- package/dist/1638.js.map +1 -1
- package/dist/1935.js +1 -0
- package/dist/1935.js.map +1 -0
- package/dist/2146.js +1 -1
- package/dist/2690.js +1 -1
- package/dist/3099.js +1 -1
- package/dist/34.js +1 -0
- package/dist/34.js.map +1 -0
- package/dist/3509.js +1 -1
- package/dist/3509.js.map +1 -1
- package/dist/3584.js +1 -1
- package/dist/4055.js +1 -1
- package/dist/4132.js +1 -1
- package/dist/4300.js +1 -1
- package/dist/4335.js +1 -1
- package/dist/439.js +1 -0
- package/dist/4618.js +1 -1
- package/dist/4652.js +1 -1
- package/dist/4944.js +1 -1
- package/dist/5173.js +1 -1
- package/dist/5241.js +1 -1
- package/dist/5442.js +1 -1
- package/dist/5661.js +1 -1
- package/dist/5670.js +1 -1
- package/dist/6022.js +1 -1
- package/dist/6113.js +1 -0
- package/dist/6113.js.map +1 -0
- package/dist/6301.js +1 -1
- package/dist/6301.js.map +1 -1
- package/dist/6468.js +1 -1
- package/dist/6589.js +1 -0
- package/dist/6679.js +1 -1
- package/dist/6840.js +1 -1
- package/dist/6859.js +1 -1
- package/dist/7097.js +1 -1
- package/dist/7159.js +1 -1
- package/dist/7202.js +1 -0
- package/dist/7202.js.map +1 -0
- package/dist/723.js +1 -1
- package/dist/7617.js +1 -1
- package/dist/790.js +1 -1
- package/dist/790.js.map +1 -1
- package/dist/795.js +1 -1
- package/dist/8163.js +1 -1
- package/dist/8349.js +1 -1
- package/dist/8371.js +1 -0
- package/dist/8555.js +2 -0
- package/dist/8555.js.map +1 -0
- package/dist/8618.js +1 -1
- package/dist/890.js +1 -1
- package/dist/9214.js +1 -1
- package/dist/9538.js +1 -1
- package/dist/9569.js +1 -1
- package/dist/986.js +1 -1
- package/dist/9879.js +1 -1
- package/dist/9895.js +1 -1
- package/dist/9900.js +1 -1
- package/dist/9913.js +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/openmrs-esm-patient-tests-app.js +1 -1
- package/dist/openmrs-esm-patient-tests-app.js.buildmanifest.json +302 -211
- package/dist/openmrs-esm-patient-tests-app.js.map +1 -1
- package/dist/routes.json +1 -1
- package/package.json +2 -2
- package/src/edit-test-results/modal/edit-lab-results.modal.tsx +2 -2
- package/src/index.ts +1 -1
- package/src/routes.json +4 -3
- package/src/test-orders/add-test-order/add-test-order.test.tsx +44 -21
- package/src/test-orders/add-test-order/add-test-order.workspace.tsx +152 -21
- package/src/test-orders/add-test-order/test-order-form.component.tsx +60 -68
- package/src/test-orders/add-test-order/test-order.ts +3 -3
- package/src/test-orders/add-test-order/test-type-search.component.tsx +60 -28
- package/src/test-orders/api.ts +2 -6
- package/src/test-orders/lab-order-basket-panel/lab-icon.component.tsx +27 -0
- package/src/test-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx +1 -1
- package/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx +95 -30
- package/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.scss +26 -11
- package/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx +12 -10
- package/src/test-results/filter/filter-context.test.tsx +556 -0
- package/src/test-results/filter/filter-context.tsx +1 -1
- package/src/test-results/filter/filter-reducer.test.ts +540 -0
- package/src/test-results/filter/filter-reducer.ts +1 -1
- package/src/test-results/filter/filter-set.component.tsx +75 -48
- package/src/test-results/filter/filter-set.test.tsx +694 -0
- package/src/test-results/filter/filter-types.ts +5 -1
- package/src/test-results/grouped-timeline/grid.component.tsx +4 -2
- package/src/test-results/grouped-timeline/grouped-timeline.component.tsx +20 -22
- package/src/test-results/grouped-timeline/grouped-timeline.test.tsx +3 -2
- package/src/test-results/grouped-timeline/reference-range-helpers.test.ts +37 -1
- package/src/test-results/grouped-timeline/reference-range-helpers.ts +50 -1
- package/src/test-results/grouped-timeline/timeline-data-group.component.tsx +4 -4
- package/src/test-results/grouped-timeline/useObstreeData.test.ts +471 -0
- package/src/test-results/grouped-timeline/useObstreeData.ts +37 -4
- package/src/test-results/individual-results-table/individual-results-table.component.tsx +2 -7
- package/src/test-results/individual-results-table-tablet/individual-results-table-tablet.component.tsx +3 -3
- package/src/test-results/individual-results-table-tablet/lab-set-panel.component.tsx +2 -5
- package/src/test-results/individual-results-table-tablet/usePanelData.tsx +40 -26
- package/src/test-results/loadPatientTestData/helpers.ts +29 -12
- package/src/test-results/loadPatientTestData/usePatientResultsData.ts +18 -7
- package/src/test-results/overview/external-overview.extension.tsx +1 -2
- package/src/test-results/print-modal/print-modal.extension.tsx +1 -1
- package/src/test-results/results-viewer/results-viewer.extension.tsx +8 -4
- package/src/test-results/tree-view/tree-view.component.tsx +18 -5
- package/src/test-results/tree-view/tree-view.test.tsx +119 -2
- package/src/test-results/trendline/trendline.component.tsx +88 -52
- package/src/test-results/ui-elements/{resetFiltersEmptyState → reset-filters-empty-state}/filter-empty-data-illustration.tsx +2 -2
- package/src/test-results/ui-elements/{resetFiltersEmptyState → reset-filters-empty-state}/filter-empty-state.component.tsx +5 -6
- package/src/types.ts +9 -0
- package/translations/am.json +3 -4
- package/translations/ar.json +3 -4
- package/translations/ar_SY.json +3 -4
- package/translations/bn.json +3 -4
- package/translations/cs.json +119 -0
- package/translations/de.json +3 -4
- package/translations/en.json +3 -4
- package/translations/en_US.json +3 -4
- package/translations/es.json +3 -4
- package/translations/es_MX.json +3 -4
- package/translations/fr.json +3 -4
- package/translations/he.json +3 -4
- package/translations/hi.json +3 -4
- package/translations/hi_IN.json +3 -4
- package/translations/id.json +3 -4
- package/translations/it.json +3 -4
- package/translations/ka.json +3 -4
- package/translations/km.json +3 -4
- package/translations/ku.json +3 -4
- package/translations/ky.json +3 -4
- package/translations/lg.json +3 -4
- package/translations/ne.json +3 -4
- package/translations/pl.json +3 -4
- package/translations/pt.json +3 -4
- package/translations/pt_BR.json +3 -4
- package/translations/qu.json +3 -4
- package/translations/ro_RO.json +3 -4
- package/translations/ru_RU.json +3 -4
- package/translations/si.json +3 -4
- package/translations/sq.json +119 -0
- package/translations/sw.json +3 -4
- package/translations/sw_KE.json +3 -4
- package/translations/tr.json +3 -4
- package/translations/tr_TR.json +3 -4
- package/translations/uk.json +3 -4
- package/translations/uz.json +3 -4
- package/translations/uz@Latn.json +3 -4
- package/translations/uz_UZ.json +3 -4
- package/translations/vi.json +3 -4
- package/translations/zh.json +3 -4
- package/translations/zh_CN.json +3 -4
- package/translations/zh_TW.json +119 -0
- package/dist/1479.js +0 -1
- package/dist/1479.js.map +0 -1
- package/dist/5348.js +0 -1
- package/dist/5348.js.map +0 -1
- package/dist/6231.js.map +0 -1
- package/dist/9540.js +0 -2
- package/dist/9540.js.map +0 -1
- package/dist/9838.js +0 -1
- package/dist/9838.js.map +0 -1
- package/src/test-orders/add-test-order/add-test-order.component.tsx +0 -125
- package/src/test-orders/add-test-order/exported-add-test-order.workspace.tsx +0 -30
- /package/dist/{9540.js.LICENSE.txt → 8555.js.LICENSE.txt} +0 -0
- /package/src/test-results/ui-elements/{resetFiltersEmptyState/index.scss → reset-filters-empty-state/filter-empty-state.scss} +0 -0
|
@@ -1,125 +0,0 @@
|
|
|
1
|
-
import React, { type ComponentProps, useMemo, useState } from 'react';
|
|
2
|
-
import classNames from 'classnames';
|
|
3
|
-
import { capitalize } from 'lodash-es';
|
|
4
|
-
import { useTranslation } from 'react-i18next';
|
|
5
|
-
import { Button } from '@carbon/react';
|
|
6
|
-
import {
|
|
7
|
-
age,
|
|
8
|
-
ArrowLeftIcon,
|
|
9
|
-
getPatientName,
|
|
10
|
-
formatDate,
|
|
11
|
-
parseDate,
|
|
12
|
-
useLayoutType,
|
|
13
|
-
useConfig,
|
|
14
|
-
Workspace2,
|
|
15
|
-
type Visit,
|
|
16
|
-
type Workspace2DefinitionProps,
|
|
17
|
-
} from '@openmrs/esm-framework';
|
|
18
|
-
import { useOrderType, type OrderBasketItem, type TestOrderBasketItem } from '@openmrs/esm-patient-common-lib';
|
|
19
|
-
import { type ConfigObject } from '../../config-schema';
|
|
20
|
-
import { LabOrderForm } from './test-order-form.component';
|
|
21
|
-
import { TestTypeSearch } from './test-type-search.component';
|
|
22
|
-
import styles from './add-test-order.scss';
|
|
23
|
-
|
|
24
|
-
export interface AddLabOrderProps {
|
|
25
|
-
initialOrder?: OrderBasketItem;
|
|
26
|
-
orderTypeUuid: string;
|
|
27
|
-
patient: fhir.Patient;
|
|
28
|
-
visitContext: Visit;
|
|
29
|
-
closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
const AddLabOrder: React.FC<AddLabOrderProps> = ({
|
|
33
|
-
patient,
|
|
34
|
-
visitContext,
|
|
35
|
-
initialOrder,
|
|
36
|
-
orderTypeUuid,
|
|
37
|
-
closeWorkspace,
|
|
38
|
-
}) => {
|
|
39
|
-
const { t } = useTranslation();
|
|
40
|
-
const isTablet = useLayoutType() === 'tablet';
|
|
41
|
-
const [currentLabOrder, setCurrentLabOrder] = useState(initialOrder as TestOrderBasketItem);
|
|
42
|
-
const { additionalTestOrderTypes, orders } = useConfig<ConfigObject>();
|
|
43
|
-
const { orderType } = useOrderType(orderTypeUuid);
|
|
44
|
-
const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
|
|
45
|
-
|
|
46
|
-
const title = useMemo(() => {
|
|
47
|
-
if (orderType) {
|
|
48
|
-
if (initialOrder?.action == 'REVISE') {
|
|
49
|
-
return t(`editOrderableForOrderType`, 'Edit {{orderTypeDisplay}}', {
|
|
50
|
-
orderTypeDisplay: orderType.display.toLocaleLowerCase(),
|
|
51
|
-
});
|
|
52
|
-
} else {
|
|
53
|
-
return t(`addOrderableForOrderType`, 'Add {{orderTypeDisplay}}', {
|
|
54
|
-
orderTypeDisplay: orderType.display.toLocaleLowerCase(),
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
} else {
|
|
58
|
-
return '';
|
|
59
|
-
}
|
|
60
|
-
}, [orderType, t, initialOrder?.action]);
|
|
61
|
-
|
|
62
|
-
const orderableConceptSets = useMemo(() => {
|
|
63
|
-
const allOrderTypes: ConfigObject['additionalTestOrderTypes'] = [
|
|
64
|
-
{
|
|
65
|
-
label: t('labOrders', 'Lab orders'),
|
|
66
|
-
orderTypeUuid: orders.labOrderTypeUuid,
|
|
67
|
-
orderableConceptSets: orders.labOrderableConcepts,
|
|
68
|
-
},
|
|
69
|
-
...additionalTestOrderTypes,
|
|
70
|
-
];
|
|
71
|
-
return allOrderTypes.find((orderType) => orderType.orderTypeUuid === orderTypeUuid).orderableConceptSets;
|
|
72
|
-
}, [additionalTestOrderTypes, orderTypeUuid, orders.labOrderTypeUuid, orders.labOrderableConcepts, t]);
|
|
73
|
-
|
|
74
|
-
const patientName = patient ? getPatientName(patient) : '';
|
|
75
|
-
|
|
76
|
-
return (
|
|
77
|
-
<Workspace2 title={title} hasUnsavedChanges={hasUnsavedChanges}>
|
|
78
|
-
<div className={styles.container}>
|
|
79
|
-
{isTablet && (
|
|
80
|
-
<div className={styles.patientHeader}>
|
|
81
|
-
<span className={styles.bodyShort02}>{patientName}</span>
|
|
82
|
-
<span className={classNames(styles.text02, styles.bodyShort01)}>
|
|
83
|
-
{capitalize(patient?.gender)} · {age(patient?.birthDate)} ·{' '}
|
|
84
|
-
<span>{formatDate(parseDate(patient?.birthDate), { mode: 'wide', time: false })}</span>
|
|
85
|
-
</span>
|
|
86
|
-
</div>
|
|
87
|
-
)}
|
|
88
|
-
{!isTablet && (
|
|
89
|
-
<div className={styles.backButton}>
|
|
90
|
-
<Button
|
|
91
|
-
kind="ghost"
|
|
92
|
-
renderIcon={(props: ComponentProps<typeof ArrowLeftIcon>) => <ArrowLeftIcon size={24} {...props} />}
|
|
93
|
-
iconDescription="Return to order basket"
|
|
94
|
-
size="sm"
|
|
95
|
-
onClick={() => closeWorkspace()}
|
|
96
|
-
>
|
|
97
|
-
<span>{t('backToOrderBasket', 'Back to order basket')}</span>
|
|
98
|
-
</Button>
|
|
99
|
-
</div>
|
|
100
|
-
)}
|
|
101
|
-
{currentLabOrder ? (
|
|
102
|
-
<LabOrderForm
|
|
103
|
-
initialOrder={currentLabOrder}
|
|
104
|
-
closeWorkspace={closeWorkspace}
|
|
105
|
-
setHasUnsavedChanges={setHasUnsavedChanges}
|
|
106
|
-
orderTypeUuid={orderTypeUuid}
|
|
107
|
-
orderableConceptSets={orderableConceptSets}
|
|
108
|
-
patient={patient}
|
|
109
|
-
/>
|
|
110
|
-
) : (
|
|
111
|
-
<TestTypeSearch
|
|
112
|
-
orderTypeUuid={orderTypeUuid}
|
|
113
|
-
orderableConceptSets={orderableConceptSets}
|
|
114
|
-
openLabForm={setCurrentLabOrder}
|
|
115
|
-
closeWorkspace={closeWorkspace}
|
|
116
|
-
patient={patient}
|
|
117
|
-
visit={visitContext}
|
|
118
|
-
/>
|
|
119
|
-
)}
|
|
120
|
-
</div>
|
|
121
|
-
</Workspace2>
|
|
122
|
-
);
|
|
123
|
-
};
|
|
124
|
-
|
|
125
|
-
export default AddLabOrder;
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { type Workspace2DefinitionProps } from '@openmrs/esm-framework';
|
|
3
|
-
import { type ExportedOrderBasketWindowProps, type OrderBasketItem } from '@openmrs/esm-patient-common-lib';
|
|
4
|
-
import AddLabOrder from './add-test-order.component';
|
|
5
|
-
|
|
6
|
-
export interface AddTestOrderWorkspaceProps {
|
|
7
|
-
order?: OrderBasketItem;
|
|
8
|
-
orderTypeUuid: string;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* This workspace displays the labs order form for adding or editing a labs order.
|
|
13
|
-
*
|
|
14
|
-
* Design: https://app.zeplin.io/project/60d5947dd636aebbd63dce4c/screen/640b06c440ee3f7af8747620
|
|
15
|
-
*/
|
|
16
|
-
export default function ExportedAddTestOrderWorkspace({
|
|
17
|
-
windowProps: { patient, visitContext },
|
|
18
|
-
workspaceProps: { order: initialOrder, orderTypeUuid },
|
|
19
|
-
closeWorkspace,
|
|
20
|
-
}: Workspace2DefinitionProps<AddTestOrderWorkspaceProps, ExportedOrderBasketWindowProps, {}>) {
|
|
21
|
-
return (
|
|
22
|
-
<AddLabOrder
|
|
23
|
-
patient={patient}
|
|
24
|
-
visitContext={visitContext}
|
|
25
|
-
initialOrder={initialOrder}
|
|
26
|
-
orderTypeUuid={orderTypeUuid}
|
|
27
|
-
closeWorkspace={closeWorkspace}
|
|
28
|
-
/>
|
|
29
|
-
);
|
|
30
|
-
}
|
|
File without changes
|