diff --git a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx index 97f54cf0..6254c24c 100644 --- a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx +++ b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx @@ -1,6 +1,7 @@ import React from "react"; import { useProjectAssignedOrganizations } from "../../../hooks/useProjects"; import { useSelectedProject } from "../../../slices/apiDataManager"; +import { formatUTCToLocalTime } from "../../../utils/dateUtils"; const ProjectAssignedOrgs = () => { const selectedProject = useSelectedProject(); @@ -24,12 +25,12 @@ const ProjectAssignedOrgs = () => { ), align: "text-start", }, - { + { key: "service", label: "Service Name", getValue: (org) => (
- {org?.service?.name} + {org?.service?.name}
), align: "text-start", @@ -48,23 +49,37 @@ const ProjectAssignedOrgs = () => { align: "text-center", }, { - key: "isActive", - label: "Status", + key: "organizationType", + label: "Organization Type", getValue: (org) => ( - {org?.isActive ? "Active" : "Inactive"} + {org?.organizationType || "N/A"} ), - align: "text-start", + align: "text-center", }, + { + key: "assignedDate", + label: "Assigned Date", + getValue: (org) => ( + + {formatUTCToLocalTime(org?.assignedDate)} + + ), + align: "text-center", + }, + ]; if (isLoading) return
Loading...
; if (isError) return
{error.message}
; - + console.log("kartik", data) return (
diff --git a/src/hooks/useProjectAccess.js b/src/hooks/useProjectAccess.js index 8449df82..6a3f5c67 100644 --- a/src/hooks/useProjectAccess.js +++ b/src/hooks/useProjectAccess.js @@ -14,8 +14,7 @@ export const useProjectAccess = (projectId) => { const canView = useHasUserPermission(VIEW_PROJECTS); const loading = isLoading || !isFetched; - debugger - useEffect(() => { + useEffect(() => { if (projectId && !loading && !canView) { showToast("You don't have permission to view project details", "warning"); navigate("/projects");