@openmrs/esm-patient-tests-app 11.3.1-patch.9064 → 11.3.1-patch.9310

package/src/test-results/individual-results-table/individual-results-table.test.tsx

@@ -21,10 +21,41 @@ describe('IndividualResultsTable', () => {
         units: 'copies/ml',
         flatName: 'HIV viral load-HIV viral load',
         hasData: true,
+        range: '0 – 50', // Node-level range
+        lowNormal: 0,
+        hiNormal: 50,
       },
     ],
   } as GroupedObservation;
 
+  const mockSubRowsWithObservationRange = {
+    key: 'Alkaline phosphatase',
+    date: '2024-10-15',
+    flatName: 'Alkaline phosphatase',
+    entries: [
+      {
+        obsDatetime: '2024-10-15 03:20:19.0',
+        value: '15',
+        interpretation: 'CRITICALLY_LOW',
+        key: 'Alkaline phosphatase',
+        datatype: 'Numeric',
+        lowAbsolute: 0,
+        display: 'Alkaline phosphatase',
+        conceptUuid: '785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        units: 'U/L',
+        flatName: 'Alkaline phosphatase',
+        hasData: true,
+        range: '35 – 147', // Observation-level range (different from node-level)
+        lowNormal: 35,
+        hiNormal: 147,
+        lowCritical: 25,
+        hiCritical: 200,
+      },
+    ],
+    range: '0 – 270', // Node-level range (fallback)
+    units: 'U/L',
+  } as GroupedObservation;
+
   const mockEmptySubRows = {
     key: 'HIV viral load',
     date: '2024-10-15',
@@ -33,18 +64,49 @@ describe('IndividualResultsTable', () => {
   } as GroupedObservation;
 
   it('renders a loading skeleton when fetching results data', () => {
-    render(<IndividualResultsTable isLoading={true} subRows={mockEmptySubRows} index={0} title={'HIV viral load'} />);
+    render(
+      <IndividualResultsTable
+        patientUuid={'patient-uuid'}
+        isLoading={true}
+        subRows={mockEmptySubRows}
+        index={0}
+        title={'HIV viral load'}
+      />,
+    );
 
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 
   it('renders a tabular overview of the available test result data', () => {
-    render(<IndividualResultsTable isLoading={false} subRows={mockSubRows} index={0} title={'HIV viral load'} />);
+    render(
+      <IndividualResultsTable
+        patientUuid={'patient-uuid'}
+        isLoading={false}
+        subRows={mockSubRows}
+        index={0}
+        title={'HIV viral load'}
+      />,
+    );
 
     expect(screen.getByRole('table')).toBeInTheDocument();
     expect(screen.getByText(/15-Oct-2024/i)).toBeInTheDocument();
     expect(screen.getByText(/test name/i)).toBeInTheDocument();
     expect(screen.getByText(/reference range/i)).toBeInTheDocument();
-    expect(screen.getByRole('row', { name: /hiv viral load 45 copies\/ml -- copies\/ml/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /hiv viral load 45 copies\/ml 0 – 50 copies\/ml/i })).toBeInTheDocument();
+  });
+
+  it('uses observation-level range when available', () => {
+    render(
+      <IndividualResultsTable
+        patientUuid={'patient-uuid'}
+        isLoading={false}
+        subRows={mockSubRowsWithObservationRange}
+        index={0}
+        title={'Alkaline phosphatase'}
+      />,
+    );
+
+    // Should display observation-level range (35 – 147) not node-level (0 – 270)
+    expect(screen.getByRole('row', { name: /alkaline phosphatase 15 u\/l 35 – 147 u\/l/i })).toBeInTheDocument();
   });
 });

package/src/test-results/individual-results-table-tablet/helper.tsx

@@ -1,8 +1,14 @@
 import { type OBSERVATION_INTERPRETATION } from '@openmrs/esm-patient-common-lib';
-import { type Concept, type ConceptMeta, type FHIRObservationResource, observationInterpretation } from '../../types';
+import {
+  type Concept,
+  type ConceptMeta,
+  type FHIRObservationResource,
+  type ObsRecord,
+  observationInterpretation,
+} from '../../types';
 import styles from './lab-set-panel.scss';
 
-export const getConceptUuid = (obs: FHIRObservationResource) => obs?.code.coding[0].code;
+export const getConceptUuid = (obs: FHIRObservationResource | ObsRecord) => obs?.code.coding?.[0]?.code;
 
 export const getClass = (interpretation: OBSERVATION_INTERPRETATION) => {
   switch (interpretation) {

package/src/test-results/individual-results-table-tablet/individual-results-table-tablet.component.tsx

@@ -233,7 +233,7 @@ const IndividualResultsTableTabletHeader: React.FC<IndividualResultsTableTabletH
           <Form onSubmit={handleSearchTerm} className={styles.flexBaseline}>
             <Search
               autoFocus
-              labelText=""
+              labelText={t('searchByTestName', 'Search by test name')}
               onChange={(e) => setLocalSearchTerm(e.target.value)}
               placeholder={t('searchByTestName', 'Search by test name')}
               size="sm"
@@ -263,7 +263,7 @@ const IndividualResultsTableTabletHeader: React.FC<IndividualResultsTableTabletH
             <Form onSubmit={handleSearchTerm} className={classNames(styles.flex)}>
               <Search
                 autoFocus
-                labelText=""
+                labelText={t('searchByTestName', 'Search by test name')}
                 onChange={(e) => setLocalSearchTerm(e.target.value)}
                 placeholder={t('searchByTestName', 'Search by test name')}
                 size="lg"

package/src/test-results/individual-results-table-tablet/lab-set-panel.component.tsx

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
+import { rangeAlreadyHasUnits } from '../grouped-timeline/reference-range-helpers';
 import {
   DataTable,
   TableContainer,
@@ -70,7 +71,10 @@ const LabSetPanel: React.FC<LabSetPanelProps> = ({ panel, activePanel, setActive
       hasRange
         ? panel.entries.map((test) => {
             const units = test.units ?? '';
-            const range = test.range ? `${test.range} ${units}` : '--';
+            // Check if range already includes units to avoid duplication
+            // formatReferenceRange includes units, so if range has units, don't append again
+            const hasUnits = rangeAlreadyHasUnits(test.range, units);
+            const range = hasUnits ? test.range : test.range ? `${test.range} ${units}` : '--';
             return {
               id: test.conceptUuid,
               testName: test.display,