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

Changes in Filter panel when on close

Browse Source
This commit is contained in:
Kartik Sharma 2025-10-15 14:38:17 +05:30
parent 9bbe479153
commit 73534226e3
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/pages/Directory/ContactFilterPanel.jsx
View File

@ -21,6 +21,12 @@ const ContactFilterPanel = forwardRef(
useContactFilter(); useContactFilter();
const { status } = useParams(); const { status } = useParams();
useEffect(() => {
return () => {
closePanel();
};
}, []);
const dynamicdefaultContactFilter = useMemo(() => { const dynamicdefaultContactFilter = useMemo(() => {
return { return {
...defaultContactFilter, ...defaultContactFilter,
@ -37,17 +43,17 @@ const ContactFilterPanel = forwardRef(
const { handleSubmit, reset, setValue, getValues } = methods; const { handleSubmit, reset, setValue, getValues } = methods;
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
resetFieldValue: (name, value) => { resetFieldValue: (name, value) => {
setTimeout(() => { setTimeout(() => {
if (value !== undefined) { if (value !== undefined) {
setValue(name, value); setValue(name, value);
} else { } else {
reset({ ...getValues(), [name]: defaultContactFilter[name] }); reset({ ...getValues(), [name]: defaultContactFilter[name] });
} }
}, 0); }, 0);
}, },
getValues, getValues,
})); }));
useEffect(() => { useEffect(() => {
if (data && setFilterdata) { if (data && setFilterdata) {
@ -61,13 +67,13 @@ const ContactFilterPanel = forwardRef(
const onSubmit = (formData) => { const onSubmit = (formData) => {
onApply(formData); onApply(formData);
closePanel(); // closePanel();
}; };
const handleClose = () => { const handleClose = () => {
reset(defaultContactFilter); reset(defaultContactFilter);
onApply(defaultContactFilter); onApply(defaultContactFilter);
closePanel(); // closePanel();
}; };
if (isLoading || isFetching) return <ExpenseFilterSkeleton />; if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
@ -93,19 +99,18 @@ const ContactFilterPanel = forwardRef(
valueKey="id" valueKey="id"
/> />
</div> </div>
<div className="d-flex justify-content-end py-3 gap-2"> <div className="d-flex justify-content-end py-3 gap-2">
<button <button
type="button" type="button"
className="btn btn-label-secondary btn-xs" className="btn btn-label-secondary btn-sm"
onClick={handleClose} onClick={handleClose}
> >
Clear Clear
</button> </button>
<button type="submit" className="btn btn-primary btn-xs"> <button type="submit" className="btn btn-primary btn-sm">
Apply Apply
</button> </button>
</div> </div>
</form> </form>
</FormProvider> </FormProvider>
); );

9
src/pages/Directory/NoteFilterPanel.jsx
View File

@ -12,6 +12,11 @@ import SelectMultiple from "../../components/common/SelectMultiple";
const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref) => { const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref) => {
const { data, isError, isLoading, error, isFetched, isFetching } = useNoteFilter(); const { data, isError, isLoading, error, isFetched, isFetching } = useNoteFilter();
useEffect(() => {
return () => {
closePanel();
};
}, []);
//Add this for Filter chip remover //Add this for Filter chip remover
const dynamicdefaultNotesFilter = useMemo(() => { const dynamicdefaultNotesFilter = useMemo(() => {
@ -35,13 +40,13 @@ const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref
const onSubmit = (formData) => { const onSubmit = (formData) => {
onApply(formData); onApply(formData);
closePanel(); // closePanel();
}; };
const handleClose = () => { const handleClose = () => {
reset(defaultNotesFilter); reset(defaultNotesFilter);
onApply(defaultNotesFilter); onApply(defaultNotesFilter);
closePanel(); // closePanel();
}; };
//Add this for Filter chip remover //Add this for Filter chip remover