@capillarytech/creatives-library 3.1.40 → 3.1.42

package/containers/Templates/index.js

@@ -1344,7 +1344,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           className="search-text"
           style={{width: '210px'}}
           placeholder={this.props.intl.formatMessage(messages.searchText)}
-          prefix={<i className="material-icons" style={{ margin: '0', fontSize: '16px'}}>{this.props.intl.formatMessage(messages.search)}</i>}
+          prefix={<i className="material-icons" style={{ margin: '0', fontSize: '16px'}}>search</i>}
           value={this.state.searchText}
           onChange={(e) => this.searchTemplate(e.target.value)}
         />

package/containers/Templates/messages.js

@@ -118,10 +118,6 @@ export default defineMessages({
     id: 'creatives.containers.Templates.useEditor',
     defaultMessage: "Use Editor",
   },
-  "search": {
-    id: 'creatives.containers.Templates.search',
-    defaultMessage: "Search",
-  },
   "blankTemplate": {
     id: 'creatives.containers.Templates.blankTemplate',
     defaultMessage: "Blank template",

package/package.json

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

package/utils/smsCharCountV2.js

@@ -88,7 +88,7 @@ export function updateCharCount(content, isUnicodeEnabled) {
       break;
     }
   }
-  chars_used = showOptoutCount ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
+  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
   if (coding == '7bit') {
     if (chars_used > 160) {
       var parts = Math.ceil(chars_used / 153);

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -230,6 +230,7 @@ function SlideBoxContent(props) {
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
         forwardedTags={forwardedTags}
+        selectedOfferDetails={selectedOfferDetails}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -252,6 +253,7 @@ function SlideBoxContent(props) {
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
         forwardedTags={forwardedTags}
+        selectedOfferDetails={selectedOfferDetails}
       />
         )}
       {isEditMPush &&

package/v2Containers/CreativesContainer/index.js

@@ -467,6 +467,7 @@ class Creatives extends React.Component {
     const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage, weChatTemplateType, weChatMaptemplateStep} = this.state;
     const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails} = this.props;
     const mapTemplateCreate = slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
+    /* TODO: Instead of passing down same props separately to each component down, write common function to these props and pass it accordingly */
     return (
       <SlideBoxWrapper className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'} ${mapTemplateCreate ? 'map-template-create' : ''}`)}>
         <CapSlideBox

package/v2Containers/Email/index.js

@@ -2562,6 +2562,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     const previewHeader = (<h3>Email Preview</h3>);
     const imagePreviewHeader = (<h3>Image Selection</h3>);
     const imagePreviewContent = this.getImagePreviewContent();
+    const { selectedOfferDetails } = this.props;
     if (!this.props.currentOrgDetails || !this.props.currentOrgDetails.basic_details) {
       return (<div>Loading...</div>);
     }
@@ -2617,6 +2618,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   getValidationData={this.saveValidationData}
                   saveForm={this.state.saveForm}
                   stopValidation={this.stopValidation}
+                  selectedOfferDetails={selectedOfferDetails}
               /> : ''}
             </Col>
           </Row>
@@ -2669,6 +2671,7 @@ Email.propTypes = {
   defaultData: PropTypes.object,
   showTemplateName: PropTypes.func,
   onValidationFail: PropTypes.func,
+  selectedOfferDetails: PropTypes.array,
 };
 
 const mapStateToProps = (state, props) => createStructuredSelector({

package/v2Containers/EmailWrapper/index.js

@@ -173,6 +173,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       setIsLoadingContent,
       onValidationFail,
       forwardedTags,
+      selectedOfferDetails,
     } = this.props;
     const {
       templateName,
@@ -232,6 +233,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 showTemplateName={showTemplateName}
                 onValidationFail={onValidationFail}
                 forwardedTags={forwardedTags}
+                selectedOfferDetails={selectedOfferDetails}
               />}
               {CmsTemplates && !isShowEmailCreate && <CmsTemplatesComponent cmsTemplates={CmsTemplates} handleEdmDefaultTemplateSelection={this.useEditor} />}
             </div>
@@ -263,6 +265,7 @@ EmailWrapper.propTypes = {
   showTemplateName: PropTypes.func,
   onValidationFail: PropTypes.func,
   forwardedTags: PropTypes.object,
+  selectedOfferDetails: PropTypes.array,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/TagList/index.js

@@ -141,15 +141,25 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
 
   transformCouponTags(offerDetails, allTags) {
     const couponTags = {};
+    const couponTagsKeys = Object.keys(_.get(allTags, 'coupon.subtags', []));
+    const withCouponId = (obj, id) => {
+      const tempObj = {};
+      if (obj.subtags) {
+        tempObj.subtags = _.mapValues(obj.subtags, (tag) => ({
+          ...withCouponId(tag, id),
+        }));
+      }
+      return {
+        ...obj,
+        ...tempObj,
+        couponSeriesId: id,
+      };
+    };
     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,
-        };
+        const couponSubTagsObj = withCouponId(allTags.coupon.subtags[couponTagKey], id);
         couponSubTags[couponTagKey] = couponSubTagsObj;
       });
       const key = couponName || id;

package/containers/Cap/messsages.js

@@ -1,63 +0,0 @@
-import { defineMessages } from 'react-intl';
-export default defineMessages({
-  "sms": {
-    id: 'reon.components.Cap.sms',
-    defaultMessage: 'SMS',
-  },
-  "wechat": {
-    id: 'reon.components.Cap.wechat',
-    defaultMessage: 'WeChat',
-  },
-  "gallery": {
-    id: 'reon.components.Cap.gallery',
-    defaultMessage: 'Gallery',
-  },
-  "creativesDashboard": {
-    id: 'reon.components.Cap.creativesDashboard',
-    defaultMessage: 'Creatives',
-  },
-  "creatives": {
-    id: 'reon.components.Cap.creatives',
-    defaultMessage: 'Creatives',
-  },
-  "campaigns": {
-    id: 'reon.components.Cap.campaigns',
-    defaultMessage: 'Campaigns',
-  },
-  "loyalty": {
-    id: 'reon.components.Cap.loyalty',
-    defaultMessage: 'Loyalty',
-  },
-  "member care": {
-    id: 'reon.components.Cap.memberCare',
-    defaultMessage: 'Member Care',
-  },
-  "workbench": {
-    id: 'reon.components.Cap.Workbench',
-    defaultMessage: 'WorkBench',
-  },
-  "store care": {
-    id: 'reon.components.Cap.storeCare',
-    defaultMessage: 'Store Care',
-  },
-  "store performance": {
-    id: 'reon.components.Cap.storePerformance',
-    defaultMessage: 'Store Performance',
-  },
-  "email": {
-    id: 'reon.components.Cap.email',
-    defaultMessage: 'Email',
-  },
-  "ebill": {
-    id: 'reon.components.Cap.ebill',
-    defaultMessage: 'Ebill',
-  },
-  "campaignsDashboard": {
-    id: 'reon.components.campaignsDashboard',
-    defaultMessage: 'Campaigns',
-  },
-  "campaignsHome": {
-    id: 'reon.components.campaignsHome',
-    defaultMessage: "Campaigns Home",
-  },
-});

package/v2Components/Header/index.js

@@ -1,46 +0,0 @@
-/**
-*
-* Header
-*
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-// import styled from 'styled-components';
-import { FormattedMessage } from 'react-intl';
-
-import { CapRow, CapColumn, CapInput, CapButton } from '@capillarytech/cap-ui-library';
-import messages from './messages';
-
-
-function Header(props) {
-  return (
-    <div>
-      <CapRow className="template-form-header">
-        <CapColumn span={10}>
-          <CapInput id="template-name" placeholder="Enter template name*" defaultValue={props.templateName} type="input" onChange={props.templateNameHandler}/>
-        </CapColumn>
-        <CapColumn span={2} offset={8}>
-          <CapButton id="preview-button" type="cancel" onClick={props.previewHandler}> <FormattedMessage {...messages.preview} /> </CapButton>
-        </CapColumn>
-        <CapColumn span={2}>
-          <CapButton id="cancel-button" type="cancel" onClick={props.cancelHandler}> <FormattedMessage {...messages.cancel} /> </CapButton>
-        </CapColumn>
-        <CapColumn span={2}>
-          <CapButton id="save-button" type="primary" onClick={props.saveHandler}> <FormattedMessage {...messages.save} /> </CapButton>
-        </CapColumn>
-      </CapRow>
-    </div>
-  );
-}
-
-Header.propTypes = {
-  templateNameHandler: PropTypes.func,
-  previewHandler: PropTypes.func,
-  cancelHandler: PropTypes.func,
-  saveHandler: PropTypes.func,
-  templateName: PropTypes.string,
-};
-
-export default Header;

package/v2Components/Header/tests/index.test.js

@@ -1,10 +0,0 @@
-// import React from 'react';
-// import { shallow } from 'enzyme';
-
-// import Header from '../index';
-
-describe('<Header />', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(false);
-  });
-});