@capillarytech/creatives-library 8.0.329 → 8.0.330

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

@@ -9,91 +9,29 @@
 
 import get from 'lodash/get';
 import { CHANNELS } from '../../constants';
-import { RCS_CONTACT_INFO_GSM_TYPE_KEYS } from '../constants';
 
-/** Match API contactInfo.type (some envs use different casing). */
-const typeMatches = (itemType, expectedKey) => {
-  if (!itemType || !expectedKey) return false;
-  const a = String(itemType).toLowerCase().replace(/-/g, '_');
-  const b = String(expectedKey).toLowerCase().replace(/-/g, '_');
-  return a === b;
-};
-
-/**
- * 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) => typeMatches(contactInfoItem.type, key) && contactInfoItem.valid !== false)
+    .filter((contactInfoItem) => contactInfoItem.type === key && contactInfoItem.valid)
     .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 merged = [];
-  RCS_CONTACT_INFO_GSM_TYPE_KEYS.forEach((key) => {
-    getSenderOptions(contactInfo, key).forEach((row) => {
-      const v = row?.value;
-      // Skip empty/whitespace — they still pass `v != null` for "" and pollute RCS sender dropdowns.
-      if (v == null || String(v).trim() === '' || seen.has(v)) return;
-      seen.add(v);
-      merged.push(row);
-    });
-  });
-  return merged.sort((a, b) => (a.default ? -1 : 0) - (b.default ? -1 : 0));
-};
-
-/**
- * Campaigns domainProperties may return { entity } or { result: { entity } } / { data: { entity } }.
- */
-function unwrapEntity(response) {
-  if (!response || typeof response !== 'object') return null;
-  if (response.entity != null) return response.entity;
-  const nested = get(response, 'result.entity') ?? get(response, 'data.entity');
-  if (nested != null) return nested;
-  if (response.entity === null) return null;
-  return response;
-}
-
 /**
  * Parse raw API response for one channel into { domains: [...] }
- * @param {string} channel - SMS | EMAIL | WHATSAPP | RCS
+ * @param {string} channel - SMS | EMAIL | WHATSAPP
  * @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 = unwrapEntity(response);
-  if (entity == null || entity === '') {
+  const entity = get(response, 'entity', response);
+  if (!entity) {
     return { domains: [] };
   }
 
-  // Normalize once: entity keys may be any casing (SMS/sms/rcs) but downstream branches use CHANNELS.* (uppercase).
-  const normalizedChannel =
-    channel == null || String(channel).trim() === ''
-      ? ''
-      : String(channel).trim().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);
-
+  // Single-channel API: entity may be { [channel]: [...] } or direct array
+  let channelSenderDetails = get(entity, channel, 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: [] };
   }
@@ -104,7 +42,6 @@ export function parseSenderDetailsResponse(channel, response) {
     const { id: dgmId, priority, domainProperties = {} } = element;
     const {
       domainName,
-      hostName,
       id = -1,
       contactInfo,
       connectionProperties: {
@@ -114,25 +51,21 @@ export function parseSenderDetailsResponse(channel, response) {
       } = {},
     } = domainProperties;
 
-    const resolvedDomainName = domainName || hostName;
-
     const domain = {
       dgmId,
-      domainName: resolvedDomainName,
+      domainName,
       domainId: id,
       priority: priority != null ? priority : 0,
     };
 
-    if ([CHANNELS.SMS, CHANNELS.WHATSAPP, CHANNELS.RCS].includes(normalizedChannel)) {
+    if ([CHANNELS.SMS, CHANNELS.WHATSAPP].includes(channel)) {
       domain.cdmaSenders = getSenderOptions(contactInfo, 'cdma_sender_id');
-      domain.gsmSenders = normalizedChannel === CHANNELS.RCS
-        ? getRcsLikeGsmSenders(contactInfo)
-        : getSenderOptions(contactInfo, 'gsm_sender_id');
+      domain.gsmSenders = getSenderOptions(contactInfo, 'gsm_sender_id');
       domain.sourceAccountIdentifier =
         sourceAccountIdentifier || wabaId || userid || '';
     }
 
-    if (normalizedChannel === CHANNELS.EMAIL) {
+    if (channel === CHANNELS.EMAIL) {
       domain.emailSenders = getSenderOptions(contactInfo, 'sender_id');
       domain.emailRepliers = getSenderOptions(contactInfo, 'reply_to_id');
     }
@@ -143,8 +76,7 @@ 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) => {
-    const key = domain.domainName ?? domain.domainId;
-    if (!acc.find((existing) => (existing.domainName ?? existing.domainId) === key)) {
+    if (!acc.find((d) => d.domainName === domain.domainName)) {
       acc.push(domain);
     }
     return acc;

package/v2Components/CommonTestAndPreview/SendTestMessage.js

@@ -6,13 +6,12 @@ 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, CHANNELS.RCS];
+const CHANNELS_WITH_DELIVERY_SETTINGS = [CHANNELS.SMS, CHANNELS.EMAIL, CHANNELS.WHATSAPP];
 
 const SendTestMessage = ({
   isFetchingTestCustomers,
@@ -25,89 +24,64 @@ const SendTestMessage = ({
   channel,
   isSendingTestMessage,
   formatMessage,
-  renderAddTestCustomerButton,
-  searchValue,
-  setSearchValue,
   deliverySettings,
-  senderDetailsByChannel = {},
+  senderDetailsOptions,
   wecrmAccounts,
   onSaveDeliverySettings,
   isLoadingSenderDetails,
   smsTraiDltEnabled,
   registeredSenderIds,
-  isChannelSmsFallbackPreviewEnabled,
-}) => {
-  const addCustomerContent = renderAddTestCustomerButton ? renderAddTestCustomerButton() : null;
-  return (
-    <CapStepsAccordian
-      showNumberSteps={false}
-      isChevronIcon
-      expandIconPosition="right"
-      items={[
-        {
-          header: (
-            <CapHeader
-              size="regular"
-              description={<FormattedMessage {...messages.testMessageDescription} />}
-              title={<FormattedMessage {...messages.sendTestMessage} />}
+}) => (
+  <CapStepsAccordian
+    showNumberSteps={false}
+    isChevronIcon
+    expandIconPosition="right"
+    items={[
+      {
+        header: <CapHeader
+          size="regular"
+          description={<FormattedMessage {...messages.testMessageDescription} />}
+          title={<FormattedMessage {...messages.sendTestMessage} />}
+        />,
+        content: (
+          <CapRow className="send-test-content">
+            <CapHeader size="label1" title={<FormattedMessage {...messages.testCustomers} />} />
+            <CapTreeSelect
+              className="test-customers-tree-select"
+              loading={isFetchingTestCustomers || isFetchingTestGroups}
+              treeData={testEntitiesTreeData}
+              onChange={handleTestEntitiesChange}
+              value={selectedTestEntities}
+              multiple
+              placeholder={formatMessage(messages.testCustomersPlaceholder)}
             />
-          ),
-          content: (
-            <CapRow className="send-test-content">
-              <CapHeader size="label1" title={<FormattedMessage {...messages.testCustomers} />} />
-              <CapTreeSelect
-                className="test-customers-tree-select"
-                dropdownMatchSelectWidth
-                dropdownClassName="test-customers-tree-select-dropdown"
-                listHeight={280}
-                loading={isFetchingTestCustomers || isFetchingTestGroups}
-                treeData={testEntitiesTreeData}
-                onChange={handleTestEntitiesChange}
-                value={selectedTestEntities}
-                showSearch
-                searchValue={searchValue}
-                onSearch={setSearchValue}
-                treeNodeFilterProp="title"
-                {...(addCustomerContent ? { notFoundContent: addCustomerContent } : {})}
-                multiple
-                placeholder={formatMessage(messages.testCustomersPlaceholder)}
-                dropdownStyle={{ zIndex: 900, maxHeight: 320 }}
-                placement="bottomLeft"
-                getPopupContainer={(node) => node.closest('.send-test-section') || document.body}
+            {CHANNELS_WITH_DELIVERY_SETTINGS.includes(channel) && (
+              <DeliverySettings
+                channel={channel}
+                deliverySettings={deliverySettings || {}}
+                senderDetailsOptions={senderDetailsOptions || []}
+                wecrmAccounts={wecrmAccounts || []}
+                onSaveDeliverySettings={onSaveDeliverySettings}
+                isLoadingSenderDetails={isLoadingSenderDetails}
+                formatMessage={formatMessage}
+                smsTraiDltEnabled={smsTraiDltEnabled}
+                registeredSenderIds={registeredSenderIds}
+                whatsappAccountFromForm={
+                  channel === CHANNELS.WHATSAPP && formData?.accountName
+                    ? { accountName: formData.accountName }
+                    : undefined
+                }
               />
-              {CHANNELS_WITH_DELIVERY_SETTINGS.includes(channel) && (
-                <DeliverySettings
-                  channel={channel}
-                  deliverySettings={deliverySettings || {}}
-                  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 }
-                      : undefined
-                  }
-                />
-              )}
-              <CapButton
-                onClick={handleSendTestMessage}
-                disabled={isEmpty(selectedTestEntities) || isSendingTestMessage}
-              >
-                <FormattedMessage {...messages.sendTestButton} />
-              </CapButton>
-            </CapRow>
-          ),
-          key: 1,
-        },
-      ]}
-    />
-  );
-};
+            )}
+            <CapButton onClick={handleSendTestMessage} disabled={isEmpty(selectedTestEntities) || isSendingTestMessage}>
+              <FormattedMessage {...messages.sendTestButton} />
+            </CapButton>
+          </CapRow>),
+        key: 1,
+      },
+    ]}
+  />
+);
 
 SendTestMessage.propTypes = {
   isFetchingTestCustomers: PropTypes.bool.isRequired,
@@ -120,33 +94,25 @@ SendTestMessage.propTypes = {
   channel: PropTypes.string,
   isSendingTestMessage: PropTypes.bool.isRequired,
   formatMessage: PropTypes.func.isRequired,
-  renderAddTestCustomerButton: PropTypes.func,
-  searchValue: PropTypes.string,
-  setSearchValue: PropTypes.func,
   deliverySettings: PropTypes.object,
-  senderDetailsByChannel: PropTypes.object,
+  senderDetailsOptions: PropTypes.array,
   wecrmAccounts: PropTypes.array,
   onSaveDeliverySettings: PropTypes.func,
   isLoadingSenderDetails: PropTypes.bool,
   smsTraiDltEnabled: PropTypes.bool,
   registeredSenderIds: PropTypes.array,
-  isChannelSmsFallbackPreviewEnabled: PropTypes.bool,
 };
 
 SendTestMessage.defaultProps = {
   formData: undefined,
   channel: undefined,
-  renderAddTestCustomerButton: undefined,
-  searchValue: '',
-  setSearchValue: () => {}, // no-op when not provided; required by TreeSelect when showSearch is true
   deliverySettings: {},
-  senderDetailsByChannel: {},
+  senderDetailsOptions: [],
   wecrmAccounts: [],
   onSaveDeliverySettings: undefined,
   isLoadingSenderDetails: false,
   smsTraiDltEnabled: false,
   registeredSenderIds: [],
-  isChannelSmsFallbackPreviewEnabled: false,
 };
 
 export default SendTestMessage;

package/v2Components/CommonTestAndPreview/UnifiedPreview/_unifiedPreview.scss

@@ -11,6 +11,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+    background: $CAP_WHITE;
     overflow: hidden;
   
     // Preview Chrome wrapper (matches old TestAndPreviewSlidebox design)
@@ -61,27 +62,7 @@
         }
       }
     }
-
-    .unified-preview.unified-preview-rcs-tabs {  
-      .ant-tabs-nav {
-        margin: 0;
-        padding: 0 $CAP_SPACE_16;
-      }
   
-      // Prevent white hover/active backgrounds from default antd styles
-      .ant-tabs-tab,
-      .ant-tabs-tab:hover,
-      .ant-tabs-tab-active {
-        background: transparent;
-      }
-  
-      .ant-tabs-tab-btn,
-      .ant-tabs-tab-btn:hover,
-      .ant-tabs-tab-btn:active {
-        background: transparent;
-      }
-    }
-
     // Preview Content Container
     .preview-content-container {
       flex: 1;

package/v2Components/CommonTestAndPreview/UnifiedPreview/index.js

@@ -21,21 +21,8 @@ import InAppPreviewContent from './InAppPreviewContent';
 import MobilePushPreviewContent from './MobilePushPreviewContent';
 import ViberPreviewContent from './ViberPreviewContent';
 import ZaloPreviewContent from './ZaloPreviewContent';
-import CapTab from '@capillarytech/cap-ui-library/CapTab';
-import {
-  CHANNELS,
-  DESKTOP,
-  TABLET,
-  MOBILE,
-  ANDROID,
-  IOS,
-  PREVIEW_TAB_RCS,
-  PREVIEW_TAB_SMS_FALLBACK,
-  PREVIEW_TAB_KEYS,
-  RCS_SMS_FALLBACK_VAR_MAPPED_PROP,
-} from '../constants';
+import { CHANNELS, DESKTOP, TABLET, MOBILE, ANDROID, IOS } from '../constants';
 import messages from '../messages';
-import { getFallbackResolvedContent } from '../../../utils/templateVarUtils';
 import './_unifiedPreview.scss';
 
 const UnifiedPreview = ({
@@ -51,24 +38,7 @@ const UnifiedPreview = ({
   lastModified,
   updatedByName,
   showHeader, // Default to true for Test and Preview flow, false for channel component previews
-  smsFallbackContent,
-  smsFallbackResolvedText,
-  activePreviewTab,
-  onPreviewTabChange,
 }) => {
-  const hasFallbackSmsTemplate = !!(smsFallbackContent?.templateContent || smsFallbackContent?.content);
-  const showRcsSmsFallbackTabs = channel === CHANNELS.RCS && hasFallbackSmsTemplate;
-  const rawFallbackTemplate = smsFallbackContent?.templateContent ?? smsFallbackContent?.content ?? '';
-  const rcsFallbackVarMapped = smsFallbackContent?.[RCS_SMS_FALLBACK_VAR_MAPPED_PROP] ?? {};
-  const hasRcsFallbackVarMapped = Object.keys(rcsFallbackVarMapped).length > 0;
-  // When no varmap is present, show raw template so {{tags}} remain visible in the preview.
-  // Only apply slot substitution when varmap entries exist or a resolved text is available.
-  const smsFallbackDisplayContent =
-    smsFallbackResolvedText != null && smsFallbackResolvedText !== ''
-      ? smsFallbackResolvedText
-      : hasRcsFallbackVarMapped
-        ? getFallbackResolvedContent(rawFallbackTemplate, rcsFallbackVarMapped)
-        : rawFallbackTemplate;
   /**
    * Render channel-specific preview content
    * For Phase 5, we'll render placeholders
@@ -154,21 +124,6 @@ const UnifiedPreview = ({
       case CHANNELS.RCS: {
         // RCS content is an object with rcsTitle, rcsDesc, rcsImageSrc, suggestions, etc.
         const rcsContent = typeof content === 'object' ? content : {};
-
-        if (showRcsSmsFallbackTabs && activePreviewTab === PREVIEW_TAB_SMS_FALLBACK) {
-          return (
-            <SmsPreviewContent
-              content={smsFallbackDisplayContent}
-              device={ANDROID}
-              isUpdating={isUpdating}
-              error={error}
-              formatMessage={formatMessage}
-              senderId={smsFallbackContent?.senderId}
-              showHeader={showHeader}
-            />
-          );
-        }
-
         return (
           <RcsPreviewContent
             content={rcsContent}
@@ -313,79 +268,6 @@ const UnifiedPreview = ({
    * PreviewHeader is shown only when showHeader is true (for Test and Preview flow)
    * Channel-specific content will be in separate files in future phases
    */
-  if (showRcsSmsFallbackTabs) {
-    const renderPane = ({ paneChannel, paneDevice, paneShowDeviceToggle, paneContent }) => (
-      <CapRow className="unified-preview-tab-pane">
-        {showHeader && (
-          <PreviewHeader
-            selectedCustomer={selectedCustomer}
-            device={paneDevice}
-            showDeviceToggle={paneShowDeviceToggle}
-            onDeviceChange={onDeviceChange}
-            channel={paneChannel}
-          />
-        )}
-
-        <CapRow className={`preview-content-container ${!showHeader ? 'preview-content-container-no-header' : ''}`}>
-          {paneContent}
-        </CapRow>
-
-       
-      </CapRow>
-    );
-
-    return (
-      <CapRow className="unified-preview unified-preview-rcs-tabs">
-        <CapTab
-          activeKey={activePreviewTab}
-          onChange={onPreviewTabChange}
-          panes={[
-            {
-              tab: formatMessage(messages.rcsTab),
-              key: PREVIEW_TAB_RCS,
-              content: renderPane({
-                paneChannel: CHANNELS.RCS,
-                paneDevice: device,
-                paneShowDeviceToggle: showDeviceToggle,
-                paneContent: (
-                  <RcsPreviewContent
-                    content={typeof content === 'object' ? content : {}}
-                    device={device}
-                    isUpdating={isUpdating}
-                    error={error}
-                    formatMessage={formatMessage}
-                    senderId={content?.senderId}
-                    showHeader={showHeader}
-                  />
-                ),
-              }),
-            },
-            {
-              tab: formatMessage(messages.smsFallbackTab),
-              key: PREVIEW_TAB_SMS_FALLBACK,
-              content: renderPane({
-                paneChannel: CHANNELS.SMS,
-                paneDevice: device,
-                paneShowDeviceToggle: showDeviceToggle,
-                paneContent: (
-                  <SmsPreviewContent
-                    content={smsFallbackDisplayContent}
-                    device={device}
-                    isUpdating={isUpdating}
-                    error={error}
-                    formatMessage={formatMessage}
-                    senderId={smsFallbackContent?.senderId}
-                    showHeader={showHeader}
-                  />
-                ),
-              }),
-            },
-          ]}
-        />
-      </CapRow>
-    );
-  }
-
   return (
     <CapRow className="unified-preview">
       {/* PreviewHeader - shown only in Test and Preview flow, hidden in channel component previews */}
@@ -423,7 +305,9 @@ const UnifiedPreview = ({
           )}
           {updatedByName && (
             <span className="metadata-item">
-              {formatMessage(messages.byAuthor, { name: updatedByName })}
+              {formatMessage(messages.by)}
+              {' '}
+              {updatedByName}
             </span>
           )}
         </CapRow>
@@ -464,15 +348,6 @@ UnifiedPreview.propTypes = {
 
   // Header display
   showHeader: PropTypes.bool, // Show PreviewHeader (true for Test and Preview flow, false for channel component previews)
-
-  // RCS: SMS fallback preview support (same shape as SmsFallback / RCS smsFallbackData)
-  smsFallbackContent: PropTypes.shape({
-    templateContent: PropTypes.string,
-    senderId: PropTypes.string,
-    templateName: PropTypes.string,
-  }),
-  activePreviewTab: PropTypes.oneOf(PREVIEW_TAB_KEYS),
-  onPreviewTabChange: PropTypes.func,
 };
 
 UnifiedPreview.defaultProps = {
@@ -485,10 +360,6 @@ UnifiedPreview.defaultProps = {
   lastModified: null,
   updatedByName: null,
   showHeader: true, // Default to true for Test and Preview flow
-  smsFallbackContent: null,
-  smsFallbackResolvedText: undefined,
-  activePreviewTab: PREVIEW_TAB_RCS,
-  onPreviewTabChange: () => {},
 };
 
 export default UnifiedPreview;