@capillarytech/creatives-library 0.1.18 → 0.1.20

package/components/FormBuilder/index.js

@@ -939,7 +939,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   }
 
   skipTags(tag) {
-    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "user_id_b64", "outbox_id_b64", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]"];
+    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]"];
 
     //const regexGroups = [];
     let skipped = false;

package/containers/Email/index.js

@@ -772,6 +772,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
           embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
         };
+        if (this.props.getDefaultTags) {
+          query.context = this.props.getDefaultTags;
+        }
         this.props.globalActions.fetchSchemaForEntity(query);
       }
       setTimeout(() => {
@@ -3129,7 +3132,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       loaderText = this.props.intl.formatMessage(messages.uploadingImage);
     }
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
-    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library') {
+    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
       tags = this.props.supportedTags;
     }
     return (
@@ -3247,7 +3250,7 @@ Email.propTypes = {
   isGetFormData: PropTypes.bool,
   getFormSubscriptionData: PropTypes.func,
   supportedTags: PropTypes.array,
-  getDefaultTags: PropTypes.bool,
+  getDefaultTags: PropTypes.string,
 };
 
 const mapStateToProps = createStructuredSelector({

package/containers/Sms/Create/index.js

@@ -154,6 +154,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
           embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
         };
+        if (this.props.getDefaultTags) {
+          query.context = this.props.getDefaultTags;
+        }
         this.props.globalActions.fetchSchemaForEntity(query);
         if (this.props.location.query.type === 'embedded') {
           this.showNext();
@@ -1406,8 +1409,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     const schema = this.state.schema;
     const spinning = this.state.loading || (this.props.Create && "createTemplateInProgress" in this.props.Create && this.props.Create.createTemplateInProgress);
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
-    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library') {
-      tags = this.props.supportedTags;
+    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
+      tags = this.props.supportedTags; // if get default tags is not present and supported tags is present use that inlbrary mode
     }
     return (
       <div>
@@ -1462,7 +1465,7 @@ Create.propTypes = {
   metaEntities: PropTypes.object,
   intl: intlShape.isRequired,
   supportedTags: PropTypes.array,
-  getDefaultTags: PropTypes.bool,
+  getDefaultTags: PropTypes.string,
 };
 
 const mapStateToProps = createStructuredSelector({

package/containers/Sms/Edit/index.js

@@ -134,6 +134,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
           embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
         };
+        if (this.props.getDefaultTags) {
+          query.context = this.props.getDefaultTags;
+        }
         this.props.globalActions.fetchSchemaForEntity(query);
         if (this.props.location.query.type === 'embedded') {
           this.showNext();
@@ -1387,7 +1390,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? this.props.intl.formatMessage(messages.saveTemplateLoader) : '';
     const spinning = this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
-    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library') {
+    if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
       tags = this.props.supportedTags;
     }
     return (
@@ -1445,7 +1448,7 @@ Edit.propTypes = {
   intl: intlShape.isRequired,
   templateData: PropTypes.object,
   supportedTags: PropTypes.array,
-  getDefaultTags: PropTypes.bool,
+  getDefaultTags: PropTypes.string,
   // route: PropTypes.object,
 };
 

package/containers/WeChat/index.js

@@ -468,11 +468,12 @@ 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();
-        });
-      }
+      // has to be un commented when wechat edit is implemented in embedded mode.
+      // 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});
       }

package/package.json

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