@capillarytech/creatives-library 8.0.287-alpha.3 → 8.0.288

package/v2Containers/CreativesContainer/tests/__snapshots__/index.test.js.snap

@@ -12,13 +12,16 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
     closeIconType="close"
     content={
       <SlideBoxContent
+        channelsToHide={Array []}
         currentChannel="RCS"
+        customerType=""
         getFormData={[Function]}
         handleClose={[Function]}
         handleCloseTestAndPreview={[Function]}
         handleTestAndPreview={[Function]}
         hostName=""
         inAppEditorType={null}
+        isAnonymousType={false}
         isTestAndPreviewMode={false}
         loyaltyMetaData={
           Object {
@@ -38,6 +41,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
         onInAppEditorTypeChange={[Function]}
         onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
+        onPersonalizationTokensChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
         onResetStep={[Function]}
@@ -46,6 +50,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
         onValidationFail={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
         onWechatTemplateChange={[Function]}
+        restrictPersonalization={false}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
         showLiquidErrorInFooter={[Function]}
@@ -103,13 +108,16 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
     closeIconType="close"
     content={
       <SlideBoxContent
+        channelsToHide={Array []}
         currentChannel="WHATSAPP"
+        customerType=""
         getFormData={[Function]}
         handleClose={[Function]}
         handleCloseTestAndPreview={[Function]}
         handleTestAndPreview={[Function]}
         hostName=""
         inAppEditorType={null}
+        isAnonymousType={false}
         isTestAndPreviewMode={false}
         loyaltyMetaData={
           Object {
@@ -129,6 +137,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
         onInAppEditorTypeChange={[Function]}
         onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
+        onPersonalizationTokensChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
         onResetStep={[Function]}
@@ -137,6 +146,7 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
         onValidationFail={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
         onWechatTemplateChange={[Function]}
+        restrictPersonalization={false}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
         showLiquidErrorInFooter={[Function]}
@@ -194,13 +204,16 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
     closeIconType="close"
     content={
       <SlideBoxContent
+        channelsToHide={Array []}
         currentChannel="WHATSAPP"
+        customerType=""
         getFormData={[Function]}
         handleClose={[Function]}
         handleCloseTestAndPreview={[Function]}
         handleTestAndPreview={[Function]}
         hostName=""
         inAppEditorType={null}
+        isAnonymousType={false}
         isTestAndPreviewMode={false}
         loyaltyMetaData={
           Object {
@@ -220,6 +233,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         onInAppEditorTypeChange={[Function]}
         onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
+        onPersonalizationTokensChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
         onResetStep={[Function]}
@@ -228,6 +242,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         onValidationFail={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
         onWechatTemplateChange={[Function]}
+        restrictPersonalization={false}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
         showLiquidErrorInFooter={[Function]}
@@ -257,6 +272,8 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
           }
         }
         fetchingCmsData={false}
+        formData={Array []}
+        hasPersonalizationTokenError={false}
         htmlEditorValidationState={
           Object {
             "errorsAcknowledged": false,
@@ -269,6 +286,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
             "validationComplete": false,
           }
         }
+        isAnonymousType={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}
@@ -280,6 +298,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         onEditTemplate={[Function]}
         onSave={[Function]}
         onTestAndPreview={[Function]}
+        restrictPersonalization={false}
         selectedEmailCreateMode={null}
         shouldShowContinueFooter={[Function]}
         shouldShowDoneFooter={[Function]}
@@ -323,13 +342,16 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
     closeIconType="close"
     content={
       <SlideBoxContent
+        channelsToHide={Array []}
         currentChannel="WHATSAPP"
+        customerType=""
         getFormData={[Function]}
         handleClose={[Function]}
         handleCloseTestAndPreview={[Function]}
         handleTestAndPreview={[Function]}
         hostName=""
         inAppEditorType={null}
+        isAnonymousType={false}
         isTestAndPreviewMode={false}
         loyaltyMetaData={
           Object {
@@ -349,6 +371,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         onInAppEditorTypeChange={[Function]}
         onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
+        onPersonalizationTokensChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
         onResetStep={[Function]}
@@ -357,6 +380,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         onValidationFail={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
         onWechatTemplateChange={[Function]}
+        restrictPersonalization={false}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
         showLiquidErrorInFooter={[Function]}
@@ -386,6 +410,8 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
           }
         }
         fetchingCmsData={false}
+        formData={Array []}
+        hasPersonalizationTokenError={false}
         htmlEditorValidationState={
           Object {
             "errorsAcknowledged": false,
@@ -398,6 +424,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
             "validationComplete": false,
           }
         }
+        isAnonymousType={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}
@@ -409,6 +436,7 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         onEditTemplate={[Function]}
         onSave={[Function]}
         onTestAndPreview={[Function]}
+        restrictPersonalization={false}
         selectedEmailCreateMode={null}
         shouldShowContinueFooter={[Function]}
         shouldShowDoneFooter={[Function]}
@@ -452,13 +480,16 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
     closeIconType="close"
     content={
       <SlideBoxContent
+        channelsToHide={Array []}
         currentChannel="WHATSAPP"
+        customerType=""
         getFormData={[Function]}
         handleClose={[Function]}
         handleCloseTestAndPreview={[Function]}
         handleTestAndPreview={[Function]}
         hostName=""
         inAppEditorType={null}
+        isAnonymousType={false}
         isTestAndPreviewMode={false}
         loyaltyMetaData={
           Object {
@@ -478,6 +509,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         onInAppEditorTypeChange={[Function]}
         onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
+        onPersonalizationTokensChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
         onResetStep={[Function]}
@@ -486,6 +518,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         onValidationFail={[Function]}
         onWeChatMaptemplateStepChange={[Function]}
         onWechatTemplateChange={[Function]}
+        restrictPersonalization={false}
         saveMessage={[Function]}
         setIsLoadingContent={[Function]}
         showLiquidErrorInFooter={[Function]}
@@ -515,6 +548,8 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
           }
         }
         fetchingCmsData={false}
+        formData={Array []}
+        hasPersonalizationTokenError={false}
         htmlEditorValidationState={
           Object {
             "errorsAcknowledged": false,
@@ -527,6 +562,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
             "validationComplete": false,
           }
         }
+        isAnonymousType={false}
         isContinueButtonDisabled={false}
         isCreatingTemplate={false}
         isEmptyContent={false}
@@ -538,6 +574,7 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         onEditTemplate={[Function]}
         onSave={[Function]}
         onTestAndPreview={[Function]}
+        restrictPersonalization={false}
         selectedEmailCreateMode={null}
         shouldShowContinueFooter={[Function]}
         shouldShowDoneFooter={[Function]}

package/v2Containers/Email/index.js

@@ -26,7 +26,7 @@ import * as globalActions from '../Cap/actions';
 import './_email.scss';
 import {getMessageObject} from '../../utils/messageUtils';
 import EmailPreview from '../../v2Components/EmailPreview';
-import { getDecodedFileName, hasSupportCKEditor } from '../../utils/common';
+import { getDecodedFileName, hasLiquidSupportFeature, hasSupportCKEditor } from '../../utils/common';
 import Pagination from '../../v2Components/Pagination';
 import * as creativesContainerActions from '../CreativesContainer/actions';
 import withCreatives from '../../hoc/withCreatives';
@@ -170,6 +170,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         deleteLanguage: this.deleteLanguage,
       },
     };
+    this.liquidFlow =  hasLiquidSupportFeature();
   }
   componentWillMount() {
     const formData = this.initFormData(this.props, true); //_.cloneDeep(this.state.formData);
@@ -254,6 +255,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       layout: 'EMAIL',
       type: 'LAYOUT',
       version: 'v2',
+      liquidFlow:this.liquidFlow,
     };
     this.props.globalActions.fetchSchemaForEntity(query);
     window.addEventListener("message", this.handleFrameTasks);
@@ -345,6 +347,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           type: 'TAG',
           context: this.props.location.query.type === 'embedded' ? this.props.location.query.module : 'default',
           embedded: this.props.location.query.type === 'embedded' ? this.props.location.query.type : 'full',
+          liquidFlow:this.liquidFlow
         };
         if (this.props.getDefaultTags) {
           query.context = this.props.getDefaultTags;
@@ -2370,6 +2373,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       type: 'TAG',
       context: (data || '').toLowerCase() === 'all' ? 'default' : (data || '').toLowerCase(),
       embedded: 'full',
+      liquidFlow:this.liquidFlow
     };
     this.props.globalActions.fetchSchemaForEntity(query);
   }

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -15,7 +15,7 @@ import HTMLEditor from '../../../v2Components/HtmlEditor';
 import CapTagListWithInput from '../../../v2Components/CapTagListWithInput';
 import formBuilderMessages from '../../../v2Components/FormBuilder/messages';
 import { validateLiquidTemplateContent } from '../../../utils/commonUtils';
-import { isEmailUnsubscribeTagOptional } from '../../../utils/common';
+import { hasLiquidSupportFeature, isEmailUnsubscribeTagMandatory } from '../../../utils/common';
 import history from '../../../utils/history';
 import messages from '../messages';
 import emailMessages from '../../Email/messages';
@@ -108,10 +108,13 @@ const EmailHTMLEditor = (props) => {
     standardErrors: [],
   });
 
-  // Merge tag validation errors (missing) into apiValidationErrors so they show in ValidationErrorDisplay
+  // Merge tag validation errors (unsupported/missing) into apiValidationErrors so they show in ValidationErrorDisplay
   const mergedApiValidationErrors = useMemo(() => {
     const tagMessages = [];
-    if (tagValidationError?.missingTags?.length && !isEmailUnsubscribeTagOptional()) {
+    if (tagValidationError?.unsupportedTags?.length) {
+      tagMessages.push(`Unsupported tags are: ${tagValidationError.unsupportedTags.join(', ')}`);
+    }
+    if (tagValidationError?.missingTags?.length && !isEmailUnsubscribeTagMandatory()) {
       tagMessages.push(`Missing tags are: ${tagValidationError.missingTags.join(', ')}`);
     }
     if (tagMessages.length === 0) {
@@ -187,6 +190,9 @@ const EmailHTMLEditor = (props) => {
     },
   }), [htmlContent, subject, currentOrgDetails]);
 
+  // Check if liquid support is enabled
+  const isLiquidEnabled = hasLiquidSupportFeature();
+
   // Detect edit mode: when isEditEmail is false (create flow), never treat as edit or fetch template details
   const hasParamsId = params?.id || location?.query?.id || location?.params?.id || location?.pathname?.includes('/edit/');
   const currentTemplateId = isEditEmail
@@ -487,8 +493,10 @@ const EmailHTMLEditor = (props) => {
       const validationResult = validateTags({
         content,
         tagsParam: tags,
+        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
+        eventContextTags,
         isFullMode,
       });
 
@@ -642,7 +650,7 @@ const EmailHTMLEditor = (props) => {
     // IMPORTANT: Clear API validation errors FIRST before checking for validation errors
     // This ensures that old API errors don't block the save when user fixes content and clicks Update again
     // We'll re-validate with fresh API call anyway
-    if (getLiquidTags) {
+    if (isLiquidEnabled && getLiquidTags) {
       setApiValidationErrors({
         liquidErrors: [],
         standardErrors: [],
@@ -704,7 +712,7 @@ const EmailHTMLEditor = (props) => {
     // When EMAIL_UNSUBSCRIBE_TAG_MANDATORY is false: validate and require unsubscribe tag.
     // Run for both library and full mode so liquid-enabled orgs also get the error (notification + ValidationErrorDisplay).
     const isModuleTypeOutbound = (moduleType || '').toUpperCase() === OUTBOUND;
-    if (!isEmailUnsubscribeTagOptional() && isModuleTypeOutbound) {
+    if (!isEmailUnsubscribeTagMandatory() && isModuleTypeOutbound) {
       const unsubscribeRegex = /{{unsubscribe(\(#[a-zA-Z\d]{6}\))?}}/g; // eslint-disable-line no-useless-escape
       const hasUnsubscribeTag = unsubscribeRegex.test(htmlContent);
 
@@ -736,17 +744,52 @@ const EmailHTMLEditor = (props) => {
       const validationResult = validateTags({
         content: htmlContent,
         tagsParam: tags,
+        injectedTagsParams: injectedTags,
         location,
         tagModule: getDefaultTags,
+        eventContextTags,
         isFullMode,
       });
 
-      if (!validationResult?.valid) {
+      const hasUnsupportedTags = validationResult?.unsupportedTags?.length > 0;
+      if (!validationResult?.valid || (hasUnsupportedTags && !isFullMode)) {
         setTagValidationError(validationResult);
-        // For liquid orgs, show warning and continue (extractTags API will validate)
+        // IMPORTANT: For non-liquid orgs, block save (like CK/BEE editor)
+        // For liquid orgs, continue (extractTags API will validate)
+        if (!isLiquidEnabled) {
+          // Show notification popup like CK/BEE editor
+          const baseLanguage = get(currentOrgDetails, 'basic_details.base_language', 'en');
+
+          const contentNotValidMsg = intl.formatMessage(formBuilderMessages.contentNotValidLanguage);
+          let errorMessage = `${contentNotValidMsg} ${baseLanguage}`;
+
+          if (hasUnsupportedTags) {
+            const unsupportedTagsMsg = intl.formatMessage(formBuilderMessages.unsupportedTags);
+            errorMessage += `\n${unsupportedTagsMsg} ${validationResult?.unsupportedTags?.join(', ')}`;
+          }
+          if (validationResult?.missingTags?.length > 0) {
+            const missingTagsMsg = intl.formatMessage(formBuilderMessages.missingTags);
+            errorMessage += `\n${missingTagsMsg} ${validationResult?.missingTags?.join(', ')}`;
+          }
+
+          const type = 'error';
+          CapNotification[type]({
+            message: `${type.toUpperCase()} ! ! ! `,
+            description: errorMessage,
+            duration: 5,
+          });
+
+          // Reset parent state so next click is detected as a change
+          if (onValidationFail) {
+            onValidationFail();
+          }
+          // Block save for non-liquid orgs
+          return;
+        }
+        // For liquid orgs, just show warning and continue
       }
       // Clear tag errors if valid
-      if (tagValidationError && validationResult?.valid) {
+      if (tagValidationError && validationResult?.valid && !hasUnsupportedTags) {
         setTagValidationError(null);
       }
     }
@@ -913,8 +956,8 @@ const EmailHTMLEditor = (props) => {
       }
     };
 
-    // Validate first using extractTags API
-    if (getLiquidTags) {
+    // If liquid enabled, validate first using extractTags API
+    if (isLiquidEnabled && getLiquidTags) {
       // Note: API validation errors are already cleared at the start of handleSave
       // This ensures fresh validation on every save attempt
 
@@ -955,6 +998,10 @@ const EmailHTMLEditor = (props) => {
         messages: formBuilderMessages,
         onError,
         onSuccess,
+        tagLookupMap: metaEntities?.tagLookupMap,
+        eventContextTags,
+        isLiquidFlow: true,
+        forwardedTags: forwardedTags || {},
       });
     } else {
       performSave();
@@ -966,6 +1013,7 @@ const EmailHTMLEditor = (props) => {
     injectedTags,
     location,
     getDefaultTags,
+    eventContextTags,
     formatMessage,
     subjectError,
     isFullMode,
@@ -977,8 +1025,11 @@ const EmailHTMLEditor = (props) => {
     emailActions,
     getFormdata,
     isGetFormData,
+    isLiquidEnabled,
     getLiquidTags,
     showLiquidErrorInFooter,
+    metaEntities,
+    forwardedTags,
     globalActions,
     intl,
     extractedTemplateName,
@@ -1124,6 +1175,7 @@ const EmailHTMLEditor = (props) => {
             userLocale={intl.locale || 'en'}
             moduleFilterEnabled={location?.query?.type !== EMBEDDED}
             onTagContextChange={handleOnTagsContextChange}
+            isLiquidEnabled={isLiquidEnabled}
             isFullMode={isFullMode}
             onErrorAcknowledged={handleErrorAcknowledged}
             onValidationChange={handleValidationChange}