@capillarytech/creatives-library 2.0.23 → 2.0.24

package/containers/CreativesContainer/SlideBoxContent.js

@@ -42,11 +42,13 @@ function SlideBoxContent(props) {
   let isEmailEditWithContent = false;
   let isPreview = false;
   let isEmailPreview = false;
+  //let isEmailCreate = false;
   let channel = currentChannel;//for create mode
   if (templateData && channel) {
     channel = templateData.type;// for edit mode with template data
     isEditSms = slidBoxContent === 'editTemplate' && channel === constants.SMS;
     isCreateSms = slidBoxContent === 'createTemplate' && channel === constants.SMS;
+    //isEmailCreate = slidBoxContent === 'createTemplate' && channel === constants.EMAIL;
     isEditEmailWithId = slidBoxContent === 'editTemplate' && channel === constants.EMAIL && templateData._id;
     isEmailEditWithContent = slidBoxContent === 'editTemplate' && channel === constants.EMAIL && !templateData._id;
     isPreview = slidBoxContent === 'preview' && channel !== constants.EMAIL;
@@ -76,7 +78,7 @@ function SlideBoxContent(props) {
       {isEmailPreview && (
         <EmailPreviewV2
           templateData={templateData}
-        />
+         />
       )
       }
       {isEditSms && (
@@ -99,7 +101,7 @@ function SlideBoxContent(props) {
         getDefaultTags={type}
           />
         )}
-      {isEditEmailWithId && (
+      {(isEditEmailWithId || isEmailEditWithContent) && (
       <Email
         location={{
           pathname: `/email`,
@@ -114,21 +116,6 @@ function SlideBoxContent(props) {
         getDefaultTags={type}
           />
         )}
-      {isEmailEditWithContent && (
-      <Email
-        location={{
-          pathname: `/email`,
-          query,
-        }}
-        route={{ name: 'email' }}
-        isGetFormData={isGetFormData}
-        getFormdata={getFormData}
-        params={{ id: templateData._id }}
-        templateData={templateData}
-        getFormSubscriptionData={getFormData}
-        getDefaultTags={type}
-      />
-        )}
     </CreativesWrapper>
   );
 }

package/containers/Email/index.js

@@ -1005,21 +1005,23 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
       if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && !_.isEqual(this.props.metaEntities.tags, nextProps.metaEntities.tags)) {
         let injectedTags = _.cloneDeep(this.state.injectedTags);
-        delete injectedTags["Registration custom fields"];
-        delete injectedTags["Store custom fields"];
-        delete injectedTags["Transaction custom fields"];
-        injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-        console.log('new injected tags', nextProps.metaEntities.tags.custom);
-        if (!_.has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
+        if (!_.isEmpty(injectedTags)) {
           delete injectedTags["Registration custom fields"];
-        }
-        if (!_.has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
           delete injectedTags["Store custom fields"];
-        }
-        if (!_.has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
           delete injectedTags["Transaction custom fields"];
+          injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
+          console.log('new injected tags', nextProps.metaEntities.tags.custom);
+          if (!_.has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
+            delete injectedTags["Registration custom fields"];
+          }
+          if (!_.has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
+            delete injectedTags["Store custom fields"];
+          }
+          if (!_.has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
+            delete injectedTags["Transaction custom fields"];
+          }
+          this.setState({injectedTags});
         }
-        this.setState({injectedTags});
       }
 
       if ( !_.isEqual(nextProps.Email.uploadAssetSuccess, this.props.Email.uploadAssetSuccess) && nextProps.Email.uploadAssetSuccess) {

package/containers/TagList/index.js

@@ -38,7 +38,9 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   componentWillReceiveProps(nextProps) {
-    console.log('tag next props', nextProps.injectedTags, this.props.injectedTags);
+    if (_.isEmpty(this.props.injectedTags) && _.isEmpty(this.props.tags)) {
+      this.setState({loading: true});
+    }
     if (!_.isEqual(nextProps.injectedTags, this.props.injectedTags)) {
       console.log('received new tags', nextProps);
       this.setState({loading: false});
@@ -177,7 +179,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   render() {
-    console.log('tags props 2', this.props);
     let tags = {};
     let injectedTags = {};
     if (this.props.injectedTags && !_.isEmpty(this.props.injectedTags)) {
@@ -190,7 +191,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     }
     tags = _.merge( {}, tags, injectedTags);
     console.log('merged tags', tags);
-        // console.log('tag list', this.renderTags(tags));
     return (
       <div className={this.props.className ? this.props.className : ''}>
         <CapTagList

package/package.json

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