@capillarytech/creatives-library 8.0.46-alpha.1 → 8.0.47

package/app.js

@@ -7,6 +7,7 @@ import { Provider } from 'react-redux';
 // import { useScroll } from 'react-router-scroll';
 import history from 'utils/history';
 import CapSomethingWentWrong from '@capillarytech/cap-ui-library/CapSomethingWentWrong';
+import { addLocizeSavedHandler, startStandalone } from 'locize';
 import Bugsnag from '@bugsnag/js';
 import BugsnagPluginReact from '@bugsnag/plugin-react';
 // import { makeSelectLocationState } from 'containers/Cap/selectors';
@@ -120,6 +121,20 @@ if (module.hot) {
     render(translationMessages);
   });
 }
+
+// for auto render UI on locize saved, since we cache the translations in redis it can't be update on real time as of now
+// need to comment as of now
+// addLocizeSavedHandler(res => {
+//   res.updated.forEach(item => {
+//     const { lng, ns, key, data } = item
+//     // load the translations somewhere...
+//     // and maybe rerender your UI
+//   })
+// })
+
+// start
+startStandalone();
+
 const openSansObserver = new FontFaceObserver('Roboto', {});
 // When Open Sans is loaded, add a font-family using Open Sans to the body
 openSansObserver.load().then(() => {

package/components/Sidebar/index.js

@@ -69,7 +69,7 @@ class Sidebar extends React.Component { // eslint-disable-line react/prefer-stat
   }
 
   selectActiveLinkFromUrl(props) {
-    const activeRouteName = this.props.history.location.pathname?.split('/')[1];
+    const activeRouteName = this.props?.history?.location?.pathname?.split('/')[1];
     let selectedItem = '';
     let selectedIndex = -1;
     _.forEach(props.menuData, (menuItem, menuIndex) => {

package/containers/Assets/Gallery/sagas.js

@@ -35,7 +35,7 @@ export function* fetchUserList() {
     const result = yield call(Api.getUserList);
     yield put({
       type: types.GET_USER_LIST_SUCCESS,
-      data: result.data.result,
+      data: result?.data?.result,
     });
   } catch (error) {
     yield put({

package/containers/Cap/index.js

@@ -32,6 +32,7 @@ import { CREATIVES_UI_VIEW } from '../../v2Containers/App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import reducer from './reducer';
 import RenderRoute from '../../v2Components/RenderRoute';
+import { EMBEDDED } from '../../v2Containers/SmsTrai/Edit/constants';
 
 const gtm = window.dataLayer || [];
 
@@ -71,7 +72,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
         gtm.push({ ...userGtmData, event: 'userAuthenticated' });
       }
     }
-    if (!_.isEmpty(this.props.Global.orgID)) {
+    if (!_.isEmpty(this.props?.Global?.orgID)) {
       gtm.push({ orgId: this.props.Global.orgID });
     }
     if (this.props.Global.isLoggedIn) {
@@ -173,7 +174,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     const { user: userData } = props.Global;
     const userName = userData.attributes.USERNAME;
     const userEmail = userData.attributes.EMAIL;
-    const orgObj = _.find(userData.proxyOrgList, { orgID: props.Global.orgID });
+    const orgObj = _.find(userData?.proxyOrgList, { orgID: props?.Global?.orgID });
     const gtmData = {
       orgId: props.Global.orgID,
       orgName: orgObj && orgObj.orgName,
@@ -295,7 +296,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
     const { isCreativesAccessible } = this.state;
     return (
       <CapWrapper>
-        {this.props.loader.localeLoading || this.props.Global.fetching_userdata ?
+        {this.props?.loader?.localeLoading || this.props?.Global?.fetching_userdata ?
           <div className="cap-loader-box">
             <img
               className="loader-image"
@@ -311,7 +312,7 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
               ]}
             />
             <div className="wrapper">
-              {loggedIn && type !== 'embedded' ?
+              {loggedIn && type !== EMBEDDED ?
                 <TopBar
                   proxyOrgList={proxyOrgList}
                   userName={userName}

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

@@ -6,6 +6,7 @@ import {
 } from 'redux-saga/effects';
 import {
   authorize, loginFlow, logoutFlow, watchForLogoutFlow, capSaga,
+  fetchSchemaForEntity,
 } from '../sagas';
 import * as api from '../../../services/api';
 import {
@@ -14,6 +15,8 @@ import {
   LOGOUT_REQUEST,
   LOGOUT_SUCCESS,
   LOGOUT_FAILURE,
+  GET_SCHEMA_FOR_ENTITY_SUCCESS,
+  GET_SCHEMA_FOR_ENTITY_FAILURE,
 } from '../constants';
 
 const error = new Error('error');
@@ -117,3 +120,97 @@ describe('logoutFlow [Unit Test]', () => {
     });
   });
 });
+
+describe("fetchSchemaForEntity", () => {
+  it("handle success response from fetchSchemaForEntity", () => {
+    expectSaga(fetchSchemaForEntity, {
+      queryParams: {
+        type: 'tags'
+      },
+    })
+      .provide([
+        [
+          matchers.call.fn(api.fetchSchemaForEntity),
+          {
+            success: true,
+            response: {},
+          },
+        ],
+      ])
+      .put({
+        type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+        data: {},
+        statusCode: '',
+        entityType: 'tags'
+      })
+      .run();
+  });
+
+  it("handle success response from fetchSchemaForEntity when metaEntities available", () => {
+    expectSaga(fetchSchemaForEntity, {
+      queryParams: {
+        type: 'tags'
+      },
+    })
+      .provide([
+        [
+          matchers.call.fn(api.fetchSchemaForEntity),
+          {
+            response: {
+              metaEntities: []
+            },
+          },
+        ],
+      ])
+      .put({
+        type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+        data: {
+          metaEntities: []
+        },
+        statusCode: '',
+        entityType: 'tags'
+      })
+      .run();
+  });
+
+  it("handle when response and query params are empty from fetchSchemaForEntity when metaEntities available", () => {
+    expectSaga(fetchSchemaForEntity, {})
+      .provide([
+        [
+          matchers.call.fn(api.fetchSchemaForEntity),
+          {
+            success: true
+          },
+        ],
+      ])
+      .put({
+        type: GET_SCHEMA_FOR_ENTITY_SUCCESS,
+        data: {},
+        statusCode: '',
+        entityType: ''
+      })
+      .run();
+  });
+
+  it("handle error response from fetchSchemaForEntity", () => {
+    expectSaga(fetchSchemaForEntity, {
+      queryParams: {
+        type: 'tags'
+      },
+    })
+      .provide([
+        [
+          matchers.call.fn(api.fetchSchemaForEntity),
+          {
+            success: false,
+            response: {},
+          },
+        ],
+      ])
+      .put({
+        type: GET_SCHEMA_FOR_ENTITY_FAILURE,
+        error: 'Error in fetching tags'
+      })
+      .run();
+  });
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.46-alpha.1",
+  "version": "8.0.47",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -31,6 +31,7 @@
     "jest-environment-jsdom": "27.5.1",
     "jquery": "^3.3.1",
     "load-script": "^1.0.0",
+    "locize": "^3.3.0",
     "ml-matrix": "6.10.8",
     "node-html-parser": "^5.4.2-0",
     "normalizr": "^3.2.3",

package/v2Containers/Cap/index.js

@@ -52,7 +52,6 @@ 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 || [];
@@ -620,7 +619,6 @@ 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 });
 
@@ -636,7 +634,6 @@ export default compose(
   withInAppSaga,
   withViberSaga,
   withFacebookSaga,
-  withZaloSaga,
   withReducer,
   withZaloReducer,
   withLineReducer,

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

@@ -19,7 +19,6 @@ import {
   GET_LIQUID_TAGS_REQUEST,
 } from '../constants';
 import { callback, error, error2, videoConfigData } from '../../mockdata';
-import { watchForLogoutFlow } from '../../../containers/Cap/sagas';
 import { LOGOUT_FAILURE, LOGOUT_REQUEST, LOGOUT_SUCCESS } from '../../../containers/Cap/constants';
 
 

package/v2Containers/Email/index.js

@@ -587,6 +587,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
 
   onChange = (evt) => {
+    const {isFullMode, showTemplateName} = this.props;
     const formData = _.cloneDeep(this.state.formData);
 
     //if (evt.editor.name.indexOf('editor') === -1) {
@@ -609,7 +610,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
 
       this.setState({formData, content: evt.editor.getData()}, () => {
-
+        if (isFullMode && showTemplateName) {
+          showTemplateName({formData, onFormDataChange: this.onFormDataChange});
+        }
       });
     }
   }

package/v2Containers/Sms/Edit/sagas.js

@@ -10,7 +10,7 @@ export function* editTemplate(template) {
   try {
     const result = yield call(Api.editTemplate, template);
     // const sidebar = result.response.sidebar;
-    if (result.message || result.status.code === 500) {
+    if (result?.message || result?.status?.code === 500) {
       errorMsg = result.message;
     }
 

package/v2Containers/Sms/Edit/test/saga.test.js

@@ -2,11 +2,54 @@
 import { expectSaga } from "redux-saga-test-plan";
 
 import {
+  editTemplate,
   v2SmsEditSagas,
 } from "../sagas";
+import * as api from "../../../../services/api";
+import * as types from '../constants';
+import { call } from "redux-saga/effects";
+import { throwError } from "redux-saga-test-plan/providers";
 
 describe("v2SmsEditSagas Combined", () => {
     it("should initialize all v2SmsEditSagas-related watcher sagas without error", () => {
       return expectSaga(v2SmsEditSagas).run();
     });
+  });
+
+  describe('editTemplate Saga', () => {
+    const template = { id: 1, name: 'Updated Template' };
+
+    it('handles successful template edit', () => {
+      const fakeResponse = {
+        response: template,
+        status: { code: 200 }
+      };
+
+      return expectSaga(editTemplate, template)
+        .provide([
+          [call(api.editTemplate, template), fakeResponse]
+        ])
+        .put({
+          type: types.EDIT_TEMPLATE_SUCCESS,
+          data: fakeResponse.response,
+          statusCode: 200,
+          errorMsg: undefined
+        })
+        .run();
+    });
+
+    it('handles failure in editing a template', () => {
+      const error = new Error('Edit failed');
+
+      return expectSaga(editTemplate, template)
+        .provide([
+          [call(api.editTemplate, template), throwError(error)]
+        ])
+        .put({
+          type: types.EDIT_TEMPLATE_FAILURE,
+          error,
+          errorMsg: undefined
+        })
+        .run();
+    });
   });

package/v2Containers/Templates/index.js

@@ -3237,6 +3237,8 @@ function mapDispatchToProps(dispatch) {
 
 const withReducer = injectReducer({ key: 'templates', reducer: v2TemplateReducer });
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
+
+//injecting Saga in Daemon Mode , so that it doesn't get injected multiple times.
 const withSaga = injectSaga({ key: 'templates', saga: v2TemplateSaga, mode: DAEMON });
 
 export default compose(

package/v2Containers/Zalo/index.js

@@ -48,9 +48,11 @@ import withCreatives from '../../hoc/withCreatives';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
 import TemplatePreview from '../../v2Components/TemplatePreview';
+import injectSaga from '../../utils/injectSaga';
 import injectReducer from '../../utils/injectReducer';
 import * as globalActions from '../Cap/actions';
 import v2ZaloReducer from './reducer';
+import { v2ZaloSagas } from './saga';
 
 export const Zalo = (props) => {
   const {
@@ -504,6 +506,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 
 const withReducer = injectReducer({ key: 'zalo', reducer: v2ZaloReducer });
+const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 
 export default withCreatives({
   WrappedComponent: Zalo,
@@ -511,4 +514,5 @@ export default withCreatives({
   mapDispatchToProps,
   userAuth: true,
   reducers: [withReducer],
+  sagas: [withZaloSaga],
 });