@capillarytech/creatives-library 9.0.46 → 9.0.48

package/v2Components/CommonTestAndPreview/index.js

@@ -246,8 +246,6 @@ 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) {
@@ -689,159 +687,6 @@ 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)
    */
@@ -1120,13 +965,11 @@ const CommonTestAndPreview = (props) => {
           templateContent: formDataObj?.bodyText || contentStr,
         };
 
-      case CHANNELS.VIBER: {
-        const viberFormData = getViberMergedFormData(formDataObj);
+      case CHANNELS.VIBER:
         return {
-          templateSubject: viberFormData?.messageTitle || '',
-          templateContent: getViberTagExtractionContent(viberFormData, contentStr),
+          templateSubject: formDataObj?.messageTitle || '',
+          templateContent: contentStr,
         };
-      }
 
       case CHANNELS.WEBPUSH:
         return {
@@ -1507,7 +1350,10 @@ const CommonTestAndPreview = (props) => {
         const language = formDataObj?.language || formDataObj?.templateLanguage || 'en';
         const mediaType = formDataObj?.mediaType || formDataObj?.templateMediaType || MEDIA_TYPE_TEXT;
         const buttonType = formDataObj?.buttonType || BUTTON_TYPE_NONE;
-        const varMapped = formDataObj?.varMapped || {};
+        const existingVarMapped = formDataObj?.varMapped || {};
+        const varMapped = Object.keys(existingVarMapped).length > 0
+          ? existingVarMapped
+          : (customValuesObj || {});
         const isPreviewUrl = formDataObj?.isPreviewUrl || false;
 
         // Extract buttons from ctaData or quickReplyData
@@ -2181,16 +2027,11 @@ 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 = '';
@@ -2205,8 +2046,6 @@ 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;
@@ -2233,8 +2072,6 @@ 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;
@@ -2277,10 +2114,6 @@ const CommonTestAndPreview = (props) => {
           text: messageText,
         };
 
-        if (messageType === CHANNELS.VIBER) {
-          messageType = '';
-        }
-
         // Add image if present
         if (imageData && imageData.url) {
           viberContent.image = {
@@ -2309,34 +2142,9 @@ const CommonTestAndPreview = (props) => {
           }
         }
 
-        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),
-            };
-          }
+        // Resolve tags in text if custom values are provided
+        if (customValuesObj && Object.keys(customValuesObj).length > 0 && viberContent.text) {
+          viberContent.text = resolveTagsInText(viberContent.text, customValuesObj);
         }
 
         // Build messageBody JSON string
@@ -2728,39 +2536,33 @@ 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, then merge with formData for carousel + tags in all entry flows
-      let parsedViberContent = getViberMergedFormData();
-      if (!parsedViberContent || typeof parsedViberContent !== 'object') {
-        parsedViberContent = {};
+      // Parse content if it's a string
+      let parsedViberContent = content;
+      if (typeof content === 'string') {
+        try {
+          parsedViberContent = JSON.parse(content);
+        } catch (e) {
+          parsedViberContent = {};
+        }
       }
-      // Merge template preview state with API resolved body so carousel type/cards survive slim responses
+      // Use resolvedContent if available (from preview call), otherwise use raw content
       if (resolvedContent && typeof resolvedContent === 'object') {
-        const base = parsedViberContent && typeof parsedViberContent === 'object' ? parsedViberContent : {};
-        contentObj = mergeViberPreviewWithResolved(base, resolvedContent);
-        if (base.accountName && !contentObj.accountName) {
-          contentObj.accountName = base.accountName;
+        contentObj = { ...resolvedContent };
+        // Merge in accountName and brandName from raw content if not in resolvedContent
+        if (parsedViberContent?.accountName && !contentObj.accountName) {
+          contentObj.accountName = parsedViberContent.accountName;
         }
-        if (base.brandName && !contentObj.brandName) {
-          contentObj.brandName = base.brandName;
+        if (parsedViberContent?.brandName && !contentObj.brandName) {
+          contentObj.brandName = parsedViberContent.brandName;
         }
       } else {
-        contentObj = parsedViberContent && typeof parsedViberContent === 'object' ? parsedViberContent : {};
-      }
-      if (
-        hasPreviewCallBeenMade
-        && viberPreviewTagValues
-        && Object.keys(viberPreviewTagValues).length > 0
-      ) {
-        contentObj = applyViberCustomValuesToContent(contentObj, viberPreviewTagValues);
+        // 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};
+        }
       }
     } else if (channel === CHANNELS.ZALO) {
       // For Zalo, content is an object with templatePreviewUrl, templateStatus, etc.
@@ -3144,11 +2946,6 @@ 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.
@@ -3231,7 +3028,6 @@ const CommonTestAndPreview = (props) => {
     setPreviewDevice(DESKTOP);
     setPreviewDataHtml('');
     setHasPreviewCallBeenMade(false); // Reset preview call flag
-    setViberPreviewTagValues(null);
     setSelectedTestEntities([]);
     setBeeContent('');
     previousBeeContentRef.current = '';
@@ -3269,7 +3065,6 @@ 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();
@@ -3328,9 +3123,6 @@ const CommonTestAndPreview = (props) => {
       emptyValues,
       selectedCustomer
     );
-    if (channel === CHANNELS.VIBER) {
-      setViberPreviewTagValues({ ...emptyValues });
-    }
     actions.updatePreviewRequested(payload);
     setHasPreviewCallBeenMade(true); // Mark that preview call was made
   };
@@ -3356,9 +3148,6 @@ const CommonTestAndPreview = (props) => {
         customValues,
         selectedCustomer
       );
-      if (channel === CHANNELS.VIBER) {
-        setViberPreviewTagValues({ ...customValues });
-      }
       await actions.updatePreviewRequested(payload);
 
       await syncSmsFallbackPreview(customValues, selectedCustomer);