@capillarytech/creatives-library 8.0.277 → 8.0.278

package/package.json

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

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -688,9 +688,10 @@ const EmailHTMLEditor = (props) => {
       return;
     }
 
-    // 2. Validate Unsubscribe Tag (if mandatory)
-    // Check if unsubscribe tag is mandatory and if it exists in content
-    if (isEmailUnsubscribeTagMandatory() && moduleType === OUTBOUND) {
+    // 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 (!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);
@@ -709,7 +710,7 @@ const EmailHTMLEditor = (props) => {
         if (onValidationFail) {
           onValidationFail();
         }
-        // Block save - unsubscribe tag is mandatory
+        // Block save - unsubscribe tag is required when validation is enabled
         return;
       }
     }

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

@@ -386,6 +386,7 @@ const defaultProps = {
   isGetFormData: false,
   getFormdata: jest.fn(),
   templateData: null,
+  isEditEmail: true,
   EmailLayout: null,
   getLiquidTags: jest.fn((content, callback) => callback({ askAiraResponse: { data: [] }, isError: false })),
   showLiquidErrorInFooter: jest.fn(),
@@ -642,6 +643,45 @@ describe('EmailHTMLEditor', () => {
       // Should trigger fetch for new template ID
       expect(emailActions.getTemplateDetails).toHaveBeenCalled();
     });
+
+    it('does not fetch template details when isEditEmail is false even if templateData has _id (create flow)', async () => {
+      const emailActions = {
+        ...defaultProps.emailActions,
+        getTemplateDetails: jest.fn(),
+      };
+      renderWithIntl({
+        isEditEmail: false,
+        templateData: { _id: 'stale-template-id', name: 'Stale' },
+        params: {},
+        location: { query: {}, pathname: '/email/create' },
+        Email: { templateDetails: null, getTemplateDetailsInProgress: false, fetchingCmsData: false },
+        emailActions,
+      });
+
+      await waitFor(() => {
+        expect(emailActions.getTemplateDetails).not.toHaveBeenCalled();
+      }, { timeout: 500 });
+    });
+
+    it('uses templateData._id for currentTemplateId and fetches when isEditEmail is true', async () => {
+      const emailActions = {
+        ...defaultProps.emailActions,
+        getTemplateDetails: jest.fn(),
+      };
+      const templateId = 'edit-template-id';
+      renderWithIntl({
+        isEditEmail: true,
+        templateData: { _id: templateId, name: 'Edit Template' },
+        params: {},
+        location: { query: {}, pathname: '/email/create' },
+        Email: { templateDetails: null, getTemplateDetailsInProgress: false, fetchingCmsData: false },
+        emailActions,
+      });
+
+      await waitFor(() => {
+        expect(emailActions.getTemplateDetails).toHaveBeenCalledWith(templateId, 'email');
+      }, { timeout: 500 });
+    });
   });
 
   describe('Subject Handling', () => {
@@ -976,8 +1016,9 @@ describe('EmailHTMLEditor', () => {
       }, { timeout: 3000 });
     });
 
-    it('blocks save when unsubscribe tag is mandatory and missing', async () => {
-      isEmailUnsubscribeTagMandatory.mockReturnValue(true);
+    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');
 
@@ -1005,15 +1046,15 @@ describe('EmailHTMLEditor', () => {
       }, { timeout: 3000 });
     });
 
-    it('allows save when unsubscribe tag is present', () => {
-      isEmailUnsubscribeTagMandatory.mockReturnValue(true);
+    it('allows save when unsubscribe validation is on and tag is present', () => {
+      isEmailUnsubscribeTagMandatory.mockReturnValue(false);
       renderWithIntl({
         isGetFormData: true,
         subject: 'Valid Subject',
         htmlContent: '<p>Content {{unsubscribe}}</p>',
         moduleType: 'OUTBOUND',
       });
-      // Should proceed with save
+      // Should proceed with save (validation passes)
     });
 
     it('blocks save for non-liquid orgs when tag validation fails', async () => {

package/v2Containers/EmailWrapper/tests/useEmailWrapper.test.js

@@ -1025,6 +1025,32 @@ describe('useEmailWrapper', () => {
           expect(mockEmailActions.getTemplateDetails).not.toHaveBeenCalled();
         }, { timeout: 1000 });
       });
+
+      it('should NOT call getTemplateDetails when isEditEmail is false (create flow)', async () => {
+        const templateId = 'create-flow-id';
+        const createFlowProps = {
+          ...newFlowMockProps,
+          isEditEmail: false,
+          params: { id: templateId },
+          location: {
+            pathname: `/email/edit/${templateId}`,
+            query: { id: templateId },
+          },
+          Email: {
+            ...newFlowMockProps.Email,
+            templateDetails: null,
+            getTemplateDetailsInProgress: false,
+          },
+        };
+
+        renderHook((props) => useEmailWrapper(props), {
+          initialProps: createFlowProps,
+        });
+
+        await waitFor(() => {
+          expect(mockEmailActions.getTemplateDetails).not.toHaveBeenCalled();
+        }, { timeout: 1000 });
+      });
     });
   });