@capillarytech/creatives-library 8.0.285-alpha.0 → 8.0.285-alpha.1

package/initialState.js

@@ -14,9 +14,7 @@ export default {
     metaEntities: {
       tags: [],
       layouts: [],
-      tagLookupMap: {},
     },
-    liquidTags: [],
     fetchingLiquidTags: false,
     fetchingSchema: true,
     fetchingSchemaError: '',

package/package.json

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

package/utils/common.js

@@ -125,7 +125,11 @@ export const hasCustomerBarcodeFeatureEnabled = Auth.hasFeatureAccess.bind(
   ENABLE_CUSTOMER_BARCODE_TAG,
 );
 
-export const isEmailUnsubscribeTagMandatory = Auth.hasFeatureAccess.bind(
+// Note: The "EMAIL_UNSUBSCRIBE_TAG_MANDATORY" feature flag determines if the Unsubscribe tag in email is optional. 
+// When this flag is enabled for an org, the Unsubscribe tag is NOT mandatory in the email flow.
+// This is as per the requirement in the tech doc:
+// https://capillarytech.atlassian.net/wiki/spaces/CAM/pages/3941662838/Remove+mandate+for+Unsubscribe+tag+in+email+flow
+export const isEmailUnsubscribeTagOptional = Auth.hasFeatureAccess.bind(
   null,
   EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
 );

package/utils/commonUtils.js

@@ -140,10 +140,6 @@ export const validateLiquidTemplateContent = async (
     messages,
     onError = () => {},
     onSuccess = () => {},
-    tagLookupMap,
-    eventContextTags,
-    isLiquidFlow,
-    forwardedTags = {},
     tabType,
   } = options;
   const emptyBodyError = formatMessage(messages?.emailBodyEmptyError);
@@ -288,7 +284,7 @@ export const _validatePlatformSpecificContent = async (
 /**
  * Validate Mobile Push content for both Android and iOS tabs
  * @param {object} formData - Form data containing Android and iOS content
- * @param {object} options - Options for validation (currentTab, onError, onSuccess, getLiquidTags, formatMessage, messages, tagLookupMap, eventContextTags, isLiquidFlow, forwardedTags, singleTab). skipTags and extractNames are no longer accepted.
+ * @param {object} options - Options for validation (currentTab, onError, onSuccess, getLiquidTags, formatMessage, messages, singleTab).
  * @returns {Promise<boolean>} - Promise that resolves to true when validation succeeds, false otherwise
  */
 export const validateMobilePushContent = async (formData, options) => {

package/utils/tagValidations.js

@@ -13,168 +13,10 @@ import { ENTRY_TRIGGER_TAG_REGEX, SKIP_TAGS_REGEX_GROUPS } from '../constants/un
 const DEFAULT = 'default';
 const SUBTAGS = 'subtags';
 
-/**
- * Checks if the response object of Tags supports the Tags added in the Add Labels Section
- * @param {Object} response - The response object to check.
- * @param {Object} tagObject - The tagLookupMap.
- */
-export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [], isLiquidFlow = false, forwardedTags = {}) => {
-  const supportedList = [];
-  // Verifies the presence of the tag in the 'Add Labels' section.
-  // Incase of journey event context the tags won't be available in the tagObject(tagLookupMap).
-  //Here forwardedTags only use in case of loyalty module
-  const mappedForwardedTags = handleForwardedTags(forwardedTags);
-  const checkNameInTagObjectOrEventContext = (name) => !!tagObject[name] || eventContextTags?.some((tag) => tag?.tagName === name) || mappedForwardedTags.includes(name);
-
-  // Verify if childTag is a valid sub-tag of parentTag from the 'Add Labels' section or if it's unsupported.
-  const checkSubtags = (parentTag, childName) => {
-    // For event context tags the parentTag will be the event context tag name and subtags will be the child attributes for leaderboards
-    if (checkNameInTagObjectOrEventContext(parentTag) && isLiquidFlow && eventContextTags?.length) {
-      const childNameAfterDot = childName?.split(".")?.[1];
-      if (eventContextTags?.some((tag) => tag?.subTags?.includes(childNameAfterDot))) {
-        supportedList.push(childName);
-      }
-    }
-    if (!tagObject?.[parentTag] && !mappedForwardedTags.includes(parentTag)) return false;
-    let updatedChildName = childName;
-    let updatedWithoutDotChildName = childName;
-    if (childName?.includes(".")) {
-      updatedChildName = `.${childName?.split(".")?.[1]}`;
-      updatedWithoutDotChildName = childName?.split(".")?.[1];
-    }
-    if (tagObject?.[parentTag]) {
-      const subTags = tagObject?.[parentTag]?.definition?.subtags;
-      return subTags?.includes(updatedChildName);
-    }
-    return mappedForwardedTags.includes(updatedChildName) || mappedForwardedTags.includes(updatedWithoutDotChildName) || mappedForwardedTags.includes(childName);
-  };
-
-  //Recursively checks if the childTag is actually a Sub-tag of the ParentTag
-  const processChildren = (parentTag = "", children = []) => {
-    for (const child of children) {
-      if (checkSubtags(parentTag, child?.name)) {
-        supportedList.push(child?.name);
-      }
-      if (child?.children?.length) {
-        processChildren(child?.name, child?.children);
-      }
-    }
-  };
-
-  //Checks if the tag is present in the Add Label Section
-  for (const item of response?.data || []) {
-    if (checkNameInTagObjectOrEventContext(item?.name)) {
-      supportedList?.push(item?.name);
-    }
-    //Repeat the process for subtags
-    if (item?.children?.length) {
-      processChildren(item?.name, item?.children);
-    }
-  }
-
-
-  return supportedList;
-};
-
-const handleForwardedTags = (forwardedTags) => {
-  const result = [];
-  Object.keys(forwardedTags).forEach((key) => {
-    result.push(key); // Add the main key to the result array
-
-    // Check if there are subtags for the current key
-    if (forwardedTags[key].subtags) {
-      // If subtags exist, add all subtag keys to the result array
-      Object.keys(forwardedTags[key].subtags).forEach((subkey) => {
-        result.push(subkey);
-      });
-    }
-  });
-  return result;
-};
-
-/**
- * Extracts the names from the given data.
- * @param {Array} data - The data to extract names from.
- * @returns {Array} - The extracted names.
- */
-export function extractNames(data) {
-  const names = [];
-
-  function traverse(node) {
-    if (node?.name) {
-      names.push(node?.name);
-    }
-
-    if (node?.children?.length > 0) {
-      node?.children?.forEach((child) => traverse(child));
-    }
-  }
-
-  data?.forEach((item) => traverse(item));
-
-  return names;
-}
-
-// Helper to check if a tag is inside a {% ... %} block
-// Handles all Liquid block types: {% %}, {%- -%}, {%- %}, {% -%}
-// Content inside {% %} blocks can contain any dynamic tags and should not be validated
-export const isInsideLiquidBlock = (content, tagIndex) => {
-  if (!content || tagIndex < 0 || tagIndex >= content.length) {
-    return false;
-  }
-
-  // Check if tagIndex is at the start of a {% block
-  // Need to check a few characters ahead to catch {% patterns
-  const checkWindow = content.substring(Math.max(0, tagIndex - 1), Math.min(content.length, tagIndex + 3));
-  if (/{%-?/.test(checkWindow) && content.substring(tagIndex, tagIndex + 2) === '{%') {
-    return true;
-  }
-
-  // Check content up to tagIndex to see if we're inside any {% %} block
-  // We need to properly handle Liquid tags:
-  // - Block opening tags: {% for %}, {% if %}, {% unless %}, {% case %}, {% capture %}, etc.
-  //   These OPEN a block that needs to be closed with an "end" tag
-  // - Block closing tags: {% endfor %}, {% endif %}, {% endunless %}, etc.
-  //   These CLOSE a block opened by a corresponding opening tag
-  // - Self-contained tags: {% assign %}, {% comment %}, etc.
-  //   These are blocks themselves (from {% to %})
-  const contentBeforeTag = content.substring(0, tagIndex);
-
-  // Regex to match Liquid block opening tags (for, if, unless, case, capture, tablerow, raw, comment)
-  // These tags OPEN a block that needs to be closed with an "end" tag
-  const blockOpeningTags = ['for', 'if', 'unless', 'case', 'capture', 'tablerow', 'raw', 'comment'];
-  const blockOpeningPattern = blockOpeningTags.map(tag => `\\b${tag}\\b`).join('|');
-  const blockOpeningRegex = new RegExp(`{%-?\\s*(${blockOpeningPattern})[^%]*%}`, 'gi');
-
-  // Regex to match Liquid block closing tags (endfor, endif, endunless, endcase, endcapture, etc.)
-  const blockClosingTags = ['endfor', 'endif', 'endunless', 'endcase', 'endcapture', 'endtablerow', 'endraw', 'endcomment'];
-  const blockClosingPattern = blockClosingTags.map(tag => `\\b${tag}\\b`).join('|');
-  const blockClosingRegex = new RegExp(`{%-?\\s*(${blockClosingPattern})[^%]*%}`, 'gi');
-
-  // Find all block opening tags before tagIndex
-  const blockOpenings = Array.from(contentBeforeTag.matchAll(blockOpeningRegex), (match) => match.index);
-
-  // Find all block closing tags before tagIndex
-  const blockClosings = Array.from(contentBeforeTag.matchAll(blockClosingRegex), (match) => match.index);
-
-  // Count unmatched opening blocks (for, if, etc.)
-  const openBlockCount = blockOpenings.length - blockClosings.length;
-
-  // Also check for self-contained tags (assign, etc.) that create blocks from {% to %}
-  // These are any {% %} tags that are not block-opening or block-closing tags
-  const allBlockStarts = /{%-?/g;
-  const allBlockEnds = /-?%}/g;
-  const allStarts = Array.from(contentBeforeTag.matchAll(allBlockStarts), (match) => match.index);
-  const allEnds = Array.from(contentBeforeTag.matchAll(allBlockEnds), (match) => match.index);
-
-  // Check if we're inside a self-contained tag (more {% than %} before tagIndex, excluding block tags)
-  const selfContainedCount = allStarts.length - allEnds.length;
-
-  // We're inside a block if:
-  // 1. We're inside an unclosed block-opening tag (for, if, etc.), OR
-  // 2. We're inside a self-contained tag (assign, etc.)
-  return openBlockCount > 0 || selfContainedCount > 0;
-};
+/** Whitespace-tolerant check for {{ unsubscribe }}-style tag in content. */
+const UNSUBSCRIBE_TAG_REGEX = /\{\{\s*unsubscribe\s*\}\}/;
+export const hasUnsubscribeTag = (content) =>
+  typeof content === 'string' && UNSUBSCRIBE_TAG_REGEX.test(content);
 
 /**
  * Shared core for tag validation. Used by validateTags (tagValidations) and FormBuilder.validateTags.
@@ -187,7 +29,7 @@ export const isInsideLiquidBlock = (content, tagIndex) => {
  * @param {Array} [params.initialMissingTags=null] - If set, use instead of computing from definitions.
  * @param {function} [params.skipTagsFn=skipTags] - skipTags implementation.
  * @param {boolean} [params.includeIsContentEmpty=false] - If true, response includes isContentEmpty: false.
- * @returns {{ valid: boolean, missingTags: string[], unsupportedTags: string[], isBraceError: boolean }}
+ * @returns {{ valid: boolean, missingTags: string[], isBraceError: boolean }}
  */
 export const validateTagsCore = ({
   contentForBraceCheck,
@@ -202,7 +44,6 @@ export const validateTagsCore = ({
   const response = {
     valid: true,
     missingTags: [],
-    unsupportedTags: [],
     isBraceError: false,
     ...(includeIsContentEmpty && { isContentEmpty: false }),
   };
@@ -219,7 +60,7 @@ export const validateTagsCore = ({
         if (value === 'unsubscribe') {
           lodashForEach(supportedModules, (module) => {
             if (module.mandatory && (currentModule === module.context)) {
-              if (contentForUnsubscribeScan.indexOf(`{{${value}}}`) === -1) {
+              if (!hasUnsubscribeTag(contentForUnsubscribeScan)) {
                 response.missingTags.push(value);
               }
             }
@@ -266,7 +107,7 @@ export const validateTagsCore = ({
  * @param {Object} [params.location] - Location with query.module.
  * @param {string} [params.tagModule] - Override for current module context.
  * @param {boolean} [params.isFullMode] - If true, skip unsubscribe checks.
- * @returns {{ valid: boolean, missingTags: string[], unsupportedTags: string[], isBraceError: boolean }}
+ * @returns {{ valid: boolean, missingTags: string[], isBraceError: boolean }}
  */
 export const validateTags = ({
   content,