From b30137a88c62d23dbf770c9a63de86a181dcdd2f Mon Sep 17 00:00:00 2001
From: Nadim Ritter <nadim.ritter@let.ethz.ch>
Date: Mon, 3 Jun 2024 14:37:19 +0200
Subject: [PATCH] SEBSP-118 fix loading issue with new data table server

---
 client/src/components/views/StartPage.vue     |  1 -
 .../views/search/SearchSessionTable.vue       | 20 ++++---
 .../src/services/api-services/apiService.ts   | 59 ++++++++-----------
 client/src/store/app.ts                       |  3 +-
 client/src/utils/table/CustomTableHeader.vue  |  7 ++-
 client/src/utils/table/tableUtils.ts          |  8 +--
 6 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/client/src/components/views/StartPage.vue b/client/src/components/views/StartPage.vue
index a20ef30..fe3a0f9 100644
--- a/client/src/components/views/StartPage.vue
+++ b/client/src/components/views/StartPage.vue
@@ -1,7 +1,6 @@
 <template>
     <v-row>
         <v-col>
-
             <v-data-table
                 item-value="item.name"
                 class="rounded-lg elevation-4"
diff --git a/client/src/components/views/search/SearchSessionTable.vue b/client/src/components/views/search/SearchSessionTable.vue
index 48ce893..d83c297 100644
--- a/client/src/components/views/search/SearchSessionTable.vue
+++ b/client/src/components/views/search/SearchSessionTable.vue
@@ -1,14 +1,9 @@
 <template>
-        <!--  -->
-        <!-- :items-per-page="tableUtils.calcDefaultItemsPerPage(sessions?.content)"  -->
-        <!--  -->
-
     <v-data-table-server
         show-expand
         item-value="sessionUUID" 
         class="elevation-1"
         @update:options="loadItems"
-        :sort-by="[{key: 'startTime', order: 'desc'}]"
         :loading="isLoading"
         loading-text="Loading... Please wait"
         :items="sessions?.content"
@@ -105,6 +100,8 @@
 
 
     //table
+    const isOnLoad = ref<boolean>(true);
+    const defaultSort: {key: string, order: string}[] = [{key: 'startTime', order: 'desc'}];
     const sessionTableHeadersRef = ref<any[]>();
     const sessionTableHeaders = ref([
         {title: "Start-Time", key: "startTime", width: "10%"},
@@ -113,19 +110,23 @@
         {title: "Group Name", key: "groupName", width: "20%"},
         {title: "Exam Name", key: "exam.name", width: "20%"},
         {title: "Slides", key: "nrOfScreenshots"},
-        {title: "Video", key: "proctoringViewLink"},
+        {title: "Video", key: "proctoringViewLink", sortable: false}
     ]);                 
 
     async function loadItems(serverTablePaging: ServerTablePaging){
-        console.log("--------start-------")
         isLoading.value = true;
+        //current solution to default sort the table
+        //sort-by in data-table-server tag breaks the sorting as the headers are in a seperate component
+        if(isOnLoad.value){
+            serverTablePaging.sortBy = defaultSort;
+        }
+
         let searchParameters: OptionalParSearchSessions = searchViewService.prepareSessionSearchParameters(props.day, props.searchParameters, serverTablePaging);
 
         console.log(searchParameters)
 
         const sessionSearchResponse: SearchSessions | null = await searchViewService.searchSessions(searchParameters);
         if(sessionSearchResponse == null){
-
             isLoading.value = false;
             return;
         }
@@ -133,8 +134,9 @@
         sessions.value = sessionSearchResponse;
         totalItems.value = sessionSearchResponse.numberOfPages * sessionSearchResponse.pageSize
 
+        isOnLoad.value = false;
         isLoading.value = false;
-        console.log("--------end-------")
+        console.log("--------end-------");
     }
 
 
diff --git a/client/src/services/api-services/apiService.ts b/client/src/services/api-services/apiService.ts
index b4f0234..874771a 100644
--- a/client/src/services/api-services/apiService.ts
+++ b/client/src/services/api-services/apiService.ts
@@ -16,8 +16,6 @@ export function createApi(){
 }
 
 export function createApiInterceptor(){
-    const ignoredUrls: string[] = getIgnoredUrls();
-
     const authStore = useAuthStore();
     const loadingStore = useLoadingStore();
 
@@ -25,42 +23,26 @@ export function createApiInterceptor(){
     let loadingEndTimeout: NodeJS.Timeout | null = null;
 
     api.interceptors.request.use(async (config) => {
-        //additional skip when url is used multiple times in differnet locations such as /group
-        if(!loadingStore.skipLoading && !loadingStore.isSessionsSearch){
-            loadingTimeout = setTimeout(() => {
-                loadingStore.isLoading = true;
-            }, 500);
-
-            loadingEndTimeout = setTimeout(() => {
-                resetLoadingState();
-            }, 10000);
-        }
+        const isIgnoredUrl: boolean = isUrlIgnorable(config.url);
 
-        if(loadingStore.isSessionsSearch){
-            loadingEndTimeout = setTimeout(() => {
-                loadingStore.isLoading = false;
-                loadingStore.isTimeout = true;
-                loadingStore.isSessionsSearch = false;
-            }, 15000);
-        }
-
-        const isIgnoredUrl: boolean = ignoredUrls.some(url => config.url?.includes(url));
-        if(isIgnoredUrl){
-            if (loadingTimeout) clearTimeout(loadingTimeout); 
+        if(loadingStore.skipLoading || isIgnoredUrl){
             return config;
         }
 
+        loadingTimeout = setTimeout(() => {
+            loadingStore.isLoading = true;
+        }, 500);
+
+        loadingEndTimeout = setTimeout(() => {
+            resetLoadingState();
+        }, 20000);
+
         return config;
     });
 
 
     api.interceptors.response.use(async response => {
-        if(loadingStore.isSessionsSearch){
-            if (loadingEndTimeout) clearTimeout(loadingEndTimeout); 
-        }else{
-            resetLoadingState();
-        }
-
+        resetLoadingState();
         return response;
 
     }, async error => {
@@ -93,10 +75,6 @@ export function createApiInterceptor(){
 
 
     function resetLoadingState(){
-        if(loadingStore.isSessionsSearch){
-            return;
-        }
-
         if (loadingTimeout) clearTimeout(loadingTimeout); 
         if (loadingEndTimeout) clearTimeout(loadingEndTimeout); 
 
@@ -131,6 +109,21 @@ function getIgnoredUrls(): string[]{
         "/screenshot-data/", 
         "/screenshot-timestamps/", 
         "/search/timeline", 
+        "/search/sessions",
         "/useraccount/me"
     ];
+}
+
+function isUrlIgnorable(url: string | undefined): boolean{
+    if(url == null){
+        return false;
+    } 
+
+    const ignoredUrls: string[] = getIgnoredUrls();
+
+    if(url == "/search/sessions/day"){
+        return false;
+    }
+
+    return ignoredUrls.some(urlFromList => url.includes(urlFromList))
 }
\ No newline at end of file
diff --git a/client/src/store/app.ts b/client/src/store/app.ts
index 2c33ae4..b944f0b 100644
--- a/client/src/store/app.ts
+++ b/client/src/store/app.ts
@@ -74,10 +74,9 @@ export const useGalleryStore = defineStore("gallery", () => {
 export const useLoadingStore = defineStore("loading", () => {
   const skipLoading = ref<boolean>(false);
   const isLoading = ref<boolean>(false);
-  const isSessionsSearch = ref<boolean>(false);
   const isTimeout = ref<boolean>(false);
 
-  return {skipLoading, isLoading, isSessionsSearch, isTimeout};
+  return {skipLoading, isLoading, isTimeout};
 });
 //-------------------------------------------------//
 
diff --git a/client/src/utils/table/CustomTableHeader.vue b/client/src/utils/table/CustomTableHeader.vue
index 83b2f51..2dd8332 100644
--- a/client/src/utils/table/CustomTableHeader.vue
+++ b/client/src/utils/table/CustomTableHeader.vue
@@ -1,9 +1,10 @@
 <template>
     <tr>
         <template v-for="(column, index) in props.columns">
-            
+    
             <th :aria-label="getHeaderDescription(column, isSorted)"> 
                 <span 
+                    v-if="column.sortable"
                     ref="headerRefs"
                     tabindex="0" 
                     class="mr-2 cursor-pointer font-weight-bold" 
@@ -12,6 +13,10 @@
                     @click="() => props.toggleSort(column)">
                     {{ column.title }}
                 </span>
+                <span 
+                    v-else>
+                    {{ column.title }}
+                </span>
 
                 <template v-if="props.isSorted(column)">
                     <v-icon :icon="props.getSortIcon(column)"></v-icon>
diff --git a/client/src/utils/table/tableUtils.ts b/client/src/utils/table/tableUtils.ts
index 62e15ef..13db04f 100644
--- a/client/src/utils/table/tableUtils.ts
+++ b/client/src/utils/table/tableUtils.ts
@@ -30,7 +30,6 @@ export function calcItemsPerPage(itemList: any): { value: number, title: string
 
     let maxLength: number = 0;
     if(typeof itemList == "number"){
-        // console.log("it got here items per page")
         maxLength = itemList;
     }else{
         maxLength = itemList.length;
@@ -38,14 +37,14 @@ export function calcItemsPerPage(itemList: any): { value: number, title: string
 
     if (maxLength < 5) {
         return [
-            { value: maxLength, title: 'All' }
+            { value: maxLength, title: maxLength.toString() }
         ];
     }
 
     if (maxLength < 10) {
         return [
             { value: 5, title: '5' },
-            { value: maxLength, title: 'All' }
+            { value: maxLength, title: maxLength.toString() }
         ];
     }
 
@@ -53,7 +52,7 @@ export function calcItemsPerPage(itemList: any): { value: number, title: string
         return [
             { value: 5, title: '5' },
             { value: 10, title: '10' },
-            { value: maxLength, title: 'All' }
+            { value: maxLength, title: maxLength.toString() }
         ];
     }
 
@@ -61,7 +60,6 @@ export function calcItemsPerPage(itemList: any): { value: number, title: string
         { value: 5, title: '5' },
         { value: 10, title: '10' },
         { value: 15, title: '15' },
-        // { value: maxLength, title: 'All' }
     ];
 }