@capillarytech/creatives-library 8.0.44 → 8.0.45

package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxContent.test.js.snap

@@ -85,7 +85,7 @@ exports[`Test SlideBoxContent container Should render correct component for line
     }
     viberBrandName=""
   />
-  <ForwardRef
+  <Connect(Connect(UserIsAuthenticated(InjectIntl(CreativesCommon))))
     location={
       Object {
         "pathname": "/sms/edit",
@@ -283,7 +283,7 @@ exports[`Test SlideBoxContent container Should render correct component for line
     }
     viberBrandName=""
   />
-  <ForwardRef
+  <Connect(Connect(UserIsAuthenticated(InjectIntl(CreativesCommon))))
     location={
       Object {
         "pathname": "/sms/edit",
@@ -453,7 +453,7 @@ exports[`Test SlideBoxContent container Should render correct component for line
     }
     viberBrandName=""
   />
-  <ForwardRef
+  <Connect(Connect(UserIsAuthenticated(InjectIntl(CreativesCommon))))
     location={
       Object {
         "pathname": "/sms/edit",
@@ -637,7 +637,7 @@ exports[`Test SlideBoxContent container Should render correct component for rcs
 
 exports[`Test SlideBoxContent container Should render correct component for rcs channel templates mode 1`] = `
 <SlideBoxContent__CreativesWrapper>
-  <Connect(UserIsAuthenticated(Component))
+  <Connect(UserIsAuthenticated(Connect(InjectIntl(withStyles__StyledComponent))))
     FTPMode="create"
     channel="rcs"
     location={
@@ -1027,7 +1027,7 @@ Click {{3}} to unsubscribe",
 
 exports[`Test SlideBoxContent container Should render correct component for whatsapp channel templates mode 1`] = `
 <SlideBoxContent__CreativesWrapper>
-  <Connect(UserIsAuthenticated(Component))
+  <Connect(UserIsAuthenticated(Connect(InjectIntl(withStyles__StyledComponent))))
     FTPMode="create"
     channel="whatsapp"
     location={

package/v2Containers/Email/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, takeEvery, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, takeEvery, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 import { transformEmailTemplates, storeS3FileSizeDetails } from '../../utils/cdnTransformation';
@@ -157,4 +159,4 @@ export function* v2EmailDuplicateTemplateSaga() {
   yield all([
     watchDuplicateTemplate(),
   ]);
-}
+}

package/v2Containers/FTP/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 
@@ -28,4 +30,4 @@ export function* v2FTPSagas() {
   yield all([
     watchGetFTPServers(),
   ]);
-}
+}

package/v2Containers/Facebook/sagas.js

@@ -1,4 +1,6 @@
-import { take, call, put, takeLatest, cancel, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import {
   GET_MARKETING_OBJECTIVES,
@@ -121,7 +123,9 @@ export function* editTemplate({ template, callback }) {
     if (callback) {
       callback(result.response);
     }
-    yield put({ type: EDIT_FACEBOOK_AD_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
+    yield put({
+      type: EDIT_FACEBOOK_AD_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg,
+    });
   } catch (error) {
     yield put({ type: EDIT_FACEBOOK_AD_TEMPLATE_FAILURE, error, errorMsg });
     if (callback) {
@@ -194,4 +198,4 @@ export function* v2FacebookSagas() {
     watchCreateTemplate(),
     watchGetOrgOUs(),
   ]);
-}
+}

package/v2Containers/InApp/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import {
   INAPP_TEMPLATE_CREATE_REQUEST,

package/v2Containers/InApp/tests/sagas.test.js

@@ -1,7 +1,8 @@
 import {
-  call, cancel, put, takeLatest,
+  call, put, takeLatest,
 } from 'redux-saga/effects';
 import { createMockTask } from 'redux-saga/utils';
+import { expectSaga } from 'redux-saga-test-plan';
 import * as sagas from '../sagas';
 import * as Api from '../../../services/api';
 import * as types from '../constants';
@@ -9,7 +10,6 @@ import { INAPP } from '../../CreativesContainer/constants';
 import {
   v2InAppSagas,
 } from "../sagas";
-import { expectSaga } from 'redux-saga-test-plan';
 
 describe('test for uploadInAppAsset function', () => {
   it('should dispatch UPLOAD_INAPP_ASSET_SUCCESS action with asset data, status code, and template type', () => {

package/v2Containers/LanguageProvider/sagas.js

@@ -1,4 +1,6 @@
-import { takeLatest, take, all, cancel, call, put } from 'redux-saga/effects';
+import {
+  takeLatest, all, call, put,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 

package/v2Containers/Line/Container/index.js

@@ -7,7 +7,7 @@ import isEmpty from 'lodash/isEmpty';
 import style from './style';
 import withStyles from '../../../hoc/withStyles';
 import './_lineCreate.scss';
-import * as globalActions from '../../Cap/actions';
+
 import CapButton from '@capillarytech/cap-ui-library/CapButton';
 import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
@@ -35,8 +35,6 @@ import withCreatives from '../../../hoc/withCreatives';
 import { gtmPush } from '../../../utils/gtmTrackers';
 import { LINE } from '../../CreativesContainer/constants';
 import * as commonUtil from '../../../utils/common';
-import injectReducer from '../../../utils/injectReducer';
-import v2LineContainerReducer from './reducer';
 
 const { stopTimer } = GA.timeTracker;
 
@@ -880,17 +878,12 @@ function mapDispatchToProps(dispatch) {
   return {
     actions: bindActionCreators(compActions, dispatch),
     templateActions: bindActionCreators(templateActionsConfig, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
   };
 }
 
-const withReducer = injectReducer({ key: 'lineCreate', reducer: v2LineContainerReducer });
-
 export default withCreatives({
-  WrappedComponent: withStyles(LineContainer, style),
+  WrappedComponent: injectIntl(withStyles(LineContainer, style)),
   mapStateToProps,
   mapDispatchToProps,
   userAuth: true,
-  reducers: [withReducer],
-});
-
+});

package/v2Containers/Line/Container/sagas.js

@@ -1,6 +1,8 @@
 // Line Sagas
 
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 

package/v2Containers/MobilePush/Create/index.js

@@ -1920,7 +1920,7 @@ function mapDispatchToProps(dispatch) {
 }
 
 const withReducer = injectReducer({ key: 'mobileCreate', reducer: v2MobilePushCreateReducer });
-const withSaga = injectSaga({ key: 'mobileCreate', saga: v2MobilePushWatchDuplicateTemplateSaga});
+const withSaga = injectSaga({ key: 'mobilePushDuplicateTemplate', saga: v2MobilePushWatchDuplicateTemplateSaga});
 
 export default withCreatives({
   WrappedComponent: Create,

package/v2Containers/MobilePush/Create/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';

package/v2Containers/MobilePush/Edit/sagas.js

@@ -1,4 +1,6 @@
-import { call, put, takeLatest, take, cancel, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -7,14 +9,15 @@ import * as types from './constants';
 export function* editTemplate(template) {
   let errorMsg;
   try {
-    
     const result = yield call(Api.createMobilePushTemplate, template);
-    
+
     if (result.message || result.status.code === 500) {
       errorMsg = result.message;
     }
-    yield put({ type: types.EDIT_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
-    yield call(template.callback, {templateId: result?.response?.templateId._id});
+    yield put( {
+      type: types.EDIT_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg,
+    });
+    yield call(template.callback, { templateId: result?.response?.templateId._id });
   } catch (error) {
     yield put({ type: types.EDIT_TEMPLATE_FAILURE, error, errorMsg });
   }
@@ -22,7 +25,6 @@ export function* editTemplate(template) {
 
 export function* getTemplateDetails(id) {
   try {
-    
     const result = yield call(Api.getTemplateDetails, id);
     // const sidebar = result.response.sidebar;
     yield put({ type: types.GET_TEMPLATE_DETAILS_SUCCESS, data: result.response });
@@ -49,7 +51,6 @@ export function* getIosCtas(licenseCode) {
 
 export function* getMobilepushTemplatesList(params) {
   try {
-    
     const result = yield call(Api.getAllTemplates, {channel: params.channel, queryParams: params.queryParams});
     yield put({ type: types.GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS, data: result.response.templates, templateData: result.response.mapped});
   } catch (error) {
@@ -58,52 +59,39 @@ export function* getMobilepushTemplatesList(params) {
 }
 
 export function* fetchWeCrmAccounts(action) {
-  
   try {
     const result = yield call(Api.fetchWeCrmAccounts, action.source);
     yield put({
-        type: types.GET_WECRM_ACCOUNTS_SUCCESS,
-        data: result.response,
-      });
+      type: types.GET_WECRM_ACCOUNTS_SUCCESS,
+      data: result.response,
+    });
   } catch (error) {
     yield put({
-        type: types.GET_WECRM_ACCOUNTS_FAILURE,
-        data: error,
-      });
+      type: types.GET_WECRM_ACCOUNTS_FAILURE,
+      data: error,
+    });
   }
 }
 
 function* watchFetchWeCrmAccounts() {
   yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
-  
-  
 }
 
 function* watchEditTemplate() {
   yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  
-  
 }
 
 function* watchGetTemplateDetails() {
   yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  
-  
 }
 function* watchUploadAsset() {
   yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  
-  
 }
 function* watchGetIosCtas() {
   yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
-  
-  
 }
 function* watchMobilepushTemplatesList() {
   yield takeLatest(types.GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST, getMobilepushTemplatesList);
-  
-  
 }
 
 // All sagas to be loaded
@@ -122,4 +110,4 @@ export function* v2MobilePushEditSagas() {
     watchUploadAsset(),
     watchGetIosCtas(),
   ]);
-}
+}

package/v2Containers/Rcs/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import {
   RCS,

package/v2Containers/Sms/Create/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';

package/v2Containers/Sms/Edit/index.js

@@ -924,7 +924,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const formData = _.cloneDeep(this.state.formData);
     editData.name = formData['template-name'];
     editData.versions.base = formData.base;
-
     this.props.actions.editTemplate(editData, this.onUpdateTemplateComplete);
   }
   isSmsLoading = () => {

package/v2Containers/Sms/Edit/sagas.js

@@ -1,5 +1,6 @@
-import { call, put, takeLatest, take, cancel, all } from 'redux-saga/effects';
-// import { schema, normalize } from 'normalizr';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 
@@ -13,8 +14,10 @@ export function* editTemplate(template) {
       errorMsg = result.message;
     }
 
-    yield put({ type: types.EDIT_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
-    yield template.onUpdateTemplateComplete(result.response,errorMsg);
+    yield put({
+      type: types.EDIT_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg
+    });
+    yield template.onUpdateTemplateComplete(result.response, errorMsg);
   } catch (error) {
     yield put({ type: types.EDIT_TEMPLATE_FAILURE, error, errorMsg });
   }
@@ -33,14 +36,10 @@ export function* getTemplateDetails(id) {
 
 function* watchEditTemplate() {
   yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  
-  
 }
 
 function* watchGetTemplateDetails() {
   yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  
-  
 }
 
 // All sagas to be loaded
@@ -53,4 +52,4 @@ export function* v2SmsEditSagas() {
     watchEditTemplate(),
     watchGetTemplateDetails(),
   ]);
-}
+}

package/v2Containers/SmsTrai/Create/sagas.js

@@ -1,4 +1,6 @@
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 

package/v2Containers/Templates/actions.js

@@ -5,7 +5,9 @@
  */
 
 import * as types from './constants';
-import { LINE, WHATSAPP, RCS, ZALO } from '../CreativesContainer/constants';
+import {
+  LINE, WHATSAPP, RCS, ZALO,
+} from '../CreativesContainer/constants';
 
 export function getAllTemplates(channel, queryParams, intlCopyOf = '') {
   return {

package/v2Containers/Templates/index.js

@@ -136,6 +136,9 @@ import { MAPP_SDK } from '../InApp/constants';
 import injectReducer from '../../utils/injectReducer';
 import v2TemplateReducer from './reducer';
 import { compose } from 'redux';
+import { v2TemplateSaga } from './sagas';
+import injectSaga from '../../utils/injectSaga';
+import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
 
 const { timeTracker } = GA;
 const {CapCustomCardList} = CapCustomCard;
@@ -3234,9 +3237,11 @@ function mapDispatchToProps(dispatch) {
 
 const withReducer = injectReducer({ key: 'templates', reducer: v2TemplateReducer });
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
+const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga, mode: DAEMON });
 
 export default compose(
   UserIsAuthenticated,
+  withSaga,
   withReducer,
   withConnect,
 )(injectIntl(Templates));

package/v2Containers/Templates/reducer.js

@@ -170,12 +170,12 @@ function templatesReducer(state = initialState, action) {
       return state.set('fetchedOrgLevelCampaignSettings', false);
     case types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_SUCCESS:
       return state.set('fetchedOrgLevelCampaignSettings', true).set(
-          'campaignSettings',
-          fromJS({
-            ...state.get('campaignSettings'),
-            ...(action.result || {}).entity,
-          }),
-        );
+        'campaignSettings',
+        fromJS({
+          ...state.get('campaignSettings'),
+          ...(action.result || {}).entity,
+        }),
+      );
     case types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_FAILURE:
       return state.set('fetchedOrgLevelCampaignSettings', false);
     case types.GET_SENDER_DETAILS_REQUEST:

package/v2Containers/Templates/sagas.js

@@ -1,4 +1,6 @@
-import { call, put, takeLatest, select, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import get from 'lodash/get';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../services/api';
@@ -9,7 +11,7 @@ import { COPY_OF } from '../../containers/App/constants';
 export function* getAllTemplates(channel, queryParams) {
   try {
     const result = yield call(Api.getAllTemplates, channel, queryParams);
-    const channelTemplates = (channel.channel === 'wechat') ? {templates: [...result.response.mapped, ...result.response.richmedia]} : result.response;
+    const channelTemplates = (channel.channel === 'wechat') ? { templates: [...result.response.mapped, ...result.response.richmedia] } : result.response;
     // const sidebar = result.response.sidebar;
     if (channel.channel === 'wechat' && channel.queryParams && channel.queryParams.sortBy && channel.queryParams.sortBy.toLocaleLowerCase() === ("Most Recent").toLocaleLowerCase()) {
       channelTemplates.templates.sort((a, b) => {
@@ -105,13 +107,9 @@ export function* watchGetOrgLevelCampaignSettings() {
     types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_REQUEST,
     getOrgLevelCampaignSettings,
   );
-  const store = yield select();
-  if (!store.getIn(['router', 'location', 'pathname']).includes('/settings/')) {
-    
-  }
 }
 
-export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
+export function* sendZippedFile({ selectedFile, errorHandler, successHandler }) {
   let errorMessage = "";
   try {
     const result = yield call(Api.sendZippedFile, selectedFile);
@@ -119,7 +117,7 @@ export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
       errorMessage = result.message;
       yield errorHandler(errorMessage);
     }
- 
+
     yield put({
       type: types.SEND_ZIPPED_FILE_SUCCESS,
       selectedTemplate: decodeURIComponent(result.response.metaEntity.htmlContent),
@@ -181,50 +179,34 @@ export function* getSenderDetails({
 
 export function* watchGetAllTemplates() {
   yield takeLatest(types.GET_ALL_TEMPLATES_REQUEST, getAllTemplates);
-  
-  
 }
 
 export function* watchDeleteTemplate() {
   yield takeLatest(types.DELETE_TEMPLATE_REQUEST, deleteTemplate);
-  
-  
 }
 
 export function* watchGetUserList() {
   yield takeLatest(types.GET_USER_LIST_REQUEST, fetchUserList);
-  
-  
 }
 
 export function* watchFetchWeCrmAccounts() {
   yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
-  
-  
 }
 
 export function* watchSendingFile() {
   yield takeLatest(types.SEND_ZIPPED_FILE_REQUEST, sendZippedFile);
-  
-  
 }
 
 export function* watchGetDefaultBeeTemplates() {
   yield takeLatest(types.GET_DEAFULT_BEE_TEMPLATES_REQUEST, getDefaultBeeTemplates);
-  
-  
 }
 
 export function* watchGetTemplateDetails() {
   yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  
-  
 }
 
 export function* watchGetSenderDetails() {
   yield takeLatest(types.GET_SENDER_DETAILS_REQUEST, getSenderDetails);
-  
-  
 }
 
 export function* watchGetCdnTransformationConfig() {
@@ -253,11 +235,11 @@ export function* v2TemplateSaga() {
     watchGetAllTemplates(),
     watchDeleteTemplate(),
     watchGetUserList(),
-    watchFetchWeCrmAccounts(),
     watchGetTemplateDetails(),
     watchGetOrgLevelCampaignSettings(),
-    watchGetSenderDetails(),
     watchGetCdnTransformationConfig(),
+    watchFetchWeCrmAccounts(),
+    watchGetSenderDetails(),
   ]);
 }
 
@@ -266,4 +248,4 @@ export function* v2TemplateSagaWatchGetDefaultBeeTemplates() {
     watchSendingFile(),
     watchGetDefaultBeeTemplates(),
   ]);
-}
+}

package/v2Containers/TemplatesV2/index.js

@@ -34,11 +34,7 @@ import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCA
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
-import injectSaga from '../../utils/injectSaga';
-import injectReducer from '../../utils/injectReducer';
 
-import reducer from '../Templates/reducer';
-import { v2TemplateSaga } from '../Templates/sagas';
 
 const {CapCustomCardList} = CapCustomCard;
 
@@ -392,12 +388,8 @@ function mapDispatchToProps(dispatch) {
 
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
 
-const withReducer = injectReducer({ key: 'templates', reducer });
-const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga });
 
 export default compose(
   UserIsAuthenticated,
-  withSaga,
-  withReducer,
   withConnect,
 )(injectIntl(withStyles(TemplatesV2, styles)));

package/v2Containers/Viber/sagas.js

@@ -1,5 +1,6 @@
-
-import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
+import {
+  call, put, takeLatest, all,
+} from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';