From 86ff9e4c2c1774ae17f17f7e7eb5174f7f560359 Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Thu, 22 Jun 2023 05:18:38 +0530
Subject: [PATCH] Fix header on Patient list page (#5736)

* Fix header on Patient list page

* fix button alignment
---
 src/Components/Common/components/Page.tsx |   2 +-
 src/Components/Patient/ManagePatients.tsx | 179 ++++++++++++----------
 2 files changed, 97 insertions(+), 84 deletions(-)

diff --git a/src/Components/Common/components/Page.tsx b/src/Components/Common/components/Page.tsx
index 9f2c3c760bf..4292804728a 100644
--- a/src/Components/Common/components/Page.tsx
+++ b/src/Components/Common/components/Page.tsx
@@ -18,7 +18,7 @@ export default function Page(props: PageProps) {
   }
 
   return (
-    <div className={`${padding} ${props.className}`} ref={props.ref}>
+    <div className={`${padding} ${props.className || ""}`} ref={props.ref}>
       <div className="flex flex-col md:flex-row justify-between md:items-center md:gap-6 gap-2">
         <PageTitle
           title={props.title}
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index a1af97fce67..4fc9369e457 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -715,103 +715,116 @@ export const PatientManager = () => {
   };
 
   return (
-    <Page title={t("Patients")} hideBack={true} breadcrumbs={false}>
-      <FacilitiesSelectDialogue
-        show={showDialog}
-        setSelected={(e) => setSelectedFacility(e)}
-        selectedFacility={selectedFacility}
-        handleOk={() => navigate(`facility/${selectedFacility.id}/patient`)}
-        handleCancel={() => {
-          setShowDialog(false);
-          setSelectedFacility({ name: "" });
-        }}
-      />
-      <div className="flex flex-col lg:flex-row justify-between items-center">
-        <div className="flex flex-col lg:flex-row lg:gap-5 items-center mb-2 lg:mb-0 w-full lg:w-fit">
-          <ButtonV2
-            onClick={() => {
-              qParams.facility
-                ? navigate(`/facility/${qParams.facility}/patient`)
-                : setShowDialog(true);
-            }}
-            className="w-full lg:w-fit"
-          >
-            <CareIcon className="care-l-plus text-lg" />
-            <p id="add-patient-div" className="lg:my-[2px]">
-              Add Patient Details
-            </p>
-          </ButtonV2>
-        </div>
-        <div className="flex flex-col gap-2 lg:gap-3 lg:flex-row justify-end w-full lg:w-fit">
-          <SwitchTabs
-            Tab1="Live"
-            Tab2="Discharged"
-            onClickTab1={() => updateQuery({ is_active: "True" })}
-            onClickTab2={() => updateQuery({ is_active: "False" })}
-            activeTab={tabValue ? true : false}
-          />
-          {showDoctorConnect && (
+    <Page
+      title={t("Patients")}
+      hideBack={true}
+      breadcrumbs={false}
+      options={
+        <div className="flex flex-col lg:flex-row justify-between items-center w-full">
+          <div className="flex flex-col lg:flex-row lg:gap-5 items-center mb-2 lg:mb-0 w-full lg:w-fit">
             <ButtonV2
               onClick={() => {
-                setShowDoctors(true);
+                qParams.facility
+                  ? navigate(`/facility/${qParams.facility}/patient`)
+                  : setShowDialog(true);
               }}
+              className="w-full lg:w-fit"
             >
-              <CareIcon className="care-l-phone text-lg" />
-              <p className="lg:my-[2px]">Doctor Connect</p>
+              <CareIcon className="care-l-plus text-lg" />
+              <p id="add-patient-div" className="lg:my-[2px]">
+                Add Patient Details
+              </p>
             </ButtonV2>
-          )}
-
-          <AdvancedFilterButton onClick={() => advancedFilter.setShow(true)} />
-          <SortDropdownMenu
-            options={PATIENT_SORT_OPTIONS}
-            selected={qParams.ordering}
-            onSelect={updateQuery}
-          />
-          <div className="tooltip">
-            {!isExportAllowed ? (
+          </div>
+          <div className="flex flex-col gap-2 lg:gap-3 lg:flex-row justify-end w-full lg:w-fit">
+            <SwitchTabs
+              Tab1="Live"
+              Tab2="Discharged"
+              onClickTab1={() => updateQuery({ is_active: "True" })}
+              onClickTab2={() => updateQuery({ is_active: "False" })}
+              activeTab={tabValue ? true : false}
+            />
+            {showDoctorConnect && (
               <ButtonV2
                 onClick={() => {
-                  advancedFilter.setShow(true);
-                  setTimeout(() => {
-                    const element = document.getElementById("bed-type-select");
-                    if (element) element.scrollIntoView({ behavior: "smooth" });
-                    Notification.Warn({
-                      msg: "Please select a seven day period.",
-                    });
-                  }, 500);
+                  setShowDoctors(true);
                 }}
-                className="lg:w-fit w-full mr-5"
               >
-                <CareIcon className="care-l-import" />
-                <span className="lg:my-[3px]">Export</span>
+                <CareIcon className="care-l-phone text-lg" />
+                <p className="lg:my-[2px]">Doctor Connect</p>
               </ButtonV2>
-            ) : (
-              <ExportMenu
-                disabled={!isExportAllowed}
-                exportItems={[
-                  {
-                    label:
-                      tabValue === 0 ? "Live patients" : "Discharged patients",
-                    action: exportPatients(true),
-                    parse: preventDuplicatePatientsDuetoPolicyId,
-                  },
-                  {
-                    label: "All patients",
-                    action: exportPatients(false),
-                    parse: preventDuplicatePatientsDuetoPolicyId,
-                  },
-                ]}
-              />
             )}
 
-            {!isExportAllowed && (
-              <span className="tooltip-text tooltip-bottom -translate-x-1/2">
-                Select a seven day period
-              </span>
-            )}
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
+            <SortDropdownMenu
+              options={PATIENT_SORT_OPTIONS}
+              selected={qParams.ordering}
+              onSelect={updateQuery}
+            />
+            <div className="tooltip">
+              {!isExportAllowed ? (
+                <ButtonV2
+                  onClick={() => {
+                    advancedFilter.setShow(true);
+                    setTimeout(() => {
+                      const element =
+                        document.getElementById("bed-type-select");
+                      if (element)
+                        element.scrollIntoView({ behavior: "smooth" });
+                      Notification.Warn({
+                        msg: "Please select a seven day period.",
+                      });
+                    }, 500);
+                  }}
+                  className="lg:w-fit w-full mr-5"
+                >
+                  <CareIcon className="care-l-import" />
+                  <span className="lg:my-[3px]">Export</span>
+                </ButtonV2>
+              ) : (
+                <ExportMenu
+                  disabled={!isExportAllowed}
+                  exportItems={[
+                    {
+                      label:
+                        tabValue === 0
+                          ? "Live patients"
+                          : "Discharged patients",
+                      action: exportPatients(true),
+                      parse: preventDuplicatePatientsDuetoPolicyId,
+                    },
+                    {
+                      label: "All patients",
+                      action: exportPatients(false),
+                      parse: preventDuplicatePatientsDuetoPolicyId,
+                    },
+                  ]}
+                />
+              )}
+
+              {!isExportAllowed && (
+                <span className="tooltip-text tooltip-bottom -translate-x-1/2">
+                  Select a seven day period
+                </span>
+              )}
+            </div>
           </div>
         </div>
-      </div>
+      }
+    >
+      <FacilitiesSelectDialogue
+        show={showDialog}
+        setSelected={(e) => setSelectedFacility(e)}
+        selectedFacility={selectedFacility}
+        handleOk={() => navigate(`facility/${selectedFacility.id}/patient`)}
+        handleCancel={() => {
+          setShowDialog(false);
+          setSelectedFacility({ name: "" });
+        }}
+      />
+
       <div className="mt-5 manualGrid grid-cols-1 gap-3 sm:grid-cols-4 my-4 px-2 md:px-0 mb-[-12px]">
         <div className="flex flex-col xl:flex-row mt-2 h-full gap-3">
           <div className="flex-1">