@capillarytech/creatives-library 9.0.26 → 9.0.29-alpha.1

package/v2Components/CommonTestAndPreview/DeliverySettings/index.js

@@ -1,11 +1,11 @@
 /**
  * DeliverySettings — summary row + CapSlideBox trigger for Test and Preview.
- * Rendered only for SMS, Email, WhatsApp. Uses cap-ui-library only.
+ * Rendered for SMS, Email, WhatsApp, RCS (ModifyDeliverySettings). RCS uses gsmSenderId + cdmaSenderId (SMS fallback).
  *
  * Reference: cap-campaigns-v2 DeliverySettingsV2 (summary + modify panel).
  */
 
-import React, { useState, useCallback } from "react";
+import React, { useState, useCallback, useMemo } from "react";
 import PropTypes from "prop-types";
 import CapRow from "@capillarytech/cap-ui-library/CapRow";
 import CapHeading from "@capillarytech/cap-ui-library/CapHeading";
@@ -22,6 +22,7 @@ import {
   SUMMARY_EMPTY_PLACEHOLDER,
   DELIVERY_SETTING_KEY_DOMAIN_ID,
   DELIVERY_SETTING_KEY_GSM_SENDER_ID,
+  DELIVERY_SETTING_KEY_CDMA_SENDER_ID,
   DELIVERY_SETTING_KEY_SENDER_EMAIL,
   DELIVERY_SETTING_KEY_SENDER_LABEL,
   DELIVERY_SETTING_KEY_SENDER_REPLY_TO,
@@ -35,7 +36,7 @@ const DeliverySettings = (props) => {
   const {
     channel,
     deliverySettings = {},
-    senderDetailsOptions = [],
+    senderDetailsByChannel = {},
     wecrmAccounts = [],
     onSaveDeliverySettings,
     isLoadingSenderDetails,
@@ -43,6 +44,7 @@ const DeliverySettings = (props) => {
     smsTraiDltEnabled,
     registeredSenderIds,
     whatsappAccountFromForm,
+    isChannelSmsFallbackPreviewEnabled,
   } = props;
 
   const [isSlideBoxOpen, setSlideBoxOpen] = useState(false);
@@ -58,17 +60,68 @@ const DeliverySettings = (props) => {
     [onSaveDeliverySettings, closeSlideBox]
   );
 
+  const senderDetailsOptions = useMemo(
+    () => (senderDetailsByChannel[channel] || []),
+    [senderDetailsByChannel, channel],
+  );
+  const smsDomainsForRcs = useMemo(
+    () => (channel === CHANNELS.RCS ? (senderDetailsByChannel[CHANNELS.SMS] || []) : []),
+    [channel, senderDetailsByChannel],
+  );
+
   if (!CHANNELS_WITH_DELIVERY_SETTINGS.includes(channel)) {
     return null;
   }
 
   const notConfiguredLabel = formatMessage(messages.notConfigured);
 
+  const getDisplayFromDomains = (domains, compositeValue) => {
+    if (!compositeValue || !domains?.length) return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+    for (const senderDomain of domains) {
+      for (const gsmSenderRow of senderDomain.gsmSenders || []) {
+        const value = senderDomain.domainId != null && gsmSenderRow.value != null
+          ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+          : gsmSenderRow.value;
+        if (value === compositeValue && (senderDomain.domainName || gsmSenderRow.value)) {
+          return [senderDomain.domainName, gsmSenderRow.value].filter(Boolean).join(' · ');
+        }
+      }
+    }
+    return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+  };
+
+  /** RCS summary: show sender ID only (no "domain · sender"). */
+  const getSenderIdOnlyFromComposite = (domains, compositeValue) => {
+    if (!compositeValue || !domains?.length) return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+    for (const senderDomain of domains) {
+      for (const gsmSenderRow of senderDomain.gsmSenders || []) {
+        const value = senderDomain.domainId != null && gsmSenderRow.value != null
+          ? `${senderDomain.domainId}|${gsmSenderRow.value}`
+          : gsmSenderRow.value;
+        if (value === compositeValue && gsmSenderRow.value != null) {
+          return String(gsmSenderRow.value);
+        }
+      }
+    }
+    return compositeValue || SUMMARY_EMPTY_PLACEHOLDER;
+  };
+
   const getSummaryText = () => {
     const empty = SUMMARY_EMPTY_PLACEHOLDER;
+    if (channel === CHANNELS.RCS) {
+      const rcsVal = get(deliverySettings, DELIVERY_SETTING_KEY_GSM_SENDER_ID) || '';
+      const smsVal = get(deliverySettings, DELIVERY_SETTING_KEY_CDMA_SENDER_ID) || '';
+      const summaryRcs = {
+        rcsSenderId: getSenderIdOnlyFromComposite(senderDetailsOptions, rcsVal),
+      };
+      if (isChannelSmsFallbackPreviewEnabled) {
+        summaryRcs.smsFallbackSenderId = getSenderIdOnlyFromComposite(smsDomainsForRcs, smsVal);
+      }
+      return summaryRcs;
+    }
     if (channel === CHANNELS.SMS) {
       const domain = (senderDetailsOptions || []).find(
-        (d) => d.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+        (senderDomain) => senderDomain.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
       );
       const domainName = domain?.domainName || empty;
       const senderId = get(deliverySettings, DELIVERY_SETTING_KEY_GSM_SENDER_ID) || empty;
@@ -76,7 +129,7 @@ const DeliverySettings = (props) => {
     }
     if (channel === CHANNELS.EMAIL) {
       const domain = (senderDetailsOptions || []).find(
-        (d) => d.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
+        (senderDomain) => senderDomain.domainId === get(deliverySettings, DELIVERY_SETTING_KEY_DOMAIN_ID),
       );
       const emailDomain = domain?.domainName || empty;
       const senderEmail = get(deliverySettings, DELIVERY_SETTING_KEY_SENDER_EMAIL) || empty;
@@ -103,7 +156,12 @@ const DeliverySettings = (props) => {
 
   const summary = getSummaryText();
   let hasValues = false;
-  if (channel === CHANNELS.SMS) {
+  if (channel === CHANNELS.RCS) {
+    hasValues = (summary.rcsSenderId && summary.rcsSenderId !== SUMMARY_EMPTY_PLACEHOLDER)
+      || (isChannelSmsFallbackPreviewEnabled
+        && summary.smsFallbackSenderId
+        && summary.smsFallbackSenderId !== SUMMARY_EMPTY_PLACEHOLDER);
+  } else if (channel === CHANNELS.SMS) {
     hasValues = summary.senderDomain !== SUMMARY_EMPTY_PLACEHOLDER
       || summary.senderId !== SUMMARY_EMPTY_PLACEHOLDER;
   } else if (channel === CHANNELS.EMAIL) {
@@ -122,6 +180,15 @@ const DeliverySettings = (props) => {
   const getSummaryObject = () => {
     if (!hasValues) return null;
     const label = (msg) => formatMessage(msg);
+    if (channel === CHANNELS.RCS) {
+      const rcsSummary = {
+        [label(messages.rcsSenderIdLabel)]: summary.rcsSenderId,
+      };
+      if (isChannelSmsFallbackPreviewEnabled) {
+        rcsSummary[label(messages.fallbackSmsSenderIdLabel)] = summary.smsFallbackSenderId;
+      }
+      return rcsSummary;
+    }
     if (channel === CHANNELS.SMS) {
       return {
         [label(messages.senderDomainSummary)]: summary.senderDomain,
@@ -165,7 +232,7 @@ const DeliverySettings = (props) => {
             Object.entries(summaryObject).map(([key, value]) => (
               <CapRow type="flex" key={key} className="delivery-settings__summary-entry">
                 <CapLabel type="label1" className="delivery-settings__summary-key">{key}</CapLabel>
-                <CapLabel type="label9">
+                <CapLabel type="label9" className="delivery-settings__summary-value">
                   :
                   {' '}
                   {value}
@@ -194,6 +261,11 @@ const DeliverySettings = (props) => {
               channel={channel}
               deliverySettings={deliverySettings}
               senderDetailsOptions={senderDetailsOptions}
+              smsFallbackSenderDetailsOptions={
+                channel === CHANNELS.RCS && isChannelSmsFallbackPreviewEnabled
+                  ? smsDomainsForRcs
+                  : undefined
+              }
               wecrmAccounts={wecrmAccounts}
               onSaveDeliverySettings={handleSave}
               onClose={closeSlideBox}
@@ -213,7 +285,7 @@ const DeliverySettings = (props) => {
 DeliverySettings.propTypes = {
   channel: PropTypes.string.isRequired,
   deliverySettings: PropTypes.object,
-  senderDetailsOptions: PropTypes.array,
+  senderDetailsByChannel: PropTypes.object,
   wecrmAccounts: PropTypes.array,
   onSaveDeliverySettings: PropTypes.func.isRequired,
   isLoadingSenderDetails: PropTypes.bool,
@@ -223,17 +295,19 @@ DeliverySettings.propTypes = {
   whatsappAccountFromForm: PropTypes.shape({
     accountName: PropTypes.string,
   }),
+  isChannelSmsFallbackPreviewEnabled: PropTypes.bool,
 };
 
 DeliverySettings.defaultProps = {
   deliverySettings: {},
-  senderDetailsOptions: [],
+  senderDetailsByChannel: {},
   wecrmAccounts: [],
   isLoadingSenderDetails: false,
   formatMessage: undefined,
   smsTraiDltEnabled: false,
   registeredSenderIds: [],
   whatsappAccountFromForm: undefined,
+  isChannelSmsFallbackPreviewEnabled: false,
 };
 
 export default DeliverySettings;

package/v2Components/CommonTestAndPreview/DeliverySettings/messages.js

@@ -108,4 +108,34 @@ export default defineMessages({
     id: `${prefix}.disabledMessage`,
     defaultMessage: 'Message template selected belongs to this account',
   },
+  /** RCS: primary domain (slidebox) */
+  rcsDomainLabel: {
+    id: `${prefix}.rcsDomainLabel`,
+    defaultMessage: 'RCS domain:',
+  },
+  /** RCS: SMS fallback domain (slidebox) */
+  fallbackSmsDomainLabel: {
+    id: `${prefix}.fallbackSmsDomainLabel`,
+    defaultMessage: 'Fallback SMS domain:',
+  },
+  /** RCS: "RCS sender ID" */
+  rcsSenderIdLabel: {
+    id: `${prefix}.rcsSenderIdLabel`,
+    defaultMessage: 'RCS sender ID',
+  },
+  /** RCS: "Fallback SMS sender ID" */
+  fallbackSmsSenderIdLabel: {
+    id: `${prefix}.fallbackSmsSenderIdLabel`,
+    defaultMessage: 'Fallback SMS sender ID',
+  },
+  /** RCS: "Domain" (for domain · sender ID display) */
+  domainLabel: {
+    id: `${prefix}.domainLabel`,
+    defaultMessage: 'Domain',
+  },
+  /** RCS: placeholder for sender ID dropdown */
+  selectSenderId: {
+    id: `${prefix}.selectSenderId`,
+    defaultMessage: 'Select sender ID',
+  },
 });

package/v2Components/CommonTestAndPreview/DeliverySettings/utils/parseSenderDetailsResponse.js

@@ -9,29 +9,70 @@
 
 import get from 'lodash/get';
 import { CHANNELS } from '../../constants';
+import { RCS_CONTACT_INFO_GSM_TYPE_KEYS } from '../constants';
+import { typeMatches, unwrapEntity } from '../../utils';
 
+/**
+ * Include row unless explicitly invalid — many APIs omit `valid`, which would
+ * otherwise filter out every sender (RCS/SMS lists empty in UI).
+ */
 const getSenderOptions = (contactInfo, key) =>
   (contactInfo || [])
-    .filter((contactInfoItem) => contactInfoItem.type === key && contactInfoItem.valid)
+    .filter((contactInfoItem) => typeMatches(contactInfoItem.type, key) && contactInfoItem.valid !== false)
     .sort((contact) => (contact.default ? -1 : 0));
 
+/** RCS APIs may label senders under several `contactInfo.type` keys — see `RCS_CONTACT_INFO_GSM_TYPE_KEYS`. */
+const getRcsLikeGsmSenders = (contactInfo) => {
+  const seen = new Set();
+  const mergedSenderRows = [];
+  RCS_CONTACT_INFO_GSM_TYPE_KEYS.forEach((key) => {
+    getSenderOptions(contactInfo, key).forEach((row) => {
+      const senderValue = row?.value;
+      // Skip empty/whitespace sender values to avoid polluting the RCS sender dropdown.
+      if (senderValue == null || String(senderValue).trim() === '' || seen.has(senderValue)) return;
+      seen.add(senderValue);
+      mergedSenderRows.push(row);
+    });
+  });
+  return mergedSenderRows.sort((a, b) => (a.default ? -1 : 0) - (b.default ? -1 : 0));
+};
+
 /**
  * Parse raw API response for one channel into { domains: [...] }
- * @param {string} channel - SMS | EMAIL | WHATSAPP
+ * @param {string} channel - SMS | EMAIL | WHATSAPP | RCS
  * @param {Object} response - API response (e.g. { entity: { SMS: [...] } } or { entity: [...] })
  * @returns {{ domains: Array }} - domains array compatible with campaigns DeliverySettingsV2
  */
 export function parseSenderDetailsResponse(channel, response) {
-  const entity = get(response, 'entity', response);
-  if (!entity) {
+  const entity = unwrapEntity(response);
+  if (entity == null || entity === '') {
     return { domains: [] };
   }
 
-  // Single-channel API: entity may be { [channel]: [...] } or direct array
-  let channelSenderDetails = get(entity, channel, null);
+  // Normalize once: entity keys may be any casing (SMS/sms/rcs) but downstream branches use CHANNELS.* (uppercase).
+  const trimmedChannel = channel == null ? '' : String(channel).trim();
+  const normalizedChannel = trimmedChannel ? trimmedChannel.toUpperCase() : '';
+
+  // Single-channel API: entity may be { [channel]: [...] } or direct array.
+  // Some responses use different casing (e.g. rcs vs RCS) or a single domain object instead of an array.
+  let channelSenderDetails =
+    get(entity, channel, null)
+    ?? (normalizedChannel ? get(entity, normalizedChannel, null) : null)
+    ?? (normalizedChannel ? get(entity, normalizedChannel.toLowerCase(), null) : null);
+
   if (channelSenderDetails == null && Array.isArray(entity)) {
     channelSenderDetails = entity;
   }
+
+  if (channelSenderDetails != null && !Array.isArray(channelSenderDetails)) {
+    const single = channelSenderDetails;
+    if (single && typeof single === 'object' && single.domainProperties) {
+      channelSenderDetails = [single];
+    } else {
+      return { domains: [] };
+    }
+  }
+
   if (!Array.isArray(channelSenderDetails)) {
     return { domains: [] };
   }
@@ -42,6 +83,7 @@ export function parseSenderDetailsResponse(channel, response) {
     const { id: dgmId, priority, domainProperties = {} } = element;
     const {
       domainName,
+      hostName,
       id = -1,
       contactInfo,
       connectionProperties: {
@@ -51,21 +93,25 @@ export function parseSenderDetailsResponse(channel, response) {
       } = {},
     } = domainProperties;
 
+    const resolvedDomainName = domainName || hostName;
+
     const domain = {
       dgmId,
-      domainName,
+      domainName: resolvedDomainName,
       domainId: id,
       priority: priority != null ? priority : 0,
     };
 
-    if ([CHANNELS.SMS, CHANNELS.WHATSAPP].includes(channel)) {
+    if ([CHANNELS.SMS, CHANNELS.WHATSAPP, CHANNELS.RCS].includes(normalizedChannel)) {
       domain.cdmaSenders = getSenderOptions(contactInfo, 'cdma_sender_id');
-      domain.gsmSenders = getSenderOptions(contactInfo, 'gsm_sender_id');
+      domain.gsmSenders = normalizedChannel === CHANNELS.RCS
+        ? getRcsLikeGsmSenders(contactInfo)
+        : getSenderOptions(contactInfo, 'gsm_sender_id');
       domain.sourceAccountIdentifier =
         sourceAccountIdentifier || wabaId || userid || '';
     }
 
-    if (channel === CHANNELS.EMAIL) {
+    if (normalizedChannel === CHANNELS.EMAIL) {
       domain.emailSenders = getSenderOptions(contactInfo, 'sender_id');
       domain.emailRepliers = getSenderOptions(contactInfo, 'reply_to_id');
     }
@@ -76,7 +122,8 @@ export function parseSenderDetailsResponse(channel, response) {
   // Sort by priority and dedupe by domainName (match campaigns behaviour)
   domains.sort((a, b) => (a.priority || 0) - (b.priority || 0));
   const deduped = domains.reduce((acc, domain) => {
-    if (!acc.find((d) => d.domainName === domain.domainName)) {
+    const key = domain.domainName ?? domain.domainId;
+    if (!acc.find((existing) => (existing.domainName ?? existing.domainId) === key)) {
       acc.push(domain);
     }
     return acc;

package/v2Components/CommonTestAndPreview/SendTestMessage.js

@@ -6,12 +6,13 @@ import CapButton from '@capillarytech/cap-ui-library/CapButton';
 import CapHeader from '@capillarytech/cap-ui-library/CapHeader';
 import CapStepsAccordian from '@capillarytech/cap-ui-library/CapStepsAccordian';
 import CapTreeSelect from '@capillarytech/cap-ui-library/CapTreeSelect';
+import CapSelect from '@capillarytech/cap-ui-library/CapSelect';
 import isEmpty from 'lodash/isEmpty';
 import messages from './messages';
 import DeliverySettings from './DeliverySettings';
 import { CHANNELS } from './constants';
 
-const CHANNELS_WITH_DELIVERY_SETTINGS = [CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP];
+const CHANNELS_WITH_DELIVERY_SETTINGS = [CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP, CHANNELS.RCS];
 
 const SendTestMessage = ({
   isFetchingTestCustomers,
@@ -28,12 +29,13 @@ const SendTestMessage = ({
   searchValue,
   setSearchValue,
   deliverySettings,
-  senderDetailsOptions,
+  senderDetailsByChannel = {},
   wecrmAccounts,
   onSaveDeliverySettings,
   isLoadingSenderDetails,
   smsTraiDltEnabled,
   registeredSenderIds,
+  isChannelSmsFallbackPreviewEnabled,
 }) => {
   const addCustomerContent = renderAddTestCustomerButton ? renderAddTestCustomerButton() : null;
   return (
@@ -77,13 +79,14 @@ const SendTestMessage = ({
                 <DeliverySettings
                   channel={channel}
                   deliverySettings={deliverySettings || {}}
-                  senderDetailsOptions={senderDetailsOptions}
+                  senderDetailsByChannel={senderDetailsByChannel}
                   wecrmAccounts={wecrmAccounts || []}
                   onSaveDeliverySettings={onSaveDeliverySettings}
                   isLoadingSenderDetails={isLoadingSenderDetails}
                   formatMessage={formatMessage}
                   smsTraiDltEnabled={smsTraiDltEnabled}
                   registeredSenderIds={registeredSenderIds}
+                  isChannelSmsFallbackPreviewEnabled={isChannelSmsFallbackPreviewEnabled}
                   whatsappAccountFromForm={
                     channel === CHANNELS.WHATSAPP && formData?.accountName
                       ? { accountName: formData.accountName }
@@ -121,12 +124,13 @@ SendTestMessage.propTypes = {
   searchValue: PropTypes.string,
   setSearchValue: PropTypes.func,
   deliverySettings: PropTypes.object,
-  senderDetailsOptions: PropTypes.array,
+  senderDetailsByChannel: PropTypes.object,
   wecrmAccounts: PropTypes.array,
   onSaveDeliverySettings: PropTypes.func,
   isLoadingSenderDetails: PropTypes.bool,
   smsTraiDltEnabled: PropTypes.bool,
   registeredSenderIds: PropTypes.array,
+  isChannelSmsFallbackPreviewEnabled: PropTypes.bool,
 };
 
 SendTestMessage.defaultProps = {
@@ -136,12 +140,13 @@ SendTestMessage.defaultProps = {
   searchValue: '',
   setSearchValue: () => {}, // no-op when not provided; required by TreeSelect when showSearch is true
   deliverySettings: {},
-  senderDetailsOptions: [],
+  senderDetailsByChannel: {},
   wecrmAccounts: [],
   onSaveDeliverySettings: undefined,
   isLoadingSenderDetails: false,
   smsTraiDltEnabled: false,
   registeredSenderIds: [],
+  isChannelSmsFallbackPreviewEnabled: false,
 };
 
 export default SendTestMessage;