Skip to content

Commit fee840e

Browse files
committed
update edit team permission
set permission to the list of teams where user is assigned as a team manager insted of project manager
1 parent d457b69 commit fee840e

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

frontend/src/hooks/UsePermissions.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ export function useEditProjectAllowed(project) {
2929
export function useEditTeamAllowed(team) {
3030
const userDetails = useSelector((state) => state.auth.userDetails);
3131
const organisations = useSelector((state) => state.auth.organisations);
32-
const pmTeams = useSelector((state) => state.auth.pmTeams);
32+
// const pmTeams = useSelector((state) => state.auth.pmTeams);
33+
const tmTeams = useSelector((state) => state.auth.tmTeams);
3334
const [isAllowed, setIsAllowed] = useState(false);
3435

3536
useEffect(() => {
@@ -39,17 +40,21 @@ export function useEditTeamAllowed(team) {
3940
if (organisations && organisations.includes(team.organisation_id)) setIsAllowed(true);
4041
// team managers can edit it
4142
// verify from the redux store
42-
if (pmTeams && pmTeams.includes(team.teamId)) setIsAllowed(true);
43-
// and verify based on the team members list
43+
// if (pmTeams && pmTeams.includes(team.teamId)) setIsAllowed(true); // removing this cause it is fetching all teams having project project manager role
44+
45+
// removed pm and test using tm list
46+
if (tmTeams && tmTeams.includes(team.teamId)) setIsAllowed(true);
47+
4448
if (team.members) {
49+
// and verify based on the team members list
4550
const managers = team.members
4651
.filter((member) => member.active && member.function === 'MANAGER')
4752
.map((member) => member.username);
4853
if (userDetails.username && managers.includes(userDetails.username)) {
4954
setIsAllowed(true);
5055
}
5156
}
52-
}, [pmTeams, userDetails.role, userDetails.username, organisations, team]);
57+
}, [userDetails.role, userDetails.username, organisations, team, tmTeams]);
5358
return [isAllowed];
5459
}
5560

0 commit comments

Comments
 (0)