@capillarytech/creatives-library 8.0.57 → 8.0.58

package/package.json

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

package/services/api.js

@@ -269,7 +269,7 @@ export const createChannelWiseTemplate = ({ channel, template }) => {
 export const getTemplateDetails = async ({id, channel}) => {
   const url = `${API_ENDPOINT}/templates/v1/${id}/${channel ? channel.toUpperCase() : SMS}`;
   const compressedTemplatesData = await request(url, getAPICallObject('GET'));
-  const {response = ''} = compressedTemplatesData || {};
+  const {response = ''} = compressedTemplatesData;
   const decompressData = decompressJsonObject(response);
   if (channel?.toUpperCase() === EMAIL) {
     return { ...compressedTemplatesData, response: addBaseToTemplate(decompressData) };
@@ -283,7 +283,7 @@ export const getAllTemplates = async ({channel, queryParams = {}}) => {
     queryParams,
   });
   const compressedTemplatesData = await request(url, getAPICallObject('GET'));
-  const {response = ''} = compressedTemplatesData || {};
+  const {response = ''} = compressedTemplatesData;
   return { ...compressedTemplatesData, response: decompressJsonObject(response)};
 };
 

package/services/tests/api.test.js

@@ -132,6 +132,14 @@ describe('getAllTemplates -- Test with valid responses', () => {
     });
   });
 
+  it('Should work for empty response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({json: () => Promise.resolve(),}));
+    mockDecompressJsonObject.mockReturnValue();
+    expect(await getAllTemplates({channel: 'email'})).toEqual({
+      "response": undefined,
+    });
+  });
+
   it('Should not return correct response', async () => {
     global.fetch.mockReturnValue(Promise.resolve({
       status: 200,
@@ -197,7 +205,18 @@ describe('getTemplateDetails -- Test with valid responses', () => {
       status: 200,
     });
   });
-
+  it('Should work incase of empty response', async () => {
+    global.fetch.mockReturnValue(Promise.resolve({
+      status: 200,
+      json: () => Promise.resolve({
+        status: 200,
+      }),
+    }));
+    mockDecompressJsonObject.mockReturnValue();
+    expect(await getTemplateDetails({id: '123', channel: 'email'})).toEqual({
+      status: 200,
+    });
+  });
   it('Should return response when channel is not email', async () => {
     global.fetch.mockReturnValue(Promise.resolve({
       status: 200,

package/utils/tests/common.test.js

@@ -12,6 +12,7 @@ import {
   iframePreviewAdjustWidth,
   getDecodedFileName,
   createQueryString,
+  getMergedUserList
 } from "../common";
 import * as mockdata from "./common.mockdata";
 
@@ -317,3 +318,48 @@ describe('createQueryString', () => {
     expect(result).toBe('?name=John');
   });
 });
+describe('getMergedUserList', () => {
+  it('should merge user list when isCapUser is true', () => {
+    const userList = {
+      capUsers: [{ id: 1, name: 'Cap User 1' }],
+      otherUsers: [{ id: 2, name: 'Other User 1' }],
+    };
+    
+    const result = getMergedUserList(userList, true);
+
+    expect(result).toEqual([
+      { id: 1, name: 'Cap User 1' },
+      { id: 2, name: 'Other User 1' },
+    ]);
+  });
+
+  it('should merge user list excluding capUsers when isCapUser is false', () => {
+    const userList = {
+      capUsers: [{ id: 1, name: 'Cap User 1' }],
+      otherUsers: [{ id: 2, name: 'Other User 1' }],
+    };
+    
+    const result = getMergedUserList(userList, false);
+
+    expect(result).toEqual([{ id: 2, name: 'Other User 1' }]);
+  });
+
+  it('should handle empty userList', () => {
+    const userList = {};
+    
+    const result = getMergedUserList(userList, true);
+
+    expect(result).toEqual([]);
+  });
+
+  it('should handle userList with empty arrays', () => {
+    const userList = {
+      capUsers: [],
+      otherUsers: [],
+    };
+    
+    const result = getMergedUserList(userList);
+
+    expect(result).toEqual([]);
+  });
+});

package/v2Containers/Cap/index.js

@@ -53,9 +53,7 @@ import { v2InAppSagas } from '../InApp/sagas';
 import { v2ViberSagas } from '../Viber/sagas';
 import { v2FacebookSagas } from '../Facebook/sagas';
 import createReducer from '../Line/Container/reducer';
-import { v2ZaloSagas } from '../Zalo/saga';
 import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
-
 const gtm = window.dataLayer || [];
 const {
   logNewTab,
@@ -618,7 +616,6 @@ const withEbillSaga = injectSaga({ key: 'ebill', saga: v2EbillSagas });
 const withEmailSaga = injectSaga({ key: 'email', saga: v2EmailDuplicateTemplateSaga });
 const withLineContainerSaga = injectSaga({ key: 'lineCreate', saga: v2LineContainerSagas });
 const withMobilePushCreateSaga = injectSaga({ key: 'mobileCreate', saga: v2MobilePushCreateSagas });
-const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 const withWechatMapTemplatesSaga = injectSaga({ key: 'weChatMapTemplate', saga: v2WechatMapTemplatesSagas });
 const withRcsSaga = injectSaga({ key: 'rcs', saga: v2RcsSagas });
 const withInAppSaga = injectSaga({ key: 'inapp', saga: v2InAppSagas });
@@ -635,7 +632,6 @@ export default compose(
   withLineContainerSaga,
   withMobilePushCreateSaga,
   withWechatMapTemplatesSaga,
-  withZaloSaga,
   withRcsSaga,
   withInAppSaga,
   withViberSaga,

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

@@ -17,7 +17,7 @@ describe("v2SmsEditSagas Combined", () => {
   });
 
   describe('editTemplate Saga', () => {
-    const template = { id: 1, name: 'Updated Template' };
+    const template = { id: 1, name: 'Updated Template',message: 'esd' };
 
     it('handles successful template edit', () => {
       const fakeResponse = {
@@ -38,6 +38,47 @@ describe("v2SmsEditSagas Combined", () => {
         .run();
     });
 
+    it('handles successful template edit for empty response', () => {
+      const fakeResponse = {
+        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 template edit for empty response', () => {
+      const fakeResponse = {
+        status: { code: 500 }
+      };
+
+      return expectSaga(editTemplate, template)
+        .provide([
+          [call(api.editTemplate, template), fakeResponse]
+        ])
+        .put({
+          type: types.EDIT_TEMPLATE_SUCCESS,
+          data: undefined,
+          statusCode: 500,
+          errorMsg: undefined
+        })
+        .put({
+          type: types.EDIT_TEMPLATE_FAILURE,
+          error: new TypeError('template.onUpdateTemplateComplete is not a function'),
+          errorMsg: undefined
+        })
+        .run();
+    });
+
     it('handles failure in editing a template', () => {
       const error = new Error('Edit failed');
 

package/v2Containers/Zalo/index.js

@@ -53,7 +53,6 @@ import injectReducer from '../../utils/injectReducer';
 import * as globalActions from '../Cap/actions';
 import v2ZaloReducer from './reducer';
 import { v2ZaloSagas } from './saga';
-import { DAEMON } from '@capillarytech/vulcan-react-sdk/utils/sagaInjectorTypes';
 
 export const Zalo = (props) => {
   const {
@@ -507,9 +506,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 
 const withReducer = injectReducer({ key: 'zalo', reducer: v2ZaloReducer });
-
-//DAEMON mode ensures that this saga is not injected twice
-const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas, mode: DAEMON });
+const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 
 export default withCreatives({
   WrappedComponent: Zalo,