@capillarytech/creatives-library 7.17.203-alpha.2 → 7.17.203

package/package.json

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

package/services/api.js

@@ -357,15 +357,15 @@ export const getUserList = () => {
   return API.get(url);// request(url, getAPICallObject('GET'));
 };
 
-export const fetchSchemaForEntity = async ({queryParams}) => {
+export const fetchSchemaForEntity = ({queryParams}) => {
   if (queryParams.version === "v2" && queryParams.type === "LAYOUT") {
     const schema = getSchema(queryParams.layout);
-    return await schema.then((layout) => layout).catch((err) => {
+    return schema.then((layout) => layout).catch((err) => {
       console.error(err);
     });
   }
   const url = `${API_ENDPOINT}/meta/${queryParams.type}?query=${JSON.stringify(queryParams)}`;
-  return await request(url, getAPICallObject('GET'));// request(url, getAPICallObject('GET'));
+  return request(url, getAPICallObject('GET'));// request(url, getAPICallObject('GET'));
 };
 
 export const fetchWeCrmAccounts = (sourceName) => {

package/v2Components/FormBuilder/index.js

@@ -1102,7 +1102,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               this.props?.metaEntities?.tagLookupMap
             );
             const unsupportedLiquidTags = extractedLiquidTags?.filter(
-              (tag) => !supportedLiquidTags?.includes(tag)
+              (tag) => !supportedLiquidTags?.includes(tag) && !this.skipTags(tag)
             );
             if (
               unsupportedLiquidTags?.length > 0

package/v2Containers/MobilePush/Edit/index.js

@@ -36,7 +36,6 @@ 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;
@@ -111,35 +110,27 @@ 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(editSelectedWeChatAccount)
-        ? editSelectedWeChatAccount
-        : nextEdit?.selectedWeChatAccount;
-    } else if (!_.isEmpty(Templates?.selectedWeChatAccount)) {
-      selectedWeChatAccount = Templates?.selectedWeChatAccount;
+      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;
     }
 
-    if (queryType === EMBEDDED && !nextEdit?.fetchingWeCrmAccounts && !_.isEqual(EditProps?.weCrmAccounts, nextEdit?.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
-      this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
+    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"));
     }
-    // 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);
+    // 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"));
     }
-    if (!_.isEmpty(nextEdit?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
+    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") {
       const params = {
         name: '',
         sortBy: 'Most Recent',
-        accountId: nextEdit?.selectedWeChatAccount?.id,
+        accountId: nextProps.Edit.selectedWeChatAccount.id,
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
@@ -168,6 +159,7 @@ 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);