src/components/Tenant/TenantFilterPanel.jsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import React, { useState, useCallback, useEffect } from "react";
+import React, { useState,useCallback } from "react";
 import { FormProvider, useForm, useFormContext } from "react-hook-form";
 import { defaultFilterValues, filterSchema } from "./TenantSchema";
 import Label from "../common/Label";
@@ -8,10 +8,9 @@ import { useIndustries } from "../../hooks/useTenant";
 import { reference, TENANT_STATUS } from "../../utils/constants";
 import { DateRangePicker1 } from "../common/DateRangePicker";
 import moment from "moment";
-import { useLocation } from "react-router-dom";
 
-const TenantFilterPanel = ({ onApply }) => {
+const TenantFilterPanel = ({onApply}) => {
-  const [resetKey, setResetKey] = useState(0);
+const [resetKey, setResetKey] = useState(0);
   
   const methods = useForm({
     resolver: zodResolver(filterSchema),
@@ -37,13 +36,6 @@ const TenantFilterPanel = ({ onApply }) => {
     [onApply, handleClosePanel]
   );
 
-
-  // ✅ Close popup when navigating to another component
-  const location = useLocation();
-  useEffect(() => {
-    handleClosePanel();
-  }, [location]);
-
   const onClear = useCallback(() => {
     reset(defaultFilterValues);
     setResetKey((prev) => prev + 1); // triggers DateRangePicker reset
@@ -56,44 +48,44 @@ const TenantFilterPanel = ({ onApply }) => {
 
   return (
     <FormProvider {...methods}>
-      <form onSubmit={handleSubmit(onSubmit)}>
+      <form  onSubmit={handleSubmit(onSubmit)}>
         <div className="text-start mb-1">
           <div className="text-start my-2">
-            <DateRangePicker1
+             <DateRangePicker1
-              placeholder="DD-MM-YYYY To DD-MM-YYYY"
+            placeholder="DD-MM-YYYY To DD-MM-YYYY"
-              startField="startDate"
+            startField="startDate"
-              endField="endDate"
+            endField="endDate"
-              resetSignal={resetKey}
+            resetSignal={resetKey}
-              defaultRange={false}
+            defaultRange={false}
-            />
+          />
           </div>
           <div className="text-strat mb-2">
             <SelectMultiple
-              name="industryIds"
+            name="industryIds"
-              label="Industries"
+            label="Industries"
-              options={industries}
+            options={industries}
-              labelKey="name"
+            labelKey="name"
-              valueKey="id"
+            valueKey="id"
-            />
+          />
           </div>
           
           <div className="text-start mb-2">
             <SelectMultiple
-              name="references"
+            name="references"
-              label="References"
+            label="References"
-              options={reference}
+            options={reference}
-              labelKey="name"
+            labelKey="name"
-              valueKey="val"
+            valueKey="val"
-            />
+          />
           </div>
-          <div className="text-start">
+           <div className="text-start">
             <SelectMultiple
-              name="tenantStatusIds"
+            name="tenantStatusIds"
-              label="Tenant Status"
+            label="Tenant Status"
-              options={TENANT_STATUS}
+            options={TENANT_STATUS}
-              labelKey="name"
+            labelKey="name"
-              valueKey="id"
+            valueKey="id"
-            />
+          />
           </div>
           {/* <SelectMultiple
               name="references"