@capillarytech/creatives-library 8.0.79 → 8.0.81

package/package.json

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

package/services/api.js

@@ -2,13 +2,12 @@
  * 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;
@@ -301,17 +300,15 @@ 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 {
@@ -406,20 +403,14 @@ export const getCmsData = (cmsType, projectId, langId) => {
   return API.get(url);
 };
 
-export const getEdmTemplates = async () => {
+export const getEdmTemplates = () => {
   const url = `${API_ENDPOINT}/templates/email/default`;
-  const compressedEdmTemplates = await request(url, getAPICallObject('GET'));
-  const response = get(compressedEdmTemplates, 'response', '');
-  const decompressedEdmTemplates = decompressJsonObject(response);
-  return { ...compressedEdmTemplates, response: addBaseToTemplate(decompressedEdmTemplates) };
+  return request(url, getAPICallObject('GET'));
 };
 
-export const getDefaultBeeTemplates = async () => {
+export const getDefaultBeeTemplates = () => {
   const url = `${API_ENDPOINT}/templates/v2/email/default`;
-  const compressedDefaultBeeTemplates = await request(url, getAPICallObject('GET'));
-  const response = get(compressedDefaultBeeTemplates, 'response', '');
-  const decompressedBeeTemplates = decompressJsonObject(response);
-  return { ...compressedDefaultBeeTemplates, response: addBaseToTemplate(decompressedBeeTemplates) };
+  return request(url, getAPICallObject('GET'));
 };
 
 // All about line

package/services/tests/api.test.js

@@ -12,22 +12,17 @@ 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,
   };
 });
 
@@ -141,7 +136,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,
     });
   });
 
@@ -498,114 +493,3 @@ 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/v2Components/FormBuilder/index.js

@@ -998,7 +998,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 if (tagValidationResponse?.isContentEmpty) {
                   errorString += this.props.intl.formatMessage(messages.emailBodyEmptyError);
                   // Adds a bypass for cases where content is initially empty in the creation flow.
-                  if(this.liquidFlow && !this.props.isEdit){
+                  if(this.liquidFlow){
                     errorString = "";
                     isLiquidValid = true;
                   }
@@ -1102,13 +1102,16 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         const handleResult = (result) => {
           const {formatMessage} = this.props.intl;
           // Checks for errors in the result and displays them if any are found.
-          if (result?.errors?.length > 0) {
+          const validString = /\S/.test(content);
+          // If the content is empty or there are errors in the result, display the necessary validation messages.
+          if (result?.errors?.length > 0 || !validString) {
             this.setState((prevState) => ({
               liquidErrorMessage: {
                 ...prevState.liquidErrorMessage,
+                STANDARD_ERROR_MSG: !validString ? [...(prevState.liquidErrorMessage?.STANDARD_ERROR_MSG || []), formatMessage(messages.emailBodyEmptyError)] : prevState.liquidErrorMessage?.STANDARD_ERROR_MSG,
                 LIQUID_ERROR_MSG: result?.errors?.map(error => error?.message) ?? [formatMessage(messages.somethingWentWrong)],
-              },
-            }) , () => {
+              }
+            }), () => {
               this.props.showLiquidErrorInFooter(this.state.liquidErrorMessage);
             });
             this.props.stopValidation();

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, _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id', this.props.Templates.BEETemplate?._id), 'open', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, 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, _.get(this.props.Templates.BEETemplate, 'versions.base.drag_drop_id', this.props.Templates.BEETemplate?._id), 'create', undefined, isBEESupport, isBEEAppEnable);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'create', undefined, isBEESupport, isBEEAppEnable);
       }
     }
     this.setState({ content: (this.props.Templates.selectedEmailLayout ? this.props.Templates.selectedEmailLayout : ''), formData});

package/v2Containers/Line/Container/Sticker/tests/mockData.js

@@ -0,0 +1,103 @@
+export const emptyInputs = {
+  emptyObject: {},
+  nullInput: null,
+  undefinedInput: undefined,
+  expectedOutput: {}
+};
+
+export const noValidPackageIdsInput = {
+  input: {
+    standard: [
+      { _id: '1', definition: { stickerUrl: 'url1' } },
+      { _id: '2', definition: {} }
+    ],
+    custom: [
+      { _id: '3', definition: null },
+      { _id: '4' }
+    ]
+  },
+  expectedOutput: {}
+};
+
+export const singleCategoryInput = {
+  input: {
+    standard: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '2', definition: { packageId: 'pkg1', stickerUrl: 'url2' } },
+      { _id: '3', definition: { packageId: 'pkg2', stickerUrl: 'url3' } }
+    ]
+  },
+  expectedOutput: {
+    pkg1: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '2', definition: { packageId: 'pkg1', stickerUrl: 'url2' } }
+    ],
+    pkg2: [
+      { _id: '3', definition: { packageId: 'pkg2', stickerUrl: 'url3' } }
+    ]
+  }
+};
+
+export const multipleCategoriesInput = {
+  input: {
+    standard: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '2', definition: { packageId: 'pkg2', stickerUrl: 'url2' } }
+    ],
+    custom: [
+      { _id: '3', definition: { packageId: 'pkg1', stickerUrl: 'url3' } },
+      { _id: '4', definition: { packageId: 'pkg3', stickerUrl: 'url4' } }
+    ],
+    extended: [
+      { _id: '5', definition: { packageId: 'pkg2', stickerUrl: 'url5' } }
+    ]
+  },
+  expectedOutput: {
+    pkg1: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '3', definition: { packageId: 'pkg1', stickerUrl: 'url3' } }
+    ],
+    pkg2: [
+      { _id: '2', definition: { packageId: 'pkg2', stickerUrl: 'url2' } },
+      { _id: '5', definition: { packageId: 'pkg2', stickerUrl: 'url5' } }
+    ],
+    pkg3: [
+      { _id: '4', definition: { packageId: 'pkg3', stickerUrl: 'url4' } }
+    ]
+  }
+};
+
+export const nonArrayCategoriesInput = {
+  input: {
+    standard: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } }
+    ],
+    custom: 'not an array',
+    extended: null
+  },
+  expectedOutput: {
+    pkg1: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } }
+    ]
+  }
+};
+
+export const mixedStickerDataInput = {
+  input: {
+    standard: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '2', definition: { stickerUrl: 'url2' } },
+      { _id: '3' }
+    ],
+    custom: [
+      { _id: '4', definition: { packageId: 'pkg1', stickerUrl: 'url4' } },
+      { _id: '5', definition: { packageId: null, stickerUrl: 'url5' } }
+    ]
+  },
+  expectedOutput: {
+    pkg1: [
+      { _id: '1', definition: { packageId: 'pkg1', stickerUrl: 'url1' } },
+      { _id: '4', definition: { packageId: 'pkg1', stickerUrl: 'url4' } }
+    ]
+  }
+}; 

package/v2Containers/Line/Container/Sticker/tests/utils.test.js

@@ -0,0 +1,37 @@
+import { groupLineStickers } from '../utils';
+import {
+  emptyInputs,
+  noValidPackageIdsInput,
+  singleCategoryInput,
+  multipleCategoriesInput,
+  nonArrayCategoriesInput,
+  mixedStickerDataInput
+} from './mockData';
+
+describe('groupLineStickers', () => {
+  it('should return empty object when input is empty', () => {
+    expect(groupLineStickers(emptyInputs.emptyObject)).toEqual(emptyInputs.expectedOutput);
+    expect(groupLineStickers(emptyInputs.nullInput)).toEqual(emptyInputs.expectedOutput);
+    expect(groupLineStickers(emptyInputs.undefinedInput)).toEqual(emptyInputs.expectedOutput);
+  });
+
+  it('should handle input with no valid packageIds', () => {
+    expect(groupLineStickers(noValidPackageIdsInput.input)).toEqual(noValidPackageIdsInput.expectedOutput);
+  });
+
+  it('should group stickers by packageId within single category', () => {
+    expect(groupLineStickers(singleCategoryInput.input)).toEqual(singleCategoryInput.expectedOutput);
+  });
+
+  it('should group stickers by packageId across multiple categories', () => {
+    expect(groupLineStickers(multipleCategoriesInput.input)).toEqual(multipleCategoriesInput.expectedOutput);
+  });
+
+  it('should skip non-array categories', () => {
+    expect(groupLineStickers(nonArrayCategoriesInput.input)).toEqual(nonArrayCategoriesInput.expectedOutput);
+  });
+
+  it('should handle mixed valid and invalid sticker data', () => {
+    expect(groupLineStickers(mixedStickerDataInput.input)).toEqual(mixedStickerDataInput.expectedOutput);
+  });
+}); 

package/v2Containers/Line/Container/Sticker/utils.js

@@ -6,15 +6,26 @@ import CapColumn from '@capillarytech/cap-ui-library/CapColumn';
 
 export const groupLineStickers = (lineStickers) => {
   const stickerGroup = {};
-  lineStickers.forEach((lineSticker) => {
-    const packageId = get(lineSticker, 'definition.packageId');
-    if (packageId) {
-      const stickerGroupPackageId = stickerGroup[packageId];
-      if (stickerGroupPackageId && Array.isArray(stickerGroupPackageId)) {
-        stickerGroup[packageId].push(lineSticker);
-      } else {
-        stickerGroup[packageId] = [];
-      }
+  // Return early if lineStickers is null or undefined
+  if (!lineStickers) return stickerGroup;
+
+  // Now we can safely iterate as lineStickers is defined
+  Object?.keys(lineStickers)?.forEach((key) => {
+    const category = lineStickers[key];
+    if (Array.isArray(category)) {
+      //iterating over each category [standard, custom, extended]
+      category?.forEach((lineSticker) => {
+        const packageId = get(lineSticker, 'definition.packageId');
+        if (packageId) {
+          const stickerGroupPackageId = stickerGroup[packageId];
+          if (stickerGroupPackageId && Array.isArray(stickerGroupPackageId)) {
+            stickerGroup[packageId].push(lineSticker);
+          } else {
+            //initialising with first sticker for each package ID
+            stickerGroup[packageId] = [lineSticker];
+          }
+        }
+      });
     }
   });
   return stickerGroup;
@@ -35,7 +46,7 @@ export const getContent = ({ lineStickers, onStickerSelect }) => (
             >
               <CapImage
                 src={definition.stickerUrl}
-                rest={{ height: 70 }}
+                rest = {{ height: 70 }}
                 rest={{
                   height: 70,
                   onMouseOut: e => (e.currentTarget.src = definition.stickerUrl),