@capillarytech/creatives-library 3.0.31 → 3.0.32

package/containers/WeChat/MapTemplates/index.js

@@ -69,8 +69,8 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       isLoading: true,
       showModal: false,
       modalContent: {
-        title: "Alert",
-        body: "Do you really want to go back? All your temporary changes will be lost!",
+        title: this.props.intl.formatMessage(messages.alertMessage),
+        body: this.props.intl.formatMessage(messages.goBackTemporaryConfirmation),
         type: 'confirm',
         id: 'template-back-confirm-modal',
       },
@@ -559,8 +559,8 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
   moveToTemplates() {
     console.log('in move to Templates');
     const modalContent = {
-      title: "Alert",
-      body: "Do you really want to go back? All your temporary changes will be lost!",
+      title: this.props.intl.formatMessage(messages.alertMessage),
+      body: this.props.intl.formatMessage(messages.goBackConfirmation),
       type: 'confirm',
       id: 'template-back-confirm-modal',
       show: true,
@@ -605,10 +605,10 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       let title = tagTitle;
 
       if (tagTitle.match(/first/i)) {
-        title = "Header";
+        title = this.props.intl.formatMessage(messages.mapTemplateHeader);
       }
       if (tagTitle.match(/remark/i)) {
-        title = "Footer";
+        title = this.props.intl.formatMessage(messages.mapTemplateFooter);
       }
 
       const colsData = {
@@ -641,7 +641,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
             type: "input",  //Resembles component to be used
             metaType: "text",
             datatype: "string",
-            errorMessage: `${title} has invalid content.`,
+            errorMessage: `${title} ${this.props.intl.formatMessage(messages.invalidContent)}`,
             required: true,
             fluid: true,
             disabled: (this.props.location.query.type === 'embedded'),
@@ -725,7 +725,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
           {
             id: "template-label-link",
             metaType: "label",
-            value: 'Link',
+            value: this.props.intl.formatMessage(messages.loadingEDMTemplates),
             primitive: true,
             type: "div",
             width: 4,
@@ -750,7 +750,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
             type: "input",  //Resembles component to be used
             metaType: "text",
             datatype: "string",
-            errorMessage: `Link cannot be empty.`,
+            errorMessage: this.props.intl.formatMessage(messages.linkCantEmpty),
             required: true,
             fluid: true,
             disabled: (this.props.location.query.type === 'embedded'),
@@ -777,7 +777,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         cols: [
           {
             id: "is-internal-url",
-            label: 'Is this internal url',
+            label: this.props.intl.formatMessage(messages.isInternalUrl),
             standalone: true,
             labelStyle: {
               backgroundColor: "white",

package/containers/WeChat/MapTemplates/messages.js

@@ -7,67 +7,99 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "header": {
-    id: 'app.containers.WeChat.header',
+    id: 'creatives.containers.WeChat.header',
     defaultMessage: 'WeChat',
   },
   'Template mapping': {
-    id: 'app.containers.WeChat.templateMapping',
+    id: 'creatives.containers.WeChat.templateMapping',
     defaultMessage: 'Template mapping',
   },
   'Discard': {
-    id: 'app.containers.WeChat.discard',
+    id: 'creatives.containers.WeChat.discard',
     defaultMessage: 'Discard',
   },
   'Cancel': {
-    id: 'app.containers.WeChat.cancel',
+    id: 'creatives.containers.WeChat.cancel',
     defaultMessage: 'Cancel',
   },
   'Save': {
-    id: 'app.containers.WeChat.save',
+    id: 'creatives.containers.WeChat.save',
     defaultMessage: 'Save',
   },
   'Account Id': {
-    id: 'app.containers.WeChat.accountId',
+    id: 'creatives.containers.WeChat.accountId',
     defaultMessage: 'Account id',
   },
   'Select Wechat Account': {
-    id: 'app.containers.WeChat.selectWechatAccount',
+    id: 'creatives.containers.WeChat.selectWechatAccount',
     defaultMessage: 'Select wechat account',
   },
   'Template': {
-    id: 'app.containers.WeChat.template',
+    id: 'creatives.containers.WeChat.template',
     defaultMessage: 'Template',
   },
   'Select Wechat Template': {
-    id: 'app.containers.WeChat.selectWechatTemplate',
+    id: 'creatives.containers.WeChat.selectWechatTemplate',
     defaultMessage: 'Select wechat template',
   },
   'Link': {
-    id: 'app.containers.WeChat.link',
+    id: 'creatives.containers.WeChat.link',
     defaultMessage: 'Link',
   },
-  'Is this internal url': {
-    id: 'app.containers.WeChat.isInternalUrl',
+  'isInternalUrl': {
+    id: 'creatives.containers.WeChat.isInternalUrl',
     defaultMessage: 'Is this internal url',
   },
   "Tags": {
-    id: 'app.containers.WeChat.tagsLabel',
+    id: 'creatives.containers.WeChat.tagsLabel',
     defaultMessage: "Tags",
   },
   "gettingTemplateData": {
-    id: 'app.containers.WeChat.gettingTemplateData',
+    id: 'creatives.containers.WeChat.gettingTemplateData',
     defaultMessage: "Getting template data..",
   },
   "wechatEditSuccess": {
-    id: 'app.containers.WeChat.wechatEditSuccess',
+    id: 'creatives.containers.WeChat.wechatEditSuccess',
     defaultMessage: "WeChat template unmapped successfully",
   },
   "wechatCreateSuccess": {
-    id: 'app.containers.WeChat.wechatCreateSuccess',
+    id: 'creatives.containers.WeChat.wechatCreateSuccess',
     defaultMessage: "WeChat template mapped successfully",
   },
   "somethingWentWrong": {
-    id: 'app.containers.WeChat.somethingWentWrong',
+    id: 'creatives.containers.WeChat.somethingWentWrong',
     defaultMessage: "Something went wrong!!",
   },
+  "goBackConfirmation": {
+    id: 'creatives.containers.WeChat.goBackConfirmation',
+    defaultMessage: "Going back will discard all the changes you've made. Continue?",
+  },
+  "alertMessage": {
+    id: 'creatives.containers.WeChat.alertMessage',
+    defaultMessage: "Alert",
+  },
+  "goBackTemporaryConfirmation": {
+    id: 'creatives.containers.WeChat.goBackTemporaryConfirmation',
+    defaultMessage: "Do you really want to go back? All your temporary changes will be lost!",
+  },
+  "mapTemplateHeader": {
+    id: 'creatives.containers.WeChat.mapTemplateHeader',
+    defaultMessage: "Header",
+  },
+  "mapTemplateFooter": {
+    id: 'creatives.containers.WeChat.mapTemplateFooter',
+    defaultMessage: "Footer",
+  },
+  "invalidContent": {
+    id: 'creatives.containers.WeChat.invalidContent',
+    defaultMessage: "has invalid content.",
+  },
+  "link": {
+    id: 'creatives.containers.WeChat.link',
+    defaultMessage: "Link",
+  },
+  "linkCantEmpty": {
+    id: 'creatives.containers.WeChat.linkCantEmpty',
+    defaultMessage: "Link cannot be empty",
+  },
 });

package/containers/WeChat/RichmediaTemplates/Create/messages.js

@@ -7,135 +7,135 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "header": {
-    id: 'app.containers.Create.header',
+    id: 'creatives.containers.Create.header',
     defaultMessage: 'This is Create container !',
   },
   "titleCharacterCount": {
-    id: 'app.containers.Create.titleCharacterCount',
+    id: 'creatives.containers.Create.titleCharacterCount',
     defaultMessage: 'Title exceeds character count limit by',
   },
   "authorCharacterCount": {
-    id: 'app.containers.Create.authorCharacterCount',
+    id: 'creatives.containers.Create.authorCharacterCount',
     defaultMessage: 'Author exceeds character count limit by',
   },
   "coverAbstractCharacterCount": {
-    id: 'app.containers.Create.coverAbstractCharacterCount',
+    id: 'creatives.containers.Create.coverAbstractCharacterCount',
     defaultMessage: 'Cover abstract exceeds character count limit by',
   },
   "saveSuccess": {
-    id: 'app.containers.Create.saveSuccess',
+    id: 'creatives.containers.Create.saveSuccess',
     defaultMessage: 'Template saved successfully',
   },
   "modalTitle": {
-    id: 'app.containers.Create.modalTitle',
+    id: 'creatives.containers.Create.modalTitle',
     defaultMessage: 'Alert',
   },
   "modalBody": {
-    id: 'app.containers.Create.modalBody',
+    id: 'creatives.containers.Create.modalBody',
     defaultMessage: 'Do you really want to go back? All your temporary changes will be lost!',
   },
   "deleteContent": {
-    id: 'app.containers.Create.deleteContent',
+    id: 'creatives.containers.Create.deleteContent',
     defaultMessage: 'Do you really want to delete? All your temporary changes will be lost!',
   },
   "emptyTemplateName": {
-    id: 'app.containers.Create.emptyTemplateName',
+    id: 'creatives.containers.Create.emptyTemplateName',
     defaultMessage: 'Cannot leave template name empty',
   },
   "wrongFormatFile": {
-    id: 'app.containers.Create.wrongFormatFile',
+    id: 'creatives.containers.Create.wrongFormatFile',
     defaultMessage: 'Wrong file upoaded. Please upload image file',
   },
   "formEmpty": {
-    id: 'app.containers.Create.formEmpty',
+    id: 'creatives.containers.Create.formEmpty',
     defaultMessage: 'Cannot leave form empty',
   },
   "titleEmpty": {
-    id: 'app.containers.Create.titleEmpty',
+    id: 'creatives.containers.Create.titleEmpty',
     defaultMessage: 'Cannot leave title field empty',
   },
   "noImage": {
-    id: 'app.containers.Create.noImage',
+    id: 'creatives.containers.Create.noImage',
     defaultMessage: 'Please upload an image',
   },
   "sourceLinkEmpty": {
-    id: 'app.containers.Create.sourceLinkEmpty',
+    id: 'creatives.containers.Create.sourceLinkEmpty',
     defaultMessage: 'Cannot leave source link field empty',
   },
   "contentEmpty": {
-    id: 'app.containers.Create.contentEmpty',
+    id: 'creatives.containers.Create.contentEmpty',
     defaultMessage: 'Cannot leave content field empty',
   },
   "titleNameRepeated": {
-    id: 'app.containers.Create.titleNameRepeated',
+    id: 'creatives.containers.Create.titleNameRepeated',
     defaultMessage: 'Title name cannot be repeated',
   },
   "wrongUrl": {
-    id: 'app.containers.Create.wrongUrl',
+    id: 'creatives.containers.Create.wrongUrl',
     defaultMessage: 'Enter correct URL',
   },
   "maxContentCount": {
-    id: 'app.containers.Create.maxContentCount',
+    id: 'creatives.containers.Create.maxContentCount',
     defaultMessage: 'You have reached the maximum template size',
   },
   "addNewRichmedia": {
-    id: 'app.containers.Create.addNewRichmedia',
+    id: 'creatives.containers.Create.addNewRichmedia',
     defaultMessage: 'Add richmedia content',
   },
   'Title*': {
-    id: 'app.containers.Create.Title*',
+    id: 'creatives.containers.Create.Title*',
     defaultMessage: 'Title*',
   },
   'Please input title': {
-    id: 'app.containers.Create.Please_input_title',
+    id: 'creatives.containers.Create.Please_input_title',
     defaultMessage: 'Please input title',
   },
   'Author': {
-    id: 'app.containers.Create.Author',
+    id: 'creatives.containers.Create.Author',
     defaultMessage: 'Author',
   },
   'Please input author': {
-    id: 'app.containers.Create.Please_input_author',
+    id: 'creatives.containers.Create.Please_input_author',
     defaultMessage: 'Please input author',
   },
   'Cover image*': {
-    id: 'app.containers.Create.Cover_image*',
+    id: 'creatives.containers.Create.Cover_image*',
     defaultMessage: 'Cover image*',
   },
   'Cover abstract': {
-    id: 'app.containers.Create.Cover_abstract',
+    id: 'creatives.containers.Create.Cover_abstract',
     defaultMessage: 'Cover abstract',
   },
   'Please input cover abstract': {
-    id: 'app.containers.Create.Please_input_cover_abstract',
+    id: 'creatives.containers.Create.Please_input_cover_abstract',
     defaultMessage: 'Please input cover abstract',
   },
   'Content*': {
-    id: 'app.containers.Create.Content*',
+    id: 'creatives.containers.Create.Content*',
     defaultMessage: 'Content*',
   },
   'Please input content': {
-    id: 'app.containers.Create.Please_input_content',
+    id: 'creatives.containers.Create.Please_input_content',
     defaultMessage: 'Please input content',
   },
   'Show cover picture': {
-    id: 'app.containers.Create.Show_cover_picture',
+    id: 'creatives.containers.Create.Show_cover_picture',
     defaultMessage: 'Show cover picture',
   },
   'Who can post comments on this content': {
-    id: 'app.containers.Create.Who_can_post_comments_on_this_content',
+    id: 'creatives.containers.Create.Who_can_post_comments_on_this_content',
     defaultMessage: 'Who can post comments on this content',
   },
   'No one': {
-    id: 'app.containers.Create.No_one',
+    id: 'creatives.containers.Create.No_one',
     defaultMessage: 'No one',
   },
   'Anyone': {
-    id: 'app.containers.Create.Anyone',
+    id: 'creatives.containers.Create.Anyone',
     defaultMessage: 'Anyone',
   },
   'Only followers': {
-    id: 'app.containers.Create.Only_followers',
+    id: 'creatives.containers.Create.Only_followers',
     defaultMessage: 'Only followers',
   },
 });

package/containers/WeChat/RichmediaTemplates/Edit/messages.js

@@ -7,7 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.containers.Edit.header',
+    id: 'creatives.containers.Edit.header',
     defaultMessage: 'This is Edit container !',
   },
 });

package/containers/WeChat/RichmediaTemplates/View/index.js

@@ -19,9 +19,9 @@ export class View extends React.PureComponent { // eslint-disable-line react/pre
     return (
       <div>
         <Helmet
-          title="View"
+          title={<FormattedMessage {...messages.view} />}
           meta={[
-            { name: 'description', content: 'Description of View' },
+            { name: 'description', content: <FormattedMessage {...messages.descriptionView} /> },
           ]}
         />
         <FormattedMessage {...messages.header} />

package/containers/WeChat/RichmediaTemplates/View/messages.js

@@ -7,7 +7,15 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.containers.View.header',
+    id: 'creatives.containers.View.header',
     defaultMessage: 'This is View container !',
   },
+  view: {
+    id: 'creatives.containers.View.view',
+    defaultMessage: 'View',
+  },
+  descriptionView: {
+    id: 'creatives.containers.View.descriptionView',
+    defaultMessage: 'Description of View',
+  },
 });

package/hoc/withStyles.js

@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+/**
+ * Higher Order Component to have consistent logic of styling components
+ * @param {*} WrappedComponent
+ * @returns {*} styled wrapped component
+ */
+export default (WrappedComponent, styles) => {
+  const StyledComponent = styled(WrappedComponent)`${styles};`;
+  StyledComponent.defaultProps = WrappedComponent.defaultProps;
+  return StyledComponent;
+};

package/index.js

@@ -3,6 +3,10 @@ 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';
@@ -47,7 +51,7 @@ import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
 import CreativesContainer from './v2Containers/CreativesContainer';
 import CreativesContainerReducer from './v2Containers/CreativesContainer/reducer';
-
+import { updateCharCount } from './utils/smsCharCountV2';
 
 export {default as Ebill} from './v2Containers/Ebill';
 export {default as EbillReducer} from './v2Containers/Ebill/reducer';
@@ -55,6 +59,7 @@ 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};
@@ -79,6 +84,7 @@ export {default as MobilePushPreview} from './v2Components/MobilePushPreviewV2';
 CreativesContainer.CreativesContainerReducer = CreativesContainerReducer;
 
 export { CapContainer,
+  LanguageProviderContainer,
   TemplatesContainer,
   SmsCreateContainer,
   SmsEditContainer,
@@ -97,4 +103,5 @@ export { CapContainer,
   TemplatesV2Container,
   CreativesContainer,
   WeChat,
+  updateCharCount,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "3.0.31",
+  "version": "3.0.32",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -16,9 +16,7 @@
     "jquery": "^3.3.1",
     "load-script": "^1.0.0",
     "normalizr": "^3.2.3",
-    "perfect-scrollbar": "^0.7.0",
     "react-datepicker": "^0.46.0",
-    "react-grid-layout": "^0.14.6",
     "react-router": "^3.2.0",
     "react-router-dom": "^4.2.2",
     "redux": "3.6.0",
@@ -27,7 +25,6 @@
     "redux-immutable": "3.0.8",
     "reselect": "2.5.4",
     "styled-components": "^3.2.1",
-    "warning": "3.0.0",
     "whatwg-fetch": "2.0.1"
   }
 }

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 'containers/LanguageProvider/reducer';
+import languageProviderReducer from 'v2Containers/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,8 @@ 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';
+import {updateCharCount} from './utils/smsCharCountV2';
 const errorLoading = (err) => {
   console.error('Dynamic page loading failed', err); // eslint-disable-line no-console
 };
@@ -22,8 +23,10 @@ const loadModule = (cb) => (componentModule) => {
 
 export default function createRoutes(store) {
   // Create reusable async injectors using getAsyncInjectors factory
+  updateCharCount("", false); // calling here to get unsubscribeurl from api.
   const { injectReducer, injectSagas } = getAsyncInjectors(store); // eslint-disable-line no-unused-vars
   injectSagas(rootSaga.default);
+  injectSagas(languageSaga.default);
   return [
     {
       path: '/',

package/services/api.js

@@ -9,9 +9,13 @@ 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;
+let SUBSCRIPTION_API_ENDPOINT = config.development.subscription_api_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;
+  SUBSCRIPTION_API_ENDPOINT = config.production.subscription_api_endpoint;
 }
 
 const isProd = process.env.NODE_ENV === 'production';
@@ -56,8 +60,8 @@ function checkStatus(response) {
   if ((response.status >= 200 && response.status < 300) || response.status === 500) {
     return response;
   }
-
-  redirectIfUnauthenticated(response);
+  const isLoginPage = window.location.pathname.indexOf('/login') !== -1;
+  if (!isLoginPage) redirectIfUnauthenticated(response);
 
   const error = new Error(response.statusText);
   error.response = response;
@@ -316,3 +320,22 @@ export const createLineTemplate = ({template}) => {
   const url = `${API_ENDPOINT}/templates/LINE`;
   return request(url, getAPICallObject('POST', template));
 };
+
+export const getLocizMessage = async (locale) => {
+  const appName = 'creatives_v2';
+  const url = `${ARYA_ENDPOINT}/translations/${appName}/${locale}`;
+  const response = await request(url, getAPICallObject('GET'));
+  return response;
+};
+
+export const getUnsubscribeUrl = () => {
+  const body = {
+    orgUnitId: -1,
+    source: 'INSTORE',
+    accountId: '',
+    priority: 'BULK',
+    channel: 'mobile',
+  };
+  const url = `${SUBSCRIPTION_API_ENDPOINT}/unsubscribeUrl`;
+  return request(url, getAPICallObject('POST', body));
+};