@imposium-hub/components 2.2.44-3 → 2.2.44-5

package/src/redux/actions/asset-uploads.ts

@@ -12,7 +12,7 @@ const assetUploadsActions: any = {
 
 const POLL_INTERVAL: number = 5000;
 
-const uploadFiles: File[] = [];
+let uploadFiles: File[] = [];
 let setBindToOverlay;
 
 export const uploadAssets = (
@@ -394,21 +394,23 @@ const pollAssetJobs = (api, ongoingJobs: any[], timeout: number): void => {
     }, POLL_INTERVAL);
 };
 
+const removeUploadHander = (fileName: string, api: IImposiumAPI, dispatch): any => {
+    uploadFiles = uploadFiles.filter((f) => f.name !== fileName);
+    api.cancelUploadAssets(fileName);
+    dispatch({
+        type: assetUploadsActions.REMOVE_UPLOAD,
+        filename: fileName
+    });
+};
+
 export const cancelAssetUpload = (fileName: string, api: IImposiumAPI, assetId: string): any => {
     return (dispatch) => {
-        uploadFiles.filter((f) => {
-            return f.name !== fileName;
-        });
-        api.cancelUploadAssets(fileName);
         if (assetId) {
             api.deleteAsset(assetId)
                 .then()
                 .catch((e) => console.error(e));
         }
-        dispatch({
-            type: assetUploadsActions.REMOVE_UPLOAD,
-            filename: fileName
-        });
+        removeUploadHander(fileName, api, dispatch);
     };
 };
 
@@ -418,15 +420,11 @@ export const cancelNonUploadedAssets = (api: IImposiumAPI): any => {
             assetUploads: { uploads }
         } = getStore();
 
-        if (uploadFiles.length > 0) {
-            for (const file of uploadFiles) {
-                const percent = uploads.find((f) => f.filename === file.name).percent;
-                if (percent === 0) {
-                    api.cancelUploadAssets(file.name);
-                    dispatch({
-                        type: assetUploadsActions.REMOVE_UPLOAD,
-                        filename: file.name
-                    });
+        if (uploads.length > 0) {
+            for (const file of uploads) {
+                const upload = uploads.find((f) => f.filename === file.filename);
+                if (upload.percent === 0) {
+                    removeUploadHander(file.filename, api, dispatch);
                 }
             }
         }