npm - @capillarytech/creatives-library - Versions diffs - 9.0.54-alpha.1 → 9.0.54-alpha.3 - Mend

@capillarytech/creatives-library 9.0.54-alpha.1 → 9.0.54-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "9.0.54-alpha.1",
+  "version": "9.0.54-alpha.3",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/CommunicationFlow/CommunicationFlow.js CHANGED Viewed

@@ -215,8 +215,12 @@ const CommunicationFlow = ({
           singleChannelStrategy: {
             variant: {
               channel,
-              ...(contentKey && { [contentKey]: { channel, ...contentPayload } }),
-              ...(deliveryKey && { [deliveryKey]: { channelSettings: { channel, ...channelSettings } } }),
+              // `channel` spreads LAST in both objects below — contentItem.templateData
+              // (e.g. mobile push) carries the UI's own internal channel identifier
+              // (MOBILEPUSH), which must never win over CCS's normalized enum value
+              // (PUSH) once spread order puts it after.
+              ...(contentKey && { [contentKey]: { ...contentPayload, channel } }),
+              ...(deliveryKey && { [deliveryKey]: { channelSettings: { ...channelSettings, channel } } }),
             },
           },
         };

package/v2Containers/CommunicationFlow/CommunicationFlowCard.js CHANGED Viewed

@@ -42,7 +42,7 @@ const resolveValue = (val) => {
 const SENDER_ID_RESOLVERS = {
   [SMS]: (setting) => resolveValue(setting?.gsmSenderId),
-  [EMAIL]: (setting) => resolveValue(setting?.senderEmail),
+  [EMAIL]: (setting) => resolveValue(setting?.senderId),
   [VIBER]: (setting) => resolveValue(setting?.sender) || resolveValue(setting?.gsmSenderId),
   [WHATSAPP]: (setting) => resolveValue(setting?.senderMobNum),
   [RCS]: (setting) => resolveValue(setting?.senderMobNum) || resolveValue(setting?.rcsSender),

package/v2Containers/CommunicationFlow/Tests/CommunicationFlow.test.js CHANGED Viewed

@@ -407,7 +407,7 @@ describe('handleSave — CCS flow', () => {
       initialData: {
         contentItems: [{
           channel: 'EMAIL',
-          templateData: { emailSubject: 'Order Confirmed', messageBody: '<html>Hi</html>' },
+          templateData: { emailSubject: 'Order Confirmed', emailBody: '<html>Hi</html>' },
         }],
       },
       onSave,
@@ -432,13 +432,67 @@ describe('handleSave — CCS flow', () => {
     );
   });
-  it('normalizes the internal MOBILEPUSH channel to CCS\'s PUSH enum (keys stay mpush*)', async () => {
+  it('transforms WEBPUSH content from the legacy editor\'s messageContent.content wrapping to CCS\'s flat shape', async () => {
     const onSave = jest.fn();
+    const cta = { type: 'SITE_URL', actionLink: 'https://example.com' };
+    const expandableDetails = { media: [{ url: 'https://example.com/banner.png', type: 'IMAGE' }], ctas: [] };
     renderWithFlow({
       features: {},
       config: ccsConfig,
       initialData: {
-        contentItems: [{ channel: 'MOBILEPUSH', templateData: { messageSubject: 'Hi' } }],
+        contentItems: [{
+          channel: 'WEBPUSH',
+          templateData: {
+            messageContent: {
+              content: {
+                channel: 'WEBPUSH',
+                accountId: 13792,
+                content: { title: 'Hi', message: 'Body', iconImageUrl: 'https://example.com/icon.png', cta, expandableDetails },
+                messageSubject: 'Subject',
+                offers: [],
+              },
+            },
+          },
+        }],
+      },
+      onSave,
+    });
+    await userEvent.click(screen.getByRole('button', { name: /^save$/i }));
+    await waitFor(() => expect(createCommDefinition).toHaveBeenCalledTimes(1));
+    expect(createCommDefinition).toHaveBeenCalledWith(
+      expect.objectContaining({
+        singleChannelStrategy: expect.objectContaining({
+          variant: expect.objectContaining({
+            channel: 'WEBPUSH',
+            webPushMessageContent: {
+              channel: 'WEBPUSH',
+              messageSubject: 'Subject',
+              accountId: 13792,
+              content: { title: 'Hi', message: 'Body', iconImageUrl: 'https://example.com/icon.png', cta, expandableDetails },
+            },
+          }),
+        }),
+      }),
+    );
+  });
+  it('normalizes the internal MOBILEPUSH channel to CCS\'s PUSH enum (keys stay mpush*), even when templateData/channelSetting carry their own stray channel field', async () => {
+    const onSave = jest.fn();
+    renderWithFlow({
+      features: {},
+      config: ccsConfig,
+      initialData: {
+        // `channel: 'MOBILEPUSH'` inline on templateData reproduces the real
+        // production bug: contentItem.templateData carries the UI's own
+        // internal channel identifier, which must not win over the
+        // normalized 'PUSH' enum once spread into mpushMessageContent.
+        contentItems: [{ channel: 'MOBILEPUSH', templateData: { channel: 'MOBILEPUSH', messageSubject: 'Hi' } }],
+        // Likewise, deliverySetting.channelSetting.PUSH carrying its own
+        // stray `channel` key must not win over the normalized value once
+        // spread into mpushDeliverySettings.channelSettings.
+        deliverySetting: { channelSetting: { PUSH: { channel: 'MOBILEPUSH', domainId: 2002 } } },
       },
       onSave,
     });
@@ -452,6 +506,9 @@ describe('handleSave — CCS flow', () => {
           variant: expect.objectContaining({
             channel: 'PUSH',
             mpushMessageContent: { channel: 'PUSH', messageSubject: 'Hi' },
+            mpushDeliverySettings: {
+              channelSettings: { channel: 'PUSH', domainId: 2002 },
+            },
           }),
         }),
       }),

package/v2Containers/CommunicationFlow/Tests/CommunicationFlowCard.test.js CHANGED Viewed

@@ -247,11 +247,11 @@ describe('CommunicationFlowCard', () => {
       expect(screen.getByText(/Sender ID/)).toBeInTheDocument();
     });
-    it('shows senderEmail for EMAIL with Sender ID label', () => {
+    it('shows senderId for EMAIL with Sender ID label', () => {
       renderCard({
         initialData: makeSavedData({
           contentItems: [{ channel: 'EMAIL', templateData: {} }],
-          deliverySetting: { channelSetting: { EMAIL: { senderEmail: 'test@example.com' } } },
+          deliverySetting: { channelSetting: { EMAIL: { senderId: 'test@example.com' } } },
         }),
       });
       expect(screen.getByText(/test@example.com/)).toBeInTheDocument();

package/v2Containers/CommunicationFlow/constants.js CHANGED Viewed

@@ -68,15 +68,29 @@ export const CCS_CHANNEL_CONTENT_KEY_MAP = {
 // editor (messageMeta-oriented field names) — for channels whose legacy field
 // names don't match CCS's own content schema, transform before sending rather
 // than dumping templateData as-is. EMAIL: legacy stores the subject as
-// `emailSubject` (see getContentBody.js), CCS expects `messageSubject`;
-// `messageBody` already matches CCS's name by coincidence. Channels absent
-// here are passed through unchanged (their legacy/CCS field names already
-// align, e.g. SMS's `message`/`messageBody`).
+// `emailSubject` and the HTML body as `emailBody` (see
+// extractContentForPreview.js and CreativesContainer/index.js, where the Bee
+// editor's output is written back into templateData.emailBody — also
+// mirrored by the existing legacy emailMessageContent builder in
+// utils/transformerUtils.js). CCS expects `messageSubject`/`messageBody`.
 export const CCS_CONTENT_TRANSFORMS = {
   EMAIL: (templateData = {}) => ({
     messageSubject: templateData.emailSubject,
-    messageBody: templateData.messageBody,
+    messageBody: templateData.emailBody || templateData.emailHtml,
   }),
+  // WEBPUSH: the legacy editor nests the real data under
+  // messageContent.content (see CommunicationFlowCard.js's own comment on
+  // this same wrapping, for the edit-mode case) — extracting it flat here
+  // matches CCS's shape ({ messageSubject, accountId, content }); `offers`
+  // (a legacy-only field) is deliberately dropped, not part of CCS's schema.
+  WEBPUSH: (templateData = {}) => {
+    const inner = templateData.messageContent?.content || templateData;
+    return {
+      messageSubject: inner.messageSubject,
+      accountId: inner.accountId,
+      content: inner.content,
+    };
+  },
 };
 export const CCS_CHANNEL_DELIVERY_KEY_MAP = {
@@ -298,4 +312,4 @@ export const INCENTIVE_TYPES = [
   {
     value: 'badges', label: <FormattedMessage {...messages.badges} />, isActive: false, disabled: false,
   },
-];
+];

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/SenderDetails.js CHANGED Viewed

@@ -29,6 +29,7 @@ import {
   getEmailDefaultsForDomainId,
   getSmsDefaultsForDomainId,
   getRcsAccountName,
+  getEmailDomainGatewayMapIdByDomainId,
 } from './deliverySettingsConfig';
 import messages from '../../messages';
 import './SenderDetails.scss';
@@ -151,6 +152,11 @@ const SenderDetails = ({
           saveValues.whatsappDomainId = matchedDomain?.domainProperties?.id ?? matchedDomain?.domainId ?? matchedDomain?.id;
         }
       }
+      // Include EMAIL domainGatewayMapId derived from the selected domain for persistence -
+      // CCS needs it alongside domainId, but it's not a user-facing field.
+      if (entity && fieldValues.emailDomain != null && fieldValues.emailDomain !== '') {
+        saveValues.emailDomainGatewayMapId = getEmailDomainGatewayMapIdByDomainId(entity, fieldValues.emailDomain);
+      }
       onSave(saveValues);
     }
     onClose();

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/Tests/SenderDetails.test.js CHANGED Viewed

@@ -83,6 +83,7 @@ const ENTITIES = {
   emailTwoDomains: {
     EMAIL: [
       {
+        id: 'gwmap-a',
         domainProperties: {
           id: 'em-a',
           domainName: 'Mail Alpha',
@@ -101,6 +102,7 @@ const ENTITIES = {
         },
       },
       {
+        id: 'gwmap-b',
         domainProperties: {
           id: 'em-b',
           domainName: 'Mail Beta',
@@ -322,6 +324,29 @@ describe('SenderDetails', () => {
     });
   });
+  it('persists emailDomainGatewayMapId derived from the selected email domain on save', async () => {
+    const { onSave } = renderSenderDetails({
+      channels: ['EMAIL'],
+      preloadedDomainProperties: ENTITIES.emailTwoDomains,
+    });
+    const root = document.querySelector('.sender-details');
+    await waitFor(() => expect(within(root).getByText('Mail Alpha')).toBeInTheDocument());
+    await openSelectAndChoose(root, 0, 'Mail Beta');
+    await waitFor(() => expect(within(root).getByText('beta@other.com')).toBeInTheDocument());
+    const saveBtn = within(root).getByRole('button', { name: /save changes/i });
+    await waitFor(() => expect(saveBtn).not.toBeDisabled());
+    fireEvent.click(saveBtn);
+    expect(onSave).toHaveBeenCalledWith(
+      expect.objectContaining({
+        emailDomain: 'em-b',
+        emailDomainGatewayMapId: 'gwmap-b',
+      }),
+    );
+  });
   it('resets email domain row back to the first gateway', async () => {
     renderSenderDetails({
       channels: ['EMAIL'],

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/Tests/deliverySettingsConfig.test.js CHANGED Viewed

@@ -438,6 +438,7 @@ describe('deliverySettingsConfig — user-facing flows', () => {
         smsDomain: 'd1',
         smsSenderId: 'g1',
         emailDomain: 'ed',
+        emailDomainGatewayMapId: 'gwmap-1',
         emailSenderId: 'mail@x.com',
         emailSenderName: 'N',
         emailReplyToId: 'r@x.com',
@@ -455,9 +456,10 @@ describe('deliverySettingsConfig — user-facing flows', () => {
         SMS: { domainId: 'd1', gsmSenderId: 'g1' },
         EMAIL: {
           domainId: 'ed',
-          senderEmail: 'mail@x.com',
+          domainGatewayMapId: 'gwmap-1',
+          senderId: 'mail@x.com',
           senderLabel: 'N',
-          senderReplyTo: 'r@x.com',
+          replyToId: 'r@x.com',
         },
         WHATSAPP: { domainId: 'wd', senderMobNum: '+w' },
         RCS: { senderMobNum: '+r', rcsSender: '+r' },
@@ -472,9 +474,10 @@ describe('deliverySettingsConfig — user-facing flows', () => {
         SMS: { domainId: 'd', gsmSenderId: 'g' },
         EMAIL: {
           domainId: 'ed',
-          senderEmail: 'e@e.com',
+          domainGatewayMapId: 'gwmap-2',
+          senderId: 'e@e.com',
           senderLabel: 'L',
-          senderReplyTo: 'r@e.com',
+          replyToId: 'r@e.com',
         },
         WHATSAPP: { senderMobNum: '+w', domainId: 'wid' },
         RCS: { rcsSender: '+r' },
@@ -486,6 +489,10 @@ describe('deliverySettingsConfig — user-facing flows', () => {
         smsDomain: 'd',
         smsSenderId: 'g',
         emailDomain: 'ed',
+        emailDomainGatewayMapId: 'gwmap-2',
+        emailSenderId: 'e@e.com',
+        emailSenderName: 'L',
+        emailReplyToId: 'r@e.com',
         whatsappDomainId: 'wid',
         viberSenderId: 'vx',
       });

package/v2Containers/CommunicationFlow/steps/DeliverySettingsStep/deliverySettingsConfig.js CHANGED Viewed

@@ -181,6 +181,14 @@ const getEmailDomainValue = (entity) => {
   return emailData.domainProperties?.id ?? emailData.domainId ?? emailData.id ?? '';
 };
+// CCS's domainGatewayMapId is the domainProperties API's own outer `id`
+// (distinct from `domainProperties.id`, which is the numeric domainId) - the
+// domain-gateway-mapping id for the selected domain entry.
+const getEmailDomainGatewayMapIdByDomainId = (entity, domainId) => {
+  const domainEntry = getEmailDomainById(entity, domainId);
+  return domainEntry?.id ?? '';
+};
 /** Domain name for summary display (parseEntityForDisplay) */
 const getEmailDomainNameForDisplay = (entity) => {
   const emailData = getEmailData(entity);
@@ -262,6 +270,8 @@ const getEmailDefaultsForDomain = (domainData) => {
  * context.fieldValues has current form state (e.g. selected emailDomain)
  * Aligned with adiona-ui/cap-campaigns-v2: default = contactInfo item with default:true, or first
  */
+export { getEmailDomainGatewayMapIdByDomainId };
 export const getDefaultValueForField = (fieldKey, entity, context = {}) => {
   if (!entity) return '';
   const fieldValues = context?.fieldValues || {};
@@ -574,7 +584,11 @@ export const parseEntityForDisplay = (entity, context = {}) => {
     senderDetails: entity,
     smsSenderId: getSmsSenderIdValue(entity),
     smsDomain: getSmsDomainValue(entity),
+    // emailDomain here is the domain NAME (for display only) - buildChannelSettingFromFieldValues
+    // needs the numeric domainId/domainGatewayMapId, sourced separately below.
     emailDomain: getEmailDomainNameForDisplay(entity),
+    emailDomainId: getEmailDomainValue(entity),
+    emailDomainGatewayMapId: getEmailDomainGatewayMapIdByDomainId(entity, getEmailDomainValue(entity)),
     emailSenderId: getEmailSenderIdValue(entity),
     viberSenderId: getSenderIdFromContactInfo(entity, 'VIBER'),
     zaloSenderId: getSenderIdFromContactInfo(entity, 'ZALO'),
@@ -600,10 +614,14 @@ export const buildChannelSettingFromFieldValues = (fieldValues = {}) => {
   }
   if (fieldValues.emailDomain != null || fieldValues.emailSenderId != null || fieldValues.emailSenderName != null || fieldValues.emailReplyToId != null) {
     channelSetting.EMAIL = {
-      domainId: fieldValues.emailDomain,
-      senderEmail: fieldValues.emailSenderId,
+      // emailDomainId (numeric, from the auto-save-defaults path via parseEntityForDisplay)
+      // takes priority over emailDomain, which is numeric when sourced from SenderDetails'
+      // own field state but a display NAME string when sourced from parseEntityForDisplay.
+      domainId: fieldValues.emailDomainId ?? fieldValues.emailDomain,
+      domainGatewayMapId: fieldValues.emailDomainGatewayMapId,
+      senderId: fieldValues.emailSenderId,
       senderLabel: fieldValues.emailSenderName,
-      senderReplyTo: fieldValues.emailReplyToId,
+      replyToId: fieldValues.emailReplyToId,
     };
   }
   if (fieldValues.whatsappSenderNumber != null || fieldValues.whatsappAccount != null) {
@@ -673,9 +691,10 @@ export const parseChannelSettingForDisplay = (channelSetting = {}) => {
   }
   if (channelSetting.EMAIL) {
     out.emailDomain = channelSetting.EMAIL.domainId;
-    out.emailSenderId = channelSetting.EMAIL.senderEmail;
+    out.emailDomainGatewayMapId = channelSetting.EMAIL.domainGatewayMapId;
+    out.emailSenderId = channelSetting.EMAIL.senderId;
     out.emailSenderName = channelSetting.EMAIL.senderLabel;
-    out.emailReplyToId = channelSetting.EMAIL.senderReplyTo;
+    out.emailReplyToId = channelSetting.EMAIL.replyToId;
   }
   if (channelSetting.WHATSAPP) {
     out.whatsappSenderNumber = channelSetting.WHATSAPP.senderMobNum;