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

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

@@ -108,22 +108,6 @@ describe('CommunicationFlowCard', () => {
       fireEvent.click(screen.getByText('Add creatives'));
       expect(screen.getByTestId('comm-flow-mock')).toHaveAttribute('data-mode', 'create');
     });
-
-    it('disables the Add creatives button when disabled prop is true', () => {
-      renderCard({ disabled: true, disabledTooltip: 'Enter an Alert name to add content' });
-      expect(screen.getByText('Add creatives').closest('button')).toBeDisabled();
-    });
-
-    it('does not open SlideBox when Add creatives is clicked while disabled', () => {
-      renderCard({ disabled: true, disabledTooltip: 'Enter an Alert name to add content' });
-      fireEvent.click(screen.getByText('Add creatives'));
-      expect(screen.queryByTestId('slide-box')).not.toBeInTheDocument();
-    });
-
-    it('Add creatives button is enabled by default (disabled prop absent)', () => {
-      renderCard();
-      expect(screen.getByText('Add creatives').closest('button')).not.toBeDisabled();
-    });
   });
 
   describe('configured state (initialData provided)', () => {

package/v2Containers/CommunicationFlow/constants.js

@@ -38,46 +38,6 @@ export const CHANNEL_PRIORITY = 'CHANNEL_PRIORITY';
 export const AB_TEST = 'AB_TEST';
 export const SINGLE_TEMPLATE = 'SINGLE_TEMPLATE';
 
-// CCS CommDefinition strategyType — distinct from SINGLE_TEMPLATE above, which
-// is this UI's own communicationStrategy value. Only SINGLE is supported this
-// phase; CCS create is skipped entirely for CHANNEL_PRIORITY/AB_TEST.
-export const CCS_STRATEGY_TYPE_SINGLE = 'SINGLE';
-
-// Mirrors CCS's SingleChannelStrategy field names exactly (Cap Notify API
-// Design doc, "Channel Strategy overview" / class dump). Kept separate from
-// CHANNEL_CONTENT_KEY_MAP/CHANNEL_DELIVERY_KEY_MAP below, which are the legacy
-// messageMeta payload's keys and do not match CCS naming for every channel
-// (e.g. legacy uses lowercase 'mpushMessageContent'; CCS uses 'mPushMessageContent').
-export const CCS_CHANNEL_CONTENT_KEY_MAP = {
-  SMS: 'smsMessageContent',
-  EMAIL: 'emailMessageContent',
-  WHATSAPP: 'whatsappMessageContent',
-  MPUSH: 'mPushMessageContent',
-  INAPP: 'inAppMessageContent',
-  ANDROID: 'androidMessageContent',
-  IOS: 'iosMessageContent',
-  ZALO: 'zaloMessageContent',
-  VIBER: 'viberMessageContent',
-  LINE: 'lineMessageContent',
-  WEBPUSH: 'webPushMessageContent',
-  RCS: 'rcsMessageContent',
-};
-
-export const CCS_CHANNEL_DELIVERY_KEY_MAP = {
-  SMS: 'smsDeliverySettings',
-  EMAIL: 'emailDeliverySettings',
-  WHATSAPP: 'whatsappDeliverySettings',
-  MPUSH: 'mPushDeliverySettings',
-  INAPP: 'inAppDeliverySettings',
-  ANDROID: 'androidDeliverySettings',
-  IOS: 'iosDeliverySettings',
-  ZALO: 'zaloDeliverySettings',
-  VIBER: 'viberDeliverySettings',
-  LINE: 'lineDeliverySettings',
-  WEBPUSH: 'webPushDeliverySettings',
-  RCS: 'rcsDeliverySettings',
-};
-
 // Channel config - single source of truth for CreativesContainer and TemplatesV2
 // paneKey: TemplatesV2 defaultPanes object key (for channelsToHide)
 // channelProp: CreativesContainer channel prop (must match pane.key for tab to be active)

package/v2Containers/CommunicationFlow/index.js

@@ -9,6 +9,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import CommunicationFlow from './CommunicationFlow';
+import { hasSupportEngagementModule } from '../../utils/common';
 
 const CommunicationFlowContainer = ({
   config,
@@ -17,16 +18,22 @@ const CommunicationFlowContainer = ({
   onCancel,
   onChange,
   ...otherProps
-}) => (
-  <CommunicationFlow
-    config={config}
-    initialData={initialData}
-    onSave={onSave}
-    onCancel={onCancel}
-    onChange={onChange}
-    {...otherProps}
-  />
-);
+}) => {
+  if (!hasSupportEngagementModule()) {
+    return null;
+  }
+
+  return (
+    <CommunicationFlow
+      config={config}
+      initialData={initialData}
+      onSave={onSave}
+      onCancel={onCancel}
+      onChange={onChange}
+      {...otherProps}
+    />
+  );
+};
 
 CommunicationFlowContainer.propTypes = {
   config: PropTypes.shape({
@@ -80,13 +87,11 @@ CommunicationFlowContainer.propTypes = {
         controls: PropTypes.array,
       }),
     }),
-    context: PropTypes.object, // ouId, campaignId, programId; name (required for CCS create),
-    // referenceId (optional, auto-generated from name if absent), description (optional).
-    useCCS: PropTypes.bool, // If false, skips the CCS createCommDefinition call on save. Defaults to true.
+    context: PropTypes.object, // ouId, campaignId, programId, etc.
+    useCCS: PropTypes.bool, // If false, skips CCS bulk-claim-approve on save. Defaults to true.
   }).isRequired,
   initialData: PropTypes.object, // for edit/preview mode
-  onSave: PropTypes.func.isRequired, // (data) => void - called when user saves; data.ccsCommDefinition
-  // ({id, referenceId, version, status}) is present when the CCS create succeeded
+  onSave: PropTypes.func.isRequired, // (data) => void - called when user saves
   onCancel: PropTypes.func.isRequired, // () => void - called when user cancels
   onChange: PropTypes.func, // (data) => void - optional, called on data changes
 };

package/v2Containers/CommunicationFlow/messages.js

@@ -363,8 +363,4 @@ export default {
     id: `${prefix}.senderNotConfiguredError`,
     defaultMessage: 'Selected domain gateway id is not correct. Please change the domain id or contact the gateway team to register them with Capillary.',
   },
-  duplicateReferenceIdError: {
-    id: `${prefix}.duplicateReferenceIdError`,
-    defaultMessage: 'This reference ID is already in use in your organization. Please use a different reference ID.',
-  },
 };

package/v2Containers/CreativesContainer/index.js

@@ -1450,15 +1450,10 @@ export class Creatives extends React.Component {
             && typeof firstCardFromSubmit.cardVarMapped === 'object'
               ? pickRcsCardVarMappedEntries(firstCardFromSubmit.cardVarMapped)
               : null;
-          // Campaigns/consumers should see the literal tag (e.g. `{{first_name}}`) in title/description,
-          // not the internal numeric slot placeholder (`{{1}}`) — that slot scheme is only meaningful
-          // to this editor's own reopen/hydration (see getFormData, which persists raw cardContentFromSubmit
-          // separately for that round-trip and is unaffected by this).
-          const cardContent = mapRcsCardContentForConsumerWithResolvedTags(
-            cardContentFromSubmit,
-            cardVarMappedFromFirstRcsCard,
-            isFullModeForRcsConsumerPayload,
-          );
+          // Campaigns/consumers get the same numeric-slot contract as the editor's own round-trip
+          // (see createPayload): title/description keep {{1}}, {{2}}, … and every slot's value —
+          // tag reference or literal — lives only in cardVarMapped for the backend to resolve.
+          const cardContent = mapRcsCardContentForConsumerWithResolvedTags(cardContentFromSubmit);
           const rcsContent = {
             contentType,
             cardType,

package/v2Containers/CreativesContainer/tests/index.test.js

@@ -267,7 +267,7 @@ describe('Test SlideBoxContent container', () => {
     expect(instance.state.templateData.rcsCardVarMapped).toEqual(cardVarMapped);
   });
 
-  it('RCS getCreativesData sends the literal tag (not the numeric slot) in title/description to consumers', async () => {
+  it('RCS getCreativesData sends the numeric slot (not the literal tag) in title/description to consumers, with the tag only in cardVarMapped', async () => {
     renderedComponent = shallowWithIntl(
       <Creatives
         loyaltyMetaData={loyaltyMetaData}
@@ -316,8 +316,9 @@ describe('Test SlideBoxContent container', () => {
     await tick();
 
     const sentCardContent = getCreativesData.mock.calls[0][0].rcsContent.cardContent[0];
-    expect(sentCardContent.title).toBe('Hi {{first_name}}');
-    expect(sentCardContent.description).toBe('Visit {{loyalty_points}}');
+    expect(sentCardContent.title).toBe('Hi {{1}}');
+    expect(sentCardContent.description).toBe('Visit {{2}}');
+    expect(sentCardContent.cardVarMapped).toEqual({ 1: '{{first_name}}', 2: '{{loyalty_points}}' });
   });
 
   it('Text getCreatives data for rcs, data from creatives done to campaigns', async () => {

package/v2Containers/Rcs/carouselUtils.js

@@ -11,6 +11,7 @@ import {
   TEMPLATE_TITLE_MAX_LENGTH,
   RCS_RICH_CARD_MAX_LENGTH,
   RCS_NUMERIC_VAR_TOKEN_REGEX,
+  RCS_NUMERIC_VAR_NAME_REGEX,
   RCS_CAROUSEL_ASSET_INDEX_BASE,
   RCS_CAROUSEL_FIRST_CARD_DEFAULT_SUGGESTIONS,
   MEDIUM,
@@ -190,22 +191,51 @@ export const buildCarouselCardContentForPayload = (carouselData, {
   const thumbnailUrl = isCardVideo
     ? (card.thumbnailSrc || card.videoAsset?.videoThumbnail || '')
     : '';
-  const cardVarTokens = [
-    ...((card.title || '').match(rcsVarRegex) ?? []),
-    ...((card.description || '').match(rcsVarRegex) ?? []),
-  ];
+  let cardTitle = card.title || '';
+  let cardDescription = card.description || '';
   const cardVarMappedForCard = {};
-  if (isSlotMappingMode && cardVarTokens.length > 0) {
-    cardVarTokens.forEach((token) => {
-      const varName = getVarNameFromToken(token);
-      if (!varName) return;
-      const scopedValue = cardVarMapped?.[getCarouselVarMapKey(cardIndex, varName)] ?? '';
-      cardVarMappedForCard[varName] = sanitizeCardVarMappedValue(scopedValue);
-    });
+  if (isSlotMappingMode) {
+    const titleTokens = cardTitle.match(rcsVarRegex) ?? [];
+    const descTokens = cardDescription.match(rcsVarRegex) ?? [];
+    if (titleTokens.length > 0 || descTokens.length > 0) {
+      // The persisted API contract requires every {{...}} in title/description to be a plain
+      // numeric slot ({{1}}, {{2}}, …) — the actual tag/value belongs only in cardVarMapped. A
+      // slot can still hold a non-numeric/legacy token here (hand-typed, or picked before this
+      // card had a numeric slot for it) since the carousel tag-picker never rewrites card text.
+      // Rename only those to the next free number for this card, leaving already-numeric slots
+      // (and the card's normal case) untouched.
+      const usedNumbers = new Set(
+        [...titleTokens, ...descTokens]
+          .map(getVarNameFromToken)
+          .filter((name) => RCS_NUMERIC_VAR_NAME_REGEX.test(name))
+          .map((name) => parseInt(name, 10)),
+      );
+      let nextFreeNumber = 1;
+      const claimNextFreeNumber = () => {
+        while (usedNumbers.has(nextFreeNumber)) nextFreeNumber++;
+        usedNumbers.add(nextFreeNumber);
+        return String(nextFreeNumber);
+      };
+      const renameFieldVarTokens = (fieldTokens, str) => {
+        let ordinal = 0;
+        return str.replace(rcsVarRegex, (matchedToken) => {
+          const varName = getVarNameFromToken(fieldTokens[ordinal]);
+          ordinal += 1;
+          if (!varName) return matchedToken;
+          const isNumericSlot = RCS_NUMERIC_VAR_NAME_REGEX.test(varName);
+          const outputVarName = isNumericSlot ? varName : claimNextFreeNumber();
+          const scopedValue = cardVarMapped?.[getCarouselVarMapKey(cardIndex, varName)] ?? '';
+          cardVarMappedForCard[outputVarName] = sanitizeCardVarMappedValue(scopedValue);
+          return `{{${outputVarName}}}`;
+        });
+      };
+      cardTitle = renameFieldVarTokens(titleTokens, cardTitle);
+      cardDescription = renameFieldVarTokens(descTokens, cardDescription);
+    }
   }
   return {
-    title: card.title || '',
-    description: card.description || '',
+    title: cardTitle,
+    description: cardDescription,
     mediaType: cardMediaType,
     ...((isCardImage || isCardVideo) && {
       media: {

package/v2Containers/Rcs/index.js

@@ -1571,17 +1571,21 @@ export const Rcs = (props) => {
     if (tagAreaField === RCS_TAG_AREA_FIELD_TITLE || tagAreaField === RCS_TAG_AREA_FIELD_DESC) {
       // Legacy slot that already holds a named tag (e.g. {{first_name}}) is replaced by
       // field-local position, since a name-based replace would also overwrite other slots
-      // sharing that same tag name.
+      // sharing that same tag name. The persisted API contract requires title/description to
+      // only ever contain {{1}}, {{2}}, … — the actual tag lives in cardVarMapped (written
+      // above) — so normalize the slot text to its numeric token instead of re-embedding the
+      // tag name, self-healing any legacy/hand-typed token the moment it's touched here.
       const fieldOffsetForSlot = tagAreaField === RCS_TAG_AREA_FIELD_TITLE
         ? 0
         : (templateTitle?.match(rcsVarRegex) ?? []).length;
       const localSlotOrdinal = (globalVarSlotIndexZeroBased !== null && globalVarSlotIndexZeroBased !== undefined)
         ? globalVarSlotIndexZeroBased - fieldOffsetForSlot
         : null;
+      const replacementToken = cardVarMappedNumericSlotKey || selectedTagNameFromPicker;
 
       if (tagAreaField === RCS_TAG_AREA_FIELD_TITLE) {
         setTemplateTitle((previousTitle) => {
-          const titleAfterReplacingTag = replaceTagAtFieldSlotOrdinal(previousTitle || '', localSlotOrdinal, selectedTagNameFromPicker);
+          const titleAfterReplacingTag = replaceTagAtFieldSlotOrdinal(previousTitle || '', localSlotOrdinal, replacementToken);
           if (titleAfterReplacingTag === previousTitle) return previousTitle;
           setTemplateTitleError(computeTemplateTitleError(titleAfterReplacingTag));
           // Remount segment editor: tag insert replaces {{n}} with e.g. {{tag.FORMAT_1}} — slot ids change; avoids stale UI vs manual typing in full-mode TextArea
@@ -1590,7 +1594,7 @@ export const Rcs = (props) => {
         });
       } else {
         setTemplateDesc((previousDescription) => {
-          const descriptionAfterReplacingTag = replaceTagAtFieldSlotOrdinal(previousDescription || '', localSlotOrdinal, selectedTagNameFromPicker);
+          const descriptionAfterReplacingTag = replaceTagAtFieldSlotOrdinal(previousDescription || '', localSlotOrdinal, replacementToken);
           if (descriptionAfterReplacingTag === previousDescription) {
             return previousDescription;
           }
@@ -2776,10 +2780,9 @@ const onTitleAddVar = () => {
                         : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.heightType || MEDIUM,
                     }}),
                     ...(isSlotMappingMode && (() => {
-                      const templateVarTokens = [
-                        ...(templateTitle?.match(rcsVarRegex) ?? []),
-                        ...(templateDesc?.match(rcsVarRegex) ?? []),
-                      ];
+                      const titleVarTokens = templateTitle?.match(rcsVarRegex) ?? [];
+                      const descVarTokens = templateDesc?.match(rcsVarRegex) ?? [];
+                      const templateVarTokens = [...titleVarTokens, ...descVarTokens];
                       const cardVarMappedForRcsCardOnly = pickRcsCardVarMappedEntries(
                         cardVarMapped,
                       );
@@ -2800,7 +2803,28 @@ const onTitleAddVar = () => {
                         const sanitizedSlotValue = sanitizeCardVarMappedValue(resolvedRawValue);
                         persistedSlotVarMap[String(slotIndexZeroBased + 1)] = sanitizedSlotValue;
                       });
-                      return { cardVarMapped: persistedSlotVarMap };
+                      // The API contract requires title/description to only ever contain {{1}}, {{2}}, …
+                      // in this exact slot order — never a semantic/legacy name — regardless of whether
+                      // the user ever touched TagList for that slot (e.g. content hydrated/pasted with a
+                      // named token). persistedSlotVarMap above already keys values by this same slot
+                      // position, so rewrite the text to match instead of persisting it verbatim.
+                      let titleOrdinal = 0;
+                      const renumberedTitle = (templateTitle || '').replace(rcsVarRegex, () => {
+                        const slotIndexZeroBased = titleOrdinal;
+                        titleOrdinal += 1;
+                        return `{{${slotIndexZeroBased + 1}}}`;
+                      });
+                      let descOrdinal = 0;
+                      const renumberedDesc = (templateDesc || '').replace(rcsVarRegex, () => {
+                        const slotIndexZeroBased = titleVarTokens.length + descOrdinal;
+                        descOrdinal += 1;
+                        return `{{${slotIndexZeroBased + 1}}}`;
+                      });
+                      return {
+                        title: renumberedTitle,
+                        description: renumberedDesc,
+                        cardVarMapped: persistedSlotVarMap,
+                      };
                     })()),
                     ...(suggestions.length > 0 && { suggestions }),
                   }

package/v2Containers/Rcs/tests/carouselUtils.test.js

@@ -853,7 +853,7 @@ describe('buildCarouselCardContentForPayload', () => {
       expect(out[0].cardVarMapped).toBeUndefined();
     });
 
-    it('builds cardVarMapped from title and description tokens, sanitizing values', () => {
+    it('renumbers non-numeric title/description tokens to sequential {{N}} slots and keys cardVarMapped by number', () => {
       const out = buildCarouselCardContentForPayload(
         [{ title: 'Hi {{name}}', description: 'Pts {{points}}', mediaType: RCS_MEDIA_TYPES.NONE }],
         {
@@ -863,7 +863,9 @@ describe('buildCarouselCardContentForPayload', () => {
           rcsVarRegex,
         },
       );
-      expect(out[0].cardVarMapped).toEqual({ name: 'Bob', points: '' });
+      expect(out[0].title).toBe('Hi {{1}}');
+      expect(out[0].description).toBe('Pts {{2}}');
+      expect(out[0].cardVarMapped).toEqual({ 1: 'Bob', 2: '' });
     });
 
     it('defaults an unmapped token value to empty string via sanitizeCardVarMappedValue', () => {
@@ -871,7 +873,8 @@ describe('buildCarouselCardContentForPayload', () => {
         [{ title: 'Hi {{missing}}', description: 'D', mediaType: RCS_MEDIA_TYPES.NONE }],
         { isSlotMappingMode: true, cardVarMapped: {}, selectedCarouselHeight: 'SHORT', rcsVarRegex },
       );
-      expect(out[0].cardVarMapped).toEqual({ missing: '' });
+      expect(out[0].title).toBe('Hi {{1}}');
+      expect(out[0].cardVarMapped).toEqual({ 1: '' });
     });
 
     it('handles a missing cardVarMapped object entirely', () => {
@@ -879,7 +882,23 @@ describe('buildCarouselCardContentForPayload', () => {
         [{ title: 'Hi {{name}}', description: 'D', mediaType: RCS_MEDIA_TYPES.NONE }],
         { isSlotMappingMode: true, cardVarMapped: undefined, selectedCarouselHeight: 'SHORT', rcsVarRegex },
       );
-      expect(out[0].cardVarMapped).toEqual({ name: '' });
+      expect(out[0].title).toBe('Hi {{1}}');
+      expect(out[0].cardVarMapped).toEqual({ 1: '' });
+    });
+
+    it('leaves an already-numeric slot untouched and only renumbers the legacy/named slot alongside it', () => {
+      const out = buildCarouselCardContentForPayload(
+        [{ title: 'Hi {{1}}', description: 'Pts {{first_name}} exp {{3}}', mediaType: RCS_MEDIA_TYPES.NONE }],
+        {
+          isSlotMappingMode: true,
+          cardVarMapped: { 1: 'test', first_name: '{{first_name}}', 3: 'test' },
+          selectedCarouselHeight: 'SHORT',
+          rcsVarRegex,
+        },
+      );
+      expect(out[0].title).toBe('Hi {{1}}');
+      expect(out[0].description).toBe('Pts {{2}} exp {{3}}');
+      expect(out[0].cardVarMapped).toEqual({ 1: 'test', 2: '{{first_name}}', 3: 'test' });
     });
 
     it('skips a matched token that strips down to an empty variable name', () => {