@capillarytech/creatives-library 3.1.28 → 3.1.29

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "3.1.28",
+  "version": "3.1.29",
   "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;
     }
   }
-  const actual_chars_used = showOptoutCount ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
+  chars_used = showOptoutCount ? (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);
@@ -147,6 +147,5 @@ export function updateCharCount(content, isUnicodeEnabled) {
     optouturlLength: (optoutUrl && optoutUrl.length) || 0,
     optoutUrlPresent: noOfOptout > 0,
     responseState,
-    actual_chars_used,
   };
 }

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -60,7 +60,6 @@ function SlideBoxContent(props) {
       onValidationFail,
       channelsToHide,
       forwardedTags,
-      channelsToDisable,
       weChatTemplateType,
       onWechatTemplateChange,
       selectedWeChatAccount,
@@ -114,7 +113,6 @@ function SlideBoxContent(props) {
         cap={cap}
         channelsToHide={channelsToHide}
         forwardedTags={forwardedTags}
-        channelsToDisable={channelsToDisable}
         />
         )}
       {isPreview && (
@@ -325,7 +323,6 @@ SlideBoxContent.propTypes = {
   onValidationFail: PropTypes.func,
   channelsToHide: PropTypes.array,
   forwardedTags: PropTypes.object,
-  channelsToDisable: PropTypes.array,
   weChatTemplateType: PropTypes.string,
   onWechatTemplateChange: PropTypes.func,
   selectedWeChatAccount: PropTypes.object,

package/v2Containers/CreativesContainer/index.js

@@ -463,7 +463,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} = this.props;
     return (
       <SlideBoxWrapper className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'}`)}>
         <CapSlideBox
@@ -519,7 +519,6 @@ class Creatives extends React.Component {
               onValidationFail={this.onValidationFail}
               channelsToHide={channelsToHide}
               forwardedTags={forwardedTags}
-              channelsToDisable={channelsToDisable}
               weChatTemplateType={weChatTemplateType}
               onWechatTemplateChange={this.onWechatTemplateChange}
               weChatMaptemplateStep={weChatMaptemplateStep}
@@ -571,7 +570,6 @@ Creatives.propTypes = {
   EmailLayout: PropTypes.string,
   channelsToHide: PropTypes.array,
   forwardedTags: PropTypes.object,
-  channelsToDisable: PropTypes.array,
   selectedWeChatAccount: PropTypes.object,
 };
 const mapStatesToProps = () => createStructuredSelector({

package/v2Containers/TemplatesV2/index.js

@@ -12,7 +12,6 @@ import { createStructuredSelector } from 'reselect';
 import { bindActionCreators } from 'redux';
 import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon } from '@capillarytech/cap-ui-library';
 import { find, get } from 'lodash';
-import isEmpty from 'lodash/isEmpty';
 import Helmet from 'react-helmet';
 
 import { UserIsAuthenticated } from '../../utils/authWrapper';
@@ -32,7 +31,7 @@ const StyledCapTab = withStyles(CapTab, CapTabStyle);
 export class TemplatesV2 extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
-    let defaultChannel = get(this, 'props.channel') || get(this, 'props.params.channel') || 'sms';
+    const defaultChannel = get(this, 'props.channel') || get(this, 'props.params.channel') || 'sms';
     const defaultPanes = {
       sms: {content: <div></div>, tab: props.intl.formatMessage(messages.sms), key: 'sms'},
       email: {content: <div></div>, tab: props.intl.formatMessage(messages.email), key: 'email'},
@@ -41,8 +40,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       mPush: {content: <div></div>, tab: props.intl.formatMessage(messages.pushNotification), key: 'mobilepush'},
     };
     const channelsToHide = this.props.channelsToHide || [];
-    const channelsToDisable = this.props.channelsToDisable || [];
-    let filteredPanes = Object.keys(defaultPanes)
+
+    const filteredPanes = Object.keys(defaultPanes)
       .filter((key) => !channelsToHide.includes(key)).reduce((obj = [], key) => {
         obj.push(defaultPanes[key]);
         return obj;
@@ -53,26 +52,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     } else if (!channelsToHide.includes('callTask')) {
       filteredPanes.push({content: <div></div>, tab: props.intl.formatMessage(messages.callTask), key: 'call_task'});
     }
-    /* eslint-disable no-param-reassign */
-    filteredPanes = filteredPanes.forEach( (pane) => {
-      if (channelsToDisable.includes(pane.key)) {
-        pane.disabled = true;
-      }
-    });
-
-    const channel = ['sms', 'email', 'mobilepush', 'call_task'];
-    if (!isEmpty(channelsToDisable)) {
-      channel.some((ch) => {
-        if (!channelsToDisable.includes(ch)) {
-          defaultChannel = ch;
-          return true;
-        }
-        return false;
-      });
-    }
 
     const panes = this.setChannelContent(defaultChannel, filteredPanes);
-
     this.state = {
       selectedChannel: defaultChannel,
       panes,
@@ -210,7 +191,6 @@ TemplatesV2.propTypes = {
   onChannelChange: PropTypes.func,
   channelsToHide: PropTypes.array,
   className: PropTypes.string.isRequired,
-  channelsToDisable: PropTypes.array,
 };
 
 TemplatesV2.defaultProps = {

package/v2Containers/TemplatesV2/_templatesV2.scss

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