@capillarytech/creatives-library 9.0.56-alpha.0 → 9.0.56-alpha.2

package/package.json

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

package/services/api.js

@@ -713,6 +713,12 @@ export const editCommDefinition = (commDefinitionId, payload) => {
   return request(url, getAPICallObject('POST', payload, false, false, false, true));
 };
 
+// Sends a real transactional comm via CCS (notify/ui's "Send test" action uses this instead of the legacy createMessageMeta/sendTestMessage flow — see CommonTestAndPreview's handleSendTestMessage).
+export const sendTransactionalComm = (payload) => {
+  const url = `${API_ENDPOINT}/comm-definitions/send/transaction`;
+  return request(url, getAPICallObject('POST', payload, false, false, false, true));
+};
+
 export const getCentralCommsMetaIds = (metaIds, metaType = TRANSACTION) => {
   const url = `${API_ENDPOINT}/common/central-comms/meta-id/${metaType}?metaIds=${metaIds}`;
   return request(url, getAPICallObject('GET', null, false, false, false, true));

package/v2Components/CommonTestAndPreview/index.js

@@ -208,6 +208,8 @@ const CommonTestAndPreview = (props) => {
     wecrmAccounts = [],
     isLoadingSenderDetails = false,
     orgUnitId = -1,
+    // notify/ui only: { commDefinitionId, referenceId } — when present, "Send test" calls CCS's send/transaction endpoint directly instead of the legacy createMessageMeta/sendTestMessage flow.
+    ccsSendTransaction,
     // Email-specific props
     beeInstance,
     currentTab = 1,
@@ -231,6 +233,7 @@ const CommonTestAndPreview = (props) => {
   const [smsFallbackOptionalTags, setSmsFallbackOptionalTags] = useState([]);
   const [isExtractingSmsFallbackTags, setIsExtractingSmsFallbackTags] = useState(false);
   const [customValues, setCustomValues] = useState({});
+  const [isSendingCcsTest, setIsSendingCcsTest] = useState(false);
   const previewCustomValuesRef = useRef({});
   const [showJSON, setShowJSON] = useState(false);
   const [tagsExtracted, setTagsExtracted] = useState(false);
@@ -3625,7 +3628,52 @@ const CommonTestAndPreview = (props) => {
   /**
    * Handle send test message
    */
+  // notify/ui: send the test through CCS's own send/transaction endpoint against the alert's
+  // real CommDefinition, instead of the legacy createMessageMeta/sendTestMessage flow below.
+  const handleCcsSendTestMessage = async () => {
+    const allUserIds = [];
+    selectedTestEntities.forEach((entityId) => {
+      const group = testGroups.find((testGroup) => testEntityIdsEqual(testGroup.groupId, entityId));
+      if (group) {
+        allUserIds.push(...group.userIds);
+      } else {
+        allUserIds.push(entityId);
+      }
+    });
+    const uniqueUserIds = [...new Set(allUserIds)];
+    const { commDefinitionId, referenceId } = ccsSendTransaction;
+
+    setIsSendingCcsTest(true);
+    try {
+      const res = await Api.sendTransactionalComm({
+        ...(commDefinitionId ? { commDefinitionId } : { referenceId }),
+        uniqueKey: `test_${Date.now()}`,
+        isTest: true,
+        recipient: {
+          identifiers: uniqueUserIds.map((userId) => ({ type: 'USER_ID', value: String(userId) })),
+          tagValues: customValues,
+        },
+      });
+      if (res?.response?.success === false) {
+        throw new Error(res?.response?.errors?.[0]?.message || 'Failed to send test message');
+      }
+      CapNotification.success({
+        message: formatMessage(messages.testMessageSent),
+      });
+    } catch (error) {
+      CapNotification.error({
+        message: formatMessage(messages.testMessageFailed),
+      });
+    } finally {
+      setIsSendingCcsTest(false);
+    }
+  };
+
   const handleSendTestMessage = () => {
+    if (ccsSendTransaction) {
+      handleCcsSendTestMessage();
+      return;
+    }
     const allUserIds = [];
     selectedTestEntities.forEach((entityId) => {
       const group = testGroups.find((testGroup) => testEntityIdsEqual(testGroup.groupId, entityId));
@@ -3763,7 +3811,7 @@ const CommonTestAndPreview = (props) => {
       formData={formDataForSendTest}
       content={getCurrentContent}
       channel={channel}
-      isSendingTestMessage={isSendingTestMessage}
+      isSendingTestMessage={isSendingTestMessage || isSendingCcsTest}
       renderAddTestCustomerButton={renderAddTestCustomerButton}
       formatMessage={formatMessage}
       deliverySettings={testPreviewDeliverySettings[channel]}
@@ -3918,6 +3966,10 @@ CommonTestAndPreview.propTypes = {
   wecrmAccounts: PropTypes.array,
   isLoadingSenderDetails: PropTypes.bool,
   orgUnitId: PropTypes.number,
+  ccsSendTransaction: PropTypes.shape({
+    commDefinitionId: PropTypes.string,
+    referenceId: PropTypes.string,
+  }),
 
   // Email-specific props
   beeInstance: PropTypes.object,
@@ -3957,6 +4009,7 @@ CommonTestAndPreview.defaultProps = {
   wecrmAccounts: [],
   isLoadingSenderDetails: false,
   orgUnitId: -1,
+  ccsSendTransaction: null,
 };
 
 // ============================================

package/v2Components/TestAndPreviewSlidebox/index.js

@@ -108,6 +108,11 @@ TestAndPreviewSlidebox.propTypes = {
   wecrmAccounts: PropTypes.array,
   isLoadingSenderDetails: PropTypes.bool,
   orgUnitId: PropTypes.number,
+  /** notify/ui only — see CommonTestAndPreview's handleSendTestMessage. */
+  ccsSendTransaction: PropTypes.shape({
+    commDefinitionId: PropTypes.string,
+    referenceId: PropTypes.string,
+  }),
 };
 
 TestAndPreviewSlidebox.defaultProps = {
@@ -125,6 +130,7 @@ TestAndPreviewSlidebox.defaultProps = {
   isLoadingSenderDetails: false,
   orgUnitId: -1,
   smsFallbackContent: null,
+  ccsSendTransaction: null,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/CommunicationFlow/CommunicationFlow.js

@@ -70,18 +70,6 @@ const hasDeliverySettingForChannel = (channelSetting, channel) => {
 // createCommDefinition resolves with the CCS error envelope for 4xx/5xx responses (see api.js request()/checkStatus); duplicate referenceId within the org returns a 409.
 const isDuplicateReferenceIdError = (res) => res?.success === false && res?.status?.message === 'REFERENCE_ID_EXISTS';
 
-/**
- * CCS requires referenceId on create, while consumers require only the Alert/comm name; generate a stable fallback from the name when referenceId is omitted instead of failing the save.
- */
-const buildCcsReferenceId = (name) => {
-  const slug = (name || 'COMM')
-    .trim()
-    .toUpperCase()
-    .replace(/[^A-Z0-9]+/g, '_')
-    .replace(/^_+|_+$/g, '') || 'COMM';
-  return `${slug}_${Date.now()}`;
-};
-
 const CommunicationFlow = ({
   config,
   initialData,
@@ -192,12 +180,15 @@ const CommunicationFlow = ({
         const contentPayload = contentTransform ? contentTransform(contentItem.templateData) : contentItem.templateData;
         const { dynamicControls = {} } = aggregatedData;
         const channelSettings = aggregatedData.deliverySetting?.channelSetting?.[channel] || {};
-        const referenceId = config?.context?.referenceId || buildCcsReferenceId(name);
+        // referenceId/description are user-editable, optional fields (up until Send for
+        // approval) — sent as '' rather than auto-generated/omitted when left blank.
+        const referenceId = config?.context?.referenceId || '';
+        const description = config?.context?.description || '';
 
         const payload = {
           referenceId,
           name,
-          description: config?.context?.description || undefined,
+          description,
           strategyType: CCS_STRATEGY_TYPE_SINGLE,
           settings: {
             additionalSettings: {
@@ -224,6 +215,8 @@ const CommunicationFlow = ({
         try {
           const res = existingCommDefinitionId
             ? await editCommDefinition(existingCommDefinitionId, {
+              referenceId: payload.referenceId,
+              description: payload.description,
               strategyType: payload.strategyType,
               settings: payload.settings,
               singleChannelStrategy: payload.singleChannelStrategy,
@@ -328,6 +321,8 @@ const CommunicationFlow = ({
               onChange={(data) => handleStepChange(step, data)}
               channelsToHide={contentTemplateData.channelsToHide}
               channelsToDisable={contentTemplateData.channelsToDisable}
+              disablePreviewAndTest={!!contentTemplateData.disablePreviewAndTest}
+              autoOpenExistingContent={!!contentTemplateData.autoOpenExistingContent}
               creativesMode={config.mode || 'create'}
               selectedOfferDetails={stepData.selectedOfferDetails}
               incentivesData={{
@@ -415,6 +410,8 @@ CommunicationFlow.propTypes = {
       contentTemplateData: PropTypes.shape({
         required: PropTypes.bool,
         channels: PropTypes.object,
+        disablePreviewAndTest: PropTypes.bool,
+        autoOpenExistingContent: PropTypes.bool,
       }),
       enableIncentives: PropTypes.bool,
       enableDeliverySettings: PropTypes.bool,

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

@@ -613,10 +613,7 @@ describe('handleSave — CCS flow', () => {
     );
   });
 
-  it('generates a referenceId from name when config.context.referenceId is absent', async () => {
-    // moduleMocks.js spies on Date.now globally, but this config's resetMocks:true
-    // clears that return value before every test — set it explicitly here.
-    jest.spyOn(Date, 'now').mockReturnValue(1612267539410);
+  it('sends an empty referenceId/description when config.context does not supply them', async () => {
     renderWithFlow({
       features: {},
       config: ccsConfig,
@@ -627,7 +624,8 @@ describe('handleSave — CCS flow', () => {
 
     await waitFor(() => expect(createCommDefinition).toHaveBeenCalled());
     const payload = createCommDefinition.mock.calls[0][0];
-    expect(payload.referenceId).toBe('ORDER_PLACED_NOTIFICATION_1612267539410');
+    expect(payload.referenceId).toBe('');
+    expect(payload.description).toBe('');
   });
 
   it('uses config.context.referenceId and description when provided', async () => {
@@ -820,7 +818,7 @@ describe('handleSave — CCS flow', () => {
       features: {},
       config: {
         ...ccsConfig,
-        context: { ...ccsConfig.context, referenceId: 'ORDER_PLACED', existingCommDefinitionId: 'cd_existing_1' },
+        context: { ...ccsConfig.context, referenceId: 'ORDER_PLACED', description: 'desc', existingCommDefinitionId: 'cd_existing_1' },
       },
       initialData: { contentItems: [{ channel: 'SMS', templateData: {} }] },
       onSave,
@@ -832,6 +830,8 @@ describe('handleSave — CCS flow', () => {
     expect(editCommDefinition).toHaveBeenCalledWith(
       'cd_existing_1',
       expect.objectContaining({
+        referenceId: 'ORDER_PLACED',
+        description: 'desc',
         strategyType: 'SINGLE',
         settings: expect.anything(),
         singleChannelStrategy: expect.anything(),

package/v2Containers/CommunicationFlow/steps/ChannelSelectionStep/ChannelSelectionStep.js

@@ -4,7 +4,9 @@
  * Content template selection with channel dropdown
  */
 
-import React, { useState, useCallback, useMemo } from 'react';
+import React, {
+  useState, useCallback, useMemo, useEffect, useRef,
+} from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 import CapButton from '@capillarytech/cap-ui-library/CapButton';
@@ -45,6 +47,8 @@ const ChannelSelectionStep = ({
   onChange,
   channelsToHide = [],
   channelsToDisable = [],
+  disablePreviewAndTest = false,
+  autoOpenExistingContent = false,
   creativesMode = 'create',
   selectedOfferDetails = [],
   incentivesData,
@@ -117,6 +121,21 @@ const ChannelSelectionStep = ({
     }
   }, [contentItems]);
 
+  // Editing an existing single-channel alert (e.g. CapNotify's rejected-alert edit page) should
+  // land straight in that channel's template editor, not the one-card content list — there's
+  // only ever one item under the SINGLE strategy, so the list is just an extra click. Runs once
+  // on mount only; the ref guard keeps a later content-item change (e.g. after closing/re-saving)
+  // from re-triggering the auto-open.
+  const hasAutoOpenedRef = useRef(false);
+  useEffect(() => {
+    if (hasAutoOpenedRef.current) return;
+    hasAutoOpenedRef.current = true;
+    if (autoOpenExistingContent && contentItems.length > 0) {
+      handleEditContent(contentItems[0].contentId);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const handleDeleteContent = useCallback((contentId) => {
     onChange({ contentItems: contentItems.filter((c) => c.contentId !== contentId) });
   }, [contentItems, onChange]);
@@ -358,7 +377,7 @@ const ChannelSelectionStep = ({
               >
                  {formatMessage(messages.edit)}
               </CapMenu.Item>
-              {!PREVIEW_TEST_UNSUPPORTED_CHANNELS.includes(item?.channel?.toUpperCase()) && (
+              {!disablePreviewAndTest && !PREVIEW_TEST_UNSUPPORTED_CHANNELS.includes(item?.channel?.toUpperCase()) && (
                 <CapMenu.Item
                   id="preview-menu-item"
                   className="ant-dropdown-menu-item"
@@ -551,6 +570,8 @@ ChannelSelectionStep.propTypes = {
   onChange: PropTypes.func.isRequired,
   channelsToHide: PropTypes.array,
   channelsToDisable: PropTypes.array,
+  disablePreviewAndTest: PropTypes.bool,
+  autoOpenExistingContent: PropTypes.bool,
   creativesMode: PropTypes.oneOf(['create', 'edit', 'preview']),
   selectedOfferDetails: PropTypes.array,
   incentivesData: PropTypes.shape({
@@ -572,6 +593,8 @@ ChannelSelectionStep.defaultProps = {
   error: null,
   channelsToHide: [],
   channelsToDisable: [],
+  disablePreviewAndTest: false,
+  autoOpenExistingContent: false,
   creativesMode: 'create',
   selectedOfferDetails: [],
   incentivesData: null,