@capillarytech/creatives-library 3.1.34 → 3.1.36

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -143,12 +143,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       if (_.has(val, 'subtags')) {
         const temp = this.renderTags(val.subtags);
         list.push((
-          <CapTreeNode title={val.name} key={key}>
+          <CapTreeNode title={val.name} tag={val} key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}>
             {temp}
           </CapTreeNode>
         ));
       } else if (searchString === '' || !searchString || val.name.toLowerCase().indexOf(searchString.toLowerCase()) !== -1) {
-        const tempNode = (<CapTreeNode title={val.name} isLeaf key={key}></CapTreeNode>);
+        const tempNode = (<CapTreeNode title={val.name} tag={val} isLeaf key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}></CapTreeNode>);
         list.push(tempNode);
       }
     });

package/v2Components/FormBuilder/index.js

@@ -997,7 +997,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   }
 
   skipTags(tag) {
-    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN"];
+    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN","^[A-Za-z].*\\([\\d]*\\)"];
 
     //const regexGroups = [];
     let skipped = false;
@@ -2312,6 +2312,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 className={val.className ? val.className : ''}
                 id={val.id}
                 userLocale={this.props.userLocale}
+                selectedOfferDetails={this.props.selectedOfferDetails}
               />
             </CapColumn>
           );
@@ -2796,6 +2797,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   className={val.className ? val.className : ''}
                   id={val.id}
                   userLocale={this.props.userLocale}
+                  selectedOfferDetails={this.props.selectedOfferDetails}
                 />
               </CapColumn>
             );
@@ -3343,6 +3345,7 @@ FormBuilder.propTypes = {
   stopValidation: PropTypes.func,
   handleDelete: PropTypes.func,
   intl: intlShape.isRequired,
+  selectedOfferDetails: PropTypes.array,
 };
 
 export default injectIntl(FormBuilder);

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -60,6 +60,7 @@ function SlideBoxContent(props) {
       onValidationFail,
       channelsToHide,
       forwardedTags,
+      selectedOfferDetails,
       channelsToDisable,
       weChatTemplateType,
       onWechatTemplateChange,
@@ -176,6 +177,7 @@ function SlideBoxContent(props) {
           getDefaultTags={type}
           templateData={templateData}
           forwardedTags={forwardedTags}
+          selectedOfferDetails={selectedOfferDetails}
         />
       )}
       {
@@ -206,6 +208,7 @@ function SlideBoxContent(props) {
         getDefaultTags={type}
         isFullMode={isFullMode}
         forwardedTags={forwardedTags}
+        selectedOfferDetails={selectedOfferDetails}
       />
         )}
       {isEmailCreate && (
@@ -325,6 +328,7 @@ SlideBoxContent.propTypes = {
   onValidationFail: PropTypes.func,
   channelsToHide: PropTypes.array,
   forwardedTags: PropTypes.object,
+  selectedOfferDetails: PropTypes.array,
   channelsToDisable: PropTypes.array,
   weChatTemplateType: PropTypes.string,
   onWechatTemplateChange: PropTypes.func,

package/v2Containers/CreativesContainer/index.js

@@ -465,7 +465,7 @@ class Creatives extends React.Component {
   }
   render() {
     const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage, weChatTemplateType, weChatMaptemplateStep} = this.state;
-    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable} = this.props;
+    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails} = this.props;
     const mapTemplateCreate = slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
     return (
       <SlideBoxWrapper className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'} ${mapTemplateCreate ? 'map-template-create' : ''}`)}>
@@ -522,6 +522,7 @@ class Creatives extends React.Component {
               onValidationFail={this.onValidationFail}
               channelsToHide={channelsToHide}
               forwardedTags={forwardedTags}
+              selectedOfferDetails={selectedOfferDetails}
               channelsToDisable={channelsToDisable}
               weChatTemplateType={weChatTemplateType}
               onWechatTemplateChange={this.onWechatTemplateChange}
@@ -574,6 +575,7 @@ Creatives.propTypes = {
   EmailLayout: PropTypes.string,
   channelsToHide: PropTypes.array,
   forwardedTags: PropTypes.object,
+  selectedOfferDetails: PropTypes.array,
   channelsToDisable: PropTypes.array,
   selectedWeChatAccount: PropTypes.object,
 };

package/v2Containers/Sms/Create/index.js

@@ -970,6 +970,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 router={this.props.router}
                 startValidation={this.state.startValidation}
                 stopValidation={this.stopValidation}
+                selectedOfferDetails={this.props.selectedOfferDetails}
               />
             </CapColumn>
           </CapRow>
@@ -995,6 +996,7 @@ Create.propTypes = {
   isFullMode: PropTypes.bool,
   getFormSubscriptionData: PropTypes.func,
   isLoadingMetaEntities: PropTypes.bool,
+  selectedOfferDetails: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Sms/Edit/index.js

@@ -966,6 +966,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 router={this.props.router}
                 startValidation={this.state.startValidation}
                 stopValidation={this.stopValidation}
+                selectedOfferDetails={this.props.selectedOfferDetails}
               />
             </CapColumn>
           </CapRow>
@@ -994,6 +995,7 @@ Edit.propTypes = {
   setIsLoadingContent: PropTypes.func,
   // route: PropTypes.object,
   injectedTags: PropTypes.object,
+  selectedOfferDetails: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/TagList/index.js

@@ -31,6 +31,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     this.populateTags = this.populateTags.bind(this);
     this.populateTagForChildren = this.populateTagForChildren.bind(this);
     this.transformInjectedTags = this.transformInjectedTags.bind(this);
+    this.transformCouponTags = this.transformCouponTags.bind(this);
   }
 
   componentDidMount() {
@@ -138,6 +139,34 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     return tagsObject[tagValue];
   }
 
+  transformCouponTags(offerDetails, allTags) {
+    const couponTags = {};
+    offerDetails.forEach((offer) => {
+      const { id, couponName } = offer;
+      const couponTagsKeys = (allTags.coupon && allTags.coupon.subtags && Object.keys(allTags.coupon.subtags)) || [];
+      const couponSubTags = {};
+      couponTagsKeys.forEach((couponTagKey) => {
+        const couponSubTagsObj = {
+          ...allTags.coupon.subtags[couponTagKey],
+          couponSeriesId: id,
+        };
+        couponSubTags[couponTagKey] = couponSubTagsObj;
+      });
+      const key = couponName || id;
+      couponTags[key] = {
+        'tag-header': true,
+        'name': couponName || id,
+        'desc': couponName || id,
+        'couponSeriesId': id,
+        'subtags': couponSubTags,
+        'resolved': true,
+        'couponTags': true,
+      };
+    });
+    // eslint-disable-next-line no-param-reassign
+    allTags.coupon.subtags = couponTags;
+  }
+
   transformInjectedTags(tags) {
     _.forEach(tags, (tag) => {
       const temp = tag;
@@ -189,6 +218,9 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       tags = this.populateTags(this.props.tags);
       console.log('populating tags', tags);
     }
+    if (this.props.selectedOfferDetails && !_.isEmpty(this.props.selectedOfferDetails) && (tags && tags.coupon)) {
+      this.transformCouponTags(this.props.selectedOfferDetails, tags);
+    }
     tags = _.merge( {}, tags, injectedTags);
     console.log('merged tags', tags);
     return (
@@ -220,6 +252,7 @@ TagList.propTypes = {
   moduleFilterEnabled: PropTypes.bool,
   className: PropTypes.string,
   userLocale: PropTypes.string,
+  selectedOfferDetails: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/TemplatesV2/index.js

@@ -78,7 +78,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       selectedChannel: defaultChannel,
       panes,
     };
-    this.props.onChannelChange(defaultChannel);
+    !props.isFullMode && this.props.onChannelChange(defaultChannel);
   }
   componentWillReceiveProps(nextProps) {
     if (this.props.channel !== nextProps.channel) {

package/v2Containers/TemplatesV2/_templatesV2.scss

@@ -1,5 +0,0 @@
-.cap-tab-v2-wrapper{
-    .ant-tabs-tabpane {
-        border: none;
-    }
-}