Revert "Track 210 - Update restrictions for Status and Issues editing…

… permissions" (#2434) Reverts #2432
bcgov · Nov 13, 2024 · a65ebac · a65ebac
1 parent e8e8500
commit a65ebac
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 116 deletions.
diff --git a/epictrack-api/docker-compose.yml b/epictrack-api/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     links:
       - eao-reports-api-db
     ports:
-      - '3200:8080'
+      - '3002:8080'
     environment:
       - JWT_OIDC_ISSUER:${JWT_OIDC_ISSUER}
       - JWT_OIDC_WELL_KNOWN_CONFIG:${JWT_OIDC_WELL_KNOWN_CONFIG}
@@ -48,7 +48,7 @@ services:
 
     networks:
       - eao-network
-
+    
 
 networks:
   eao-network:

diff --git a/epictrack-api/src/api/logging.conf → epictrack-api/logging.conf b/epictrack-api/src/api/logging.conf → epictrack-api/logging.conf
diff --git a/epictrack-web/package-lock.json b/epictrack-web/package-lock.json
diff --git a/epictrack-web/src/components/workPlan/issues/IssueAccordion/Details.tsx b/epictrack-web/src/components/workPlan/issues/IssueAccordion/Details.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { Button, Grid } from "@mui/material";
 import { WorkIssue } from "../../../../models/Issue";
-import { WorkStaffRole, WorkStaffRoleNames } from "../../../../models/role";
 import { ETCaption1, ETHeading4, ETParagraph, GrayBox } from "../../../shared";
 import moment from "moment";
 import { ETChip } from "../../../shared/chip/ETChip";
@@ -15,32 +14,18 @@ import IssueHistory from "./IssueHistory";
 import {
   MONTH_DAY_YEAR,
   ROLES,
-  SPECIAL_FIELDS,
 } from "../../../../constants/application-constant";
 import { Restricted } from "../../../shared/restricted";
 import { useAppSelector } from "hooks";
-import { WorkplanContext } from "../../WorkPlanContext";
+import { WorkplanContext } from "components/workPlan/WorkPlanContext";
 
 const IssueDetails = ({ issue }: { issue: WorkIssue }) => {
   const latestUpdate = issue.updates[0];
   const CheckCircleIcon: React.FC<IconProps> = icons["CheckCircleIcon"];
   const PencilEditIcon: React.FC<IconProps> = icons["PencilEditIcon"];
   const AddIcon: React.FC<IconProps> = icons["AddIcon"];
 
-  // These are used in conjunction with /restricted/index.tsx for permission control.
   const { team } = React.useContext(WorkplanContext);
-  const activeTeam = team?.filter((member) => member.is_active);
-  const { email } = useAppSelector((state) => state.user.userDetail);
-  const isTeamMember = team?.some((member) => member.staff.email === email);
-  const rolesArray = [
-    ROLES.RESPONSIBLE_EPD,
-    ROLES.TEAM_LEAD,
-    ROLES.TEAM_CO_LEAD,
-  ];
-  const userHasRole = activeTeam?.some(
-    (member) =>
-      member.staff.email === email && rolesArray.includes(member.role.name)
-  );
 
   const {
     setEditIssueUpdateFormIsOpen,
@@ -52,6 +37,9 @@ const IssueDetails = ({ issue }: { issue: WorkIssue }) => {
     setNewIssueUpdateFormIsOpen,
   } = React.useContext(IssuesContext);
 
+  const { email } = useAppSelector((state) => state.user.userDetail);
+  const isTeamMember = team?.some((member) => member.staff.email === email);
+
   const handleApproveIssue = () => {
     approveIssue(issue.id, latestUpdate.id);
     setIssueToApproveId(null);
@@ -166,10 +154,8 @@ const IssueDetails = ({ issue }: { issue: WorkIssue }) => {
                   allowed={[
                     latestUpdate.is_approved ? ROLES.EXTENDED_EDIT : ROLES.EDIT,
                   ]}
+                  exception={!latestUpdate.is_approved && isTeamMember}
                   errorProps={{ disabled: true }}
-                  exception={
-                    (!latestUpdate.is_approved && isTeamMember) || userHasRole
-                  }
                 >
                   <Button
                     data-cy="edit-issue-update-button"

diff --git a/epictrack-web/src/components/workPlan/issues/IssueAccordion/IssueHistory/index.tsx b/epictrack-web/src/components/workPlan/issues/IssueAccordion/IssueHistory/index.tsx
@@ -24,26 +24,9 @@ import {
 } from "../../../../../constants/application-constant";
 import { Restricted } from "../../../../shared/restricted";
 import { EmptyIssueHistory } from "./EmptyIssueHistory";
-import { WorkplanContext } from "../../../WorkPlanContext";
-import { useAppSelector } from "hooks";
 
 const IssueHistory = ({ issue }: { issue: WorkIssue }) => {
   const theme = useTheme();
-
-  // These are used in conjunction with /restricted/index.tsx for permission control.
-  const { team } = React.useContext(WorkplanContext);
-  const activeTeam = team?.filter((member) => member.is_active);
-  const { email } = useAppSelector((state) => state.user.userDetail);
-  const rolesArray = [
-    ROLES.RESPONSIBLE_EPD,
-    ROLES.TEAM_LEAD,
-    ROLES.TEAM_CO_LEAD,
-  ];
-  const userHasRole = activeTeam?.some(
-    (member) =>
-      member.staff.email === email && rolesArray.includes(member.role.name)
-  );
-
   const { setUpdateToEdit, setEditIssueUpdateFormIsOpen } =
     useContext(IssuesContext);
 
@@ -112,7 +95,6 @@ const IssueHistory = ({ issue }: { issue: WorkIssue }) => {
                   <Restricted
                     allowed={[ROLES.EXTENDED_EDIT]}
                     errorProps={{ disabled: true }}
-                    exception={userHasRole}
                   >
                     <Button
                       data-cy="edit-history-update-button"

diff --git a/epictrack-web/src/components/workPlan/issues/IssueAccordion/Summary.tsx b/epictrack-web/src/components/workPlan/issues/IssueAccordion/Summary.tsx
@@ -20,21 +20,9 @@ import { useAppSelector } from "hooks";
 const IssueSummary = ({ issue }: { issue: WorkIssue }) => {
   const { setEditIssueFormIsOpen, setIssueToEdit } =
     React.useContext(IssuesContext);
-
-  // These are used in conjunction with /restricted/index.tsx for permission control.
   const { team } = React.useContext(WorkplanContext);
-  const activeTeam = team?.filter((member) => member.is_active);
   const { email } = useAppSelector((state) => state.user.userDetail);
   const isTeamMember = team?.some((member) => member.staff.email === email);
-  const rolesArray = [
-    ROLES.RESPONSIBLE_EPD,
-    ROLES.TEAM_LEAD,
-    ROLES.TEAM_CO_LEAD,
-  ];
-  const userHasRole = activeTeam?.some(
-    (member) =>
-      member.staff.email === email && rolesArray.includes(member.role.name)
-  );
 
   const EditIcon: React.FC<IconProps> = icons["PencilEditIcon"];
   return (
@@ -78,9 +66,9 @@ const IssueSummary = ({ issue }: { issue: WorkIssue }) => {
         <Grid item xs={"auto"} container justifyContent={"flex-end"}>
           <AccordionSummaryItem title="Actions" enableTooltip={true}>
             <Restricted
-              allowed={[ROLES.EXTENDED_EDIT]}
+              allowed={[ROLES.EDIT]}
               errorProps={{ disabled: true }}
-              exception={userHasRole}
+              exception={isTeamMember}
             >
               <Button
                 variant="text"

diff --git a/epictrack-web/src/components/workPlan/status/StatusView/RecentStatus.tsx b/epictrack-web/src/components/workPlan/status/StatusView/RecentStatus.tsx
@@ -27,21 +27,9 @@ const RecentStatus = () => {
     setStatus,
     setShowApproveStatusDialog,
   } = React.useContext(StatusContext);
-
-  // These are used in conjunction with /restricted/index.tsx for permission control.
   const { team } = React.useContext(WorkplanContext);
-  const activeTeam = team?.filter((member) => member.is_active);
   const { email } = useAppSelector((state) => state.user.userDetail);
   const isTeamMember = team?.some((member) => member.staff.email === email);
-  const rolesArray = [
-    ROLES.RESPONSIBLE_EPD,
-    ROLES.TEAM_LEAD,
-    ROLES.TEAM_CO_LEAD,
-  ];
-  const userHasRole = activeTeam?.some(
-    (member) =>
-      member.staff.email === email && rolesArray.includes(member.role.name)
-  );
 
   return (
     <GrayBox
@@ -149,7 +137,7 @@ const RecentStatus = () => {
         <Restricted
           allowed={[statuses[0].is_approved ? ROLES.EXTENDED_EDIT : ROLES.EDIT]}
           errorProps={{ disabled: true }}
-          exception={(!statuses[0].is_approved && isTeamMember) || userHasRole}
+          exception={!statuses[0].is_approved && isTeamMember}
         >
           <Button
             startIcon={<PencilEditIcon />}

diff --git a/epictrack-web/src/components/workPlan/status/StatusView/StatusHistory/index.tsx b/epictrack-web/src/components/workPlan/status/StatusView/StatusHistory/index.tsx
@@ -25,7 +25,6 @@ import { Box, Button, Collapse, Grid, useTheme } from "@mui/material";
 import { StatusContext } from "../../StatusContext";
 import { Restricted } from "../../../../shared/restricted";
 import { EmptyStatusHistory } from "./EmptyStatusHistory";
-import { useAppSelector } from "hooks";
 
 const ExpandIcon: React.FC<IconProps> = Icons["ExpandIcon"];
 const PencilEditIcon: React.FC<IconProps> = Icons["PencilEditIcon"];
@@ -35,25 +34,13 @@ const StatusHistory = () => {
   const { setShowStatusForm, setStatus } = useContext(StatusContext);
   const [expand, setExpand] = useState(false);
   const theme = useTheme();
+
   const approvedStatuses = statuses.filter(
     (status) => status.is_approved && status.id != statuses?.[0]?.id
   );
   const highlightFirstInTimeLineApproved = !statuses?.[0]?.is_approved;
-  const SHOW_MORE_THRESHOLD = 3;
 
-  // These are used in conjunction with /restricted/index.tsx for permission control.
-  const { team } = React.useContext(WorkplanContext);
-  const activeTeam = team?.filter((member) => member.is_active);
-  const { email } = useAppSelector((state) => state.user.userDetail);
-  const rolesArray = [
-    ROLES.RESPONSIBLE_EPD,
-    ROLES.TEAM_LEAD,
-    ROLES.TEAM_CO_LEAD,
-  ];
-  const userHasRole = activeTeam?.some(
-    (member) =>
-      member.staff.email === email && rolesArray.includes(member.role.name)
-  );
+  const SHOW_MORE_THRESHOLD = 3;
 
   if (approvedStatuses.length === 0) {
     return <EmptyStatusHistory />;
@@ -96,7 +83,6 @@ const StatusHistory = () => {
                   <Restricted
                     allowed={[ROLES.EXTENDED_EDIT]}
                     errorProps={{ disabled: true }}
-                    exception={userHasRole}
                   >
                     <Button
                       variant="text"

diff --git a/epictrack-web/src/constants/application-constant.ts b/epictrack-web/src/constants/application-constant.ts
@@ -105,9 +105,6 @@ export const ROLES = {
   DEFAULT_ROLES_EAO_EPIC: "default-roles-eao-epic",
   MANAGE_USERS: "manage_users",
   EXTENDED_EDIT: "extended_edit",
-  RESPONSIBLE_EPD: "Responsible EPD",
-  TEAM_LEAD: "Team Lead",
-  TEAM_CO_LEAD: "Team Co-Lead",
 };
 
 export enum SpecialFieldEntityEnum {
@@ -126,8 +123,7 @@ export const SPECIAL_FIELDS = Object.freeze({
   },
   WORK: {
     RESPONSIBLE_EPD: "responsible_epd_id",
-    TEAM_LEAD: "team_lead_id",
-    TEAM_CO_LEAD: "team_co_lead_id",
+    WORK_LEAD: "work_lead_id",
   },
 });
 

diff --git a/epictrack-web/src/services/userService/index.ts b/epictrack-web/src/services/userService/index.ts
@@ -82,7 +82,7 @@ const initKeycloak = async (dispatch: Dispatch<AnyAction>) => {
       KeycloakData.tokenParsed?.resource_access?.[AppConfig.keycloak.clientId]
         ?.roles ?? [];
     const roles = [...realmAccessRoles, ...clientLevelRoles];
-
+    console.log("My Roles:", roles);
     const userDetail = new UserDetail(
       userInfo["sub"],
       userInfo["preferred_username"],