@capillarytech/creatives-library 2.0.50 → 2.0.52

package/components/FormBuilder/index.js

@@ -1746,7 +1746,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
 
 
     this.setState({formData}, () => {
-      this.validateForm();
+      if (this.props.startValidation) {
+        this.validateForm();
+      }
     });
     if (event && val.injectedEvents[event]) {
       if (event === "onRowClick") {

package/containers/CreativesContainer/SlideBoxContent.js

@@ -39,7 +39,7 @@ function SlideBoxContent(props) {
       setIsLoadingContent,
     } = props;
   const type = messageDetails.type.toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
-  const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'defualt' : 'library', isLanguageSupport: true};
+  const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'defualt' : 'library'};
   const creativesLocationProps = {
     pathname: `/sms/edit`,
     query,
@@ -117,6 +117,8 @@ function SlideBoxContent(props) {
         )}
       {isEmailCreate && (
       <EmailWrapper
+        key="creatives-email-wrapper"
+        date={new Date().getMilliseconds()}
         setIsLoadingContent={setIsLoadingContent}
         onEmailModeChange={onEmailModeChange}
         emailCreateMode={emailCreateMode}

package/containers/CreativesContainer/SlideBoxHeader.js

@@ -8,7 +8,7 @@ const PrefixWrapper = styled.div`
   margin-right: 16px;
 `;
 function SlideBoxHeader(props) {
-  const { slidBoxContent, messages, templateData, onShowTemplates, creativesMode, isFullMode } = props;
+  const { slidBoxContent, messages, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix } = props;
   return (
     <div>
       {slidBoxContent === 'templates' && (
@@ -33,7 +33,7 @@ function SlideBoxHeader(props) {
       {slidBoxContent === 'editTemplate' && (
       <CapHeader
         title={<FormattedMessage {...messages.editMessageContent} />}
-        prefix={creativesMode !== 'edit' && !isFullMode &&
+        prefix={creativesMode !== 'edit' && !isFullMode && showPrefix &&
           <PrefixWrapper>
             <CapIcons.backIcon onClick={onShowTemplates} />
           </PrefixWrapper>
@@ -43,7 +43,7 @@ function SlideBoxHeader(props) {
       {slidBoxContent === 'createTemplate' && (
       <CapHeader
         title={<FormattedMessage {...messages.createMessageContent} />}
-        prefix={!isFullMode &&
+        prefix={!isFullMode && showPrefix &&
           <PrefixWrapper>
             <CapIcons.backIcon onClick={onShowTemplates} />
           </PrefixWrapper>
@@ -60,5 +60,6 @@ SlideBoxHeader.propTypes = {
   onShowTemplates: PropTypes.func,
   creativesMode: PropTypes.string,
   isFullMode: PropTypes.bool,
+  showPrefix: PropTypes.bool,
 };
 export default SlideBoxHeader;

package/containers/CreativesContainer/index.js

@@ -224,8 +224,8 @@ class Creatives extends React.Component {
     return isShowContinueFooter;
   }
   render() {
-    const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep} = this.state;
-    const {isFullMode, creativesMode, cap} = this.props;
+    const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent} = this.state;
+    const {isFullMode, creativesMode, cap, isUploading} = this.props;
     return (
       <div className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'}`)}>
         <CapSlideBox
@@ -237,6 +237,8 @@ class Creatives extends React.Component {
               onShowTemplates={this.onShowTemplates}
               creativesMode={creativesMode}
               isFullMode={isFullMode}
+              isLoadingContent={isLoadingContent}
+              showPrefix={!isUploading} // not show back button when email template is being uploaded
             />
           }
           content={

package/containers/Email/actions.js

@@ -78,3 +78,9 @@ export function uploadAsset(file, assetType, fileParams) {
     fileParams,
   };
 }
+
+export function resetCmsData() {
+  return {
+    type: types.RESET_CMS_EDITOR_DATA,
+  };
+}

package/containers/Email/constants.js

@@ -23,6 +23,7 @@ export const GET_CMS_EDITOR_DETAILS_FAILURE = 'app/containers/Email/GET_CMS_EDIT
 export const GET_CMS_EDITOR_DATA_REQUEST = 'app/containers/Email/GET_CMS_EDITOR_DATA_REQUEST';
 export const GET_CMS_EDITOR_DATA_SUCCESS = 'app/containers/Email/GET_CMS_EDITOR_DATA_SUCCESS';
 export const GET_CMS_EDITOR_DATA_FAILURE = 'app/containers/Email/GET_CMS_EDITOR_DATA_FAILURE';
+export const RESET_CMS_EDITOR_DATA = 'app/containers/Email/RESET_CMS_EDITOR_DATA';
 
 export const UPLOAD_ASSET_REQUEST = 'app/containers/Email/UPLOAD_ASSET_REQUEST';
 export const UPLOAD_ASSET_SUCCESS = 'app/containers/Email/UPLOAD_ASSET_SUCCESS';

package/containers/Email/index.js

@@ -310,6 +310,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         this.startTemplateCreation(nextProps.templateData);
       }
       if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
+        if (!_.isEmpty(this.props.Email.cmsData)) {
+          this.props.actions.resetCmsData();
+        }
         this.getFormData();
       }
 
@@ -1315,7 +1318,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           this.validateContent(e);
           break;
         case "Save result: success":
-          this.handleEdmSave();
+          if (_.isEmpty(this.props.Email.cmsData)) {
+            this.handleEdmSave();
+          }
           break;
         case "JsonChanged":
           this.edmEvent = e;
@@ -2666,4 +2671,4 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Email)));
+export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Email)));

package/containers/Email/reducer.js

@@ -95,6 +95,9 @@ function emailReducer(state = initialState, action) {
         .set('cmsData', '')
         .set('langId', undefined)
         .set('fetchingCmsDataFailed', false);
+    case types.RESET_CMS_EDITOR_DATA:
+      return state
+        .set('cmsData', '');
     case types.GET_CMS_EDITOR_DATA_SUCCESS:
       return state
         .set('fetchingCmsData', false)

package/containers/EmailWrapper/index.js

@@ -25,7 +25,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       templateName: '',
       routeParams: {
         pathname: `/email/create`,
-        query: { module: 'library', type: 'embedded', isEdmSupport: true},
+        query: { module: 'library', type: 'embedded'},
       },
       modeContent: {
 
@@ -93,35 +93,36 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
     CapNotification.error(message);
   }
   handleFileUpload = (file) => {
-    const { templatesActions, intl, showNextStep } = this.props;
-    const validUpload = false;
-    const fileExtension = file.name.split('.').pop();
-    const supportedZipFormats = ['zip'];
+    const { templatesActions, intl, showNextStep, isUploading } = this.props;
+    if (!isUploading) {
+      const fileExtension = file.name.split('.').pop();
+      const supportedZipFormats = ['zip'];
 
 
-    if (supportedZipFormats.indexOf(fileExtension.toLowerCase()) !== -1) {
-      templatesActions.handleZipUpload(file.originFileObj, () => { //handle upload success
-        this.setState({modeContent: { file}}, showNextStep);
-      }, this.handleZipUploadError);
-    } else if (fileExtension === 'html' || fileExtension === 'htm') {
-      const reader = new FileReader();
-      reader.onload = () => {
-        const text = reader.result;
-        this.setState({modeContent: { file}}, () => {
-          templatesActions.handleHtmlUpload(text);
-        });
+      if (supportedZipFormats.indexOf(fileExtension.toLowerCase()) !== -1) {
+        templatesActions.handleZipUpload(file.originFileObj, () => { //handle upload success
+          this.setState({modeContent: { file}}, showNextStep);
+        }, this.handleZipUploadError);
+      } else if (fileExtension === 'html' || fileExtension === 'htm') {
+        const reader = new FileReader();
+        reader.onload = () => {
+          const text = reader.result;
+          this.setState({modeContent: { file}}, () => {
+            templatesActions.handleHtmlUpload(text);
+          });
 
-        // showNextStep();
-      };
-      reader.readAsText(file.originFileObj);
-    } else {
-      const message = {
-        message: intl.formatMessage(messages.invalidUploadFileError),
-        description: intl.formatMessage(messages.invalidUploadFileErrorDesc),
-      };
-      CapNotification.error(message);
+          // showNextStep();
+        };
+        reader.readAsText(file.originFileObj);
+      } else {
+        const message = {
+          key: "email-upload-error",
+          message: intl.formatMessage(messages.invalidUploadFileError),
+          description: intl.formatMessage(messages.invalidUploadFileErrorDesc),
+        };
+        CapNotification.error(message);
+      }
     }
-    return validUpload;
   };
 
   handleEdmDefaultTemplateSelection = (id) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "2.0.50",
+  "version": "2.0.52",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",