@capillarytech/creatives-library 8.0.290 → 8.0.292-alpha.0

package/v2Containers/MobilePushNew/index.js

@@ -77,7 +77,6 @@ import { getContent } from "../MobilePush/commonMethods";
 import { getMessageObject } from "../../utils/messageUtils";
 import { gtmPush } from "../../utils/gtmTrackers";
 import mobilePushReducer from "./reducer";
-import { hasLiquidSupportFeature } from "../../utils/common";
 import formBuilderMessages from "../../v2Components/FormBuilder/messages";
 import { validateMobilePushContent } from "../../utils/commonUtils";
 import { getSingleTab } from "../InApp/utils";
@@ -803,10 +802,9 @@ const MobilePushNew = ({
     (value) => {
       let errorTemplateDescMessage = "";
 
-      const { unsupportedTags, isBraceError } = validateTags({
+      const { isBraceError } = validateTags({
         content: value,
         tagsParam: tags,
-        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
         isFullMode,
@@ -816,14 +814,6 @@ const MobilePushNew = ({
           messages.emptyTemplateDescErrorMessage
         );
       }
-      if (unsupportedTags?.length > 0) {
-        errorTemplateDescMessage = formatMessage(
-          globalMessages.unsupportedTagsValidationError,
-          {
-            unsupportedTags,
-          }
-        );
-      }
       if (isBraceError) {
         errorTemplateDescMessage = formatMessage(
           globalMessages.unbalanacedCurlyBraces
@@ -2659,20 +2649,6 @@ const MobilePushNew = ({
       getLiquidTags: globalActionsProps.getLiquidTags,
       formatMessage,
       messages: formBuilderMessages,
-      tagLookupMap: metaEntities?.tagLookupMap || {},
-      eventContextTags: metaEntities?.eventContextTags || [],
-      isLiquidFlow: hasLiquidSupportFeature(),
-      forwardedTags: {},
-      skipTags: (tag) => {
-        const skipRegexes = [
-          /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]*\)/,
-        ];
-        return skipRegexes.some((regex) => regex.test(tag));
-      },
       singleTab: getSingleTab(accountData),
     });
   }, [
@@ -2681,12 +2657,9 @@ const MobilePushNew = ({
     activeTab,
     globalActionsProps,
     formatMessage,
-    metaEntities,
     accountData,
   ]);
 
-  const isLiquidFlow = hasLiquidSupportFeature();
-
   useEffect(() => {
     // Always map to { label } for both platforms
     const newButtons = Array.isArray(ctaData)
@@ -2933,16 +2906,22 @@ const MobilePushNew = ({
     setShowTestAndPreviewSlidebox(false);
   }, []);
 
-  // Add useEffect to handle isGetFormData prop changes
+  // Add useEffect to handle isGetFormData prop changes (e.g. Done clicked in footer)
+  // In library mode: run liquid validation (extractTags) first; on success liquidMiddleWare calls handleSave
+  // In full mode: call handleSave directly
   useEffect(() => {
     if (isGetFormData) {
-      handleSave();
+      if (!isFullMode) {
+        liquidMiddleWare();
+      } else {
+        handleSave();
+      }
       // Reset the flag to prevent infinite loop
       if (onValidationFail) {
         onValidationFail();
       }
     }
-  }, [isGetFormData, handleSave, onValidationFail]);
+  }, [isGetFormData, handleSave, onValidationFail, isFullMode, liquidMiddleWare]);
 
   // Add message event listener to handle parent communication (like old MobilePush components)
   useEffect(() => {
@@ -3083,7 +3062,8 @@ const MobilePushNew = ({
                     <CapButton
                       type="primary"
                       onClick={() => {
-                        if (isLiquidFlow) {
+                        // Liquid validation (extractTags) only in library mode
+                        if (!isFullMode) {
                           liquidMiddleWare();
                         } else {
                           handleSave();

package/v2Containers/MobilepushWrapper/index.js

@@ -72,7 +72,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
   }
 
   render() {
-    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
+    const {mobilePushCreateMode, step, getFormData, getLiquidTags, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
     const {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -102,6 +102,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
           <div>
             {isShowMobilepushCreate && <MobilepushCreate
               getFormLibraryData={getFormData}
+              getLiquidTags={getLiquidTags}
               setIsLoadingContent={setIsLoadingContent}
               defaultData={{"template-name": templateName}}
               location={{
@@ -143,6 +144,7 @@ MobilepushWrapper.propTypes = {
   mobilePushCreateMode: PropTypes.string,
   step: PropTypes.string,
   getFormData: PropTypes.string,
+  getLiquidTags: PropTypes.func,
   setIsLoadingContent: PropTypes.func,
   onEnterTemplateName: PropTypes.func,
   onRemoveTemplateName: PropTypes.func,

package/v2Containers/Rcs/index.js

@@ -394,23 +394,15 @@ export const Rcs = (props) => {
     const validationResponse =
       validateTags({
         content: contentForValidation,
-      tagsParam: tags,
-      injectedTagsParams: injectedTags,
-      location,
-      tagModule: getDefaultTags,
-      eventContextTags,
-      isFullMode,
-    }) || {};
-    const unsupportedTagsLengthCheck =
-      validationResponse?.unsupportedTags?.length > 0;
-      const errorMsg =
-        (unsupportedTagsLengthCheck &&
-          formatMessage(globalMessages.unsupportedTagsValidationError, {
-            unsupportedTags: validationResponse.unsupportedTags,
-          })) ||
-        (validationResponse.isBraceError &&
-          formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
-        false;
+        tagsParam: tags,
+        location,
+        tagModule: getDefaultTags,
+        isFullMode,
+      }) || {};
+    const errorMsg =
+      (validationResponse?.isBraceError &&
+        formatMessage(globalMessages.unbalanacedCurlyBraces)) ||
+      false;
     if (type === TITLE_TEXT) setTemplateTitleError(errorMsg);
     if (type === MESSAGE_TEXT) setTemplateDescError(errorMsg);
   };
@@ -835,10 +827,9 @@ export const Rcs = (props) => {
 
   const templateDescErrorHandler = (value) => {
     let errorMessage = false;
-    const { unsupportedTags, isBraceError } = validateTags({
+    const { isBraceError } = validateTags({
       content: value,
       tagsParam: tags,
-      injectedTagsParams: injectedTags,
       location,
       tagModule: getDefaultTags,
       isFullMode,
@@ -868,26 +859,10 @@ export const Rcs = (props) => {
   };
 
   const fallbackMessageErrorHandler = (value) => {
-    let errorMessage = false;
-    const { unsupportedTags } = validateTags({
-      content: value,
-      tagsParam: tags,
-      injectedTagsParams: injectedTags,
-      location,
-      tagModule: getDefaultTags,
-      isFullMode,
-    }) || {};
     if (value?.length > FALLBACK_MESSAGE_MAX_LENGTH) {
-      errorMessage = formatMessage(messages.fallbackMsgLenError);
-    } else if (unsupportedTags?.length > 0) {
-      errorMessage = formatMessage(
-        globalMessages.unsupportedTagsValidationError,
-        {
-          unsupportedTags,
-        },
-      );
+      return formatMessage(messages.fallbackMsgLenError);
     }
-    return errorMessage;
+    return false;
   };
 
   // Check for forbidden characters: square brackets [] and single curly braces {}