src/components/Project/ProjectNav.jsx

@@ -7,10 +7,6 @@ import {
   DIRECTORY_USER,
   MANAGE_PROJECT_INFRA,
   MANAGE_TASK,
-  MANAGE_TEAM,
-  MODIFY_DOCUMENT,
-  UPLOAD_DOCUMENT,
-  VIEW_DOCUMENT,
   VIEW_PROJECT_INFRA,
 } from "../../utils/constants";
 
@@ -21,10 +17,6 @@ const ProjectNav = ({ onPillClick, activePill }) => {
   const DirAdmin = useHasUserPermission(DIRECTORY_ADMIN);
   const DireManager = useHasUserPermission(DIRECTORY_MANAGER);
   const DirUser = useHasUserPermission(DIRECTORY_USER);
-  const isManageTeam = useHasUserPermission(MANAGE_TEAM)
-  const isViewDocuments = hasUserPermission(VIEW_DOCUMENT);
-  const isUploadDocument = useHasUserPermission(UPLOAD_DOCUMENT)
-  const isModifyDocument = useHasUserPermission(MODIFY_DOCUMENT)
 
   const ProjectTab = [
     { key: "profile", icon: "bx bx-user", label: "Profile" },
@@ -41,8 +33,8 @@ const ProjectNav = ({ onPillClick, activePill }) => {
       label: "Directory",
       hidden: !(DirAdmin || DireManager || DirUser),
     },
-    { key: "documents", icon: "bx bx-folder-open", label: "Documents",hidden:!(isViewDocuments || isModifyDocument || isUploadDocument) },
+    { key: "documents", icon: "bx bx-folder-open", label: "Documents" },
-    { key: "setting", icon: "bx bxs-cog", label: "Setting",hidden:!isManageTeam },
+    { key: "setting", icon: "bx bxs-cog", label: "Setting" },
   ];
   return (
     <div className="nav-align-top">

src/components/Project/ProjectPermission.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from "react";
+import React, { useEffect } from "react";
 import {
   useProjectLevelEmployeePermission,
   useProjectLevelModules,
@@ -27,7 +27,7 @@ const ProjectPermission = () => {
     watch,
     handleSubmit,
     reset,
-    formState: { errors, isDirty },
+    formState: { errors },
   } = useForm({
     resolver: zodResolver(ProjectPermissionSchema),
     defaultValues: {
@@ -43,82 +43,82 @@ const ProjectPermission = () => {
     selectedProject
   );
 
-  useEffect(() => {
+useEffect(() => {
-    if (!selectedEmployee) return;
+  if (!selectedEmployee) return;
 
-    const enabledPerms =
+  const enabledPerms =
-      selectedEmpPermissions?.permissions
+    selectedEmpPermissions?.permissions
-        ?.filter((perm) => perm.isEnabled)
+      ?.filter((perm) => perm.isEnabled)
-        ?.map((perm) => perm.id) || [];
+      ?.map((perm) => perm.id) || [];
+
+  reset((prev) => ({
+    ...prev,
+    selectedPermissions: enabledPerms,
+  }));
+}, [selectedEmpPermissions, reset, selectedEmployee]);
 
-    reset((prev) => ({
-      ...prev,
-      selectedPermissions: enabledPerms,
-    }));
-  }, [selectedEmpPermissions, reset, selectedEmployee]);
 
   const { mutate: updatePermission, isPending } =
     useUpdateProjectLevelEmployeePermission();
 
-  const onSubmit = (formData) => {
+ const onSubmit = (formData) => {
-    if (!formData.employeeId) {
+  if (!formData.employeeId) {
-      showToast("Please select an employee", "warn");
+    showToast("Please select an employee", "warn");
-      return;
+    return;
-    }
+  }
 
-    const existingPermissions = selectedEmpPermissions?.permissions || [];
+  const existingPermissions = selectedEmpPermissions?.permissions || [];
-    const existingEnabledIds = existingPermissions
+  const existingEnabledIds = existingPermissions
-      .filter((p) => p.isEnabled)
+    .filter((p) => p.isEnabled)
-      .map((p) => p.id);
+    .map((p) => p.id);
 
-    const newSelectedIds = formData.selectedPermissions || [];
+  const newSelectedIds = formData.selectedPermissions || [];
 
-    const removed = existingEnabledIds
+  const removed = existingEnabledIds
-      .filter((id) => !newSelectedIds.includes(id))
+    .filter((id) => !newSelectedIds.includes(id))
-      .map((id) => ({ id, isEnabled: false }));
+    .map((id) => ({ id, isEnabled: false }));
 
-    const added = newSelectedIds
+  const added = newSelectedIds
-      .filter((id) => !existingEnabledIds.includes(id))
+    .filter((id) => !existingEnabledIds.includes(id))
-      .map((id) => ({ id, isEnabled: true }));
+    .map((id) => ({ id, isEnabled: true }));
 
-    const payloadPermissions = [...removed, ...added];
+  const payloadPermissions = [...removed, ...added];
 
-    if (payloadPermissions.length === 0) {
+  if (payloadPermissions.length === 0) {
-      showToast("No changes detected", "info");
+    showToast("No changes detected", "info");
-      return;
+    return;
-    }
+  }
 
-    const payload = {
+  const payload = {
-      employeeId: formData.employeeId,
+    employeeId: formData.employeeId,
-      projectId: selectedProject,
+    projectId: selectedProject,
-      permission: payloadPermissions,
+    permission: payloadPermissions,
-    };
-
-    updatePermission(payload);
   };
 
-  const useOnClick = useCallback((event) => {}, []);
+  updatePermission(payload);
+};
+
+
   return (
-    <div className="w-100  p py-1 ">
+    <div className="row px-2 py-1">
       <form className="row" onSubmit={handleSubmit(onSubmit)}>
-        <div className="d-flex justify-content-between align-items-end gap-2 mb-3">
+        {/* Employee Dropdown */}
-          <div className="text-start d-flex align-items-center gap-2">
+        <div className="d-flex align-items-end gap-2">
-            <div className="d-block"><label className="form-label">Select Employee</label></div>
+          <div className="text-start">
-           <div className="d-block"> <select
+            <label className="form-label">Select Employee</label>
+            <select
               className="form-select form-select-sm"
               {...register("employeeId")}
               disabled={isPending}
-              dd
             >
               {loading ? (
                 <option value="">Loading...</option>
               ) : (
                 <>
                   <option value="">-- Select Employee --</option>
-                  {[...employees]
+                  {[...employees]?.sort((a, b) =>
-                    ?.sort((a, b) =>
+                      `${a.firstName} ${a.firstName}`?.localeCompare(
-                      `${a?.firstName} ${a?.firstName}`?.localeCompare(
+                        `${b.firstName} ${b.lastName}`
-                        `${b?.firstName} ${b?.lastName}`
                       )
                     )
                     ?.map((emp) => (
@@ -128,7 +128,7 @@ const ProjectPermission = () => {
                     ))}
                 </>
               )}
-            </select></div>
+            </select>
 
             {errors.employeeId && (
               <div className="text-danger small">
@@ -136,48 +136,42 @@ const ProjectPermission = () => {
               </div>
             )}
           </div>
-          {isDirty && (
+          <button
-            <div className="mt-3 text-end">
+            className="btn btn-sm btn-primary"
-              <button
+            disabled={isPending || loading}
-                type="submit"
+          >
-                className="btn btn-sm btn-primary"
+            {isPending ? "Please Wait..." : "Update Permission"}
-                disabled={isPending || loading}
+          </button>
-              >
-                {isPending ? "Please Wait..." : "Save Permission"}
-              </button>
-            </div>
-          )}
         </div>
 
+        {/* Permissions */}
         {ProjectModules.map((feature) => (
-          <div
+          <div key={feature.id} className="row my-2 px-3 ">
-            key={feature.id}
+            <div className="col-12 text-start fw-semibold mb-2">
-            className="col-12 col-sm-6 col-md-4 col-lg-4 mb-4"
+              {feature.name}
-          >
+            </div>
-            <div className="card text-start border-1 p-1">
+            <div className="col-12">
-              <p className="card-title fs-6 fw-semibold">{feature.name}</p>
+              <div className="row">
-              <div className="px-2">
+                {feature.featurePermissions?.map((perm) => (
-                <ul class="list-unstyled">
+                  <div className="col-12 col-sm-6 col-md-4 mb-2" key={perm.id}>
-                  {feature.featurePermissions?.map((perm) => (
+                    <label
-                    <div className="d-flex my-2" key={perm.id}>
+                      className="form-check-label d-flex align-items-center"
-                      <label
+                      htmlFor={perm.id}
-                        className="form-check-label d-flex align-items-center"
+                    >
-                        htmlFor={perm.id}
+                      <input
-                      >
+                        type="checkbox"
-                        <input
+                        className="form-check-input me-2"
-                          type="checkbox"
+                        id={perm.id}
-                          className="form-check-input me-2"
+                        value={perm.id}
-                          id={perm.id}
+                        {...register("selectedPermissions")}
-                          value={perm.id}
+                      />
-                          {...register("selectedPermissions")}
+                      {perm.name}
-                        />
+                    </label>
-                        {perm.name}
+                  </div>
-                      </label>
+                ))}
-                    </div>
-                  ))}
-                </ul>
               </div>
             </div>
+            <hr className="my-2" />
           </div>
         ))}
       </form>

src/hooks/useHasUserPermission.js

@@ -1,16 +1,11 @@
 
-import { useSelectedProject } from "../slices/apiDataManager";
+import { useProfile } from "./useProfile"
-import { useAllProjectLevelPermissions, useProfile } from "./useProfile";
-
 export const useHasUserPermission = (permission) => {
-  const selectedProject = useSelectedProject();
   const { profile } = useProfile();
-  const { data: projectPermissions = [], isLoading, isError } = useAllProjectLevelPermissions(selectedProject);
 
-  if (isLoading || !permission) return false;
+  if (profile && permission && typeof permission === "string") {
-
+    return profile?.featurePermissions.includes(permission);
-  const globalPerms = profile?.featurePermissions ?? [];
+  }
-  const projectPerms = projectPermissions ?? [];
+  
-
+  return false;
-  return globalPerms.includes(permission) || projectPerms.includes(permission);
 };

src/hooks/useProfile.js

@@ -1,20 +1,67 @@
-import { useState, useEffect, useCallback } from "react";
+import {useState,useEffect, useCallback} from "react";
 import AuthRepository from "../repositories/AuthRepository";
-import {
+import {cacheData, cacheProfileData, getCachedData, getCachedProfileData} from "../slices/apiDataManager";
-  cacheData,
+import {useSelector} from "react-redux";
-  cacheProfileData,
-  getCachedData,
-  getCachedProfileData,
-  useSelectedProject,
-} from "../slices/apiDataManager";
-import { useSelector } from "react-redux";
 import eventBus from "../services/eventBus";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import ProjectRepository from "../repositories/ProjectRepository";
 
 let hasFetched = false;
 let hasReceived = false;
 
+// export const useProfile = () => {
+//   const loggedUser = useSelector( ( store ) => store.globalVariables.loginUser );
+//   const [profile, setProfile] = useState(null);
+//   const [loading, setLoading] = useState(false);
+//   const [error, setError] = useState("");
+
+//   const fetchData = async () => {
+//     try {
+//       setLoading(true);
+//       let response = await AuthRepository.profile();
+//       setProfile(response.data);
+//       cacheProfileData(response.data);
+//     } catch (error) {
+//       setError("Failed to fetch data.");
+//     } finally {
+//       setLoading(false);
+//     }
+//   };
+
+//   const validation = () => {
+//     if (!hasFetched) {
+//       hasFetched = true;
+//       if (!loggedUser) {
+//         fetchData();
+//       } else {
+//         setProfile(loggedUser);
+//       }
+//     }
+  
+//       setProfile(loggedUser);
+//   }
+
+//   useEffect(() => {
+//     validation();
+//   }, [loggedUser]);
+
+//   const handler = useCallback(
+//     (data) => {
+//       if(!getCachedData("hasReceived")){
+//         cacheData("hasReceived", true);
+//       hasFetched = false;
+//       validation();
+//       }
+//     },[]
+//   );
+
+//   useEffect(() => {
+//     eventBus.on("assign_project_one", handler);
+//     return () => eventBus.off("assign_project_one", handler);
+//   }, [handler]);
+
+//   return { profile, loading, error };
+// };
+
 export const useProfile = () => {
   const loggedUser = useSelector((store) => store.globalVariables.loginUser);
   const queryClient = useQueryClient();
@@ -53,26 +100,12 @@ export const useProfile = () => {
   };
 };
 
-export const useSidBarMenu = () => {
-  const userLogged = useSelector((store) => store.globalVariables.loginUser);
-  return useQuery({
-    queryKey: ["AppMenu"],
-    queryFn: async () => await AuthRepository.appmenu(),
-    enabled: !!userLogged,
-  });
-};
 
-export const useAllProjectLevelPermissions = (projectId) => {
+export const useSidBarMenu = ()=>{
-
+  const userLogged = useSelector((store)=>store.globalVariables.loginUser);
-  
   return useQuery({
-    queryKey: ["AllProjectLevelPermission", projectId],
+    queryKey:["AppMenu"],
-    queryFn: async () => {
+    queryFn:async()=> await AuthRepository.appmenu(),
-      const resp = await ProjectRepository.getAllProjectLevelPermission(
+    enabled: !!userLogged
-        projectId
+  })
-      );
+}
-      return resp.data;
-    },
-    enabled: !!projectId,
-  });
-};

src/repositories/ProjectRepository.jsx

@@ -44,8 +44,7 @@ const ProjectRepository = {
     getProjectLevelEmployeeList:(projectId)=>api.get(`/api/Project/get/proejct-level/employees/${projectId}`),
     getProjectLevelModules:()=>api.get(`/api/Project/get/proejct-level/modules`),
     getProjectLevelEmployeePermissions:(employeeId,projectId)=>api.get(`/api/Project/get/project-level-permission/employee/${employeeId}/project/${projectId}`),
-    updateProjectLevelEmployeePermission:(data)=>api.post(`/api/Project/assign/project-level-permission`,data),
+    updateProjectLevelEmployeePermission:(data)=>api.post(`/api/Project/assign/project-level-permission`,data)
-    getAllProjectLevelPermission:(projectId)=>api.get(`/api/Project/get/all/project-level-permission/${projectId}`)
 };
 
 export const TasksRepository = {

src/utils/constants.jsx

@@ -17,7 +17,6 @@ export const VIEW_ALL_EMPLOYEES = "60611762-7f8a-4fb5-b53f-b1139918796b"
 
 export const VIEW_TEAM_MEMBERS = "b82d2b7e-0d52-45f3-997b-c008ea460e7f"
 
-export const MANAGE_TEAM = "b94802ce-0689-4643-9e1d-11c86950c35b"
 
 export const MANAGE_PROJECT_INFRA = "cf2825ad-453b-46aa-91d9-27c124d63373"