@capillarytech/creatives-library 8.0.44 → 8.0.46-alpha.0

package/containers/Cap/sagas.js

@@ -1,10 +1,12 @@
-import { fork, take, call, put, cancelled, cancel, takeLatest, all } from 'redux-saga/effects';
+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';
 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) {
@@ -25,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);
@@ -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', () => {
@@ -25,13 +29,11 @@ describe('loginFlow', () => {
     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{
-      const logoutAction = { type: LOGOUT_REQUEST };
+    try {
       const failureAction = { type: LOGIN_FAILURE };
 
       expect(generator.next(logoutAction).value).toEqual(cancel(task));
@@ -40,8 +42,7 @@ describe('loginFlow', () => {
       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]', () => {
@@ -115,4 +116,4 @@ describe('logoutFlow [Unit Test]', () => {
       );
     });
   });
-});
+});

package/containers/Ebill/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/containers/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';
 

package/containers/Line/Create/sagas.js

@@ -1,6 +1,7 @@
 // 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/containers/Line/Edit/sagas.js

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

package/containers/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/containers/Sms/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';

package/containers/Templates/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';

package/containers/WeChat/MapTemplates/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 * as types from './constants';
 

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.44",
+  "version": "8.0.46-alpha.0",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/services/api.js

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

package/styles/containers/login/_loginPage.scss

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

package/v2Components/Ckeditor/index.js

@@ -17,11 +17,9 @@ 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) {

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/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/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,4 +1,8 @@
-import { fork, take, call, put, cancelled, cancel, takeLatest, all } from 'redux-saga/effects';
+import {
+  take, call, put, cancelled, takeLatest, all,
+  fork,
+  cancel,
+} from 'redux-saga/effects';
 // import { normalize } from 'normalizr';
 import * as Api from '../../services/api';
 import * as LocalStorage from '../../services/localStorageApi';
@@ -9,7 +13,7 @@ import {
   getTopbarMenuDataValue,
   getLoyaltyTopbarMenuDataValue,
   LOYALTY,
-} from '../../v2Containers/App/constants';
+} from "../App/constants";
 // import {makeSelectOrgId} from './selectors';
 
 export function* authorize(user) {
@@ -43,7 +47,7 @@ export function* switchOrg({orgID}) {
 export function* loginFlow() {
   let condition = true;
   while (condition) {
-    const { user } = yield take(types.LOGIN_REQUEST);
+    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) {
@@ -260,7 +264,7 @@ export function* capSagaForFetchSchemaForEntity() {
   yield all([
     watchFetchSchemaForEntity(),
     watchLiquidEntity(),
-  ])
+  ]);
 }
 
 export function* v2CapSagas() {
@@ -272,5 +276,5 @@ export function* v2CapSagas() {
     watchGetTopbarMenuData(),
     watchForGetVideosConfig(),
     watchLiquidEntity(),
-  ])
+  ]);
 }

package/v2Containers/CapFacebookPreview/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 * as type from './constants';
 
@@ -39,4 +41,4 @@ export function* v2CapFacebookPreviewSagas() {
   yield all([
     watchImageFacebookPreview(),
   ]);
-}
+}