X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/172ba18e43743d90b8a1110d62209be2ab7627d1..e3ca6297f8ec9f3504074291ce6cd10babeb69bf:/src/store/file-uploader/file-uploader-reducer.ts

diff --git a/src/store/file-uploader/file-uploader-reducer.ts b/src/store/file-uploader/file-uploader-reducer.ts
index bade4c8f..4218fbee 100644
--- a/src/store/file-uploader/file-uploader-reducer.ts
+++ b/src/store/file-uploader/file-uploader-reducer.ts
@@ -41,24 +41,22 @@ export const fileUploaderReducer = (state: UploaderState = initialState, action:
             const idToDelete: number = file.id;
             const updatedState = state.filter(file => file.id !== idToDelete);
 
-            const key: string | undefined = Object.keys((window as any).cancelTokens)
-                .find(key => key.indexOf(file.file.name) > -1);
-
-            if (key) {
-                (window as any).cancelTokens[key]();
-                delete (window as any).cancelTokens[key];
-            }
-
             return updatedState;
         },
         CANCEL_FILES_UPLOAD: () => {
-            Object.keys((window as any).cancelTokens)
-                .forEach((key) => {
-                    (window as any).cancelTokens[key]();
-                    delete (window as any).cancelTokens[key];
-                });
+            state.forEach((file) => {
+                let interval = setInterval(() => {
+                    const key = Object.keys((window as any).cancelTokens).find(key => key.indexOf(file.file.name) > -1);
+    
+                    if (key) {
+                        clearInterval(interval);
+                        (window as any).cancelTokens[key]();
+                        delete (window as any).cancelTokens[key];
+                    }
+                }, 100);
+            });
 
-            return state;
+            return [];
         },
         START_UPLOAD: () => {
             const startTime = Date.now();