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

package/containers/Cap/sagas.js

@@ -1,5 +1,6 @@
 import {
   fork, take, call, put, cancelled, takeLatest, all,
+  cancel,
 } from 'redux-saga/effects';
 import { getRedirectionUrl } from '@capillarytech/cap-ui-utils/utils/logoutUtil';
 // import { normalize } from 'normalizr';
@@ -26,7 +27,7 @@ export function* authorize(user) {
   }
 }
 
-function* switchOrg({orgID}) {
+function* switchOrg({ orgID }) {
   try {
     LocalStorage.saveItem('orgID', orgID);
     const res = yield call(Api.changeProxyOrg, orgID);
@@ -39,11 +40,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');
@@ -58,7 +60,7 @@ export function* logoutFlow() {
       const redirectUrl = getRedirectionUrl({
         redirectUri: serverLogout?.redirectUri,
       });
-      yield put({type: types.LOGOUT_SUCCESS});
+      yield put({ type: types.LOGOUT_SUCCESS });
       yield call(LocalStorage.clearItem, 'token');
       yield call(LocalStorage.clearItem, 'orgID');
       yield call(LocalStorage.clearItem, 'user');
@@ -76,7 +78,7 @@ export function* fetchUserInfo({ callback }) {
     const userData = result.user;
     // const orgId = yield select(makeSelectOrgId());
     // yield put({type: types.GET_ORG_DETAILS_REQUEST, orgId});
-    const currentOrgDetails = result.currentOrgDetails;
+    const { currentOrgDetails } = result;
     if (!(currentOrgDetails && currentOrgDetails.basic_details && currentOrgDetails.basic_details.base_language && (currentOrgDetails.basic_details.base_language !== "" || currentOrgDetails.basic_details.base_language === null))) {
       currentOrgDetails.basic_details.base_language = 'en';
     }
@@ -94,7 +96,9 @@ export function* fetchUserInfo({ callback }) {
     }
     yield call(LocalStorage.saveItem, 'orgID', result.currentOrgId);
     yield call(LocalStorage.saveItem, 'user', userData);
-    yield put({type: types.GET_USER_DATA_SUCCESS, userData, currentOrgId: result.currentOrgId, currentOrgDetails});
+    yield put({
+      type: types.GET_USER_DATA_SUCCESS, userData, currentOrgId: result.currentOrgId, currentOrgDetails,
+    });
   } catch (error) {
     yield call(LocalStorage.clearItem, 'user');
     yield put({
@@ -106,11 +110,12 @@ export function* fetchUserInfo({ callback }) {
 
 export function* fetchSchemaForEntity(queryParams) {
   try {
-    
     const result = yield call(Api.fetchSchemaForEntity, queryParams);
-    
+
     // const sidebar = result.response.sidebar;
-    yield put({ type: types.GET_SCHEMA_FOR_ENTITY_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', entityType: queryParams.queryParams.type });
+    yield put({
+      type: types.GET_SCHEMA_FOR_ENTITY_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', entityType: queryParams.queryParams.type,
+    });
   } catch (error) {
     yield put({ type: types.GET_SCHEMA_FOR_ENTITY_FAILURE, error });
   }
@@ -151,4 +156,4 @@ export function* capSaga() {
     watchForFetchUserInfo(),
     watchFetchSchemaForEntity(),
   ]);
-}
+}

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

@@ -1,9 +1,13 @@
 import { expectSaga } from 'redux-saga-test-plan';
 import { throwError } from 'redux-saga-test-plan/providers';
 import * as matchers from 'redux-saga-test-plan/matchers';
-import { authorize, loginFlow } from '../sagas';
+import {
+  take, fork, cancel, takeLatest,
+} from 'redux-saga/effects';
+import {
+  authorize, loginFlow, logoutFlow, watchForLogoutFlow, capSaga,
+} from '../sagas';
 import * as api from '../../../services/api';
-import { take, fork, cancel, takeLatest } from 'redux-saga/effects';
 import {
   LOGIN_REQUEST,
   LOGIN_FAILURE,
@@ -11,7 +15,7 @@ import {
   LOGOUT_SUCCESS,
   LOGOUT_FAILURE,
 } from '../constants';
-import {logoutFlow, watchForLogoutFlow,capSaga } from '../sagas';
+
 const error = new Error('error');
 
 describe('capSaga', () => {
@@ -24,22 +28,21 @@ 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
-    try{
+    task = generator.next().value; // Assign the task value
+    try {
       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));
       expect(generator.next().value).toEqual(fork(authorize, user));
       expect(generator.next().done).toBe(true);
-    }
-    catch{}
+    } catch {}
   });
 });
 describe('logoutFlow [Unit Test]', () => {
@@ -113,4 +116,4 @@ describe('logoutFlow [Unit Test]', () => {
       );
     });
   });
-});
+});

package/hoc/withCreatives.js

@@ -1,11 +1,10 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, compose } 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';
-import { compose } from 'redux';
 
 /**
  * Higher Order Component to common out creatives channel logic
@@ -19,7 +18,7 @@ export default ({
   userAuth,
   sagas = [],
   reducers = [],
-  }) => {
+}) => {
   const CreativesCommon = (props) => {
     useEffect(() => {
       const {

package/package.json

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

package/v2Components/Ckeditor/index.js

@@ -73,6 +73,7 @@ const CKEditorConfig = {
     ['Font', 'FontSize'],
     ['TextColor', 'BGColor'],
   ],
+  removePlugins: 'magicline',
 };
 
 const weChatCKEditorConfig = {

package/v2Components/NavigationBar/index.js

@@ -8,12 +8,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { compose } from 'redux';
-import injectSaga from '../../utils/injectSaga';
-import sagas from './saga';
 import { loadItem } from 'services/localStorageApi';
 import { intlShape, injectIntl } from 'react-intl';
 import { withRouter } from 'react-router-dom';
 import { get } from 'lodash';
+import CapNavigation from '@capillarytech/cap-ui-library/CapNavigation';
+import injectSaga from '../../utils/injectSaga';
+import sagas from './saga';
 import messages from './messages';
 import { LOYALTY } from '../../v2Containers/App/constants';
 import {
@@ -23,7 +24,6 @@ import {
   DEFAULT_MODULE,
   AI_DOCUMENTATION_BOT_DISABLED,
 } from '../../v2Containers/Cap/constants';
-import CapNavigation from '@capillarytech/cap-ui-library/CapNavigation';
 import configPath from '../../config/path';
 import * as Api from '../../services/api';
 import { CapLeftNavigatioOpenCss, CapLeftNavigationCss } from './style';
@@ -118,7 +118,6 @@ export class NavigationBar extends React.Component {
       ICONS.push(settingsIcon);
     }
     return showDocumentationBot ? ICONS.slice(1) : ICONS; // If showDocumentationBot is true, help icon will be replaced by Aira icon on UI
-
   };
 
   getDropdownMenu = () => {
@@ -148,12 +147,11 @@ export class NavigationBar extends React.Component {
     const { location, intl: { formatMessage } } = this.props;
     const { pathname } = location;
     const parentModule = pathname.substring(pathname.lastIndexOf('/') + 1);
-    switch (parentModule) { 
+    switch (parentModule) {
       case LOYALTY:
         return formatMessage(messages.loyaltyProgram);
       default:
         return formatMessage(messages.selectedProductDefault)
-
     }
   }
 
@@ -236,5 +234,5 @@ NavigationBar.propTypes = {
   leftNavbarExpandedProp: PropTypes.bool,
 };
 
-const withSagas = sagas.map(saga => injectSaga(saga));
+const withSagas = sagas.map((saga) => injectSaga(saga));
 export default compose(...withSagas)(withRouter(injectIntl(NavigationBar)));

package/v2Containers/Cap/index.js

@@ -52,6 +52,8 @@ import { v2RcsSagas } from '../Rcs/sagas';
 import { v2InAppSagas } from '../InApp/sagas'; 
 import { v2ViberSagas } from '../Viber/sagas';
 import { v2FacebookSagas } from '../Facebook/sagas';
+import { v2ZaloSagas } from '../Zalo/saga';
+import createReducer from '../Line/Container/reducer';
 
 const gtm = window.dataLayer || [];
 const {
@@ -618,7 +620,10 @@ const withWechatMapTemplatesSaga = injectSaga({ key: 'weChatMapTemplate', saga:
 const withRcsSaga = injectSaga({ key: 'rcs', saga: v2RcsSagas });
 const withInAppSaga = injectSaga({ key: 'inapp', saga: v2InAppSagas });
 const withViberSaga = injectSaga({ key: 'viber', saga: v2ViberSagas });
+const withZaloSaga = injectSaga({ key: 'zaloSaga', saga: v2ZaloSagas });
 const withFacebookSaga = injectSaga({ key: 'facebook', saga: v2FacebookSagas });
+const withLineReducer = injectReducer({ key: 'lineCreate', reducer: createReducer });
+
 export default compose(
   withSaga,
   withSmsCreateSaga,
@@ -631,7 +636,9 @@ export default compose(
   withInAppSaga,
   withViberSaga,
   withFacebookSaga,
+  withZaloSaga,
   withReducer,
   withZaloReducer,
+  withLineReducer,
   withConnect,
 )(injectIntl(Cap));

package/v2Containers/Cap/sagas.js

@@ -1,6 +1,7 @@
 import {
   take, call, put, cancelled, takeLatest, all,
   fork,
+  cancel,
 } from 'redux-saga/effects';
 // import { normalize } from 'normalizr';
 import * as Api from '../../services/api';
@@ -47,10 +48,11 @@ export function* loginFlow() {
   let condition = true;
   while (condition) {
     const {user} = yield take(types.LOGIN_REQUEST);
-    yield fork(authorize, user);
+    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');
@@ -274,5 +276,5 @@ export function* v2CapSagas() {
     watchGetTopbarMenuData(),
     watchForGetVideosConfig(),
     watchLiquidEntity(),
-  ])
+  ]);
 }