@capillarytech/creatives-library 9.0.44 → 9.0.46

package/v2Components/CommonTestAndPreview/UnifiedPreview/_viberCarouselPreviewCards.scss

@@ -0,0 +1,133 @@
+// Shared Viber carousel card row (Test & Preview device preview)
+.viber-carousel-preview {
+  .scroll {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: stretch;
+    width: 100%;
+    max-width: 100%;
+    min-width: 0;
+    overflow-x: auto;
+    overflow-y: hidden;
+    padding-right: $CAP_SPACE_12;
+    scrollbar-width: none;
+    -webkit-overflow-scrolling: touch;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
+    .card {
+      flex: 0 0 68%;
+      min-width: 80%;
+      margin-right: $CAP_SPACE_08;
+      background: $CAP_G09;
+      border: 1px solid $CAP_G07;
+      border-radius: $CAP_SPACE_12;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-self: stretch;
+
+      &:last-child {
+        margin-right: 0;
+      }
+
+      .image {
+        width: 100%;
+        height: 10rem;
+        object-fit: cover;
+        border-radius: 0;
+      }
+
+      .image-placeholder {
+        width: 100%;
+        height: 10rem;
+        border-radius: 0;
+        background: $CAP_G07;
+      }
+
+      .card-body {
+        flex: 1;
+        padding: $CAP_SPACE_08;
+        display: flex;
+        flex-direction: column;
+        min-height: 0;
+
+        .text-wrap {
+          flex-shrink: 0;
+          width: 100%;
+
+          &--1-line {
+            min-height: 1.3em;
+          }
+
+          &--2-line {
+            min-height: 2.6em;
+          }
+
+          .text-inner {
+            width: 100%;
+
+            .text {
+              color: $CAP_G01;
+              line-height: 1.3;
+              white-space: normal;
+              word-break: break-word;
+              display: block;
+              width: 100%;
+              margin: 0;
+            }
+          }
+
+          .text-placeholder {
+            width: 100%;
+            height: 0.875rem;
+            border-radius: $CAP_SPACE_04;
+            background: $CAP_G07;
+            min-height: 0.875rem;
+            display: block;
+          }
+        }
+
+        .buttons {
+          display: flex;
+          flex-direction: column;
+          gap: $CAP_SPACE_06;
+          width: 100%;
+          flex-shrink: 0;
+
+          .button {
+            color: $CAP_WHITE;
+            background: $CAP_PURPLE01;
+            border-radius: $CAP_SPACE_12;
+            text-align: center;
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            min-height: 1.5rem;
+            padding: $CAP_SPACE_06 $CAP_SPACE_08;
+            white-space: normal;
+            box-sizing: border-box;
+          }
+
+          .button-placeholder {
+            visibility: hidden;
+            pointer-events: none;
+            padding: 0;
+            background: transparent;
+            border: none;
+          }
+
+          .button-secondary {
+            color: $CAP_PURPLE01;
+            background: transparent;
+            border: none;
+          }
+        }
+      }
+    }
+  }
+}

package/v2Components/CommonTestAndPreview/constants.js

@@ -228,6 +228,8 @@ export const CHANNEL_NAME_MOBILE_PUSH = 'MOBILE_PUSH';
 export const DEFAULT_SENDER = 'test1';
 export const VIBER_API_SCENARIO_KEY = 'viber-api';
 export const VIBER_USER_ID_PATTERN = '{{viber_user_id}}';
+/** Fallback title line-height (px) when computed style is unavailable. */
+export const DEFAULT_CAROUSEL_TITLE_LINE_HEIGHT_PX = 18;
 export const UNSUBSCRIBE_TAG_NAME = 'unsubscribe';
 export const IN_APP_CHANNEL_NAME = 'in-app';
 export const MOBILE_PUSH_CHANNEL_NAME = 'mobile push';

package/v2Components/CommonTestAndPreview/index.js

@@ -246,6 +246,8 @@ const CommonTestAndPreview = (props) => {
   const [smsFallbackPreviewText, setSmsFallbackPreviewText] = useState(undefined);
   // Track if a preview call has been made (to know when to use previewDataHtml vs raw content)
   const [hasPreviewCallBeenMade, setHasPreviewCallBeenMade] = useState(false);
+  // Viber: tag values applied to preview only after explicit Update preview / Discard (not while typing)
+  const [viberPreviewTagValues, setViberPreviewTagValues] = useState(null);
   const [previewDataHtml, setPreviewDataHtml] = useState(() => {
     // Initialize preview data based on channel
     if (channel === CHANNELS.EMAIL && formData) {
@@ -687,6 +689,159 @@ const CommonTestAndPreview = (props) => {
     return resolvedText;
   };
 
+  const getViberMergedFormData = useCallback((formDataOverride) => {
+    const formDataObj = formDataOverride && typeof formDataOverride === 'object'
+      ? formDataOverride
+      : (formData && typeof formData === 'object' ? formData : {});
+    let contentObj = {};
+    if (content && typeof content === 'object') {
+      contentObj = content;
+    } else if (typeof content === 'string' && content.trim()) {
+      try {
+        contentObj = JSON.parse(content);
+      } catch (e) {
+        contentObj = {};
+      }
+    }
+    const previewCards = formDataObj?.viberPreviewContent?.cards
+      ?? formDataObj?.cards
+      ?? contentObj?.viberPreviewContent?.cards
+      ?? contentObj?.cards;
+    const isCarousel = Boolean(
+      formDataObj.type === MEDIA_TYPE_CAROUSEL
+      || contentObj.type === MEDIA_TYPE_CAROUSEL
+      || (Array.isArray(previewCards) && previewCards.length > 0),
+    );
+    const mergedPreview = {
+      ...(contentObj.viberPreviewContent || {}),
+      ...(formDataObj.viberPreviewContent || {}),
+      ...(Array.isArray(previewCards) && previewCards.length ? { cards: previewCards } : {}),
+      ...(isCarousel ? {
+        type: MEDIA_TYPE_CAROUSEL,
+        showCarouselEditorPreview: true,
+      } : {}),
+    };
+    return {
+      ...contentObj,
+      ...formDataObj,
+      ...(Array.isArray(previewCards) && previewCards.length ? { cards: previewCards } : {}),
+      ...(isCarousel ? { type: MEDIA_TYPE_CAROUSEL } : {}),
+      ...(Object.keys(mergedPreview).length ? { viberPreviewContent: mergedPreview } : {}),
+    };
+  }, [formData, content]);
+
+  const getViberCarouselCardsFromFormData = (formDataObj) => {
+    const previewCards = formDataObj?.viberPreviewContent?.cards;
+    if (Array.isArray(previewCards) && previewCards.length) {
+      return previewCards;
+    }
+    const rootCards = formDataObj?.cards;
+    if (Array.isArray(rootCards) && rootCards.length) {
+      return rootCards;
+    }
+    return [];
+  };
+
+  const getViberTagExtractionContent = (formDataObj, contentStr = '') => {
+    const messageText = formDataObj?.messageContent
+      || formDataObj?.viberPreviewContent?.messageContent
+      || contentStr
+      || '';
+    const cardFieldTexts = getViberCarouselCardsFromFormData(formDataObj).flatMap((card) => {
+      const fields = [card?.text || ''];
+      (card?.buttons || []).forEach((button) => {
+        fields.push(button?.title || '', button?.action || '');
+      });
+      return fields;
+    });
+    return [messageText, ...cardFieldTexts]
+      .filter((value) => typeof value === 'string' && value.trim())
+      .join(' ');
+  };
+
+  const resolveViberCarouselCards = (cards, tagValues) => {
+    if (!Array.isArray(cards) || !tagValues || !Object.keys(tagValues).length) {
+      return cards;
+    }
+    return cards.map((card) => ({
+      ...card,
+      text: resolveTagsInText(card?.text || '', tagValues),
+      buttons: (card?.buttons || []).map((button) => ({
+        ...button,
+        title: resolveTagsInText(button?.title || '', tagValues),
+        action: resolveTagsInText(button?.action || '', tagValues),
+      })),
+    }));
+  };
+
+  const applyViberCustomValuesToContent = (contentObj, tagValues) => {
+    if (!contentObj || typeof contentObj !== 'object' || !tagValues || !Object.keys(tagValues).length) {
+      return contentObj;
+    }
+    const result = { ...contentObj };
+    if (typeof result.messageContent === 'string') {
+      result.messageContent = resolveTagsInText(result.messageContent, tagValues);
+    }
+    if (Array.isArray(result.cards)) {
+      result.cards = resolveViberCarouselCards(result.cards, tagValues);
+    }
+    if (result.viberPreviewContent && typeof result.viberPreviewContent === 'object') {
+      const preview = result.viberPreviewContent;
+      result.viberPreviewContent = {
+        ...preview,
+        messageContent: resolveTagsInText(preview.messageContent || '', tagValues),
+        cards: resolveViberCarouselCards(preview.cards, tagValues),
+      };
+    }
+    return result;
+  };
+
+  const mergeViberPreviewWithResolved = (base, resolved) => {
+    if (!resolved || typeof resolved !== 'object') {
+      return base && typeof base === 'object' ? base : {};
+    }
+    const baseObj = base && typeof base === 'object' ? base : {};
+    const basePreview = baseObj.viberPreviewContent || {};
+    const resolvedPreview = resolved.viberPreviewContent || {};
+    const baseCards = basePreview.cards || baseObj.cards || [];
+    const resolvedCards = resolvedPreview.cards || resolved.cards || [];
+    const mergedCards = baseCards.length
+      ? baseCards.map((card, index) => {
+        const resolvedCard = resolvedCards[index];
+        if (!resolvedCard) {
+          return card;
+        }
+        return {
+          ...card,
+          ...(resolvedCard.text != null ? { text: resolvedCard.text } : {}),
+          ...(resolvedCard.mediaUrl != null ? { mediaUrl: resolvedCard.mediaUrl } : {}),
+          buttons: (card.buttons || []).map((button, buttonIndex) => ({
+            ...button,
+            ...(resolvedCard.buttons?.[buttonIndex] || {}),
+          })),
+        };
+      })
+      : resolvedCards;
+    const resolvedMessage = resolved.messageContent ?? resolvedPreview.messageContent;
+
+    return {
+      ...baseObj,
+      ...resolved,
+      viberPreviewContent: {
+        ...basePreview,
+        ...resolvedPreview,
+        type: resolvedPreview.type || basePreview.type || baseObj.type || (mergedCards.length ? MEDIA_TYPE_CAROUSEL : ''),
+        cards: mergedCards.length ? mergedCards : (resolvedPreview.cards || basePreview.cards),
+        showCarouselEditorPreview: Boolean(
+          basePreview.showCarouselEditorPreview
+          || resolvedPreview.showCarouselEditorPreview
+          || mergedCards.length > 0,
+        ),
+        ...(resolvedMessage != null ? { messageContent: resolvedMessage } : {}),
+      },
+    };
+  };
+
   /**
    * Common handler for saving test customers (both new and existing)
    */
@@ -965,11 +1120,13 @@ const CommonTestAndPreview = (props) => {
           templateContent: formDataObj?.bodyText || contentStr,
         };
 
-      case CHANNELS.VIBER:
+      case CHANNELS.VIBER: {
+        const viberFormData = getViberMergedFormData(formDataObj);
         return {
-          templateSubject: formDataObj?.messageTitle || '',
-          templateContent: contentStr,
+          templateSubject: viberFormData?.messageTitle || '',
+          templateContent: getViberTagExtractionContent(viberFormData, contentStr),
         };
+      }
 
       case CHANNELS.WEBPUSH:
         return {
@@ -1433,6 +1590,7 @@ const CommonTestAndPreview = (props) => {
         // Build templateConfigs
         const templateConfigs = {
           _id: templateId || '',
+          templateId: formDataObj?.templateId || '',
           name: templateNameValue,
           template: templateEditorValue,
           varMapped,
@@ -2023,11 +2181,16 @@ const CommonTestAndPreview = (props) => {
         // 1. formDataObj from getTemplateContent (contains both viberPreviewContent and payload fields)
         // 2. formDataObj[0] (array format - legacy)
         // 3. contentStr (direct string - legacy)
+        // Merge content prop so listing / preview-only flows include carousel card tags
+        const viberFormData = getViberMergedFormData(formDataObj);
+        formDataObj = viberFormData;
 
         let messageText = '';
         let imageData = null;
         let videoData = null;
         let buttonData = null;
+        let cardsData = [];
+        let messageType = '';
         let accountId = null;
         let accountDetails = null;
         let scenarioKey = '';
@@ -2042,6 +2205,8 @@ const CommonTestAndPreview = (props) => {
           imageData = formDataObj.image || null;
           videoData = formDataObj.video || null;
           buttonData = formDataObj.button || null;
+          cardsData = formDataObj.cards || [];
+          messageType = formDataObj.type || '';
           accountId = formDataObj.accountId || null;
           accountDetails = formDataObj.accountDetails || null;
           scenarioKey = formDataObj.scenarioKey || VIBER_API_SCENARIO_KEY;
@@ -2068,6 +2233,8 @@ const CommonTestAndPreview = (props) => {
               url: formDataObj?.buttonURL || '',
             };
           }
+          cardsData = viberPreview.cards || formDataObj?.cards || [];
+          messageType = viberPreview.type || formDataObj?.type || '';
           // Extract account info from parent formDataObj if available
           accountId = formDataObj.accountId || null;
           accountDetails = formDataObj.accountDetails || null;
@@ -2110,6 +2277,10 @@ const CommonTestAndPreview = (props) => {
           text: messageText,
         };
 
+        if (messageType === CHANNELS.VIBER) {
+          messageType = '';
+        }
+
         // Add image if present
         if (imageData && imageData.url) {
           viberContent.image = {
@@ -2138,9 +2309,34 @@ const CommonTestAndPreview = (props) => {
           }
         }
 
-        // Resolve tags in text if custom values are provided
-        if (customValuesObj && Object.keys(customValuesObj).length > 0 && viberContent.text) {
-          viberContent.text = resolveTagsInText(viberContent.text, customValuesObj);
+        if (messageType === MEDIA_TYPE_CAROUSEL || (Array.isArray(cardsData) && cardsData.length)) {
+          viberContent.type = MEDIA_TYPE_CAROUSEL;
+          viberContent.cards = (cardsData || []).map((card) => ({
+            text: card?.text || '',
+            mediaUrl: card?.mediaUrl || '',
+            buttons: (card?.buttons || []).map((button) => ({
+              title: button?.title || '',
+              action: button?.action || '',
+            })),
+          }));
+          delete viberContent.button;
+        }
+
+        // Resolve tags in text/cards if custom values are provided
+        if (customValuesObj && Object.keys(customValuesObj).length > 0) {
+          if (viberContent.text) {
+            viberContent.text = resolveTagsInText(viberContent.text, customValuesObj);
+          }
+          if (Array.isArray(viberContent.cards)) {
+            viberContent.cards = resolveViberCarouselCards(viberContent.cards, customValuesObj);
+          }
+          if (viberContent.button) {
+            viberContent.button = {
+              ...viberContent.button,
+              text: resolveTagsInText(viberContent.button.text || '', customValuesObj),
+              url: resolveTagsInText(viberContent.button.url || '', customValuesObj),
+            };
+          }
         }
 
         // Build messageBody JSON string
@@ -2532,33 +2728,39 @@ const CommonTestAndPreview = (props) => {
       // Only use previewDataHtml if preview call was made
       if (hasPreviewCallBeenMade && previewDataHtml?.resolvedBody) {
         resolvedContent = previewDataHtml.resolvedBody;
+        if (typeof resolvedContent === 'string') {
+          try {
+            resolvedContent = JSON.parse(resolvedContent);
+          } catch (e) {
+            resolvedContent = null;
+          }
+        }
       }
 
-      // Parse content if it's a string
-      let parsedViberContent = content;
-      if (typeof content === 'string') {
-        try {
-          parsedViberContent = JSON.parse(content);
-        } catch (e) {
-          parsedViberContent = {};
-        }
+      // Parse content if it's a string, then merge with formData for carousel + tags in all entry flows
+      let parsedViberContent = getViberMergedFormData();
+      if (!parsedViberContent || typeof parsedViberContent !== 'object') {
+        parsedViberContent = {};
       }
-      // Use resolvedContent if available (from preview call), otherwise use raw content
+      // Merge template preview state with API resolved body so carousel type/cards survive slim responses
       if (resolvedContent && typeof resolvedContent === 'object') {
-        contentObj = { ...resolvedContent };
-        // Merge in accountName and brandName from raw content if not in resolvedContent
-        if (parsedViberContent?.accountName && !contentObj.accountName) {
-          contentObj.accountName = parsedViberContent.accountName;
+        const base = parsedViberContent && typeof parsedViberContent === 'object' ? parsedViberContent : {};
+        contentObj = mergeViberPreviewWithResolved(base, resolvedContent);
+        if (base.accountName && !contentObj.accountName) {
+          contentObj.accountName = base.accountName;
         }
-        if (parsedViberContent?.brandName && !contentObj.brandName) {
-          contentObj.brandName = parsedViberContent.brandName;
+        if (base.brandName && !contentObj.brandName) {
+          contentObj.brandName = base.brandName;
         }
       } else {
-        // Use raw content if no preview call was made or resolvedContent is not available
-        contentObj = {...parsedViberContent, messageContent: resolvedContent};
-        if (resolvedContent) {
-          contentObj.viberPreviewContent = {...parsedViberContent?.viberPreviewContent, messageContent: resolvedContent};
-        }
+        contentObj = parsedViberContent && typeof parsedViberContent === 'object' ? parsedViberContent : {};
+      }
+      if (
+        hasPreviewCallBeenMade
+        && viberPreviewTagValues
+        && Object.keys(viberPreviewTagValues).length > 0
+      ) {
+        contentObj = applyViberCustomValuesToContent(contentObj, viberPreviewTagValues);
       }
     } else if (channel === CHANNELS.ZALO) {
       // For Zalo, content is an object with templatePreviewUrl, templateStatus, etc.
@@ -2942,6 +3144,11 @@ const CommonTestAndPreview = (props) => {
 
       setCustomValues(updatedValues);
 
+      // Viber: do not auto-resolve tags in preview; user must click Update preview
+      if (channel === CHANNELS.VIBER) {
+        return;
+      }
+
       // Update preview with prefilled values (this is a valid preview call trigger)
       // For RCS: always dispatch with RCS channel/content so previewDataHtml stays RCS-shaped.
       // SMS fallback preview is kept in sync by syncSmsFallbackPreview via smsFallbackPreviewText.
@@ -3024,6 +3231,7 @@ const CommonTestAndPreview = (props) => {
     setPreviewDevice(DESKTOP);
     setPreviewDataHtml('');
     setHasPreviewCallBeenMade(false); // Reset preview call flag
+    setViberPreviewTagValues(null);
     setSelectedTestEntities([]);
     setBeeContent('');
     previousBeeContentRef.current = '';
@@ -3061,6 +3269,7 @@ const CommonTestAndPreview = (props) => {
   const handleClearSelection = () => {
     setSelectedCustomer(null);
     setHasPreviewCallBeenMade(false); // Reset flag when customer is cleared
+    setViberPreviewTagValues(null);
 
     // Clear all preview errors when customer is cleared
     actions.clearPreviewErrors();
@@ -3119,6 +3328,9 @@ const CommonTestAndPreview = (props) => {
       emptyValues,
       selectedCustomer
     );
+    if (channel === CHANNELS.VIBER) {
+      setViberPreviewTagValues({ ...emptyValues });
+    }
     actions.updatePreviewRequested(payload);
     setHasPreviewCallBeenMade(true); // Mark that preview call was made
   };
@@ -3144,6 +3356,9 @@ const CommonTestAndPreview = (props) => {
         customValues,
         selectedCustomer
       );
+      if (channel === CHANNELS.VIBER) {
+        setViberPreviewTagValues({ ...customValues });
+      }
       await actions.updatePreviewRequested(payload);
 
       await syncSmsFallbackPreview(customValues, selectedCustomer);

package/v2Components/CommonTestAndPreview/tests/UnifiedPreview/SmsPreviewContent.test.js

@@ -601,6 +601,38 @@ describe('SmsPreviewContent', () => {
     });
   });
 
+  describe('DLT token highlighting', () => {
+    it('wraps `{#…#}` tokens in a highlighted span and leaves plain text as-is', () => {
+      const { container } = render(
+        <TestWrapper>
+          <ComponentToRender {...defaultProps} content="Hi {#alp#}, code {#num#} thanks" />
+        </TestWrapper>
+      );
+      const tokens = container.querySelectorAll('.sms-preview-dlt-token');
+      expect(tokens.length).toBe(2);
+      expect(tokens[0].textContent).toBe('{#alp#}');
+      expect(tokens[1].textContent).toBe('{#num#}');
+    });
+
+    it('renders no token spans when content has no DLT tokens', () => {
+      const { container } = render(
+        <TestWrapper>
+          <ComponentToRender {...defaultProps} content="Plain SMS body" />
+        </TestWrapper>
+      );
+      expect(container.querySelectorAll('.sms-preview-dlt-token').length).toBe(0);
+    });
+
+    it('falls back to noContent placeholder when content is empty', () => {
+      render(
+        <TestWrapper>
+          <ComponentToRender {...defaultProps} content="" />
+        </TestWrapper>
+      );
+      expect(screen.getByText('No content available')).toBeTruthy();
+    });
+  });
+
   describe('PropTypes Validation', () => {
     it('should accept all required props without warnings', () => {
       const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});