@capillarytech/creatives-library 8.0.328 → 8.0.330-alpha.0

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

@@ -8,6 +8,8 @@ import {
   syncCardVarMappedSemanticsFromSlots,
   hasMeaningfulSmsFallbackShape,
   getLibrarySmsFallbackApiBaselineFromTemplateData,
+  extractRegisteredSenderIdsFromSmsFallbackRecord,
+  pickRcsCardVarMappedEntries,
 } from '../rcsLibraryHydrationUtils';
 import { rcsVarRegex } from '../constants';
 
@@ -103,6 +105,41 @@ describe('rcsLibraryHydrationUtils', () => {
     });
   });
 
+  describe('extractRegisteredSenderIdsFromSmsFallbackRecord', () => {
+    it('returns null for missing / empty', () => {
+      expect(extractRegisteredSenderIdsFromSmsFallbackRecord(null)).toBe(null);
+      expect(extractRegisteredSenderIdsFromSmsFallbackRecord({})).toBe(null);
+      expect(
+        extractRegisteredSenderIdsFromSmsFallbackRecord({ registeredSenderIds: [] }),
+      ).toBe(null);
+    });
+
+    it('prefers top-level registeredSenderIds', () => {
+      expect(
+        extractRegisteredSenderIdsFromSmsFallbackRecord({
+          registeredSenderIds: ['A'],
+          templateConfigs: { registeredSenderIds: ['B'] },
+        }),
+      ).toEqual(['A']);
+    });
+
+    it('reads templateConfigs.registeredSenderIds when top-level absent', () => {
+      expect(
+        extractRegisteredSenderIdsFromSmsFallbackRecord({
+          templateConfigs: { registeredSenderIds: ['DLT1', 'DLT2'] },
+        }),
+      ).toEqual(['DLT1', 'DLT2']);
+    });
+
+    it('falls back to templateConfigs.header array', () => {
+      expect(
+        extractRegisteredSenderIdsFromSmsFallbackRecord({
+          templateConfigs: { header: ['H1'] },
+        }),
+      ).toEqual(['H1']);
+    });
+  });
+
   describe('pickFirstSmsFallbackTemplateString', () => {
     it('prefers smsTemplateContent over resolved message so DLT tokens stay in the string', () => {
       const sms = {
@@ -173,6 +210,7 @@ describe('rcsLibraryHydrationUtils', () => {
     it('is true when string contains {{word}} tokens', () => {
       expect(hasRcsVarTokens('{{1}} hi', rcsVarRegex)).toBe(true);
       expect(hasRcsVarTokens('{{user_id}}', rcsVarRegex)).toBe(true);
+      expect(hasRcsVarTokens('{{dynamic_expiry_date_after_3_days.FORMAT_1}}', rcsVarRegex)).toBe(true);
     });
   });
 
@@ -248,4 +286,33 @@ describe('rcsLibraryHydrationUtils', () => {
       expect(out.user_name).toBe('kept');
     });
   });
+
+  describe('pickRcsCardVarMappedEntries', () => {
+    it('returns {} for null, undefined, and array inputs', () => {
+      expect(pickRcsCardVarMappedEntries(null)).toEqual({});
+      expect(pickRcsCardVarMappedEntries(undefined)).toEqual({});
+      expect(pickRcsCardVarMappedEntries(['{#v#}_0', 'x'])).toEqual({});
+    });
+
+    it('keeps numeric slot keys', () => {
+      expect(pickRcsCardVarMappedEntries({ 1: 'a', 2: 'b' })).toEqual({ 1: 'a', 2: 'b' });
+    });
+
+    it('keeps semantic word keys', () => {
+      expect(pickRcsCardVarMappedEntries({ user_name: 'Alice', gt: '{{tag}}' })).toEqual({
+        user_name: 'Alice',
+        gt: '{{tag}}',
+      });
+    });
+
+    it('strips SMS fallback slot keys like {#var#}_0', () => {
+      const input = { 1: 'x', user_name: 'y', '{#promo#}_0': 'z', '{{name}}_1': 'w' };
+      const out = pickRcsCardVarMappedEntries(input);
+      expect(out).toEqual({ 1: 'x', user_name: 'y' });
+    });
+
+    it('returns {} for an empty object', () => {
+      expect(pickRcsCardVarMappedEntries({})).toEqual({});
+    });
+  });
 });

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

@@ -7,6 +7,7 @@ import {
   getTemplateStatusType,
   normalizeCardVarMapped,
   coalesceCardVarMappedToTemplate,
+  getRcsSemanticVarNamesSpanningTitleAndDesc,
   resolveCardVarMappedSlotValue,
   isRcsTextOnlyCardMediaType,
   mapRcsCardContentForConsumerWithResolvedTags,
@@ -215,7 +216,39 @@ describe('RCS utils', () => {
     });
   });
 
+  describe('getRcsSemanticVarNamesSpanningTitleAndDesc', () => {
+    it('returns names that appear in both title and description', () => {
+      const set = getRcsSemanticVarNamesSpanningTitleAndDesc(
+        'Hello {{adv}}',
+        'Body {{adv}} x {{other}}',
+        rcsVarRegex,
+      );
+      expect(Array.from(set).sort()).toEqual(['adv']);
+    });
+
+    it('is empty when the same name is only repeated in the title', () => {
+      const set = getRcsSemanticVarNamesSpanningTitleAndDesc(
+        '{{user_name}} and {{user_name}}',
+        'Hi',
+        rcsVarRegex,
+      );
+      expect(set.size).toBe(0);
+    });
+  });
+
   describe('coalesceCardVarMappedToTemplate', () => {
+    it('does not copy a shared semantic value into the second slot when the tag spans title and description', () => {
+      const out = coalesceCardVarMappedToTemplate(
+        { adv: 'shared' },
+        'T {{adv}}',
+        'D {{adv}}',
+        rcsVarRegex,
+      );
+      expect(out[1]).toBe('shared');
+      expect(out[2]).toBe('');
+      expect(out.adv).toBe('shared');
+    });
+
     it('maps slot 1 to first token name from title', () => {
       expect(
         coalesceCardVarMappedToTemplate(
@@ -332,6 +365,24 @@ describe('RCS utils', () => {
         ),
       ).toBe('{{loyalty_points}}');
     });
+
+    it('omitSemanticFallback: duplicate title+desc tag does not read shared semantic for either slot', () => {
+      expect(
+        resolveCardVarMappedSlotValue({ adv: '{{adv}}', 1: '', 2: '' }, 'adv', 0, false, true),
+      ).toBe('');
+      expect(
+        resolveCardVarMappedSlotValue({ adv: '{{adv}}', 1: 'A', 2: 'B' }, 'adv', 0, false, true),
+      ).toBe('A');
+      expect(
+        resolveCardVarMappedSlotValue({ adv: '{{adv}}', 1: 'A', 2: 'B' }, 'adv', 1, false, true),
+      ).toBe('B');
+    });
+
+    it('omitSemanticFallback: cleared semantic does not force empty when numeric slot has a value', () => {
+      expect(
+        resolveCardVarMappedSlotValue({ adv: '', 1: 'first', 2: 'second' }, 'adv', 1, false, true),
+      ).toBe('second');
+    });
   });
 
   describe('mapRcsCardContentForConsumerWithResolvedTags', () => {
@@ -374,6 +425,11 @@ describe('RCS utils', () => {
       expect(out[0].title).toBe('Hi {{customer_name}}');
       expect(out[0].description).toBe('Pts {{loyalty_points}}');
     });
+
+    it('passes through null or non-object items in the card array unchanged', () => {
+      const out = mapRcsCardContentForConsumerWithResolvedTags([null, 'string', 42], {}, false);
+      expect(out).toEqual([null, 'string', 42]);
+    });
   });
 
   describe('isRcsTextOnlyCardMediaType', () => {

package/v2Containers/Rcs/utils.js

@@ -22,6 +22,7 @@ import {
   COMBINED_SMS_TEMPLATE_VAR_REGEX,
   isAnyTemplateVarToken,
 } from '../../utils/templateVarUtils';
+import { pickRcsCardVarMappedEntries } from './rcsLibraryHydrationUtils';
 
 export const getRcsStatusType = (status) => {
   switch (status) {
@@ -130,6 +131,27 @@ export function normalizeCardVarMapped(rawCardVarMapped, orderedTagNames) {
   return normalizedMap;
 }
 
+/**
+ * Semantic names that appear in both title and description (e.g. `{{adv}}` in header and body).
+ * Those slots must not share one semantic `cardVarMapped` key — otherwise VarSegment inputs mirror.
+ */
+export function getRcsSemanticVarNamesSpanningTitleAndDesc(
+  templateTitle,
+  templateDesc,
+  rcsVarRegex,
+) {
+  const getVarNameFromToken = (token = '') => token.replace(RCS_STRIP_MUSTACHE_DELIMITERS_REGEX, '');
+  const titleTokens = templateTitle?.match(rcsVarRegex) ?? [];
+  const descTokens = templateDesc?.match(rcsVarRegex) ?? [];
+  const titleNames = new Set(titleTokens.map(getVarNameFromToken).filter(Boolean));
+  const descNames = new Set(descTokens.map(getVarNameFromToken).filter(Boolean));
+  const spanning = new Set();
+  titleNames.forEach((n) => {
+    if (descNames.has(n)) spanning.add(n);
+  });
+  return spanning;
+}
+
 /**
  * Rebuild `cardVarMapped` so keys match the current title/description tokens (title tokens first,
  * then description), in order. Values are taken from the matching key, else from legacy slot
@@ -151,15 +173,25 @@ export function coalesceCardVarMappedToTemplate(
   if (!templateVarTokens.length) {
     return { ...lookupSourceMap };
   }
+  const semanticNamesSpanningTitleAndDesc = getRcsSemanticVarNamesSpanningTitleAndDesc(
+    templateTitle,
+    templateDesc,
+    rcsVarRegex,
+  );
   const coalescedMap = { ...lookupSourceMap };
   const seenSemanticVarNames = new Set();
   templateVarTokens.forEach((token, slotIndexZeroBased) => {
     const semanticVarName = getVarNameFromToken(token);
     if (!semanticVarName) return;
     const numericSlotKey = String(slotIndexZeroBased + 1);
+    const isRepeatOfSemanticName = seenSemanticVarNames.has(semanticVarName);
+    const skipSharedSemanticLookup =
+      isRepeatOfSemanticName && semanticNamesSpanningTitleAndDesc.has(semanticVarName);
     let valueFromSource = lookupSourceMap[numericSlotKey];
     if (valueFromSource === undefined || valueFromSource === null) {
-      valueFromSource = lookupSourceMap[semanticVarName];
+      if (!skipSharedSemanticLookup) {
+        valueFromSource = lookupSourceMap[semanticVarName];
+      }
     }
     if (valueFromSource === undefined || valueFromSource === null) {
       valueFromSource = lookupSourceMap[String(slotIndexZeroBased + 1)];
@@ -189,12 +221,17 @@ export function coalesceCardVarMappedToTemplate(
  * When a numeric slot is present but only whitespace / empty (common after hydration), do not
  * treat it as authoritative — fall through to the semantic key so preview and payload match the
  * tag the user selected (e.g. `1: ''` but `promotion_points: '{{newTag}}'`).
+ *
+ * @param {boolean} [omitSemanticFallback=false] When true, do not read `varName` on the map (and do
+ * not apply the early `semanticEmpty` short-circuit). Use when the same semantic name appears in
+ * both title and description so each global slot stays independent.
  */
 export function resolveCardVarMappedSlotValue(
   cardVarMapped,
   varName,
   globalSlotIndexZeroBased,
   isLibraryMode = false,
+  omitSemanticFallback = false,
 ) {
   const varMap = cardVarMapped ?? {};
   const slotKey = String(globalSlotIndexZeroBased + 1);
@@ -205,7 +242,7 @@ export function resolveCardVarMappedSlotValue(
     Object.prototype.hasOwnProperty.call(varMap, slotKey)
     && String(varMap[slotKey] ?? '').trim() !== '';
 
-  if (semanticEmpty && !(isLibraryMode && slotNonEmpty)) {
+  if (semanticEmpty && !(isLibraryMode && slotNonEmpty) && !omitSemanticFallback) {
     return '';
   }
   let numericSlotValue = '';
@@ -217,7 +254,7 @@ export function resolveCardVarMappedSlotValue(
   if (numericSlotValue.trim() !== '') {
     return numericSlotValue;
   }
-  if (Object.prototype.hasOwnProperty.call(varMap, varName)) {
+  if (!omitSemanticFallback && Object.prototype.hasOwnProperty.call(varMap, varName)) {
     return String(varMap[varName] ?? '');
   }
   return '';
@@ -247,6 +284,9 @@ export function resolveRcsCardPreviewStrings(
   const splitTemplateVarStringRcs = (str) => splitTemplateVarString(str, rcsVarRegex);
   const getVarNameFromToken = (token = '') =>
     token.replace(RCS_STRIP_MUSTACHE_DELIMITERS_REGEX, '');
+  const semanticNamesSpanningTitleAndDesc = textOnlyCard
+    ? new Set()
+    : getRcsSemanticVarNamesSpanningTitleAndDesc(title, description, rcsVarRegex);
 
   const resolveTemplateWithMap = (str = '', slotOffset = 0) => {
     if (!str) return '';
@@ -258,11 +298,13 @@ export function resolveRcsCardPreviewStrings(
           const key = getVarNameFromToken(elem);
           const globalSlot = slotOffset + varOrdinal;
           varOrdinal += 1;
+          const omitSemantic = semanticNamesSpanningTitleAndDesc.has(key);
           const v = resolveCardVarMappedSlotValue(
             cardVarMapped,
             key,
             globalSlot,
             isLibraryMode,
+            omitSemantic,
           );
           if (v == null || String(v).trim() === '') return elem;
           return String(v);
@@ -285,7 +327,8 @@ export function resolveRcsCardPreviewStrings(
 /**
  * Campaign consumer payload: replace each card's `title` / `description` with VarSegment-resolved
  * tag strings (same rules as {@link resolveRcsCardPreviewStrings}). Root `rcsCardVarMapped` merges
- * with per-card `cardVarMapped`; `cardVarMapped` on each card is left unchanged for round-trip.
+ * with per-card `cardVarMapped` for resolution; emitted `cardVarMapped` omits SMS-fallback slot keys
+ * (root/nested merged with {@link pickRcsCardVarMappedEntries} per side).
  */
 export function mapRcsCardContentForConsumerWithResolvedTags(
   cardContentArray,
@@ -304,7 +347,9 @@ export function mapRcsCardContentForConsumerWithResolvedTags(
       card.cardVarMapped != null && typeof card.cardVarMapped === 'object'
         ? card.cardVarMapped
         : {};
-    const merged = { ...rootRecord, ...nested };
+    const rootClean = pickRcsCardVarMappedEntries(rootRecord);
+    const nestedClean = pickRcsCardVarMappedEntries(nested);
+    const merged = { ...rootClean, ...nestedClean };
     const textOnly = isRcsTextOnlyCardMediaType(card.mediaType);
     const { rcsTitle, rcsDesc } = resolveRcsCardPreviewStrings(
       card.title ?? '',
@@ -313,10 +358,12 @@ export function mapRcsCardContentForConsumerWithResolvedTags(
       isLibraryMode,
       textOnly,
     );
+    const { cardVarMapped: _drop, ...cardRest } = card;
     return {
-      ...card,
+      ...cardRest,
       title: rcsTitle,
       description: rcsDesc,
+      ...(Object.keys(nestedClean).length > 0 ? { cardVarMapped: nestedClean } : {}),
     };
   });
 }

package/v2Containers/SmsTrai/Edit/index.js

@@ -1102,6 +1102,33 @@ export const SmsTraiEdit = (props) => {
               </CapLabelInline>
             </TraiEditTemplateDetails>
           )}
+          {isRcsSmsFallback &&
+            traiDataRef.current &&
+            !isEmpty(traiDataRef.current) &&
+            !loading && (
+            <TraiEditTemplateDetails className="sms-trai-edit-rcs-fallback__template-meta">
+              <CapLabelInline type="label1">
+                {formatMessage(messages.templateNameLabel)}
+              </CapLabelInline>
+              <CapLabelInline type="label2">
+                {get(traiDataRef.current, 'versions.base.template_name', '')
+                  || get(traiDataRef.current, 'name', '')}
+              </CapLabelInline>
+              {traiDltEnabled ? (
+                <>
+                  <CapLabelInline type="label1">
+                    {formatMessage(messages.traiEditSeperator)}
+                  </CapLabelInline>
+                  <CapLabelInline type="label1">
+                    {formatMessage(messages.senderIdlabel)}
+                  </CapLabelInline>
+                  <CapLabelInline type="label2">
+                    {[...get(traiDataRef.current, 'versions.base.header', [])].join(', ')}
+                  </CapLabelInline>
+                </>
+              ) : null}
+            </TraiEditTemplateDetails>
+          )}
           <CapColumn span={shouldShowPreview ? 14 : 24}>
             <CapRow>
               <CapHeader

package/v2Containers/SmsTrai/Edit/messages.js

@@ -48,6 +48,11 @@ export default defineMessages({
     id: `${prefix}.templateLabel`,
     defaultMessage: 'Template',
   },
+  /** RCS → SMS fallback slidebox: label above selected template metadata. */
+  templateNameLabel: {
+    id: `${prefix}.templateNameLabel`,
+    defaultMessage: 'Template name',
+  },
   traiEditSeperator: {
     id: `${prefix}.traiEditSeperator`,
     defaultMessage: '|',