@capillarytech/creatives-library 8.0.43-alpha.1 → 8.0.44

package/containers/Cap/sagas.js

@@ -1,11 +1,10 @@
-import {
-  fork, take, call, put, cancelled, takeLatest, all,
-} from 'redux-saga/effects';
+import { fork, take, call, put, cancelled, cancel, takeLatest, all } from 'redux-saga/effects';
 import { getRedirectionUrl } from '@capillarytech/cap-ui-utils/utils/logoutUtil';
 // import { normalize } from 'normalizr';
 import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
 import * as types from './constants';
+import config from '../../config/app';
 // import {makeSelectOrgId} from './selectors';
 
 export function* authorize(user) {
@@ -39,11 +38,12 @@ function* switchOrg({orgID}) {
 export function* loginFlow() {
   let condition = true;
   while (condition) {
-    const {user} = yield take(types.LOGIN_REQUEST);
-    yield fork(authorize, user);
+    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) {
       condition = false;
+      yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');
     // yield call(LocalStorage.clearItem, 'orgID');

package/containers/Cap/tests/saga.test.js

@@ -24,15 +24,17 @@ describe('loginFlow', () => {
   it('should handle the login flow', () => {
     const generator = loginFlow();
     const user = { username: 'testuser', password: 'password123' };
+    let task;
 
     // First iteration
     expect(generator.next().value).toEqual(take(LOGIN_REQUEST));
     expect(generator.next({ user }).value).toEqual(fork(authorize, user));
-    // task = generator.next().value; // Assign the task value
+    task = generator.next().value; // Assign the task value
     try{
+      const logoutAction = { type: LOGOUT_REQUEST };
       const failureAction = { type: LOGIN_FAILURE };
 
-      // expect(generator.next(logoutAction).value).toEqual(cancel(task));
+      expect(generator.next(logoutAction).value).toEqual(cancel(task));
 
       // When LOGIN_FAILURE action is dispatched
       expect(generator.next(failureAction).value).toEqual(take(LOGIN_REQUEST));

package/containers/Ebill/sagas.js

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

package/containers/Email/sagas.js

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

package/containers/Line/Create/sagas.js

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

package/containers/Line/Edit/sagas.js

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

package/containers/MobilePush/Create/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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/containers/MobilePush/Edit/sagas.js

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

package/containers/Sms/Create/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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/containers/Sms/Edit/sagas.js

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

package/containers/Templates/sagas.js

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

package/containers/WeChat/MapTemplates/sagas.js

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

package/package.json

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

package/services/api.js

@@ -266,25 +266,29 @@ export const createChannelWiseTemplate = ({ channel, template }) => {
 };
 
 
-export const getTemplateDetails = async ({id, channel}) => {
+export const getTemplateDetails = ({id, channel}) => {
   const url = `${API_ENDPOINT}/templates/v1/${id}/${channel ? channel.toUpperCase() : SMS}`;
-  const compressedTemplatesData = await request(url, getAPICallObject('GET'));
-  const {response = ''} = compressedTemplatesData || {};
-  const decompressData = decompressJsonObject(response);
-  if (channel?.toUpperCase() === EMAIL) {
-    return { ...compressedTemplatesData, response: addBaseToTemplate(decompressData) };
-  }
-  return { ...compressedTemplatesData, response: decompressData};
+  const compressedTemplatesData = request(url, getAPICallObject('GET'));
+  return compressedTemplatesData.then((data) => {
+    const { response = '' } = data || {};
+    const decompressData = decompressJsonObject(response);
+    if (channel?.toUpperCase() === EMAIL) {
+      return { ...data, response: addBaseToTemplate(decompressData) };
+    }
+    return { ...data, response: decompressData };
+  });
 };
 
-export const getAllTemplates = async ({channel, queryParams = {}}) => {
+export const getAllTemplates = ({channel, queryParams = {}}) => {
   const url = getUrlWithQueryParams({
     url: `${API_ENDPOINT}/templates/v1/${channel}?`,
     queryParams,
   });
-  const compressedTemplatesData = await request(url, getAPICallObject('GET'));
-  const {response = ''} = compressedTemplatesData || {};
-  return { ...compressedTemplatesData, response: decompressJsonObject(response)};
+  const compressedTemplatesData = request(url, getAPICallObject('GET'));
+  return compressedTemplatesData.then((data) => {
+    const { response = '' } = data || {};
+    return { ...data, response: decompressJsonObject(response)};
+  });
 };
 
 export const deleteTemplate = ({channel, id}) => {
@@ -531,13 +535,13 @@ export const getS3UrlFileSizes = (data) => {
   return request(url, getAPICallObject('POST', data));
 };
 
-export const getTemplateInfoById = async ({
-  id, username, oa_id, token, host,
-}) => {
+export const getTemplateInfoById = ({id, username, oa_id, token, host}) => {
   const url = `${API_ENDPOINT}/templates/v1/${id}/Zalo?username=${username}&oa_id=${oa_id}&token=${token}&host=${host}`;
-  const compressedTemplatesData = await request(url, getAPICallObject('GET'));
-  const {response = ''} = compressedTemplatesData || {};
-  return { ...compressedTemplatesData, response: decompressJsonObject(response)};
+  const compressedTemplatesData = request(url, getAPICallObject('GET'));
+  return compressedTemplatesData.then((data) => {
+    const { response = '' } = data || {};
+    return { ...data, response: decompressJsonObject(response)};
+  });
 };
 
 export const getMetaTags = ({previewUrl}) => {

package/styles/containers/login/_loginPage.scss

@@ -19,8 +19,7 @@ div#app:first-child {
   overflow: hidden;
 
   .ant-input-affix-wrapper, .login-form-button {
-    width: 100% !important;
-    margin-bottom: 5%;
+    width: 100% !important
   }
 
   .login-form-item {

package/v2Components/Ckeditor/index.js

@@ -17,9 +17,11 @@ import { request,getAPICallObject } from '../../services/api';
 import './style.scss';
 // import messages from './messages';
 const loadScript = require('load-script');
-const hostName = window.location.origin.includes('localhost') ? 'https://nightly.intouch.capillarytech.com' : window.location.origin;
-const defaultScriptUrl = `${hostName}/arya/ui/library/ckeditor/ckeditor.js`;
 
+const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
+//const defaultScriptUrl = 'https://nightly.intouch.capillarytech.com/arya/ui/library/ckeditor/ckeditor.js';
+/*Uncomment the above line to use CKEDITOR in local
+*/
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {
@@ -73,6 +75,7 @@ const CKEditorConfig = {
     ['Font', 'FontSize'],
     ['TextColor', 'BGColor'],
   ],
+  removePlugins: 'magicline',
 };
 
 const weChatCKEditorConfig = {

package/v2Containers/Assets/Gallery/sagas.js

@@ -78,4 +78,4 @@ export function* v2GallerySagas() {
     watchDeleteAssetById(),
     watchGetUserList(),
   ]);
-}
+}

package/v2Containers/BeeEditor/sagas.js

@@ -27,11 +27,11 @@ function* watchCreateCustomRow() {
 // All sagas to be loaded
 export default [
   watchCreateCustomRow,
-  watchForMediaGeneration,
+  watchForMediaGeneration
 ];
 
 export function* v2BeeEditionSagas() {
   yield all([
     watchCreateCustomRow(),
   ]);
-}
+}

package/v2Containers/CallTask/sagas.js

@@ -14,4 +14,4 @@ export function* v2CallTaskSagas() {
   yield all([
     defaultSaga(),
   ]);
-}
+}

package/v2Containers/Cap/sagas.js

@@ -1,7 +1,4 @@
-import {
-  take, call, put, cancelled, takeLatest, all,
-  fork,
-} from 'redux-saga/effects';
+import { fork, take, call, put, cancelled, cancel, takeLatest, all } from 'redux-saga/effects';
 // import { normalize } from 'normalizr';
 import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
@@ -12,7 +9,7 @@ import {
   getTopbarMenuDataValue,
   getLoyaltyTopbarMenuDataValue,
   LOYALTY,
-} from "../App/constants";
+} from '../../v2Containers/App/constants';
 // import {makeSelectOrgId} from './selectors';
 
 export function* authorize(user) {
@@ -46,11 +43,12 @@ export function* switchOrg({orgID}) {
 export function* loginFlow() {
   let condition = true;
   while (condition) {
-    const {user} = yield take(types.LOGIN_REQUEST);
-    yield fork(authorize, user);
+    const { user } = yield take(types.LOGIN_REQUEST);
+    const task = yield fork(authorize, user);
     const action = yield take([types.LOGOUT_REQUEST_V2, types.LOGIN_FAILURE]);
     if (action.type === types.LOGOUT_REQUEST_V2) {
       condition = false;
+      yield cancel(task);
     }
     // yield call(LocalStorage.clearItem, 'token');
     // yield call(LocalStorage.clearItem, 'orgID');
@@ -262,7 +260,7 @@ export function* capSagaForFetchSchemaForEntity() {
   yield all([
     watchFetchSchemaForEntity(),
     watchLiquidEntity(),
-  ]);
+  ])
 }
 
 export function* v2CapSagas() {

package/v2Containers/CapFacebookPreview/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, call, put, takeLatest, cancel, all } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as type from './constants';
 
@@ -41,4 +39,4 @@ export function* v2CapFacebookPreviewSagas() {
   yield all([
     watchImageFacebookPreview(),
   ]);
-}
+}

package/v2Containers/CreativesContainer/index.js

@@ -1403,6 +1403,6 @@ function mapDispatchToProps(dispatch) {
 const withConnect = connect(mapStatesToProps, mapDispatchToProps);
 const withReducer = injectReducer({ key: 'creativesContainer', reducer: creativesContainerReducer });
 const withSaga = injectSaga({ key: 'cap', saga: capSagaForFetchSchemaForEntity });
-const withDefaultTempSaga = injectSaga({ key: 'creativesContainer', saga: v2TemplateSagaWatchGetDefaultBeeTemplates });
+const withDefaultTempSaga = injectSaga({ key: 'templates', saga: v2TemplateSagaWatchGetDefaultBeeTemplates });
 
 export default compose(withSaga, withDefaultTempSaga, withReducer, withConnect)(injectIntl(Creatives));

package/v2Containers/Email/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, takeEvery, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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';
@@ -159,4 +157,4 @@ export function* v2EmailDuplicateTemplateSaga() {
   yield all([
     watchDuplicateTemplate(),
   ]);
-}
+}

package/v2Containers/FTP/sagas.js

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

package/v2Containers/Facebook/index.js

@@ -477,6 +477,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
 const withReducer = injectReducer({ key: 'facebook', reducer: v2FacebookReducer });
-const withSaga = injectSaga({ key: 'facebook', saga: v2GallerySagas });
+const withSaga = injectSaga({ key: 'gallery', saga: v2GallerySagas });
 
 export default compose(withSaga, withReducer, withConnect)(injectIntl(withStyles(Facebook, styles)));

package/v2Containers/Facebook/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, call, put, takeLatest, cancel, all } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import {
   GET_MARKETING_OBJECTIVES,
@@ -123,9 +121,7 @@ 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) {
@@ -198,4 +194,4 @@ export function* v2FacebookSagas() {
     watchCreateTemplate(),
     watchGetOrgOUs(),
   ]);
-}
+}

package/v2Containers/InApp/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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,8 +1,7 @@
 import {
-  call, put, takeLatest,
+  call, cancel, 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';
@@ -10,6 +9,7 @@ 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,6 +1,4 @@
-import {
-  takeLatest, all, call, put,
-} from 'redux-saga/effects';
+import { takeLatest, take, all, cancel, call, put } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 

package/v2Containers/Line/Container/sagas.js

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

package/v2Containers/MobilePush/Create/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { call, put, takeLatest, take, cancel, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -51,6 +49,7 @@ 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) {

package/v2Containers/Rcs/sagas.js

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

package/v2Containers/Sms/Create/actions.js

@@ -7,7 +7,6 @@
 import * as types from './constants';
 
 export function createTemplate(template, onCreateTemplateComplete) {
-  console.log('***Action***', template);
   return {
     type: types.CREATE_TEMPLATE_REQUEST,
     template,

package/v2Containers/Sms/Create/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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/actions.js

@@ -12,7 +12,6 @@ export function defaultAction() {
 }
 
 export function editTemplate(template, onUpdateTemplateComplete) {
-  console.log('***Action***', template);
   return {
     type: types.EDIT_TEMPLATE_REQUEST,
     template,

package/v2Containers/Sms/Edit/index.js

@@ -201,7 +201,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const content = _.get(this.state, `formData[0]['sms-editor']`);
     const unicodeEnabled = _.get(this.state, `formData[0]['unicode-validity']`);
     const smsDetails = updateCharCount(content || "", unicodeEnabled || false);
-    console.log('***onTemplateContentChange***', content, unicodeEnabled, smsDetails);
     if (this.smsCount.current) {
       this.smsCount.current.innerText = `${smsDetails.parts}${this.props.intl.formatMessage(messages.sms)} (${smsDetails.chars_used} ${this.props.intl.formatMessage(messages.characters)})`;
     }
@@ -925,8 +924,7 @@ 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;
-    console.log('***saveFormData***', editData);
-    console.log('***saveFormData***', formData);
+
     this.props.actions.editTemplate(editData, this.onUpdateTemplateComplete);
   }
   isSmsLoading = () => {

package/v2Containers/Sms/Edit/sagas.js

@@ -1,6 +1,5 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { call, put, takeLatest, take, cancel, all } from 'redux-saga/effects';
+// import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 
@@ -14,10 +13,8 @@ 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 });
   }
@@ -36,10 +33,14 @@ 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
@@ -52,4 +53,4 @@ export function* v2SmsEditSagas() {
     watchEditTemplate(),
     watchGetTemplateDetails(),
   ]);
-}
+}

package/v2Containers/SmsTrai/Create/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { take, cancel, 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,12 +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 = '') {
-  console.log('*********getAllTemplates*********Action', channel, queryParams, intlCopyOf);
   return {
     type: types.GET_ALL_TEMPLATES_REQUEST, channel, queryParams, intlCopyOf,
   };
@@ -29,7 +26,6 @@ export function resetAccount() {
 }
 
 export function deleteTemplate(channel, id) {
-  console.log('*********deleteTemplate*********Action', channel, id);
   return {
     type: types.DELETE_TEMPLATE_REQUEST, channel, id,
   };

package/v2Containers/Templates/index.js

@@ -136,8 +136,6 @@ 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 '@capillarytech/vulcan-react-sdk/utils';
 
 const { timeTracker } = GA;
 const {CapCustomCardList} = CapCustomCard;
@@ -360,7 +358,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if ((this.state.channel || '').toLowerCase() === "sms" && isTraiDltFeature) {
         queryParams.traiEnable = true;
       }
-      console.log('***queryParams***361', queryParams, channel);
       this.props.actions.getAllTemplates(channel, queryParams,`${formatMessage(globalMessages.copyOf)}`);
     }
 
@@ -426,7 +423,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           if (['mobilepush', INAPP_LOWERCASE].includes((this.state.channel).toLowerCase())  && !isEmpty(nextProps.Templates.selectedWeChatAccount)) {
             params.accountId = nextProps.Templates.selectedWeChatAccount.id;
           }
-          console.log('***params***427', params);
           this.getAllTemplates({params}, true);
         }
       });
@@ -583,7 +579,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (!nextProps.Templates.deleteTemplateInProgress && !isEqual(nextProps.Templates.deleteTemplateInProgress, this.props.Templates.deleteTemplateInProgress) &&
     nextProps.Templates.deleteResponse) {
       const message = `${this.state.channel} ${this.props.intl.formatMessage(messages['Template deleted successfully'])}`;
-      console.log('***message***582', message);
       CapNotification.success({key: 'deleteSucess', message});
       this.getAllTemplates({params, resetPage: true});
     }
@@ -1899,7 +1894,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   };
 
   deleteTemplate(template) {
-    console.log('***deleteTemplate-->1898', template);
     this.props.actions.deleteTemplate(this.state.channel.toUpperCase(), template._id);
     this.setState({actionTemplate: {}});
   }
@@ -3240,11 +3234,9 @@ function mapDispatchToProps(dispatch) {
 
 const withReducer = injectReducer({ key: 'templates', reducer: v2TemplateReducer });
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
-const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga });
 
 export default compose(
   UserIsAuthenticated,
-  withSaga,
   withReducer,
   withConnect,
 )(injectIntl(Templates));

package/v2Containers/Templates/reducer.js

@@ -29,33 +29,26 @@ function templatesReducer(state = initialState, action) {
     case types.DEFAULT_ACTION:
       return state;
     case types.GET_ALL_TEMPLATES_REQUEST:
-      console.log('***Reducer***Request', action);
       return state.set('getAllTemplatesInProgress', true).set('templateError', {});
     case types.GET_ALL_TEMPLATES_SUCCESS:
       if (action.isReset) {
-        console.log('***Reducer***Success36', action);
         return state.set('getAllTemplatesInProgress', false)
           .set('templates', action.data ? action.data.templates : [])
           .set('isSearch', action.data ? action.data.search : false)
           .set('weCRMtemplates', action.weCRMTemplate ? action.weCRMTemplate : []).set('templateError', {});
       }
-      console.log('***Reducer***Success42', action);
       return state.set('getAllTemplatesInProgress', false)
         .set('templates', action.data ? state.get('templates').concat(action.data.templates) : [])
         .set('isSearch', action.data ? action.data.search : false)
         .set('weCRMtemplates', action.weCRMTemplate ? state.get('weCRMtemplates').concat(action.weCRMTemplate) : []);
     case types.GET_ALL_TEMPLATES_FAILURE:
-      console.log('***Reducer***Failure', action);
       return state.set('getAllTemplatesInProgress', false).set('templateError', action.error);
     case types.DELETE_TEMPLATE_REQUEST:
-      console.log('***Reducer***Request', action);
       return state.set('deleteTemplateInProgress', true);
     case types.DELETE_TEMPLATE_SUCCESS:
-      console.log('***Reducer***Success', action);
       return state.set('deleteTemplateInProgress', false)
         .set('deleteResponse', action.data);
     case types.DELETE_TEMPLATE_FAILURE:
-      console.log('***Reducer***Failure', action);
       return state.set('deleteTemplateInProgress', false);
     case types.GET_USER_LIST_REQUEST:
       return state

package/v2Containers/Templates/sagas.js

@@ -1,6 +1,4 @@
-import {
-  call, put, takeLatest, all,
-} from 'redux-saga/effects';
+import { call, put, takeLatest, select, all } from 'redux-saga/effects';
 import get from 'lodash/get';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../services/api';
@@ -11,7 +9,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) => {
@@ -107,9 +105,13 @@ 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);
@@ -117,7 +119,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),
@@ -179,34 +181,50 @@ 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() {
@@ -248,4 +266,4 @@ export function* v2TemplateSagaWatchGetDefaultBeeTemplates() {
     watchSendingFile(),
     watchGetDefaultBeeTemplates(),
   ]);
-}
+}

package/v2Containers/TemplatesV2/index.js

@@ -34,7 +34,11 @@ 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;
 
@@ -388,12 +392,12 @@ function mapDispatchToProps(dispatch) {
 
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
 
-// const withReducer = injectReducer({ key: 'templates', reducer });
-// const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga });
+const withReducer = injectReducer({ key: 'templates', reducer });
+const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga });
 
 export default compose(
   UserIsAuthenticated,
-  // withSaga,
-  // withReducer,
+  withSaga,
+  withReducer,
   withConnect,
 )(injectIntl(withStyles(TemplatesV2, styles)));

package/v2Containers/Viber/sagas.js

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

package/v2Containers/WeChat/MapTemplates/sagas.js

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

package/v2Containers/WeChat/RichmediaTemplates/Create/sagas.js

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

package/v2Containers/Whatsapp/sagas.js

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

package/v2Containers/Zalo/saga.js

@@ -42,4 +42,4 @@ export default [watchForGetTemplateInfoById];
 
 export function* v2ZaloSagas() {
   yield all([watchForGetTemplateInfoById()]);
-}
+}