@capillarytech/creatives-library 8.0.223 → 8.0.225

package/package.json

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

package/utils/commonUtils.js

@@ -16,7 +16,7 @@ import {
   IOS,
 } from "../v2Containers/CreativesContainer/constants";
 import { GLOBAL_CONVERT_OPTIONS } from "../v2Components/FormBuilder/constants";
-import { checkSupport, extractNames, skipTags as defaultSkipTags } from "./tagValidations";
+import { checkSupport, extractNames } from "./tagValidations";
 import { SMS_TRAI_VAR } from '../v2Containers/SmsTrai/Edit/constants';
 export const apiMessageFormatHandler = (id, fallback) => (
   <FormattedMessage id={id} defaultMessage={fallback} />
@@ -146,7 +146,7 @@ export const validateLiquidTemplateContent = async (
     isLiquidFlow,
     forwardedTags = {},
     tabType,
-    skipTags = defaultSkipTags,
+    skipTags = () => false,
   } = options;
   const emptyBodyError = formatMessage(messages?.emailBodyEmptyError);
   const somethingWrongMsg = formatMessage(messages?.somethingWentWrong);

package/utils/tagValidations.js

@@ -221,7 +221,7 @@ export const validateTags = ({
 /**
  * Checks if the given tag is supported based on the injected tags.
  * @param {string} checkingTag - The tag to check.
- * @param {Object} injectedTags - The injected tags.
+ * @param {Array} injectedTags - The injected tags.
  * @returns {boolean} - True if the tag is supported, false otherwise.
  */
 export const checkIfSupportedTag = (checkingTag, injectedTags) => {
@@ -235,7 +235,7 @@ export const checkIfSupportedTag = (checkingTag, injectedTags) => {
   });
   
   return result;
-};
+}
 
 const indexOfEnd = (targetString, string) => {
   let io = targetString.indexOf(string);
@@ -247,14 +247,19 @@ export const skipTags = (tag) => {
   if (tag?.match(ENTRY_TRIGGER_TAG_REGEX)) {
     return false;
   }
-  const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)", "Link_to_[a-zA-z]", "SURVEY.*.TOKEN", "^[A-Za-z].*\\([a-zA-Z\\d]*\\)", "referral_unique_(code|url).*userid"];
-  // Use some() to check if any pattern matches (stops on first match)
-  return regexGroups.some((group) => {
-    // Create a new RegExp for each test to avoid state issues with global flag
-    const groupRegex = new RegExp(group);
-    return groupRegex.test(tag);
+  const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN", "^[A-Za-z].*\\([a-zA-Z\\d]*\\)"];
+  let skipped = false;
+  lodashForEach(regexGroups, (group) => {
+    const groupRegex = new RegExp(group, "g");
+    let match = groupRegex.exec(tag);
+    if (match !== null ) {
+      skipped = true;
+      return true;
+    }
+    return true;
   });
-};
+  return skipped;
+}
 
 export const transformInjectedTags = (tags) => {
   lodashForEach(tags, (tag) => {

package/utils/tests/commonUtil.test.js

@@ -7,7 +7,6 @@ import {
   addBaseToTemplate,
   validateCarouselCards,
 } from "../commonUtils";
-import { skipTags } from "../tagValidations";
 import { SMS_TRAI_VAR } from '../../v2Containers/SmsTrai/Edit/constants';
 import { ANDROID, IOS } from '../../v2Containers/CreativesContainer/constants';
 
@@ -123,150 +122,6 @@ describe("validateLiquidTemplateContent", () => {
     expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
   });
 
-  it("should skip referral_unique_code tags and not trigger unsupported tag error", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_code_C6SOE_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_url tags and not trigger unsupported tag error", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_url_C6SOE_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_code tags with different codes", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_code_ABC123_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_url tags with different codes", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_url_ABC123_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_code tags with alphanumeric codes", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_code_XYZ789_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_url tags with alphanumeric codes", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_url_XYZ789_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip both referral_unique_code and referral_unique_url tags in the same content", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_code_C6SOE_userid" }, { name: "referral_unique_url_C6SOE_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
-  it("should skip referral_unique_code_632L7_userid tag (real-world example)", async () => {
-    const getLiquidTags = jest.fn((content, cb) =>
-      cb({ askAiraResponse: { errors: [], data: [{ name: "referral_unique_code_632L7_userid" }] }, isError: false })
-    );
-    await validateLiquidTemplateContent("foo", {
-      getLiquidTags,
-      formatMessage,
-      messages,
-      onError,
-      onSuccess,
-      tagLookupMap,
-      eventContextTags,
-      skipTags
-    });
-    expect(onSuccess).toHaveBeenCalledWith("foo", undefined);
-    expect(onError).not.toHaveBeenCalled();
-  });
-
   it("calls onError with emailBodyEmptyError when validString is falsy", async () => {
     const getLiquidTags = jest.fn((content, cb) => cb({ askAiraResponse: { errors: [], data: [] }, isError: false }));
     const formatMessage = jest.fn((msg) => msg.id);

package/utils/tests/tagValidations.test.js

@@ -952,92 +952,6 @@ describe("skipTags", () => {
     const result = skipTags(tag);
     expect(result).toEqual(true);
   });
-
-  it("should return true for referral unique code tags with userid", () => {
-    const tag = "referral_unique_code_C6SOE_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral unique url tags with userid", () => {
-    const tag = "referral_unique_url_C6SOE_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral unique code tags with different codes", () => {
-    const tag = "referral_unique_code_ABC123_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral unique url tags with different codes", () => {
-    const tag = "referral_unique_url_ABC123_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral unique code tags with alphanumeric codes", () => {
-    const tag = "referral_unique_code_XYZ789_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral unique url tags with alphanumeric codes", () => {
-    const tag = "referral_unique_url_XYZ789_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return false for tags that don't match referral pattern", () => {
-    const tag = "referral_code_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(false);
-  });
-
-  it("should return false for tags with referral but missing unique_code or unique_url", () => {
-    const tag = "referral_C6SOE_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(false);
-  });
-
-  it("should return false for tags with referral_unique_code but missing userid", () => {
-    const tag = "referral_unique_code_C6SOE";
-    const result = skipTags(tag);
-    expect(result).toEqual(false);
-  });
-
-  it("should return false for tags with referral_unique_url but missing userid", () => {
-    const tag = "referral_unique_url_C6SOE";
-    const result = skipTags(tag);
-    expect(result).toEqual(false);
-  });
-
-  it("should return true for referral_unique_code tags with numeric codes like 632L7", () => {
-    const tag = "referral_unique_code_632L7_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral_unique_url tags with numeric codes like 632L7", () => {
-    const tag = "referral_unique_url_632L7_userid";
-    const result = skipTags(tag);
-    expect(result).toEqual(true);
-  });
-
-  it("should return true for referral tags with various token formats", () => {
-    const tags = [
-      "referral_unique_code_123_userid",
-      "referral_unique_code_ABC_userid",
-      "referral_unique_code_123ABC_userid",
-      "referral_unique_url_456_userid",
-      "referral_unique_url_DEF_userid",
-      "referral_unique_url_456DEF_userid",
-    ];
-    tags.forEach((tag) => {
-      expect(skipTags(tag)).toEqual(true);
-    });
-  });
 });
 
 

package/v2Components/FormBuilder/constants.js

@@ -4,10 +4,11 @@ export const UPLOAD = 'upload';
 export const USE_EDITOR = 'useEditor';
 export const COPY_PRIMARY_LANGUAGE = 'copyPrimaryLanguage';
 export const GLOBAL_CONVERT_OPTIONS = {
-    selectors: [
-      ...[1, 2, 3, 4, 5, 6].map(level => ({
-        selector: `h${level}`,
-        options: { uppercase: false }
-      }))
-    ]
-  };
+  wordwrap: null,
+  selectors: [
+    ...[1, 2, 3, 4, 5, 6].map((level) => ({
+      selector: `h${level}`,
+      options: { uppercase: false },
+    })),
+  ],
+};

package/v2Components/FormBuilder/index.js

@@ -54,7 +54,7 @@ import { containsBase64Images } from '../../utils/content';
 import { SMS, MOBILE_PUSH, LINE, ENABLE_AI_SUGGESTIONS,AI_CONTENT_BOT_DISABLED, EMAIL, LIQUID_SUPPORTED_CHANNELS, INAPP } from '../../v2Containers/CreativesContainer/constants';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { convert } from 'html-to-text';
-import { OUTBOUND, ADD_LANGUAGE, UPLOAD, USE_EDITOR, COPY_PRIMARY_LANGUAGE } from './constants';
+import { OUTBOUND, ADD_LANGUAGE, UPLOAD, USE_EDITOR, COPY_PRIMARY_LANGUAGE, GLOBAL_CONVERT_OPTIONS } from './constants';
 import { GET_TRANSLATION_MAPPED } from '../../constants/unified';
 import moment from 'moment';
 import { CUSTOMER_BARCODE_TAG , COPY_OF, ENTRY_TRIGGER_TAG_REGEX} from '../../constants/unified';
@@ -1491,13 +1491,20 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     if (tag?.match(ENTRY_TRIGGER_TAG_REGEX)) {
       return false;
     }
-    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)", "Link_to_[a-zA-z]", "SURVEY.*.TOKEN", "^[A-Za-z].*\\([a-zA-Z\\d]*\\)", "referral_unique_(code|url).*userid"];
-    // Use some() to check if any pattern matches (stops on first match)
-    return regexGroups.some((group) => {
-      // Create a new RegExp for each test to avoid state issues with global flag
-      const groupRegex = new RegExp(group);
-      return groupRegex.test(tag);
+    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN","^[A-Za-z].*\\([a-zA-Z\\d]*\\)"];
+    //const regexGroups = [];
+    let skipped = false;
+    _.forEach(regexGroups, (group) => {
+      //const groupRegex = /dynamic_expiry_date_after_\(\d+\)_days.FORMAT_\d/g;
+      const groupRegex = new RegExp(group, "g");
+      let match = groupRegex.exec(tag);
+      if (match !== null ) {
+        skipped = true;
+        return true;
+      }
+      return true;
     });
+    return skipped;
   }
 
   validateTags(content, tagsParam, injectedTagsParams, isEmail = false) {
@@ -1517,7 +1524,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     response.unsupportedTags = [];
     response.isBraceError = false;
     response.isContentEmpty = false;
-    const contentForValidation = isEmail ? convert(content) : content ;
+    const contentForValidation = isEmail ? convert(content, GLOBAL_CONVERT_OPTIONS) : content ;
     if(tags && tags.length) {
       _.forEach(tags, (tag) => {
         _.forEach(tag.definition.supportedModules, (module) => {