@capillarytech/creatives-library 0.1.16 → 0.1.18

package/containers/Templates/index.js

@@ -117,7 +117,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   componentDidMount() {
-    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === "library") {
+    if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
       this.setLocale();
     }
     if (this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && !_.isEmpty(this.props.Templates.selectedWeChatAccount))) {
@@ -194,7 +194,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === "mobilepush" && nextProps.Templates.selectedWeChatAccount) {
       params.accountId = nextProps.Templates.selectedWeChatAccount.id;
     }
-    if ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && _.isEmpty(nextProps.Templates.selectedWeChatAccount) && (this.props.location.query.type === 'embedded')) {
+    if ((this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === 'mobilepush') && _.isEmpty(nextProps.Templates.selectedWeChatAccount) && (this.props.location.query.type === 'embedded') && !this.isEnabledInLibraryModule("showAccountSelection")) {
       let selectedAccount = '';
       if (_.isEmpty(nextProps.Templates.weCrmAccounts)) {
         return;
@@ -283,7 +283,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       const isLanguageSupport = (this.props.location.query.isLanguageSupport) ? this.props.location.query.isLanguageSupport : true;
       const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
       const type = this.props.location.query.type;
-      if (module && module === 'library') {
+      if (this.isEnabledInLibraryModule("callCreateFromProps")) {
         this.props.createNew();
         return;
       }
@@ -508,7 +508,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         this.props.actions.handleHtmlUpload(text);
         document.getElementById("filename").value = "";
         const type = this.props.location.query.type;
-        if (type === 'embedded' && module === "library") {
+        if (this.isEnabledInLibraryModule("callCreateFromProps")) {
           this.props.createNew();
           return;
         }
@@ -693,7 +693,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   createTemplate(ev) {
     const type = this.props.location.query.type;
     const module = this.props.location.query.module ? this.props.location.query.module : 'default';
-    if (this.props.location.query.module === 'library') {
+    if (this.isEnabledInLibraryModule("callCreateFromProps")) {
       this.props.createNew();
     } else if (ev.key && (ev.key.toLowerCase() === "text" || ev.key.toLowerCase() === "image")) {
       this.props.router.push({
@@ -827,7 +827,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       } else {
         getQuery = (type === 'embedded') ? {type: 'embedded', module} : {module};
       }
-      if (type === 'embedded' && module === "library") {
+      if (this.isEnabledInLibraryModule("callCreateFromProps")) {
         this.props.createNew();
         return;
       }
@@ -864,7 +864,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === 'ebill') {
       pathName = `/ebill/edit/${id}`;
     }
-    if (module && module === 'library') {
+    if (this.isEnabledInLibraryModule("callSelectFromProps")) {
       this.props.onSelectTemplate(id);
     } else {
       if (this.state.channel.toLowerCase() === 'ebill') {
@@ -1131,6 +1131,25 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     </Modal>);
     return modal;
   };
+  //Gets called only when creatives gets used as node library
+  isEnabledInLibraryModule = (property) => {
+    if (this.props.location.query.type === "embedded" && this.props.location.query.module === "library") {
+      switch (property) {
+        case "showAccountSelection":
+          return (this.props.route && (this.props.route.name.toLowerCase() === "wechat" || this.props.route.name.toLowerCase() === "mobilepush"));
+        case "setLocale":
+          return true;
+        case "callCreateFromProps":
+          return true;
+        case "callSelectFromProps":
+          return true;
+        default:
+          return false;
+      }
+    } else {
+      return false;
+    }
+  }
 
   render() {
     console.log('templates props', this.props);
@@ -1232,7 +1251,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const pageHeader = (
       <div>
         {(this.props.location.query.type !== 'embedded') ? `${pageHeaderText}` : templateText}
-        {((this.state.channel.toUpperCase() === 'WECHAT' || this.state.channel.toUpperCase() === "MOBILEPUSH") && (this.props.location.query.type !== 'embedded') && !_.isEmpty(this.props.Templates.weCrmAccounts)) &&
+        {(this.isEnabledInLibraryModule("showAccountSelection") || (((this.state.channel.toUpperCase() === 'WECHAT' || this.state.channel.toUpperCase() === "MOBILEPUSH") && (this.props.location.query.type !== 'embedded') && !_.isEmpty(this.props.Templates.weCrmAccounts)))) &&
           <Select className="selectAccount" onSelect={this.onAccountSelect} value={this.props.Templates.selectedWeChatAccount ? this.props.Templates.selectedWeChatAccount.name : undefined} placeholder={this.props.intl.formatMessage(messages.selectAccount)}>
             {accountOptions}
           </Select>}

package/containers/WeChat/index.js

@@ -433,6 +433,9 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
   }
 
   componentWillReceiveProps(nextProps) {
+    if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
+      this.getFormData();
+    }
     console.log('MetaEntity nextprops ', nextProps.metaEntities);
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.schema)) {
       this.injectEvents(nextProps.metaEntities.layouts[0].definition);
@@ -465,6 +468,11 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
           }
         });
       }
+      if (nextProps.location.query.type === "embedded" && nextProps.location.query.module === "library" && nextProps.templateData && nextProps.templateData.versions) { // Edit of already added message in library mode
+        this.setState({editTemplateData: nextProps.templateData}, () => {
+          this.setEditData();
+        });
+      }
       if (nextProps.params.id && !_.isEqual(nextProps.params.id, this.props.params.id)) {
         this.setState({isEdit: true});
       }
@@ -616,7 +624,7 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
           }
         });
       }
-    } else if (this.state.isEdit) {
+    } else if (this.state.isEdit && this.state.editTemplateData.versions) {
       console.log('this.state.editTemplateData', this.state.editTemplateData);
       selectedTemplateData = _.cloneDeep(this.state.editTemplateData);
       selectedTemplate = {
@@ -716,7 +724,11 @@ export class WeChat extends React.Component { // eslint-disable-line react/prefe
     };
     console.log('response ', response);
     this.setState({checkValidation: true});
-    e.source.postMessage(JSON.stringify(response), e.origin);
+    if (this.props.location.query.module === 'library') {
+      this.props.getLibraryFormData(response);
+    } else {
+      e.source.postMessage(JSON.stringify(response), e.origin);
+    }
   }
 
   getCurrentWindow(e) {
@@ -1579,6 +1591,8 @@ WeChat.propTypes = {
   params: PropTypes.object,
   metaEntities: PropTypes.object,
   intl: intlShape.isRequired,
+  isGetFormData: PropTypes.bool,
+  getLibraryFormData: PropTypes.func,
 };
 
 const mapStateToProps = createStructuredSelector({

package/index.js

@@ -7,4 +7,4 @@ export Email from './containers/Email/index';
 export TagList from './containers/TagList/index';
 export TemplatePreview from './components/TemplatePreview';
 export EmailPreview from './components/EmailPreview';
-
+export WeChat from './containers/WeChat';

package/package.json

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