Merge branch 'BULL-529' of...

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

src/components/AddTeam.vue

@@ -58,13 +58,13 @@
           ></v-text-field>
 
           <UserSelect
-            v-model="toAdd.poc"
+            v-model="leads"
             ref="UserSelect"
             required
             multiple
             preload
-            :preloadData="toAdd.poc"
-            label="Select a Team Leads"
+            :preloadData="leads"
+            label="Select Team Leads"
             :rules="[inputRules.required]"
           />
         </v-form>
@@ -112,14 +112,15 @@ export default {
   },
   data: () => ({
     showDialog: true,
-    toAdd: { memberCount: { count: 0 } },
+    toAdd: {},
     valid: false,
     inputRules,
+    leads: [],
   }),
   created() {
     if (this.value) {
       this.toAdd = cloneDeep(this.value);
-      this.toAdd.poc = this.toAdd.members.filter(
+      this.leads = this.toAdd.members.filter(
         (item) => item.TeamMember.isTeamLead === true
       );
     }
@@ -131,11 +132,24 @@ export default {
       this.init();
     },
     add() {
+      this.leads.forEach((lead) => (lead.TeamMember.isTeamLead = true));
+      this.toAdd.members = this.leads;
       this.$emit("add", this.toAdd);
       this.init();
     },
     edit() {
-      console.log("Saving", this.toAdd);
+      // merge members and leads
+      const members = new Map();
+      this.toAdd.members.forEach((member) => {
+        member.TeamMember.isTeamLead = false;
+        members.set(member.id, member);
+      });
+      this.leads.forEach((lead) => {
+        lead.TeamMember.isTeamLead = true;
+        members.set(lead.id, lead);
+      });
+      this.toAdd.members = members.values();
+
       this.$emit("edit", this.toAdd);
       this.init();
     },

tests/unit/components/AddTeam.spec.js

@@ -22,24 +22,15 @@ describe("AddTeam", () => {
           },
         },
       },
-      propsData: {
-        value: {
-          name: "test",
-          description: "this",
-          memberCount: { max: 1 },
-          poc: "",
-        },
-      },
       localVue,
       vuetify,
     });
 
-    wrapper.setData({ loading: false, emptyString: false });
-
+    wrapper.vm.$emit = jest.fn();
     wrapper.vm.edit();
-
-    // assert the component loads without error
-    expect(wrapper.find(".error").exists()).toBe(false);
+    expect(wrapper.vm.$emit).toHaveBeenCalledWith("edit", {
+      memberCount: { count: 0 },
+    });
   });
   it("should trigger cancel", async () => {
     // render the component
@@ -56,12 +47,9 @@ describe("AddTeam", () => {
       vuetify,
     });
 
-    wrapper.setData({ loading: false, emptyString: false });
-
+    wrapper.vm.$emit = jest.fn();
     wrapper.vm.cancel();
-
-    // assert the component loads without error
-    expect(wrapper.find(".error").exists()).toBe(false);
+    expect(wrapper.vm.$emit).toHaveBeenCalledWith("cancel");
   });
   it("should trigger add", async () => {
     // render the component
@@ -78,11 +66,10 @@ describe("AddTeam", () => {
       vuetify,
     });
 
-    wrapper.setData({ loading: false, emptyString: false });
-
+    wrapper.vm.$emit = jest.fn();
     wrapper.vm.add();
-
-    // assert the component loads without error
-    expect(wrapper.find(".error").exists()).toBe(false);
+    expect(wrapper.vm.$emit).toHaveBeenCalledWith("add", {
+      memberCount: { count: 0 },
+    });
   });
 });