From 0a1d2e8459990cb974432272a9a967c1ff6c818b Mon Sep 17 00:00:00 2001 From: pramod mahajan Date: Fri, 25 Jul 2025 22:15:56 +0530 Subject: [PATCH] setdefault value for data range --- src/components/Expenses/ExpenseSchema.js | 4 ++-- src/pages/Expense/ExpensePage.jsx | 28 +++++++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/components/Expenses/ExpenseSchema.js b/src/components/Expenses/ExpenseSchema.js index dfa5ffec..8d06ee89 100644 --- a/src/components/Expenses/ExpenseSchema.js +++ b/src/components/Expenses/ExpenseSchema.js @@ -106,6 +106,6 @@ export const defaultFilter = { statusIds:[], createdByIds:[], paidById:[], - startDate:"", - endDate:"" + startDate:null, + endDate:null } \ No newline at end of file diff --git a/src/pages/Expense/ExpensePage.jsx b/src/pages/Expense/ExpensePage.jsx index 90624d61..3b29f74f 100644 --- a/src/pages/Expense/ExpensePage.jsx +++ b/src/pages/Expense/ExpensePage.jsx @@ -148,16 +148,24 @@ const ExpensePage = () => { const onSubmit = (data) => { setFilter(data) }; - const setDateRange = ({ startDate, endDate }) => { - setValue( - "startDate", - startDate ? new Date(startDate).toISOString().split("T")[0] : null - ); - setValue( - "endDate", - endDate ? new Date(endDate).toISOString().split("T")[0] : null - ); - }; +const isValidDate = (date) => { + return date instanceof Date && !isNaN(date); +}; + +const setDateRange = ({ startDate, endDate }) => { + const parsedStart = new Date(startDate); + const parsedEnd = new Date(endDate); + + setValue( + "startDate", + isValidDate(parsedStart) ? parsedStart.toISOString().split("T")[0] : null + ); + setValue( + "endDate", + isValidDate(parsedEnd) ? parsedEnd.toISOString().split("T")[0] : null + ); +}; + const toggleDropdown = () => { setIsOpen((prev) => {