@capillarytech/creatives-library 8.0.76 → 8.0.77

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.76",
+  "version": "8.0.77",
   "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';
 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/utils/tagValidations.js

@@ -315,7 +315,7 @@ export const getTagMapValue = (object = {}) => {
   return Object.values(
     object
   ).reduce((acc, current) => {
-    return { ...acc, ...current?.subtags ?? {} };
+    return { ...acc?.subtags ?? {}, ...current?.subtags ?? {} };
   }, {});
 };
 

package/utils/tests/tagValidations.test.js

@@ -498,27 +498,6 @@ describe("getTagMapValue", () => {
           name: "233",
         },
       },
-      "key 2": {
-        name: "24",
-        subtags: {
-          tagName: "234",
-        },
-      },
-    };
-    const result = getTagMapValue(object);
-    expect(result).toEqual({ name: "233", tagName: "234", });
-  });
-  it("should return the tag map value when an object is provided but subtag is not present in one of the obj", () => {
-    const object = {
-      "key 1": {
-        name: "23",
-        subtags: {
-          name: "233",
-        },
-      },
-      "key 2": {
-        name: "24",
-      },
     };
     const result = getTagMapValue(object);
     expect(result).toEqual({ name: "233" });

package/v2Containers/Email/index.js

@@ -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});