@imposium-hub/components 2.5.4-2 → 2.5.4

package/src/components/story-previewer/StoryPreviewer.tsx

@@ -65,7 +65,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
 
     private evtHandlers: any;
 
-    private TIMEOUT: number = 120000;
+    private TIMEOUT: string = '02:00';
 
     private maxPlaybackRate = 3;
 
@@ -210,8 +210,20 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
             });
         }
 
+        if (this.props.notifications) {
+            if (this.props.notifications[0]) {
+                if (this.props.notifications[0]['type'] === 'error') {
+                    this.setState({ isTimeOut: true });
+                }
+
+                if (this.props.notifications[0]['type'] === 'info') {
+                    this.setState({ isTimeOut: false });
+                }
+            }
+        }
+
         if (prevState.timeElapsed !== this.state.timeElapsed) {
-            if (this.state.timeElapsed >= this.TIMEOUT && !this.state.experience) {
+            if (formattedTime(this.state.timeElapsed) === this.TIMEOUT && !this.state.experience) {
                 const { onError, api } = this.props;
                 const { experienceId } = this.state;
 
@@ -558,24 +570,14 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                                     }
                                 })
                                 .catch((e) => {
+                                    this.resetState();
                                     if (onError) {
                                         if (e.error) {
                                             onError(copy.runExpError.replace('[error]', e.error));
-                                            this.resetState(
-                                                true,
-                                                () => {
-                                                    this.setState({
-                                                        isTimeOut: true,
-                                                        errorMsg: e.error
-                                                    });
-                                                },
-                                                experienceId
-                                            );
                                         } else {
                                             onError(
                                                 copy.runExpIdError.replace('[expId]', experienceId)
                                             );
-                                            this.resetState();
                                         }
                                     }
                                 });
@@ -680,7 +682,7 @@ class StoryPreviewer extends React.PureComponent<IStoryPreviewerProps, IStoryPre
                         {copy.time}&nbsp;{formattedTime(timeElapsed)}
                     </p>
                     <br />
-                    {errorMsg ? <p>{`${copy.runExpError.replace('[error]', errorMsg)}`}</p> : ''}
+                    <p>{`${copy.runExpError.replace('[error]', errorMsg)}`}</p>
                 </div>
             );
         } else if (experience && activeOutput) {

package/src/constants/icons.tsx

@@ -73,7 +73,7 @@ import {
 } from '@fortawesome/pro-light-svg-icons';
 import { faCircleSmall } from '@fortawesome/pro-solid-svg-icons/faCircleSmall';
 import { faClapperboardPlay } from '@fortawesome/pro-solid-svg-icons/faClapperboardPlay';
-import { faCloudArrowUp, faFilters } from '@fortawesome/pro-solid-svg-icons';
+import { faFilters } from '@fortawesome/pro-solid-svg-icons';
 
 export const ICON_VIDEO = <FontAwesomeIcon icon={faVideo} />;
 
@@ -218,5 +218,3 @@ export const ICON_CLAPPERBOARD_PLAY = <FontAwesomeIcon icon={faClapperboardPlay}
 export const ICON_CODE = <FontAwesomeIcon icon={faCode} />;
 
 export const ICON_UP_RIGHT_FROM_SQUARE = <FontAwesomeIcon icon={faUpRightFromSquare} />;
-
-export const ICON_FILE_UPLOAD = <FontAwesomeIcon icon={faCloudArrowUp} />;

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

@@ -257,8 +257,7 @@ export const replaceAsset = (
     api: IImposiumAPI,
     assetId: any,
     files: File[],
-    storyId: string,
-    bindToOverlay?: (f: any) => any
+    storyId: string
 ): any => {
     return (dispatch, getStore) => {
         return new Promise<void>((resolve) => {
@@ -304,23 +303,17 @@ export const replaceAsset = (
                 )
                     .then((result) => {
                         const currentOngoingJobs = () => {
-                            if (bindToOverlay) {
-                                bindToOverlay(result);
-                            }
                             return {
-                                footageId: result.id,
-                                jobId: result.job_id,
                                 filename: replacedFileBlobs[activeIndex].filename,
                                 onProcessed: () => {
                                     const fileName = ongoingJobs.filter(
-                                        (job: any) => job.jobId === result.job_id
+                                        (job: any) => job.jobId === result[0].job_id
                                     )[0].filename;
                                     dispatch({
                                         type: assetUploadsActions.REMOVE_UPLOAD,
                                         filename: fileName
                                     });
                                     doAssetTableHydration(api, storyId);
-                                    resolve(result);
                                 }
                             };
                         };
@@ -333,22 +326,23 @@ export const replaceAsset = (
                         } else {
                             ongoingJobs = ongoingJobs.filter((j: any, i: number) => {
                                 const jobIdExists: boolean = typeof j.jobId === 'string';
+
                                 if (!jobIdExists) {
                                     dispatch({
                                         type: assetUploadsActions.REMOVE_UPLOAD,
                                         filename: j.filename
                                     });
                                     doAssetTableHydration(api, storyId);
-                                    resolve(result);
                                 }
                                 return jobIdExists;
                             });
+
                             if (ongoingJobs.length > 0) {
                                 pollAssetJobs(api, ongoingJobs, processingTimeout);
                             }
                         }
 
-                        // resolve(result);
+                        resolve(result);
                     })
                     .catch((e: Error[]) => {
                         if (axios.isCancel(e) && currentQueue !== queueLength - 1) {

package/src/redux/actions/publish.ts

@@ -17,7 +17,7 @@ export const getStoryPublishStatus = (api: IImposiumAPI, storyId: string): any =
                         }
 
                         dispatch({ type: publish.UPDATE_PUBLISH_STATUS, data: resStatus });
-                        resolve(resStatus);
+
                         if (resStatus.publishing) {
                             const jobId = resStatus.job_id;
                             api.pollJob(jobId)