UNCLASSIFIED

Commit 78a69f9e authored by graham.smith's avatar graham.smith
Browse files

Merge branches 'BULL-529' and 'BULL-529' of...

Merge branches 'BULL-529' and 'BULL-529' of https://code.il2.dso.mil/platform-one/products/bullhorn/launchboard-fe into BULL-529
parents c4c40088 9f205616
...@@ -55,9 +55,6 @@ export default { ...@@ -55,9 +55,6 @@ export default {
}); });
}, },
async addMembers(members, teamId) { async addMembers(members, teamId) {
for (let i = 0; i < members.length; i++) { await HTTP.post(`/teams/${teamId}/members`, members);
console.log("USER", members[i]);
await this.addMember(members[i], teamId, members[i].isTeamLead);
}
}, },
}; };
...@@ -344,8 +344,11 @@ export default { ...@@ -344,8 +344,11 @@ export default {
member = this.memberToAdd; member = this.memberToAdd;
} }
this.state.isAddingBusy = true; this.state.isAddingBusy = true;
member = member.map(function (member) {
return { userId: member.id, isTeamLead: false };
});
try { try {
await TeamService.addMembers(member, this.$route.params.teamId, false); await TeamService.addMembers(member, this.$route.params.teamId);
this.memberToAdd = member; this.memberToAdd = member;
this.snackbars.add = true; this.snackbars.add = true;
} catch (e) { } catch (e) {
...@@ -361,17 +364,7 @@ export default { ...@@ -361,17 +364,7 @@ export default {
this.snackbars.delete = false; this.snackbars.delete = false;
this.state.isDeleting = true; this.state.isDeleting = true;
this.deletingMembers = this.selectedMembers; this.deletingMembers = this.selectedMembers;
for (let i = 0; i < this.deletingMembers.length; i++) {
const tempMember = this.team.members.filter(
(member) => member.id === this.deletingMembers[i].id
);
this.deletingMembers[i] = {
...this.deletingMembers[i],
isTeamLead: tempMember[0].TeamMember.isTeamLead,
};
}
this.deletingMembers.forEach((m) => Vue.set(m, "isDeleting", true)); this.deletingMembers.forEach((m) => Vue.set(m, "isDeleting", true));
try { try {
await TeamService.deleteMembers( await TeamService.deleteMembers(
this.deletingMembers.map((item) => item.id), this.deletingMembers.map((item) => item.id),
...@@ -392,11 +385,12 @@ export default { ...@@ -392,11 +385,12 @@ export default {
// keep the delete snackbar open // keep the delete snackbar open
this.snackbars.deleteTimeout = -1; this.snackbars.deleteTimeout = -1;
this.state.isUndoingDelete = true; this.state.isUndoingDelete = true;
console.log("Deleted", this.deletingMembers);
const members = this.deletingMembers.map(function (member) {
return { userId: member.id, isTeamLead: member.TeamMember.isTeamLead };
});
try { try {
await TeamService.addMembers( await TeamService.addMembers(members, this.$route.params.teamId);
this.deletingMembers,
this.$route.params.teamId
);
} catch (e) { } catch (e) {
//TODO: error message to the user??? //TODO: error message to the user???
console.error("error restoring member:", e); console.error("error restoring member:", e);
...@@ -419,7 +413,6 @@ export default { ...@@ -419,7 +413,6 @@ export default {
computed: { computed: {
canEdit() { canEdit() {
// TODO: pull this from user info // TODO: pull this from user info
return true; return true;
}, },
availableSlots() { availableSlots() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment