@capillarytech/creatives-library 8.0.290-alpha.3 → 8.0.290

package/v2Containers/InappAdvance/index.js

@@ -50,7 +50,9 @@ import injectReducer from '../../utils/injectReducer';
 import v2InAppReducer from '../InApp/reducer';
 import { v2InAppSagas } from '../InApp/sagas';
 import injectSaga from '../../utils/injectSaga';
+import { validateTags } from "../../utils/tagValidations";
 import { validateInAppContent } from "../../utils/commonUtils";
+import { hasLiquidSupportFeature } from "../../utils/common";
 import formBuilderMessages from "../../v2Components/FormBuilder/messages";
 import { getSingleTab, hasAnyErrors } from "../InApp/utils";
 import ErrorInfoNote from "../../v2Components/ErrorInfoNote";
@@ -815,9 +817,11 @@ export const InappAdvanced = (props) => {
     const latestHtmlValues = await saveAllBeeInstances();
     const payload = createPayload(latestHtmlValues);
 
+    // Validate the INAPP content
+    const isLiquidFlow = hasLiquidSupportFeature();
     // Skip validation if no tags are available (e.g., in tests or when tags haven't loaded)
     const hasTags = tags && tags.length > 0;
-    if (hasTags) {
+    if (isLiquidFlow && hasTags) {
       validateInAppContent(payload, {
         currentTab: panes === ANDROID ? 1 : 2, // Convert ANDROID/IOS to tab numbers
         onError,
@@ -825,6 +829,10 @@ export const InappAdvanced = (props) => {
         getLiquidTags: (content, callback) => globalActions.getLiquidTags(content, callback),
         formatMessage,
         messages: formBuilderMessages,
+        tagLookupMap: metaEntities?.tagLookupMap || {},
+        eventContextTags: metaEntities?.eventContextTags || [],
+        isLiquidFlow,
+        forwardedTags: {},
         skipTags: (tag) => {
           // Skip certain tags if needed
           const skipRegexes = [
@@ -839,7 +847,92 @@ export const InappAdvanced = (props) => {
         },
         singleTab: getSingleTab(accountData),
       });
+    } else if (hasTags) {
+      // For non-liquid flow, validate tags using validateTags (only if tags are available)
+      const androidContent = latestHtmlValues?.android || (androidBeeHtml?.value || (typeof androidBeeHtml === 'string' ? androidBeeHtml : ''));
+      const iosContent = latestHtmlValues?.ios || (iosBeeHtml?.value || (typeof iosBeeHtml === 'string' ? iosBeeHtml : ''));
+
+      const androidSupported = get(accountData, 'selectedWeChatAccount.configs.android') === DEVICE_SUPPORTED || get(editContent, 'ANDROID.deviceType') === ANDROID;
+      const iosSupported = get(accountData, 'selectedWeChatAccount.configs.ios') === DEVICE_SUPPORTED || get(editContent, 'IOS.deviceType') === IOS_CAPITAL;
+
+      let hasErrors = false;
+      const newErrors = {
+        STANDARD_ERROR_MSG: {
+          ANDROID: [],
+          IOS: [],
+          GENERIC: [],
+        },
+        LIQUID_ERROR_MSG: {
+          ANDROID: [],
+          IOS: [],
+          GENERIC: [],
+        },
+      };
+
+      // Validate Android content
+      if (androidSupported && androidContent && androidContent?.trim() !== '') {
+        const validationResponse = validateTags({
+          content: androidContent,
+          tagsParam: tags,
+          injectedTagsParams: injectedTags || {},
+          location,
+          tagModule: getDefaultTags,
+          eventContextTags: metaEntities?.eventContextTags || [],
+          isFullMode,
+        }) || {};
+
+        if (validationResponse?.unsupportedTags?.length > 0) {
+          hasErrors = true;
+          newErrors.LIQUID_ERROR_MSG.ANDROID.push(
+            formatMessage(globalMessages.unsupportedTagsValidationError, {
+              unsupportedTags: validationResponse.unsupportedTags.join(", "),
+            })
+          );
+        }
+        if (validationResponse?.isBraceError) {
+          hasErrors = true;
+          newErrors.LIQUID_ERROR_MSG.ANDROID.push(
+            formatMessage(globalMessages.unbalanacedCurlyBraces)
+          );
+        }
+      }
+
+      // Validate iOS content
+      if (iosSupported && iosContent && iosContent?.trim() !== '') {
+        const validationResponse = validateTags({
+          content: iosContent,
+          tagsParam: tags,
+          injectedTagsParams: injectedTags || {},
+          location,
+          tagModule: getDefaultTags,
+          eventContextTags: metaEntities?.eventContextTags || [],
+          isFullMode,
+        }) || {};
+
+        if (validationResponse?.unsupportedTags?.length > 0) {
+          hasErrors = true;
+          newErrors.LIQUID_ERROR_MSG.IOS.push(
+            formatMessage(globalMessages.unsupportedTagsValidationError, {
+              unsupportedTags: validationResponse.unsupportedTags.join(", "),
+            })
+          );
+        }
+        if (validationResponse?.isBraceError) {
+          hasErrors = true;
+          newErrors.LIQUID_ERROR_MSG.IOS.push(
+            formatMessage(globalMessages.unbalanacedCurlyBraces)
+          );
+        }
+      }
+
+      if (hasErrors) {
+        setErrorMessage(newErrors);
+      } else {
+        // No errors, proceed with submission
+        onSuccess();
+      }
     } else {
+      // No tags available, skip validation and proceed directly
       onSuccess();
     }
   };
@@ -945,7 +1038,15 @@ export const InappAdvanced = (props) => {
             )}
             <CapButton
               onClick={async () => {
-                await liquidMiddleWare();
+                const isLiquidFlow = hasLiquidSupportFeature();
+                const hasTags = tags && tags?.length > 0;
+                if (isLiquidFlow || hasTags) {
+                  // Use validation middleware for tag validation
+                  await liquidMiddleWare();
+                } else {
+                  // No validation needed, proceed directly
+                  await onDoneCallback();
+                }
               }}
               disabled={isDisableDone()}
               className="inapp-create-btn"

package/v2Containers/Line/Container/ImageCarousel/tests/__snapshots__/content.test.js.snap

@@ -3117,6 +3117,7 @@ new message content.",
                                     },
                                   ]
                                 }
+                                showTruncatedTooltip={false}
                                 size="large"
                                 style={
                                   Object {
@@ -3135,6 +3136,7 @@ new message content.",
                                     />
                                   }
                                   onChange={[Function]}
+                                  onDropdownVisibleChange={[Function]}
                                   removeIcon={
                                     <CapIcon
                                       size="s"
@@ -3199,6 +3201,7 @@ new message content.",
                                     onBlur={[Function]}
                                     onChange={[Function]}
                                     onDeselect={[Function]}
+                                    onDropdownVisibleChange={[Function]}
                                     onFocus={[Function]}
                                     onInputKeyDown={[Function]}
                                     onSearch={[Function]}
@@ -3437,7 +3440,11 @@ new message content.",
                                                   }
                                                 }
                                                 title=""
-                                              />
+                                              >
+                                                <div
+                                                  className="cap-select-option-tooltip"
+                                                />
+                                              </div>
                                             </div>
                                             <span
                                               className="ant-select-arrow"
@@ -6940,6 +6947,7 @@ new message content.",
                                     },
                                   ]
                                 }
+                                showTruncatedTooltip={false}
                                 size="large"
                                 style={
                                   Object {
@@ -6958,6 +6966,7 @@ new message content.",
                                     />
                                   }
                                   onChange={[Function]}
+                                  onDropdownVisibleChange={[Function]}
                                   removeIcon={
                                     <CapIcon
                                       size="s"
@@ -7022,6 +7031,7 @@ new message content.",
                                     onBlur={[Function]}
                                     onChange={[Function]}
                                     onDeselect={[Function]}
+                                    onDropdownVisibleChange={[Function]}
                                     onFocus={[Function]}
                                     onInputKeyDown={[Function]}
                                     onSearch={[Function]}
@@ -7260,7 +7270,11 @@ new message content.",
                                                   }
                                                 }
                                                 title=""
-                                              />
+                                              >
+                                                <div
+                                                  className="cap-select-option-tooltip"
+                                                />
+                                              </div>
                                             </div>
                                             <span
                                               className="ant-select-arrow"
@@ -10707,6 +10721,7 @@ new message content.",
                                     },
                                   ]
                                 }
+                                showTruncatedTooltip={false}
                                 size="large"
                                 style={
                                   Object {
@@ -10725,6 +10740,7 @@ new message content.",
                                     />
                                   }
                                   onChange={[Function]}
+                                  onDropdownVisibleChange={[Function]}
                                   removeIcon={
                                     <CapIcon
                                       size="s"
@@ -10789,6 +10805,7 @@ new message content.",
                                     onBlur={[Function]}
                                     onChange={[Function]}
                                     onDeselect={[Function]}
+                                    onDropdownVisibleChange={[Function]}
                                     onFocus={[Function]}
                                     onInputKeyDown={[Function]}
                                     onSearch={[Function]}
@@ -11027,7 +11044,11 @@ new message content.",
                                                   }
                                                 }
                                                 title=""
-                                              />
+                                              >
+                                                <div
+                                                  className="cap-select-option-tooltip"
+                                                />
+                                              </div>
                                             </div>
                                             <span
                                               className="ant-select-arrow"

package/v2Containers/Line/Container/Text/index.js

@@ -137,6 +137,7 @@ export const LineText = ({
         const { valid, isBraceError } = validateTags({
             content: value,
             tagsParam: tags,
+            injectedTagsParams: injectedTags,
             location,
             tagModule: 'outbound',
             isFullMode,

package/v2Containers/MobilePush/Create/index.js

@@ -678,21 +678,31 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
   showError = () => {
     const {intl} = this.props;
-    const {errorData, schema} = this.state;
+    const {errorData} = this.state;
     const errorMessage = {key: 'validation-error', message: intl.formatMessage(messages.validationError)};
     if (!isEmpty(this.state.formData) && !this.state.isFormValid) {
       let tab = this.state.currentTab;
-      const isAndroidInvalid = Object.values(errorData[0] || {}).includes(true);
-      const isIosInvalid = Object.values(errorData[1] || {}).includes(true);
-      const isIosTabVisible = get(schema, 'containers[0].panes[1].isSupported', true) !== false;
+      const isAndroidInvalid = Object.values(errorData[0]).includes(true);
+      const isIosInvalid = Object.values(errorData[1]).includes(true);
+      let isTagErrorExist = false;
       if (isAndroidInvalid) {
         tab = 1;
         errorMessage.description = intl.formatMessage(messages.invalidAndroidMessage);
-      } else if (isIosInvalid && isIosTabVisible) {
+        const invalidTags = errorData[0]['invalid-tags'];
+        if (!isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidAndroidMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
+      } else if (isIosInvalid) {
         tab = 2;
         errorMessage.description = intl.formatMessage(messages.invalidIosMessage);
+        const invalidTags = errorData[1]['invalid-tags'];
+        if (!isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidIosMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
       }
-      if (tab !== this.state.currentTab) {
+      if (tab !== this.state.currentTab || isTagErrorExist) {
         CapNotification.error(errorMessage);
       }
     }

package/v2Containers/MobilePush/Edit/index.js

@@ -705,22 +705,32 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   // eslint-disable-next-line react/sort-comp
   showError = () => {
     const {intl} = this.props;
-    const {errorData, schema} = this.state;
+    const {errorData} = this.state;
     const errorMessage = {key: 'validation-error', message: intl.formatMessage(messages.validationError)};
+    let isTagErrorExist = false;
     if (!_.isEmpty(this.state.formData) && !this.state.isFormValid) {
       let tab = this.state.currentTab;
-      const isAndroidInvalid = Object.values(errorData[0] || {}).includes(true);
-      const isIosInvalid = Object.values(errorData[1] || {}).includes(true);
-      const isIosTabVisible = get(schema, 'containers[0].panes[1].isSupported', true) !== false;
+      const isAndroidInvalid = Object.values(errorData[0]).includes(true);
+      const isIosInvalid = Object.values(errorData[1]).includes(true);
       if (isAndroidInvalid) {
         tab = 1;
         errorMessage.description = intl.formatMessage(messages.invalidAndroidMessage);
-      } else if (isIosInvalid && isIosTabVisible) {
+        const invalidTags = errorData[0]['invalid-tags'];
+        if (!_.isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidAndroidMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
+      } else if (isIosInvalid) {
         tab = 2;
         errorMessage.description = intl.formatMessage(messages.invalidIosMessage);
+        const invalidTags = errorData[1]['invalid-tags'];
+        if (!_.isEmpty(invalidTags)) {
+          isTagErrorExist = true;
+          errorMessage.description = `${intl.formatMessage(messages.invalidIosMessage)} ${intl.formatMessage(messages.invalidTags)}: ${invalidTags.join(',')} `;
+        }
       }
 
-      if (tab !== this.state.currentTab) {
+      if (tab !== this.state.currentTab || isTagErrorExist) {
         CapNotification.error(errorMessage);
       }
     }

package/v2Containers/MobilePushNew/index.js

@@ -77,6 +77,7 @@ 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";
@@ -802,9 +803,10 @@ const MobilePushNew = ({
     (value) => {
       let errorTemplateDescMessage = "";
 
-      const { isBraceError } = validateTags({
+      const { unsupportedTags, isBraceError } = validateTags({
         content: value,
         tagsParam: tags,
+        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
         isFullMode,
@@ -814,6 +816,14 @@ const MobilePushNew = ({
           messages.emptyTemplateDescErrorMessage
         );
       }
+      if (unsupportedTags?.length > 0) {
+        errorTemplateDescMessage = formatMessage(
+          globalMessages.unsupportedTagsValidationError,
+          {
+            unsupportedTags,
+          }
+        );
+      }
       if (isBraceError) {
         errorTemplateDescMessage = formatMessage(
           globalMessages.unbalanacedCurlyBraces
@@ -2649,6 +2659,20 @@ 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),
     });
   }, [
@@ -2657,9 +2681,12 @@ const MobilePushNew = ({
     activeTab,
     globalActionsProps,
     formatMessage,
+    metaEntities,
     accountData,
   ]);
 
+  const isLiquidFlow = hasLiquidSupportFeature();
+
   useEffect(() => {
     // Always map to { label } for both platforms
     const newButtons = Array.isArray(ctaData)
@@ -3056,7 +3083,11 @@ const MobilePushNew = ({
                     <CapButton
                       type="primary"
                       onClick={() => {
-                        liquidMiddleWare();
+                        if (isLiquidFlow) {
+                          liquidMiddleWare();
+                        } else {
+                          handleSave();
+                        }
                       }}
                       className="save-button"
                       disabled={isSaveDisabled}

package/v2Containers/Rcs/index.js

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