From abd430ccb6d5c6e51bc517b500ec665b3ea98790 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Fri, 9 May 2025 19:23:13 +0530 Subject: [PATCH 1/2] preserve selected employees when applying designation filter --- src/components/Project/AssignRole.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Project/AssignRole.jsx b/src/components/Project/AssignRole.jsx index a4f38386..7c035f2c 100644 --- a/src/components/Project/AssignRole.jsx +++ b/src/components/Project/AssignRole.jsx @@ -67,7 +67,7 @@ const AssignRoleModel = ({ assignData, onClose }) => { const handleRoleChange = (event) => { reset(); - setSelectedEmployees([]); + // setSelectedEmployees([]); setSelectedRole(event.target.value); }; -- 2.43.0 From b639acc7e6144f60dc0e8204e668a7fc7d1f2565 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Fri, 9 May 2025 22:21:34 +0530 Subject: [PATCH 2/2] added loader for loading display during api calling --- src/components/Project/AssignRole.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Project/AssignRole.jsx b/src/components/Project/AssignRole.jsx index 7c035f2c..e5a567e9 100644 --- a/src/components/Project/AssignRole.jsx +++ b/src/components/Project/AssignRole.jsx @@ -40,7 +40,7 @@ const AssignRoleModel = ({ assignData, onClose }) => { const selectedProject = useSelector( (store) => store.localVariables.projectId ); - const { employees } = useEmployeesAllOrByProjectId(selectedProject,false); + const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false); const dispatch = useDispatch(); const { data, loading } = useMaster(); @@ -188,7 +188,8 @@ const AssignRoleModel = ({ assignData, onClose }) => {
Employee
- {filteredEmployees?.length === 0 && employees && ( + {employeeLoading &&
Loading...
} + {!employeeLoading && filteredEmployees?.length === 0 && employees && (
No employees found
)} -- 2.43.0