@capillarytech/creatives-library 8.0.279 → 8.0.280

package/package.json

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

package/utils/tagValidations.js

@@ -201,7 +201,6 @@ export const validateTags = ({
     unsupportedTags: [],
     isBraceError: false,
   };
-  // Mandatory-tags check: only when we have a tags list and are in library mode
   if (tags && tags.length && !isFullMode) {
     lodashForEach(tags, ({
       definition: {
@@ -218,9 +217,6 @@ export const validateTags = ({
         }
       });
     });
-  }
-  // In library mode, always scan content for {{...}} and flag unsupported tags (even when tags list is empty)
-  if (!isFullMode && content) {
     const regex = /{{[(A-Z\w+(\s\w+)*$\(\)@!#$%^&*~.,/\\]+}}/g;
     let match = regex.exec(content);
     while (match !== null) {
@@ -228,8 +224,8 @@ export const validateTags = ({
       const tagIndex = match?.index;
       match = regex.exec(content);
       let ifSupported = false;
-      lodashForEach(tags || [], (tag) => {
-        if (tag?.definition?.value === tagValue) {
+      lodashForEach(tags, (tag) => {
+        if (tag.definition.value === tagValue) {
           ifSupported = true;
         }
       });

package/utils/tests/tagValidations.test.js

@@ -104,7 +104,7 @@ describe("validateTags", () => {
     });
 
     expect(result.valid).toEqual(true);
-    expect(result.unsupportedTags).toEqual(["tag1", "tag2", "tag3"]);
+    expect(result.unsupportedTags).toEqual([]);
     expect(result.isBraceError).toEqual(false);
   });
 

package/v2Components/FormBuilder/index.js

@@ -1247,11 +1247,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   },
                 }),
                 () => {
+                  // Callback after the state is updated
                   this.props.showLiquidErrorInFooter(this.state.liquidErrorMessage, this.props.channel === SMS? null: this.state.currentTab);
                 }
               );
-              // Show toast for liquid flow too so user sees error (scenario 3)
-              this.openNotificationWithIcon('error', errorString, "email-validation-error");
             } else {
               this.openNotificationWithIcon('error', errorString, "email-validation-error");
             }
@@ -1519,8 +1518,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     response.isBraceError = false;
     response.isContentEmpty = false;
     const contentForValidation = isEmail ? convert(content, GLOBAL_CONVERT_OPTIONS) : content ;
-    // Run tag validation (missing + unsupported) for library mode OR for email channel (scenario 4: full mode email with CK)
-    if(tags && tags.length && (!isFullMode || isEmail)) {
+    if(tags && tags.length && !isFullMode) {
       _.forEach(tags, (tag) => {
         _.forEach(tag.definition.supportedModules, (module) => {
           if (module.mandatory && (currentModule === module.context)) {
@@ -1583,8 +1581,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         });
 
         ifSupported = ifSupported || this.checkIfSupportedTag(tagValue, injectedTags);
-        // Only add to unsupportedTags if not inside a {% ... %} block (scenario 3: liquid orgs also get unsupported-tag errors)
-        if (!ifSupported && !isInsideLiquidBlock(content, tagIndex)) {
+        // Only add to unsupportedTags if not inside a {% ... %} block and not in liquid flow
+        // Tags inside {% %} blocks can contain any dynamic tags and should not be validated
+        if (!ifSupported && !this.liquidFlow() && !isInsideLiquidBlock(content, tagIndex)) {
           response.unsupportedTags.push(tagValue);
           response.valid = false;
         }

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -108,24 +108,6 @@ const EmailHTMLEditor = (props) => {
     standardErrors: [],
   });
 
-  // Merge tag validation errors (unsupported/missing) into apiValidationErrors so they show in ValidationErrorDisplay
-  const mergedApiValidationErrors = useMemo(() => {
-    const tagMessages = [];
-    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) {
-      return apiValidationErrors;
-    }
-    return {
-      liquidErrors: apiValidationErrors?.liquidErrors || [],
-      standardErrors: [...(apiValidationErrors?.standardErrors || []), ...tagMessages],
-    };
-  }, [apiValidationErrors, tagValidationError]);
-
   // Refs for tracking initialization and previous values
   const contentInitializedRef = useRef(false);
   const subjectInitializedRef = useRef(false);
@@ -497,7 +479,6 @@ const EmailHTMLEditor = (props) => {
         location,
         tagModule: getDefaultTags,
         eventContextTags,
-        isFullMode,
       });
 
       if (!validationResult.valid) {
@@ -710,7 +691,7 @@ const EmailHTMLEditor = (props) => {
     // 2. Validate Unsubscribe Tag when feature is OFF (when flag is false we require unsubscribe)
     // When EMAIL_UNSUBSCRIBE_TAG_MANDATORY is true: do NOT validate for unsubscribe (aligned with FormBuilder).
     // When EMAIL_UNSUBSCRIBE_TAG_MANDATORY is false: validate and require unsubscribe tag.
-    if (!isFullMode && !isEmailUnsubscribeTagMandatory() && moduleType === OUTBOUND) {
+    if (!isEmailUnsubscribeTagMandatory() && moduleType === OUTBOUND) {
       // Check if content contains unsubscribe tag (either {{unsubscribe}} or {{unsubscribe(#...)})
       const unsubscribeRegex = /{{unsubscribe(\(#[a-zA-Z\d]{6}\))?}}/g; // eslint-disable-line no-useless-escape
       const hasUnsubscribeTag = unsubscribeRegex.test(htmlContent);
@@ -719,13 +700,11 @@ const EmailHTMLEditor = (props) => {
         // Show error notification
         const missingTagsMsg = intl.formatMessage(formBuilderMessages.missingTags);
         const errorMessage = `${missingTagsMsg} unsubscribe`;
-        setTimeout(() => {
-          CapNotification.error({
-            message: 'ERROR ! ! !',
-            description: errorMessage,
-            duration: 5,
-          });
-        }, 0);
+        CapNotification.error({
+          message: 'ERROR ! ! !',
+          description: errorMessage,
+          duration: 5,
+        });
 
         // Reset parent state so next click is detected as a change
         if (onValidationFail) {
@@ -739,9 +718,7 @@ const EmailHTMLEditor = (props) => {
     // 3. Validate Content Tags
     // For NON-liquid orgs: BLOCKING validation (matches CK/BEE behavior)
     // For liquid orgs: Non-blocking (extractTags API will validate)
-    // In library mode, always validate when there is content (even if tags list is empty)
-    const shouldValidateTags = (tags.length > 0 || !isEmpty(injectedTags)) || (!isFullMode && !!htmlContent);
-    if (shouldValidateTags) {
+    if (tags.length > 0 || !isEmpty(injectedTags)) {
       const validationResult = validateTags({
         content: htmlContent,
         tagsParam: tags,
@@ -749,12 +726,12 @@ const EmailHTMLEditor = (props) => {
         location,
         tagModule: getDefaultTags,
         eventContextTags,
-        isFullMode,
       });
 
       const hasUnsupportedTags = validationResult?.unsupportedTags?.length > 0;
-      if (!validationResult?.valid || (hasUnsupportedTags && !isFullMode)) {
+      if (!validationResult?.valid || hasUnsupportedTags) {
         setTagValidationError(validationResult);
+
         // IMPORTANT: For non-liquid orgs, block save (like CK/BEE editor)
         // For liquid orgs, continue (extractTags API will validate)
         if (!isLiquidEnabled) {
@@ -1180,7 +1157,7 @@ const EmailHTMLEditor = (props) => {
             isFullMode={isFullMode}
             onErrorAcknowledged={handleErrorAcknowledged}
             onValidationChange={handleValidationChange}
-            apiValidationErrors={mergedApiValidationErrors}
+            apiValidationErrors={apiValidationErrors}
           />
         </CapColumn>
       </CapRow>

package/v2Containers/EmailWrapper/components/__tests__/EmailHTMLEditor.test.js

@@ -1016,6 +1016,36 @@ describe('EmailHTMLEditor', () => {
       }, { timeout: 3000 });
     });
 
+    it('blocks save when unsubscribe validation is on (flag false) and tag is missing', async () => {
+      // When EMAIL_UNSUBSCRIBE_TAG_MANDATORY is false we validate and require unsubscribe
+      isEmailUnsubscribeTagMandatory.mockReturnValue(false);
+      const onValidationFail = jest.fn();
+      const CapNotification = require('@capillarytech/cap-ui-library/CapNotification');
+
+      // Set subject via input and content via HTMLEditor mock
+      const { rerender } = renderWithIntl({
+        onValidationFail,
+        isGetFormData: false,
+        moduleType: 'OUTBOUND',
+      });
+      const input = screen.getByTestId('subject-input');
+      fireEvent.change(input, { target: { value: 'Valid Subject' } });
+      // Trigger content change to set htmlContent
+      const changeButton = screen.getByTestId('trigger-content-change');
+      fireEvent.click(changeButton);
+      // Now trigger save
+      rerender(
+        <IntlProvider locale="en" messages={{}}>
+          <EmailHTMLEditor {...defaultProps} onValidationFail={onValidationFail} isGetFormData moduleType="OUTBOUND" />
+        </IntlProvider>
+      );
+
+      await waitFor(() => {
+        expect(CapNotification.error).toHaveBeenCalled();
+        expect(onValidationFail).toHaveBeenCalled();
+      }, { timeout: 3000 });
+    });
+
     it('allows save when unsubscribe validation is on and tag is present', () => {
       isEmailUnsubscribeTagMandatory.mockReturnValue(false);
       renderWithIntl({

package/v2Containers/Facebook/Advertisement/index.js

@@ -73,7 +73,7 @@ export const Advertisement = (props) => {
   const FbAdFooter = styled.div`
     background-color: ${CAP_WHITE};
     position: fixed;
-    bottom: 0;
+    bottom: 20px;
     width: 100%;
     margin-left: -32px;
     padding: ${CAP_SPACE_32} ${CAP_SPACE_24};

package/v2Containers/InApp/index.js

@@ -1155,7 +1155,6 @@ export const InApp = (props) => {
           location,
           tagModule: getDefaultTags,
           eventContextTags: metaEntities?.eventContextTags || [],
-          isFullMode,
         }) || {};
 
         if (validationResponse?.unsupportedTags?.length > 0) {
@@ -1183,7 +1182,6 @@ export const InApp = (props) => {
           location,
           tagModule: getDefaultTags,
           eventContextTags: metaEntities?.eventContextTags || [],
-          isFullMode,
         }) || {};
 
         if (validationResponse?.unsupportedTags?.length > 0) {

package/v2Containers/InappAdvance/index.js

@@ -878,7 +878,6 @@ export const InappAdvanced = (props) => {
           location,
           tagModule: getDefaultTags,
           eventContextTags: metaEntities?.eventContextTags || [],
-          isFullMode,
         }) || {};
 
         if (validationResponse?.unsupportedTags?.length > 0) {
@@ -906,7 +905,6 @@ export const InappAdvanced = (props) => {
           location,
           tagModule: getDefaultTags,
           eventContextTags: metaEntities?.eventContextTags || [],
-          isFullMode,
         }) || {};
 
         if (validationResponse?.unsupportedTags?.length > 0) {

package/v2Containers/Line/Container/_lineCreate.scss

@@ -40,7 +40,6 @@
 .create-msg,
 .cancel-msg {
   position: fixed;
-  bottom: 20px;
 }
 .cancel-msg {
   margin-left: 100px;

package/v2Containers/Line/Container/style.js

@@ -38,7 +38,7 @@ export default css`
     .action-section {
       background-color: ${CAP_WHITE};
       position: fixed;
-      bottom: 0;
+      bottom: 20px;
       width: 100%;
       margin-left: -32px;
       padding: ${CAP_SPACE_32} ${CAP_SPACE_24};

package/v2Containers/SmsTrai/Create/index.scss

@@ -98,5 +98,5 @@
 }
 
 .create-dlt-msg {
-  margin-left: 170px;
+  margin-left: 120px;
 }

package/v2Containers/SmsTrai/Edit/index.js

@@ -106,6 +106,7 @@ export const SmsTraiEdit = (props) => {
     padding: ${CAP_SPACE_32} ${CAP_SPACE_24};
     position: fixed;
     bottom: 2rem;
+    margin-left: -2rem;
     .ant-btn {
       margin-right: ${CAP_SPACE_16};
     }
@@ -687,24 +688,17 @@ export const SmsTraiEdit = (props) => {
           <CapButton
             onClick={handleTestAndPreview}
             type="secondary"
-            className="create-msg"
+            className="create-msg create-dlt-msg"
           >
             <FormattedMessage {...messages.testAndPreviewButtonLabel} />
           </CapButton>
           <CapButton
             onClick={isLiquidSupportFeatureEnabled ? onSubmitWrapper : onDoneCallback}
-            className="create-msg create-dlt-msg"
+            className="create-msg"
             disabled={isTagValidationError || (isLiquidSupportFeatureEnabled && !isObject(metaEntities?.tagLookupMap))}
           >
             <FormattedMessage {...messages.saveButtonLabel} />
           </CapButton>
-          <CapButton
-            onClick={handleClose}
-            className="cancel-dlt-msg"
-            type="secondary"
-          >
-            <FormattedMessage {...messages.cancelButtonLabel} />
-          </CapButton>
         </SMSTraiFooter>
         <TestAndPreviewSlidebox
           show={showTestAndPreviewSlidebox}