@capillarytech/creatives-library 3.0.24 → 3.0.27

package/containers/Email/index.js

@@ -2638,22 +2638,20 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const formData = _.cloneDeep(this.state.formData);
       formData[0].selectedLanguages = [];
       let tabKey;
-      const isDragDrop = _.get(data, 'base.is_drag_drop');
       if (this.props.location.query.type === 'embedded' && (this.props.location.query.isLanguageSupport === undefined || this.props.location.query.isLanguageSupport === 'false')) {
-        formData['template-subject'] = _.get(data, 'base.subject', '');
+        formData['template-subject'] = data.base.subject ? data.base.subject : '';
         const baseLanguage = this.props.Global.currentOrgDetails.basic_details.base_language;
         let languageIndex = _.findIndex(this.supportedLanguages, {iso_code: baseLanguage});
         console.log("startTemplatecreation before index", languageIndex, this.supportedLanguages, baseLanguage, formData);
         if (languageIndex === -1) {
           languageIndex = 0;
         }
-        const isDragDrop = _.get(data, 'base.is_drag_drop');
         const tempData = {
-          "is_drag_drop": isDragDrop,
+          "is_drag_drop": data.base.is_drag_drop,
           "lang_id": this.supportedLanguages[languageIndex].lang_id,
           "iso_code": this.supportedLanguages[languageIndex].iso_code,
           "language": this.supportedLanguages[languageIndex].language,
-          "template-content": !isDragDrop && isDragDrop !== 1 ? _.get(data, 'base.html_content') : "",
+          "template-content": !data.base.is_drag_drop && data.base.is_drag_drop !== 1 ? data.base.html_content : "",
         };
         formData[0].base = true;
         formData[0].selectedLanguages.push(this.supportedLanguages[languageIndex].iso_code);
@@ -2702,7 +2700,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
       formData.base = _.cloneDeep(formData[0]);
       console.log('startTemplateCreation final ', formData);
-      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (isDragDrop !== 0 )}, () => {
+      this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
         // this.setState({tabKey: ''});
         _.forEach(formData[0].selectedLanguages, (language) => {
           if (formData[0][language].is_drag_drop) {

package/containers/Templates/index.js

@@ -222,15 +222,13 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             }
           }
         });
-        if (!_.isEmpty(selectedAccount)) {
-          this.setState({selectedAccount: selectedAccount.name}, () => {
-            params.wecrmId = selectedAccount.configs.wecrm_app_id;
-            params.wecrmToken = selectedAccount.configs.wecrm_token;
-            params.originalId = selectedAccount.sourceAccountIdentifier;
-            nextProps.actions.setWeChatAccount(selectedAccount);
-            this.getAllTemplates({params});
-          });
-        }
+        this.setState({selectedAccount: selectedAccount.name}, () => {
+          params.wecrmId = selectedAccount.configs.wecrm_app_id;
+          params.wecrmToken = selectedAccount.configs.wecrm_token;
+          params.originalId = selectedAccount.sourceAccountIdentifier;
+          nextProps.actions.setWeChatAccount(selectedAccount);
+          this.getAllTemplates({params});
+        });
       } else if (this.state.channel.toLowerCase() === 'mobilepush' && (nextProps.location.query.account_id || nextProps.location.query.source_account_id)) {
         _.forEach(nextProps.Templates.weCrmAccounts, (account) => {
           if ((nextProps.location.query.account_id && account.id === Number(nextProps.location.query.account_id)) || (nextProps.location.query.source_account_id && account.sourceAccountIdentifier && account.sourceAccountIdentifier === nextProps.location.query.source_account_id)) {

package/package.json

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

package/v2Components/EmailMobilePreview/index.js

@@ -25,7 +25,7 @@ import * as templateActions from '../../containers/Templates/actions';
 const deviceAspectRatio = {
   mobile: {
     height: "415",
-    width: "227",
+    width: "238",
   },
 };
 
@@ -93,9 +93,10 @@ class EmailMobilePreview extends React.Component {
                       </CapButton>
                       )}
                     <div className={"shell align-center"}>
-                      {emailSubjectLabel}
-                      <img src={mobileBody} alt="capillary" width="60%" />
+
+                      <img src={mobileBody} alt="capillary" width="270" />
                       <div className={`${messageContainerName} ${emailSubjectLabel ? 'with-subject' : ''}`}>
+                        {emailSubjectLabel}
                         <iframe srcDoc={templateContent} {...deviceAspectRatio.mobile} >
                           <p><FormattedMessage {...messages.noIframeSupport}/></p>
                         </iframe>

package/v2Components/EmailMobilePreview/index.scss

@@ -33,22 +33,39 @@ $classPrefix: email-mobile-preview-container;
     
             }
             .email-preview-container{
+              .shell {
+                position: relative;
+                -webkit-transform: unset;
+                transform: unset;
+                left: unset;
+                padding: unset;
+                width: unset;
+                display: flex;
+                justify-content: center;
+              }
               .email-subject-mobile {
-                position: absolute;
-                top: 11.5%;
-                left: 26%;
+                width: 227px;
+                text-align: left;
+                margin: 8px 0;
+                margin-left: 4px;
               }
+              // .mobile-message-container {
+              //   position: absolute;
+              //   top: 10.3%;
+              //   left: 24.8%;
+              //   overflow: auto;
+              //   display: -webkit-box;
+              //   display: -ms-flexbox;
+              //   display: flex;
+              //   &.with-subject {
+              //     top: 15%;
+              //   }
+              // }
               .mobile-message-container {
                 position: absolute;
                 top: 10.3%;
-                left: 24.8%;
-                overflow: auto;
-                display: -webkit-box;
-                display: -ms-flexbox;
-                display: flex;
-                &.with-subject {
-                  top: 15%;
-                }
+                height: 100%;
+                left: unset;
               }
             }
             padding: 0 0px 0 24px;