Merge branch 'pramod_Bug#99ProjectsDisplays' into Issues_April_4W

src/hooks/useProjects.js

@@ -7,6 +7,7 @@ import { setProjectId } from "../slices/localVariablesSlice";
 
 export const useProjects = () =>
 {
+  const {profile} = useProfile()
   const dispatch = useDispatch();
   const [projects, setProjects] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -48,9 +49,19 @@ export const useProjects = () =>
     fetchData();
   }, []);
 
-  useEffect(() => {
+  useEffect( () =>
-    dispatch(setProjectId(projects[0]?.id));
+  {
-  }, [projects]);
+    if (projects )
+    {
+      if ( profile?.projects && profile?.projects?.length > 0 )
+      {
+        dispatch(setProjectId(profile?.projects[0]))
+      } else
+      {
+        dispatch(setProjectId(1))
+      }
+    }
+  }, [profile]);
 
   return { projects, loading, error, refetch: fetchData };
 };

src/pages/employee/EmployeeList.jsx

@@ -163,30 +163,32 @@ const EmployeeList = () => {
                         className="dataTables_length text-start"
                         id="DataTables_Table_0_length"
                       >
-                        <label>
+                      <label>
-                          <select
+  <select
-                            id="project-select"
+    id="project-select"
-                            onChange={(e) => setSelectedProject(e.target.value)}
+    onChange={(e) => setSelectedProject(e.target.value)}
-                            name="DataTables_Table_0_length"
+    name="DataTables_Table_0_length"
-                            aria-controls="DataTables_Table_0"
+    aria-controls="DataTables_Table_0"
-                            className="form-select form-select-sm"
+    className="form-select form-select-sm"
-                            value={selectedProject || ""}
+    value={selectedProject || ""}
-                          >
+  >
-                            {projectLoading ? (
+    {projectLoading ? (
-                              <option value="Loading">Loading...</option>
+      <option value="Loading">Loading...</option>
-                            ) : (
+    ) : (
-                              <>
+      <>
-                                <option value="">All Employees</option>
+        <option value="">All Employees</option>
-                                {Array.isArray(projects) &&
+        {Array.isArray(projects) &&
-                                  projects.map((item) => (
+          projects
-                                    <option key={item.id} value={item.id}>
+            .filter((item) => loginUser?.projects?.includes(String(item.id)))
-                                      {item.name}
+            .map((item) => (
-                                    </option>
+              <option key={item.id} value={item.id}>
-                                  ))}
+                {item.name}
-                              </>
+              </option>
-                            )}
+            ))}
-                          </select>
+      </>
-                        </label>
+    )}
+  </select>
+</label>
                       </div>
                     </div>
                   </div>

src/pages/project/ProjectList.jsx

@@ -176,10 +176,13 @@ const ProjectList = () =>
           {loading && <p className="text-center">Loading...</p>}
 
           
-          {currentItems &&
+          {Array.isArray(currentItems) && loginUser?.projects && (
-            currentItems.map((item) => (
+  currentItems
-              <ProjectCard projectData={item} key={item.id}></ProjectCard>
+    .filter((item) => loginUser.projects.includes(String(item.id)))
-            ))}
+    .map((item) => (
+      <ProjectCard projectData={item} key={item.id} />
+    ))
+)}
         </div>
            {/* Pagination */}
            {!loading && (