@imposium-hub/components 1.41.1 → 1.41.3

package/components/publish-wizard/PublishWizard.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import Button from '../button/Button';
 import SelectField from '../select-field/SelectField';
 import HRule from '../h-rule/HRule';
-import {ICON_EMAIL, ICON_GLOBE, ICON_HUBSPOT, ICON_PROJECT_DIAGRAM} from '../../constants/icons';
+import {ICON_DOWNLOAD, ICON_EMAIL, ICON_GLOBE, ICON_HUBSPOT, ICON_PROJECT_DIAGRAM} from '../../constants/icons';
 import {IImposiumAPI} from '../../services/API';
 import * as copy from '../../constants/copy';
 import {ASSET_TYPES} from '../../constants/assets';
@@ -34,7 +34,7 @@ interface IPublishWizardProps {
     createFreshBatch : (e : string) => any;
     getBatches : () => any;
     getBatchExport : (batchId : string) => any;
-    importBatchFromCsv : (storyId : string, batchId : string, batchName : string, csvFile : File, accessKey : string, compId : string) => any;
+    importBatchFromCsv : (storyId : string, batchId : string, batchName : string, csvFile : File, accessKey : string, compId : string, addEmbed : boolean, addMedia : boolean) => any;
     handleNotification? : (n) => void;
     batchJobs : any;
     renderBatch : (batchId : string, batchName ? : string) => any;
@@ -307,6 +307,10 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                 label : <span>{ICON_PROJECT_DIAGRAM}&nbsp;{copy.publish.btnAPI}</span>,
                 onClick: (e) => this.onSelectOption(6)
             },
+            {
+                label : <span>{ICON_DOWNLOAD}&nbsp;{copy.publish.btnExport}</span>,
+                onClick: (e) => this.onSelectOption(7)
+            },
         ];
 
         return (
@@ -375,8 +379,9 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                     {screenIndex === 0 && this.renderPublish()}
                     {screenIndex === 1 && this.renderDistributionOptions()}
                     {screenIndex === 2 && <WebpageHosted story={story} compositionId={selectedComposition} accessKey={accessKey}  />}
-                    {screenIndex === 3 &&
+                    {(screenIndex === 3 || screenIndex === 7) &&
                     <EmailWorkflow
+                        isExport = {screenIndex === 7}
                         api={api}
                         story={story}
                         onDone={this.onDoneHandler}
@@ -404,23 +409,6 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
                     />
                     }
                     {screenIndex === 6 && <APIIntegration/>}
-                    {screenIndex === 7 &&
-                    <EmailWorkflow
-                        api={api}
-                        renderBatch={renderBatch}
-                        batchJobs={batchJobs}
-                        story={story}
-                        onDone={this.onDoneHandler}
-                        status={status}
-                        accessKey = {accessKey}
-                        compositionId = {selectedComposition}
-                        compositionName = {compName}
-                        handleError={handleError}
-                        createFreshBatch={createFreshBatch}
-                        getBatches={getBatches}
-                        getBatchExport={getBatchExport}
-                        importBatchFromCsv={importBatchFromCsv}
-                    />}
                     <br/>
                     <HRule/>
                     <div className = 'lower-buttons'>{this.renderLowerButtons()}</div>

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

@@ -6,14 +6,14 @@ import {BigButton} from '../PublishWizard';
 import { ExportToCsv } from 'export-to-csv';
 import { ICON_DOWNLOAD, ICON_UPLOAD } from '../../../constants/icons';
 import * as moment from 'moment';
-import {IImposiumAPI} from '../../../services/API';
+import { IImposiumAPI } from '../../../services/API';
 
 interface IEmailWorkflowProps {
     story : any;
     createFreshBatch : (e : string) => any;
     getBatches : () => any;
     getBatchExport : (batchId : string) => any;
-    importBatchFromCsv : (storyId : string, batchId : string, batchName : string, csvFile : File, accessKey : string, compId : string, embed : boolean) => any;
+    importBatchFromCsv : (storyId : string, batchId : string, batchName : string, csvFile : File, accessKey : string, compId : string, embed : boolean, addMedia : boolean) => any;
     renderBatch : (batchId : string, batchName : string) => any;
     status : string;
     accessKey : string;
@@ -126,7 +126,7 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
 
     private importBatch({story_id, id, name, uploadEvt}) {
         const {accessKey, compositionId, isExport, handleError} = this.props;
-        this.props.importBatchFromCsv(story_id, id, name, uploadEvt.target.files[0], accessKey, compositionId, !isExport)
+        this.props.importBatchFromCsv(story_id, id, name, uploadEvt.target.files[0], accessKey, compositionId, !isExport, isExport)
             .then(() => {
                 this.setState({uploadComplete: true, uploading: false});
                 if (isExport) {
@@ -179,12 +179,12 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
         const {renderedBatch, selectedBatchId, uploading, uploadComplete} = this.state;
         if (isExport && uploadComplete && !renderedBatch) {
             return (
-                <span className={'progress-bar'}>
+                <div className={'progress-bar'}>
                     <progress
                         max = {EmailWorkflow.PROGRESS_MAX_VALUE}
                         value = {batchJobs.renders[selectedBatchId]}
                     />
-                </span>
+                </div>
             );
         }
         if (uploading) {

package/constants/copy.ts

@@ -150,6 +150,9 @@ export const publish = {
     // api
     btnAPI: 'API integration',
 
+    // export
+    btnExport: 'Export',
+
     // global
     btnPublish: 'Publish',
     btnSkip: 'Skip',