Fix (Advanced Filters): made all filter sidebars collapse on clearing…

… filters (#4337) * fix (FacilityFilter): sidebar collapses on clearing advanced filters * fix: revert changes * fix (Advanced Filters): all filter sidebars collapse on clearing filters
coronasafe · Dec 22, 2022 · 0333752 · 0333752
1 parent 552d981
commit 0333752
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/src/Components/Facility/FacilityFilter/LocalBodySelect.tsx b/src/Components/Facility/FacilityFilter/LocalBodySelect.tsx
@@ -23,7 +23,6 @@ function LocalBodySelect(props: LocalBodySelectProps) {
     className,
     multiple,
     selected,
-    searchAll,
     setSelected,
     margin,
     district,
@@ -79,7 +78,7 @@ function LocalBodySelect(props: LocalBodySelectProps) {
     isLocalBodyLoading(true);
     fetchLocalbodies();
     isLocalBodyLoading(false);
-  }, [dispatchAction, district]);
+  }, [dispatchAction, district, selected]);
 
   return (
     <AutoCompleteAsyncField

diff --git a/src/Components/Facility/FacilityFilter/index.tsx b/src/Components/Facility/FacilityFilter/index.tsx
@@ -13,7 +13,7 @@ const initialStates = [{ id: 0, name: "Choose State *" }];
 const initialDistricts = [{ id: 0, name: "Choose District" }];
 const selectStates = [{ id: 0, name: "Please select your state" }];
 
-function FacillityFilter(props: any) {
+function FacilityFilter(props: any) {
   const { filter, onChange, closeFilter } = props;
   const dispatchAction: any = useDispatch();
 
@@ -214,4 +214,4 @@ function FacillityFilter(props: any) {
   );
 }
 
-export default FacillityFilter;
+export default FacilityFilter;
diff --git a/src/Components/Facility/HospitalList.tsx b/src/Components/Facility/HospitalList.tsx
@@ -17,7 +17,7 @@ import loadable from "@loadable/component";
 import { FacilityModel } from "./models";
 import CircularProgress from "@material-ui/core/CircularProgress";
 import { make as SlideOver } from "../Common/SlideOver.gen";
-import FacillityFilter from "./FacilityFilter";
+import FacilityFilter from "./FacilityFilter";
 import { useTranslation } from "react-i18next";
 import SearchInput from "../Form/SearchInput";
 import useFilters from "../../Common/hooks/useFilters";
@@ -308,7 +308,7 @@ export const HospitalList = () => {
       <div>
         <SlideOver {...advancedFilter}>
           <div className="bg-white min-h-screen p-4">
-            <FacillityFilter {...advancedFilter} />
+            <FacilityFilter {...advancedFilter} />
           </div>
         </SlideOver>
       </div>

diff --git a/src/Components/Patient/PatientFilterV2.tsx b/src/Components/Patient/PatientFilterV2.tsx
@@ -361,6 +361,7 @@ export default function PatientFilterV2(props: any) {
         onClear={() => {
           navigate("/patients");
           setFilterState(clearFilterState);
+          closeFilter();
         }}
       />
       <div className="w-full flex-none pt-20">

diff --git a/src/Components/Patient/SampleFilters.tsx b/src/Components/Patient/SampleFilters.tsx
@@ -81,6 +81,7 @@ export default function UserFilter(props: any) {
           onClick={(_) => {
             navigate("/sample");
             setFilterState(clearFilterState);
+            closeFilter();
           }}
         >
           <i className="fas fa-times mr-2" />

diff --git a/src/Components/Resource/ListFilter.tsx b/src/Components/Resource/ListFilter.tsx
@@ -154,7 +154,11 @@ export default function ListFilter(props: any) {
           <i className="fas fa-times mr-2" />
           Cancel
         </button>
-        <Link href="/resource" className="btn btn-default hover:text-gray-900">
+        <Link
+          href="/resource"
+          className="btn btn-default hover:text-gray-900"
+          onClick={closeFilter}
+        >
           <i className="fas fa-times mr-2" />
           Clear Filters
         </Link>

diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
@@ -91,6 +91,7 @@ export default function UserFilter(props: any) {
         onClear={() => {
           navigate("/users");
           setFilterState(clearFilterState);
+          closeFilter();
         }}
       />