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

Kartik_Enhancement#1448 : Document filters chips #468

Merged
pramod.mahajan merged 3 commits from Kartik_Enhancement#1448 into OnFieldWork_V1 2025-10-09 12:57:37 +00:00
Conversation 0 Commits 3 Files Changed 5 +8 -11
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9dab29d93c - Show all commits

4
src/components/Documents/DocumentFilterPanel.jsx
View File

@ -11,7 +11,8 @@ import SelectMultiple from "../common/SelectMultiple";
import moment from "moment";
import { useParams } from "react-router-dom";
const DocumentFilterPanel = forwardRef(({ entityTypeId, onApply, setFilterdata }, ref) => {
const DocumentFilterPanel = forwardRef(
({ entityTypeId, onApply, setFilterdata }, ref) => {
const [resetKey, setResetKey] = useState(0);
const { status } = useParams();
@ -51,7 +52,6 @@ const DocumentFilterPanel = forwardRef(({ entityTypeId, onApply, setFilterdata }
useImperativeHandle(ref, () => ({
resetFieldValue: (name, value) => {
// Reset specific field
if (value !== undefined) {
setValue(name, value);
} else {

15
src/components/Documents/Documents.jsx
View File

@ -59,7 +59,7 @@ const Documents = ({ Document_Entity, Entity }) => {
const { employeeId } = useParams();
const [OpenDocument, setOpenDocument] = useState(false);
const [filterData, setFilterdata] = useState(DocumentFilterDefaultValues);
const updatedFilters = useRef();
const updatedRef = useRef();
const [ManageDoc, setManageDoc] = useState({
document: null,
isOpen: false,
@ -95,7 +95,7 @@ const Documents = ({ Document_Entity, Entity }) => {
setShowTrigger(true);
setOffcanvasContent(
"Document Filters",
<DocumentFilterPanel entityTypeId={DocumentEntity} onApply={setFilter} setFilterdata={setFilterdata} ref={updatedFilters} />
<DocumentFilterPanel entityTypeId={DocumentEntity} onApply={setFilter} setFilterdata={setFilterdata} ref={updatedRef} />
);
return () => {
@ -111,7 +111,6 @@ const Documents = ({ Document_Entity, Entity }) => {
setViewDoc,
setOpenDocument,
OpenDocument,
// removeFilterChip
};
useEffect(() => {
@ -123,13 +122,15 @@ const Documents = ({ Document_Entity, Entity }) => {
const removeFilterChip = (key, id) => {
const updatedFilters = { ...filters };
if (Array.isArray(updatedFilters[key])) {
updatedFilters[key] = updatedFilters[key].filter((v) => v !== id);
updatedRef.current?.resetFieldValue(key,updatedFilters[key]);
}
else if (key === "dateRange") {
updatedFilters.startDate = null;
updatedFilters.endDate = null;
updatedRef.current?.resetFieldValue("startDate",null);
updatedRef.current?.resetFieldValue("endDate",null);
}
else {
updatedFilters[key] = null;
@ -137,12 +138,8 @@ const Documents = ({ Document_Entity, Entity }) => {
setFilter(updatedFilters);
methods.setValue(key, updatedFilters[key] ?? DocumentFilterDefaultValues[key]);
return updatedFilters;
if (key === "dateRange") {
methods.setValue("startDate", null);
methods.setValue("endDate", null);
}
};