@capillarytech/creatives-library 8.0.329 → 8.0.330-alpha.1

package/v2Components/CommonTestAndPreview/index.js

@@ -97,6 +97,7 @@ import {
   extractPreviewFromLiquidResponse,
   getSmsFallbackTextForTagExtraction,
 } from './previewApiUtils';
+import { pickFirstSmsFallbackTemplateString } from '../../v2Containers/Rcs/rcsLibraryHydrationUtils';
 
 import { isValidEmail, isValidMobile, formatPhoneNumber } from '../../utils/commonUtils';
 import { getMembersLookup } from '../../services/api';
@@ -1039,78 +1040,77 @@ const CommonTestAndPreview = (props) => {
    * rcsMessageContent: { channel, accountId?, rcsRichCardContent: { contentType, cardType, cardSettings, cardContent }, smsFallBackContent? }
    * Then rcsDeliverySettings, executionParams, clientName last.
    */
-  const buildRcsTestMessagePayload = (formDataObj, _contentStr, customValuesObj, deliverySettingsOverride, basePayload, rcsExtra = {}) => {
-    const plainCustom =
-      customValuesObj != null && typeof customValuesObj.toJS === 'function'
-        ? customValuesObj.toJS()
-        : (customValuesObj || {});
-    const userVarMap = Object.fromEntries(
-      Object.entries(plainCustom).filter(([, v]) => v != null && String(v).trim() !== '')
-    );
-    const rcsData = formDataObj?.versions?.base?.content?.RCS ?? formDataObj?.content?.RCS ?? {};
-    const rcsContent = rcsData?.rcsContent || {};
-    const smsFallback = rcsData?.smsFallBackContent || {};
-    let cardContentList = [];
-    if (Array.isArray(rcsContent?.cardContent)) {
-      cardContentList = rcsContent.cardContent;
-    } else if (rcsContent?.cardContent) {
-      cardContentList = [rcsContent.cardContent];
+  const buildRcsTestMessagePayload = (
+    creativeFormData,
+    _unusedEditorContentString,
+    _customValuesObj,
+    deliverySettingsOverride,
+    basePayload,
+    _rcsTestMetaExtras = {},
+  ) => {
+    const rcsSectionFromForm =
+      creativeFormData?.versions?.base?.content?.RCS ?? creativeFormData?.content?.RCS ?? {};
+    const rcsContentFromForm = rcsSectionFromForm?.rcsContent || {};
+    const smsFallbackFromCreativeForm = rcsSectionFromForm?.smsFallBackContent || {};
+    let rcsCardPayloadList = [];
+    if (Array.isArray(rcsContentFromForm?.cardContent)) {
+      rcsCardPayloadList = rcsContentFromForm.cardContent;
+    } else if (rcsContentFromForm?.cardContent) {
+      rcsCardPayloadList = [rcsContentFromForm.cardContent];
     }
-    // Merge test customValues into cardVarMapped (template snapshot + user-entered RCS + fallback SMS tags).
-    const cardContent = cardContentList.map((rcsCard) => {
-      const baseMap = rcsCard.cardVarMapped || {};
-      const mergedCardVarMapped =
-        Object.keys(userVarMap).length > 0 ? { ...baseMap, ...userVarMap } : baseMap;
-      const mediaNorm = rcsCard?.media ? normalizeRcsTestCardMedia(rcsCard.media) : undefined;
-      const suggestionsRaw = Array.isArray(rcsCard?.suggestions) ? rcsCard.suggestions : [];
-      const suggestionsMapped = suggestionsRaw.map((suggestionItem, i) =>
-        mapRcsSuggestionForTestMeta(suggestionItem, i));
+    // Raw title/description with template tags; SMS fallback uses tagged template fields (pickFirst…).
+    const cardContentForTestMetaApi = rcsCardPayloadList.map((singleRcsCardPayload) => {
+      const normalizedCardMediaForTestApi = singleRcsCardPayload?.media
+        ? normalizeRcsTestCardMedia(singleRcsCardPayload.media)
+        : undefined;
+      const suggestionsFromCard = Array.isArray(singleRcsCardPayload?.suggestions)
+        ? singleRcsCardPayload.suggestions
+        : [];
+      const suggestionsFormattedForTestMeta = suggestionsFromCard.map((suggestionItem, index) =>
+        mapRcsSuggestionForTestMeta(suggestionItem, index));
       return {
-        title: rcsCard?.title ?? '',
-        description: rcsCard?.description ?? '',
-        mediaType: rcsCard?.mediaType ?? MEDIA_TYPE_TEXT,
-        ...(mediaNorm && { media: mediaNorm }),
-        ...(Object.keys(mergedCardVarMapped).length > 0 && { cardVarMapped: mergedCardVarMapped }),
-        ...(suggestionsMapped.length > 0 && { suggestions: suggestionsMapped }),
+        title: singleRcsCardPayload?.title ?? '',
+        description: singleRcsCardPayload?.description ?? '',
+        mediaType: singleRcsCardPayload?.mediaType ?? MEDIA_TYPE_TEXT,
+        ...(normalizedCardMediaForTestApi && { media: normalizedCardMediaForTestApi }),
+        ...(suggestionsFormattedForTestMeta.length > 0 && {
+          suggestions: suggestionsFormattedForTestMeta,
+        }),
       };
     });
-    // Prefer parent `smsFallbackContent` snapshot (rcsExtra) — includes VarSegment-resolved body via
-    // getSmsFallbackTextForTagExtraction. Nested formData.smsFallBackContent is often stale vs live editor.
-    const rcsExtraFallbackTemplate = rcsExtra?.smsFallbackTemplateContent;
-    const hasResolvedFallbackBodyFromRcsExtra =
-      rcsExtraFallbackTemplate != null
-      && String(rcsExtraFallbackTemplate).trim() !== '';
-    const smsMessageRaw = hasResolvedFallbackBodyFromRcsExtra
-      ? String(rcsExtraFallbackTemplate)
-      : (smsFallback?.smsContent ?? smsFallback?.message ?? '');
+    const smsFallbackTaggedTemplateBody = pickFirstSmsFallbackTemplateString(
+      smsFallbackFromCreativeForm,
+    ) || '';
     const smsSenderFromDelivery = deliverySettingsOverride?.cdmaSenderId?.includes('|')
       ? deliverySettingsOverride.cdmaSenderId.split('|')[1]
       : deliverySettingsOverride?.cdmaSenderId;
     const deliveryFallbackSmsId =
       typeof smsSenderFromDelivery === 'string' ? smsSenderFromDelivery.trim() : '';
     const creativeFallbackSmsId =
-      smsFallback?.senderId != null ? String(smsFallback.senderId).trim() : '';
+      smsFallbackFromCreativeForm?.senderId != null
+        ? String(smsFallbackFromCreativeForm.senderId).trim()
+        : '';
     const fallbackSmsSenderIdForChannel = deliveryFallbackSmsId || creativeFallbackSmsId || '';
 
     const smsFallBackContent =
-      smsMessageRaw.trim() !== ''
-        ? { message: smsMessageRaw }
+      smsFallbackTaggedTemplateBody.trim() !== ''
+        ? { message: smsFallbackTaggedTemplateBody }
         : undefined;
 
     // accountId: WeCRM account id (not sourceAccountIdentifier) for createMessageMeta
     const accountIdForMeta =
-      rcsContent?.accountId != null && String(rcsContent.accountId).trim() !== ''
-        ? String(rcsContent.accountId)
+      rcsContentFromForm?.accountId != null && String(rcsContentFromForm.accountId).trim() !== ''
+        ? String(rcsContentFromForm.accountId)
         : undefined;
 
     const rcsRichCardContent = {
       contentType: RCS_TEST_META_CONTENT_TYPE_RICHCARD,
-      cardType: rcsContent?.cardType ?? RCS_TEST_META_CARD_TYPE_STANDALONE,
-      cardSettings: rcsContent?.cardSettings ?? {
+      cardType: rcsContentFromForm?.cardType ?? RCS_TEST_META_CARD_TYPE_STANDALONE,
+      cardSettings: rcsContentFromForm?.cardSettings ?? {
         cardOrientation: RCS_TEST_META_CARD_ORIENTATION_VERTICAL,
         cardWidth: RCS_TEST_META_CARD_WIDTH_SMALL,
       },
-      ...(cardContent.length > 0 && { cardContent }),
+      ...(cardContentForTestMetaApi.length > 0 && { cardContent: cardContentForTestMetaApi }),
     };
 
     const rcsMessageContent = {
@@ -3299,15 +3299,7 @@ const CommonTestAndPreview = (props) => {
       uniqueUserIds,
       previewData,
       deliveryOverride,
-      channel === CHANNELS.RCS
-        ? {
-          smsFallbackTemplateContent:
-            smsFallbackTextForTagExtraction
-            || smsFallbackContent?.templateContent
-            || smsFallbackContent?.content
-            || '',
-        }
-        : {},
+      {},
     );
 
     actions.createMessageMetaRequested(

package/v2Components/CommonTestAndPreview/messages.js

@@ -340,6 +340,14 @@ export default defineMessages({
     id: `${scope}.videoPreviewTooltip`,
     defaultMessage: 'Video Preview',
   },
+  rcsCarouselPreviewTitlePlaceholder: {
+    id: `${scope}.rcsCarouselPreviewTitlePlaceholder`,
+    defaultMessage: 'Card title',
+  },
+  rcsCarouselPreviewBodyPlaceholder: {
+    id: `${scope}.rcsCarouselPreviewBodyPlaceholder`,
+    defaultMessage: 'Card description',
+  },
   toMe: {
     id: `${scope}.toMe`,
     defaultMessage: 'to me',

package/v2Components/CommonTestAndPreview/reducer.js

@@ -220,8 +220,10 @@ const previewAndTestReducer = (state = initialState, action) => {
     case ADD_TEST_CUSTOMER: {
       const raw = state.get('testCustomers');
       const list = Array.isArray(raw) ? raw : (raw && raw.toArray ? raw.toArray().map((i) => (i && i.toJS ? i.toJS() : i)) : []);
-      const customer = action.payload.customer;
+      const customer = action.payload?.customer;
+      if (!customer) return state;
       const newId = customer.userId || customer.customerId;
+      if (!newId) return state;
       if (list.some((c) => (c.userId || c.customerId) === newId)) return state;
       return state.set('testCustomers', list.concat([customer]));
     }

package/v2Components/CommonTestAndPreview/sagas.js

@@ -161,9 +161,10 @@ export function* getBulkCustomerDetails({fetchedUserIds}) {
         const emailIdentifier = profile?.identifiers?.find(
           (identifier) => identifier.type === IDENTIFIER_TYPE_EMAIL,
         );
+        const nameParts = [profile?.firstName, profile?.lastName].filter(Boolean);
         return {
           userId: item?.entity?.id,
-          name: `${profile?.firstName} ${profile?.lastName}`,
+          name: nameParts.join(' '),
           mobile: mobileIdentifier?.value,
           email: emailIdentifier?.value,
         };

package/v2Components/CommonTestAndPreview/tests/PreviewSection.test.js

@@ -8,7 +8,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import PreviewSection from '../PreviewSection';
 
-// Mock UnifiedPreview component
+// Mock UnifiedPreview component (lightweight DOM for this suite only).
 const mockUnifiedPreview = jest.fn();
 jest.mock('../UnifiedPreview', () => {
   // eslint-disable-next-line global-require, import/no-extraneous-dependencies
@@ -232,3 +232,10 @@ describe('PreviewSection', () => {
     });
   });
 });
+
+// This suite mocks ../UnifiedPreview. resetModules() alone is not enough — Jest still applies the
+// manual mock on the next load. Unmock + reset so later test files in this worker get the real module.
+afterAll(() => {
+  jest.unmock('../UnifiedPreview');
+  jest.resetModules();
+});