@imposium-hub/components 2.5.11-1 → 2.5.11-11

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

@@ -78,22 +78,18 @@ export const getAssets = (api: IImposiumAPI, storyId: string): any => {
 
 export const deleteAssets = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        if (window.confirm(`Are you sure you want to delete ${ids.length} assets?`)) {
-            return new Promise<boolean>((resolve, reject) => {
-                dispatch(toggleLoading(true));
-                api.deleteAssets(ids)
-                    .then(() => {
-                        dispatch(getAssets(api, storyId));
-                        resolve(true);
-                    })
-                    .catch((errors: Error[]) => {
-                        dispatch(toggleLoading(false));
-                        reject(false);
-                    });
-            });
-        } else {
-            return Promise.resolve(false);
-        }
+        return new Promise<boolean>((resolve, reject) => {
+            dispatch(toggleLoading(true));
+            api.deleteAssets(ids)
+                .then(() => {
+                    dispatch(getAssets(api, storyId));
+                    resolve(true);
+                })
+                .catch((errors: Error[]) => {
+                    dispatch(toggleLoading(false));
+                    reject(false);
+                });
+        });
     };
 };
 
@@ -194,20 +190,18 @@ export const deleteAssetTags = (api: IImposiumAPI, id: string): any => {
 
 export const deleteAssetsTags = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        if (window.confirm(`Are you sure you want to remove all tags from ${ids.length} assets?`)) {
-            return new Promise<void>((resolve, reject) => {
-                dispatch(toggleLoading(true));
-                api.deleteAssetsTags(ids)
-                    .then(() => {
-                        dispatch(getAssets(api, storyId));
-                        resolve();
-                    })
-                    .catch((errors: Error[]) => {
-                        dispatch(toggleLoading(false));
-                        reject();
-                    });
-            });
-        }
+        return new Promise<void>((resolve, reject) => {
+            dispatch(toggleLoading(true));
+            api.deleteAssetsTags(ids)
+                .then(() => {
+                    dispatch(getAssets(api, storyId));
+                    resolve();
+                })
+                .catch((errors: Error[]) => {
+                    dispatch(toggleLoading(false));
+                    reject();
+                });
+        });
     };
 };
 
@@ -245,20 +239,18 @@ export const updateAssetStory = (api: IImposiumAPI, id: string, storyId: string)
 
 export const decoupleAssets = (api: IImposiumAPI, ids: string[], storyId: string): any => {
     return (dispatch) => {
-        if (window.confirm(`Are you sure you want to decouple ${ids.length} assets?`)) {
-            return new Promise<void>((resolve, reject) => {
-                dispatch(toggleLoading(true));
-                api.decoupleAssets(ids)
-                    .then(() => {
-                        dispatch(getAssets(api, storyId));
-                        resolve();
-                    })
-                    .catch((errors: Error[]) => {
-                        dispatch(toggleLoading(false));
-                        reject();
-                    });
-            });
-        }
+        return new Promise<void>((resolve, reject) => {
+            dispatch(toggleLoading(true));
+            api.decoupleAssets(ids)
+                .then(() => {
+                    dispatch(getAssets(api, storyId));
+                    resolve();
+                })
+                .catch((errors: Error[]) => {
+                    dispatch(toggleLoading(false));
+                    reject();
+                });
+        });
     };
 };
 

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

@@ -364,6 +364,15 @@ export const replaceAsset = (
                         if (axios.isCancel(e) && currentQueue !== queueLength - 1) {
                             currentQueue = currentQueue + 1;
                             createPromise(currentQueue);
+                        } else {
+                            const error: any = { ...e };
+                            const errorMsg = error.response.data.error.split(':')[0];
+                            dispatch({
+                                type: assetUploadsActions.ERROR,
+                                filename: replacedFileBlobs[activeIndex].filename,
+                                errorMsg
+                            });
+                            doAssetTableHydration(api, storyId);
                         }
                     });
             };

package/src/redux/actions/story-filter.ts

@@ -0,0 +1,15 @@
+const storyFilterActions: any = {
+    UPDATE: 'storyFilter/UPDATE',
+    RESET: 'storyFilter/RESET'
+};
+
+export const updateStoryFilter = (newFilters: any): any => ({
+    type: storyFilterActions.UPDATE,
+    newFilters
+});
+
+export const resetStoryFilter = (): any => ({
+    type: storyFilterActions.RESET
+});
+
+export default storyFilterActions;

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

@@ -52,10 +52,8 @@ const assetUploads = (state = initialState, action): any => {
                 if (u.filename === action.filename) {
                     return { ...u, error: action.errorMsg };
                 }
-
                 return u;
             });
-
             return {
                 ...state,
                 uploads: newError

package/src/redux/reducers/story-filter.ts

@@ -0,0 +1,18 @@
+import storyFilterActions from '../actions/story-filter';
+
+const initialState: any = {
+    name: ''
+};
+
+const storyFilter = (state = initialState, action): any => {
+    switch (action.type) {
+        case storyFilterActions.UPDATE:
+            return { ...state, ...action.newFilters };
+        case storyFilterActions.RESET:
+            return { ...initialState };
+        default:
+            return state;
+    }
+};
+
+export default storyFilter;