WIP17

cabinetoffice · Oct 22, 2024 · cea60e9 · cea60e9
1 parent ee4a5ed
commit cea60e9
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/GenderPayGap.WebUI/Views/Search/SearchPage.cshtml b/GenderPayGap.WebUI/Views/Search/SearchPage.cshtml
@@ -301,6 +301,23 @@
     window.addEventListener("DOMContentLoaded", () => {        
         const NUMBER_OF_SEARCH_RESULTS_PER_TABLE = 100;
         
+        const aborter = (() => {
+            const abortControllers = [];
+            
+            return {
+                abortPreviousFetchesAndGetNewAbortSignal: () => {
+                    while(abortControllers.length > 0) {
+                        const abortController = abortControllers.pop();
+                        abortController.abort();
+                    }
+                    
+                    const abortController = new AbortController();
+                    abortControllers.push(abortController);
+                    return abortController.signal;
+                }
+            };
+        })();
+        
         const searchResultsIdGenerator = (() => {
             let currentSearchResultsId = 0;
             return {
@@ -407,7 +424,7 @@
                 const MIN_LOADING_DELAY_MILLISECONDS = 400;
                 const fetchStartTime = Date.now();
                 
-                const response = await fetch(`${searchApiPath}${urlQuery}`);
+                const response = await fetch(`${searchApiPath}${urlQuery}`, { signal: aborter.abortPreviousFetchesAndGetNewAbortSignal() });
                 if (response.ok) {
                     const json = await response.json();
                     if (searchResultsIdGenerator.isCurrentId(searchResultsId)) {