@capillarytech/creatives-library 3.1.7 → 3.1.8

package/package.json

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

package/translations/en.json

@@ -73,7 +73,7 @@
   "creatives.componentsV2.CallTaskPreview.header": "This is the CallTaskPreview component !",
   "creatives.componentsV2.CapTagList.Cancel": "Cancel",
   "creatives.componentsV2.CapTagList.Ok": "Ok",
-  "creatives.componentsV2.CapTagList.all": "Dynamic days before expiry",
+  "creatives.componentsV2.CapTagList.all": "All",
   "creatives.componentsV2.CapTagList.dynamic_days_before_expiry": "Dynamic days before expiry",
   "creatives.componentsV2.CapTagList.gettingTags": "Getting tags...",
   "creatives.componentsV2.CapTagList.loyalty": "Loyalty",

package/v2Components/CapTagList/index.js

@@ -182,7 +182,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           content={<div>
             <CapSpin tip={this.props.intl.formatMessage(messages.gettingTags)} spinning={this.props.loading}>
               <Search style={{ marginBottom: 8, width: '250px'}} placeholder={this.props.intl.formatMessage(messages.search)} onChange={this.onChange} />
-              {this.props.moduleFilterEnabled ? <CapSelect getPopupContainer={(triggerNode) => triggerNode.parentNode} style={{width: '250px', marginBottom: '16px', minWidth: 'initial', display: 'inherit'}} onChange={this.props.onContextChange} defaultValue="All" options={options}>
+              {this.props.moduleFilterEnabled ? <CapSelect getPopupContainer={(triggerNode) => triggerNode.parentNode} style={{width: '250px', marginBottom: '16px', minWidth: 'initial', display: 'inherit'}} onChange={this.props.onContextChange} defaultValue={this.props.intl.formatMessage(messages.all)} options={options}>
               </CapSelect> : ''}
               <CapTree
                 styling={{height: '350px', overflow: 'auto'}}

package/v2Components/CapTagList/messages.js

@@ -24,7 +24,7 @@ export default defineMessages({
   },
   "all": {
     id: 'creatives.componentsV2.CapTagList.all',
-    defaultMessage: 'Dynamic days before expiry',
+    defaultMessage: 'All',
   },
   "outbound": {
     id: 'creatives.componentsV2.CapTagList.outbound',

package/v2Components/TemplatePreview/WechatRichmediaTemplatePreview/index.js

@@ -22,7 +22,6 @@ class WechatRichmediaTemplatePreview extends React.PureComponent { // eslint-dis
     const content = JSON.parse(JSON.stringify(mediaList));
     const mediaListLength = content.length;
     const contentData = content[0];
-    console.log("archita medialist: ", mediaList, content, mediaListLength);
     previewMsg.push(
       <div className="image-container">
         <img alt="default" width="100%" height="102px" src={contentData.image_url} />
@@ -45,11 +44,10 @@ class WechatRichmediaTemplatePreview extends React.PureComponent { // eslint-dis
       previewMsg.push(
         <div className="additional-richmedia-container">
           <div><CapHeading type="label7" style={{width: '170px', top: '12px', position: 'relative'}}>{data.title}</CapHeading></div>
-          <img alt="default" width="40px" height="40px" src={data.image_url} />
+          <img alt="default" width="34px" height="34px" src={data.image_url} />
         </div>
       );
     });
-    console.log("archita return obj: ", previewMsg);
     return (
       <div className="richmedia-template">
         {previewMsg}

package/v2Containers/Templates/index.js

@@ -387,7 +387,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   onAccountSelect(e) {
     const value = e.target.value;
-    console.log("onAccountSelect", e, value);
     this.setState({selectedAccount: value}, () => {
       const params = {
         name: this.state.searchText,
@@ -532,18 +531,14 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   };
   filterWechatTemplates = (templates) => {
     const { wechatFilter } = this.state;
-    switch(wechatFilter) {
+    switch (wechatFilter) {
       case WECHAT_FILTERS.RICHMEDIA:
-        return templates.filter(function (template) {
-          return template.definition && template.definition.msgcontent.toUpperCase() === "RICH_MEDIA_WECHAT";
-        });
+        return templates.filter((template) => template.definition && template.definition.msgcontent.toUpperCase() === "RICH_MEDIA_WECHAT");
       case WECHAT_FILTERS.MAPTEMPLATES:
-        return templates.filter(function (template) {
-          return !template.definition;
-        });
+        return templates.filter((template) => !template.definition);
       default:
         return templates;
-    };
+    }
   }
   getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoading, loadingTip}) => {
     const currentChannel = channel.toUpperCase();
@@ -1585,7 +1580,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         <CapRadioCard
           className="select-account"
           onChange={this.onAccountSelect}
-          value={this.props.Templates.selectedWeChatAccount ? this.props.Templates.selectedWeChatAccount.name : undefined}
           panes={accountOptions}
           cardHeight="48px"
           cardWidth="276px"
@@ -1611,7 +1605,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const isMobilePushChannel = channel === MOBILE_PUSH;
     return (<CapHeader
       title={<CapHeading type="h4">{isMobilePushChannel ? this.props.intl.formatMessage(messages.mobilepushAccount) : this.props.intl.formatMessage(messages.wechatAccount)}</CapHeading>}
-    description={<><CapHeading type="h3">{selectedAccount} {weCrmAccounts.length > 1 && <CapLink onClick={this.setAccountSelectionMode} style={{display: 'inline-block', position: 'relative', top: '3px'}} fontWeight="regular" fontSize="14px" title="change"/>} </CapHeading></>}
+      description={<><CapHeading type="h3">{selectedAccount} {weCrmAccounts.length > 1 && <CapLink onClick={this.setAccountSelectionMode} style={{display: 'inline-block', position: 'relative', top: '3px'}} fontWeight="regular" fontSize="14px" title="change"/>} </CapHeading></>}
       size="regular"
   />);
   }
@@ -1649,6 +1643,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     //TODO -> uncomment the following line
     // const isfilterContentVisisble = !isEmpty(this.props.TemplatesList) || !isEmpty(this.state.searchText) || !isEmpty(this.props.Templates.templateError);
     const isfilterContentVisisble = true;
+    const isWechatEmbedded = !this.props.isFullMode && channel.toUpperCase() === WECHAT;
     const filterContent = (( isfilterContentVisisble || [WECHAT, MOBILE_PUSH].includes(this.state.channel.toUpperCase())) && <div className="action-container">
       {isfilterContentVisisble && <CapInput.Search
         className="search-text"
@@ -1673,7 +1668,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         </CapRadio.CapRadioGroup>
       }
       <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
-        {isfilterContentVisisble && <CapButton
+        {isfilterContentVisisble && !isWechatEmbedded && <CapButton
           type={"primary"}
           disabled={this.isCreateDisabled()}
           style={{marginLeft: '8px'}}

package/v2Containers/WeChat/RichmediaTemplates/Create/index.js

@@ -18,8 +18,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import forEach from 'lodash/forEach';
 import isEqual from 'lodash/isEqual';
 import get from 'lodash/get';
-
-import { Menu } from 'antd';
 import { CapRow, CapColumn, CapButton, CapCard, CapSpin, CapInput, CapHeading, CapDivider, CapIcon, CapLink } from '@capillarytech/cap-ui-library';
 import makeSelectCreate, {makeSelectTemplates, getAssetDetails, getContentAssetDetails} from './selectors';
 import * as actions from './actions';
@@ -925,11 +923,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
             />
             <div className="wechat-container">
               <CapRow className="wechat-form-container">
-                <CapColumn span={8}>
+                <CapColumn span={9}>
                   {cardLayout}
                   {!this.state.isIframe && contentMenu}
                 </CapColumn>
-                <CapColumn span={16}>
+                <CapColumn span={15}>
                   { !isIframe && <CapInput
                     label="Name of the template"
                     value={this.state.templateName}