projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18169: Removed cancel disable when uploading
[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 c1f9c6810958467629ecdddb0d74fb00035f35fd..bade4c8f88082aa6057d6e8f7c1d07f2cc134979 100644
(file)
--- a/
src/store/file-uploader/file-uploader-reducer.ts
+++ b/
src/store/file-uploader/file-uploader-reducer.ts
@@
-41,8
+41,25
@@
export const fileUploaderReducer = (state: UploaderState = initialState, action:
const idToDelete: number = file.id;
const updatedState = state.filter(file => file.id !== idToDelete);
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;
},
return updatedState;
},
+ CANCEL_FILES_UPLOAD: () => {
+ Object.keys((window as any).cancelTokens)
+ .forEach((key) => {
+ (window as any).cancelTokens[key]();
+ delete (window as any).cancelTokens[key];
+ });
+
+ return state;
+ },
START_UPLOAD: () => {
const startTime = Date.now();
return state.map(f => ({ ...f, startTime, prevTime: startTime }));
START_UPLOAD: () => {
const startTime = Date.now();
return state.map(f => ({ ...f, startTime, prevTime: startTime }));