From 78b721dad7158c0cd1b9e61bfcaf38b56c1fbeda Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Fri, 17 Oct 2025 10:24:35 +0530 Subject: [PATCH] Changes in Expensfilter panel at on apply and clear fitler is closed. --- src/components/Documents/DocumentFilterPanel.jsx | 4 ++-- src/components/Expenses/ExpenseFilterPanel.jsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Documents/DocumentFilterPanel.jsx b/src/components/Documents/DocumentFilterPanel.jsx index b266c986..edc613e1 100644 --- a/src/components/Documents/DocumentFilterPanel.jsx +++ b/src/components/Documents/DocumentFilterPanel.jsx @@ -78,14 +78,14 @@ const DocumentFilterPanel = forwardRef( ? moment.utc(values.endDate, "DD-MM-YYYY").toISOString() : null, }); - closePanel(); + // closePanel(); }; const onClear = () => { reset(DocumentFilterDefaultValues); setResetKey((prev) => prev + 1); onApply(DocumentFilterDefaultValues); - closePanel(); + // closePanel(); }; if (isLoading) return
Loading...
; diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx index 7a3b04e6..b25067ae 100644 --- a/src/components/Expenses/ExpenseFilterPanel.jsx +++ b/src/components/Expenses/ExpenseFilterPanel.jsx @@ -43,7 +43,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata } return { ...defaultFilter, statusIds: status ? [status] : defaultFilter.statusIds || [], - projectIds: selectedProjectId ? [selectedProjectId] : [], + projectIds: defaultFilter.projectIds || [], createdByIds: defaultFilter.createdByIds || [], paidById: defaultFilter.paidById || [], ExpenseTypeIds: defaultFilter.ExpenseTypeIds || [], @@ -96,7 +96,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata } endDate: moment.utc(formData.endDate, "DD-MM-YYYY").toISOString(), }); handleGroupBy(selectedGroup.id); - closePanel(); + // closePanel(); }; const onClear = () => { @@ -105,7 +105,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata } setSelectedGroup(groupByList[0]); onApply(defaultFilter); handleGroupBy(groupByList[0].id); - closePanel(); + // closePanel(); if (status) { navigate("/expenses", { replace: true }); }