From a7fd2586358ec45b11e264e92eac78907bfd3e84 Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Wed, 28 Apr 2021 16:06:20 -0600
Subject: [PATCH 1/8] Modify home page and add redirect

---
 src/components/PersonnelTable.vue  |  64 ++++++++++++-
 src/router/routes.js               |  14 +--
 src/views/Home.vue                 |  37 ++++++++
 src/views/user/LaunchboardUser.vue | 138 +++++++++++++++++++++++++++++
 4 files changed, 237 insertions(+), 16 deletions(-)
 create mode 100644 src/views/Home.vue
 create mode 100644 src/views/user/LaunchboardUser.vue

diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index 5ee8b14..514d09f 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -1,5 +1,32 @@
 <template>
   <div>
+    <v-dialog
+      v-model="displayUserPermissionDialog"
+      persistent
+      width="500"
+      hide-overlay
+      id="user-permission-dialog"
+    >
+      <v-card class="ma-0">
+        <v-card-title> Confirm Permission Change </v-card-title>
+
+        <v-card-text class="text-left">
+          Are you sure you want to change your permission to "{{
+            permissionUserData.permission
+          }}"?
+        </v-card-text>
+
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn color="secondary" text @click="cancelUserPermissionChange">
+            Cancel
+          </v-btn>
+          <v-btn color="primary" text @click="confirmUserPermissionChange">
+            Confirm
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
     <div
       class="d-flex flex-wrap flex-sm-nowrap px-2 px-sm-4 mb-4 justify-space-between"
     >
@@ -69,7 +96,11 @@ import {
 } from "@/config/table-constants";
 import { createDefaultPaginationParams } from "@/utils/tableHelpers";
 import ErrorMessage from "@/components/APIErrorDialog";
-import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
+import {
+  SET_USER,
+  SET_ERROR_MESSAGE,
+  SET_ERROR_DIALOG,
+} from "@/store/mutation-types";
 
 export default {
   name: "PersonnelTable",
@@ -144,6 +175,8 @@ export default {
         ],
       },
       permissionTypes: Permission,
+      displayUserPermissionDialog: false,
+      permissionUserData: {},
     };
   },
   async mounted() {
@@ -225,8 +258,33 @@ export default {
     getPersonnelListItems() {
       return this.personnel.listItems;
     },
-    async updateUserPermissions(userData) {
-      UserService.updateUserPermission([userData]);
+    updateUserPermissions(userData) {
+      this.permissionUserData = userData;
+      if (this.$store.state.user.user.name === userData.name) {
+        this.displayUserPermissionDialog = true;
+      } else {
+        this.setUserPermissions(userData);
+      }
+    },
+    async setUserPermissions(userData) {
+      try {
+        await UserService.updateUserPermission([userData]);
+        const user = await UserService.getUser();
+        this.$store.commit(SET_USER, user);
+        this.$router.push({ name: "Launchboard" });
+      } catch (e) {
+        this.$store.commit(SET_ERROR_MESSAGE, e);
+        this.$store.commit(SET_ERROR_DIALOG, true);
+        this.fetchData({});
+      }
+    },
+    cancelUserPermissionChange() {
+      this.fetchData({});
+      this.displayUserPermissionDialog = false;
+    },
+    confirmUserPermissionChange() {
+      this.setUserPermissions(this.permissionUserData);
+      this.displayUserPermissionDialog = false;
     },
   },
   watch: {
diff --git a/src/router/routes.js b/src/router/routes.js
index fdf4c79..e98eb5c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,24 +1,12 @@
 import NotAuthorizedComponent from "@/components/NotAuthorizedComponent";
 import NotFoundComponent from "@/components/NotFoundComponent";
-import store from "@/store";
 import Permission from "@/config/user-permissions";
 
 export default [
   {
     path: "/",
     name: "Launchboard",
-    component: async () => {
-      const user = store.state.user.user;
-
-      switch (user.permission) {
-        case Permission.ADMIN:
-          return import("@/views/admin/LaunchboardAdmin.vue");
-        case Permission.SUPER_ADMIN:
-          return import("@/views/super-admin/LaunchboardSuperAdmin.vue");
-        default:
-          return import("@/views/Launchboard.vue");
-      }
-    },
+    component: () => import("@/views/Home.vue"),
     meta: {
       title: "Platform One: Launchboard",
       bodyClass: "launchboard-page",
diff --git a/src/views/Home.vue b/src/views/Home.vue
new file mode 100644
index 0000000..97d6217
--- /dev/null
+++ b/src/views/Home.vue
@@ -0,0 +1,37 @@
+<template>
+  <div>
+    <LaunchboardSuperAdmin v-if="isSuperAdmin" />
+    <LaunchboardAdmin v-else-if="isAdmin" />
+    <LaunchboardUser v-else />
+  </div>
+</template>
+
+<script>
+import LaunchboardUser from "@/views/user/LaunchboardUser";
+import LaunchboardAdmin from "@/views/admin/LaunchboardAdmin";
+import LaunchboardSuperAdmin from "@/views/super-admin/LaunchboardSuperAdmin";
+import Permission from "@/config/user-permissions";
+
+export default {
+  components: {
+    LaunchboardUser,
+    LaunchboardAdmin,
+    LaunchboardSuperAdmin,
+  },
+  name: "launchboard-home",
+  data: () => ({
+    Permission,
+  }),
+  computed: {
+    user() {
+      return this.$store.state.user.user || {};
+    },
+    isAdmin() {
+      return this.user.permission === Permission.ADMIN;
+    },
+    isSuperAdmin() {
+      return this.user.permission === Permission.SUPER_ADMIN;
+    },
+  },
+};
+</script>
diff --git a/src/views/user/LaunchboardUser.vue b/src/views/user/LaunchboardUser.vue
new file mode 100644
index 0000000..9358a49
--- /dev/null
+++ b/src/views/user/LaunchboardUser.vue
@@ -0,0 +1,138 @@
+<template>
+  <v-container fluid class="px-2 px-md-4 px-lg-8 px-xl-16 pb-0">
+    <v-row>
+      <v-col cols="12" lg="6" class="d-flex flex-column pb-0 pb-lg-3">
+        <WelcomeTutorialModal
+          :showWelcomeMessage="displayTutorialModal && showWelcomeMessage"
+          :setDisplayTutorialModal="setDisplayTutorialModal"
+        />
+        <UserBanner
+          :name="user.name"
+          :company="user.organization"
+          :position="user.affiliation"
+          :avatar="user.avatar"
+        />
+        <WelcomeTutorialModal
+          :showWelcomeMessage="displayTutorialModal && showWelcomeMessage"
+          :setDisplayTutorialModal="setDisplayTutorialModal"
+        />
+        <Section class="mt-6" v-if="showWelcomeMessage">
+          <h4 slot="header" class="ma-0 pl-5 text-left">
+            Welcome to Platform One
+          </h4>
+          <WelcomeSummary slot="content" />
+        </Section>
+
+        <Section class="mt-6">
+          <h4 slot="header" class="ma-0 pl-5 text-left">
+            My Curriculum Schedule
+          </h4>
+          <CurriculumSchedule slot="content" />
+        </Section>
+        <Section class="mt-6">
+          <h4 slot="header" class="ma-0 pl-5 text-left">
+            <TutorialTooltip tooltipName="helpDesk">
+              <span id="helpDeskTutorialTooltip"></span>
+            </TutorialTooltip>
+            Help Desk
+          </h4>
+          <HelpDeskSummary slot="content" />
+        </Section>
+      </v-col>
+      <v-col cols="12" lg="6" class="d-flex flex-column py-0 pt-lg-3">
+        <Section>
+          <h4 slot="header" class="ma-0 pl-5 text-left">
+            <TutorialTooltip tooltipName="projects">
+              <span id="projectsTutorialTooltip"></span>
+            </TutorialTooltip>
+            My Project Summary
+          </h4>
+
+          <span slot="header-right">
+            <v-tooltip top>
+              <template v-slot:activator="{ on, attrs }">
+                <v-btn
+                  class="no-shadow no-border"
+                  icon
+                  v-bind="attrs"
+                  v-on="on"
+                  @click="refreshProjectData"
+                  :loading="loadingProjectData"
+                >
+                  <v-icon>mdi-refresh</v-icon>
+                </v-btn>
+              </template>
+              <span>Refresh</span>
+            </v-tooltip>
+          </span>
+          <ProjectsSummary
+            slot="content"
+            ref="projectSummary"
+            :setProjectLoading="setProjectLoading"
+          />
+        </Section>
+
+        <Section class="mt-6">
+          <h4 slot="header" class="ma-0 pl-5 text-left">
+            <TutorialTooltip tooltipName="tools">
+              <span id="toolsTutorialTooltip"></span>
+            </TutorialTooltip>
+            Tools
+          </h4>
+          <ToolsSummary slot="content" />
+        </Section>
+      </v-col>
+    </v-row>
+  </v-container>
+</template>
+
+<script>
+import UserBanner from "@/components/UserBanner";
+import Section from "@/components/Section";
+import CurriculumSchedule from "@/components/CurriculumSchedule";
+import ProjectsSummary from "@/components/ProjectsSummary";
+import HelpDeskSummary from "@/components/HelpDeskSummary";
+import ToolsSummary from "@/components/ToolsSummary";
+import WelcomeSummary from "@/components/WelcomeSummary";
+import TutorialTooltip from "@/components/TutorialTooltip";
+import WelcomeTutorialModal from "@/components/WelcomeTutorialModal";
+
+export default {
+  components: {
+    UserBanner,
+    Section,
+    CurriculumSchedule,
+    ProjectsSummary,
+    HelpDeskSummary,
+    ToolsSummary,
+    WelcomeSummary,
+    TutorialTooltip,
+    WelcomeTutorialModal,
+  },
+  name: "launchboard-user-dashboard",
+  data: () => ({
+    user: {},
+    loadingProjectData: false,
+    displayTutorialModal: true,
+  }),
+  mounted() {
+    this.user = this.$store.state.user.user;
+  },
+  methods: {
+    refreshProjectData() {
+      this.$refs.projectSummary.refreshProjects();
+    },
+    setProjectLoading(loading) {
+      this.loadingProjectData = loading;
+    },
+    setDisplayTutorialModal(value) {
+      this.displayTutorialModal = value;
+    },
+  },
+  computed: {
+    showWelcomeMessage() {
+      return this.$store.state.userPreferences.userPreference.welcomeMessage;
+    },
+  },
+};
+</script>
-- 
GitLab


From 7c4aad9d86e971d43feb4b29ea7f26e5cf24129a Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Wed, 28 Apr 2021 16:09:27 -0600
Subject: [PATCH 2/8] Simplify

---
 src/views/Home.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 97d6217..ea228f7 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -23,14 +23,11 @@ export default {
     Permission,
   }),
   computed: {
-    user() {
-      return this.$store.state.user.user || {};
-    },
     isAdmin() {
-      return this.user.permission === Permission.ADMIN;
+      return this.$store.state.user.user.permission === Permission.ADMIN;
     },
     isSuperAdmin() {
-      return this.user.permission === Permission.SUPER_ADMIN;
+      return this.$store.state.user.user.permission === Permission.SUPER_ADMIN;
     },
   },
 };
-- 
GitLab


From 750af1b8f942432d3aa0d6fc6f4fa988adda100e Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Thu, 29 Apr 2021 09:35:13 -0600
Subject: [PATCH 3/8] Complete tests for home page

---
 src/views/Launchboard.vue                     | 136 ------------------
 tests/unit/router/index.spec.js               | 118 +++++++++++----
 .../LaunchboardUser.spec.js}                  |  12 +-
 3 files changed, 95 insertions(+), 171 deletions(-)
 delete mode 100644 src/views/Launchboard.vue
 rename tests/unit/views/{Launchboard.spec.js => user/LaunchboardUser.spec.js} (86%)

diff --git a/src/views/Launchboard.vue b/src/views/Launchboard.vue
deleted file mode 100644
index 2b6e5a2..0000000
--- a/src/views/Launchboard.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <div>
-    <v-container fluid class="px-2 px-md-4 px-lg-8 px-xl-16 pb-0">
-      <v-row>
-        <v-col cols="12" lg="6" class="d-flex flex-column pb-0 pb-lg-3">
-          <WelcomeTutorialModal
-            :showWelcomeMessage="displayTutorialModal && showWelcomeMessage"
-            :setDisplayTutorialModal="setDisplayTutorialModal"
-          />
-          <UserBanner
-            :name="user.name"
-            :company="user.organization"
-            :position="user.affiliation"
-            :avatar="user.avatar"
-          />
-          <Section class="mt-6" v-if="showWelcomeMessage">
-            <h4 slot="header" class="ma-0 pl-5 text-left">
-              Welcome to Platform One
-            </h4>
-            <WelcomeSummary slot="content" />
-          </Section>
-
-          <Section class="mt-6">
-            <h4 slot="header" class="ma-0 pl-5 text-left">
-              My Curriculum Schedule
-            </h4>
-            <CurriculumSchedule slot="content" />
-          </Section>
-          <Section class="mt-6">
-            <h4 slot="header" class="ma-0 pl-5 text-left">
-              <TutorialTooltip tooltipName="helpDesk">
-                <span id="helpDeskTutorialTooltip"></span>
-              </TutorialTooltip>
-              Help Desk
-            </h4>
-            <HelpDeskSummary slot="content" />
-          </Section>
-        </v-col>
-        <v-col cols="12" lg="6" class="d-flex flex-column py-0 pt-lg-3">
-          <Section>
-            <h4 slot="header" class="ma-0 pl-5 text-left">
-              <TutorialTooltip tooltipName="projects">
-                <span id="projectsTutorialTooltip"></span>
-              </TutorialTooltip>
-              My Project Summary
-            </h4>
-
-            <span slot="header-right">
-              <v-tooltip top>
-                <template v-slot:activator="{ on, attrs }">
-                  <v-btn
-                    class="no-shadow no-border"
-                    icon
-                    v-bind="attrs"
-                    v-on="on"
-                    @click="refreshProjectData"
-                    :loading="loadingProjectData"
-                  >
-                    <v-icon>mdi-refresh</v-icon>
-                  </v-btn>
-                </template>
-                <span>Refresh</span>
-              </v-tooltip>
-            </span>
-            <ProjectsSummary
-              slot="content"
-              ref="projectSummary"
-              :setProjectLoading="setProjectLoading"
-            />
-          </Section>
-
-          <Section class="mt-6">
-            <h4 slot="header" class="ma-0 pl-5 text-left">
-              <TutorialTooltip tooltipName="tools">
-                <span id="toolsTutorialTooltip"></span>
-              </TutorialTooltip>
-              Tools
-            </h4>
-            <ToolsSummary slot="content" />
-          </Section>
-        </v-col>
-      </v-row>
-    </v-container>
-  </div>
-</template>
-
-<script>
-import UserBanner from "@/components/UserBanner";
-import Section from "@/components/Section";
-import CurriculumSchedule from "@/components/CurriculumSchedule";
-import ProjectsSummary from "@/components/ProjectsSummary";
-import HelpDeskSummary from "@/components/HelpDeskSummary";
-import ToolsSummary from "@/components/ToolsSummary";
-import WelcomeSummary from "@/components/WelcomeSummary";
-import TutorialTooltip from "@/components/TutorialTooltip";
-import WelcomeTutorialModal from "@/components/WelcomeTutorialModal";
-
-export default {
-  components: {
-    UserBanner,
-    Section,
-    CurriculumSchedule,
-    ProjectsSummary,
-    HelpDeskSummary,
-    ToolsSummary,
-    WelcomeSummary,
-    TutorialTooltip,
-    WelcomeTutorialModal,
-  },
-  name: "launchboard-user-dashboard",
-  data: () => ({
-    user: {},
-    loadingProjectData: false,
-    displayTutorialModal: true,
-  }),
-  mounted() {
-    this.user = this.$store.state.user.user;
-  },
-  methods: {
-    refreshProjectData() {
-      this.$refs.projectSummary.refreshProjects();
-    },
-    setProjectLoading(loading) {
-      this.loadingProjectData = loading;
-    },
-    setDisplayTutorialModal(value) {
-      this.displayTutorialModal = value;
-    },
-  },
-  computed: {
-    showWelcomeMessage() {
-      return this.$store.state.userPreferences.userPreference.welcomeMessage;
-    },
-  },
-};
-</script>
diff --git a/tests/unit/router/index.spec.js b/tests/unit/router/index.spec.js
index 6d3406d..b9ccab4 100644
--- a/tests/unit/router/index.spec.js
+++ b/tests/unit/router/index.spec.js
@@ -1,8 +1,9 @@
-import { shallowMount, createLocalVue } from "@vue/test-utils";
+import { mount, shallowMount, createLocalVue } from "@vue/test-utils";
 import App from "@/App";
 import Vuex from "vuex";
+import Vuetify from "vuetify";
 import flushPromises from "flush-promises";
-import LaunchBoardUserHomePage from "@/views/Launchboard.vue";
+import LaunchBoardUserHomePage from "@/views/user/LaunchboardUser.vue";
 import LaunchBoardAdminHomePage from "@/views/admin/LaunchboardAdmin.vue";
 import LaunchBoardSuperAdminHomePage from "@/views/super-admin/LaunchboardSuperAdmin.vue";
 import VueRouter from "vue-router";
@@ -14,6 +15,7 @@ import { SET_USER } from "@/store/mutation-types";
 describe("router", () => {
   let localVue;
   let router;
+  const vuetify = new Vuetify();
   beforeEach(() => {
     localVue = createLocalVue();
     localVue.use(VueRouter);
@@ -25,51 +27,109 @@ describe("router", () => {
   });
 
   it("should have default path with correct component for Admin", async () => {
-    store.commit(SET_USER, {
-      name: "mock user",
-      permission: Permission.ADMIN,
-    });
-
     window.scrollTo = jest.fn();
 
-    shallowMount(App, { localVue, router });
+    const wrapper = mount(App, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+      vuetify,
+      router,
+    });
     await flushPromises();
-    expect(router.currentRoute.fullPath).toEqual("/");
-    expect(router.currentRoute.matched[0].components.default.name).toEqual(
-      LaunchBoardAdminHomePage.name
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(true);
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      false
     );
+    expect(router.currentRoute.fullPath).toEqual("/");
   });
 
   it("should have default path with correct component for user", async () => {
-    store.commit(SET_USER, {
-      name: "mock user",
-      permission: Permission.USER,
-    });
-
     window.scrollTo = jest.fn();
 
-    shallowMount(App, { localVue, router });
+    const wrapper = mount(App, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+      vuetify,
+      router,
+    });
     await flushPromises();
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(true);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
+      false
+    );
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      false
+    );
 
     expect(router.currentRoute.fullPath).toEqual("/");
-    expect(router.currentRoute.matched[0].components.default.name).toEqual(
-      LaunchBoardUserHomePage.name
-    );
   });
   it("should have default path with correct component for Super Admin", async () => {
-    store.commit(SET_USER, {
-      name: "mock user",
-      permission: Permission.SUPER_ADMIN,
-    });
     window.scrollTo = jest.fn();
 
-    shallowMount(App, { localVue, router });
+    const wrapper = mount(App, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+      vuetify,
+      router,
+    });
     await flushPromises();
-
-    expect(router.currentRoute.fullPath).toEqual("/");
-    expect(router.currentRoute.matched[0].components.default.name).toEqual(
-      LaunchBoardSuperAdminHomePage.name
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
+      false
+    );
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      true
     );
+    expect(router.currentRoute.fullPath).toEqual("/");
 
     await flushPromises();
   });
diff --git a/tests/unit/views/Launchboard.spec.js b/tests/unit/views/user/LaunchboardUser.spec.js
similarity index 86%
rename from tests/unit/views/Launchboard.spec.js
rename to tests/unit/views/user/LaunchboardUser.spec.js
index 05ffc74..352af6c 100644
--- a/tests/unit/views/Launchboard.spec.js
+++ b/tests/unit/views/user/LaunchboardUser.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount, createLocalVue } from "@vue/test-utils";
-import Launchboard from "@/views/Launchboard.vue";
+import LaunchboardUser from "@/views/user/LaunchboardUser.vue";
 import Vuex from "vuex";
 import Permission from "@/config/user-permissions";
 //import userPreference from "../../../src/api/services/userPreference";
@@ -9,7 +9,7 @@ import Permission from "@/config/user-permissions";
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-describe("Launchboard", () => {
+describe("LaunchboardUser", () => {
   it("should get user from store", async () => {
     const store = new Vuex.Store({
       state: {
@@ -24,7 +24,7 @@ describe("Launchboard", () => {
         },
       },
     });
-    const wrapper = shallowMount(Launchboard, { store, localVue });
+    const wrapper = shallowMount(LaunchboardUser, { store, localVue });
     expect(wrapper.vm.user).toEqual({
       name: "mock user",
       permission: Permission.USER,
@@ -45,7 +45,7 @@ describe("Launchboard", () => {
         },
       },
     });
-    const wrapper = shallowMount(Launchboard, { store, localVue });
+    const wrapper = shallowMount(LaunchboardUser, { store, localVue });
 
     wrapper.vm.user = {
       auth: {
@@ -69,7 +69,7 @@ describe("Launchboard", () => {
         },
       },
     });
-    const wrapper = shallowMount(Launchboard, { store, localVue });
+    const wrapper = shallowMount(LaunchboardUser, { store, localVue });
 
     wrapper.vm.user = {
       auth: {
@@ -96,7 +96,7 @@ describe("Launchboard", () => {
         },
       },
     });
-    const wrapper = shallowMount(Launchboard, { store, localVue });
+    const wrapper = shallowMount(LaunchboardUser, { store, localVue });
 
     wrapper.vm.user = {
       auth: {
-- 
GitLab


From 87b58013143e20bb95981245e370a41bb42848bc Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Thu, 29 Apr 2021 10:56:47 -0600
Subject: [PATCH 4/8] Add updates to unit test for PersonnelTable

---
 tests/unit/components/PersonnelTable.spec.js | 279 ++++++++++++++++++-
 1 file changed, 269 insertions(+), 10 deletions(-)

diff --git a/tests/unit/components/PersonnelTable.spec.js b/tests/unit/components/PersonnelTable.spec.js
index b8dc4c7..bbed01a 100644
--- a/tests/unit/components/PersonnelTable.spec.js
+++ b/tests/unit/components/PersonnelTable.spec.js
@@ -28,15 +28,25 @@ describe("PersonnelTable", () => {
 
     UserService.updateUserPersonnelType = jest.fn().mockResolvedValue([]);
 
-    const store = new Vuex.Store({
-      state: {
-        user: {
-          user: { name: "mock user", permission: Permission.USER },
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
         },
       },
-    });
-
-    const wrapper = shallowMount(PersonnelTable, {
       data() {
         return {
           personnel: {
@@ -45,7 +55,6 @@ describe("PersonnelTable", () => {
           params: {},
         };
       },
-      store,
       localVue,
     });
 
@@ -59,6 +68,50 @@ describe("PersonnelTable", () => {
     expect(wrapper.vm.userPermission).toEqual("User");
   });
 
+  it("should catch error when removing personnel", async () => {
+    UserService.getUsersByPersonnelType = jest
+      .fn()
+      .mockRejectedValue(new Error("test"));
+
+    UserService.updateUserPersonnelType = jest
+      .fn()
+      .mockRejectedValue(new Error("test"));
+
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+
+    wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
+    await wrapper.vm.removePersonnel();
+    expect(wrapper.vm.$store.commit).toHaveBeenCalled();
+  });
+
   it("should send email to personnel", async () => {
     UserService.getUsersByPersonnelType = jest
       .fn()
@@ -110,11 +163,81 @@ describe("PersonnelTable", () => {
       .fn()
       .mockResolvedValue(mockUsersResponse);
 
-    const wrapper = shallowMount(PersonnelTable);
-    await wrapper.vm.updateUserPermissions();
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+    await wrapper.vm.updateUserPermissions({ name: "mock user2" });
     expect(UserService.updateUserPermission).toHaveBeenCalled();
   });
 
+  it("should trigger confirmation modal if user is updating their own permission", async () => {
+    UserService.getUsersByPersonnelType = jest
+      .fn()
+      .mockResolvedValue(mockUsersResponse);
+
+    UserService.updateUserPermission = jest
+      .fn()
+      .mockResolvedValue(mockUsersResponse);
+
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+    await wrapper.vm.updateUserPermissions({ name: "mock user" });
+    expect(UserService.updateUserPermission).toHaveBeenCalledTimes(0);
+  });
+
   it("should provide correct roleTypesDropdown", async () => {
     UserService.getUsersByPersonnelType = jest
       .fn()
@@ -169,4 +292,140 @@ describe("PersonnelTable", () => {
     expect(wrapper.vm.fetchDebounced).toHaveBeenCalledTimes(1);
     expect(wrapper.vm.params.pageSize).toEqual(mockOptions.itemsPerPage);
   });
+
+  it("should setUserPermissions", async () => {
+    UserService.getUsersByPersonnelType = jest
+      .fn()
+      .mockResolvedValue(mockUsersResponse);
+    UserService.updateUserPermission = jest.fn();
+
+    UserService.getUser = jest
+      .fn()
+      .mockResolvedValue({ name: "mock user", permission: "User" });
+
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+
+    wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
+    await wrapper.vm.setUserPermissions({
+      name: "mock user",
+      permission: "User",
+    });
+    expect(wrapper.vm.$store.commit).toHaveBeenCalledWith("user/setUser", {
+      name: "mock user",
+      permission: "User",
+    });
+  });
+
+  it("should cancelUserPermissionChange", async () => {
+    UserService.getUsersByPersonnelType = jest
+      .fn()
+      .mockResolvedValue(mockUsersResponse);
+
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          displayUserPermissionDialog: true,
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+    wrapper.vm.fetchData = jest.fn().mockResolvedValue({ test: "test" });
+    await wrapper.vm.cancelUserPermissionChange();
+    expect(wrapper.vm.fetchData).toHaveBeenCalled();
+    expect(wrapper.vm.displayUserPermissionDialog).toEqual(false);
+  });
+
+  it("should confirmUserPermissionChange", async () => {
+    UserService.getUsersByPersonnelType = jest
+      .fn()
+      .mockResolvedValue(mockUsersResponse);
+
+    const wrapper = shallowMount(PersonnelTable, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          commit: jest.fn(),
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      data() {
+        return {
+          permissionUserData: { name: "mock user" },
+          displayUserPermissionDialog: true,
+          personnel: {
+            listItems: [{ id: 1 }],
+          },
+          params: {},
+        };
+      },
+      localVue,
+    });
+    wrapper.vm.setUserPermissions = jest.fn();
+    await wrapper.vm.confirmUserPermissionChange();
+    expect(wrapper.vm.setUserPermissions).toHaveBeenCalledWith({
+      name: "mock user",
+    });
+    expect(wrapper.vm.displayUserPermissionDialog).toEqual(false);
+  });
 });
-- 
GitLab


From ed9eaf9cd7be96eecc72d949c222842ca8672a39 Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Mon, 3 May 2021 08:59:05 -0600
Subject: [PATCH 5/8] Fix issue with redirect for any user permission change

---
 src/components/PersonnelTable.vue            | 12 +++++++-----
 tests/unit/components/PersonnelTable.spec.js | 20 +++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index 295cc99..d327821 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -263,12 +263,14 @@ export default {
         this.setUserPermissions(userData);
       }
     },
-    async setUserPermissions(userData) {
+    async setUserPermissions(userData, activeUser) {
       try {
         await UserService.updateUserPermission([userData]);
-        const user = await UserService.getUser();
-        this.$store.commit(SET_USER, user);
-        this.$router.push({ name: "Launchboard" });
+        if (activeUser) {
+          const user = await UserService.getUser();
+          this.$store.commit(SET_USER, user);
+          this.$router.push({ name: "Launchboard" });
+        }
       } catch (e) {
         this.$store.commit(SET_ERROR_MESSAGE, e);
         this.$store.commit(SET_ERROR_DIALOG, true);
@@ -280,7 +282,7 @@ export default {
       this.displayUserPermissionDialog = false;
     },
     confirmUserPermissionChange() {
-      this.setUserPermissions(this.permissionUserData);
+      this.setUserPermissions(this.permissionUserData, true);
       this.displayUserPermissionDialog = false;
     },
   },
diff --git a/tests/unit/components/PersonnelTable.spec.js b/tests/unit/components/PersonnelTable.spec.js
index bbed01a..abd4d56 100644
--- a/tests/unit/components/PersonnelTable.spec.js
+++ b/tests/unit/components/PersonnelTable.spec.js
@@ -334,10 +334,13 @@ describe("PersonnelTable", () => {
     });
 
     wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
-    await wrapper.vm.setUserPermissions({
-      name: "mock user",
-      permission: "User",
-    });
+    await wrapper.vm.setUserPermissions(
+      {
+        name: "mock user",
+        permission: "User",
+      },
+      true
+    );
     expect(wrapper.vm.$store.commit).toHaveBeenCalledWith("user/setUser", {
       name: "mock user",
       permission: "User",
@@ -423,9 +426,12 @@ describe("PersonnelTable", () => {
     });
     wrapper.vm.setUserPermissions = jest.fn();
     await wrapper.vm.confirmUserPermissionChange();
-    expect(wrapper.vm.setUserPermissions).toHaveBeenCalledWith({
-      name: "mock user",
-    });
+    expect(wrapper.vm.setUserPermissions).toHaveBeenCalledWith(
+      {
+        name: "mock user",
+      },
+      true
+    );
     expect(wrapper.vm.displayUserPermissionDialog).toEqual(false);
   });
 });
-- 
GitLab


From e012e0dbcd9146dc9f42ef032f93bae24ae972f3 Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Mon, 3 May 2021 14:30:41 -0600
Subject: [PATCH 6/8] Remove unused params for buttons

---
 src/components/PersonnelTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index d327821..373750a 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -18,10 +18,10 @@
 
         <v-card-actions>
           <v-spacer></v-spacer>
-          <v-btn color="secondary" text @click="cancelUserPermissionChange">
+          <v-btn color="secondary" @click="cancelUserPermissionChange">
             Cancel
           </v-btn>
-          <v-btn color="primary" text @click="confirmUserPermissionChange">
+          <v-btn color="primary" @click="confirmUserPermissionChange">
             Confirm
           </v-btn>
         </v-card-actions>
-- 
GitLab


From 121daabb680672a215ee4a622c335776c02ee758 Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Tue, 4 May 2021 07:34:38 -0600
Subject: [PATCH 7/8] Fix unit tests

---
 src/components/PersonnelTable.vue            |   2 -
 tests/unit/Home.spec.js                      | 138 +++++++++++++++++++
 tests/unit/components/PersonnelTable.spec.js |  14 +-
 tests/unit/router/index.spec.js              | 114 +--------------
 4 files changed, 155 insertions(+), 113 deletions(-)
 create mode 100644 tests/unit/Home.spec.js

diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index 373750a..23efac4 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -213,7 +213,6 @@ export default {
       } catch (error) {
         this.$store.commit(SET_ERROR_MESSAGE, error);
         this.$store.commit(SET_ERROR_DIALOG, true);
-        console.error("!personnel error!", error);
       } finally {
         this.loading = false;
         this.fetchingData = false;
@@ -236,7 +235,6 @@ export default {
         await this.fetchData({});
         this.personnel.selectedPersonnel = [];
       } catch (e) {
-        console.error("!personnel error!", e);
         this.$store.commit(SET_ERROR_MESSAGE, e);
         this.$store.commit(SET_ERROR_DIALOG, true);
       }
diff --git a/tests/unit/Home.spec.js b/tests/unit/Home.spec.js
new file mode 100644
index 0000000..e7b0421
--- /dev/null
+++ b/tests/unit/Home.spec.js
@@ -0,0 +1,138 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils";
+import Vuex from "vuex";
+import Permission from "@/config/user-permissions";
+import Home from "@/views/Home";
+import LaunchBoardUserHomePage from "@/views/user/LaunchboardUser";
+import LaunchBoardAdminHomePage from "@/views/admin/LaunchboardAdmin";
+import LaunchBoardSuperAdminHomePage from "@/views/super-admin/LaunchboardSuperAdmin";
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe("Home", () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it("should default to LaunchboardUser if permission does not match", async () => {
+    const wrapper = shallowMount(Home, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: "" },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+    });
+
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(true);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
+      false
+    );
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      false
+    );
+  });
+
+  it("should load LaunchboardUser if permission matches", async () => {
+    const wrapper = shallowMount(Home, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.USER },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+    });
+
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(true);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
+      false
+    );
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      false
+    );
+  });
+
+  it("should load LaunchboardAdmin if permission matches", async () => {
+    const wrapper = shallowMount(Home, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+    });
+
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(true);
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      false
+    );
+  });
+
+  it("should load LaunchboardSuperAdmin if permission matches", async () => {
+    const wrapper = shallowMount(Home, {
+      mocks: {
+        $vuetify: { theme: { dark: false } },
+        $store: {
+          state: {
+            user: {
+              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
+            },
+            error: {},
+            tutorial: {},
+            userPreferences: {
+              userPreference: {
+                darkMode: true,
+              },
+            },
+          },
+        },
+      },
+      localVue,
+    });
+
+    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
+    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
+      false
+    );
+    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
+      true
+    );
+  });
+});
diff --git a/tests/unit/components/PersonnelTable.spec.js b/tests/unit/components/PersonnelTable.spec.js
index abd4d56..f283c81 100644
--- a/tests/unit/components/PersonnelTable.spec.js
+++ b/tests/unit/components/PersonnelTable.spec.js
@@ -4,6 +4,7 @@ import Vuex from "vuex";
 import PersonnelTable from "@/components/PersonnelTable.vue";
 import UserService from "@/api/services/user";
 import Permission from "@/config/user-permissions";
+import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -71,11 +72,11 @@ describe("PersonnelTable", () => {
   it("should catch error when removing personnel", async () => {
     UserService.getUsersByPersonnelType = jest
       .fn()
-      .mockRejectedValue(new Error("test"));
+      .mockRejectedValue("mock error");
 
     UserService.updateUserPersonnelType = jest
       .fn()
-      .mockRejectedValue(new Error("test"));
+      .mockRejectedValue("mock error");
 
     const wrapper = shallowMount(PersonnelTable, {
       mocks: {
@@ -109,7 +110,14 @@ describe("PersonnelTable", () => {
 
     wrapper.vm.personnel.selectedPersonnel = [{ id: 1 }];
     await wrapper.vm.removePersonnel();
-    expect(wrapper.vm.$store.commit).toHaveBeenCalled();
+    expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(
+      SET_ERROR_MESSAGE,
+      "mock error"
+    );
+    expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(
+      SET_ERROR_DIALOG,
+      true
+    );
   });
 
   it("should send email to personnel", async () => {
diff --git a/tests/unit/router/index.spec.js b/tests/unit/router/index.spec.js
index b9ccab4..a3c9c2e 100644
--- a/tests/unit/router/index.spec.js
+++ b/tests/unit/router/index.spec.js
@@ -1,11 +1,6 @@
-import { mount, shallowMount, createLocalVue } from "@vue/test-utils";
+import { shallowMount, createLocalVue } from "@vue/test-utils";
 import App from "@/App";
 import Vuex from "vuex";
-import Vuetify from "vuetify";
-import flushPromises from "flush-promises";
-import LaunchBoardUserHomePage from "@/views/user/LaunchboardUser.vue";
-import LaunchBoardAdminHomePage from "@/views/admin/LaunchboardAdmin.vue";
-import LaunchBoardSuperAdminHomePage from "@/views/super-admin/LaunchboardSuperAdmin.vue";
 import VueRouter from "vue-router";
 import routes from "@/router/routes";
 import Permission from "@/config/user-permissions";
@@ -15,7 +10,6 @@ import { SET_USER } from "@/store/mutation-types";
 describe("router", () => {
   let localVue;
   let router;
-  const vuetify = new Vuetify();
   beforeEach(() => {
     localVue = createLocalVue();
     localVue.use(VueRouter);
@@ -26,112 +20,16 @@ describe("router", () => {
     jest.clearAllMocks();
   });
 
-  it("should have default path with correct component for Admin", async () => {
+  it("should have default path and load Home component", async () => {
     window.scrollTo = jest.fn();
 
-    const wrapper = mount(App, {
-      mocks: {
-        $vuetify: { theme: { dark: false } },
-        $store: {
-          state: {
-            user: {
-              user: { name: "mock user", permission: Permission.ADMIN },
-            },
-            error: {},
-            tutorial: {},
-            userPreferences: {
-              userPreference: {
-                darkMode: true,
-              },
-            },
-          },
-        },
-      },
-      localVue,
-      vuetify,
-      router,
-    });
-    await flushPromises();
-    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
-    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(true);
-    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
-      false
-    );
-    expect(router.currentRoute.fullPath).toEqual("/");
-  });
-
-  it("should have default path with correct component for user", async () => {
-    window.scrollTo = jest.fn();
-
-    const wrapper = mount(App, {
-      mocks: {
-        $vuetify: { theme: { dark: false } },
-        $store: {
-          state: {
-            user: {
-              user: { name: "mock user", permission: Permission.USER },
-            },
-            error: {},
-            tutorial: {},
-            userPreferences: {
-              userPreference: {
-                darkMode: true,
-              },
-            },
-          },
-        },
-      },
-      localVue,
-      vuetify,
-      router,
-    });
-    await flushPromises();
-    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(true);
-    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
-      false
-    );
-    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
-      false
-    );
+    const wrapper = shallowMount(App, { localVue, router });
+    await wrapper.vm.$router.push("/");
 
     expect(router.currentRoute.fullPath).toEqual("/");
-  });
-  it("should have default path with correct component for Super Admin", async () => {
-    window.scrollTo = jest.fn();
-
-    const wrapper = mount(App, {
-      mocks: {
-        $vuetify: { theme: { dark: false } },
-        $store: {
-          state: {
-            user: {
-              user: { name: "mock user", permission: Permission.SUPER_ADMIN },
-            },
-            error: {},
-            tutorial: {},
-            userPreferences: {
-              userPreference: {
-                darkMode: true,
-              },
-            },
-          },
-        },
-      },
-      localVue,
-      vuetify,
-      router,
-    });
-    await flushPromises();
-    expect(wrapper.findComponent(LaunchBoardUserHomePage).exists()).toBe(false);
-    expect(wrapper.findComponent(LaunchBoardAdminHomePage).exists()).toBe(
-      false
-    );
-    expect(wrapper.findComponent(LaunchBoardSuperAdminHomePage).exists()).toBe(
-      true
+    expect(router.currentRoute.matched[0].components.default.name).toEqual(
+      (await import("@/views/Home.vue")).default.name
     );
-    expect(router.currentRoute.fullPath).toEqual("/");
-
-    await flushPromises();
   });
 
   it("should update scroll position", async () => {
-- 
GitLab


From 1c1149acb2e7ed6a57ded29af908d1d50897ea2e Mon Sep 17 00:00:00 2001
From: Luke E Glasscock <luke.glasscock@norsemanservices.com>
Date: Wed, 5 May 2021 14:03:11 -0600
Subject: [PATCH 8/8] Adjust styling for confirmation box

---
 src/components/PersonnelTable.vue | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/components/PersonnelTable.vue b/src/components/PersonnelTable.vue
index 23efac4..5bef460 100644
--- a/src/components/PersonnelTable.vue
+++ b/src/components/PersonnelTable.vue
@@ -3,21 +3,22 @@
     <v-dialog
       v-model="displayUserPermissionDialog"
       persistent
-      width="500"
+      width="550"
       hide-overlay
       id="user-permission-dialog"
     >
-      <v-card class="ma-0">
-        <v-card-title> Confirm Permission Change </v-card-title>
+      <v-card class="ma-0 pt-10 pb-8">
+        <v-card-title class="justify-center">
+          <h3>Confirm Permission Change</h3>
+        </v-card-title>
 
-        <v-card-text class="text-left">
+        <v-card-text class="justify-center permission-change-text pt-4">
           Are you sure you want to change your permission to "{{
             permissionUserData.permission
           }}"?
         </v-card-text>
 
-        <v-card-actions>
-          <v-spacer></v-spacer>
+        <v-card-actions class="justify-center pt-6">
           <v-btn color="secondary" @click="cancelUserPermissionChange">
             Cancel
           </v-btn>
@@ -333,3 +334,21 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.theme--light {
+  .permission-change-text {
+    font-size: 16px;
+    line-height: 24px;
+    color: #000000 !important;
+    letter-spacing: normal;
+  }
+}
+.theme--dark {
+  .permission-change-text {
+    font-size: 16px;
+    line-height: 24px;
+    color: #fff !important;
+    letter-spacing: normal;
+  }
+}
+</style>
-- 
GitLab