From 209f2b499ab8e1db33f4a5823460b69038f47c8a Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Mon, 28 Oct 2024 11:26:49 +0300
Subject: [PATCH 1/5] initial commit

---
 .../laboratory-order-referals.component.tsx   | 67 ++++---------------
 .../laboratory-order-referals.scss            |  7 ++
 .../referred-date-filter.component.tsx        | 41 ++++++++++++
 3 files changed, 60 insertions(+), 55 deletions(-)
 create mode 100644 src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx

diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
index 1d9bb7d6..ffa7ec33 100644
--- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
+++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
@@ -11,7 +11,6 @@ import {
   formatDate,
   parseDate,
   ErrorState,
-  showModal,
   useConfig,
 } from "@openmrs/esm-framework";
 
@@ -27,7 +26,6 @@ import {
   TableRow,
   TableToolbar,
   TableToolbarContent,
-  TableToolbarSearch,
   Layer,
   Tag,
   Tile,
@@ -41,7 +39,6 @@ import {
 
 import {
   Printer,
-  MailAll,
   Checkmark,
   SendAlt,
   NotSent,
@@ -62,6 +59,8 @@ import {
 } from "@openmrs/esm-patient-common-lib";
 import { mutate } from "swr";
 import { REFERINSTRUCTIONS } from "../../constants";
+import ReferredDateFilter from "./referred-date-filter.component";
+import { date } from "zod";
 
 interface LaboratoryOrderReferalResultsProps {
   patientUuid: string;
@@ -81,18 +80,16 @@ const LaboratoryOrderReferalResults: React.FC<
 > = ({ patientUuid }) => {
   const { t } = useTranslation();
 
-  const {
-    enableSendingLabTestsByEmail,
-    laboratoryEncounterTypeUuid,
-    artCardEncounterTypeUuid,
-    laboratoryOrderTypeUuid,
-  } = useConfig();
+  const { enableSendingLabTestsByEmail, laboratoryEncounterTypeUuid } =
+    useConfig();
 
   const displayText = t(
     "referralLaboratoryTestsDisplayTextTitle",
     "Laboratory Referral Tests"
   );
 
+  const [orderDate, setOrderDate] = useState("");
+
   const {
     items,
     currentPage,
@@ -113,17 +110,11 @@ const LaboratoryOrderReferalResults: React.FC<
   const sortedLabRequests = useMemo(() => {
     return [...items]
       ?.filter((item) => {
-        const { encounterType, orders } = item || {};
-        const { uuid: encounterTypeUuid } = encounterType || {};
-
-        // Check if the encounterType UUID matches either of the specified UUIDs
-
-        // Filter orders to only include those with the matching orderType UUID
+        const { orders } = item || {};
         const matchingOrders = orders?.filter(
           (order) => order?.instructions === REFERINSTRUCTIONS
         );
 
-        // Return the item only if it has matching encounterType and at least one matching order
         return matchingOrders?.length > 0;
       })
       ?.sort((a, b) => {
@@ -137,11 +128,6 @@ const LaboratoryOrderReferalResults: React.FC<
   const [laboratoryOrders, setLaboratoryOrders] = useState(sortedLabRequests);
   const [initialTests, setInitialTests] = useState(sortedLabRequests);
 
-  const handleChange = useCallback((event) => {
-    const searchText = event?.target?.value?.trim().toLowerCase();
-    setSearchTerm(searchText);
-  }, []);
-
   useEffect(() => {
     if (!searchTerm) {
       setLaboratoryOrders(initialTests);
@@ -159,23 +145,6 @@ const LaboratoryOrderReferalResults: React.FC<
     setInitialTests(sortedLabRequests);
   }, [sortedLabRequests]);
 
-  const EmailButtonAction: React.FC = () => {
-    const launchSendEmailModal = useCallback(() => {
-      const dispose = showModal("send-email-dialog", {
-        closeModal: () => dispose(),
-      });
-    }, []);
-
-    return (
-      <Button
-        kind="ghost"
-        size="sm"
-        onClick={(e) => launchSendEmailModal()}
-        renderIcon={(props) => <MailAll size={16} {...props} />}
-      />
-    );
-  };
-
   const EditReferralAction: React.FC<EditReferralActionProps> = ({
     formUuid,
     encounterUuid,
@@ -305,7 +274,6 @@ const LaboratoryOrderReferalResults: React.FC<
             encounterUuid={entry[index]?.uuid}
           />
           <PrintButtonAction encounter={entry} />
-          {enableSendingLabTestsByEmail && <EmailButtonAction />}
         </div>
       ),
     }));
@@ -336,14 +304,7 @@ const LaboratoryOrderReferalResults: React.FC<
           headers={tableReferralHeaders}
           useZebraStyles
         >
-          {({
-            rows,
-            headers,
-            getHeaderProps,
-            getTableProps,
-            getRowProps,
-            onInputChange,
-          }) => (
+          {({ rows, headers, getHeaderProps, getTableProps, getRowProps }) => (
             <TableContainer className={styles.tableContainer}>
               <TableToolbar
                 style={{
@@ -398,13 +359,9 @@ const LaboratoryOrderReferalResults: React.FC<
                       {"Rejected"}
                     </Tag>
                   </div>
-                  <Layer>
-                    <TableToolbarSearch
-                      expanded={true}
-                      value={searchTerm}
-                      onChange={handleChange}
-                      placeholder={t("searchThisList", "Search this list")}
-                      size="sm"
+                  <Layer className={styles.referalFilter}>
+                    <ReferredDateFilter
+                      setDate={(date) => setOrderDate(date)}
                     />
                   </Layer>
                 </TableToolbarContent>
@@ -444,7 +401,7 @@ const LaboratoryOrderReferalResults: React.FC<
                                 <TestsResults
                                   obs={sortedLabRequests[index]?.obs}
                                 />
-                              )}{" "}
+                              )}
                           </TableExpandedRow>
                         ) : (
                           <TableExpandedRow
diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.scss b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.scss
index 704e9376..a32b5bce 100644
--- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.scss
+++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.scss
@@ -77,3 +77,10 @@
         margin-right: -50%;
     }
 }
+
+.referalFilter {
+    display: flex;
+    flex-direction: row;
+    align-items: right;
+    margin: 0.9rem;
+}
\ No newline at end of file
diff --git a/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx b/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx
new file mode 100644
index 00000000..b3ae22ed
--- /dev/null
+++ b/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx
@@ -0,0 +1,41 @@
+import React, { useState, useEffect } from "react";
+import { DatePicker, DatePickerInput } from "@carbon/react";
+import dayjs from "dayjs";
+
+interface ReferredDateFilterProps {
+  date?: string;
+  setDate: (date: string) => void;
+}
+
+const ReferredDateFilter = (props: ReferredDateFilterProps) => {
+  const [date, setDate] = useState(props.date || "");
+
+  useEffect(() => {
+    setDate(props.date || "");
+  }, [props.date]);
+
+  const handleDateChange = (event: any) => {
+    const selectedDate = event[0]?.toISOString().split("T")[0];
+    if (selectedDate) {
+      setDate(selectedDate);
+      props.setDate(selectedDate);
+    }
+  };
+
+  return (
+    <DatePicker
+      datePickerType="single"
+      dateFormat="Y-m-d"
+      onChange={handleDateChange}
+    >
+      <DatePickerInput
+        placeholder="YYYY-MM-DD"
+        id="referred-date-picker-single"
+        size="md"
+        value={dayjs(date).format("YYYY-MM-DD")}
+      />
+    </DatePicker>
+  );
+};
+
+export default ReferredDateFilter;

From d369049e6f64e2861cd2ee6cc617cac6b3e88869 Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Mon, 28 Oct 2024 11:29:59 +0300
Subject: [PATCH 2/5] clean up

---
 .../laboratory-order-referals.component.tsx                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
index ffa7ec33..ead572a7 100644
--- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
+++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
@@ -60,7 +60,6 @@ import {
 import { mutate } from "swr";
 import { REFERINSTRUCTIONS } from "../../constants";
 import ReferredDateFilter from "./referred-date-filter.component";
-import { date } from "zod";
 
 interface LaboratoryOrderReferalResultsProps {
   patientUuid: string;

From 95c15a56840367a5a6000b7d1461be26039714d6 Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Mon, 28 Oct 2024 13:14:18 +0300
Subject: [PATCH 3/5] revert changes

---
 .../laboratory-order-referals.component.tsx   | 24 +++++++----
 .../referred-date-filter.component.tsx        | 41 -------------------
 2 files changed, 16 insertions(+), 49 deletions(-)
 delete mode 100644 src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx

diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
index ead572a7..b022fe4e 100644
--- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
+++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
@@ -26,6 +26,7 @@ import {
   TableRow,
   TableToolbar,
   TableToolbarContent,
+  TableToolbarSearch,
   Layer,
   Tag,
   Tile,
@@ -59,7 +60,6 @@ import {
 } from "@openmrs/esm-patient-common-lib";
 import { mutate } from "swr";
 import { REFERINSTRUCTIONS } from "../../constants";
-import ReferredDateFilter from "./referred-date-filter.component";
 
 interface LaboratoryOrderReferalResultsProps {
   patientUuid: string;
@@ -87,8 +87,6 @@ const LaboratoryOrderReferalResults: React.FC<
     "Laboratory Referral Tests"
   );
 
-  const [orderDate, setOrderDate] = useState("");
-
   const {
     items,
     currentPage,
@@ -127,6 +125,11 @@ const LaboratoryOrderReferalResults: React.FC<
   const [laboratoryOrders, setLaboratoryOrders] = useState(sortedLabRequests);
   const [initialTests, setInitialTests] = useState(sortedLabRequests);
 
+  const handleChange = useCallback((event) => {
+    const searchText = event?.target?.value?.trim().toLowerCase();
+    setSearchTerm(searchText);
+  }, []);
+
   useEffect(() => {
     if (!searchTerm) {
       setLaboratoryOrders(initialTests);
@@ -313,7 +316,7 @@ const LaboratoryOrderReferalResults: React.FC<
                   backgroundColor: "color",
                 }}
               >
-                <TableToolbarContent>
+                <TableToolbarContent className={styles.referalFilter}>
                   <div
                     style={{
                       fontSize: "10px",
@@ -358,11 +361,16 @@ const LaboratoryOrderReferalResults: React.FC<
                       {"Rejected"}
                     </Tag>
                   </div>
-                  <Layer className={styles.referalFilter}>
-                    <ReferredDateFilter
-                      setDate={(date) => setOrderDate(date)}
+                  <Layer>
+                    <TableToolbarSearch
+                      expanded={true}
+                      value={searchTerm}
+                      onChange={handleChange}
+                      placeholder={t("searchThisList", "Search this list")}
+                      size="sm"
                     />
                   </Layer>
+                  {/* <ReferredDateFilter /> */}
                 </TableToolbarContent>
               </TableToolbar>
               <Table
@@ -400,7 +408,7 @@ const LaboratoryOrderReferalResults: React.FC<
                                 <TestsResults
                                   obs={sortedLabRequests[index]?.obs}
                                 />
-                              )}
+                              )}{" "}
                           </TableExpandedRow>
                         ) : (
                           <TableExpandedRow
diff --git a/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx b/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx
deleted file mode 100644
index b3ae22ed..00000000
--- a/src/patient-chart/laboratory-order-referals/referred-date-filter.component.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { DatePicker, DatePickerInput } from "@carbon/react";
-import dayjs from "dayjs";
-
-interface ReferredDateFilterProps {
-  date?: string;
-  setDate: (date: string) => void;
-}
-
-const ReferredDateFilter = (props: ReferredDateFilterProps) => {
-  const [date, setDate] = useState(props.date || "");
-
-  useEffect(() => {
-    setDate(props.date || "");
-  }, [props.date]);
-
-  const handleDateChange = (event: any) => {
-    const selectedDate = event[0]?.toISOString().split("T")[0];
-    if (selectedDate) {
-      setDate(selectedDate);
-      props.setDate(selectedDate);
-    }
-  };
-
-  return (
-    <DatePicker
-      datePickerType="single"
-      dateFormat="Y-m-d"
-      onChange={handleDateChange}
-    >
-      <DatePickerInput
-        placeholder="YYYY-MM-DD"
-        id="referred-date-picker-single"
-        size="md"
-        value={dayjs(date).format("YYYY-MM-DD")}
-      />
-    </DatePicker>
-  );
-};
-
-export default ReferredDateFilter;

From 348cd33ae4a8133114a1b919ed789dfe309b87b0 Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Mon, 28 Oct 2024 13:17:55 +0300
Subject: [PATCH 4/5] chore

---
 .../laboratory-order-referals.component.tsx                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
index b022fe4e..d61d0980 100644
--- a/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
+++ b/src/patient-chart/laboratory-order-referals/laboratory-order-referals.component.tsx
@@ -370,7 +370,6 @@ const LaboratoryOrderReferalResults: React.FC<
                       size="sm"
                     />
                   </Layer>
-                  {/* <ReferredDateFilter /> */}
                 </TableToolbarContent>
               </TableToolbar>
               <Table

From 2a310ed0951b4a90fa5335de399faf7954b2813a Mon Sep 17 00:00:00 2001
From: jabahum <jabajnan8@gmail.com>
Date: Mon, 28 Oct 2024 13:43:18 +0300
Subject: [PATCH 5/5] chore

---
 .../laboratory-active-test-order-results.component.tsx    | 8 ++------
 .../patient-laboratory-results.component.tsx              | 1 -
 .../results-summary/print-results-summary.component.tsx   | 3 +--
 src/referred-orders/referred-orders.component.tsx         | 3 ---
 src/reject-order/reject-order-dialog.component.tsx        | 2 +-
 src/results/result-form-field.component.tsx               | 1 -
 src/summary-tiles/laboratory-summary.resource.tsx         | 2 +-
 src/summary-tiles/summary-tile.component.tsx              | 3 +--
 src/tests-ordered/lab-tests/lab-tests.resource.ts         | 7 +------
 src/utils/orders-table/orders-data-table.component.tsx    | 2 +-
 10 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx b/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx
index cddf9123..1145ed24 100644
--- a/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx
+++ b/src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.component.tsx
@@ -77,12 +77,8 @@ const LaboratoryActiveTestOrderResults: React.FC<
 > = ({ patientUuid }) => {
   const { t } = useTranslation();
 
-  const {
-    enableSendingLabTestsByEmail,
-    laboratoryEncounterTypeUuid,
-    artCardEncounterTypeUuid,
-    laboratoryOrderTypeUuid,
-  } = useConfig();
+  const { enableSendingLabTestsByEmail, laboratoryEncounterTypeUuid } =
+    useConfig();
 
   const displayText = t(
     "activelLaboratoryTestsDisplayTextTitle",
diff --git a/src/patient-chart/patient-laboratory-results.component.tsx b/src/patient-chart/patient-laboratory-results.component.tsx
index e22b8b79..350efe40 100644
--- a/src/patient-chart/patient-laboratory-results.component.tsx
+++ b/src/patient-chart/patient-laboratory-results.component.tsx
@@ -1,4 +1,3 @@
-import { EmptyState } from "@openmrs/esm-patient-common-lib";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import LaboratoryActiveTestOrderResults from "./laboratory-active-test-order/laboratory-active-test-order-results.component";
diff --git a/src/patient-chart/results-summary/print-results-summary.component.tsx b/src/patient-chart/results-summary/print-results-summary.component.tsx
index cc0a39e7..117cb658 100644
--- a/src/patient-chart/results-summary/print-results-summary.component.tsx
+++ b/src/patient-chart/results-summary/print-results-summary.component.tsx
@@ -1,9 +1,8 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useMemo } from "react";
 import styles from "./print-results-summary.scss";
 import { formatDate, parseDate } from "@openmrs/esm-framework";
 import logoImg from "../../../assets/logo/moh_logo_without_word.png";
 import { Identifier, PatientResource } from "../../utils/functions";
-import { useTranslation } from "react-i18next";
 import PrintResultsTable from "./print-results-table.component";
 import { Result } from "../patient-laboratory-order-results.resource";
 
diff --git a/src/referred-orders/referred-orders.component.tsx b/src/referred-orders/referred-orders.component.tsx
index d9924274..597fb068 100644
--- a/src/referred-orders/referred-orders.component.tsx
+++ b/src/referred-orders/referred-orders.component.tsx
@@ -23,12 +23,9 @@ import {
   TableToolbarSearch,
   Layer,
   Tile,
-  DatePicker,
-  DatePickerInput,
 } from "@carbon/react";
 import { getStatusColor, useOrderDate } from "../utils/functions";
 import styles from "./referred-orders.scss";
-import dayjs from "dayjs";
 import { REFERINSTRUCTIONS } from "../constants";
 
 const ReferredOrdersList: React.FC = () => {
diff --git a/src/reject-order/reject-order-dialog.component.tsx b/src/reject-order/reject-order-dialog.component.tsx
index 0d2d7387..e22c16f0 100644
--- a/src/reject-order/reject-order-dialog.component.tsx
+++ b/src/reject-order/reject-order-dialog.component.tsx
@@ -36,7 +36,7 @@ const RejectOrderDialog: React.FC<RejectOrderDialogProps> = ({
       fulfillerComment: notes,
     };
     RejectOrder(order.uuid, payload).then(
-      (resp) => {
+      () => {
         showSnackbar({
           isLowContrast: true,
           title: t("rejectOrder", "Rejected Order"),
diff --git a/src/results/result-form-field.component.tsx b/src/results/result-form-field.component.tsx
index b908912d..5e575865 100644
--- a/src/results/result-form-field.component.tsx
+++ b/src/results/result-form-field.component.tsx
@@ -4,7 +4,6 @@ import { TextInput, Select, SelectItem } from "@carbon/react";
 import { useTranslation } from "react-i18next";
 import { ConceptReference } from "./result-form.resource";
 import { Controller } from "react-hook-form";
-import { min } from "rxjs/operators";
 
 interface ResultFormFieldProps {
   concept: ConceptReference;
diff --git a/src/summary-tiles/laboratory-summary.resource.tsx b/src/summary-tiles/laboratory-summary.resource.tsx
index 40d425fa..58b17275 100644
--- a/src/summary-tiles/laboratory-summary.resource.tsx
+++ b/src/summary-tiles/laboratory-summary.resource.tsx
@@ -1,4 +1,4 @@
-import useSWR, { mutate } from "swr";
+import useSWR from "swr";
 import useSWRImmutable from "swr/immutable";
 import {
   FetchResponse,
diff --git a/src/summary-tiles/summary-tile.component.tsx b/src/summary-tiles/summary-tile.component.tsx
index 73c87106..44bc0ea2 100644
--- a/src/summary-tiles/summary-tile.component.tsx
+++ b/src/summary-tiles/summary-tile.component.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Tile, Button } from "@carbon/react";
-import { ArrowRight } from "@carbon/react/icons";
+import { Tile } from "@carbon/react";
 import styles from "./summary-tile.scss";
 
 interface SummaryTileProps {
diff --git a/src/tests-ordered/lab-tests/lab-tests.resource.ts b/src/tests-ordered/lab-tests/lab-tests.resource.ts
index e441c307..d0964c6c 100644
--- a/src/tests-ordered/lab-tests/lab-tests.resource.ts
+++ b/src/tests-ordered/lab-tests/lab-tests.resource.ts
@@ -1,9 +1,4 @@
-import {
-  FetchResponse,
-  openmrsFetch,
-  restBaseUrl,
-  useConfig,
-} from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import useSWR from "swr";
 import { Result } from "../../patient-chart/patient-laboratory-order-results.resource";
 export function useGetLabOrders(encounterUuid: string) {
diff --git a/src/utils/orders-table/orders-data-table.component.tsx b/src/utils/orders-table/orders-data-table.component.tsx
index 2636368e..c3aa73b8 100644
--- a/src/utils/orders-table/orders-data-table.component.tsx
+++ b/src/utils/orders-table/orders-data-table.component.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from "react";
+import React, { useState } from "react";
 import {
   DataTable,
   Pagination,