@capillarytech/creatives-library 8.0.285-alpha.1 → 8.0.286

package/v2Containers/SmsTrai/Edit/tests/__snapshots__/index.test.js.snap

@@ -4265,7 +4265,7 @@ FREE GIFTS-
                         <CapCheckbox
                           checked={false}
                           disabled={false}
-                          key=".3"
+                          key=".4"
                           labelType="h4"
                           onChange={[Function]}
                         >
@@ -4327,7 +4327,7 @@ FREE GIFTS-
                           </div>
                         </CapCheckbox>
                         <div
-                          key=".5"
+                          key=".6"
                           style={
                             Object {
                               "marginBottom": "100px",
@@ -15176,7 +15176,7 @@ FREE GIFTS-
                         <CapCheckbox
                           checked={false}
                           disabled={false}
-                          key=".3"
+                          key=".4"
                           labelType="h4"
                           onChange={[Function]}
                         >
@@ -15238,7 +15238,7 @@ FREE GIFTS-
                           </div>
                         </CapCheckbox>
                         <div
-                          key=".5"
+                          key=".6"
                           style={
                             Object {
                               "marginBottom": "100px",
@@ -26117,7 +26117,7 @@ FREE GIFTS-
                         <CapCheckbox
                           checked={false}
                           disabled={false}
-                          key=".3"
+                          key=".4"
                           labelType="h4"
                           onChange={[Function]}
                         >
@@ -26179,7 +26179,7 @@ FREE GIFTS-
                           </div>
                         </CapCheckbox>
                         <div
-                          key=".5"
+                          key=".6"
                           style={
                             Object {
                               "marginBottom": "100px",

package/v2Containers/Viber/index.js

@@ -234,6 +234,7 @@ export const Viber = (props) => {
     const { valid, isBraceError } = validateTags({
       content: value,
       tagsParam: tags,
+      injectedTagsParams: injectedTags,
       location,
       tagModule: 'outbound',
       isFullMode,

package/v2Containers/Viber/index.scss

@@ -121,5 +121,5 @@
   margin-top: $CAP_SPACE_08;
 }
 .test-and-preview-button {
-  margin-left: 120px;
+  margin-left: 100px;
 }

package/v2Containers/WebPush/Create/hooks/useTagManagement.js

@@ -105,10 +105,12 @@ export const useTagManagement = ({
   const validationConfig = useMemo(
     () => ({
       tagsParam: tags,
+      injectedTagsParams: injectedTags,
       location,
       tagModule: getDefaultTags,
+      eventContextTags,
     }),
-    [tags, location, getDefaultTags],
+    [tags, injectedTags, location, getDefaultTags, eventContextTags],
   );
 
   return {

package/v2Containers/WebPush/Create/hooks/useTagManagement.test.js

@@ -528,19 +528,26 @@ describe('useTagManagement', () => {
 
   describe('validationConfig', () => {
     it('should return validation config with tags', () => {
+      const injectedTags = [{ id: 5, name: 'Injected Tag' }];
+      const eventContextTags = [{ id: 6, name: 'Event Tag' }];
+
       const { result } = renderHook(() =>
         useTagManagement({
           location: defaultLocation,
           globalActions: mockGlobalActions,
           metaEntities: defaultMetaEntities,
+          injectedTags,
+          eventContextTags,
           getDefaultTags: 'custom',
         })
       );
 
       expect(result.current.validationConfig).toEqual({
         tagsParam: defaultMetaEntities.tags.standard,
+        injectedTagsParams: injectedTags,
         location: defaultLocation,
         tagModule: 'custom',
+        eventContextTags,
       });
     });
 

package/v2Containers/WebPush/Create/index.js

@@ -285,8 +285,8 @@ const WebPushCreate = ({
   const validateTemplateName = useCallback((value) => validateTemplateNameUtil(value), []);
 
   const validateTitle = useCallback(
-    (value) => validateTitleUtil(value, formatMessage, messages, validationConfig, isFullMode),
-    [formatMessage, validationConfig, isFullMode],
+    (value) => validateTitleUtil(value, formatMessage, messages),
+    [formatMessage],
   );
 
   const validateUrl = useCallback(

package/v2Containers/WebPush/Create/utils/validation.js

@@ -10,31 +10,16 @@ import globalMessages from '../../../Cap/messages';
 export const validateTemplateName = (value) => !value || value.trim() === '';
 
 /**
- * Validates notification title (required and optional tag validation)
+ * Validates notification title
  * @param {string} value - The title value
  * @param {Function} formatMessage - i18n format message function
  * @param {Object} messages - Message definitions
- * @param {Object} [validationConfig] - Optional config for tag validation
- * @param {boolean} [isFullMode] - Optional; when set with validationConfig, runs tag validation
  * @returns {string} Error message if invalid, empty string if valid
  */
-export const validateTitle = (value, formatMessage, messages, validationConfig, isFullMode) => {
+export const validateTitle = (value, formatMessage, messages) => {
   if (!value || value.trim() === '') {
     return formatMessage(messages.titleRequired);
   }
-
-  if (validationConfig != null) {
-    const validationResponse = validateTags({
-      content: value,
-      ...validationConfig,
-      isFullMode,
-    }) || {};
-
-    if (validationResponse?.isBraceError) {
-      return formatMessage(globalMessages.unbalanacedCurlyBraces);
-    }
-  }
-
   return '';
 };
 
@@ -75,7 +60,13 @@ export const validateMessageContent = (value, formatMessage, messages, validatio
     ...validationConfig,
     isFullMode,
   }) || {};
-
+  
+  if (validationResponse?.unsupportedTags?.length) {
+    return formatMessage(globalMessages.unsupportedTagsValidationError, {
+      unsupportedTags: validationResponse.unsupportedTags.join(', '),
+    });
+  }
+  
   if (validationResponse?.isBraceError) {
     return formatMessage(globalMessages.unbalanacedCurlyBraces);
   }

package/v2Containers/WebPush/Create/utils/validation.test.js

@@ -169,8 +169,10 @@ describe('validation', () => {
   describe('validateMessageContent', () => {
     const mockValidationConfig = {
       tagsParam: [],
+      injectedTagsParams: [],
       location: {},
       tagModule: '',
+      eventContextTags: [],
     };
 
     beforeEach(() => {
@@ -209,6 +211,17 @@ describe('validation', () => {
       });
     });
 
+    it('should return error message for unsupported tags', () => {
+      validateTags.mockReturnValue({
+        unsupportedTags: ['tag1', 'tag2'],
+      });
+      const result = validateMessageContent('Message with {tag1} and {tag2}', mockFormatMessage, mockMessages, mockValidationConfig);
+      expect(result).toBe('Unsupported tags: tag1, tag2');
+      expect(mockFormatMessage).toHaveBeenCalledWith(globalMessages.unsupportedTagsValidationError, {
+        unsupportedTags: 'tag1, tag2',
+      });
+    });
+
     it('should return error message for unbalanced curly braces', () => {
       validateTags.mockReturnValue({
         isBraceError: true,
@@ -218,11 +231,22 @@ describe('validation', () => {
       expect(mockFormatMessage).toHaveBeenCalledWith(globalMessages.unbalanacedCurlyBraces);
     });
 
+    it('should return error message for both unsupported tags and brace error (unsupported tags takes precedence)', () => {
+      validateTags.mockReturnValue({
+        unsupportedTags: ['tag1'],
+        isBraceError: true,
+      });
+      const result = validateMessageContent('Message with {tag1}', mockFormatMessage, mockMessages, mockValidationConfig);
+      expect(result).toBe('Unsupported tags: tag1');
+    });
+
     it('should pass validation config to validateTags', () => {
       const customConfig = {
         tagsParam: [{ id: 1, name: 'Tag1' }],
+        injectedTagsParams: [{ id: 2, name: 'Tag2' }],
         location: { query: { type: 'test' } },
         tagModule: 'custom',
+        eventContextTags: [{ id: 3, name: 'Tag3' }],
       };
       validateTags.mockReturnValue({});
       validateMessageContent('Valid message', mockFormatMessage, mockMessages, customConfig);

package/v2Containers/Whatsapp/index.js

@@ -637,21 +637,22 @@ export const Whatsapp = (props) => {
         validateTags({
           content: contentData.join(""),
           tagsParam: tags,
+          injectedTagsParams: injectedTags,
           location,
           tagModule: getDefaultTags,
+          eventContextTags,
           isFullMode,
         }) || {};
+      const unsupportedTagsLengthCheck =
+        validationResponse?.unsupportedTags?.length > 0;
       if (type === HEADER_TEXT) {
         headerTagValidationResponse = validationResponse;
-        updateIsHeaderTagValidationError(validationResponse.isBraceError);
+        updateIsHeaderTagValidationError(unsupportedTagsLengthCheck);
       } else if (type === CAROUSEL_TEXT) {
-        return [
-          { fieldName: "carouselTagValidationErrMessage", value: validationResponse.isBraceError ? validationResponse : {} },
-          { fieldName: "carouselTagValidationErr", value: validationResponse.isBraceError },
-        ];
+        return [{fieldName: "carouselTagValidationErrMessage", value: validationResponse}, {fieldName: "carouselTagValidationErr", value: unsupportedTagsLengthCheck}];
       } else {
         tagValidationResponse = validationResponse;
-        updateIsTagValidationError(validationResponse.isBraceError);
+        updateIsTagValidationError(unsupportedTagsLengthCheck);
       }
     }
   };
@@ -2681,11 +2682,18 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
     } else {
       validationResponse = tagValidationResponse;
     }
-    const { isBraceError } = validationResponse || {};
+    const { unsupportedTags = [], isBraceError } = validationResponse;
+
+    let tagError = "";
+    if (unsupportedTags.length > 0) {
+      tagError = formatMessage(globalMessages.unsupportedTagsValidationError, {
+        unsupportedTags,
+      });
+    }
     if (isBraceError) {
-      return <CapError>{formatMessage(globalMessages.unbalanacedCurlyBraces)}</CapError>;
+      tagError = formatMessage(globalMessages.unbalanacedCurlyBraces);
     }
-    return null;
+    return <CapError>{tagError}</CapError>;
   };
 
   const editModeContent = () => (