pulled master

src/api/http-common.js

@@ -16,7 +16,7 @@ HTTP.interceptors.response.use(
     // If err.status does not exist a general networking error occurred.
     // We'll assume that their keycloak session has expired, so refresh the
     // page which will redirect them to login
-    if (!err.status) {
+    if (!err.status && !err.response?.status) {
       location.reload();
     } else {
       throw err;

src/views/Team.vue

 <template>
   <div>
-    <v-container class="team">
+    <div v-if="!Object.entries(team).length">
+      <NotFoundComponent />
+    </div>
+
+    <v-container class="team" v-else>
       <div class="d-flex flex-column justify-center align-top flex-sm-row mb-4">
         <div>
           <h1
@@ -304,6 +308,7 @@ import SelectAddStudentsToCourseDialog from "@/components/Dialogs/SelectAddStude
 import TeamService from "@/api/services/team";
 import UserSelect from "@/components/UserSelect";
 import AddTeam from "@/components/AddTeam";
+import NotFoundComponent from "@/components/NotFoundComponent";
 import { defaultSnackbarTimeout } from "@/config/config";
 import inputRules from "@/utils/inputRules";
 import Permission from "@/config/user-permissions";
@@ -317,6 +322,7 @@ export default {
     SelectAddStudentsToCourseDialog,
     AddTeam,
     BaseDialog,
+    NotFoundComponent,
   },
   data: () => ({
     editValid: false,

src/views/TrainingDetails.vue

 <template>
   <div>
-    <v-container class="course">
+    <div v-if="!Object.entries(trainingCourse).length">
+      <NotFoundComponent />
+    </div>
+    <v-container class="course" v-else>
       <v-skeleton-loader
         :loading="initialLoad"
         type="table-heading,table-thead, table-tbody"
@@ -392,6 +395,7 @@
 import moment from "moment";
 import TrainingService from "@/api/services/training";
 import inputRules from "@/utils/inputRules";
+import NotFoundComponent from "@/components/NotFoundComponent";
 import TrainingAttendance from "@/components/Training/TrainingAttendance";
 import PendingRequests from "@/components/Training/PendingRequests";
 import { SET_ERROR_MESSAGE, SET_ERROR_DIALOG } from "@/store/mutation-types";
@@ -405,6 +409,7 @@ export default {
     TrainingAttendance,
     UserSelect,
     PendingRequests,
+    NotFoundComponent,
   },
   data: () => ({
     selectedInstructors: [],

src/views/super-admin/Teams.vue

@@ -69,7 +69,6 @@
               :add-busy="state.isAddingBusy"
             />
           </template>
-
           <template v-slot:[`item.name`]="{ item }">
             <router-link
               :to="{ name: 'TeamDetails', params: { teamId: item.id } }"
@@ -93,6 +92,7 @@
               >
             </div>
           </template>
+
           <template v-slot:[`item.email`]="{ item }" class="team-leads">
             <div
               class="d-flex flex-wrap white-space-nowrap"