@capillarytech/creatives-library 8.0.81 → 8.0.82-alpha.0

package/containers/Email/index.js

@@ -1199,13 +1199,11 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
 
   getValidationData = () => {
-    
     const that = this;
     const formData = _.cloneDeep(this.state.formData);
     _.forEach(formData, (val, index) => {
       if (!isNaN(index)) {
         _.forEach(val.selectedLanguages, (language) => {
-          
           if (val[language].is_drag_drop) {
             that.props.actions.getCmsData('edm', val[language].drag_drop_id, language);
           }
@@ -1933,6 +1931,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           if (this.state.saveEdmDataMode === 'validation') {
             this.getValidationData();
           } else if (this.state.saveEdmDataMode === 'save') {
+            console.log('***handleEdmSave -1935', this.state.saveObj);
             this.props.actions.createTemplate(this.state.saveObj);
           }
         }
@@ -3005,7 +3004,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     });
     
     // if (saveCount === 0) {
-    
     this.props.actions.createTemplate(obj);
     // } else {
     //   this.setState({saveObj: obj, targetSaveCount: saveCount, mode: "save", saveEdmDataMode: 'save'}, () => {

package/containers/Email/sagas.js

@@ -8,7 +8,6 @@ import * as types from './constants';
 export function* createTemplate(template) {
   let errorMsg;
   try {
-    
     const result = yield call(Api.createEmailTemplate, template);
     if (result.message || result.status.code === 500) {
       errorMsg = result.message;
@@ -55,9 +54,7 @@ export function* getAllAssets(assetType, queryParams) {
 
 export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport}) {
   try {
-    
     const result = yield call(Api.getCmsTemplateSettings, cmsType, projectId, cmsMode, langId, isEdmSupport);
-    
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_FAILURE, error });
@@ -67,7 +64,6 @@ export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSuppor
 export function* getCmsData({cmsType, projectId, langId}) {
   try {
     const result = yield call(Api.getCmsTemplateData, cmsType, projectId, langId);
-    
     yield put({ type: types.GET_CMS_EDITOR_DATA_SUCCESS, data: result.data.response.data, langId: result.data.response.langId });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DATA_FAILURE, error });
@@ -85,44 +81,30 @@ export function* uploadAsset(file, assetType, fileParams) {
 
 function* watchCreateTemplate() {
   yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  
-  
 }
 
 function* watchGetTemplateDetails() {
   yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  
-  
 }
 
 function* watchGetAllAssets() {
   yield takeLatest(types.GET_ALL_ASSETS_REQUEST, getAllAssets);
-  
-  
 }
 
 function* watchGetCmsSetting() {
   yield takeEvery(types.GET_CMS_EDITOR_DETAILS_REQUEST, getCmsSetting);
-  
-  
 }
 
 function* watchGetCmsData() {
   yield takeEvery(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
-  
-  
 }
 
 function* watchUploadAsset() {
   yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  
-  
 }
 
 function* watchDuplicateTemplate() {
   yield takeLatest(types.DUPLICATE_TEMPLATE_REQUEST, duplicateTemplate);
-  
-  
 }
 
 // All sagas to be loaded
@@ -146,4 +128,4 @@ export function* emailSaga() {
     watchUploadAsset(),
     watchDuplicateTemplate(),
   ]);
-}
+}

package/package.json

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

package/services/api.js

@@ -2,12 +2,13 @@
  * Created by vivek on 3/5/17.
  */
 import 'whatwg-fetch';
+import { GA, decompressJsonObject } from '@capillarytech/cap-ui-utils';
+import get from 'lodash/get';
 import { loadItem, clearItem } from './localStorageApi';
 import config from '../config/app';
 import pathConfig from '../config/path';
 import getSchema from './getSchema';
 import * as API from '../utils/ApiCaller';
-import { GA, decompressJsonObject } from '@capillarytech/cap-ui-utils';
 import { addBaseToTemplate } from '../utils/commonUtils';
 import { EMAIL, SMS } from '../v2Containers/CreativesContainer/constants';
 let API_ENDPOINT = config.development.api_endpoint;
@@ -300,15 +301,17 @@ export const getAllAssets = ({assetType, queryParams = {}}) => {
   });
   // const url = `https://nightly.capillary.in/arya/api/v1/creatives/assets/${assetType}?query=${JSON.stringify(queryParams)}`;
   return request(url, getAPICallObject('GET'));
-}
-;
+};
+
 export const deleteAssetById = ({assetId, assetType}) => {
   const url = `${API_ENDPOINT}/assets/${assetId}/${assetType}`;
   return request(url, getAPICallObject('DELETE'));
   // return API.deleteResource(url);
 };
 
-export const uploadFile = ({file, assetType, fileParams, mode, wechatParams, whatsappParams}) => {
+export const uploadFile = ({
+  file, assetType, fileParams, mode, wechatParams, whatsappParams,
+}) => {
   const data = new FormData();
   let fileName = '';
   try {
@@ -403,14 +406,20 @@ export const getCmsData = (cmsType, projectId, langId) => {
   return API.get(url);
 };
 
-export const getEdmTemplates = () => {
+export const getEdmTemplates = async () => {
   const url = `${API_ENDPOINT}/templates/email/default`;
-  return request(url, getAPICallObject('GET'));
+  const compressedEdmTemplates = await request(url, getAPICallObject('GET'));
+  const response = get(compressedEdmTemplates, 'response', '');
+  const decompressedEdmTemplates = decompressJsonObject(response);
+  return { ...compressedEdmTemplates, response: addBaseToTemplate(decompressedEdmTemplates) };
 };
 
-export const getDefaultBeeTemplates = () => {
+export const getDefaultBeeTemplates = async () => {
   const url = `${API_ENDPOINT}/templates/v2/email/default`;
-  return request(url, getAPICallObject('GET'));
+  const compressedDefaultBeeTemplates = await request(url, getAPICallObject('GET'));
+  const response = get(compressedDefaultBeeTemplates, 'response', '');
+  const decompressedBeeTemplates = decompressJsonObject(response);
+  return { ...compressedDefaultBeeTemplates, response: addBaseToTemplate(decompressedBeeTemplates) };
 };
 
 // All about line

package/services/tests/api.test.js

@@ -12,17 +12,22 @@ import {
   askAiraForLiquid,
   getLiquidTags,
   fetchSchemaForEntity,
+  getDefaultBeeTemplates,
+  getEdmTemplates,
 } from '../api';
 import { mockData } from './mockData';
 import getSchema from '../getSchema';
 const sampleFile = require('../../assets/line.png');
 
 let mockDecompressJsonObject;
+let mockAddBaseToTemplate;
 jest.mock('@capillarytech/cap-ui-utils', () => {
   mockDecompressJsonObject = jest.fn();
+  mockAddBaseToTemplate = jest.fn();
   return {
     ...jest.requireActual('@capillarytech/cap-ui-utils'),
     decompressJsonObject: mockDecompressJsonObject,
+    addBaseToTemplate: mockAddBaseToTemplate,
   };
 });
 
@@ -136,7 +141,7 @@ describe('getAllTemplates -- Test with valid responses', () => {
     global.fetch.mockReturnValue(Promise.resolve({json: () => Promise.resolve(),}));
     mockDecompressJsonObject.mockReturnValue();
     expect(await getAllTemplates({channel: 'email'})).toEqual({
-      "response": undefined,
+      response: undefined,
     });
   });
 
@@ -493,3 +498,114 @@ describe('fetchSchemaForEntity', () => {
     expect(console.error).toHaveBeenCalledWith(mockError);
   });
 });
+
+describe('Email Template APIs', () => {
+  beforeEach(() => {
+    global.fetch = jest.fn();
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  const sharedTests = (apiFunction, functionName) => {
+    it('should handle successful response', async () => {
+      const mockResponse = { response: 'compressed-data' };
+      const mockDecompressed = { template: 'decompressed-data' };
+      const mockWithBase = { template: 'data-with-base' };
+
+      global.fetch.mockReturnValue(Promise.resolve({
+        status: 200,
+        json: () => Promise.resolve(mockResponse),
+      }));
+      mockDecompressJsonObject.mockReturnValue(mockDecompressed);
+      mockAddBaseToTemplate.mockReturnValue(mockWithBase);
+
+      const result = await apiFunction();
+      expect(result).toEqual({
+        ...mockResponse,
+        response: mockDecompressed,
+      });
+    });
+
+    it('should handle response property as empty object', async () => {
+      const mockResponse = { response: {} };
+
+      global.fetch.mockReturnValue(Promise.resolve({
+        status: 200,
+        json: () => Promise.resolve(mockResponse),
+      }));
+      mockDecompressJsonObject.mockReturnValue({});
+      mockAddBaseToTemplate.mockReturnValue({});
+
+      const result = await apiFunction();
+      expect(result).toEqual({
+        ...mockResponse,
+        response: {},
+      });
+    });
+
+    it('should handle missing response property', async () => {
+      const mockResponse = {};
+
+      global.fetch.mockReturnValue(Promise.resolve({
+        status: 200,
+        json: () => Promise.resolve(mockResponse),
+      }));
+      mockDecompressJsonObject.mockReturnValue('');
+      mockAddBaseToTemplate.mockReturnValue('');
+
+      const result = await apiFunction();
+      expect(result).toEqual({
+        response: '',
+      });
+    });
+
+    it('should handle null response', async () => {
+      global.fetch.mockReturnValue(Promise.resolve({
+        json: () => Promise.resolve(null),
+      }));
+      mockDecompressJsonObject.mockReturnValue('');
+      mockAddBaseToTemplate.mockReturnValue('');
+
+      const result = await apiFunction();
+      expect(result).toEqual({
+        response: '',
+      });
+    });
+
+    it('should handle undefined response', async () => {
+      global.fetch.mockReturnValue(Promise.resolve({
+        json: () => Promise.resolve(undefined),
+      }));
+      mockDecompressJsonObject.mockReturnValue('');
+      mockAddBaseToTemplate.mockReturnValue('');
+
+      const result = await apiFunction();
+      expect(result).toEqual({
+        response: '',
+      });
+    });
+
+    it('should handle fetch failure', async () => {
+      global.fetch.mockRejectedValue(new Error('Network error'));
+      mockDecompressJsonObject.mockReturnValue(undefined);
+      mockAddBaseToTemplate.mockReturnValue(undefined);
+      console.error = jest.fn();
+
+      const result = await apiFunction();
+
+      expect(result).toEqual({
+        response: undefined,
+      });
+    });
+  };
+
+  describe('getEdmTemplates', () => {
+    sharedTests(getEdmTemplates, 'getEdmTemplates');
+  });
+
+  describe('getDefaultBeeTemplates', () => {
+    sharedTests(getDefaultBeeTemplates, 'getDefaultBeeTemplates');
+  });
+});

package/v2Containers/Ebill/sagas.js

@@ -31,7 +31,6 @@ export function* getTemplateDetails(id, channel) {
 export function* getCmsData({cmsType, projectId}) {
   try {
     const result = yield call(Api.getCmsData, cmsType, projectId);
-    
     yield put({ type: types.GET_CMS_EDITOR_DATA_SUCCESS, data: decodeURIComponent(result.data.response.cmsData.htmlContent) });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DATA_FAILURE, error });

package/v2Containers/Email/index.js

@@ -36,7 +36,7 @@ import { TRACK_CREATE_EMAIL, TRACK_EDIT_EMAIL, BEE_PLUGIN, CREATE, EDIT } from '
 import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 import { gtmPush } from '../../utils/gtmTrackers';
 const {CapCustomCardList} = CapCustomCard;
-import {transformEmailTemplates, storeS3FileSizeDetails, CREATIVES_S3_ASSET_FILESIZES} from '../../utils/cdnTransformation';
+import {storeS3FileSizeDetails, CREATIVES_S3_ASSET_FILESIZES} from '../../utils/cdnTransformation';
 import { CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 import injectReducer from '../../utils/injectReducer';
 import v2EmailReducer from './reducer';
@@ -199,9 +199,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         this.setState({isDragDrop: true});
       }
       if (this.props.params.id) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'open', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id', this.props.Templates.BEETemplate?._id), 'open', undefined, isBEESupport, isBEEAppEnable);
       } else if (this.props.location.query.module !== "library" || (this.props.location.query.module === "library" && !this.props.templateData)) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'create', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id', this.props.Templates.BEETemplate?._id), 'create', undefined, isBEESupport, isBEEAppEnable);
       }
     }
     this.setState({ content: (this.props.Templates.selectedEmailLayout ? this.props.Templates.selectedEmailLayout : ''), formData});
@@ -376,7 +376,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           const beeJson = `BEEeditor${currentTab > 1 ? currentTab : ''}json`;
           const beeToken = `BEEeditor${currentTab > 1 ? currentTab : ''}token`;
           let beeJsonValue = _.get(nextProps, 'Templates.BEETemplate.versions.base.json-content', '');
-          const selectedId = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate._id', '');
+          const selectedId = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate.versions.base.drag_drop_id', '');
           if (this.state.isEdit) {
             if (this.props.location.query.module === "library") {
               beeJsonValue = _.get(this.state, `formData[${currentTab - 1}][${langId}].json-content`, '');
@@ -748,7 +748,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
   getValidationData = () => {
     const that = this;
-    let id = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate._id', '');
+    let id = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate.versions.base.drag_drop_id', '');
     const formData = _.cloneDeep(this.state.formData);
     if (!id) {
       id = _.get(formData, `base[${formData.base.activeTab}].id`, '');
@@ -1405,7 +1405,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         }
       });
     } else if (this.state.mode === 'preview' || this.state.mode === 'switchEditor') {
-      let id = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate._id', '');
+      let id = _.get(this.props, 'Email.templateDetails._id', '') || _.get(this.props, 'Templates.BEETemplate.versions.base.drag_drop_id', '');   
       const formData = _.cloneDeep(this.state.formData);
       if (!id) {
         id = _.get(formData, `base[${formData.base.activeTab}].id`, '');
@@ -2397,7 +2397,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
     _.forEach(formData, (data, index) => {
       const newdata = data;
-
       if (!isNaN(index) && newdata) {
         // as baseLanguage & created template language are not same than it will pick from  template language
         const baseLangTabKey = newdata[baseLanguage]?.tabKey || newdata.tabKey;
@@ -2431,7 +2430,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     });
 
     // if (saveCount === 0) {
-
     this.props.actions.transformEmailTemplate(obj, (newEmail) => {
       this.props.actions.createTemplate(newEmail, this.onUpdateTemplateComplete);
     });