@capillarytech/creatives-library 7.17.21-alpha.2 → 7.17.21

package/v2Containers/SmsTrai/Edit/tests/__snapshots__/index.test.js.snap

@@ -3134,7 +3134,7 @@ FREE GIFTS-
                                 key=".0"
                                 size="regular"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     hidePopover={false}
                                     injectedTags={Object {}}
                                     location={
@@ -3173,7 +3173,7 @@ FREE GIFTS-
                                         />
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       hidePopover={false}
                                       injectedTags={Object {}}
                                       location={
@@ -3190,7 +3190,7 @@ FREE GIFTS-
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -3233,7 +3233,7 @@ FREE GIFTS-
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -10463,7 +10463,7 @@ FREE GIFTS-
                                 key=".0"
                                 size="regular"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     hidePopover={false}
                                     injectedTags={Object {}}
                                     location={
@@ -10502,7 +10502,7 @@ FREE GIFTS-
                                         />
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       hidePopover={false}
                                       injectedTags={Object {}}
                                       location={
@@ -10519,7 +10519,7 @@ FREE GIFTS-
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -10562,7 +10562,7 @@ FREE GIFTS-
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -18212,7 +18212,7 @@ FREE GIFTS-
                                 key=".0"
                                 size="regular"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     hidePopover={false}
                                     injectedTags={Object {}}
                                     location={
@@ -18251,7 +18251,7 @@ FREE GIFTS-
                                         />
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       hidePopover={false}
                                       injectedTags={Object {}}
                                       location={
@@ -18268,7 +18268,7 @@ FREE GIFTS-
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -18311,7 +18311,7 @@ FREE GIFTS-
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -26070,7 +26070,7 @@ FREE GIFTS-
                                 key=".0"
                                 size="regular"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     hidePopover={false}
                                     injectedTags={Object {}}
                                     location={
@@ -26109,7 +26109,7 @@ FREE GIFTS-
                                         />
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       hidePopover={false}
                                       injectedTags={Object {}}
                                       location={
@@ -26126,7 +26126,7 @@ FREE GIFTS-
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -26169,7 +26169,7 @@ FREE GIFTS-
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>

package/v2Containers/TagList/index.js

@@ -21,16 +21,12 @@ import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
 const TreeNode = Tree.TreeNode;
-import { injectIntl } from 'react-intl';
-import { scope } from './messages';
-import { handleInjectedData } from '../../utils/common';
 
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
     this.state = {
       loading: false,
-      tags: []
     };
     this.renderTags = this.renderTags.bind(this);
     this.populateTags = this.populateTags.bind(this);
@@ -43,34 +39,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     
   }
 
-  componentDidUpdate(prevProps) {
-    if (this.props.tags !== prevProps.tags || this.props.injectedTags !== prevProps.injectedTags || this.props.selectedOfferDetails !== prevProps.selectedOfferDetails) {
-      this.setState({
-        tags: this.generateTags(this.props),
-      });
-    }
-  }
-
-  generateTags(props) {
-    let tags = {};
-    let injectedTags = {};
-    if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
-      const formattedInjectedTags = handleInjectedData(
-        props.injectedTags,
-        scope
-      );
-      injectedTags = this.transformInjectedTags(formattedInjectedTags);
-    }
-    if (props.tags && props.tags.length > 0) {
-      tags = this.populateTags(props.tags);
-      console.log('populating tags', Object.keys(tags || {}).length);
-    }
-    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
-      this.transformCouponTags(props.selectedOfferDetails, tags);
-    }
-    return _.merge( {}, tags, injectedTags);
-  }
-
   componentWillReceiveProps(nextProps) {
     if (_.isEmpty(this.props.injectedTags) && _.isEmpty(this.props.tags)) {
       this.setState({loading: true});
@@ -83,7 +51,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       
       this.setState({loading: false});
     }
-
   }
 
   onSelect = (selectedKeys) => {
@@ -106,11 +73,11 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
-      const { locale : userLocale } = this.props.intl;
+      const { userLocale } = this.props;
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
-          "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
-          "desc": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          name: tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
+          desc: tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
         };
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
@@ -118,8 +85,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         // 
         mainTags[tag.value] = {
           'tag-header': true,
-          "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
-          "desc": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          "name": tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
+          "desc": tag.label[userLocale] ? tag.label[userLocale] : tag.label.en,
           "subtags": tag.subtags,
         };
       }
@@ -255,11 +222,26 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   render() {
+    let tags = {};
+    let injectedTags = {};
+    if (this.props.injectedTags && !_.isEmpty(this.props.injectedTags)) {
+      injectedTags = this.transformInjectedTags(this.props.injectedTags);
+      
+    }
+    if (this.props.tags && this.props.tags.length > 0) {
+      tags = this.populateTags(this.props.tags);
+      console.log('populating tags', Object.keys(tags || {}).length);
+    }
+    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', Object.keys(tags || {}).length);
     return (
       <div className={this.props.className ? this.props.className : ''}>
         <CapTagList
           loading={this.state.loading}
-          tags={this.state.tags}
+          tags={tags}
           onSelect={this.onSelect}
           label={this.props.label}
           visibleTaglist={this.props.visibleTaglist}
@@ -309,4 +291,4 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(TagList)));
+export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(TagList));

package/v2Containers/TagList/messages.js

@@ -4,11 +4,10 @@
  * This contains all the text for the TagList component.
  */
 import { defineMessages } from 'react-intl';
-export const scope = `creatives.containersV2.TagList`;
 
 export default defineMessages({
   header: {
-    id: `${scope}.header`,
+    id: 'creatives.containersV2.TagList.header',
     defaultMessage: 'This is TagList container !',
   },
 });

package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap

@@ -120064,7 +120064,7 @@ Click {{3}} to unsubscribe'",
                                 key=".0"
                                 size="large"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     injectedTags={Object {}}
                                     location={
                                       Object {
@@ -120116,7 +120116,7 @@ Click {{3}} to unsubscribe'",
                                         </div>
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       injectedTags={Object {}}
                                       location={
                                         Object {
@@ -120132,7 +120132,7 @@ Click {{3}} to unsubscribe'",
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -120174,7 +120174,7 @@ Click {{3}} to unsubscribe'",
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -154586,7 +154586,7 @@ Click {{3}} to unsubscribe'",
                                 key=".0"
                                 size="large"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     injectedTags={Object {}}
                                     location={
                                       Object {
@@ -154638,7 +154638,7 @@ Click {{3}} to unsubscribe'",
                                         </div>
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       injectedTags={Object {}}
                                       location={
                                         Object {
@@ -154654,7 +154654,7 @@ Click {{3}} to unsubscribe'",
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -154696,7 +154696,7 @@ Click {{3}} to unsubscribe'",
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -171659,7 +171659,7 @@ Click {{unsubscribe}} to unsubscribe",
                                 key=".0"
                                 size="large"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     injectedTags={Object {}}
                                     location={
                                       Object {
@@ -171711,7 +171711,7 @@ Click {{unsubscribe}} to unsubscribe",
                                         </div>
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       injectedTags={Object {}}
                                       location={
                                         Object {
@@ -171727,7 +171727,7 @@ Click {{unsubscribe}} to unsubscribe",
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -171769,7 +171769,7 @@ Click {{unsubscribe}} to unsubscribe",
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>
@@ -183805,7 +183805,7 @@ new message content.",
                                 key=".0"
                                 size="large"
                                 suffix={
-                                  <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                  <Connect(UserIsAuthenticated(Connect(TagList)))
                                     injectedTags={Object {}}
                                     location={
                                       Object {
@@ -183857,7 +183857,7 @@ new message content.",
                                         </div>
                                       </CapHeading>
                                     </div>
-                                    <Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))
+                                    <Connect(UserIsAuthenticated(Connect(TagList)))
                                       injectedTags={Object {}}
                                       location={
                                         Object {
@@ -183873,7 +183873,7 @@ new message content.",
                                       onTagSelect={[Function]}
                                       tags={Array []}
                                     >
-                                      <UserIsAuthenticated(Connect(InjectIntl(TagList)))
+                                      <UserIsAuthenticated(Connect(TagList))
                                         authData={
                                           Object {
                                             "app": Object {},
@@ -183915,7 +183915,7 @@ new message content.",
                                         redirect={[Function]}
                                         tags={Array []}
                                       />
-                                    </Connect(UserIsAuthenticated(Connect(InjectIntl(TagList))))>
+                                    </Connect(UserIsAuthenticated(Connect(TagList)))>
                                   </div>
                                 </CapHeader__Flex>
                               </CapHeader>

package/utils/commonUtils.js

@@ -1,6 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-export const apiMessageFormatHandler = (id, fallback) => (
-    <FormattedMessage id={id} defaultMessage={fallback} />
-);

package/v2Containers/ChannelTemplates/actions.js

@@ -1,20 +0,0 @@
-/*
- *
- * ChannelTemplates actions
- *
- */
-
-import * as types from './constants';
-
-export function defaultAction() {
-  return {
-    type: types.DEFAULT_ACTION,
-  };
-}
-
-export function getTemplates(channel) {
-  return {
-    type: types.GET_TEMPLATES_REQUEST,
-    channel,
-  };
-}

package/v2Containers/ChannelTemplates/constants.js

@@ -1,8 +0,0 @@
-/*
- *
- * ChannelTemplates constants
- *
- */
-
-export const DEFAULT_ACTION = 'app/ChannelTemplates/DEFAULT_ACTION';
-

package/v2Containers/ChannelTemplates/index.js

@@ -1,47 +0,0 @@
-/*
- *
- * ChannelTemplates
- *
- */
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import { bindActionCreators } from 'redux';
-import { createStructuredSelector } from 'reselect';
-import makeSelectChannelTemplates from './selectors';
-import * as actions from './actions';
-import messages from './messages';
-
-
-export class ChannelTemplates extends React.Component { // eslint-disable-line react/prefer-stateless-function
-  componentDidMount() {
-    this.props.actions.getTemplates(this.props.channel);
-  }
-  render() {
-    return (
-      <CardGrid
-        cardDataList={[]}
-      />
-    );
-  }
-}
-
-ChannelTemplates.propTypes = {
-  actions: PropTypes.object.isRequired,
-  channel: PropTypes.string,
-};
-
-const mapStateToProps = createStructuredSelector({
-  ChannelTemplates: makeSelectChannelTemplates(),
-});
-
-function mapDispatchToProps(dispatch) {
-  return {
-    actions: bindActionCreators(actions, dispatch),
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ChannelTemplates);

package/v2Containers/ChannelTemplates/messages.js

@@ -1,13 +0,0 @@
-/*
- * ChannelTemplates Messages
- *
- * This contains all the text for the ChannelTemplates component.
- */
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-  header: {
-    id: 'creatives.containersV2.ChannelTemplates.header',
-    defaultMessage: 'This is ChannelTemplates container !',
-  },
-});

package/v2Containers/ChannelTemplates/reducer.js

@@ -1,34 +0,0 @@
-/*
- *
- * ChannelTemplates reducer
- *
- */
-
-import { fromJS } from 'immutable';
-import * as types from './constants';
-
-const initialState = fromJS({
-  loadingTemplates: true,
-  smsTemplates: [],
-  emailTemplates: [],
-  wechatTemplates: [],
-  mobilepushTemplates: [],
-});
-
-function channelTemplatesReducer(state = initialState, action) {
-  const channelTemplates = `${action.channel}Templates`;
-  switch (action.type) {
-    case types.DEFAULT_ACTION:
-      return state;
-    case types.GET_TEMPLATES_REQUEST:
-      return state.set('loadingTemplates', true);
-    case types.GET_TEMPLATES_SUCESS:
-      return state.set('loadingTemplates', false).set(channelTemplates, action.templates);
-    case types.GET_TEMPLATES_FAILURE:
-      return state.set('loadingTemplates', false).set('error', action.error);
-    default:
-      return state;
-  }
-}
-
-export default channelTemplatesReducer;

package/v2Containers/ChannelTemplates/sagas.js

@@ -1,32 +0,0 @@
-import { take, takeLatest, call, put, cancel } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
-import * as Api from '../../services/api';
-
-
-import * as types from './constants';
-// Individual exports for testing
-export function* defaultSaga() {
-  // See example in v2Containers/HomePage/sagas.js
-}
-function* getTemplates(action) {
-  try {
-    const req = {
-      channel: action.channel,
-      queryParams: action.query,
-    };
-    const res = call(Api.getAllTemplates, req);
-    put({type: types.GET_TEMPLATES_SUCESS, templates: res.response, channel: action.channel});
-  } catch (error) {
-    put({type: types.GET_TEMPLATES_FAILURE, error});
-  }
-}
-function* getTemplatesWatcher() {
-  const watcher = yield takeLatest(types.GET_TEMPLATES_REQUEST, getTemplates);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
-}
-// All sagas to be loaded
-export default [
-  defaultSaga,
-  getTemplatesWatcher,
-];

package/v2Containers/ChannelTemplates/selectors.js

@@ -1,25 +0,0 @@
-import { createSelector } from 'reselect';
-
-/**
- * Direct selector to the channelTemplates state domain
- */
-const selectChannelTemplatesDomain = () => (state) => state.get('templates');
-
-/**
- * Other specific selectors
- */
-
-
-/**
- * Default selector used by ChannelTemplates
- */
-
-const makeSelectChannelTemplates = () => createSelector(
-  selectChannelTemplatesDomain(),
-  (substate) => substate.toJS()
-);
-
-export default makeSelectChannelTemplates;
-export {
-  selectChannelTemplatesDomain,
-};