@capillarytech/creatives-library 7.9.12 → 7.9.13

package/package.json

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

package/utils/common.js

@@ -38,11 +38,9 @@ export const hasStore2DoorFeature = Auth.hasFeatureAccess.bind(
   STORE2DOOR_PLUS_ENABLED,
 );
 
-export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails = [], disableTagsDetails = {}}) {
+export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails = []}) {
   console.log('populating tags', (tagsList || []).length);
   const mainTags = {};
-  const { disableRelatedTags, childTagsToDisable, parentTagstoDisable} = disableTagsDetails;
-
 
   _.forEach(tagsList, (temp) => {
     const tag = temp.definition;
@@ -50,7 +48,6 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
       mainTags[tag.value] = {
         name: tag.label[userLocale] || tag.label.en,
         value: tag.value,
-        disabled: disableRelatedTags ? childTagsToDisable.includes(tag.value) : false,
       };
     } else if (tag['tag-header'] && mainTags[tag.value]) {
       // to check it this tag header is already available in mainTags object,
@@ -63,7 +60,6 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
         "name": tag.label[userLocale] || tag.label.en,
         "subtags": tag.subtags,
         "value": tag.value,
-        "disabled": disableRelatedTags ? parentTagstoDisable.includes(tag.value) : false,
       };
     }
   });
@@ -179,19 +175,17 @@ function populateTagForChildren(targetTag, tagsObject, tagValue) {
 function getTreeStructureData(data) {
   const result = [];
   _.forOwn(data, (mainTag) => {
-    const { name, value, subtags = [], disabled } = mainTag;
+    const { name, value, subtags = [] } = mainTag;
     if (!mainTag['tag-header']) {
       result.push({
         title: name,
         value: `{{${value}}}`,
-        disabled,
       });
     } else {
       const obj = {
         title: name,
         value: `{{${value}}}`,
         selectable: false,
-        disabled,
       };
       obj.children = getSubTags(subtags);
       result.push(obj);
@@ -203,19 +197,17 @@ function getTreeStructureData(data) {
 function getSubTags(subtagsParam) {
   const result = [];
   _.forOwn(subtagsParam, (subTag) => {
-    const { name, value, subtags = [], disabled } = subTag;
+    const { name, value, subtags = [] } = subTag;
     if (_.isEmpty(subtags)) {
       result.push({
         title: name,
         value: `{{${value}}}`,
-        disabled,
       });
     } else {
       const obj = {
         title: name,
         value: `{{${value}}}`,
         selectable: false,
-        disabled,
       };
       obj.children = getSubTags(subtags);
       result.push(obj);

package/v2Components/CapTagList/index.js

@@ -8,18 +8,16 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 // import styled from 'styled-components';
-import { CapSpin, CapModal, CapButton, CapPopover, CapInput, CapTree, CapSelect, CapTooltip } from '@capillarytech/cap-ui-library';
+import { CapSpin, CapModal, CapButton, CapPopover, CapInput, CapTree, CapSelect } from '@capillarytech/cap-ui-library';
 
 import _ from 'lodash';
-import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
-import { createStructuredSelector } from 'reselect';
+import { injectIntl, intlShape } from 'react-intl';
 import messages from './messages';
-import { makeSelectLoyaltyPromotionDisplay } from '../../v2Containers/Cap/selectors';
-import withCreatives from '../../hoc/withCreatives';
 
 const {Search} = CapInput;
 const {CapTreeNode} = CapTree;
 class CapTagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
+
   constructor(props) {
     super(props);
     this.state = {
@@ -134,39 +132,23 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   };
 
   renderTags(tags, searchString = '') {
-    const { disableRelatedTags, childTagsToDisable, parentTagstoDisable} = this.props.disableTagsDetails;
     const list = [];
-    const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     _.forEach(tags, (val = '', key) => {
       let supportedTagsString = '';
       _.forEach(val.supportedTags, (supportedTag) => {
         supportedTagsString += `${supportedTag} ,`;
       });
       supportedTagsString = supportedTagsString.replace(/,\s*$/, "");
+      
       if (_.has(val, 'subtags')) {
-        const disabled = disableRelatedTags ? parentTagstoDisable.includes(key) : false;
-        const temp = this.renderTags(val.subtags, '', disabled);
+        const temp = this.renderTags(val.subtags);
         list.push((
-          <CapTreeNode
-            title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
-            tag={val}
-            key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}
-            disabled={disabled}
-          >
+          <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 childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
-        const tempNode = (
-          <CapTreeNode
-            title={childDisabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
-            tag={val}
-            isLeaf
-            key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}
-            disabled={childDisabled}
-          >
-          </CapTreeNode>);
+        const tempNode = (<CapTreeNode title={val.desc || val.name} tag={val} isLeaf key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}></CapTreeNode>);
         list.push(tempNode);
       }
     });
@@ -271,27 +253,10 @@ CapTagList.propTypes = {
   visibleTaglist: PropTypes.bool,
   hidePopover: PropTypes.bool,
   modalProps: PropTypes.any,
-  disableTagsDetails: PropTypes.object,
 };
 
 CapTagList.defaultValue = {
   hidePopover: false,
 };
 
-function mapDispatchToProps() {
-  return {
-  };
-}
-
-const mapStateToProps = createStructuredSelector({
-  disableTagsDetails: makeSelectLoyaltyPromotionDisplay(),
-});
-
-export default withCreatives({
-  WrappedComponent: CapTagList,
-  mapStateToProps,
-  mapDispatchToProps,
-  suserAuth: true,
-});
-
-// export default injectIntl(CapTagList);
+export default injectIntl(CapTagList);

package/v2Components/CapTagList/messages.js

@@ -42,8 +42,4 @@ export default defineMessages({
     id: 'creatives.componentsV2.CapTagList.search',
     defaultMessage: 'Search',
   },
-  "loyaltyAttributeDisable": {
-    id: `creatives.componentsV2.CapTagList.loyaltyAttributeDisable`,
-    defaultMessage: 'You won’t be able to add loyalty related attributes since the loyalty program/ card series is None.',
-  },
 });

package/v2Containers/Cap/constants.js

@@ -28,8 +28,6 @@ export const GET_TOPBAR_MENU_DATA_SUCCESS = 'creatives/cap/GET_TOPBAR_MENU_DATA_
 export const GET_TOPBAR_MENU_DATA_FAILURE = 'creatives/cap/GET_TOPBAR_MENU_DATA_FAILURE';
 export const CLEAR_TOPBAR_MENU_DATA = 'creatives/cap/CLEAR_TOPBAR_MENU_DATA';
 
-export const SET_LOYALTY_PROMOTION_RELATED_CREATIVE_TAGS_DISPLAY = 'SET_LOYALTY_PROMOTION_RELATED_CREATIVE_TAGS_DISPLAY';
-
 export const CAMPAIGN_SETTINGS_URL = '/creatives/settings/message';
 export const ORG_SETTINGS_URL = '/org/index';
 export const HELP_URL = 'https://support.capillarytech.com/en/support/solutions/4000007853';

package/v2Containers/Cap/reducer.js

@@ -82,6 +82,7 @@ function capReducer(state = fromJS(initialState.cap), action) {
         .set('fetchingSchema', false);
     case types.GET_SCHEMA_FOR_ENTITY_SUCCESS: {
       const stateMeta = state.get('metaEntities');
+      
       return state
         .set('fetchingSchema', false)
         .set('metaEntities', {
@@ -116,11 +117,6 @@ function capReducer(state = fromJS(initialState.cap), action) {
         );
     case types.CLEAR_TOPBAR_MENU_DATA:
       return state.set('topbarMenuData', fromJS({}));
-    case types.SET_LOYALTY_PROMOTION_RELATED_CREATIVE_TAGS_DISPLAY: {
-      return state.set('disableLoyaltyPromotionRelatedTags', action.disable)
-        .set('tagsToDisable', action.tagsToDisable)
-        .set('parentTagsToDisable', action.parentTagsToDisable);
-    }
     default:
       return state;
   }

package/v2Containers/Cap/selectors.js

@@ -31,6 +31,7 @@ const setInjectedTags = () => createSelector(
     const { tags } = metaEntities;
     const customTags = tags && (tags.custom || {});
     const extendedTags = tags && (tags.extended || {});
+    
     return (injectedTags = _.merge({}, injectedTags, customTags, extendedTags));
   }
 );
@@ -73,15 +74,6 @@ const makeSelectFetchingSchema = () => createSelector(
   (globalState) => globalState.get('fetchingSchema')
 );
 
-const makeSelectLoyaltyPromotionDisplay = () => createSelector(
-  selectCapDomain,
-  (globalState) => ({
-    disableRelatedTags: globalState.get('disableLoyaltyPromotionRelatedTags'),
-    childTagsToDisable: globalState.get('tagsToDisable') || [],
-    parentTagstoDisable: globalState.get('parentTagsToDisable') || [],
-  }),
-);
-
 export {
   makeSelectLocationState,
   makeSelectAuthenticated,
@@ -93,5 +85,4 @@ export {
   isLoadingMetaEntities,
   makeSelectFetchingSchema,
   setInjectedTags,
-  makeSelectLoyaltyPromotionDisplay,
 };

package/v2Containers/FTP/index.js

@@ -25,7 +25,7 @@ import { FONT_SIZE_L } from '@capillarytech/cap-ui-library/styled/variables';
 import { find, cloneDeep, findIndex, isEmpty, isEqual, filter, flattenDeep, replace } from 'lodash';
 import * as actions from './actions';
 import { makeSelectFTP, makeSelectMetaEntities } from './selectors';
-import { makeSelectLoyaltyPromotionDisplay, setInjectedTags } from '../Cap/selectors';
+import { setInjectedTags } from '../Cap/selectors';
 import withCreatives from '../../hoc/withCreatives';
 import messages from './messages';
 import './_FTP.scss';
@@ -132,11 +132,7 @@ export class FTP extends React.Component {
       ) || !isEqual(injectedTags, thisInjectedTags)
     ) {
       const tags = _.concat(
-        getTreeStructuredTags({
-          tagsList: ((metaEntities.tags || {}).standard || []),
-          offerDetails: selectedOfferDetails,
-          disableTagsDetails: this.props.disableTagsDetails,
-        }),
+        getTreeStructuredTags({ tagsList: ((metaEntities.tags || {}).standard || []), offerDetails: selectedOfferDetails }),
         this.getTreeStructuredInjectedTags(injectedTags)
       );
       this.setState({ tagsTree: tags}, () => this.disableUsedColumns());
@@ -495,13 +491,9 @@ export class FTP extends React.Component {
 
   disableUsedColumns = () => {
     const { headerTagList = [] } = this.state;
-    const { selectedOfferDetails = [], metaEntities = {}, injectedTags, disableTagsDetails } = this.props;
+    const { selectedOfferDetails = [], metaEntities = {}, injectedTags } = this.props;
     const tags = _.concat(
-      getTreeStructuredTags({
-        tagsList: ((metaEntities.tags || {}).standard || []),
-        offerDetails: selectedOfferDetails,
-        disableTagsDetails,
-      }),
+      getTreeStructuredTags({ tagsList: ((metaEntities.tags || {}).standard || []), offerDetails: selectedOfferDetails }),
       this.getTreeStructuredInjectedTags(injectedTags)
     );
     const clonnedTagsTree = cloneDeep(tags);
@@ -644,7 +636,6 @@ FTP.propTypes = {
   contents: PropTypes.array,
   metaEntities: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
-  disableTagsDetails: PropTypes.func,
 };
 
 
@@ -659,7 +650,6 @@ const mapStateToProps = createStructuredSelector({
   FTP: makeSelectFTP(),
   metaEntities: makeSelectMetaEntities(),
   injectedTags: setInjectedTags(),
-  disableTagsDetails: makeSelectLoyaltyPromotionDisplay(),
 });
 
 export default withCreatives({

package/v2Containers/Templates/index.js

@@ -207,11 +207,26 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.props.location.query.type === 'embedded') {
       this.props.actions.resetAccount();
     }
-    if (['line', VIBER_CHANNEL, FACEBOOK_CHANNEL, 'sms', 'email', 'ebill'].includes((this.state.channel || '').toLowerCase())) {
+    if ((['line', VIBER_CHANNEL, FACEBOOK_CHANNEL, 'sms', 'email', 'ebill'].includes((this.state.channel || '').toLowerCase())) || ((['wechat', 'mobilepush'].includes(this.state.channel.toLowerCase()) && !isEmpty(this.props.Templates.selectedWeChatAccount)))) {
       const queryParams = {
         // name: this.state.searchText,
         // sortBy: this.state.sortBy,
       };
+      if (this.state.channel.toLowerCase() === 'wechat' && get(this.props, 'Templates.selectedWeChatAccount.configs', false)) {
+        queryParams.wecrmId = this.props.Templates.selectedWeChatAccount.configs.wecrm_app_id;
+        queryParams.wecrmToken = this.props.Templates.selectedWeChatAccount.configs.wecrm_token;
+        queryParams.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
+      }
+      if (this.state.channel.toLowerCase() === "mobilepush" && !isEmpty(this.props.Templates.selectedWeChatAccount)) {
+        const account = this.props.Templates.selectedWeChatAccount;
+        queryParams.accountId = account.id;
+        const isAndroidSupported = get(account, "configs.android") === '1';
+        const isIosSupported = get(account, "configs.ios") === '1';
+        if (!(isAndroidSupported || isIosSupported)) {
+          this.props.actions.resetAccount();
+          return;
+        }
+      }
       queryParams.page = this.state.page;
       queryParams.perPage = this.state.perPageLimit;
       const channel = this.state.channel;