Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions frontend/src/components/projectEdit/teamSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export const TeamSelect = () => {
return teamRoles.filter((r) => r.value === value)[0].label;
};

const editTeam = (id) => {
const team = projectInfo.teams.filter((t) => t.teamId === id)[0];
const editTeam = (teamId, roleValue) => {
const team = projectInfo.teams.filter((t) => t.teamId === teamId && t.role === roleValue)[0];
const role = teamRoles.filter((r) => team.role === r.value)[0];

setTeamSelect((t) => {
Expand Down Expand Up @@ -69,7 +69,7 @@ export const TeamSelect = () => {
const updateTeam = () => {
const teams = projectInfo.teams.map((t) => {
let item = t;
if (t.teamId === teamSelect.team.teamId) {
if (t.teamId === teamSelect.team.teamId && t.role === teamSelect.team.role) {
item = newTeam();
}
return item;
Expand Down Expand Up @@ -117,7 +117,10 @@ export const TeamSelect = () => {
</div>
<div className="w-30 fl">{getLabel(t.role)}</div>
<div className="w-20 fl pl3 tr">
<span className="pa2 br-100 pointer bg-grey-light" onClick={() => editTeam(t.teamId)}>
<span
className="pa2 br-100 pointer bg-grey-light"
onClick={() => editTeam(t.teamId, t.role)}
>
<PencilIcon className="h1 w1 blue-dark" />
</span>
<span
Expand Down