Changes in Filter panel when on close
This commit is contained in:
parent
9bbe479153
commit
73534226e3
@ -21,6 +21,12 @@ const ContactFilterPanel = forwardRef(
|
||||
useContactFilter();
|
||||
const { status } = useParams();
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
closePanel();
|
||||
};
|
||||
}, []);
|
||||
|
||||
const dynamicdefaultContactFilter = useMemo(() => {
|
||||
return {
|
||||
...defaultContactFilter,
|
||||
@ -37,17 +43,17 @@ const ContactFilterPanel = forwardRef(
|
||||
const { handleSubmit, reset, setValue, getValues } = methods;
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
resetFieldValue: (name, value) => {
|
||||
setTimeout(() => {
|
||||
if (value !== undefined) {
|
||||
setValue(name, value);
|
||||
} else {
|
||||
reset({ ...getValues(), [name]: defaultContactFilter[name] });
|
||||
}
|
||||
}, 0);
|
||||
},
|
||||
getValues,
|
||||
}));
|
||||
resetFieldValue: (name, value) => {
|
||||
setTimeout(() => {
|
||||
if (value !== undefined) {
|
||||
setValue(name, value);
|
||||
} else {
|
||||
reset({ ...getValues(), [name]: defaultContactFilter[name] });
|
||||
}
|
||||
}, 0);
|
||||
},
|
||||
getValues,
|
||||
}));
|
||||
|
||||
useEffect(() => {
|
||||
if (data && setFilterdata) {
|
||||
@ -61,13 +67,13 @@ const ContactFilterPanel = forwardRef(
|
||||
|
||||
const onSubmit = (formData) => {
|
||||
onApply(formData);
|
||||
closePanel();
|
||||
// closePanel();
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
reset(defaultContactFilter);
|
||||
onApply(defaultContactFilter);
|
||||
closePanel();
|
||||
// closePanel();
|
||||
};
|
||||
|
||||
if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
|
||||
@ -93,19 +99,18 @@ const ContactFilterPanel = forwardRef(
|
||||
valueKey="id"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="d-flex justify-content-end py-3 gap-2">
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-label-secondary btn-xs"
|
||||
onClick={handleClose}
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
<button type="submit" className="btn btn-primary btn-xs">
|
||||
Apply
|
||||
</button>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-label-secondary btn-sm"
|
||||
onClick={handleClose}
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
<button type="submit" className="btn btn-primary btn-sm">
|
||||
Apply
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</FormProvider>
|
||||
);
|
||||
|
@ -12,6 +12,11 @@ import SelectMultiple from "../../components/common/SelectMultiple";
|
||||
const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref) => {
|
||||
const { data, isError, isLoading, error, isFetched, isFetching } = useNoteFilter();
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
closePanel();
|
||||
};
|
||||
}, []);
|
||||
|
||||
//Add this for Filter chip remover
|
||||
const dynamicdefaultNotesFilter = useMemo(() => {
|
||||
@ -35,13 +40,13 @@ const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref
|
||||
|
||||
const onSubmit = (formData) => {
|
||||
onApply(formData);
|
||||
closePanel();
|
||||
// closePanel();
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
reset(defaultNotesFilter);
|
||||
onApply(defaultNotesFilter);
|
||||
closePanel();
|
||||
// closePanel();
|
||||
};
|
||||
|
||||
//Add this for Filter chip remover
|
||||
|
Loading…
x
Reference in New Issue
Block a user