team changes

src/api/services/team.js

@@ -24,14 +24,21 @@ export default {
     }
   },
 
-  async updateTeam(team, addPOC, editedMembers) {
-    console.log("UPDATING", team, addPOC, editedMembers);
-    await HTTP.put(`/teams/${team.id}/members`, editedMembers);
-    if (addPOC) {
-      await HTTP.post(`/teams/${team.id}/members`, addPOC);
-    };
-    const response = await HTTP.put(`/teams/${team.id}`, team);
-    return response;
+  async updateTeam(team) {
+    const { name, description, capacity } = team;
+    return HTTP.put(`/teams/${team.id}`, {
+      name,
+      description,
+      capacity,
+    });
+  },
+  async updateTeamMembers(team) {
+    const membersBody = team.members.map((m) => ({
+      userId: m.id,
+      isTeamLead: m.TeamMember.isTeamLead,
+    }));
+
+    return HTTP.put(`/teams/${team.id}/members`, membersBody);
   },
 
   async deleteMembers(members, teamId) {

src/components/AddTeam.vue

@@ -141,16 +141,16 @@ export default {
       // merge members and leads
       const members = new Map();
       this.toAdd.members.forEach((member) => {
-        member.TeamMember.isTeamLead = false;
+        member.TeamMember = { isTeamLead: false };
         members.set(member.id, member);
       });
       this.leads.forEach((lead) => {
-        lead.TeamMember.isTeamLead = true;
+        lead.TeamMember = { isTeamLead: true };
         members.set(lead.id, lead);
       });
-      this.toAdd.members = members.values();
+      this.toAdd.members = [...members.values()];
 
-      this.$emit("edit", this.toAdd);
+      this.$emit("edit", this.toAdd, this.leads);
       this.init();
     },
   },

src/views/Team.vue

@@ -273,32 +273,35 @@ export default {
     inputRules,
   }),
   async mounted() {
-    try {
-      this.loading = true;
+    this.init();
+  },
+  methods: {
+    async init() {
+      try {
+        this.loading = true;
 
-      // no team specified
-      if (!this.$route.params.teamId) {
-        // Admin and Dojo Master don't have a team, so redirect them since
-        // they don't have a reason to be on this page without a specific id
-        this.user = this.$store.state.user.user;
-        if (this.user.permission !== Permission.USER) {
-          console.warn("redirecting privileged user to /teams");
-          this.$router.push("/teams");
+        // no team specified
+        if (!this.$route.params.teamId) {
+          // Admin and Dojo Master don't have a team, so redirect them since
+          // they don't have a reason to be on this page without a specific id
+          this.user = this.$store.state.user.user;
+          if (this.user.permission !== Permission.USER) {
+            console.warn("redirecting privileged user to /teams");
+            this.$router.push("/teams");
+          } else {
+            // get the current user's team
+            this.team = await TeamService.getMyTeam();
+          }
         } else {
-          // get the current user's team
-          this.team = await TeamService.getMyTeam();
+          console.log("THIS CANNOT BE ME");
+          await this.getTeams();
         }
-      } else {
-        console.log("THIS CANNOT BE ME");
-        await this.getTeams();
+      } catch (error) {
+        console.error("!user error!", error);
+      } finally {
+        this.loading = false;
       }
-    } catch (error) {
-      console.error("!user error!", error);
-    } finally {
-      this.loading = false;
-    }
-  },
-  methods: {
+    },
     async getTeams() {
       if (this.initialLoad) {
         this.loading = true;
@@ -315,55 +318,16 @@ export default {
     },
     async editTeam(editedTeam) {
       this.state.isEditingTeamDetailsBusy = true;
-      //1 filtering out to only get IDs from various groups of users
-      const editMembersId = editedTeam.members.map((member) => member.id);
-      const newPOCId = editedTeam.poc.map((member) => member.id);
-      let currentPOCId = this.team.members.filter(
-        (member) => member.TeamMember.isTeamLead === true
-      );
-      currentPOCId = currentPOCId.map((member) => member.id);
-      console.log("ID", editMembersId);
-      const addTeamLeads =[];
-      const editTeamMembers = [];
-      //2 sorting throught the new team leads to decide whether or not they need to be added or updated to team leads
-      for (let i = 0; i < editedTeam.poc.length; i++) {
-        //adding
-        if (!editMembersId.includes(editedTeam.poc[i].id)) {
-          console.log("ADDING", editedTeam.poc[i].name)
-          addTeamLeads.push({ userId: editedTeam.poc[i].id, isTeamLead: true });
-        } //upgrading users 
-        else if (
-          editMembersId.includes(editedTeam.poc[i].id) &&
-          !currentPOCId.includes(editedTeam.poc[i].id)
-        ) {
-          console.log("UPGRADING", editedTeam.poc[i].name)
-          editTeamMembers.push({
-            userId: editedTeam.poc[i].id,
-            isTeamLead: true,
-          });
-        }
-      }
-      //seeing a person needs to be removed from team lead
-      editTeamMembers.concat(
-        currentPOCId.map(function (member) {
-          if (!newPOCId.includes(member)) {
-            console.log("DEMOTING", member);
-            return { userId: member, isTeamLead: false };
-          }
-        })
-      );
-      console.log("addTeamLeads", addTeamLeads);
-      console.log("REMOVE TEAM LEAD", editTeamMembers);
       try {
-        this.team = await TeamService.updateTeam(
-          editedTeam,
-          addTeamLeads,
-          editTeamMembers
-        );
+        await TeamService.updateTeam(editedTeam);
+        // the editedTeam.members will essentially just be the team leads
+        await TeamService.updateTeamMembers(editedTeam);
         // success state
         this.snackbars.teamDetails = true;
         this.state.showEditDialog = false;
+        this.init();
       } catch (e) {
+        // TODO: no error message to the user???
         console.error("error editing team", e);
       } finally {
         this.state.isEditingTeamDetailsBusy = false;