@capillarytech/creatives-library 6.11.5 → 6.11.6

package/app.js

@@ -37,7 +37,7 @@ const history = syncHistoryWithStore(browserHistory, store, {
   selectLocationState: makeSelectLocationState(),
 });
 
-const bugSnagErrorCallback = event => {
+const bugSnagErrorCallback = (event) => {
   let userId;
   let userName;
   let userEmail;
@@ -66,7 +66,7 @@ const bugSnagErrorCallback = event => {
   event.addMetadata('org', {
     name: orgName,
     id: orgId,
-  })
+  });
   event.setUser(userId, userEmail, userName);
 };
 
@@ -87,7 +87,7 @@ export const BugsnagClient = Bugsnag;
 const rootRoute = {
   component: (props) => {
     // eslint-disable-next-line react/prop-types
-    if (props.location.pathname === 'v2') {
+    if (props.location.pathname === 'v2' || props.location.pathname === 'v2/') {
       return <CapV2 {...props} />;
     }
     return <Cap {...props} />;

package/config/app.js

@@ -7,7 +7,7 @@ const config = {
     campaigns_api_endpoint: '/iris/v2/campaigns',
     auth_endpoint: '/arya/api/v1/auth',
     arya_endpoint: '/arya/api/v1',
-    login_url: 'auth/login',
+    login_url: '/auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
     subscription_api_endpoint: '/arya/api/v1/org-settings/subscription',
@@ -19,7 +19,7 @@ const config = {
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',
     arya_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1',
     subscription_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/org-settings/subscription',
-    login_url: 'auth/login',
+    login_url: '/auth/login',
     dashboard_url: '/sms',
     dashboard_url_v2: '/v2',
   },

package/containers/Cap/sagas.js

@@ -5,7 +5,6 @@ import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
 import * as types from './constants';
 import config from '../../config/app';
-import pathConfig from '../../config/path';
 // import {makeSelectOrgId} from './selectors';
 
 function* authorize(user) {
@@ -56,13 +55,13 @@ function* logoutFlow() {
     const serverLogout = yield call(Api.logout);
     if (serverLogout.success && serverLogout.success === true) {
       const loginUrl = (process.env.NODE_ENV === 'production') ?
-        `${pathConfig.publicPath}${config.production.login_url}` : `${pathConfig.publicPath}${config.development.login_url}`;
+        `${config.production.login_url}` : `${config.development.login_url}`;
       yield [put({type: types.LOGOUT_SUCCESS})];
       yield call(LocalStorage.clearItem, 'token');
       yield call(LocalStorage.clearItem, 'orgID');
       yield call(LocalStorage.clearItem, 'user');
       yield call(LocalStorage.clearItem, 'isLoggedIn');
-      window.location.href = loginUrl;
+      window.location.href = `${window.location.origin}${loginUrl}`;
     }
   } catch (error) {
     yield put({ type: types.LOGOUT_FAILURE, error });

package/package.json

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

package/translations/en.json

@@ -86,21 +86,6 @@
   "creatives.components.WechatRichmediaTemplatePreview.header": "This is the WechatRichmediaTemplatePreview component !",
   "creatives.components.WechatRichmediaTemplatePreview.reply": "Reply",
   "creatives.components.WechatRichmediaTemplatePreview.select": "Select",
-  "creatives.componentsV2.BeeEditor.addLabel": "Add label",
-  "creatives.componentsV2.BeeEditor.cancel": "Cancel",
-  "creatives.componentsV2.BeeEditor.cta": "CTA",
-  "creatives.componentsV2.BeeEditor.customRows": "Custom rows",
-  "creatives.componentsV2.BeeEditor.footer": "Footer",
-  "creatives.componentsV2.BeeEditor.header": "Header",
-  "creatives.componentsV2.BeeEditor.others": "Others",
-  "creatives.componentsV2.BeeEditor.rowName": "Row name",
-  "creatives.componentsV2.BeeEditor.rowPlaceHolder": "Enter Row name",
-  "creatives.componentsV2.BeeEditor.save": "Save",
-  "creatives.componentsV2.BeeEditor.select": "Select",
-  "creatives.componentsV2.BeeEditor.selectCategoyPlaceholder": "Select category",
-  "creatives.componentsV2.BeeEditor.socialPlatform": "Social platform",
-  "creatives.componentsV2.BeeEditor.tagPlaceHolder": "Enter tags",
-  "creatives.componentsV2.BeeEditor.tags": "Tags (optional)",
   "creatives.componentsV2.BreadCrumbs.header": "This is the BreadCrumbs component !",
   "creatives.componentsV2.CallTaskPreview.header": "This is the CallTaskPreview component !",
   "creatives.componentsV2.CapTagList.Cancel": "Cancel",
@@ -793,6 +778,20 @@
   "creatives.containersV2.Assets.Gallery.uploadedAt": "Uploaded at",
   "creatives.containersV2.Assets.Gallery.uploadedBy": "Uploaded by",
   "creatives.containersV2.Assets.Gallery.uploadedOn": "Uploaded on",
+  "creatives.containersV2.BeeEditor.addLabel": "Add label",
+  "creatives.containersV2.BeeEditor.cta": "CTA",
+  "creatives.containersV2.BeeEditor.customRows": "Create new row",
+  "creatives.containersV2.BeeEditor.done": "Done",
+  "creatives.containersV2.BeeEditor.footer": "Footer",
+  "creatives.containersV2.BeeEditor.header": "Header",
+  "creatives.containersV2.BeeEditor.others": "Others",
+  "creatives.containersV2.BeeEditor.rowCreationFailureMgs": "Error in row creation",
+  "creatives.containersV2.BeeEditor.rowCreationSuccessMgs": "Row created successfully",
+  "creatives.containersV2.BeeEditor.rowName": "Row name",
+  "creatives.containersV2.BeeEditor.rowPlaceHolder": "Enter Row name",
+  "creatives.containersV2.BeeEditor.select": "Select",
+  "creatives.containersV2.BeeEditor.selectCategoyPlaceholder": "Select category",
+  "creatives.containersV2.BeeEditor.socialPlatform": "Social platform",
   "creatives.containersV2.CallTask.addNewCallTask": "Add new call task",
   "creatives.containersV2.CallTask.callTaskInfo": "Call Tasks are message sent to store staff. The messages are displayed on the Point of Sale (POS) machines for store staff to take action.",
   "creatives.containersV2.CallTask.callTaskTitleIllustartion": "Create a Call Task {templateText}",

package/translations/zh.json

@@ -86,21 +86,6 @@
   "creatives.components.WechatRichmediaTemplatePreview.header": "",
   "creatives.components.WechatRichmediaTemplatePreview.reply": "",
   "creatives.components.WechatRichmediaTemplatePreview.select": "",
-  "creatives.componentsV2.BeeEditor.addLabel": "",
-  "creatives.componentsV2.BeeEditor.cancel": "",
-  "creatives.componentsV2.BeeEditor.cta": "",
-  "creatives.componentsV2.BeeEditor.customRows": "",
-  "creatives.componentsV2.BeeEditor.footer": "",
-  "creatives.componentsV2.BeeEditor.header": "",
-  "creatives.componentsV2.BeeEditor.others": "",
-  "creatives.componentsV2.BeeEditor.rowName": "",
-  "creatives.componentsV2.BeeEditor.rowPlaceHolder": "",
-  "creatives.componentsV2.BeeEditor.save": "",
-  "creatives.componentsV2.BeeEditor.select": "",
-  "creatives.componentsV2.BeeEditor.selectCategoyPlaceholder": "",
-  "creatives.componentsV2.BeeEditor.socialPlatform": "",
-  "creatives.componentsV2.BeeEditor.tagPlaceHolder": "",
-  "creatives.componentsV2.BeeEditor.tags": "",
   "creatives.componentsV2.BreadCrumbs.header": "",
   "creatives.componentsV2.CallTaskPreview.header": "",
   "creatives.componentsV2.CapTagList.Cancel": "",
@@ -793,6 +778,20 @@
   "creatives.containersV2.Assets.Gallery.uploadedAt": "",
   "creatives.containersV2.Assets.Gallery.uploadedBy": "",
   "creatives.containersV2.Assets.Gallery.uploadedOn": "",
+  "creatives.containersV2.BeeEditor.addLabel": "",
+  "creatives.containersV2.BeeEditor.cta": "",
+  "creatives.containersV2.BeeEditor.customRows": "",
+  "creatives.containersV2.BeeEditor.done": "",
+  "creatives.containersV2.BeeEditor.footer": "",
+  "creatives.containersV2.BeeEditor.header": "",
+  "creatives.containersV2.BeeEditor.others": "",
+  "creatives.containersV2.BeeEditor.rowCreationFailureMgs": "",
+  "creatives.containersV2.BeeEditor.rowCreationSuccessMgs": "",
+  "creatives.containersV2.BeeEditor.rowName": "",
+  "creatives.containersV2.BeeEditor.rowPlaceHolder": "",
+  "creatives.containersV2.BeeEditor.select": "",
+  "creatives.containersV2.BeeEditor.selectCategoyPlaceholder": "",
+  "creatives.containersV2.BeeEditor.socialPlatform": "",
   "creatives.containersV2.CallTask.addNewCallTask": "",
   "creatives.containersV2.CallTask.callTaskInfo": "",
   "creatives.containersV2.CallTask.callTaskTitleIllustartion": "",

package/v2Containers/BeeEditor/index.js

@@ -256,7 +256,7 @@ function BeeEditor(props) {
   </>;
   return (
     <CapSpin spinning={saveRowRequest || false}>
-      <div id="bee-plugin-container" style={{ height: '500px'}}>
+      <div id="bee-plugin-container" style={{ height: '650px'}}>
       </div>
       <TagList
         moduleFilterEnabled={moduleFilterEnabled}

package/v2Containers/Cap/actions.js

@@ -12,7 +12,7 @@ export function authenticate(user) {
 
 export function logout() {
   return {
-    type: types.LOGOUT_REQUEST,
+    type: types.LOGOUT_REQUEST_V2,
   };
 }
 

package/v2Containers/Cap/constants.js

@@ -6,9 +6,9 @@ export const LOGIN_REQUEST = 'cap/LOGIN_REQUEST';
 export const LOGIN_SUCCESS = 'cap/LOGIN_SUCCESS';
 export const LOGIN_FAILURE = 'cap/LOGIN_FAILURE';
 
-export const LOGOUT_REQUEST = 'cap/LOGOUT_REQUEST';
-export const LOGOUT_SUCCESS = 'cap/LOGOUT_SUCCESS';
-export const LOGOUT_FAILURE = 'cap/LOGOUT_FAILURE';
+export const LOGOUT_REQUEST_V2 = 'cap/LOGOUT_REQUEST_V2';
+export const LOGOUT_SUCCESS_V2 = 'cap/LOGOUT_SUCCESS_V2';
+export const LOGOUT_FAILURE_V2 = 'cap/LOGOUT_FAILURE_V2';
 export const ADD_MESSAGE = 'cap/ADD_MESSAGE';
 export const REMOVE_MESSAGE = 'cap/REMOVE_MESSAGE';
 export const GET_USER_DATA_REQUEST = 'cap/GET_USER_DATA_REQUEST';

package/v2Containers/Cap/reducer.js

@@ -22,11 +22,11 @@ function capReducer(state = fromJS(initialState.cap), action) {
       return state
         .set('login_progress', false)
         .set('message', action.error.message);
-    case types.LOGOUT_REQUEST:
+    case types.LOGOUT_REQUEST_V2:
       return state.set('login_progress', false);
-    case types.LOGOUT_SUCCESS:
+    case types.LOGOUT_SUCCESS_V2:
       return state;
-    case types.LOGOUT_FAILURE:
+    case types.LOGOUT_FAILURE_V2:
       return state;
     case types.SWITCH_ORG_REQUEST:
       return state

package/v2Containers/Cap/sagas.js

@@ -5,7 +5,7 @@ import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
 import * as types from './constants';
 import config from '../../config/app';
-import pathConfig from '../../config/path';
+//import pathConfig from '../../config/path';
 import { getTopbarMenuDataValue } from '../../v2Containers/App/constants';
 // import {makeSelectOrgId} from './selectors';
 
@@ -42,8 +42,8 @@ function* loginFlow() {
   while (condition) {
     const { user } = yield take(types.LOGIN_REQUEST);
     const task = yield fork(authorize, user);
-    const action = yield take([types.LOGOUT_REQUEST, types.LOGIN_FAILURE]);
-    if (action.type === types.LOGOUT_REQUEST) {
+    const action = yield take([types.LOGOUT_REQUEST_V2, types.LOGIN_FAILURE]);
+    if (action.type === types.LOGOUT_REQUEST_V2) {
       yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');
@@ -57,16 +57,16 @@ function* logoutFlow() {
     const serverLogout = yield call(Api.logout);
     if (serverLogout.success && serverLogout.success === true) {
       const loginUrl = (process.env.NODE_ENV === 'production') ?
-        `${pathConfig.publicPath}${config.production.login_url}` : `${pathConfig.publicPath}${config.development.login_url}`;
-      yield [put({type: types.LOGOUT_SUCCESS})];
+        `${config.production.login_url}` : `${config.development.login_url}`;
+      yield [put({type: types.LOGOUT_SUCCESS_V2})];
       yield call(LocalStorage.clearItem, 'token');
       yield call(LocalStorage.clearItem, 'orgID');
       yield call(LocalStorage.clearItem, 'user');
       yield call(LocalStorage.clearItem, 'isLoggedIn');
-      window.location.href = loginUrl;
+      window.location.href = `${window.location.origin}${loginUrl}`;
     }
   } catch (error) {
-    yield put({ type: types.LOGOUT_FAILURE, error });
+    yield put({ type: types.LOGOUT_FAILURE_V2, error });
   }
 }
 
@@ -141,7 +141,7 @@ function* watchForOrgChange() {
 }
 
 function* watchForLogoutFlow() {
-  yield takeLatest(types.LOGOUT_REQUEST, logoutFlow);
+  yield takeLatest(types.LOGOUT_REQUEST_V2, logoutFlow);
 }
 
 function* watchForFetchUserInfo() {

package/v2Containers/LanguageProvider/index.js

@@ -45,7 +45,7 @@ export class LanguageProvider extends React.PureComponent { // eslint-disable-li
     let locale = localStorage.getItem('jlocale') || 'en';
     moment.locale(locale);
     if (user) {
-      locale = JSON.parse(user).lang;
+      locale = JSON.parse(user).lang || locale;
     }
     locale = this.getMappedLocale(locale);
     this.props.actions.getLocizMessage(locale);