Merge branch 'BULL-529' of...

Merge branch 'BULL-529' of https://code.il2.dso.mil/platform-one/products/bullhorn/launchboard-fe into BULL-529

package.json

@@ -29,38 +29,38 @@
     "vuex": "^3.5.1"
   },
   "devDependencies": {
-    "@babel/plugin-transform-strict-mode": "^7.8.3",
-    "@mdi/font": "^5.3.45",
-    "@vue/cli-plugin-babel": "^4.5.8",
-    "@vue/cli-plugin-e2e-cypress": "^4.5.8",
-    "@vue/cli-plugin-eslint": "^4.5.8",
-    "@vue/cli-plugin-router": "^4.5.8",
-    "@vue/cli-plugin-unit-jest": "^4.5.8",
-    "@vue/cli-service": "^4.5.8",
+    "@babel/plugin-transform-strict-mode": "^7.12.13",
+    "@mdi/font": "^5.9.55",
+    "@vue/cli-plugin-babel": "^4.5.11",
+    "@vue/cli-plugin-e2e-cypress": "^4.5.11",
+    "@vue/cli-plugin-eslint": "^4.5.11",
+    "@vue/cli-plugin-router": "^4.5.11",
+    "@vue/cli-plugin-unit-jest": "^4.5.11",
+    "@vue/cli-service": "^4.5.11",
     "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/test-utils": "^1.1.2",
+    "@vue/test-utils": "^1.1.3",
     "babel-eslint": "^10.1.0",
     "cypress": "^5.4.0",
     "eslint": "^6.8.0",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-vue": "^6.2.2",
     "flush-promises": "^1.0.2",
-    "husky": "^4.3.5",
+    "husky": "^4.3.8",
     "pre-commit": "^1.2.2",
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0",
-    "sass": "^1.29.0",
+    "sass": "^1.32.8",
     "sass-loader": "^8.0.2",
     "style-resources-loader": "^1.3.2",
-    "stylelint": "^13.0.0",
+    "stylelint": "^13.11.0",
     "stylelint-webpack-plugin": "^2.1.1",
     "vue-cli-plugin-style-resources-loader": "~0.1.4",
-    "vue-cli-plugin-vuetify": "~2.0.6",
+    "vue-cli-plugin-vuetify": "^2.0.9",
     "vue-loader-v16": "^16.0.0-beta.5.4",
     "vue-svg-loader": "^0.16.0",
     "vue-template-compiler": "^2.6.12",
-    "vuetify-loader": "^1.3.0"
+    "vuetify-loader": "^1.7.2"
   },
   "eslintConfig": {
     "root": true,

src/api/services/team.js

@@ -24,14 +24,20 @@ export default {
     }
   },
 
-  async updateTeam({ id, name, description, capacity }) {
-    await HTTP.put(`/teams/${id}`, { name, description, capacity });
+  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 deleteMembers(members, teamId) {
-    for (let i = 0; i < members.length; i++) {
-      await HTTP.delete(`/teams/${teamId}/members/${members[i].id}`);
-    }
+    await HTTP.delete(`/teams/${teamId}/members`, {
+      params: { userIds: `[${members}]` },
+    });
   },
   async addMember(member, teamId, teamLead) {
     await HTTP.post(`/teams/${teamId}/members`, {
@@ -42,7 +48,6 @@ export default {
     });
   },
   async addMembers(members, teamId) {
-    console.log(members);
     for (let i = 0; i < members.length; i++) {
       console.log("USER", members[i]);
       await this.addMember(members[i], teamId, members[i].isTeamLead);

src/api/services/user.js

@@ -28,4 +28,5 @@ export default {
   async updateUserPreferences(preferences) {
     return HTTP.post("/users/preferences", preferences);
   },
-};
+}
+

src/components/AddTeam.vue

@@ -62,7 +62,9 @@
             ref="UserSelect"
             required
             multiple
-            label="Select a Team Point of Contact"
+            preload
+            :preloadData="toAdd.poc"
+            label="Select a Team Leads"
             :rules="[inputRules.required]"
           />
         </v-form>
@@ -117,6 +119,9 @@ export default {
   created() {
     if (this.value) {
       this.toAdd = cloneDeep(this.value);
+      this.toAdd.poc = this.toAdd.members.filter(
+        (item) => item.TeamMember.isTeamLead === true
+      );
     }
   },
   methods: {
@@ -130,6 +135,7 @@ export default {
       this.init();
     },
     edit() {
+      console.log("Saving", this.toAdd);
       this.$emit("edit", this.toAdd);
       this.init();
     },

src/components/UserSelect.vue

@@ -75,9 +75,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    preload: {
+      type: Boolean,
+      default: false,
+    },
     rules: Array,
     label: String,
     value: [Object, Array],
+    preloadData: Array,
   },
   data: () => ({
     loading: false,
@@ -88,7 +93,7 @@ export default {
   created() {
     if (this.value) {
       this.model = this.value;
-      this.items = [this.value];
+      this.items = this.value;
     }
   },
   computed: {
@@ -151,12 +156,12 @@ export default {
         const newItems = await UserService.search({ q: val });
         if (this.model) {
           if (Array.isArray(this.model)) {
-            this.items = uniq([...newItems, ...this.model]);
+            this.items = uniq([...newItems.users, ...this.model]);
           } else {
-            this.items = uniq([...newItems, this.model]);
+            this.items = uniq([...newItems.users, this.model]);
           }
         } else {
-          this.items = newItems;
+          this.items = newItems.users;
         }
       } catch (e) {
         console.error("unable to get users", e);

src/views/Team.vue

@@ -100,6 +100,7 @@
                   <UserSelect
                     ref="userSelect"
                     v-model="memberToAdd"
+                    multiple
                     :rules="[
                       inputRules.required,
                       inputRules.duplicates(
@@ -288,6 +289,7 @@ export default {
           this.team = await TeamService.getMyTeam();
         }
       } else {
+        console.log("THIS CANNOT BE ME");
         await this.getTeams();
       }
     } catch (error) {
@@ -303,6 +305,7 @@ export default {
       }
       try {
         this.team = await TeamService.getTeam(this.$route.params.teamId);
+        console.log("TEAM", this.team);
       } catch (error) {
         console.error("!teams error!", error);
       } finally {
@@ -312,9 +315,51 @@ export default {
     },
     async editTeam(editedTeam) {
       this.state.isEditingTeamDetailsBusy = true;
-      console.log("THIS IS EDITTED", editedTeam);
+      //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);
+        this.team = await TeamService.updateTeam(
+          editedTeam,
+          addTeamLeads,
+          editTeamMembers
+        );
         // success state
         this.snackbars.teamDetails = true;
         this.state.showEditDialog = false;
@@ -336,7 +381,7 @@ export default {
       }
       this.state.isAddingBusy = true;
       try {
-        await TeamService.addMember(member, this.$route.params.teamId, false);
+        await TeamService.addMembers(member, this.$route.params.teamId, false);
         this.memberToAdd = member;
         this.snackbars.add = true;
       } catch (e) {
@@ -365,7 +410,7 @@ export default {
 
       try {
         await TeamService.deleteMembers(
-          this.deletingMembers,
+          this.deletingMembers.map((item) => item.id),
           this.$route.params.teamId
         );
         this.snackbars.delete = true;

src/views/super-admin/Teams.vue

@@ -79,15 +79,18 @@
               {{ item.name }}
             </router-link>
           </template>
-          <template v-slot:[`item.poc`]="{ item }">
+          <template v-slot:[`item.poc`]="{ item }" class="team-leads">
             <div
               class="d-flex flex-wrap white-space-nowrap table-no-link"
               v-for="(lead, index) in item.leads"
               :key="index"
             >
-              <a :href="`mailto:${lead.email}`" target="_blank">{{
-                lead.name
-              }}</a>
+              <a
+                :href="`mailto:${lead.email}`"
+                target="_blank"
+                class="lead-name"
+                >{{ lead.name }}</a
+              >
             </div>
           </template>
           <template v-slot:[`item.startDate`]="{ item }">
@@ -400,6 +403,9 @@ export default {
     pointer-events: none;
   }
 }
+.lead-name {
+  padding: 12.5px;
+}
 
 .v-skeleton-loader__table-row .v-skeleton-loader__table-cell,
 .v-skeleton-loader__table-thead .v-skeleton-loader__heading {