diff --git a/src/components/Documents/DocumentFilterPanel.jsx b/src/components/Documents/DocumentFilterPanel.jsx
index c71c5979..b266c986 100644
--- a/src/components/Documents/DocumentFilterPanel.jsx
+++ b/src/components/Documents/DocumentFilterPanel.jsx
@@ -11,7 +11,8 @@ import SelectMultiple from "../common/SelectMultiple";
import moment from "moment";
import { useParams } from "react-router-dom";
-const DocumentFilterPanel = forwardRef(({ entityTypeId, onApply, setFilterdata }, ref) => {
+const DocumentFilterPanel = forwardRef(
+ ({ entityTypeId, onApply, setFilterdata }, ref) => {
const [resetKey, setResetKey] = useState(0);
const { status } = useParams();
@@ -51,7 +52,6 @@ const DocumentFilterPanel = forwardRef(({ entityTypeId, onApply, setFilterdata }
useImperativeHandle(ref, () => ({
resetFieldValue: (name, value) => {
- // Reset specific field
if (value !== undefined) {
setValue(name, value);
} else {
diff --git a/src/components/Documents/Documents.jsx b/src/components/Documents/Documents.jsx
index 7eea6c0f..ad08d6ca 100644
--- a/src/components/Documents/Documents.jsx
+++ b/src/components/Documents/Documents.jsx
@@ -59,7 +59,7 @@ const Documents = ({ Document_Entity, Entity }) => {
const { employeeId } = useParams();
const [OpenDocument, setOpenDocument] = useState(false);
const [filterData, setFilterdata] = useState(DocumentFilterDefaultValues);
- const updatedFilters = useRef();
+ const updatedRef = useRef();
const [ManageDoc, setManageDoc] = useState({
document: null,
isOpen: false,
@@ -95,7 +95,7 @@ const Documents = ({ Document_Entity, Entity }) => {
setShowTrigger(true);
setOffcanvasContent(
"Document Filters",
-
+
);
return () => {
@@ -111,7 +111,6 @@ const Documents = ({ Document_Entity, Entity }) => {
setViewDoc,
setOpenDocument,
OpenDocument,
- // removeFilterChip
};
useEffect(() => {
@@ -123,13 +122,15 @@ const Documents = ({ Document_Entity, Entity }) => {
const removeFilterChip = (key, id) => {
const updatedFilters = { ...filters };
-
if (Array.isArray(updatedFilters[key])) {
updatedFilters[key] = updatedFilters[key].filter((v) => v !== id);
+ updatedRef.current?.resetFieldValue(key,updatedFilters[key]);
}
else if (key === "dateRange") {
updatedFilters.startDate = null;
updatedFilters.endDate = null;
+ updatedRef.current?.resetFieldValue("startDate",null);
+ updatedRef.current?.resetFieldValue("endDate",null);
}
else {
updatedFilters[key] = null;
@@ -137,12 +138,8 @@ const Documents = ({ Document_Entity, Entity }) => {
setFilter(updatedFilters);
- methods.setValue(key, updatedFilters[key] ?? DocumentFilterDefaultValues[key]);
+ return updatedFilters;
- if (key === "dateRange") {
- methods.setValue("startDate", null);
- methods.setValue("endDate", null);
- }
};