@capillarytech/creatives-library 7.17.203 → 7.17.204

package/package.json

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

package/services/api.js

@@ -357,10 +357,11 @@ export const getUserList = () => {
   return API.get(url);// request(url, getAPICallObject('GET'));
 };
 
-export const fetchSchemaForEntity = ({queryParams}) => {
+export const fetchSchemaForEntity = async ({queryParams}) => {
   if (queryParams.version === "v2" && queryParams.type === "LAYOUT") {
     const schema = getSchema(queryParams.layout);
-    return schema.then((layout) => layout).catch((err) => {
+    // Added async/await to ensure the schema object is resolved before returning it
+    return await schema.then((layout) => layout).catch((err) => {
       console.error(err);
     });
   }

package/services/tests/api.test.js

@@ -11,8 +11,10 @@ import {
   getTemplateInfoById,
   askAiraForLiquid,
   getLiquidTags,
+  fetchSchemaForEntity,
 } from '../api';
 import { mockData } from './mockData';
+import getSchema from '../getSchema';
 const sampleFile = require('../../assets/line.png');
 
 let mockDecompressJsonObject;
@@ -24,6 +26,8 @@ jest.mock('@capillarytech/cap-ui-utils', () => {
   };
 });
 
+jest.mock('../getSchema', () => jest.fn());
+
 describe('getSenderDetails -- Test with valid responses', () => {
   it('Should return correct response', () =>
     expect(getSenderDetails('WHATSAPP', -1)).toEqual(Promise.resolve()));
@@ -438,4 +442,33 @@ describe('getLiquidTags -- Test with various responses', () => {
       error: 'Internal Server Error',
     });
   });
-});
+});
+
+describe('fetchSchemaForEntity', () => {
+  it('should fetch schema for version v2 and type LAYOUT', async () => {
+    const queryParams = { version: 'v2', type: 'LAYOUT', layout: 'testLayout' };
+    const mockLayout = { id: 'layout1', name: 'Test Layout' };
+
+    getSchema.mockReturnValue(Promise.resolve(mockLayout));
+
+    const result = await fetchSchemaForEntity({ queryParams });
+
+    expect(getSchema).toHaveBeenCalledWith(queryParams.layout);
+    expect(result).toEqual(mockLayout);
+  });
+
+  it('should handle errors when fetching schema', async () => {
+    const queryParams = { version: 'v2', type: 'LAYOUT', layout: 'testLayout' };
+    const mockError = new Error('Failed to fetch schema');
+
+    getSchema.mockReturnValue(Promise.reject(mockError));
+
+    console.error = jest.fn();
+
+    const result = await fetchSchemaForEntity({ queryParams });
+
+    expect(getSchema).toHaveBeenCalledWith(queryParams.layout);
+    expect(result).toBeUndefined();
+    expect(console.error).toHaveBeenCalledWith(mockError);
+  });
+});

package/v2Containers/MobilePush/Edit/index.js

@@ -36,6 +36,7 @@ import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
 import { MAPP_SDK } from './constants';
 import { isEmbeddedEditOrPreview } from '../../../utils/commonUtils';
+import { EMBEDDED } from '../../Whatsapp/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -110,27 +111,35 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     let selectedWeChatAccount = {};
     const queryType = String(get(this.props, 'location.query.type', ''))?.toLowerCase();
     const creativesMode = String(get(this.props, 'creativesMode', ''))?.toLowerCase();
+    const { Edit: EditProps, Templates } = this.props || {};
+    const { selectedWeChatAccount: editSelectedWeChatAccount, templateDetails } = EditProps || {};
+    const { id: selectedWeChatAccountId } = editSelectedWeChatAccount || {};
+    const { definition } = templateDetails || {};
+    const { accountId: templateAccountId } = definition || {};
+    const { Edit: nextEdit } = nextProps || {};
     if (isEmbeddedEditOrPreview(queryType, creativesMode)) {
-      selectedWeChatAccount = !_.isEmpty(this.props.Edit.selectedWeChatAccount)
-        ? this.props.Edit.selectedWeChatAccount
-        : nextProps.Edit.selectedWeChatAccount;
-    } else if (!_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
+      selectedWeChatAccount = !_.isEmpty(editSelectedWeChatAccount)
+        ? editSelectedWeChatAccount
+        : nextEdit?.selectedWeChatAccount;
+    } else if (!_.isEmpty(Templates?.selectedWeChatAccount)) {
+      selectedWeChatAccount = Templates?.selectedWeChatAccount;
     }
 
-    if (this.props.location.query.type === 'embedded' && !nextProps.Edit.fetchingWeCrmAccounts && !_.isEqual(this.props.Edit.weCrmAccounts, nextProps.Edit.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
-      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
+    if (queryType === EMBEDDED && !nextEdit?.fetchingWeCrmAccounts && !_.isEqual(EditProps?.weCrmAccounts, nextEdit?.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
+      this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
     }
-    // Check if the query type is 'embedded' and the creatives mode is either 'edit' or 'preview'. Also, ensure that the selected WeChat account ID is not equal to the account ID in the template details.
-   // If all conditions are met, set the mobile push account options using the provided weCrmAccounts and the account ID from templateData.
-    if (isEmbeddedEditOrPreview(queryType, creativesMode) && !_.isEqual(this.props.Edit.selectedWeChatAccount?.id, this.props.Edit.templateDetails?.definition?.accountId)) {
-      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
+    // Check if the current mode is either embedded edit or preview, and if the selected WeChat account ID,
+    // template account ID, and the next props' weCrmAccounts are available, and if fetchingWeCrmAccounts is false,
+    // and if the selected WeChat account ID is not equal to the template account ID.
+    // If all conditions are met, set the mobile push account options using the next props' weCrmAccounts and the template account ID.
+    if (isEmbeddedEditOrPreview(queryType, creativesMode) && nextEdit?.weCrmAccounts && templateAccountId && selectedWeChatAccountId && !_.isEqual(selectedWeChatAccountId, templateAccountId)) {
+      this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, templateAccountId);
     }
-    if (!_.isEmpty(nextProps.Edit.selectedWeChatAccount) && !_.isEqual(this.props.Edit.selectedWeChatAccount, nextProps.Edit.selectedWeChatAccount) && (this.props.location.query.type === 'embedded') && this.props.location.query.module === "loyalty") {
+    if (!_.isEmpty(nextEdit?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
       const params = {
         name: '',
         sortBy: 'Most Recent',
-        accountId: nextProps.Edit.selectedWeChatAccount.id,
+        accountId: nextEdit?.selectedWeChatAccount?.id,
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
@@ -159,7 +168,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         this.setTemplateOptions(nextProps.Edit.mobilepushTemplates);
       }
     }
-
     this.handleEditSchemaOnPropsChange(nextProps, selectedWeChatAccount);
     if (nextProps.Edit.uploadedAssetData) {
       const formData = _.cloneDeep(this.state.formData);