@capillarytech/creatives-library 2.0.84 → 2.0.86

package/v2Containers/Line/Edit/constants.js

@@ -6,22 +6,22 @@
 
 export const DEFAULT_ACTION = 'app/Edit/DEFAULT_ACTION';
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/line/Edit/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/line/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/line/Edit/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/line/Edit/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/line/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/line/Edit/GET_TEMPLATE_DETAILS_FAILURE';
 
-export const EDIT_TEMPLATE_REQUEST = 'app/containers/line/Edit/EDIT_TEMPLATE_REQUEST';
-export const EDIT_TEMPLATE_SUCCESS = 'app/containers/line/Edit/EDIT_TEMPLATE_SUCCESS';
-export const EDIT_TEMPLATE_FAILURE = 'app/containers/line/Edit/EDIT_TEMPLATE_FAILURE';
+export const EDIT_TEMPLATE_REQUEST = 'app/v2Containers/line/Edit/EDIT_TEMPLATE_REQUEST';
+export const EDIT_TEMPLATE_SUCCESS = 'app/v2Containers/line/Edit/EDIT_TEMPLATE_SUCCESS';
+export const EDIT_TEMPLATE_FAILURE = 'app/v2Containers/line/Edit/EDIT_TEMPLATE_FAILURE';
 
-export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/containers/line/Edit/CLEAR_EDIT_RESPONSE_REQUEST';
-export const UPLOAD_ASSET_REQUEST = 'app/containers/Line/Edit/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/Line/Edit/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/Line/Edit/UPLOAD_ASSET_FAILURE';
-export const CLEAR_DATA = 'app/containers/Line/Edit/CLEAR_DATA';
-export const CLEAR_ASSET = 'app/containers/Line/Edit/CLEAR_ASSET';
-export const SET_SELECTED_TEMPLATE = 'app/containers/Line/Edit/SET_SELECTED_TEMPLATE';
+export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/v2Containers/line/Edit/CLEAR_EDIT_RESPONSE_REQUEST';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/Line/Edit/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/Line/Edit/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/Line/Edit/UPLOAD_ASSET_FAILURE';
+export const CLEAR_DATA = 'app/v2Containers/Line/Edit/CLEAR_DATA';
+export const CLEAR_ASSET = 'app/v2Containers/Line/Edit/CLEAR_ASSET';
+export const SET_SELECTED_TEMPLATE = 'app/v2Containers/Line/Edit/SET_SELECTED_TEMPLATE';
 
-export const GET_LINE_TEMPLATES_LIST_REQUEST = 'app/containers/Line/GET_LINE_TEMPLATES_LIST_REQUEST';
-export const GET_LINE_TEMPLATES_LIST_SUCCESS = 'app/containers/Line/GET_LINE_TEMPLATES_LIST_SUCCESS';
-export const GET_LINE_TEMPLATES_LIST_FAILURE = 'app/containers/Line/GET_LINE_TEMPLATES_LIST_FAILURE';
+export const GET_LINE_TEMPLATES_LIST_REQUEST = 'app/v2Containers/Line/GET_LINE_TEMPLATES_LIST_REQUEST';
+export const GET_LINE_TEMPLATES_LIST_SUCCESS = 'app/v2Containers/Line/GET_LINE_TEMPLATES_LIST_SUCCESS';
+export const GET_LINE_TEMPLATES_LIST_FAILURE = 'app/v2Containers/Line/GET_LINE_TEMPLATES_LIST_FAILURE';

package/v2Containers/Login/index.js

@@ -10,8 +10,8 @@ import { createStructuredSelector } from 'reselect';
 import makeSelectLogin from './selectors';
 import messages from './messages';
 import config from '../../config/app';
-import LoginForm from './v2Components/LoginForm';
-import * as actions from '../../containers/Cap/actions';
+import LoginForm from './components/LoginForm';
+import * as actions from '../Cap/actions';
 import { UserIsNotAuthenticated } from '../../utils/authWrapper';
 import loaderGif from '../../assets/loading_img.gif';
 const logo = require('./assets/images/capillary_logo.png');

package/v2Containers/MobilePush/Create/constants.js

@@ -7,18 +7,18 @@
 export const DEFAULT_ACTION = 'app/Create/DEFAULT_ACTION';
 
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/PushMessage/Create/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/PushMessage/Create/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/PushMessage/Create/CREATE_TEMPLATE_FAILURE';
-export const UPLOAD_ASSET_REQUEST = 'app/containers/PushMessage/Create/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/PushMessage/Create/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/PushMessage/Create/UPLOAD_ASSET_FAILURE';
-export const CLEAR_ASSET = 'app/containers/PushMessage/Create/CLEAR_ASSET';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/PushMessage/Create/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/PushMessage/Create/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/PushMessage/Create/CREATE_TEMPLATE_FAILURE';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/PushMessage/Create/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/PushMessage/Create/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/PushMessage/Create/UPLOAD_ASSET_FAILURE';
+export const CLEAR_ASSET = 'app/v2Containers/PushMessage/Create/CLEAR_ASSET';
 
-export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_REQUEST';
-export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
-export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_FAILURE';
-export const GET_IOS_CTAS = 'app/containers/PushMessage/Create/GET_IOS_CTAS';
-export const GET_IOS_CTAS_SUCCESS = 'app/containers/PushMessage/Create/GET_IOS_CTAS_SUCCESS';
-export const GET_IOS_CTAS_FAILURE = 'app/containers/PushMessage/Create/GET_IOS_CTAS_FAILURE';
-export const RESET_STORE = 'app/containers/PushMessage/Create/RESET_STORE';
+export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/v2Containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_REQUEST';
+export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/v2Containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
+export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/v2Containers/PushMessage/Create/CLEAR_CREATE_RESPONSE_FAILURE';
+export const GET_IOS_CTAS = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS';
+export const GET_IOS_CTAS_SUCCESS = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS_SUCCESS';
+export const GET_IOS_CTAS_FAILURE = 'app/v2Containers/PushMessage/Create/GET_IOS_CTAS_FAILURE';
+export const RESET_STORE = 'app/v2Containers/PushMessage/Create/RESET_STORE';

package/v2Containers/MobilePush/Create/index.js

@@ -17,7 +17,7 @@ import styled from 'styled-components';
 import { CapSlideBox, CapHeader, CapTable, CapLink, CapRow, CapColumn, CapIcons, CapSpin, CapNotification } from '@capillarytech/cap-ui-library';
 import { makeSelectCreate, makeSelectCreateResponse, makeSelectIosCta } from './selectors';
 import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';
-import * as globalActions from '../../../containers/Cap/actions';
+import * as globalActions from '../../Cap/actions';
 import FormBuilder from '../../../v2Components/FormBuilder';
 import './_mobilePushCreate.scss';
 import * as actions from './actions';

package/v2Containers/MobilePush/Edit/constants.js

@@ -6,30 +6,30 @@
 
 export const DEFAULT_ACTION = 'app/Edit/DEFAULT_ACTION';
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/mobilePush/Edit/GET_TEMPLATE_DETAILS_FAILURE';
 
-export const EDIT_TEMPLATE_REQUEST = 'app/containers/mobilePush/Edit/EDIT_TEMPLATE_REQUEST';
-export const EDIT_TEMPLATE_SUCCESS = 'app/containers/mobilePush/Edit/EDIT_TEMPLATE_SUCCESS';
-export const EDIT_TEMPLATE_FAILURE = 'app/containers/mobilePush/Edit/EDIT_TEMPLATE_FAILURE';
+export const EDIT_TEMPLATE_REQUEST = 'app/v2Containers/mobilePush/Edit/EDIT_TEMPLATE_REQUEST';
+export const EDIT_TEMPLATE_SUCCESS = 'app/v2Containers/mobilePush/Edit/EDIT_TEMPLATE_SUCCESS';
+export const EDIT_TEMPLATE_FAILURE = 'app/v2Containers/mobilePush/Edit/EDIT_TEMPLATE_FAILURE';
 
-export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/containers/mobilePush/Edit/CLEAR_EDIT_RESPONSE_REQUEST';
-export const GET_IOS_CTAS = 'app/containers/PushMessage/Edit/GET_IOS_CTAS';
-export const GET_IOS_CTAS_SUCCESS = 'app/containers/PushMessage/Edit/GET_IOS_CTAS_SUCCESS';
-export const GET_IOS_CTAS_FAILURE = 'app/containers/PushMessage/Edit/GET_IOS_CTAS_FAILURE';
-export const UPLOAD_ASSET_REQUEST = 'app/containers/PushMessage/Edit/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/PushMessage/Edit/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/PushMessage/Edit/UPLOAD_ASSET_FAILURE';
-export const CLEAR_DATA = 'app/containers/PushMessage/Edit/CLEAR_DATA';
-export const CLEAR_ASSET = 'app/containers/PushMessage/Edit/CLEAR_ASSET';
-export const SET_SELECTED_TEMPLATE = 'app/containers/PushMessage/Edit/SET_SELECTED_TEMPLATE';
+export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/v2Containers/mobilePush/Edit/CLEAR_EDIT_RESPONSE_REQUEST';
+export const GET_IOS_CTAS = 'app/v2Containers/PushMessage/Edit/GET_IOS_CTAS';
+export const GET_IOS_CTAS_SUCCESS = 'app/v2Containers/PushMessage/Edit/GET_IOS_CTAS_SUCCESS';
+export const GET_IOS_CTAS_FAILURE = 'app/v2Containers/PushMessage/Edit/GET_IOS_CTAS_FAILURE';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/PushMessage/Edit/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/PushMessage/Edit/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/PushMessage/Edit/UPLOAD_ASSET_FAILURE';
+export const CLEAR_DATA = 'app/v2Containers/PushMessage/Edit/CLEAR_DATA';
+export const CLEAR_ASSET = 'app/v2Containers/PushMessage/Edit/CLEAR_ASSET';
+export const SET_SELECTED_TEMPLATE = 'app/v2Containers/PushMessage/Edit/SET_SELECTED_TEMPLATE';
 
-export const SET_WECHAT_ACCOUNT = "app/containers/MobilePush/SET_WECHAT_ACCOUNT";
-export const GET_WECRM_ACCOUNTS_REQUEST = "app/containers/MobilePush/GET_WECRM_ACCOUNTS_REQUEST";
-export const GET_WECRM_ACCOUNTS_SUCCESS = "app/containers/MobilePush/GET_WECRM_ACCOUNTS_SUCCESS";
-export const GET_WECRM_ACCOUNTS_FAILURE = "app/containers/MobilePush/GET_WECRM_ACCOUNTS_FAILURE";
+export const SET_WECHAT_ACCOUNT = "app/v2Containers/MobilePush/SET_WECHAT_ACCOUNT";
+export const GET_WECRM_ACCOUNTS_REQUEST = "app/v2Containers/MobilePush/GET_WECRM_ACCOUNTS_REQUEST";
+export const GET_WECRM_ACCOUNTS_SUCCESS = "app/v2Containers/MobilePush/GET_WECRM_ACCOUNTS_SUCCESS";
+export const GET_WECRM_ACCOUNTS_FAILURE = "app/v2Containers/MobilePush/GET_WECRM_ACCOUNTS_FAILURE";
 
-export const GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST = 'app/containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST';
-export const GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS = 'app/containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS';
-export const GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE = 'app/containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE';
+export const GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST';
+export const GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS';
+export const GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE';

package/v2Containers/MobilepushWrapper/index.js

@@ -60,7 +60,13 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
     this.props.onMobilepushModeChange( e.target.value );
   };
   onTemplateNameChange = (ev) => {
+    const {onEnterTemplateName, onRemoveTemplateName} = this.props;
     this.setState({templateName: ev.target.value});
+    if (ev.target.value && onEnterTemplateName) {
+      onEnterTemplateName();
+    } else if (onRemoveTemplateName) {
+      onRemoveTemplateName();
+    }
   }
   render() {
     const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type} = this.props;
@@ -121,6 +127,8 @@ MobilepushWrapper.propTypes = {
   step: PropTypes.string,
   getFormData: PropTypes.string,
   setIsLoadingContent: PropTypes.func,
+  onEnterTemplateName: PropTypes.func,
+  onRemoveTemplateName: PropTypes.func,
   isGetFormData: PropTypes.bool,
   query: PropTypes.object,
   isFullMode: PropTypes.bool,

package/v2Containers/Sms/Create/constants.js

@@ -7,10 +7,10 @@
 export const DEFAULT_ACTION = 'app/Create/DEFAULT_ACTION';
 
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/Sms/Create/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/Sms/Create/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/Sms/Create/CREATE_TEMPLATE_FAILURE';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/Sms/Create/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/Sms/Create/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/Sms/Create/CREATE_TEMPLATE_FAILURE';
 
-export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/containers/Sms/Create/CLEAR_CREATE_RESPONSE_REQUEST';
-export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/containers/Sms/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
-export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/containers/Sms/Create/CLEAR_CREATE_RESPONSE_FAILURE';
+export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/v2Containers/Sms/Create/CLEAR_CREATE_RESPONSE_REQUEST';
+export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/v2Containers/Sms/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
+export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/v2Containers/Sms/Create/CLEAR_CREATE_RESPONSE_FAILURE';

package/v2Containers/Sms/Create/index.js

@@ -22,11 +22,11 @@ import * as actions from './actions';
 import messages from './messages';
 import * as charCount from '../../../utils/smsCharCount';
 import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
-import * as globalActions from '../../../containers/Cap/actions';
+import * as globalActions from '../../Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
 // import callNativeEvent from '../../../utils/callNativeEvent';
-
+import {showError} from '../commonMethods';
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -87,6 +87,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.componentRefs = {
       'sms-count': this.smsCount,
     };
+    this.showError = showError.bind(this);
   }
 
   componentWillMount() {
@@ -318,8 +319,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     return map[id][event];
   }
 
-  setFormValidity(isFormValid) {
-    this.setState({isFormValid});
+  setFormValidity(isFormValid, errorData) {
+    this.setState({isFormValid, errorData});
   }
 
   injectMessages(elem) {
@@ -921,7 +922,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({startValidation: false});
   }
   startValidation = () => {
-    this.setState({startValidation: true});
+    this.setState({startValidation: true}, this.showError);
   }
   render() {
     console.log("this.props sms create: ", this.props);

package/v2Containers/Sms/Create/messages.js

@@ -82,4 +82,12 @@ export default defineMessages({
     id: 'app.containers.Create.somethingWentWrong',
     defaultMessage: "Something Went Wrong!!",
   },
+  "invalidTags": {
+    id: 'app.containers.Create.invalidTags',
+    defaultMessage: 'Invalid tags',
+  },
+  "validationError": {
+    id: 'app.containers.Create.validationError',
+    defaultMessage: 'Validation error',
+  },
 });

package/v2Containers/Sms/Edit/constants.js

@@ -6,13 +6,13 @@
 
 export const DEFAULT_ACTION = 'app/Edit/DEFAULT_ACTION';
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/Sms/Edit/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/Sms/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/Sms/Edit/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/Sms/Edit/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/Sms/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/Sms/Edit/GET_TEMPLATE_DETAILS_FAILURE';
 
-export const EDIT_TEMPLATE_REQUEST = 'app/containers/Sms/Edit/EDIT_TEMPLATE_REQUEST';
-export const EDIT_TEMPLATE_SUCCESS = 'app/containers/Sms/Edit/EDIT_TEMPLATE_SUCCESS';
-export const EDIT_TEMPLATE_FAILURE = 'app/containers/Sms/Edit/EDIT_TEMPLATE_FAILURE';
+export const EDIT_TEMPLATE_REQUEST = 'app/v2Containers/Sms/Edit/EDIT_TEMPLATE_REQUEST';
+export const EDIT_TEMPLATE_SUCCESS = 'app/v2Containers/Sms/Edit/EDIT_TEMPLATE_SUCCESS';
+export const EDIT_TEMPLATE_FAILURE = 'app/v2Containers/Sms/Edit/EDIT_TEMPLATE_FAILURE';
 
-export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/containers/Sms/Create/CLEAR_EDIT_RESPONSE_REQUEST';
-export const RESET_EDIT_TEMPLATE = 'app/containers/Sms/Create/RESET_EDIT_TEMPLATE';
+export const CLEAR_EDIT_RESPONSE_REQUEST = 'app/v2Containers/Sms/Create/CLEAR_EDIT_RESPONSE_REQUEST';
+export const RESET_EDIT_TEMPLATE = 'app/v2Containers/Sms/Create/RESET_EDIT_TEMPLATE';

package/v2Containers/Sms/Edit/index.js

@@ -22,11 +22,11 @@ import * as actions from './actions';
 import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
 import '../Create/_smsCreate.scss';
 import messages from './messages';
-import * as globalActions from '../../../containers/Cap/actions';
+import * as globalActions from '../../Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
 // import callNativeEvent from '../../../utils/callNativeEvent';
-
+import {showError} from '../commonMethods';
 export class Edit extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -83,7 +83,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.showNext = this.showNext.bind(this);
     this.injectMessages = this.injectMessages.bind(this);
     this.smsCount = React.createRef();
-
+    this.showError = showError.bind(this);
     this.componentRefs = {
       'sms-count': this.smsCount,
     };
@@ -291,8 +291,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     });
   }
 
-  setFormValidity(isFormValid) {
-    this.setState({isFormValid});
+  setFormValidity(isFormValid, errorData) {
+    this.setState({isFormValid, errorData});
   }
 
   getFormData(e, value) {
@@ -322,7 +322,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       validity: this.state.isFormValid,
       type: 'SMS',
     };
-    this.setState({checkValidation: true});
+    this.setState({checkValidation: true}, this.showError);
 
     if (e) {
       e.source.postMessage(JSON.stringify(response), e.origin);

package/v2Containers/Sms/commonMethods.js

@@ -0,0 +1,18 @@
+import isEmpty from 'lodash/isEmpty';
+import { CapNotification } from '@capillarytech/cap-ui-library';
+import messages from './Create/messages';
+export function showError() {
+  const {intl} = this.props;
+  const {errorData} = this.state;
+  const errorMessage = {key: 'validation-error', message: intl.formatMessage(messages.validationError)};
+  if (!isEmpty(this.state.formData) && !this.state.isFormValid) {
+    const isSmsInvalid = Object.values(errorData[0]).includes(true);
+    if (isSmsInvalid) {
+      const invalidTags = errorData[0]['invalid-tags'];
+      if (!isEmpty(invalidTags)) {
+        errorMessage.description = `${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+      }
+      CapNotification.error(errorMessage);
+    }
+  }
+}

package/v2Containers/TagList/index.js

@@ -15,7 +15,7 @@ import { bindActionCreators } from 'redux';
 import makeSelectTagList from './selectors';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
 import * as actions from './actions';
-import * as globalActions from '../../containers/Cap/actions';
+import * as globalActions from '../Cap/actions';
 // import styled from styled-components;
 import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';

package/v2Containers/TagList/sagas.js

@@ -2,7 +2,7 @@
 
 // Individual exports for testing
 export function* defaultSaga() {
-  // See example in containers/HomePage/sagas.js
+  // See example in v2Containers/HomePage/sagas.js
 }
 
 // All sagas to be loaded

package/v2Containers/Templates/constants.js

@@ -6,40 +6,40 @@
 
 export const DEFAULT_ACTION = 'app/Templates/DEFAULT_ACTION';
 
-export const GET_ALL_TEMPLATES_REQUEST = 'app/containers/Templates/GET_ALL_TEMPLATES_REQUEST';
-export const GET_ALL_TEMPLATES_SUCCESS = 'app/containers/Templates/GET_ALL_TEMPLATES_SUCCESS';
-export const GET_ALL_TEMPLATES_FAILURE = 'app/containers/Templates/GET_ALL_TEMPLATES_FAILURE';
-
-export const DELETE_TEMPLATE_REQUEST = 'app/containers/Templates/DELETE_TEMPLATE_REQUEST';
-export const DELETE_TEMPLATE_SUCCESS = 'app/containers/Templates/DELETE_TEMPLATE_SUCCESS';
-export const DELETE_TEMPLATE_FAILURE = 'app/containers/Templates/DELETE_TEMPLATE_FAILURE';
-
-export const GET_USER_LIST_REQUEST = "app/containers/GET_USER_LIST_REQUEST";
-export const GET_USER_LIST_SUCCESS = "app/containers/GET_USER_LIST_SUCCESS";
-export const GET_USER_LIST_FAILURE = "app/containers/GET_USER_LIST_FAILURE";
-
-export const GET_WECRM_ACCOUNTS_REQUEST = "app/containers/Templates/GET_WECRM_ACCOUNTS_REQUEST";
-export const GET_WECRM_ACCOUNTS_SUCCESS = "app/containers/Templates/GET_WECRM_ACCOUNTS_SUCCESS";
-export const GET_WECRM_ACCOUNTS_FAILURE = "app/containers/Templates/GET_WECRM_ACCOUNTS_FAILURE";
-export const SET_WECHAT_ACCOUNT = "app/containers/Templates/SET_WECHAT_ACCOUNT";
-
-export const SET_SELECTED_LAYOUT = "app/containers/Templates/SET_SELECTED_LAYOUT";
-export const SEND_ZIPPED_FILE_REQUEST = "app/containers/Templates/SEND_ZIPPED_FILE_REQUEST";
-export const SEND_ZIPPED_FILE_SUCCESS = "app/containers/Templates/SEND_ZIPPED_FILE_SUCCESS";
-export const SEND_ZIPPED_FILE_FAILURE = "app/containers/Templates/SEND_ZIPPED_FILE_FAILURE";
-
-export const GET_EDM_DEAFULT_TEMPLATES_REQUEST = 'app/containers/Templates/GET_EDM_DEAFULT_TEMPLATES_REQUEST';
-export const GET_EDM_DEAFULT_TEMPLATES_SUCCESS = 'app/containers/Templates/GET_EDM_DEAFULT_TEMPLATES_SUCCESS';
-export const GET_EDM_DEAFULT_TEMPLATES_FAILURE = 'app/containers/Templates/GET_EDM_DEAFULT_TEMPLATES_FAILURE';
-
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/Templates/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/Templates/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/Templates/GET_TEMPLATE_DETAILS_FAILURE';
-
-
-export const SET_EDM_TEMPLATE = "app/containers/Templates/SET_EDM_TEMPLATE";
-export const RESET_ACCOUNT = "app/containers/Templates/RESET_ACCOUNT";
-export const RESET_TEMPLATE = "app/containers/Templates/RESET_TEMPLATE";
-export const RESET_TEMPLATE_DATA = "app/containers/Templates/RESET_TEMPLATE_DATA";
-export const RESET_UPLOAD_DATA = "app/containers/Templates/RESET_UPLOAD_DATA";
-export const CLEAR_TEMPLATE_STORE_DATA = "app/containers/Templates/CLEAR_TEMPLATE_STORE_DATA";
+export const GET_ALL_TEMPLATES_REQUEST = 'app/v2Containers/Templates/GET_ALL_TEMPLATES_REQUEST';
+export const GET_ALL_TEMPLATES_SUCCESS = 'app/v2Containers/Templates/GET_ALL_TEMPLATES_SUCCESS';
+export const GET_ALL_TEMPLATES_FAILURE = 'app/v2Containers/Templates/GET_ALL_TEMPLATES_FAILURE';
+
+export const DELETE_TEMPLATE_REQUEST = 'app/v2Containers/Templates/DELETE_TEMPLATE_REQUEST';
+export const DELETE_TEMPLATE_SUCCESS = 'app/v2Containers/Templates/DELETE_TEMPLATE_SUCCESS';
+export const DELETE_TEMPLATE_FAILURE = 'app/v2Containers/Templates/DELETE_TEMPLATE_FAILURE';
+
+export const GET_USER_LIST_REQUEST = "app/v2Containers/GET_USER_LIST_REQUEST";
+export const GET_USER_LIST_SUCCESS = "app/v2Containers/GET_USER_LIST_SUCCESS";
+export const GET_USER_LIST_FAILURE = "app/v2Containers/GET_USER_LIST_FAILURE";
+
+export const GET_WECRM_ACCOUNTS_REQUEST = "app/v2Containers/Templates/GET_WECRM_ACCOUNTS_REQUEST";
+export const GET_WECRM_ACCOUNTS_SUCCESS = "app/v2Containers/Templates/GET_WECRM_ACCOUNTS_SUCCESS";
+export const GET_WECRM_ACCOUNTS_FAILURE = "app/v2Containers/Templates/GET_WECRM_ACCOUNTS_FAILURE";
+export const SET_WECHAT_ACCOUNT = "app/v2Containers/Templates/SET_WECHAT_ACCOUNT";
+
+export const SET_SELECTED_LAYOUT = "app/v2Containers/Templates/SET_SELECTED_LAYOUT";
+export const SEND_ZIPPED_FILE_REQUEST = "app/v2Containers/Templates/SEND_ZIPPED_FILE_REQUEST";
+export const SEND_ZIPPED_FILE_SUCCESS = "app/v2Containers/Templates/SEND_ZIPPED_FILE_SUCCESS";
+export const SEND_ZIPPED_FILE_FAILURE = "app/v2Containers/Templates/SEND_ZIPPED_FILE_FAILURE";
+
+export const GET_EDM_DEAFULT_TEMPLATES_REQUEST = 'app/v2Containers/Templates/GET_EDM_DEAFULT_TEMPLATES_REQUEST';
+export const GET_EDM_DEAFULT_TEMPLATES_SUCCESS = 'app/v2Containers/Templates/GET_EDM_DEAFULT_TEMPLATES_SUCCESS';
+export const GET_EDM_DEAFULT_TEMPLATES_FAILURE = 'app/v2Containers/Templates/GET_EDM_DEAFULT_TEMPLATES_FAILURE';
+
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/Templates/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/Templates/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/Templates/GET_TEMPLATE_DETAILS_FAILURE';
+
+
+export const SET_EDM_TEMPLATE = "app/v2Containers/Templates/SET_EDM_TEMPLATE";
+export const RESET_ACCOUNT = "app/v2Containers/Templates/RESET_ACCOUNT";
+export const RESET_TEMPLATE = "app/v2Containers/Templates/RESET_TEMPLATE";
+export const RESET_TEMPLATE_DATA = "app/v2Containers/Templates/RESET_TEMPLATE_DATA";
+export const RESET_UPLOAD_DATA = "app/v2Containers/Templates/RESET_UPLOAD_DATA";
+export const CLEAR_TEMPLATE_STORE_DATA = "app/v2Containers/Templates/CLEAR_TEMPLATE_STORE_DATA";

package/v2Containers/Templates/index.js

@@ -521,7 +521,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if (currentChannel === "SMS") {
         templateData.content = template.versions.base['sms-editor'];
       } else if (currentChannel === "EMAIL") {
-        templateData.url = template.versions.base.preview_http_url;
+        const url = template.versions.base.preview_http_url;
+        if (url) {
+          templateData.url = url;
+        } else {
+          templateData.content = template.versions.base.subject;
+        }
       } else if (currentChannel === "MOBILEPUSH" && template.type === "MOBILEPUSH") {
         templateData.content = template;
       }

package/v2Containers/TestPage/constants.js

@@ -4,4 +4,4 @@
  *
  */
 
-export const DEFAULT_ACTION = 'app/containers/TestPage/DEFAULT_ACTION';
+export const DEFAULT_ACTION = 'app/v2Containers/TestPage/DEFAULT_ACTION';

package/v2Containers/TestPage/sagas.js

@@ -2,7 +2,7 @@
 
 // Individual exports for testing
 export function* defaultSaga() {
-  // See example in containers/HomePage/sagas.js
+  // See example in v2Containers/HomePage/sagas.js
 }
 
 // All sagas to be loaded

package/v2Containers/Testv2/sagas.js

@@ -2,7 +2,7 @@
 
 // Individual exports for testing
 export function* defaultSaga() {
-  // See example in containers/HomePage/sagas.js
+  // See example in v2Containers/HomePage/sagas.js
 }
 
 // All sagas to be loaded

package/v2Containers/WeChat/MapTemplates/constants.js

@@ -4,25 +4,25 @@
  *
  */
 
-export const GET_WECHAT_DEFAULT_TEMPLATES_REQUEST = 'app/containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_REQUEST';
-export const GET_WECHAT_DEFAULT_TEMPLATES_SUCCESS = 'app/containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_SUCCESS';
-export const GET_WECHAT_DEFAULT_TEMPLATES_FAILURE = 'app/containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_FAILURE';
+export const GET_WECHAT_DEFAULT_TEMPLATES_REQUEST = 'app/v2Containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_REQUEST';
+export const GET_WECHAT_DEFAULT_TEMPLATES_SUCCESS = 'app/v2Containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_SUCCESS';
+export const GET_WECHAT_DEFAULT_TEMPLATES_FAILURE = 'app/v2Containers/WeChat/GET_WECHAT_DEFAULT_TEMPLATES_FAILURE';
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/WeChat/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/WeChat/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/WeChat/CREATE_TEMPLATE_FAILURE';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/WeChat/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/WeChat/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/WeChat/CREATE_TEMPLATE_FAILURE';
 
-export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/containers/WeChat/CLEAR_CREATE_RESPONSE_REQUEST';
-export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/containers/WeChat/CLEAR_CREATE_RESPONSE_SUCCESS';
-export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/containers/WeChat/CLEAR_CREATE_RESPONSE_FAILURE';
+export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/v2Containers/WeChat/CLEAR_CREATE_RESPONSE_REQUEST';
+export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/v2Containers/WeChat/CLEAR_CREATE_RESPONSE_SUCCESS';
+export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/v2Containers/WeChat/CLEAR_CREATE_RESPONSE_FAILURE';
 
-export const GET_WECRM_ACCOUNTS_REQUEST = "app/containers/WeChat/GET_WECRM_ACCOUNTS_REQUEST";
-export const GET_WECRM_ACCOUNTS_SUCCESS = "app/containers/WeChat/GET_WECRM_ACCOUNTS_SUCCESS";
-export const GET_WECRM_ACCOUNTS_FAILURE = "app/containers/WeChat/GET_WECRM_ACCOUNTS_FAILURE";
+export const GET_WECRM_ACCOUNTS_REQUEST = "app/v2Containers/WeChat/GET_WECRM_ACCOUNTS_REQUEST";
+export const GET_WECRM_ACCOUNTS_SUCCESS = "app/v2Containers/WeChat/GET_WECRM_ACCOUNTS_SUCCESS";
+export const GET_WECRM_ACCOUNTS_FAILURE = "app/v2Containers/WeChat/GET_WECRM_ACCOUNTS_FAILURE";
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/WeChat/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/WeChat/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/WeChat/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/WeChat/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/WeChat/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/WeChat/GET_TEMPLATE_DETAILS_FAILURE';
 
 
-export const SET_WECHAT_ACCOUNT = "app/containers/WeChat/SET_WECHAT_ACCOUNT";
+export const SET_WECHAT_ACCOUNT = "app/v2Containers/WeChat/SET_WECHAT_ACCOUNT";

package/v2Containers/WeChat/MapTemplates/index.js

@@ -21,7 +21,7 @@ import messages from './messages';
 import * as actions from './actions';
 import FormBuilder from '../../../v2Components/FormBuilder';
 import { UserIsAuthenticated } from '../../../utils/authWrapper';
-import * as globalActions from '../../../containers/Cap/actions';
+import * as globalActions from '../../Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as templateActions from '../../Templates/actions';
 // import SlideBox from '../../v2Components/SlideBox';

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

@@ -4,12 +4,12 @@
  *
  */
 
-export const DEFAULT_ACTION = 'app/containers/Wechat/RichmediaTemplates/Create/DEFAULT_ACTION';
-export const UPLOAD_ASSET_REQUEST = 'app/containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_FAILURE';
-export const CLEAR_ASSET = 'app/containers/Wechat/RichmediaTemplates/Create/CLEAR_ASSET';
-export const SAVE_TEMPLATE_REQUEST = 'app/containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_REQUEST';
-export const SAVE_TEMPLATE_SUCCESS = 'app/containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_SUCCESS';
-export const SAVE_TEMPLATE_FAILURE = 'app/containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_FAILURE';
-export const CLEAR_CONTENT_ASSET = 'app/containers/Wechat/RichmediaTemplates/Create/CLEAR_CONTENT_ASSET';
+export const DEFAULT_ACTION = 'app/v2Containers/Wechat/RichmediaTemplates/Create/DEFAULT_ACTION';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/Wechat/RichmediaTemplates/Create/UPLOAD_ASSET_FAILURE';
+export const CLEAR_ASSET = 'app/v2Containers/Wechat/RichmediaTemplates/Create/CLEAR_ASSET';
+export const SAVE_TEMPLATE_REQUEST = 'app/v2Containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_REQUEST';
+export const SAVE_TEMPLATE_SUCCESS = 'app/v2Containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_SUCCESS';
+export const SAVE_TEMPLATE_FAILURE = 'app/v2Containers/Wechat/RichmediaTemplates/Create/SAVE_TEMPLATE_FAILURE';
+export const CLEAR_CONTENT_ASSET = 'app/v2Containers/Wechat/RichmediaTemplates/Create/CLEAR_CONTENT_ASSET';

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

@@ -20,8 +20,8 @@ import * as actions from './actions';
 import richmediaschema from './richmediaschema';
 import './_createRichmedia.scss';
 import messages from './messages';
-import * as globalActions from '../../../../containers/Cap/actions';
-import {getMessageObject} from '../../../../../utils/messageUtils';
+import * as globalActions from '../../../Cap/actions';
+import {getMessageObject} from '../../../../utils/messageUtils';
 import FormBuilder from '../../../../v2Components/FormBuilder';
 import Header from '../../../../v2Components/Header';
 import WechatRichmediaTemplatePreview from '../../../../v2Components/TemplatePreview/WechatRichmediaTemplatePreview';

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

@@ -5,7 +5,7 @@ import * as types from './constants';
 // import testschema from './testschema';
 // Individual exports for testing
 export function* defaultSaga() {
-  // See example in containers/HomePage/sagas.js
+  // See example in v2Containers/HomePage/sagas.js
 }
 export function* uploadAsset({file, assetType, fileParams, mode, wechatParams, contentId, uploadId}) {
   try {

package/v2Containers/WeChat/RichmediaTemplates/Edit/constants.js

@@ -5,6 +5,6 @@
  */
 
 export const DEFAULT_ACTION = 'app/Edit/DEFAULT_ACTION';
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/WeChat/RichmediaTemplates/Edit/GET_TEMPLATE_DETAILS_FAILURE';