18169: Fixed upload cancelation on a single file

[arvados-workbench2.git] / 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 bade4c8f88082aa6057d6e8f7c1d07f2cc134979..4218fbee61a9df1689fa3b69a36d40d328e2d2a2 100644 (file)
--- 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();