src/hooks/useProjects.js

@@ -7,7 +7,6 @@ import { setProjectId } from "../slices/localVariablesSlice";
 
 export const useProjects = () =>
 {
-  const {profile} = useProfile()
   const dispatch = useDispatch();
   const [projects, setProjects] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -49,19 +48,9 @@ export const useProjects = () =>
     fetchData();
   }, []);
 
-  useEffect( () =>
+  useEffect(() => {
-  {
+    dispatch(setProjectId(projects[0]?.id));
-    if (projects )
+  }, [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,32 +163,30 @@ 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
+                                  projects.map((item) => (
-            .filter((item) => loginUser?.projects?.includes(String(item.id)))
+                                    <option key={item.id} value={item.id}>
-            .map((item) => (
+                                      {item.name}
-              <option key={item.id} value={item.id}>
+                                    </option>
-                {item.name}
+                                  ))}
-              </option>
+                              </>
-            ))}
+                            )}
-      </>
+                          </select>
-    )}
+                        </label>
-  </select>
-</label>
                       </div>
                     </div>
                   </div>

src/pages/project/ProjectList.jsx

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