@capillarytech/creatives-library 8.0.345-alpha.14 → 8.0.345-alpha.15

package/v2Components/CommonTestAndPreview/messages.js

@@ -98,6 +98,20 @@ export default defineMessages({
     id: `${scope}.personalizationTags`,
     defaultMessage: 'Personalization Tags',
   },
+  rcsTagsSectionTitle: {
+    id: `${scope}.rcsTagsSectionTitle`,
+    defaultMessage: 'RCS Tags',
+  },
+  /** Primary SMS section when channel is SMS — `messages[`${channel}TagsSectionTitle`]` resolves to this. */
+  SMSTagsSectionTitle: {
+    id: `${scope}.SMSTagsSectionTitle`,
+    defaultMessage: 'SMS tags',
+  },
+  /** Fallback SMS under RCS — same label as SMS Test & Preview for consistent personalization UX. */
+  smsFallbackTagsSectionTitle: {
+    id: `${scope}.smsFallbackTagsSectionTitle`,
+    defaultMessage: 'SMS tags',
+  },
   customValues: {
     id: `${scope}.customValues`,
     defaultMessage: 'Custom Values',
@@ -138,6 +152,14 @@ export default defineMessages({
     id: `${scope}.discardCustomValues`,
     defaultMessage: 'Discard custom values',
   },
+  rcsSenderIdLabel: {
+    id: `${scope}.rcsSenderIdLabel`,
+    defaultMessage: 'RCS Sender ID',
+  },
+  fallbackSmsSenderIdLabel: {
+    id: `${scope}.fallbackSmsSenderIdLabel`,
+    defaultMessage: 'Fallback SMS Sender ID',
+  },
   updatePreview: {
     id: `${scope}.updatePreview`,
     defaultMessage: 'Update Preview',
@@ -194,6 +216,14 @@ export default defineMessages({
     id: `${scope}.previewTitle`,
     defaultMessage: 'Preview',
   },
+  rcsTab: {
+    id: `${scope}.rcsTab`,
+    defaultMessage: 'RCS',
+  },
+  smsFallbackTab: {
+    id: `${scope}.smsFallbackTab`,
+    defaultMessage: 'Fallback SMS',
+  },
   previewPlaceholder: {
     id: `${scope}.previewPlaceholder`,
     defaultMessage: 'Click "Update Preview" to see the rendered email.',
@@ -286,14 +316,22 @@ export default defineMessages({
     id: `${scope}.lastModified`,
     defaultMessage: 'Last modified',
   },
-  by: {
-    id: `${scope}.by`,
-    defaultMessage: 'by',
+  byAuthor: {
+    id: `${scope}.byAuthor`,
+    defaultMessage: 'by {name}',
   },
   senderId: {
     id: `${scope}.senderId`,
     defaultMessage: 'Sender ID',
   },
+  rcsSenderIdLabel: {
+    id: `${scope}.rcsSenderIdLabel`,
+    defaultMessage: 'RCS sender ID',
+  },
+  domainLabel: {
+    id: `${scope}.domainLabel`,
+    defaultMessage: 'Domain',
+  },
   urlPreviewImage: {
     id: `${scope}.urlPreviewImage`,
     defaultMessage: 'URL Preview Image',
@@ -302,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/previewApiUtils.js

@@ -0,0 +1,59 @@
+/**
+ * Helpers for Liquid `/preview` (updateEmailPreview) responses.
+ * The API may nest the payload under `data` or return fields at the top level.
+ * SMS responses often use `messageBody` instead of `resolvedBody`.
+ */
+
+import { getFallbackResolvedContent } from '../../utils/templateVarUtils';
+import { RCS_SMS_FALLBACK_VAR_MAPPED_PROP } from './constants';
+
+export function normalizePreviewApiPayload(raw) {
+  if (!raw || typeof raw !== 'object') return raw;
+  const next = { ...raw };
+  if (next.resolvedBody == null) {
+    const alt = next.messageBody ?? next.previewMessage ?? next.previewText;
+    if (alt != null) next.resolvedBody = alt;
+  }
+  return next;
+}
+
+/**
+ * Returns a normalized preview object suitable for Redux `previewData`, or null on error / empty.
+ */
+export function extractPreviewFromLiquidResponse(response) {
+  if (!response || response.error) return null;
+  if (response.errors && Array.isArray(response.errors) && response.errors.length > 0) return null;
+
+  let body;
+  if (response.data !== undefined && response.data !== null && typeof response.data === 'object') {
+    body = normalizePreviewApiPayload(response.data);
+  } else if (typeof response === 'object' && !Array.isArray(response)) {
+    body = normalizePreviewApiPayload(response);
+  } else {
+    return null;
+  }
+
+  if (!body) return null;
+  if (body.resolvedBody === undefined && body.messageBody === undefined) {
+    return null;
+  }
+  return body;
+}
+
+/**
+ * RCS SMS fallback: merge template (`templateContent` / `content`) with VarSegment
+ * `rcsSmsFallbackVarMapped` before Liquid /preview, tag extraction, or createMessageMeta.
+ * Raw template alone is stale when the user edits slot values.
+ */
+export function getSmsFallbackTextForTagExtraction(smsFallbackContext) {
+  const rawTemplateBody =
+    smsFallbackContext?.templateContent ?? smsFallbackContext?.content ?? '';
+  if (!rawTemplateBody) return '';
+  const rcsSmsFallbackVarMapped = smsFallbackContext?.[RCS_SMS_FALLBACK_VAR_MAPPED_PROP];
+  const hasRcsSmsFallbackVarMappedEntries =
+    Object.keys(rcsSmsFallbackVarMapped ?? {}).length > 0;
+  if (hasRcsSmsFallbackVarMappedEntries) {
+    return getFallbackResolvedContent(rawTemplateBody, rcsSmsFallbackVarMapped ?? {});
+  }
+  return rawTemplateBody;
+}

package/v2Components/CommonTestAndPreview/sagas.js

@@ -3,7 +3,7 @@
  */
 
 import {
-  call, put, takeLatest, all,
+  call, put, takeLatest, takeEvery, all,
 } from 'redux-saga/effects';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
@@ -45,6 +45,7 @@ import {
   CHANNELS,
 } from './constants';
 import { parseSenderDetailsResponse } from './DeliverySettings/utils/parseSenderDetailsResponse';
+import { extractPreviewFromLiquidResponse } from './previewApiUtils';
 
 // Search Customers Saga
 export function* searchCustomersSaga(action) {
@@ -91,11 +92,12 @@ export function* updatePreviewSaga(action) {
     const customValues = action.payload.resolvedTags;
 
     const response = yield call(Api.updateEmailPreview, action.payload);
-    if (response?.data) {
+    const previewPayload = extractPreviewFromLiquidResponse(response);
+    if (previewPayload) {
       yield put({
         type: UPDATE_PREVIEW_SUCCESS,
         payload: {
-          previewData: response.data,
+          previewData: previewPayload,
           customValues, // Pass custom values to be preserved
         },
       });
@@ -237,8 +239,13 @@ export function* createMessageMetaSaga(action) {
 export function* getPrefilledValuesSaga(action) {
   try {
     const response = yield call(Api.updateEmailPreview, action.payload);
-    if (response?.data) {
-      yield put({ type: GET_PREFILLED_VALUES_SUCCESS, payload: { values: response?.data?.resolvedTagValues } });
+    const body =
+      response?.data !== undefined && response?.data !== null
+        ? response.data
+        : response;
+    const resolvedTagValues = body?.resolvedTagValues;
+    if (resolvedTagValues != null) {
+      yield put({ type: GET_PREFILLED_VALUES_SUCCESS, payload: { values: resolvedTagValues } });
     } else {
       // Pass all errors from API response to state
       yield put({
@@ -338,7 +345,9 @@ export function* getWeCrmAccountsSaga(action) {
 }
 
 export function* watchGetSenderDetails() {
-  yield takeLatest(GET_SENDER_DETAILS_REQUESTED, getSenderDetailsSaga);
+  // takeEvery: RCS test & preview dispatches RCS then SMS back-to-back; takeLatest would
+  // cancel the RCS fetch so senderDetailsByChannel.RCS stayed empty while SMS loaded.
+  yield takeEvery(GET_SENDER_DETAILS_REQUESTED, getSenderDetailsSaga);
 }
 
 export function* watchGetWeCrmAccounts() {