@capillarytech/creatives-library 3.0.29 → 3.0.31

package/app.js

@@ -10,7 +10,7 @@ import CapV2 from 'v2Containers/Cap';
 import Cap from 'containers/Cap';
 import { LocaleProvider } from 'antd';
 import { makeSelectLocationState } from 'containers/Cap/selectors';
-import LanguageProvider from 'v2Containers/LanguageProvider';
+import LanguageProvider from 'containers/LanguageProvider';
 import FontFaceObserver from 'fontfaceobserver';
 /* eslint-disable import/no-unresolved, import/extensions */
 import '!file-loader?name=[name].[ext]!./favicon.ico';

package/components/FormBuilder/index.js

@@ -2037,8 +2037,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     img.src = _URL.createObjectURL(file);
     img.onload = () => {
       const fileParams = {
-        width: this.width,
-        height: this.height,
+        width: img.width,
+        height: img.height,
         error: file.size / (1e+6) > 5,
       };
       this.callChildEvent({file, type: 'image', fileParams}, val, val.submitAction);

package/config/app.js

@@ -5,7 +5,6 @@ const config = {
   production: {
     api_endpoint: '/arya/api/v1/creatives',
     auth_endpoint: '/arya/api/v1/auth',
-    arya_endpoint: '/arya/api/v1',
     login_url: 'auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
@@ -14,7 +13,6 @@ const config = {
   development: {
     api_endpoint: 'https://nightly.capillary.in/arya/api/v1/creatives',
     auth_endpoint: 'https://nightly.capillary.in/arya/api/v1/auth',
-    arya_endpoint: 'https://nightly.capillary.in/arya/api/v1',
     login_url: 'auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',

package/containers/Line/Create/index.js

@@ -717,8 +717,8 @@ export class Line extends Component {
     } else {
       data.fileParams.isGeneratePreview = true;
       const name = data.file.name.split('.');
-      const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      // const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([data.file], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image/jpeg'});
       this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };

package/containers/Line/Edit/index.js

@@ -718,8 +718,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.props.globalActions.addMessageToQueue(message);
     } else {
       const name = data.file.name.split('.');
-      const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      // const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([data.file], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
       this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };

package/containers/MobilePush/Create/index.js

@@ -1706,8 +1706,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       this.props.globalActions.addMessageToQueue(message);
     } else {
       const name = data.file.name.split('.');
-      const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      // const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([data.file], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
       this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };

package/containers/MobilePush/Edit/index.js

@@ -1064,8 +1064,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.props.globalActions.addMessageToQueue(message);
     } else {
       const name = data.file.name.split('.');
-      const blob = data.file.slice(0, -1, 'image');
-      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      // const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([data.file], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
       this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };

package/containers/Templates/index.js

@@ -222,13 +222,15 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             }
           }
         });
-        this.setState({selectedAccount: selectedAccount.name}, () => {
-          params.wecrmId = selectedAccount.configs.wecrm_app_id;
-          params.wecrmToken = selectedAccount.configs.wecrm_token;
-          params.originalId = selectedAccount.sourceAccountIdentifier;
-          nextProps.actions.setWeChatAccount(selectedAccount);
-          this.getAllTemplates({params});
-        });
+        if (!_.isEmpty(selectedAccount)) {
+          this.setState({selectedAccount: selectedAccount.name}, () => {
+            params.wecrmId = selectedAccount.configs.wecrm_app_id;
+            params.wecrmToken = selectedAccount.configs.wecrm_token;
+            params.originalId = selectedAccount.sourceAccountIdentifier;
+            nextProps.actions.setWeChatAccount(selectedAccount);
+            this.getAllTemplates({params});
+          });
+        }
       } else if (this.state.channel.toLowerCase() === 'mobilepush' && (nextProps.location.query.account_id || nextProps.location.query.source_account_id)) {
         _.forEach(nextProps.Templates.weCrmAccounts, (account) => {
           if ((nextProps.location.query.account_id && account.id === Number(nextProps.location.query.account_id)) || (nextProps.location.query.source_account_id && account.sourceAccountIdentifier && account.sourceAccountIdentifier === nextProps.location.query.source_account_id)) {

package/hoc/withCreatives.js

@@ -0,0 +1,46 @@
+import React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { injectIntl } from 'react-intl';
+import * as globalActions from '../v2Containers/Cap/actions';
+import * as creativesContainerActions from '../v2Containers/CreativesContainer/actions';
+import { UserIsAuthenticated } from '../utils/authWrapper';
+
+/**
+ * Higher Order Component to common out creatives channel logic
+ * @param {*} WrappedComponent
+ * @returns {*} modified wrapped component
+ */
+export default ({
+  WrappedComponent,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth,
+  }) => {
+  const CreativesCommon = (props) => {
+    useEffect(() => {
+      const {
+        globalActions: {
+          setInjectedTags,
+        },
+        forwardedTags = {},
+      } = props;
+      // setting the passed tags from parent in Cap store
+      setInjectedTags(forwardedTags);
+    }, []);
+
+    return <WrappedComponent {...props} />;
+  };
+
+  const hocMapDispatchToProps = (dispatch) => {
+    const passedMapDispatchToProps = mapDispatchToProps(dispatch);
+    return {
+      ...passedMapDispatchToProps,
+      globalActions: bindActionCreators(globalActions, dispatch),
+      creativesContainerActions: bindActionCreators(creativesContainerActions, dispatch),
+    };
+  };
+
+  const CreativeComponent = connect(mapStateToProps, hocMapDispatchToProps)(injectIntl(CreativesCommon));
+  return userAuth ? UserIsAuthenticated(CreativeComponent) : CreativeComponent;
+};

package/index.js

@@ -3,10 +3,6 @@ import capReducer from './v2Containers/Cap/reducer';
 import capSaga from './v2Containers/Cap/sagas';
 import Cap from './v2Containers/Cap/index';
 
-import LanguageProvider from './v2Containers/LanguageProvider';
-import LanguageProviderReducer from './v2Containers/LanguageProvider/reducer';
-import LanguageProviderSaga from './v2Containers/LanguageProvider/sagas';
-
 import templateReducer from './v2Containers/Templates/reducer';
 import templateSaga from './v2Containers/Templates/sagas';
 import Templates from './v2Containers/Templates/index';
@@ -59,7 +55,6 @@ export {default as EbillSaga} from './v2Containers/Ebill/sagas';
 
 
 const CapContainer = {Cap, capReducer, capSaga};
-const LanguageProviderContainer = {LanguageProvider, LanguageProviderReducer, LanguageProviderSaga};
 const TemplatesContainer = {Templates, templateReducer, templateSaga};
 const SmsCreateContainer = {SmsCreate, smsCreateReducer, smsCreateSaga};
 const SmsEditContainer = {SmsEdit, smsEditReducer, smsEditSaga};
@@ -84,7 +79,6 @@ export {default as MobilePushPreview} from './v2Components/MobilePushPreviewV2';
 CreativesContainer.CreativesContainerReducer = CreativesContainerReducer;
 
 export { CapContainer,
-  LanguageProviderContainer,
   TemplatesContainer,
   SmsCreateContainer,
   SmsEditContainer,

package/package.json

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

package/reducers.js

@@ -7,7 +7,7 @@ import { combineReducers } from 'redux-immutable';
 import { fromJS } from 'immutable';
 import { LOCATION_CHANGE } from 'react-router-redux';
 
-import languageProviderReducer from 'v2Containers/LanguageProvider/reducer';
+import languageProviderReducer from 'containers/LanguageProvider/reducer';
 import capReducer from 'containers/Cap/reducer';
 import appReducer from 'containers/App/reducer';
 import createSmsReducer from 'containers/Sms/Create/reducer';

package/routes.js

@@ -11,7 +11,6 @@ import * as ebillSagas from 'containers/Ebill/sagas';
 import * as emailSagas from 'containers/Email/sagas';
 import * as templateSagas from 'containers/Templates/sagas';
 import * as lineSagas from 'containers/Line/Create/sagas';
-import * as languageSaga from './v2Containers/LanguageProvider/sagas';
 
 const errorLoading = (err) => {
   console.error('Dynamic page loading failed', err); // eslint-disable-line no-console
@@ -25,7 +24,6 @@ export default function createRoutes(store) {
   // Create reusable async injectors using getAsyncInjectors factory
   const { injectReducer, injectSagas } = getAsyncInjectors(store); // eslint-disable-line no-unused-vars
   injectSagas(rootSaga.default);
-  injectSagas(languageSaga.default);
   return [
     {
       path: '/',

package/services/api.js

@@ -9,11 +9,9 @@ import getSchema from './getSchema';
 import * as API from '../utils/ApiCaller';
 let API_ENDPOINT = config.development.api_endpoint;
 let API_AUTH_ENDPOINT = config.development.auth_endpoint;
-let ARYA_ENDPOINT = config.development.arya_endpoint;
 if (process.env.NODE_ENV === 'production') {
   API_ENDPOINT = config.production.api_endpoint;
   API_AUTH_ENDPOINT = config.production.auth_endpoint;
-  ARYA_ENDPOINT = config.production.arya_endpoint;
 }
 
 const isProd = process.env.NODE_ENV === 'production';
@@ -58,8 +56,8 @@ function checkStatus(response) {
   if ((response.status >= 200 && response.status < 300) || response.status === 500) {
     return response;
   }
-  const isLoginPage = window.location.pathname.indexOf('/login') !== -1;
-  if (!isLoginPage) redirectIfUnauthenticated(response);
+
+  redirectIfUnauthenticated(response);
 
   const error = new Error(response.statusText);
   error.response = response;
@@ -318,9 +316,3 @@ export const createLineTemplate = ({template}) => {
   const url = `${API_ENDPOINT}/templates/LINE`;
   return request(url, getAPICallObject('POST', template));
 };
-
-export const getLocizMessage = (locale) => {
-  const appName = 'creatives_v2';
-  const url = `${ARYA_ENDPOINT}/translations/${appName}/${locale}`;
-  return request(url, getAPICallObject('GET'));
-};

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -50,6 +50,7 @@ function SlideBoxContent(props) {
       showTemplateName,
       onValidationFail,
       channelsToHide,
+      forwardedTags,
     } = props;
   const type = messageDetails.type.toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'defualt' : 'library'};
@@ -97,6 +98,7 @@ function SlideBoxContent(props) {
         onCallTaskSubmit={onCallTaskSubmit}
         cap={cap}
         channelsToHide={channelsToHide}
+        forwardedTags={forwardedTags}
         />
         )}
       {isPreview && (
@@ -107,44 +109,52 @@ function SlideBoxContent(props) {
         charCounterEnabled
         templateData={templateData}
         showCount
+        forwardedTags={forwardedTags}
       />
         )}
       {isEmailPreview && (
         <EmailPreviewV2
           templateData={templateData}
-         />
+          forwardedTags={forwardedTags}
+        />
       )
       }
-      {isMpushPreview &&
-        <MobilePushPreview templateData={templateData} channel={channel}/>
-      }
+      {isMpushPreview && (
+        <MobilePushPreview
+          templateData={templateData}
+          channel={channel}
+          forwardedTags={forwardedTags}
+        />
+      )}
       {isEditSms && (
-      <SmsEdit
-        setIsLoadingContent={setIsLoadingContent}
-        location={creativesLocationProps}
-        isFullMode={isFullMode}
-        route={{ name: 'sms' }}
-        params={{id: templateData._id}}
-        isGetFormData={isGetFormData}
-        getFormSubscriptionData={getFormData}
-        getDefaultTags={type}
-        templateData={templateData}
-        // subscriptionTemplateDetails={templateData} // used only in library mode
-          />
-        )}
+        <SmsEdit
+          setIsLoadingContent={setIsLoadingContent}
+          location={creativesLocationProps}
+          isFullMode={isFullMode}
+          route={{ name: 'sms' }}
+          params={{id: templateData._id}}
+          isGetFormData={isGetFormData}
+          getFormSubscriptionData={getFormData}
+          getDefaultTags={type}
+          templateData={templateData}
+          forwardedTags={forwardedTags}
+        />
+      )}
       {
         isEditCallTask &&
           <CallTask
             mode={'edit'}
             templateData={templateData}
             onCallTaskSubmit={onCallTaskSubmit}
-        />
+            forwardedTags={forwardedTags}
+          />
       }
       {
          isCreateCallTask &&
          <CallTask
            mode={'create'}
            onCallTaskSubmit={onCallTaskSubmit}
+           forwardedTags={forwardedTags}
         />
        }
       {isCreateSms && (
@@ -157,7 +167,8 @@ function SlideBoxContent(props) {
         getFormSubscriptionData={getFormData}
         getDefaultTags={type}
         isFullMode={isFullMode}
-          />
+        forwardedTags={forwardedTags}
+      />
         )}
       {isEmailCreate && (
       <EmailWrapper
@@ -177,6 +188,7 @@ function SlideBoxContent(props) {
         onResetStep={onResetStep}
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
+        forwardedTags={forwardedTags}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -198,7 +210,8 @@ function SlideBoxContent(props) {
         cap={cap}
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
-          />
+        forwardedTags={forwardedTags}
+      />
         )}
       {isEditMPush &&
         <MobliPushEdit
@@ -216,6 +229,7 @@ function SlideBoxContent(props) {
           showTemplateName={showTemplateName}
           getDefaultTags={type}
           onValidationFail={onValidationFail}
+          forwardedTags={forwardedTags}
         />
         }
       {isCreateMPush &&
@@ -238,6 +252,7 @@ function SlideBoxContent(props) {
         onResetStep={onResetStep}
         showTemplateName={showTemplateName}
         query={query}
+        forwardedTags={forwardedTags}
         onValidationFail={onValidationFail}/>
         }
     </CreativesWrapper>
@@ -271,5 +286,6 @@ SlideBoxContent.propTypes = {
   showTemplateName: PropTypes.func,
   onValidationFail: PropTypes.func,
   channelsToHide: PropTypes.array,
+  forwardedTags: PropTypes.object,
 };
 export default SlideBoxContent;

package/v2Containers/CreativesContainer/index.js

@@ -119,8 +119,11 @@ class Creatives extends React.Component {
       channel: 'CALL_TASK',
       ...data,
     });
-  }
+  };
 
+  onValidationFail = () => {
+    this.setState({ isGetFormData: false });
+  };
   getTemplateData = (templateData) => { //from consumers to creatives
     const {isFullMode} = this.props;
     if (!isFullMode && templateData) { // for component mode
@@ -224,6 +227,7 @@ class Creatives extends React.Component {
     }
     return templateData;
   };
+
   getSlideBocContent({mode, templateData, isFullMode}) {
     let creativesMode = isFullMode ? 'createTemplate' : 'templates';// for library mode templates page is initial mode and for full mode createTemplates
     if (mode === 'create' && isFullMode) {
@@ -253,7 +257,6 @@ class Creatives extends React.Component {
       );
     }
   };
-
   setIsLoadingContent = (isLoadingContent) => {
     if (this.state.isLoadingContent !== isLoadingContent) {
       this.setState({isLoadingContent });
@@ -280,9 +283,6 @@ class Creatives extends React.Component {
   saveMessage = () => {
     this.setState({ isGetFormData: true });
   };
-  onValidationFail = () => {
-    this.setState({ isGetFormData: false });
-  }
   discardMessage = () => {
     this.setState({ isDiscardMessage: true });
   }
@@ -404,10 +404,11 @@ class Creatives extends React.Component {
       const name = get(formData, 'template-name');
       return showTemplateNameComponentEdit ? this.templateNameComponentInput({formData, onFormDataChange, name}) : this.templateNameComponentHeader({formData, onFormDataChange, name});
     }
+    return false;
   }
   render() {
     const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage} = this.state;
-    const {isFullMode, creativesMode, cap, isUploading, channelsToHide} = this.props;
+    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, forwardedTags} = this.props;
     return (
       <SlideBoxWrapper className={classnames(`${classPrefix} ${isFullMode ? 'creatives-full-mode' : 'creatives-library-mode'}`)}>
         <CapSlideBox
@@ -458,6 +459,7 @@ class Creatives extends React.Component {
               showTemplateName={this.showTemplateName}
               onValidationFail={this.onValidationFail}
               channelsToHide={channelsToHide}
+              forwardedTags={forwardedTags}
             />
           }
           footer={this.shouldShowFooter() &&
@@ -503,6 +505,7 @@ Creatives.propTypes = {
   isUploading: PropTypes.bool,
   EmailLayout: PropTypes.string,
   channelsToHide: PropTypes.array,
+  forwardedTags: PropTypes.object,
 };
 const mapStatesToProps = () => createStructuredSelector({
   isLoading: isLoadingSelector(),

package/v2Containers/Ebill/index.js

@@ -7,24 +7,23 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Spin, Row, Col, Breadcrumb } from 'antd';
 import Helmet from 'react-helmet';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import _ from 'lodash';
 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 '../Cap/actions';
-import { UserIsAuthenticated } from '../../utils/authWrapper';
 import { makeSelectTemplates } from '../Templates/selectors';
 import {getMessageObject} from '../../utils/messageUtils';
 import makeSelectEbill from './selectors';
 import messages from './messages';
 import EmailPreview from '../../v2Components/EmailPreview';
 import './_ebill.scss';
+import withCreatives from '../../hoc/withCreatives';
+
 const BreadcrumbItem = Breadcrumb.Item;
 
 export class Ebill extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -1253,8 +1252,12 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Ebill)));
+export default withCreatives({
+  WrappedComponent: Ebill,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/Email/index.js

@@ -7,10 +7,9 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Row, Col, Popover, Modal } from 'antd';
-import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
+import { intlShape, FormattedMessage } from 'react-intl';
 import { CapButton, CapInput, CapSpin, CapSlideBox, CapCustomCard, CapNotification } from '@capillarytech/cap-ui-library';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
@@ -19,8 +18,6 @@ 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 '../Cap/actions';
-import { UserIsAuthenticated } from '../../utils/authWrapper';
 import {makeSelectEmail} from './selectors';
 import { makeSelectTemplates } from '../Templates/selectors';
 import messages from './messages';
@@ -31,6 +28,8 @@ import EmailPreview from '../../v2Components/EmailPreview';
 
 import Pagination from '../../v2Components/Pagination';
 import * as creativesContainerActions from '../CreativesContainer/actions';
+import withCreatives from '../../hoc/withCreatives';
+
 const {CapCustomCardList} = CapCustomCard;
 export class Email extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -1421,6 +1420,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
             newContainerInputFieldCol.style.display = isDragDrop ? "none" : '';
           }
           if (containerInputFieldCol.id === 'tab-options-popover') {
+            // eslint-disable-next-line no-param-reassign
             containerInputFieldCol.colStyle.display = isDragDrop ? "flex" : "none";
             _.forEach(containerInputFieldCol.content.sections[0].inputFields, (tabPopoverSection) => {
               if (tabPopoverSection.cols[0].id === 'switch-editor-label') {
@@ -2684,11 +2684,14 @@ const mapStateToProps = (state, props) => createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     templatesActions: bindActionCreators(templatesActions, dispatch),
     creativesContainerActions: bindActionCreators(creativesContainerActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Email)));
-
+export default withCreatives({
+  WrappedComponent: Email,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/LanguageProvider/actions.js

@@ -4,19 +4,14 @@
  *
  */
 
-import * as types from './constants';
+import {
+  CHANGE_LOCALE,
+} from './constants';
 
 export function changeLocale(languageLocale) {
   console.log('trying to change locale', languageLocale);
   return {
-    type: types.CHANGE_LOCALE,
+    type: CHANGE_LOCALE,
     locale: languageLocale,
   };
 }
-
-export function getLocizMessage(locale) {
-  return {
-    type: types.GET_LOCIZ_MESSAGE_REQUEST,
-    locale,
-  };
-}

package/v2Containers/LanguageProvider/constants.js

@@ -6,10 +6,3 @@
 
 export const CHANGE_LOCALE = 'app/LanguageToggle/CHANGE_LOCALE';
 export const DEFAULT_LOCALE = 'en';
-
-export const GET_LOCIZ_MESSAGE_REQUEST =
-  'app/LanguageProvider/GET_LOCIZ_MESSAGE_REQUEST';
-export const GET_LOCIZ_MESSAGE_SUCCESS =
-  'app/LanguageProvider/GET_LOCIZ_MESSAGE_SUCCESS';
-export const GET_LOCIZ_MESSAGE_FAILURE =
-  'app/LanguageProvider/GET_LOCIZ_MESSAGE_FAILURE';

package/v2Containers/LanguageProvider/index.js

@@ -10,36 +10,15 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { createStructuredSelector } from 'reselect';
+import { createSelector } from 'reselect';
 import { IntlProvider } from 'react-intl';
-import { bindActionCreators } from 'redux';
-import * as actions from './actions';
-import { makeSelectLocale } from './selectors';
 
+import { makeSelectLocale } from './selectors';
 
 export class LanguageProvider extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
-  componentDidMount() {
-    const user = localStorage.getItem('user');
-    let locale = localStorage.getItem('jlocale') || 'en';
-    if (user) {
-      locale = JSON.parse(user).lang;
-    }
-    locale = this.getMappedLocale(locale);
-    this.props.actions.getLocizMessage(locale);
-  }
-
-  getMappedLocale = (locale) => {
-    const map = {
-      'en': 'en-US',
-      'zh-cn': 'zh',
-    };
-    return map[locale];
-  };
-
   render() {
-    const { locale, messages} = this.props.language;
     return (
-      <IntlProvider locale={locale} key={locale} messages={messages}>
+      <IntlProvider locale={this.props.locale} key={this.props.locale} messages={this.props.messages[this.props.locale]}>
         {React.Children.only(this.props.children)}
       </IntlProvider>
     );
@@ -47,19 +26,20 @@ export class LanguageProvider extends React.PureComponent { // eslint-disable-li
 }
 
 LanguageProvider.propTypes = {
-  language: PropTypes.object,
-  actions: PropTypes.object,
+  locale: PropTypes.string,
+  messages: PropTypes.object,
   children: PropTypes.element.isRequired,
 };
 
 
-const mapStateToProps = createStructuredSelector({
-  language: makeSelectLocale(),
-});
+const mapStateToProps = createSelector(
+  makeSelectLocale(),
+  (locale) => ({ locale })
+);
 
 function mapDispatchToProps(dispatch) {
   return {
-    actions: bindActionCreators(actions, dispatch),
+    dispatch,
   };
 }
 

package/v2Containers/LanguageProvider/reducer.js

@@ -6,30 +6,22 @@
 
 import { fromJS } from 'immutable';
 
-import * as types from './constants';
+import {
+  CHANGE_LOCALE,
+} from './constants';
 import {
   DEFAULT_LOCALE,
 } from '../Cap/constants'; // eslint-disable-line
 
 const initialState = fromJS({
   locale: DEFAULT_LOCALE,
-  messages: [],
-  localeLoading: false,
 });
 
 function languageProviderReducer(state = initialState, action) {
   switch (action.type) {
-    case types.CHANGE_LOCALE:
+    case CHANGE_LOCALE:
       return state
         .set('locale', action.locale);
-    case types.GET_LOCIZ_MESSAGE_REQUEST:
-      return state.set('localeLoading', true);
-    case types.GET_LOCIZ_MESSAGE_SUCCESS:
-      return state
-        .set('localeLoading', false)
-        .set('messages', fromJS(action.data));
-    case types.GET_LOCIZ_MESSAGE_FAILURE:
-      return state.set('localeLoading', false);
     default:
       return state;
   }

package/v2Containers/LanguageProvider/selectors.js

@@ -11,7 +11,7 @@ const selectLanguage = (state) => state.get('language');
 
 const makeSelectLocale = () => createSelector(
   selectLanguage,
-  (languageState) => languageState.toJS()
+  (languageState) => languageState.get('locale')
 );
 
 export {

package/v2Containers/Line/Create/index.js

@@ -1,22 +1,20 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import {connect} from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { Row, Col, Spin, Breadcrumb } from 'antd';
 import _ from 'lodash';
 import messages from './messages';
 import * as actions from './actions';
 import FormBuilder from '../../../v2Components/FormBuilder';
-import { UserIsAuthenticated } from '../../../utils/authWrapper';
-import * as globalActions from '../../Cap/actions';
 //import { makeSelectCreate, makeSelectCreateResponse, makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse } from './selectors';
 import {makeSelectCreateLine} from './selectors';
 import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';
 import {getMessageObject} from '../../../utils/messageUtils';
 import { makeSelectTemplates } from '../../Templates/selectors';
 import './_lineCreate.scss';
+import withCreatives from '../../../hoc/withCreatives';
 
 const BreadcrumbItem = Breadcrumb.Item;
 
@@ -813,8 +811,12 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Line)));
+export default withCreatives({
+  WrappedComponent: Line,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/Line/Edit/index.js

@@ -9,21 +9,20 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import {bindActionCreators} from "redux";
-import { connect } from 'react-redux';
 import { Row, Col, Spin, Breadcrumb, notification } from 'antd';
 import { createStructuredSelector } from 'reselect';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import _ from 'lodash';
 import {makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse} from "../../MobilePush/Edit/selectors";
 import {makeSelectMetaEntities, setInjectedTags} from "../../Cap/selectors";
 import {getMessageObject} from "../../../utils/messageUtils";
 import FormBuilder from '../../../v2Components/FormBuilder';
-import * as globalActions from "../../Cap/actions";
 import * as actions from "../../MobilePush/Edit/actions";
 import * as templatesActions from "../../Templates/actions";
 import {makeSelectTemplates} from "../../Templates/selectors";
 import messages from './messages';
 import './_lineEdit.scss';
+import withCreatives from '../../../hoc/withCreatives';
 
 const BreadcrumbItem = Breadcrumb.Item;
 
@@ -1040,9 +1039,13 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     templatesActions: bindActionCreators(templatesActions, dispatch),
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Edit));
+export default withCreatives({
+  WrappedComponent: Edit,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: false,
+});

package/v2Containers/MobilePush/Create/index.js

@@ -7,20 +7,19 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { notification } from 'antd';
 import {get, set, filter, isEmpty, map, forEach, uniqueId, cloneDeep, isEqual, findIndex} from 'lodash';
 import { createStructuredSelector } from 'reselect';
-import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
+import { intlShape, FormattedMessage } from 'react-intl';
 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 '../../Cap/actions';
 import FormBuilder from '../../../v2Components/FormBuilder';
 import './_mobilePushCreate.scss';
 import * as actions from './actions';
+import withCreatives from '../../../hoc/withCreatives';
 
 import {getMessageObject} from '../../../utils/messageUtils';
 import { makeSelectTemplates } from '../../Templates/selectors';
@@ -1809,8 +1808,12 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Create));
+export default withCreatives({
+  WrappedComponent: Create,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: false,
+});

package/v2Containers/MobilePush/Edit/index.js

@@ -9,10 +9,9 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import {bindActionCreators} from "redux";
-import { connect } from 'react-redux';
 import { notification } from 'antd';
 import { createStructuredSelector } from 'reselect';
-import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
+import { intlShape, FormattedMessage } from 'react-intl';
 import _, {get, findIndex, set, forEach, cloneDeep} from 'lodash';
 import { CapSpin, CapSlideBox, CapHeader, CapTable, CapLink, CapRow, CapColumn, CapIcons, CapNotification} from '@capillarytech/cap-ui-library';
 import styled from 'styled-components';
@@ -20,13 +19,13 @@ import {makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsRespons
 import {makeSelectMetaEntities, setInjectedTags, isLoadingMetaEntities} from "../../Cap/selectors";
 import {getMessageObject} from "../../../utils/messageUtils";
 import FormBuilder from '../../../v2Components/FormBuilder';
-import * as globalActions from "../../Cap/actions";
 import * as actions from "../../MobilePush/Edit/actions";
 import * as templatesActions from "../../Templates/actions";
 import {makeSelectTemplates} from "../../Templates/selectors";
 import messages from './messages';
 import './_mobilePushCreate.scss';
 import {makeSelectCreate} from "../Create/selectors";
+import withCreatives from '../../../hoc/withCreatives';
 
 import getEventsMap from '../eventsMap';
 import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields} from '../commonMethods';
@@ -1902,9 +1901,13 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     templatesActions: bindActionCreators(templatesActions, dispatch),
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Edit));
+export default withCreatives({
+  WrappedComponent: Edit,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: false,
+});

package/v2Containers/Sms/Create/index.js

@@ -7,27 +7,26 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { CapRow, CapColumn, CapSpin, CapNotification } from '@capillarytech/cap-ui-library';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { makeSelectCreate, makeSelectCreateResponse } from './selectors';
 import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../../Cap/selectors';
-import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import './_smsCreate.scss';
 import FormBuilder from '../../../v2Components/FormBuilder';
 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 '../../Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
 import {SMS} from '../../CreativesContainer/constants';
 // import callNativeEvent from '../../../utils/callNativeEvent';
 import {showError} from '../commonMethods';
+import withCreatives from '../../../hoc/withCreatives';
+
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -1009,9 +1008,13 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     creativesContainerActions: bindActionCreators(creativesContainerActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Create)));
+export default withCreatives({
+  WrappedComponent: Create,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/Sms/Edit/index.js

@@ -8,25 +8,24 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { CapRow, CapColumn, CapSpin, CapNotification } from '@capillarytech/cap-ui-library';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse } from './selectors';
 import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../../Cap/selectors';
-import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import FormBuilder from '../../../v2Components/FormBuilder';
 import * as actions from './actions';
 import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
 import '../Create/_smsCreate.scss';
 import messages from './messages';
-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';
+import withCreatives from '../../../hoc/withCreatives';
+
 export class Edit extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -1009,9 +1008,13 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     creativesContainerActions: bindActionCreators(creativesContainerActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Edit)));
+export default withCreatives({
+  WrappedComponent: Edit,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/WeChat/MapTemplates/index.js

@@ -7,10 +7,9 @@
 import PropTypes from 'prop-types';
 
 import React from 'react';
-import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import Helmet from 'react-helmet';
-import { injectIntl, intlShape } from 'react-intl';
+import { intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { Row, Col, Spin } from 'antd';
 import _ from 'lodash';
@@ -20,15 +19,10 @@ import makeSelectWeChat from './selectors';
 import messages from './messages';
 import * as actions from './actions';
 import FormBuilder from '../../../v2Components/FormBuilder';
-import { UserIsAuthenticated } from '../../../utils/authWrapper';
-import * as globalActions from '../../Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as templateActions from '../../Templates/actions';
-// import SlideBox from '../../v2Components/SlideBox';
-// import PageHeader from '../../v2Components/PageHeader';
 import './_mapTemplates.scss';
-
-// const Option = Select.Option;
+import withCreatives from '../../../hoc/withCreatives';
 
 export class MapTemplates extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -1376,9 +1370,13 @@ const mapStateToProps = createStructuredSelector({
 function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(actions, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
     templateActions: bindActionCreators(templateActions, dispatch),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(MapTemplates)));
+export default withCreatives({
+  WrappedComponent: MapTemplates,
+  mapStateToProps,
+  mapDispatchToProps,
+  userAuth: true,
+});

package/v2Containers/LanguageProvider/sagas.js

@@ -1,39 +0,0 @@
-import { takeLatest, take, all, cancel, call, put } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
-import * as Api from '../../services/api';
-import * as types from './constants';
-
-function* getLocizMessage(action) {
-  try {
-    const result = yield call(Api.getLocizMessage, action.locale);
-    yield [
-      put({
-        type: types.GET_LOCIZ_MESSAGE_SUCCESS,
-        data: result,
-      }),
-    ];
-  } catch (error) {
-    yield [
-      put({
-        type: types.GET_LOCIZ_MESSAGE_FAILURE,
-        data: error,
-      }),
-    ];
-  }
-}
-export function* watchGetLocizMessage() {
-  const watcher = yield takeLatest(
-    types.GET_LOCIZ_MESSAGE_REQUEST,
-    getLocizMessage,
-  );
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
-}
-
-export default [watchGetLocizMessage];
-
-export function* LanguageProviderRootSaga() {
-  yield all([
-    watchGetLocizMessage(),
-  ]);
-}