Merge branch 'dev-mission-app-fix' of...

Merge branch 'dev-mission-app-fix' of https://repo1.dso.mil/platform-one/party-bus/launchboard/launchboard-fe into dev-mission-app-fix

src/api/services/user.js

@@ -8,7 +8,7 @@ export default {
     return HTTP.get("/users/notifications");
   },
   async deleteNotifications(notificationId) {
-    await HTTP.delete(`/users/notification/${notificationId}`);
+    return HTTP.delete(`/users/notification/${notificationId}`);
   },
   async search(params) {
     return HTTP.get("/users", { params });

src/components/DenialNotification.vue

@@ -16,8 +16,8 @@
       />
 
       <v-card-title class="text-h4 mb-8 justify-center font-weight-bold">
-        SEND OUT A CUSTOM NOTIFICATION<br />
-        TO ALL LAUNCHBOARD USERS
+        NOTIFY THE PM ON WHY THEIR<br />
+        REQUEST WAS DENIED
       </v-card-title>
 
       <v-select
@@ -28,7 +28,7 @@
         label="Templated Responses"
         return-object
         single-line
-        color="secondary"
+        outlined      
         class="select mx-auto"
         @change="updateTextArea()"
       ></v-select>
@@ -37,7 +37,7 @@
         ref="inputRef"
         clearable
         v-model="selectedMessage"
-        class="mx-auto mt-10"
+        class="text-area mx-auto mt-10"
         placeholder="Edit your response in here or choose from the templated responses provided in the dropdown..."
         outlined
         auto-grow
@@ -66,8 +66,6 @@ export default {
     return {
       selectedMessage: "",
       messageSubText: "",
-      messageMainText:
-        "Your request to add a team member into the <> has been denied due to the following reasons:",
       select: "",
       items: [
         {
@@ -98,7 +96,6 @@ export default {
   methods: {
     updateTextArea() {
       this.selectedMessage = this.select.subText;
-      this.mainText = this.messageMainText;
       this.subText = this.select.subText;
     },
 
@@ -110,7 +107,7 @@ export default {
             {
               userId: this.$props.id,
               pmId: this.$props.pm,
-              mainText: this.mainText,
+              mainText: this.$props.mainMessage,
               subText: this.subText,
               add: false,
             }
@@ -129,11 +126,12 @@ export default {
 </script>
 <style lang="scss" scoped>
 .select {
-  width: 70%;
+  width: 60%;
+  height: 56px;
   font-size: 14px;
 }
 .text-area {
-  width: 70%;
+  width: 80%;
   font-size: 14px;
 }
 </style>

tests/unit/components/DenialNotification.spec.js

@@ -19,7 +19,6 @@ describe("DenialNotification", () => {
       data() {
         return {
           select: { subText: "mockOne" },
-          messageMainText: "mockOne",
 
           selectedMessage: "",
           mainText: "",
@@ -29,7 +28,6 @@ describe("DenialNotification", () => {
     });
     wrapper.vm.updateTextArea();
     expect(wrapper.vm.selectedMessage).toEqual("mockOne");
-    expect(wrapper.vm.mainText).toEqual("mockOne");
     expect(wrapper.vm.subText).toEqual("mockOne");
   });