@openmrs/esm-laboratory-app 1.2.1-pre.739 → 1.2.1-pre.740

package/dist/openmrs-esm-laboratory-app.js.buildmanifest.json

@@ -218,9 +218,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 40257,
+      "size": 40790,
       "sizes": {
-        "javascript": 40257
+        "javascript": 40790
       },
       "names": [],
       "idHints": [],
@@ -234,7 +234,7 @@
       "auxiliaryFiles": [
         "1120.js.map"
       ],
-      "hash": "d49cc4835730f829",
+      "hash": "29dddb34ccedc4c9",
       "childrenByOrder": {}
     },
     {
@@ -264,10 +264,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 74326,
+      "size": 75165,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 74284
+        "javascript": 75123
       },
       "names": [],
       "idHints": [],
@@ -280,7 +280,7 @@
       "auxiliaryFiles": [
         "1788.js.map"
       ],
-      "hash": "b71a99918f613cab",
+      "hash": "9ff21cc90be63cdf",
       "childrenByOrder": {}
     },
     {
@@ -526,9 +526,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 609,
+      "size": 606,
       "sizes": {
-        "javascript": 609
+        "javascript": 606
       },
       "names": [],
       "idHints": [],
@@ -542,7 +542,7 @@
       "auxiliaryFiles": [
         "3656.js.map"
       ],
-      "hash": "ba700160a1ef21b4",
+      "hash": "004c8b5953bfa4a0",
       "childrenByOrder": {}
     },
     {
@@ -596,9 +596,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 625,
+      "size": 655,
       "sizes": {
-        "javascript": 625
+        "javascript": 655
       },
       "names": [],
       "idHints": [],
@@ -612,7 +612,7 @@
       "auxiliaryFiles": [
         "4069.js.map"
       ],
-      "hash": "09bb24717667c319",
+      "hash": "b296e202ab7e3a08",
       "childrenByOrder": {}
     },
     {
@@ -666,9 +666,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2174,
+      "size": 2175,
       "sizes": {
-        "javascript": 2174
+        "javascript": 2175
       },
       "names": [],
       "idHints": [],
@@ -680,7 +680,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "eac8032bf0461437",
+      "hash": "71deebbed405413c",
       "childrenByOrder": {}
     },
     {
@@ -800,9 +800,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 19080,
+      "size": 19613,
       "sizes": {
-        "javascript": 19080
+        "javascript": 19613
       },
       "names": [],
       "idHints": [],
@@ -816,7 +816,7 @@
       "auxiliaryFiles": [
         "5085.js.map"
       ],
-      "hash": "5c51bbbd9517d426",
+      "hash": "a871c0871547ba58",
       "childrenByOrder": {}
     },
     {
@@ -980,9 +980,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 146403,
+      "size": 148280,
       "sizes": {
-        "javascript": 146403
+        "javascript": 148280
       },
       "names": [],
       "idHints": [],
@@ -996,7 +996,7 @@
       "auxiliaryFiles": [
         "6134.js.map"
       ],
-      "hash": "8a6d97f3e3948633",
+      "hash": "53524e1d0e200b7e",
       "childrenByOrder": {}
     },
     {
@@ -1184,9 +1184,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 645,
+      "size": 694,
       "sizes": {
-        "javascript": 645
+        "javascript": 694
       },
       "names": [],
       "idHints": [],
@@ -1200,7 +1200,7 @@
       "auxiliaryFiles": [
         "7423.js.map"
       ],
-      "hash": "935db041eff89a55",
+      "hash": "0fe8a00532cf2f89",
       "childrenByOrder": {}
     },
     {
@@ -1274,9 +1274,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9073,
+      "size": 9606,
       "sizes": {
-        "javascript": 9073
+        "javascript": 9606
       },
       "names": [],
       "idHints": [],
@@ -1290,7 +1290,7 @@
       "auxiliaryFiles": [
         "8554.js.map"
       ],
-      "hash": "731befcdfa8ed740",
+      "hash": "63e9e6eda7a0d876",
       "childrenByOrder": {}
     },
     {
@@ -1320,9 +1320,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 650,
+      "size": 674,
       "sizes": {
-        "javascript": 650
+        "javascript": 674
       },
       "names": [],
       "idHints": [],
@@ -1336,7 +1336,7 @@
       "auxiliaryFiles": [
         "8667.js.map"
       ],
-      "hash": "23de6d3f05104789",
+      "hash": "170e7977205c7d9a",
       "childrenByOrder": {}
     },
     {
@@ -1344,10 +1344,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3971892,
+      "size": 3972731,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 3950593,
+        "javascript": 3951432,
         "share-init": 210,
         "runtime": 20837
       },
@@ -1364,7 +1364,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "64d7fd9dc133af83",
+      "hash": "2b00889e33bc1a34",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"laboratory"}],"extensions":[{"name":"laboratory-dashboard","slot":"laboratory-dashboard-slot","component":"root"},{"name":"laboratory-dashboard-link","slot":"homepage-dashboard-slot","component":"laboratoryDashboardLink","meta":{"name":"laboratory","slot":"laboratory-dashboard-slot","title":"Laboratory"}},{"name":"pickup-lab-request-modal","component":"pickupLabRequestModal"},{"name":"reject-lab-request-modal","component":"rejectLabRequestModal"},{"name":"all-lab-requests-table","slot":"lab-panels-slot","component":"allLabRequestsTable","meta":{"name":"inprogressPanel","title":"Tests ordered"}},{"name":"inprogress-lab-requests-table","slot":"lab-panels-slot","component":"inprogressLabRequestsTable","meta":{"name":"inprogressPanel","title":"In progress"}},{"name":"completed-lab-requests-table","slot":"lab-panels-slot","component":"completedLabRequestsTable","meta":{"name":"completedPanel","title":"Completed"}},{"name":"tests-ordered-tile-component","slot":"lab-tiles-slot","component":"testOrderedTile","meta":{"name":"testsOrderedTileSlot","title":"Ordered tests"}},{"name":"worklist-tile-component","slot":"lab-tiles-slot","component":"worklistTile","meta":{"name":"worklisTileSlot","title":"Worklist"}},{"name":"completed-tile-component","slot":"lab-tiles-slot","component":"completedTile","meta":{"name":"referredPanleSlot","title":"Referred tests"}},{"name":"declined-tile-component","slot":"lab-panels-slot","component":"declinedLabRequestsTable","meta":{"name":"declinedPanel","title":"Declined tests"}},{"name":"pick-lab-request-action","component":"pickupLabRequestAction","slot":"tests-ordered-actions-slot"},{"name":"reject-lab-request-tests-ordered-action","component":"rejectLabRequestAction","slot":"rejected-ordered-actions-slot"},{"name":"edit-lab-request-tests-ordered-action","component":"editLabRequestAction","slot":"completed-ordered-actions-slot"},{"name":"reject-lab-request-worklist-action","component":"rejectLabRequestAction","slot":"inprogress-tests-actions-slot"},{"name":"add-lab-request-results-action","component":"addLabRequestResultsAction","slot":"inprogress-tests-actions-slot"},{"name":"edit-lab-request-tests-ordered-action","component":"editLabRequestAction","slot":"completed-ordered-actions-slot"}],"version":"1.2.1-pre.739"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"laboratory"}],"extensions":[{"name":"laboratory-dashboard","slot":"laboratory-dashboard-slot","component":"root"},{"name":"laboratory-dashboard-link","slot":"homepage-dashboard-slot","component":"laboratoryDashboardLink","meta":{"name":"laboratory","slot":"laboratory-dashboard-slot","title":"Laboratory"}},{"name":"pickup-lab-request-modal","component":"pickupLabRequestModal"},{"name":"reject-lab-request-modal","component":"rejectLabRequestModal"},{"name":"all-lab-requests-table","slot":"lab-panels-slot","component":"allLabRequestsTable","meta":{"name":"inprogressPanel","title":"Tests ordered"}},{"name":"inprogress-lab-requests-table","slot":"lab-panels-slot","component":"inprogressLabRequestsTable","meta":{"name":"inprogressPanel","title":"In progress"}},{"name":"completed-lab-requests-table","slot":"lab-panels-slot","component":"completedLabRequestsTable","meta":{"name":"completedPanel","title":"Completed"}},{"name":"tests-ordered-tile-component","slot":"lab-tiles-slot","component":"testOrderedTile","meta":{"name":"testsOrderedTileSlot","title":"Ordered tests"}},{"name":"worklist-tile-component","slot":"lab-tiles-slot","component":"worklistTile","meta":{"name":"worklisTileSlot","title":"Worklist"}},{"name":"completed-tile-component","slot":"lab-tiles-slot","component":"completedTile","meta":{"name":"referredPanleSlot","title":"Referred tests"}},{"name":"declined-tile-component","slot":"lab-panels-slot","component":"declinedLabRequestsTable","meta":{"name":"declinedPanel","title":"Declined tests"}},{"name":"pick-lab-request-action","component":"pickupLabRequestAction","slot":"tests-ordered-actions-slot"},{"name":"reject-lab-request-tests-ordered-action","component":"rejectLabRequestAction","slot":"rejected-ordered-actions-slot"},{"name":"edit-lab-request-tests-ordered-action","component":"editLabRequestAction","slot":"completed-ordered-actions-slot"},{"name":"reject-lab-request-worklist-action","component":"rejectLabRequestAction","slot":"inprogress-tests-actions-slot"},{"name":"add-lab-request-results-action","component":"addLabRequestResultsAction","slot":"inprogress-tests-actions-slot"},{"name":"edit-lab-request-tests-ordered-action","component":"editLabRequestAction","slot":"completed-ordered-actions-slot"}],"version":"1.2.1-pre.740"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-laboratory-app",
-  "version": "1.2.1-pre.739",
+  "version": "1.2.1-pre.740",
   "license": "MPL-2.0",
   "description": "An O3 frontend module for managing laboratory requests and queues",
   "browser": "dist/openmrs-esm-laboratory-app.js",

package/src/components/orders-table/list-order-details.component.tsx

@@ -10,8 +10,8 @@ import {
   StructuredListWrapper,
 } from '@carbon/react';
 import { capitalize } from 'lodash-es';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import { type ListOrdersDetailsProps } from '../../types';
+import { ExtensionSlot, formatDate, parseDate } from '@openmrs/esm-framework';
+import { type GroupedOrders, type OrderAction } from '../../types';
 import styles from './list-order-details.scss';
 
 type OrderDetailsRowProps = {
@@ -19,6 +19,11 @@ type OrderDetailsRowProps = {
   value: ReactNode;
 };
 
+export interface ListOrdersDetailsProps {
+  groupedOrders: GroupedOrders;
+  actions: Array<OrderAction>;
+}
+
 const OrderDetailRow = ({ label, value }: OrderDetailsRowProps) => {
   return (
     <StructuredListRow className={styles.orderDetailsRow}>
@@ -33,48 +38,51 @@ const OrderDetailRow = ({ label, value }: OrderDetailsRowProps) => {
 };
 const ListOrderDetails: React.FC<ListOrdersDetailsProps> = ({ groupedOrders }) => {
   const { t } = useTranslation();
-  const orders = groupedOrders?.orders ?? [];
+  const originalOrders = groupedOrders?.originalOrders ?? [];
 
   return (
     <div>
-      {orders.map((row) => (
-        <div key={row.orderNumber} className={styles.orderDetailsContainer}>
+      {originalOrders.map((order) => (
+        <div key={order.orderNumber} className={styles.orderDetailsContainer}>
           <StructuredListWrapper className={styles.orderDetailsWrapper}>
             <StructuredListBody>
               <OrderDetailRow
                 label={t('urgencyStatus', 'Urgency:')}
                 value={
-                  <div className={styles.priorityPill} data-urgency={row.urgency?.replace('_', ' ')}>
-                    {capitalize(row.urgency?.replace(/_/g, ' '))}
+                  <div className={styles.priorityPill} data-urgency={order.urgency?.replace('_', ' ')}>
+                    {capitalize(order.urgency?.replace(/_/g, ' '))}
                   </div>
                 }
               />
-              <OrderDetailRow label={t('testOrdered', 'Test ordered:')} value={capitalize(row.display)} />
+              <OrderDetailRow label={t('testOrdered', 'Test ordered:')} value={order.display} />
               <OrderDetailRow
                 label={t('orderStatus', 'Status:')}
                 value={
                   <div
                     className={styles.statusPill}
-                    data-status={(row.fulfillerStatus ?? 'Order not picked').replace('_', ' ')}
+                    data-status={(order.fulfillerStatus ?? 'Order not picked').replace('_', ' ')}
                   >
-                    {capitalize(row.fulfillerStatus?.replace('_', '')) || t('orderNotPicked', 'Order not picked')}
+                    {capitalize(order.fulfillerStatus?.replace('_', '')) || t('orderNotPicked', 'Order not picked')}
                   </div>
                 }
               />
-              <OrderDetailRow label={t('orderNumbers', 'Order number:')} value={capitalize(row.orderNumber)} />
-              <OrderDetailRow label={t('orderDate', 'Order date:')} value={row.dateActivated} />
-              <OrderDetailRow label={t('orderedBy', 'Ordered By:')} value={capitalize(row.orderer?.display)} />
+              <OrderDetailRow label={t('orderNumbers', 'Order number:')} value={order.orderNumber} />
+              <OrderDetailRow
+                label={t('orderDate', 'Order date:')}
+                value={formatDate(parseDate(order.dateActivated))}
+              />
+              <OrderDetailRow label={t('orderedBy', 'Ordered By:')} value={order.orderer.display} />
               <OrderDetailRow
                 label={t('orderInstructions', 'Instructions:')}
-                value={row.instructions ?? t('NoInstructionLeft', 'No instructions are provided.')}
+                value={order.instructions ?? t('NoInstructionLeft', 'No instructions are provided.')}
               />
 
-              {row.fulfillerStatus === 'DECLINED' && (
-                <OrderDetailRow label={t('reasonForDecline', 'Reason for decline:')} value={row.fulfillerComment} />
+              {order.fulfillerStatus === 'DECLINED' && (
+                <OrderDetailRow label={t('reasonForDecline', 'Reason for decline:')} value={order.fulfillerComment} />
               )}
             </StructuredListBody>
           </StructuredListWrapper>
-          {row.fulfillerStatus === 'COMPLETED' && (
+          {order.fulfillerStatus === 'COMPLETED' && (
             <Accordion>
               <AccordionItem
                 title={<span className={styles.accordionTitle}>{t('viewTestResults', 'View test results')}</span>}
@@ -82,7 +90,7 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = ({ groupedOrders }) =
                 <div className={styles.viewResults}>
                   <ExtensionSlot
                     className={styles.labResultSlot}
-                    state={{ order: row }}
+                    state={{ order: order }}
                     name="completed-lab-order-results-slot"
                   />
                 </div>
@@ -91,20 +99,19 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = ({ groupedOrders }) =
           )}
 
           <div className={styles.buttonSection}>
-            {/* @ts-ignore */}
-            {row.fulfillerStatus === 'New' || row.fulfillerStatus === 'RECEIVED' || row.fulfillerStatus == null ? (
+            {order.fulfillerStatus === 'RECEIVED' || order.fulfillerStatus == null ? (
               <>
                 <div className={styles.testsOrderedActions}>
-                  <ExtensionSlot state={{ order: row }} name="rejected-ordered-actions-slot" />
-                  <ExtensionSlot state={{ order: row }} name="tests-ordered-actions-slot" />
+                  <ExtensionSlot state={{ order: order }} name="rejected-ordered-actions-slot" />
+                  <ExtensionSlot state={{ order: order }} name="tests-ordered-actions-slot" />
                 </div>
               </>
-            ) : row.fulfillerStatus === 'IN_PROGRESS' ? (
+            ) : order.fulfillerStatus === 'IN_PROGRESS' ? (
               <>
                 <div className={styles.testsOrderedActions}>
                   <ExtensionSlot
                     className={styles.menuLink}
-                    state={{ order: row }}
+                    state={{ order: order }}
                     name="inprogress-tests-actions-slot"
                   />
                 </div>

package/src/components/orders-table/list-order-details.scss

@@ -119,7 +119,6 @@
     background-color: colors.$green-20;
   }
 
-  &[data-status='DISCONTINUED'],
   &[data-status='DECLINED'],
   &[data-status='Order not picked'] {
     background-color: colors.$red-20;

package/src/components/orders-table/orders-data-table.component.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
   DataTable,
   DataTableSkeleton,
@@ -22,67 +22,152 @@ import {
   TableToolbarSearch,
   Tile,
 } from '@carbon/react';
-import { ExtensionSlot, formatDate, parseDate, showModal, usePagination } from '@openmrs/esm-framework';
+import {
+  ExtensionSlot,
+  formatDate,
+  parseDate,
+  type Patient,
+  showModal,
+  useConfig,
+  usePagination,
+} from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
-import { type Order } from '@openmrs/esm-patient-common-lib';
-import type { FulfillerStatus, OrdersDataTableProps } from '../../types';
-import { useLabOrders, useSearchGroupedResults } from '../../laboratory-resource';
+import { type Order, type FulfillerStatus } from '@openmrs/esm-patient-common-lib';
+import { type FlattenedOrder, type OrderAction } from '../../types';
+import { useLabOrders } from '../../laboratory-resource';
 import { OrdersDateRangePicker } from './orders-date-range-picker.component';
 import ListOrderDetails from './list-order-details.component';
 import styles from './orders-data-table.scss';
+import { type Config } from '../../config-schema';
+
+const labTableColumnSpec = {
+  name: {
+    // t('patient', 'Patient')
+    headerLabelKey: 'patient',
+    headerLabelDefault: 'Patient',
+    key: 'patientName',
+  },
+  age: {
+    // t('age', 'Age')
+    headerLabelKey: 'age',
+    headerLabelDefault: 'Age',
+    key: 'patientAge',
+  },
+  sex: {
+    // t('sex', 'Sex')
+    headerLabelKey: 'sex',
+    headerLabelDefault: 'Sex',
+    key: 'patientSex',
+  },
+  totalOrders: {
+    // t('totalOrders', 'Total Orders')
+    headerLabelKey: 'totalOrders',
+    headerLabelDefault: 'Total Orders',
+    key: 'totalOrders',
+  },
+  action: {
+    // t('action', 'Action')
+    headerLabelKey: 'action',
+    headerLabelDefault: 'Action',
+    key: 'action',
+  },
+  patientId: {
+    // t('patientId', 'Patient ID')
+    headerLabelKey: 'patientId',
+    headerLabelDefault: 'Patient ID',
+    key: 'patientId',
+  },
+};
+
+export interface OrdersDataTableProps {
+  /* Whether the data table should include a status filter dropdown */
+  useFilter?: boolean;
+  actionsSlotName?: string;
+  excludeColumns?: Array<string>;
+  fulfillerStatus?: FulfillerStatus;
+  newOrdersOnly?: boolean;
+  excludeCanceledAndDiscontinuedOrders?: boolean;
+  actions?: Array<OrderAction>;
+}
 
 const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   const { t } = useTranslation();
   const [filter, setFilter] = useState<FulfillerStatus>(null);
   const [searchString, setSearchString] = useState('');
+  const { labTableColumns, patientIdIdentifierTypeUuid } = useConfig<Config>();
 
-  const { labOrders, isLoading } = useLabOrders(
-    props.useFilter ? filter : props.fulfillerStatus,
-    props.excludeCanceledAndDiscontinuedOrders,
-  );
+  const { labOrders, isLoading } = useLabOrders({
+    status: props.useFilter ? filter : props.fulfillerStatus,
+    newOrdersOnly: props.newOrdersOnly,
+    excludeCanceled: props.excludeCanceledAndDiscontinuedOrders,
+    includePatientId: labTableColumns.includes('patientId'),
+  });
 
-  const flattenedLabOrders: Order[] = useMemo(() => {
+  const flattenedLabOrders: Array<FlattenedOrder> = useMemo(() => {
     return (
       labOrders?.map((order) => {
         return {
-          ...order,
+          id: order.uuid,
+          patientUuid: order.patient.uuid,
+          orderNumber: order.orderNumber,
           dateActivated: formatDate(parseDate(order.dateActivated)),
-          patientName: order.patient?.person.display,
-          patientUuid: order.patient?.uuid,
-          patientAge: order.patient?.person?.age,
-          status: order.fulfillerStatus ?? '--',
-          orderer: order.orderer,
+          fulfillerStatus: order.fulfillerStatus,
+          urgency: order.urgency,
+          orderer: order.orderer?.display,
+          instructions: order.instructions,
+          fulfillerComment: order.fulfillerComment,
+          display: order.display,
         };
       }) ?? []
     );
   }, [labOrders]);
 
-  function groupOrdersById(orders) {
-    if (orders && orders.length > 0) {
-      const groupedOrders = orders.reduce((acc, item) => {
-        if (!acc[item.patientUuid]) {
-          acc[item.patientUuid] = [];
-        }
-        acc[item.patientUuid].push(item);
-        return acc;
-      }, {});
+  const groupedOrdersByPatient = useMemo(() => {
+    if (labOrders && labOrders.length > 0) {
+      const patientUuids = [...new Set(labOrders.map((order) => order.patient.uuid))];
 
-      return Object.keys(groupedOrders).map((patientId) => ({
-        patientId: patientId,
-        orders: groupedOrders[patientId],
-      }));
+      return patientUuids.map((patientUuid) => {
+        const labOrdersForPatient = labOrders.filter((order) => order.patient.uuid === patientUuid);
+        const patient: Patient = labOrdersForPatient[0]?.patient;
+        const flattenedLabOrdersForPatient = flattenedLabOrders.filter((order) => order.patientUuid === patientUuid);
+        return {
+          patientId: patient.identifiers?.find(
+            (identifier) =>
+              identifier.preferred &&
+              !identifier.voided &&
+              identifier.identifierType.uuid === patientIdIdentifierTypeUuid,
+          )?.identifier,
+          patientUuid: patientUuid,
+          patientName: patient.person.display,
+          patientAge: patient.person.age,
+          patientSex: patient.person.gender,
+          totalOrders: flattenedLabOrdersForPatient.length,
+          orders: flattenedLabOrdersForPatient,
+          originalOrders: labOrdersForPatient,
+        };
+      });
     } else {
       return [];
     }
-  }
+  }, [flattenedLabOrders, labOrders, patientIdIdentifierTypeUuid]);
 
-  const groupedOrdersByPatient = groupOrdersById(flattenedLabOrders);
+  const searchResults = useMemo(() => {
+    if (searchString && searchString.trim() !== '') {
+      // Normalize the search string to lowercase
+      const lowerSearchString = searchString.toLowerCase();
+      return groupedOrdersByPatient.filter(
+        (orderGroup) =>
+          (labTableColumns.includes('name') && orderGroup.patientName.toLowerCase().includes(lowerSearchString)) ||
+          (labTableColumns.includes('patientId') && orderGroup.patientId.toLowerCase().includes(lowerSearchString)) ||
+          orderGroup.orders.some((order) => order.orderNumber.toLowerCase().includes(lowerSearchString)),
+      );
+    }
 
-  const searchResults = useSearchGroupedResults(groupedOrdersByPatient, searchString);
+    return groupedOrdersByPatient;
+  }, [searchString, groupedOrdersByPatient, labTableColumns]);
 
   const orderStatuses = [
     { value: null, display: t('all', 'All') },
-    { value: 'NEW', display: t('newStatus', 'NEW') },
     { value: 'RECEIVED', display: t('receivedStatus', 'RECEIVED') },
     { value: 'IN_PROGRESS', display: t('inProgressStatus', 'IN_PROGRESS') },
     { value: 'COMPLETED', display: t('completedStatus', 'COMPLETED') },
@@ -92,17 +177,23 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   ];
 
   const columns = useMemo(() => {
-    const baseColumns = [
-      { id: 0, header: t('patient', 'Patient'), key: 'patientName' },
-      { id: 1, header: t('age', 'Age'), key: 'patientAge' },
-      { id: 2, header: t('gender', 'Gender'), key: 'patientGender' },
-      { id: 3, header: t('totalOrders', 'Total Orders'), key: 'totalOrders' },
-    ];
-
-    const showActionColumn = flattenedLabOrders.some((order) => order.fulfillerStatus === 'COMPLETED');
-
-    return showActionColumn ? [...baseColumns, { id: 4, header: t('action', 'Action'), key: 'action' }] : baseColumns;
-  }, [t, flattenedLabOrders]);
+    return labTableColumns
+      .map((column) => {
+        const spec = labTableColumnSpec[column];
+        if (!spec) {
+          throw new Error(`Lab table has been configured with an invalid column: ${column}`);
+        }
+        if (spec.key === 'action') {
+          const showActionColumn = flattenedLabOrders.some((order) => order.fulfillerStatus === 'COMPLETED');
+          if (!showActionColumn) {
+            return null;
+          }
+        }
+        return { header: t(spec.headerLabelKey, spec.headerLabelDefault), key: spec.key };
+      })
+      .filter(Boolean)
+      .map((column, index) => ({ ...column, id: index }));
+  }, [t, flattenedLabOrders, labTableColumns]);
 
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);
@@ -127,32 +218,28 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   };
 
   const tableRows = useMemo(() => {
-    return paginatedLabOrders.map((order) => ({
-      id: order.patientId,
-      patientName: order.orders[0]?.patient.person.display,
-      orders: order.orders,
-      totalOrders: order.orders?.length,
-      patientAge: order.orders[0]?.patient?.person?.age,
-      patientGender: order.orders[0]?.patient?.person?.gender || '',
-      action: order.orders.some((o) => o.fulfillerStatus === 'COMPLETED') ? (
+    return paginatedLabOrders.map((groupedOrder) => ({
+      ...groupedOrder,
+      id: groupedOrder.patientUuid,
+      action: groupedOrder.orders.some((o) => o.fulfillerStatus === 'COMPLETED') ? (
         <div className={styles.actionCell}>
           <OverflowMenu aria-label="Actions" flipped iconDescription="Actions">
             <ExtensionSlot
               className={styles.transitionOverflowMenuItemSlot}
               name="transition-overflow-menu-item-slot"
-              state={{ patientUuid: order?.patientId }}
+              state={{ patientUuid: groupedOrder.patientUuid }}
               // Without tabIndex={0} here, the overflow menu incorrectly sets initial focus to the second item instead of the first.
               tabIndex={0}
             />
             <OverflowMenuItem
               className={styles.menuitem}
               itemText={t('editResults', 'Edit results')}
-              onClick={() => handleLaunchModal(order?.orders)}
+              onClick={() => handleLaunchModal(groupedOrder.originalOrders)}
             />
             <OverflowMenuItem
               className={styles.menuitem}
               itemText={t('printTestResults', 'Print test results')}
-              onClick={() => handlePrintModal(order?.orders)}
+              onClick={() => handlePrintModal(groupedOrder.originalOrders)}
             />
           </OverflowMenu>
         </div>
@@ -218,7 +305,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
                     <TableExpandedRow colSpan={headers.length + 2}>
                       <ListOrderDetails
                         actions={props.actions}
-                        groupedOrders={groupedOrdersByPatient.find((item) => item.patientId === row.id)}
+                        groupedOrders={groupedOrdersByPatient.find((item) => item.patientUuid === row.id)}
                       />
                     </TableExpandedRow>
                   ) : (