Merge branch 'remove-clickElementById/ohcnetwork#8929' of github.com:…

…AnveshNalimela/care_fe into remove-clickElementById/ohcnetwork#8929
AnveshNalimela · Nov 26, 2024 · 535e641 · 535e641
2 parents e735efa + 8a7b927
commit 535e641
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/components/Common/SortDropdown.tsx b/src/components/Common/SortDropdown.tsx
@@ -27,7 +27,7 @@ export default function SortDropdownMenu(props: Props) {
       variant="secondary"
       className="w-full border border-primary-500 bg-white md:w-auto"
       icon={<CareIcon icon="l-sort" />}
-      containerClassName="w-full md:w-auto"
+      containerClassName="w-full md:w-auto z-20"
     >
       {props.options.map(({ isAscending, value }, i) => (
         <DropdownItem

diff --git a/src/components/Patient/SampleDetails.tsx b/src/components/Patient/SampleDetails.tsx
@@ -477,7 +477,11 @@ export const SampleDetails = ({ id }: DetailRoute) => {
       <div className="mb-4">
         <h4 className="mt-8">{t("sample_test_history")}</h4>
         {sampleDetails?.flow &&
-          sampleDetails.flow.map((flow: FlowModel) => renderFlow(flow))}
+          sampleDetails.flow.map((flow: FlowModel) => (
+            <div key={flow.id} className="mb-2">
+              {renderFlow(flow)}
+            </div>
+          ))}
       </div>
 
       <FileUpload

diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx
@@ -189,7 +189,7 @@ export default function ListView() {
 
   return (
     <Page
-      title="Resource"
+      title={t("resource")}
       hideBack
       componentRight={
         <ExportButton
@@ -216,13 +216,13 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <AdvancedFilterButton
-              onClick={() => advancedFilter.setShow(true)}
-            />
             <ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
               <CareIcon icon="l-list-ul" className="rotate-90" />
               {t("board_view")}
             </ButtonV2>
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
           </div>
         </>
       }

diff --git a/src/components/Shifting/ShiftingList.tsx b/src/components/Shifting/ShiftingList.tsx
@@ -274,16 +274,16 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <AdvancedFilterButton
-              onClick={() => advancedFilter.setShow(true)}
-            />
             <ButtonV2
               className="py-[11px]"
               onClick={() => navigate("/shifting/board", { query: qParams })}
             >
               <CareIcon icon="l-list-ul" className="rotate-90" />
               {t("board_view")}
             </ButtonV2>
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
           </div>
         </>
       }