@imposium-hub/components 1.27.0 → 1.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imposium-hub/components",
-  "version": "1.27.0",
+  "version": "1.28.0",
   "description": "React & Typescript component / asset library for Imposium front-ends",
   "main": "dist/components.js",
   "scripts": {

package/redux/actions/asset-list.ts

@@ -42,7 +42,7 @@ export const getAssets = (api : IImposiumAPI, storyId : string) : any => {
                 dispatch(toggleLoading(true));
             }
 
-            api.getAssets(assetFilters, storyId)
+            api.getAssets(assetFilters, storyId, true)
             .then((assetList : any) => {
                 dispatch({type: assetActions.GET, assetList});
                 dispatch(toggleLoading(false));
@@ -60,18 +60,16 @@ export const deleteAssets = (api : IImposiumAPI, ids : string[], storyId : strin
     return (dispatch) => {
         if (window.confirm(`Are you sure you want to delete ${ids.length} assets?`)) {
             return new Promise<void>((resolve, reject) => {
-                const requests : Array<Promise<any | Error>> = ids.map((id : string) => (api.deleteAsset(id)));
-
                 dispatch(toggleLoading(true));
-                Promise.all(requests)
-                    .then(() => {
-                        dispatch(getAssets(api, storyId));
-                        resolve();
-                    })
-                    .catch((errors : Error[]) => {
-                        dispatch(toggleLoading(false));
-                        reject();
-                    });
+                api.deleteAssets(ids)
+                .then(() => {
+                    dispatch(getAssets(api, storyId));
+                    resolve();
+                })
+                .catch((errors : Error[]) => {
+                    dispatch(toggleLoading(false));
+                    reject();
+                });
             });
         }
     };

package/redux/actions/asset-uploads.ts

@@ -1,4 +1,5 @@
 import IImposiumAPI from '../../services/API';
+import {doAssetTableHydration} from './asset-list';
 
 const assetUploadsActions : any = {
     TOGGLE_AUTO_TAG: 'assetUploads/TOGGLE_AUTO_TAG',
@@ -54,10 +55,13 @@ export const uploadAssets = (api : IImposiumAPI, files : File[], storyId : strin
                 return {
                     footageId: f[0].id,
                     jobId: f[0].job_id,
-                    onProcessed: () => dispatch({
-                        type: assetUploadsActions.REMOVE_UPLOAD,
-                        filename: uploadBlobs[i].filename
-                    })
+                    onProcessed: () => {
+                        dispatch({
+                            type: assetUploadsActions.REMOVE_UPLOAD,
+                            filename: uploadBlobs[i].filename
+                        });
+                        doAssetTableHydration(api, storyId);
+                    }
                 };
             });
 
@@ -69,6 +73,7 @@ export const uploadAssets = (api : IImposiumAPI, files : File[], storyId : strin
                         type: assetUploadsActions.REMOVE_UPLOAD,
                         filename: uploadBlobs[i].filename
                     });
+                    doAssetTableHydration(api, storyId);
                 }
 
                 return jobIdExists;
@@ -94,7 +99,8 @@ const pollAssetJobs = (api, ongoingJobs : any[], timeout : number) : void => {
             let processedJob : any;
 
             ongoingJobResults.forEach((ongoingJobResult : any) => {
-                if (!ongoingJobResult.processing) {
+
+                if (ongoingJobResult.status === 'processing' || ongoingJobResult.status === 'completed') {
                     processedJob = ongoingJobs
                         .find((ongoingJob : any) => (ongoingJob.jobId === ongoingJobResult.id));
 
@@ -104,6 +110,7 @@ const pollAssetJobs = (api, ongoingJobs : any[], timeout : number) : void => {
                             .filter((ongoingJob : any) => (ongoingJob.jobId !== ongoingJobResult.id));
                     }
                 }
+                // TODO: handle errored out
             });
 
             if (ongoingJobs.length > 0) {

package/services/API.ts

@@ -8,6 +8,7 @@ export interface IImposiumAPI {
     getAssetItem(assetId : string);
     uploadAsset(storyId : string, tags : string, file : File);
     deleteAsset(assetId : string);
+    deleteAssets(assetIds : string[]);
     copyAsset(assetId : string, data);
     addAssetTag(assetId : string, tag : string);
     deleteAssetTag(assetId : string, tag : string);
@@ -251,10 +252,9 @@ export default class API {
         });
     }
 
-    public getAssets = (filters : any, storyId : string) : Promise<any | Error> => {
+    public getAssets = (filters : any, storyId : string, unprocessed = false) : Promise<any | Error> => {
 
-        // TODO: add story_id filtering
-        let parameterizedRoute : string = `/assets?items_per_page=50&optional_story_id=${storyId}`;
+        let parameterizedRoute : string = `/assets?items_per_page=50&optional_story_id=${storyId}&unprocessed=${unprocessed}`;
         let tagsSplit : string[];
 
         for (const key in filters) {
@@ -348,6 +348,16 @@ export default class API {
         });
     }
 
+    public deleteAssets = (assetIds : string[]) : Promise<any | Error> => {
+        return this.doRequest({
+            method: 'DELETE',
+            url: `/assets`,
+            data: {
+                ids: assetIds
+            }
+        });
+    }
+
     public copyAsset = (assetId : string, data : any) : Promise<any | Error> => {
 
         return this.doRequest({