@capillarytech/creatives-library 9.0.35 → 9.0.36

package/v2Containers/Rcs/rcsLibraryHydrationUtils.js

@@ -217,24 +217,6 @@ export function buildSmsFallBackContentForPayload({
         ? tcSibling.header
         : null;
   const hasRegisteredSenderIds = Array.isArray(registeredSenderIdsForPayload);
-  // `rcsSmsFallbackVarMapped` (root of smsFallBackContent) is a custom field that
-  // normalizeRcsMessageContentForApi strips before the real API call (see comment below) — it
-  // only survives for same-session local re-hydration. templateConfigs.templateVariableMapping is
-  // the field the backend actually persists (same shape TRAI/DLT registration uses), so mirror the
-  // var map there too — otherwise slot values saved through campaigns/library mode are lost on reopen.
-  const varMapForTemplateConfigs =
-    smsFallbackForPayload?.[RCS_SMS_FALLBACK_VAR_MAPPED_PROP]
-    || mergedFallback[RCS_SMS_FALLBACK_VAR_MAPPED_PROP];
-  const templateVariableMappingForPayload =
-    varMapForTemplateConfigs && typeof varMapForTemplateConfigs === 'object'
-      ? Object.entries(varMapForTemplateConfigs).reduce((acc, [slotKey, slotValue], index) => {
-          if (slotValue == null || slotValue === '') return acc;
-          acc[slotKey] = { data: slotValue, count: index + 1 };
-          return acc;
-        }, {})
-      : null;
-  const hasTemplateVariableMapping =
-    templateVariableMappingForPayload && Object.keys(templateVariableMappingForPayload).length > 0;
   const smsFallbackTemplateConfigs =
     smsFallbackTemplateId || hasRegisteredSenderIds
       ? {
@@ -246,9 +228,6 @@ export function buildSmsFallBackContentForPayload({
           ...(hasRegisteredSenderIds && {
             registeredSenderIds: registeredSenderIdsForPayload,
           }),
-          ...(hasTemplateVariableMapping && {
-            templateVariableMapping: templateVariableMappingForPayload,
-          }),
         }
       : null;
   const isDltCampaign = !isFullMode && isTraiDLTEnable(isFullMode, smsRegister);
@@ -316,48 +295,18 @@ export function resolveSmsFallbackHydrationFromDetails(details) {
   const fromNested = Array.isArray(updatedEditor)
     ? updatedEditor.join('')
     : (typeof updatedEditor === 'string' ? updatedEditor : (smsEditor || ''));
-  const templateConfigsRecord =
-    smsFallbackContent.templateConfigs && typeof smsFallbackContent.templateConfigs === 'object'
-      ? smsFallbackContent.templateConfigs
-      : {};
-  // For DLT/TRAI fallbacks, smsContent/smsTemplateContent/message are the send-ready text —
-  // {#var#} slots are already baked into a literal value there (required to match the
-  // TRAI-approved template). Only templateConfigs.template keeps {#var#} intact, so prefer it
-  // here — otherwise reopening the editor can never re-render that slot as its own box again.
-  const rawDltTemplate =
-    typeof templateConfigsRecord.template === 'string' && templateConfigsRecord.template.trim() !== ''
-      ? templateConfigsRecord.template
-      : '';
-  const fallbackMessage = rawDltTemplate
-    || smsFallbackContent.smsContent
+  const fallbackMessage = smsFallbackContent.smsContent
     || smsFallbackContent.smsTemplateContent
     || smsFallbackContent.message
     || fromNested
     || '';
-  const varMapFromTemplateVariableMapping =
-    templateConfigsRecord.templateVariableMapping && typeof templateConfigsRecord.templateVariableMapping === 'object'
-      ? Object.entries(templateConfigsRecord.templateVariableMapping).reduce((acc, [slotKey, slotEntry]) => {
-          const slotValue = slotEntry && typeof slotEntry === 'object' ? slotEntry.data : slotEntry;
-          if (slotValue != null) acc[slotKey] = slotValue;
-          return acc;
-        }, {})
-      : null;
-  const varMappedFromPayload = {
-    ...(varMapFromTemplateVariableMapping || {}),
-    ...(smsFallbackContent[RCS_SMS_FALLBACK_VAR_MAPPED_PROP] || {}),
-  };
+  const varMappedFromPayload = smsFallbackContent[RCS_SMS_FALLBACK_VAR_MAPPED_PROP] || {};
   const hasVarMapped = Object.keys(varMappedFromPayload).length > 0;
-  const smsFallbackTemplateName =
-    smsFallbackContent.templateName
-    || smsFallbackContent.smsTemplateName
-    || templateConfigsRecord.templateName
-    || templateConfigsRecord.name
-    || '';
   const hasFallbackPayload =
     smsFallbackContent
     && Object.keys(smsFallbackContent).length > 0
     && (
-      !!smsFallbackTemplateName
+      !!smsFallbackContent.smsTemplateName
       || !!fallbackMessage
       || hasVarMapped
     );
@@ -376,7 +325,7 @@ export function resolveSmsFallbackHydrationFromDetails(details) {
       : (typeof base['unicode-validity'] === 'boolean' ? base['unicode-validity'] : true);
   const registeredSenderIds = extractRegisteredSenderIdsFromSmsFallbackRecord(smsFallbackContent);
   const nextSmsState = {
-    templateName: smsFallbackTemplateName,
+    templateName: smsFallbackContent.smsTemplateName || '',
     content: fallbackMessage,
     templateContent: fallbackMessage,
     unicodeValidity: unicodeFromApi,
@@ -447,6 +396,7 @@ export function syncCardVarMappedSemanticsFromSlots(
   templateDesc,
   rcsVarRegex,
 ) {
+  console.log('syncCardVarMappedSemanticsFromSlots', cardVarMappedInput, templateTitle, templateDesc);
   const cardVarMappedSynced =
     cardVarMappedInput != null && typeof cardVarMappedInput === 'object'
       ? { ...cardVarMappedInput }
@@ -459,11 +409,48 @@ export function syncCardVarMappedSemanticsFromSlots(
   templateVarTokens.forEach((token, slotIndexZeroBased) => {
     const semanticVarName = getVarNameFromToken(token);
     if (!semanticVarName) return;
-    const numericSlotKey = String(slotIndexZeroBased + 1);
-    const semanticValueTrimmed = String(cardVarMappedSynced[semanticVarName] ?? '').trim();
-    const numericSlotValueTrimmed = String(cardVarMappedSynced[numericSlotKey] ?? '').trim();
-    if (!semanticValueTrimmed && numericSlotValueTrimmed) {
-      cardVarMappedSynced[semanticVarName] = cardVarMappedSynced[numericSlotKey];
+
+    if (!RCS_NUMERIC_VAR_NAME_REGEX.test(semanticVarName)) {
+      // A numeric slot may already self-reference this exact tag (e.g. "4" -> "{{last_name}}") when
+      // the template's own numeric placeholder has since been resolved to this tag in the text —
+      // that numeric key is the source of truth, not this token's position.
+      const mustacheSelfReference = `{{${semanticVarName}}}`;
+      const existingNumericKeyForSemantic = Object.keys(cardVarMappedSynced).find((key) => (
+        RCS_NUMERIC_VAR_NAME_REGEX.test(key) && cardVarMappedSynced[key] === mustacheSelfReference
+      ));
+      if (existingNumericKeyForSemantic) {
+        const semanticValueTrimmed = String(cardVarMappedSynced[semanticVarName] ?? '').trim();
+        const numericValueTrimmed = String(cardVarMappedSynced[existingNumericKeyForSemantic] ?? '').trim();
+        if (!semanticValueTrimmed && numericValueTrimmed) {
+          cardVarMappedSynced[semanticVarName] = cardVarMappedSynced[existingNumericKeyForSemantic];
+        }
+        return;
+      }
+
+      // Legacy: template embeds the semantic token directly ({{user_name}}), but older payloads
+      // stored the resolved value under a position-based numeric key ("1", "2", …).
+      const numericSlotKey = String(slotIndexZeroBased + 1);
+      const semanticValueTrimmed = String(cardVarMappedSynced[semanticVarName] ?? '').trim();
+      const numericSlotValueTrimmed = String(cardVarMappedSynced[numericSlotKey] ?? '').trim();
+      if (!semanticValueTrimmed && numericSlotValueTrimmed) {
+        cardVarMappedSynced[semanticVarName] = cardVarMappedSynced[numericSlotKey];
+      }
+      return;
+    }
+
+    // Carousel numeric placeholder ({{3}}, {{4}}, …): the slot key IS the token digit itself —
+    // numbers are allocated globally across the whole carousel (getNextCarouselVarToken), not
+    // re-numbered per card, so a position-based key here would target the wrong slot. Its value
+    // may be a mustache-wrapped tag reference (e.g. "3" -> "{{last_name}}") — mirror that onto the
+    // bare semantic key too so VarSegment editors keyed by tag name also prepopulate.
+    const slotValueTrimmed = String(cardVarMappedSynced[semanticVarName] ?? '').trim();
+    if (!slotValueTrimmed) return;
+    const mustacheInnerMatch = slotValueTrimmed.match(/^\{\{([^}]+)\}\}$/);
+    const innerSemanticName = mustacheInnerMatch?.[1]?.trim();
+    if (!innerSemanticName || innerSemanticName === semanticVarName) return;
+    const existingSemanticValue = String(cardVarMappedSynced[innerSemanticName] ?? '').trim();
+    if (!existingSemanticValue) {
+      cardVarMappedSynced[innerSemanticName] = cardVarMappedSynced[semanticVarName];
     }
   });
   return cardVarMappedSynced;

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

@@ -220,7 +220,8 @@ const baseProps = {
   onDescriptionChange: jest.fn(),
   onTitleAddVar: jest.fn(),
   onDescriptionAddVar: jest.fn(),
-  onTagSelect: jest.fn(),
+  onTitleTagSelect: jest.fn(),
+  onDescTagSelect: jest.fn(),
   onContextChange: jest.fn(),
   renderEditMessage: (val) => <div data-testid="render-edit-message">{val}</div>,
   onFieldChange: jest.fn(),