@imposium-hub/components 1.41.6 → 1.42.0

package/components/publish-wizard/PublishWizard.tsx

@@ -37,7 +37,9 @@ interface IPublishWizardProps {
     importBatchFromCsv : (storyId : string, batchId : string, batchName : string, csvFile : File, accessKey : string, compId : string, addEmbed : boolean, addMedia : boolean) => any;
     handleNotification? : (n) => void;
     batchJobs : any;
+    activeComposition : string;
     renderBatch : (batchId : string, batchName ? : string) => any;
+    publishData : any;
 }
 
 export interface ICredential {
@@ -96,13 +98,25 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
 
     public componentDidMount() {
 
-        const {story, api, handleError} = this.props;
+        const {story, api, handleError, activeComposition} = this.props;
 
         // Pull in all of the access creds for the composition dropdown
         api.getAssets({type: ASSET_TYPES.VIDEO_COMPOSITION}, story.id).then((res) => {
+            const firstCompId = (res.assets[0]) ? res.assets[0].id : null;
             this.setState({
-                compositions: res.assets
+                compositions: res.assets,
+                selectedComposition: (activeComposition) ?  activeComposition : firstCompId
             });
+            if (res.assets.length > 0) {
+                const comp = res.assets[0];
+                const composition = {
+                    value: comp.id,
+                    label: comp.name
+                };
+                this.setState({
+                    selectedComposition: composition
+                });
+            }
         }).catch((credsError) => {
             handleError(copy.integration.errorPullingComps);
         });
@@ -185,6 +199,10 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
     }
 
     public onSelectOption = (index)  => {
+        const {publishing} = this.props.publishData;
+        if (publishing) {
+            alert('WARNING: Your publish is still in progress, your changes will not be present in the rendered videos until the publish is complete');
+        }
         this.setState({screenIndex: index, done: false});
     }
 
@@ -319,6 +337,10 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                 <HRule/>
                 <p>{copy.publish.distributeStepDesc}</p>
                 <HRule/>
+                {!this.state.selectedComposition && (
+                    <p className={'text-danger'}>{copy.publish.noCompErrorDesc}</p>
+                )}
+                <div style={{marginTop: '10px'}}>
                 <SelectField
                     label={copy.project.compName}
                     value={selectedComposition}
@@ -337,12 +359,14 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                         return (
                             <BigButton
                                 key={index}
+                                disabled={!this.state.selectedComposition}
                                 label={option.label}
                                 onClick={option.onClick}
                             />
                         );
                     })}
                 </div>
+                </div>
            </div>
         );
     }
@@ -421,15 +445,19 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
     }
 }
 
+const mapStateToProps = (state) => ({
+    publishData: state.publish
+});
+
 const mapDispatchToProps = (dispatch) => {
     return bindActionCreators({publishVersion}, dispatch);
 };
 
-export default connect (null, mapDispatchToProps)(PublishWizard);
+export default connect (mapStateToProps, mapDispatchToProps)(PublishWizard);
 
 export const BigButton : React.FC<IBigButtonProps> = (p) => (
-    <div className = {`big-link ${(p.disabled) ? 'disabled' : ''}`} onClick = {() => p.onClick()} style={p.style}>
-        <h1 style={{color: p.selected && '#2d8ceb' }}>{p.label}</h1>
+    <div className = {`big-link ${(p.disabled) && 'disabled'}`} onClick = {() => p.onClick()} style={p.style}>
+        <h1>{p.label}</h1>
     </div>
 );
 

package/components/publish-wizard/publish/EmailWorkflow.tsx

@@ -80,7 +80,7 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
         const emptyRow : any = maskConfig.map((m : any) => (m.id))
             .reduce((prevState : any, currId : string) => ({...prevState, [currId]: ''}), {});
 
-        const filename = `${alphaNumeric(name)}-batch-template.csv`;
+        const filename = `${alphaNumeric(name)}-batch-template`;
         const exporter = new ExportToCsv({
             ...EmailWorkflow.CSV_EXPORT_CONFIG,
             filename

package/components/tabs/Tabs.tsx

@@ -12,7 +12,7 @@ interface ITab {
     key : string;
     canClose? : boolean;
     resize? : boolean;
-    label : string;
+    label : any;
 }
 
 interface ITabsProps {
@@ -72,10 +72,18 @@ class Tabs extends React.PureComponent<ITabsProps, ITabsState> {
                 for (let i = 0; i < options.length; i++) {
 
                     const option = options[i];
-                    const buttonWidth = option.canClose ? 20 : 0;
+                    let buttonWidth = option.canClose ? 20 : 0;
                     let div = document.createElement('div');
                     div.className = 'tab-header-option';
-                    div.innerHTML = option.label;
+
+                    // check typeof label
+                    if (typeof option.label !== 'string') {
+                        // set label
+                        div.innerHTML = option.label.props.children[0];
+                        buttonWidth = 20;
+                    } else {
+                        div.innerHTML = option.label;
+                    }
                     container.appendChild(div);
                     totalTabWidths += div.offsetWidth + buttonWidth;
                     container.removeChild(div);

package/constants/copy.ts

@@ -159,7 +159,7 @@ export const publish = {
     btnBack: 'Back',
     btnFinished: 'Done',
     noCompErrorTitle: 'No Compositions Found',
-    noCompErrorDesc: `You can't publish and deliver your project until you have created your first composition.`
+    noCompErrorDesc: `You must have at least 1 composition on your story to render and distribute videos.`
 };
 
 export const integration = {