@capillarytech/creatives-library 2.0.84 → 2.0.86

package/v2Containers/Cap/constants.js

@@ -22,3 +22,13 @@ export const CLEAR_META_ENTITIES = 'cap/CLEAR_META_ENTITIES';
 export const HIDE_TAGS = 'cap/HIDE_TAGS';
 
 export const SET_INJECTED_TAGS = 'cap/SET_INJECTED_TAGS';
+
+export const GET_TOPBAR_MENU_DATA_REQUEST = 'creatives/cap/GET_TOPBAR_MENU_DATA_REQUEST';
+export const GET_TOPBAR_MENU_DATA_SUCCESS = 'creatives/cap/GET_TOPBAR_MENU_DATA_SUCCESS';
+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 CAMPAIGN_SETTINGS_URL = '/campaign/settings/message?from="/creatives/ui/v2/"';
+export const BRAND_SETTINGS_URL = '/org/index';
+export const PROFILE_SETTINGS_URL = '/org/users/NewProfile';
+export const HELP_URL = 'https://support.capillarytech.com';

package/v2Containers/Cap/index.js

@@ -2,25 +2,27 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
-// import { Link } from 'react-router';
-// import { Icon } from 'semantic-ui-react';
 import { bindActionCreators } from 'redux';
 import styled from 'styled-components';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import { injectIntl, intlShape } from 'react-intl';
+import { injectIntl } from 'react-intl';
 import {CapNotification} from '@capillarytech/cap-ui-library';
-import TopBar from '../../v2Components/TopBar';
-// import 'moment/locale/en-us';
-import Sidebar from '../../v2Components/Sidebar';
 import { makeSelectAuthenticated, makeSelectUser } from './selectors';
 import * as actions from './actions';
 import * as locationActions from '../LanguageProvider/actions';
 import * as appActions from '../App/actions';
 import config from '../../config/app';
-import messages from './messsages';
+import NavigationBar from '../../v2Components/NavigationBar';
+import { engagePlusPublicPath } from '../../config/path';
+import {
+  HELP_URL,
+  PROFILE_SETTINGS_URL,
+  BRAND_SETTINGS_URL,
+  CAMPAIGN_SETTINGS_URL,
+} from './constants';
 const gtm = window.dataLayer || [];
 
 const CapWrapper = styled.div`
@@ -36,7 +38,6 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   constructor(props) {
     super(props);
     this.state = {
-      menuData: [],
       switchedOrg: false,
     };
     this.changeOrg = this.changeOrg.bind(this);
@@ -47,6 +48,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
 
   componentWillMount() {
     this.props.actions.getUserData();
+    this.props.actions.getTopbarMenuData();
     if (this.props.Global.user) {
       const userGtmData = this.getUserGtmData(this.props);
       gtm.push(userGtmData);
@@ -109,43 +111,9 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
 
   componentWillUnmount() {
     this.setState({ switchedOrg: false });
+    this.props.actions.clearTopbarMenuData();
   }
 
-  // getSideBarData(reportData) {
-  //   const tmpMenuData = [];
-  //   const categoryId = reportData.categories ? Object.keys(reportData.categories) : [];
-  //   _.forEach(categoryId, (id) => {
-  //     const groupReport = {
-  //       group: reportData.categories[id].name,
-  //       items: [],
-  //     };
-  //     _.forEach(reportData.reportList, (report, reportId) => {
-  //       if (report.category === id) {
-  //         groupReport.items.push({
-  //           link: `/report/${reportId}`,
-  //           text: report.name,
-  //         });
-  //       }
-  //     });
-  //     tmpMenuData.push(groupReport);
-  //   });
-  //   const menuLibrary = {
-  //     group: 'Library',
-  //     items: [
-  //       {
-  //         link: '/library/charts',
-  //         text: 'Charts',
-  //       },
-  //       {
-  //         link: '/library/dimension',
-  //         text: 'Dimensions',
-  //       },
-  //     ],
-  //   };
-  //   tmpMenuData.push(menuLibrary);
-  //   this.setState({ menuData: tmpMenuData });
-  // }
-
   getUserGtmData = (props) => {
     const { user: userData } = props.Global;
     const userName = userData.attributes.USERNAME;
@@ -174,7 +142,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   }
 
   navigateToDashboard() {
-    const dashboardUrl = process.env.NODE_ENV === 'production' ? config.production.dashboard_url : config.development.dashboard_url;
+    const dashboardUrl = process.env.NODE_ENV === 'production' ? config.production.dashboard_url_v2 : config.development.dashboard_url_v2;
     this.props.router.push({ pathname: dashboardUrl, state: {} });
     this.props.router.go(dashboardUrl);
   }
@@ -184,94 +152,15 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
   }
   changeOrg(orgId) {
     this.props.actions.changeOrg(orgId);
-    //this.navigateToDashboard();
+    this.navigateToDashboard();
   }
 
   render() {
-    const userData = this.props.Global;
+    const { Global, location } = this.props;
+    const { topbarMenuData, isLoggedIn } = Global;
+    const topbarMenuDataOptions = topbarMenuData && topbarMenuData.data ? topbarMenuData.data : [];
     const type = this.props.location.query.type;
-    // const changeOrg = this.props.actions.changeOrg;
-    // const logout = this.props.actions.logout;
-    console.log('props', this.props);
-    const proxyOrgList = [];
-    let defaultOrgName = '';
-    let defaultOrgId = '';
-    let userName = '';
-    const navigateToDashboard = this.navigateToDashboard;
-    if (userData && userData.user && userData.user !== '') {
-      console.log('Org name ', userData.user.orgName, userData.user.orgID);
-      defaultOrgName = userData.user.orgName;
-      defaultOrgId = userData.user.orgID;
-      proxyOrgList.push({ text: defaultOrgName, value: defaultOrgId });
-      const orgList = userData.user.proxyOrgList;
-      if (!_.isEmpty(orgList)) {
-        _.forEach(orgList, (item) => {
-          const id = item.orgID;
-          let name = item.orgName;
-          if (id === 486) {
-            name = 'Demo Org';
-          }
-          proxyOrgList.push({ key: id, text: name, value: id });
-        });
-      }
-      userName = userData.user.firstName;
-    }
-    const actionComponents = "";
     const toastMessages = this.props.Global.messages;
-    const loggedIn = this.props.Global.isLoggedIn;
-    const menuData = [
-      {
-        group: this.props.intl.formatMessage(messages.creativesDashboard),
-        items: [
-          {
-            link: '/sms',
-            text: this.props.intl.formatMessage(messages.sms),
-            value: 'SMS',
-          },
-          {
-            link: '/wechat',
-            text: this.props.intl.formatMessage(messages.wechat),
-            value: 'WECHAT',
-          },
-          {
-            link: '/mobilepush',
-            text: 'Mobile Push',
-            value: 'MOBILEPUSH',
-          },
-          {
-            link: '/assets',
-            text: this.props.intl.formatMessage(messages.gallery),
-            value: 'GALLERY',
-          },
-          {
-            link: '/email',
-            text: this.props.intl.formatMessage(messages.email),
-            value: 'EMAIL',
-          },
-          {
-            link: '/ebill',
-            text: this.props.intl.formatMessage(messages.ebill),
-            value: 'EBILL',
-          },
-          {
-            link: '/line',
-            text: 'Line',
-            value: 'LINE',
-          },
-        ],
-      },
-      {
-        group: this.props.intl.formatMessage(messages.campaignsDashboard),
-        items: [
-          {
-            link: '/campaign/index',
-            text: this.props.intl.formatMessage(messages.campaignsHome),
-            value: 'Campaigns Home',
-            external: true,
-          },
-        ],
-      },
-    ];
     return (
       <CapWrapper>
         <Helmet
@@ -282,24 +171,20 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
           ]}
         />
         <div className="wrapper">
-          {loggedIn && type !== 'embedded' ?
-            <TopBar
-              proxyOrgList={proxyOrgList}
-              userName={userName}
-              orgName={defaultOrgName}
-              orgID={defaultOrgId}
+          {isLoggedIn && type !== 'embedded' ?
+            <NavigationBar
+              userData={Global}
               changeOrg={this.changeOrg}
-              navigateToDashboard={navigateToDashboard}
               logout={this.logout}
+              settingsUrl={`${engagePlusPublicPath}${CAMPAIGN_SETTINGS_URL}`}
+              brandSettingsUrl={BRAND_SETTINGS_URL}
+              profileSettingsUrl={PROFILE_SETTINGS_URL}
+              helpUrl={HELP_URL}
+              loggedIn={isLoggedIn}
+              topbarMenuData={topbarMenuDataOptions}
+              location={location}
             /> : ''}
           <div className="main">
-            {loggedIn && type !== 'embedded' && this.props.location.pathname.indexOf('v2') === -1 ? <div id="cap-sidebar" className={'sidebar'}>
-              <Sidebar
-                menuData={menuData}
-                actionComponents={actionComponents}
-                router={this.props.router}
-              />
-            </div> : '' }
             <div className="main-content">
               {React.Children.toArray(this.props.children)}
             </div>
@@ -330,7 +215,6 @@ Cap.propTypes = {
   appActions: PropTypes.object,
   locationActions: PropTypes.object,
   location: PropTypes.object,
-  intl: intlShape.isRequired,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Cap/reducer.js

@@ -103,6 +103,20 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state.setIn(['metaEntities'], metaEntities);
     case types.SET_INJECTED_TAGS:
       return state.set('injectedTags', action.injectedTags);
+    case types.GET_TOPBAR_MENU_DATA_REQUEST:
+      return state.set('topbarMenuData', fromJS({ status: 'request' }));
+    case types.GET_TOPBAR_MENU_DATA_SUCCESS:
+      return state.set(
+          'topbarMenuData',
+          fromJS({ status: 'success', data: action.data }),
+        );
+    case types.GET_TOPBAR_MENU_DATA_FAILURE:
+      return state.set(
+          'topbarMenuData',
+          fromJS({ status: 'failure', error: action.error }),
+        );
+    case types.CLEAR_TOPBAR_MENU_DATA:
+      return state.set('topbarMenuData', fromJS({}));
     default:
       return state;
   }

package/v2Containers/Cap/sagas.js

@@ -112,6 +112,17 @@ export function* fetchSchemaForEntity(queryParams) {
   }
 }
 
+function* getTopbarMenuData() {
+  try {
+    yield put({
+      type: types.GET_TOPBAR_MENU_DATA_SUCCESS,
+      data: getTopbarMenuDataValue(),
+    });
+  } catch (error) {
+    yield put({ type: types.GET_TOPBAR_MENU_DATA_FAILURE, error });
+  }
+}
+
 
 function* watchFetchSchemaForEntity() {
   console.log('inside watch get schema');
@@ -133,6 +144,9 @@ function* watchForFetchUserInfo() {
   yield takeLatest(types.GET_USER_DATA_REQUEST, fetchUserInfo);
 }
 
+function* watchGetTopbarMenuData() {
+  yield takeLatest(types.GET_TOPBAR_MENU_DATA_REQUEST, getTopbarMenuData);
+}
 
 export default [
   loginFlow,
@@ -140,4 +154,14 @@ export default [
   watchForLogoutFlow,
   watchForFetchUserInfo,
   watchFetchSchemaForEntity,
+  watchGetTopbarMenuData,
 ];
+
+function getTopbarMenuDataValue() {
+  return [
+    { label: 'Campaigns', link: '/campaigns/ui/list', key: 'campaigns' },
+    { label: 'Audience', link: '/audience-manager/list', key: 'audience' },
+    { label: 'Incentive', link: '/coupons/ui/', key: 'incentive' },
+    { label: 'Creatives', link: '/creatives/ui/v2', key: 'creatives' },
+  ];
+}

package/v2Containers/Cap/tests/selectors.test.js

@@ -1,6 +1,6 @@
 import { fromJS } from 'immutable';
 
-import { makeSelectLocationState } from 'containers/Cap/selectors';
+import { makeSelectLocationState } from 'v2Containers/Cap/selectors';
 
 describe('makeSelectLocationState', () => {
   it('should select the route as a plain JS object', () => {

package/v2Containers/ChannelTemplates/sagas.js

@@ -6,7 +6,7 @@ import * as Api from '../../services/api';
 import * as types from './constants';
 // Individual exports for testing
 export function* defaultSaga() {
-  // See example in containers/HomePage/sagas.js
+  // See example in v2Containers/HomePage/sagas.js
 }
 function* getTemplates(action) {
   try {

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -38,6 +38,8 @@ function SlideBoxContent(props) {
       onMobilepushModeChange,
       mobilePushCreateMode,
       templateStep,
+      onEnterTemplateName,
+      onRemoveTemplateName,
       onCreateNextStep,
       cap,
       onResetStep,
@@ -222,6 +224,8 @@ function SlideBoxContent(props) {
         step={templateStep}
         showNextStep={onCreateNextStep}
         isFullMode={isFullMode}
+        onEnterTemplateName={onEnterTemplateName}
+        onRemoveTemplateName={onRemoveTemplateName}
         cap={cap}
         onResetStep={onResetStep}
         showTemplateName={showTemplateName}
@@ -246,6 +250,8 @@ SlideBoxContent.propTypes = {
   emailCreateMode: PropTypes.string,
   templateStep: PropTypes.string,
   onCreateNextStep: PropTypes.func,
+  onEnterTemplateName: PropTypes.func,
+  onRemoveTemplateName: PropTypes.func,
   cap: PropTypes.object,
   onResetStep: PropTypes.func,
   onCallTaskSubmit: PropTypes.func,

package/v2Containers/CreativesContainer/index.js

@@ -45,6 +45,7 @@ class Creatives extends React.Component {
       showSlideBox: true,
       slidBoxContent: this.getSlideBocContent({mode: props.creativesMode, templateData: props.templateData, isFullMode: props.isFullMode}),
       templateData: this.getTemplateData(props.templateData),
+      templateNameExists: false,
       currentChannel: this.props.channel || 'sms',
     };
     this.creativesTemplateSteps = {
@@ -60,6 +61,13 @@ class Creatives extends React.Component {
     }
   }
 
+  onEnterTemplateName = () => {
+    this.setState({templateNameExists: true});
+  };
+
+  onRemoveTemplateName = () => {
+    this.setState({templateNameExists: false});
+  }
 
   onSelectTemplate = (template) => {
     this.setState({ slidBoxContent: 'editTemplate', templateData: template });
@@ -276,7 +284,7 @@ class Creatives extends React.Component {
   }
   shouldShowFooter = () => {
     const {isFullMode } = this.props;
-    const {slidBoxContent, currentChannel, emailCreateMode, templateStep, mobilePushCreateMode} = this.state;
+    const {slidBoxContent, currentChannel, emailCreateMode, templateNameExists, templateStep, mobilePushCreateMode} = this.state;
     const channel = currentChannel.toUpperCase();
     const currentStep = this.creativesTemplateSteps[templateStep];
     let showFooter = false;
@@ -303,7 +311,10 @@ class Creatives extends React.Component {
     if (slidBoxContent === "editTemplate" && ((channel === constants.EMAIL && currentStep === 'modeSelection'))) {
       showFooter = true;
     }
-    if (channel === constants.MOBILE_PUSH && ((slidBoxContent === 'createTemplate' && !isEmpty(mobilePushCreateMode)) || (slidBoxContent === 'editTemplate' && currentStep === 'modeSelection'))) {
+    if (channel === constants.MOBILE_PUSH &&
+      ((slidBoxContent === 'createTemplate' && !isEmpty(mobilePushCreateMode))
+      || (slidBoxContent === 'editTemplate' && currentStep === 'modeSelection')) &&
+      templateNameExists) {
       showFooter = true;
     }
 
@@ -421,6 +432,8 @@ class Creatives extends React.Component {
               emailCreateMode={emailCreateMode}// upload zip || use editor are values
               templateStep={this.creativesTemplateSteps[templateStep]}
               onCreateNextStep={this.onCreateNextStep}
+              onEnterTemplateName={this.onEnterTemplateName}
+              onRemoveTemplateName={this.onRemoveTemplateName}
               onResetStep={this.resetStep}
               cap={cap}
               setIsLoadingContent={this.setIsLoadingContent}

package/v2Containers/CreativesContainer/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/Dashboard/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/Ebill/constants.js

@@ -4,17 +4,17 @@
  *
  */
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/Ebill/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/Ebill/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/Ebill/CREATE_TEMPLATE_FAILURE';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/Ebill/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/Ebill/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/Ebill/CREATE_TEMPLATE_FAILURE';
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/Ebill/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/Ebill/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/Ebill/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/Ebill/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/Ebill/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/Ebill/GET_TEMPLATE_DETAILS_FAILURE';
 
-export const GET_CMS_EDITOR_DATA_REQUEST = 'app/containers/Ebill/GET_CMS_EDITOR_DATA_REQUEST';
-export const GET_CMS_EDITOR_DATA_SUCCESS = 'app/containers/Ebill/GET_CMS_EDITOR_DATA_SUCCESS';
-export const GET_CMS_EDITOR_DATA_FAILURE = 'app/containers/Ebill/GET_CMS_EDITOR_DATA_FAILURE';
+export const GET_CMS_EDITOR_DATA_REQUEST = 'app/v2Containers/Ebill/GET_CMS_EDITOR_DATA_REQUEST';
+export const GET_CMS_EDITOR_DATA_SUCCESS = 'app/v2Containers/Ebill/GET_CMS_EDITOR_DATA_SUCCESS';
+export const GET_CMS_EDITOR_DATA_FAILURE = 'app/v2Containers/Ebill/GET_CMS_EDITOR_DATA_FAILURE';
 
-export const CLEAR_EBILL_CRUD_RESPONSE_REQUEST = 'app/containers/Ebill/CLEAR_EBILL_CRUD_RESPONSE_REQUEST';
-export const CLEAR_ALL_VALUES = "app/containers/Ebill/CLEAR_ALL_VALUES";
+export const CLEAR_EBILL_CRUD_RESPONSE_REQUEST = 'app/v2Containers/Ebill/CLEAR_EBILL_CRUD_RESPONSE_REQUEST';
+export const CLEAR_ALL_VALUES = "app/v2Containers/Ebill/CLEAR_ALL_VALUES";

package/v2Containers/Ebill/index.js

@@ -17,7 +17,7 @@ import { createStructuredSelector } from 'reselect';
 import * as actions from './actions';
 import FormBuilder from '../../v2Components/FormBuilder';
 import { makeSelectMetaEntities, makeSelectAuthenticated, setInjectedTags } from '../Cap/selectors';
-import * as globalActions from '../../containers/Cap/actions';
+import * as globalActions from '../Cap/actions';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
 import { makeSelectTemplates } from '../Templates/selectors';
 import {getMessageObject} from '../../utils/messageUtils';

package/v2Containers/Email/constants.js

@@ -4,34 +4,34 @@
  *
  */
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/Email/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/Email/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/Email/CREATE_TEMPLATE_FAILURE';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/Email/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/Email/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/Email/CREATE_TEMPLATE_FAILURE';
 
-export const GET_TEMPLATE_DETAILS_REQUEST = 'app/containers/Email/GET_TEMPLATE_DETAILS_REQUEST';
-export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/containers/Email/GET_TEMPLATE_DETAILS_SUCCESS';
-export const GET_TEMPLATE_DETAILS_FAILURE = 'app/containers/Email/GET_TEMPLATE_DETAILS_FAILURE';
+export const GET_TEMPLATE_DETAILS_REQUEST = 'app/v2Containers/Email/GET_TEMPLATE_DETAILS_REQUEST';
+export const GET_TEMPLATE_DETAILS_SUCCESS = 'app/v2Containers/Email/GET_TEMPLATE_DETAILS_SUCCESS';
+export const GET_TEMPLATE_DETAILS_FAILURE = 'app/v2Containers/Email/GET_TEMPLATE_DETAILS_FAILURE';
 
-export const GET_ALL_ASSETS_REQUEST = 'app/containers/Email/GET_ALL_ASSETS_REQUEST';
-export const GET_ALL_ASSETS_SUCCESS = 'app/containers/Email/GET_ALL_ASSETS_SUCCESS';
-export const GET_ALL_ASSETS_FAILURE = 'app/containers/Email/GET_ALL_ASSETS_FAILURE';
+export const GET_ALL_ASSETS_REQUEST = 'app/v2Containers/Email/GET_ALL_ASSETS_REQUEST';
+export const GET_ALL_ASSETS_SUCCESS = 'app/v2Containers/Email/GET_ALL_ASSETS_SUCCESS';
+export const GET_ALL_ASSETS_FAILURE = 'app/v2Containers/Email/GET_ALL_ASSETS_FAILURE';
 
-export const GET_CMS_EDITOR_DETAILS_REQUEST = 'app/containers/Email/GET_CMS_EDITOR_DETAILS_REQUEST';
-export const GET_CMS_EDITOR_DETAILS_SUCCESS = 'app/containers/Email/GET_CMS_EDITOR_DETAILS_SUCCESS';
-export const GET_CMS_EDITOR_DETAILS_FAILURE = 'app/containers/Email/GET_CMS_EDITOR_DETAILS_FAILURE';
+export const GET_CMS_EDITOR_DETAILS_REQUEST = 'app/v2Containers/Email/GET_CMS_EDITOR_DETAILS_REQUEST';
+export const GET_CMS_EDITOR_DETAILS_SUCCESS = 'app/v2Containers/Email/GET_CMS_EDITOR_DETAILS_SUCCESS';
+export const GET_CMS_EDITOR_DETAILS_FAILURE = 'app/v2Containers/Email/GET_CMS_EDITOR_DETAILS_FAILURE';
 
-export const GET_CMS_EDITOR_DATA_REQUEST = 'app/containers/Email/GET_CMS_EDITOR_DATA_REQUEST';
-export const GET_CMS_EDITOR_DATA_SUCCESS = 'app/containers/Email/GET_CMS_EDITOR_DATA_SUCCESS';
-export const GET_CMS_EDITOR_DATA_FAILURE = 'app/containers/Email/GET_CMS_EDITOR_DATA_FAILURE';
-export const RESET_CMS_EDITOR_DATA = 'app/containers/Email/RESET_CMS_EDITOR_DATA';
+export const GET_CMS_EDITOR_DATA_REQUEST = 'app/v2Containers/Email/GET_CMS_EDITOR_DATA_REQUEST';
+export const GET_CMS_EDITOR_DATA_SUCCESS = 'app/v2Containers/Email/GET_CMS_EDITOR_DATA_SUCCESS';
+export const GET_CMS_EDITOR_DATA_FAILURE = 'app/v2Containers/Email/GET_CMS_EDITOR_DATA_FAILURE';
+export const RESET_CMS_EDITOR_DATA = 'app/v2Containers/Email/RESET_CMS_EDITOR_DATA';
 
-export const UPLOAD_ASSET_REQUEST = 'app/containers/Email/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/Email/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/Email/UPLOAD_ASSET_FAILURE';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/Email/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/Email/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/Email/UPLOAD_ASSET_FAILURE';
 
-export const CLEAR_EMAIL_CRUD_RESPONSE_REQUEST = "app/containers/Email/CLEAR_EMAIL_CRUD_RESPONSE_REQUEST";
-export const CLEAR_ALL_VALUES = "app/containers/Email/CLEAR_ALL_VALUES";
+export const CLEAR_EMAIL_CRUD_RESPONSE_REQUEST = "app/v2Containers/Email/CLEAR_EMAIL_CRUD_RESPONSE_REQUEST";
+export const CLEAR_ALL_VALUES = "app/v2Containers/Email/CLEAR_ALL_VALUES";
 
-export const DUPLICATE_TEMPLATE_REQUEST = 'app/containers/Email/DUPLICATE_TEMPLATE_REQUEST';
-export const DUPLICATE_TEMPLATE_SUCCESS = 'app/containers/Email/DUPLICATE_TEMPLATE_SUCCESS';
-export const DUPLICATE_TEMPLATE_FAILURE = 'app/containers/Email/DUPLICATE_TEMPLATE_FAILURE';
+export const DUPLICATE_TEMPLATE_REQUEST = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_REQUEST';
+export const DUPLICATE_TEMPLATE_SUCCESS = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_SUCCESS';
+export const DUPLICATE_TEMPLATE_FAILURE = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_FAILURE';

package/v2Containers/Email/index.js

@@ -19,7 +19,7 @@ import FormBuilder from '../../v2Components/FormBuilder';
 import { makeSelectMetaEntities, selectCurrentOrgDetails, isLoadingMetaEntities, makeSelectAuthenticated, setInjectedTags } from '../Cap/selectors';
 import * as actions from './actions';
 import * as templatesActions from '../Templates/actions';
-import * as globalActions from '../../containers/Cap/actions';
+import * as globalActions from '../Cap/actions';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
 import {makeSelectEmail} from './selectors';
 import { makeSelectTemplates } from '../Templates/selectors';

package/v2Containers/EmailWrapper/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/Line/Create/constants.js

@@ -7,33 +7,33 @@
 export const DEFAULT_ACTION = 'app/Create/DEFAULT_ACTION';
 
 
-export const CREATE_TEMPLATE_REQUEST = 'app/containers/Line/Create/CREATE_TEMPLATE_REQUEST';
-export const CREATE_TEMPLATE_SUCCESS = 'app/containers/Line/Create/CREATE_TEMPLATE_SUCCESS';
-export const CREATE_TEMPLATE_FAILURE = 'app/containers/Line/Create/CREATE_TEMPLATE_FAILURE';
-export const UPLOAD_ASSET_REQUEST = 'app/containers/Line/Create/UPLOAD_ASSET_REQUEST';
-export const UPLOAD_ASSET_SUCCESS = 'app/containers/Line/Create/UPLOAD_ASSET_SUCCESS';
-export const UPLOAD_ASSET_FAILURE = 'app/containers/Line/Create/UPLOAD_ASSET_FAILURE';
-export const CLEAR_ASSET = 'app/containers/Line/Create/CLEAR_ASSET';
+export const CREATE_TEMPLATE_REQUEST = 'app/v2Containers/Line/Create/CREATE_TEMPLATE_REQUEST';
+export const CREATE_TEMPLATE_SUCCESS = 'app/v2Containers/Line/Create/CREATE_TEMPLATE_SUCCESS';
+export const CREATE_TEMPLATE_FAILURE = 'app/v2Containers/Line/Create/CREATE_TEMPLATE_FAILURE';
+export const UPLOAD_ASSET_REQUEST = 'app/v2Containers/Line/Create/UPLOAD_ASSET_REQUEST';
+export const UPLOAD_ASSET_SUCCESS = 'app/v2Containers/Line/Create/UPLOAD_ASSET_SUCCESS';
+export const UPLOAD_ASSET_FAILURE = 'app/v2Containers/Line/Create/UPLOAD_ASSET_FAILURE';
+export const CLEAR_ASSET = 'app/v2Containers/Line/Create/CLEAR_ASSET';
 
-export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/containers/Line/Create/CLEAR_CREATE_RESPONSE_REQUEST';
-export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/containers/Line/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
-export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/containers/Line/Create/CLEAR_CREATE_RESPONSE_FAILURE';
+export const CLEAR_CREATE_RESPONSE_REQUEST = 'app/v2Containers/Line/Create/CLEAR_CREATE_RESPONSE_REQUEST';
+export const CLEAR_CREATE_RESPONSE_SUCCESS = 'app/v2Containers/Line/Create/CLEAR_CREATE_RESPONSE_SUCCESS';
+export const CLEAR_CREATE_RESPONSE_FAILURE = 'app/v2Containers/Line/Create/CLEAR_CREATE_RESPONSE_FAILURE';
 
 
 // edit
 
-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 CLEAR_DATA = 'app/containers/Line/Edit/CLEAR_DATA';
-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 CLEAR_DATA = 'app/v2Containers/Line/Edit/CLEAR_DATA';
+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/Line/Create/index.js

@@ -10,7 +10,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 { makeSelectCreate, makeSelectCreateResponse, makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse } from './selectors';
 import {makeSelectCreateLine} from './selectors';
 import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';