admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Date field not cleared in Tenant filter after clicking Clear button' (#432) from Kartik_Bug#1306 into Organization_Management

Browse Source 
Reviewed-on: #432
Merged
This commit is contained in:
pramod.mahajan 2025-09-27 09:40:05 +00:00
commit bbd8ed12f6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Tenant/TenantFilterPanel.jsx
View File

@ -38,7 +38,7 @@ const TenantFilterPanel = ({ onApply }) => {
); );
// ✅ Close popup when navigating to another component // Close popup when navigating to another component
const location = useLocation(); const location = useLocation();
useEffect(() => { useEffect(() => {
handleClosePanel(); handleClosePanel();

14
src/components/common/DateRangePicker.jsx
View File

@ -148,10 +148,20 @@ export const DateRangePicker1 = ({
}, []); }, []);
useEffect(() => { useEffect(() => {
if (defaultRange && resetSignal !== undefined) { if (resetSignal !== undefined) {
if (defaultRange) {
applyDefaultDates(); applyDefaultDates();
} else {
setValue(startField, "", { shouldValidate: true });
setValue(endField, "", { shouldValidate: true });
if (inputRef.current?._flatpickr) {
inputRef.current._flatpickr.clear();
}
} }
}, [resetSignal, defaultRange]); }
}, [resetSignal, defaultRange, setValue, startField, endField]);
const start = getValues(startField); const start = getValues(startField);
const end = getValues(endField); const end = getValues(endField);