adding updating teams teams

package-lock.json

@@ -176,12 +176,6 @@
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -561,16 +555,10 @@
             }
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         }
       }
@@ -1584,6 +1572,12 @@
             }
           }
         },
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -3871,6 +3865,11 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
           "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -13042,12 +13041,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
     "lodash.defaultsdeep": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",

src/api/http-common.js

@@ -5,6 +5,4 @@ export const HTTP = axios.create({
   // add headers or common stuff here
 });
 
-HTTP.interceptors.response.use(function (response) {
-  return response?.data?.result;
-});
+HTTP.interceptors.response.use((response) => response?.data?.result);

src/api/services/training.js

@@ -11,7 +11,7 @@ export default {
     return await HTTP.delete(`/courses/${courseId}`);
   },
   async addInstructor(courseId, instructor) {
-    return await HTTP.post(`/courses/${courseId}/instructor`, instructor);
+    return await HTTP.post(`/courses/${courseId}/instructors`, instructor);
   },
   async addCourse(course) {
     return await HTTP.post("/courses", course);
@@ -20,7 +20,7 @@ export default {
     return await HTTP.put(`/courses/${courseId}`, course);
   },
   async addStudent(courseId, student) {
-    return await HTTP.post(`/courses/${courseId}/registration`, student);
+    return await HTTP.post(`/courses/${courseId}/registrations`, student);
   },
   async addStudents(courseId, students) {
     for (const student of students) {

src/components/AddClass.vue → src/components/AddCourse.vue

@@ -158,7 +158,7 @@
           :disabled="!valid"
           color="primary"
           :loading="addBusy"
-          @click="addClass()"
+          @click="addCourse()"
         >
           Add Class
         </v-btn>
@@ -197,7 +197,7 @@ export default {
       this.$emit("cancel");
       this.init();
     },
-    addClass() {
+    addCourse() {
       this.$emit("add", this.toAdd);
       this.init();
     },

src/components/EditableInput.vue

@@ -115,8 +115,6 @@ export default {
         .getComputedStyle(this.$refs.defaultSlot)
         .getPropertyValue("font-size");
 
-      console.log("+++ startEditing", width, fontSize);
-
       // set focus to the input element
       this.$nextTick(() => {
         const editInput = this.getEditingInput();

src/components/PersonnelTable.vue

@@ -89,7 +89,7 @@ export default {
     return {
       inputRules,
       loading: true,
-      initialLoad: false,
+      initialLoad: true,
       total: 0,
       footerProps: DEFAULT_FOOTER_PROPS,
       params: {
@@ -174,7 +174,8 @@ export default {
         this.personnel.listItems = data;
         this.total = response.meta.total;
       } catch (error) {
-        console.error("!teams error!", error);
+        // TODO: no error messages to the user?!
+        console.error("!personnel error!", error);
       } finally {
         this.loading = false;
         this.fetchingData = false;
@@ -186,6 +187,7 @@ export default {
         user.personnelType = null;
         return user;
       });
+      // TODO: this should be wrapped in a try/catch
       await UserService.updateUserPersonnelType(selectedPersonnel);
       const removeStudentIds = this.personnel.selectedPersonnel.map(
         ({ id }) => id
@@ -211,7 +213,7 @@ export default {
       return this.personnel.listItems;
     },
     async updateUserPermissions(userData) {
-      await UserService.updateUserPermission([userData]);
+      UserService.updateUserPermission([userData]);
     },
   },
   watch: {

src/components/ProjectsSummary.vue

@@ -5,7 +5,11 @@
       class="background-transparent"
       type="list-item@3"
     >
-      <v-card v-if="emptyString">
+      <v-card v-if="error">
+        <v-card-title>Something went wrong...</v-card-title>
+        <v-card-text>Use the refresh button in panel to try again.</v-card-text>
+      </v-card>
+      <v-card v-else-if="emptyString">
         <v-card-title>You currently don't have any projects! </v-card-title>
         <v-card-text
           >Your starred GitLab projects will appear here. Go to
@@ -241,6 +245,7 @@ export default {
   data: () => ({
     loading: false,
     emptyString: false,
+    error: false,
   }),
   async mounted() {
     try {
@@ -248,12 +253,8 @@ export default {
       await this.refreshProjects();
     } catch (error) {
       console.error(error);
-    } finally {
-      // TODO: remove fake wait
-      setTimeout(() => {
-        this.loading = false;
-      }, 2000);
     }
+    this.loading = false;
   },
   methods: {
     ...mapMutations({
@@ -263,13 +264,18 @@ export default {
       if (this.setProjectLoading) {
         this.setProjectLoading(true);
       }
-      const projects = await ProjectService.getProjectsSummary();
-      if (projects) {
-        this.setProjects(projects);
-        this.emptyString = false;
-      }
-      if (projects.length === 0) {
-        this.emptyString = true;
+      this.error = false;
+      this.emptyString = false;
+      try {
+        const projects = await ProjectService.getProjectsSummary();
+        if (projects) {
+          this.setProjects(projects);
+        }
+        if (projects.length === 0) {
+          this.emptyString = true;
+        }
+      } catch (e) {
+        this.error = true;
       }
       if (this.setProjectLoading) {
         this.setProjectLoading(false);

src/components/UserSelect.vue

@@ -153,7 +153,6 @@ export default {
     },
     async query(val) {
       try {
-        console.log("val:", val);
         const newItems = await UserService.search({ q: val });
         if (this.model) {
           if (Array.isArray(this.model)) {

src/store/action-types.js

-export const CALL_SET_USER_PREFERENCE = " user_preferences/callSetUserProjects";
+export const CALL_SET_USER_PREFERENCE = "user_preferences/callSetUserProjects";

src/utils/tableHelpers.js

 export const createDefaultPaginationParams = (options, additional = {}) => {
   const { overwrite } = additional;
-  let sortBy = options.sortBy[0];
-  const sortDesc = options.sortDesc[0];
+  let sortBy = options.sortBy?.[0];
+  const sortDesc = options.sortDesc?.[0];
   const page = options.page;
-  const pageSize = options.itemsPerPage === -1 ? 500 : options.itemsPerPage;
+  const pageSize = options.itemsPerPage === -1 ? 20 : options.itemsPerPage;
 
   if (overwrite?.sortBy && sortBy === overwrite?.sortBy?.from) {
     sortBy = overwrite.sortBy.to;

src/views/Launchboard.vue

@@ -11,23 +11,29 @@
           />
           <ErrorMessage />
           <Section class="mt-6" v-if="showWelcomeMessage">
-            <h4 slot="header" class="ma-0 pl-5">Welcome to Platform One</h4>
+            <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">My Curriculum Schedule</h4>
+            <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">System Status</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">System Status</h4>
             <SystemStatusSummary 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">My Project Summary</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">
+              My Project Summary
+            </h4>
             <span slot="header-right">
               <v-tooltip top>
                 <template v-slot:activator="{ on, attrs }">
@@ -52,11 +58,11 @@
             />
           </Section>
           <Section class="mt-6">
-            <h4 slot="header" class="ma-0 pl-5">Help Desk</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">Help Desk</h4>
             <HelpDeskSummary slot="content" />
           </Section>
           <Section class="mt-6">
-            <h4 slot="header" class="ma-0 pl-5">Tools</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">Tools</h4>
             <ToolsSummary slot="content" />
           </Section>
         </v-col>

src/views/Projects.vue

@@ -4,7 +4,7 @@
       <v-row>
         <v-col cols="12" class="d-flex flex-column pb-0 pb-lg-3">
           <Section class="mt-6" hideCollapseButton>
-            <h4 slot="header" class="ma-0 pl-5">My Projects</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">My Projects</h4>
             <span slot="header-right">
               <v-tooltip top>
                 <template v-slot:activator="{ on, attrs }">

src/views/Resources.vue

@@ -4,7 +4,7 @@
       <v-row class="justify-content-left">
         <v-col cols="12" lg="4" md="6" sm="12" class="py-0 pt-lg-3">
           <Section hideCollapseButton>
-            <h4 slot="header" class="mt-4 w-100">
+            <h4 slot="header" class="mt-4 w-100 text-left">
               ABMS ADCE Party Bus Survival Guide
             </h4>
             <div slot="content">
@@ -30,7 +30,7 @@
       <v-row>
         <v-col>
           <Section hide-collapse-button>
-            <h4 slot="header">Training Resources</h4>
+            <h4 slot="header" class="text-left">Training Resources</h4>
             <div slot="content" class="d-flex flex-column">
               <div class="text-left pl-10 link-column">
                 <a
@@ -98,7 +98,7 @@
       <v-row>
         <v-col>
           <Section hide-collapse-button>
-            <h4 slot="header">Self-Learning Videos</h4>
+            <h4 slot="header" class="text-left">Self-Learning Videos</h4>
             <div slot="content" class="d-flex flex-column">
               <div class="text-left pl-10 link-column">
                 Kubernetes -

src/views/Settings.vue

@@ -4,7 +4,9 @@
       <v-row>
         <v-col cols="12" lg="6" class="d-flex flex-column pb-0 pb-lg-3">
           <Section>
-            <h4 slot="header" class="ma-0 pl-5">Launchboard Settings</h4>
+            <h4 slot="header" class="ma-0 pl-5 text-left">
+              Launchboard Settings
+            </h4>
             <LaunchboardSettings slot="content" />
           </Section>
         </v-col>

src/views/Team.vue

@@ -229,7 +229,7 @@ import UserSelect from "@/components/UserSelect";
 import AddTeam from "@/components/AddTeam";
 import { defaultSnackbarTimeout } from "@/config/config";
 import inputRules from "@/utils/inputRules";
-import Roles from "@/config/user-permissions";
+import Permission from "@/config/user-permissions";
 
 export default {
   components: { UserSelect, AddTeam },
@@ -281,12 +281,12 @@ export default {
         // 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.role !== Roles.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.getTeamForUser();
+          this.team = await TeamService.getMyTeam();
         }
       } else {
         console.log("THIS CANNOT BE ME");
@@ -410,6 +410,7 @@ export default {
         );
         this.snackbars.delete = true;
       } catch (e) {
+        // TODO: no user notification of the error???
         console.error("error deleting member:", e);
       } finally {
         this.deletingMembers.forEach((m) => Vue.set(m, "isDeleting", false));
@@ -428,6 +429,7 @@ export default {
           this.$route.params.teamId
         );
       } catch (e) {
+        //TODO: error message to the user???
         console.error("error restoring member:", e);
       } finally {
         await this.getTeams();

src/views/TrainingDetails.vue

@@ -363,11 +363,9 @@ export default {
   }),
   computed: {
     getSelectedPocs() {
-      console.log(this.selectedPocs);
       return this.selectedPocs;
     },
     getSelectedStudents() {
-      console.log(this.selectedStudents);
       return this.selectedStudents;
     },
   },
@@ -376,12 +374,10 @@ export default {
     this.trainingCourse = await TrainingService.getCourse(
       this.$route.params.trainingId
     );
-    console.log(this.trainingCourse);
     this.loading = false;
   },
   methods: {
     removeSelectedStudent() {
-      console.log(this.getSelectedStudents);
       const removeStudentIds = this.getSelectedStudents.map(
         (student) => student.id
       );

src/views/super-admin/Training.vue

@@ -109,10 +109,10 @@
               </v-row>
             </v-container>
 
-            <AddClass
+            <AddCourse
               v-if="state.isAdding"
               @cancel="state.isAdding = false"
-              @add="addClass"
+              @add="addCourse"
               :add-busy="state.isAddingBusy"
             />
           </template>
@@ -269,7 +269,7 @@
 <script>
 import Vue from "vue";
 import TrainingService from "@/api/services/training";
-import AddClass from "@/components/AddClass";
+import AddCourse from "@/components/AddCourse";
 import { defaultSnackbarTimeout, debounceTimeout } from "@/config/config";
 import { trainingTypes } from "@/config/reference-data";
 import isEqual from "lodash/isEqual";
@@ -283,7 +283,7 @@ import { createDefaultPaginationParams } from "@/utils/tableHelpers";
 
 export default {
   components: {
-    AddClass,
+    AddCourse,
   },
   data: () => ({
     initialLoad: true,
@@ -387,7 +387,7 @@ export default {
       }
     },
 
-    async addClass(toAdd) {
+    async addCourse(toAdd) {
       this.state.isAddingBusy = true;
 
       toAdd.seats = {

tests/unit/App.spec.js

@@ -38,6 +38,7 @@ describe("Launchboard InitialLoadingApp", () => {
           },
         },
       },
+      stubs: ["router-view"],
       localVue,
       vuetify,
     });
@@ -58,6 +59,7 @@ describe("Launchboard InitialLoadingApp", () => {
           },
         },
       },
+      stubs: ["router-view"],
       localVue,
       vuetify,
     });

tests/unit/InitialLoadingApp.spec.js

@@ -41,7 +41,7 @@ describe("Launchboard InitialLoadingApp", () => {
 
   it("should show launch state", async () => {
     const wrapper = shallowMount(InitialLoadingApp);
-
+    wrapper.vm.$commit = jest.fn();
     wrapper.vm.$destroy = jest.fn();
     wrapper.vm.showLaunch();
 

tests/unit/api/http-common.spec.js

 import { HTTP } from "@/api/http-common";
+import axios from "axios";
 
 describe("api/services", () => {
-  describe("should call HTTP", () => {
-    test("HTTP", async () => {
-      const res = await HTTP.get("test");
-      expect(res).toEqual(undefined);
-    });
+  it("HTTP should be instance of axios", () => {
+    const shouldEqualInstance = axios.create({});
+    expect(HTTP.constructor.name).toEqual(shouldEqualInstance.constructor.name);
+  });
+  it("HTTP.get should be function", () => {
+    expect(typeof HTTP.get).toEqual("function");
+  });
+  it("HTTP.delete should be function", () => {
+    expect(typeof HTTP.delete).toEqual("function");
+  });
+  it("HTTP.put should be function", () => {
+    expect(typeof HTTP.put).toEqual("function");
+  });
+  it("HTTP.post should be function", () => {
+    expect(typeof HTTP.post).toEqual("function");
+  });
+  it("should test interceptor", () => {
+    expect(
+      HTTP.interceptors.response.handlers[0].fulfilled({
+        data: { result: "mock result" },
+      })
+    ).toEqual("mock result");
+    expect(
+      HTTP.interceptors.response.handlers[0].fulfilled({
+        data: {},
+      })
+    ).toBeUndefined();
+    expect(
+      HTTP.interceptors.response.handlers[0].fulfilled({})
+    ).toBeUndefined();
   });
 });