cap-creatives-ui 8.0.280 → 8.0.321

package/app/v2Containers/Rcs/index.scss

@@ -5,18 +5,56 @@
   position: fixed;
   bottom: 0;
   width: 100%;
-  margin-left: -32px;
+  margin-left: -2rem;
   padding: $CAP_SPACE_32 $CAP_SPACE_24;
-  margin-top: 40px;
+  margin-top: 2.5rem;
   z-index: 1;
   .ant-btn {
     margin-right: $CAP_SPACE_16;
   }
+
+  .rcs-test-preview-btn {
+    margin-left: $CAP_SPACE_08;
+  }
 }
 
 .cap-rcs-creatives {
+  .rcs-creative-name-readonly {
+    margin-bottom: $CAP_SPACE_24;
+  }
+
+  .rcs-creative-name-value {
+    margin-top: $CAP_SPACE_08;
+    font-weight: 400;
+  }
+
   .rcs-scroll-div {
-    margin-bottom: 150px;
+    margin-bottom: 9.375rem;
+  }
+
+  &.rcs-edit-mode {
+    .rcs-scroll-div {
+      margin-bottom: 15.625rem;
+    }
+
+    .rcs-edit-template-message-input {
+      background-color: $CAP_G10;
+      padding: $CAP_SPACE_12 $CAP_SPACE_16;
+    }
+
+    .rcs-edit-template-message-split {
+      margin-bottom: $CAP_SPACE_08;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: $FONT_COLOR_03;
+      font-weight: 500;
+    }
+  }
+
+  /* Keep message box text lighter across RCS flows */
+  .rcs-edit-template-message-split {
+    color: $FONT_COLOR_03;
+    font-weight: 500;
   }
   .rcs-preview-container {
     .cap-row-v2 {
@@ -24,18 +62,52 @@
     }
   }
   .rcs-optional-label {
-    margin-left: 8px;
+    margin-left: $CAP_SPACE_08;
     color: $FONT_COLOR_03;
     font-weight: normal;
   }
   .rcs_text_area_wrapper {
     position: relative;
   }
+  .rcs-edit-template-message-input .ant-input,
+  .rcs-edit-template-message-input textarea.ant-input {
+    border-color: $CAP_G07;
+    box-shadow: none;
+    min-height: 2.5rem;
+    padding-top: $CAP_SPACE_08;
+    padding-bottom: $CAP_SPACE_08;
+    overflow: hidden;
+  }
+  .rcs-edit-template-message-input .ant-input:focus,
+  .rcs-edit-template-message-input .ant-input:active,
+  .rcs-edit-template-message-input textarea.ant-input:focus,
+  .rcs-edit-template-message-input textarea.ant-input:active {
+    border-color: $CAP_G07;
+    box-shadow: none;
+    outline: none;
+  }
   .rcs-button{
     display: inline-grid;
   }
-  .rcs-button-label{
-    margin-bottom: 17px;
+  .rcs-form-field-caption {
+    margin-bottom: $CAP_SPACE_16;
+  }
+
+  .rcs-form-section-heading {
+    display: flex;
+    margin-top: $CAP_SPACE_20;
+  }
+
+  .rcs-image-upload--top-spacing {
+    padding-top: $CAP_SPACE_20;
+  }
+
+  .rcs-dimension-select--bottom-spacing {
+    margin-bottom: $CAP_SPACE_20;
+  }
+
+  .rcs-fallback-section-divider {
+    margin: $CAP_SPACE_28 0;
   }
   .disabled-button{
      opacity: 0.5;
@@ -87,6 +159,7 @@
     margin-top: 13px;
     float: right;
   }
+
   .rcs-fallback-len-error{
     margin-top: 8px;
   }
@@ -127,6 +200,12 @@
     width: 430px;
 }
 
+// SMS fallback slidebox / tag popover: see v2Components/SmsFallback/index.scss (loaded with SmsFallback)
+
+.template-status-container {
+  margin-bottom: $CAP_SPACE_24;
+}
+
 .rcs-button-cta{
   margin-top: 1.25rem;
   margin-bottom: 0.75rem;

package/app/v2Containers/Rcs/messages.js

@@ -262,6 +262,10 @@ export default defineMessages({
     id: `${prefix}.fallbackLabel`,
     defaultMessage: 'Fallback SMS message',
   },
+  smsFallbackOptional: {
+    id: `${prefix}.smsFallbackOptional`,
+    defaultMessage: 'Fallback SMS message (Optional)',
+  },
   fallbackDesc: {
     id: `${prefix}.fallbackDesc`,
     defaultMessage: 'We would suggest to add fallback SMS',
@@ -281,7 +285,12 @@ export default defineMessages({
   },
   fallbackMsgPlaceholder: {
     id: `${prefix}.fallbackMsgPlaceholder`,
-    defaultMessage: 'Enter the text message content for fallback SMS',
+    defaultMessage: 'Add labels or text',
+  },
+  /** Shown only when a {{…}} slot has no value — not the saved text (that uses the input value). */
+  rcsVarSlotPlaceholder: {
+    id: `${prefix}.rcsVarSlotPlaceholder`,
+    defaultMessage: 'Add labels or text',
   },
   totalCharacters: {
     id: `${prefix}.totalCharacters`,

package/app/v2Containers/Rcs/rcsLibraryHydrationUtils.js

@@ -0,0 +1,205 @@
+import isEmpty from 'lodash/isEmpty';
+import get from 'lodash/get';
+import { RCS_SMS_FALLBACK_VAR_MAPPED_PROP } from '../../v2Components/CommonTestAndPreview/constants';
+
+/**
+ * Nested `versions…smsFallBackContent` and root `smsFallBackContent` (CreativesContainer mirror)
+ * can diverge. Merge explicitly (avoid `get(..., {}) || root` — `{}` is truthy and blocks fallback).
+ *
+ * When both exist, **nested wins on overlap**: the canonical RCS path is what `createPayload` / submit
+ * update; the root mirror can lag behind campaign parent state and would otherwise keep old
+ * `message` / `rcsSmsFallbackVarMapped` in hydration and approval payloads.
+ */
+export function mergeRcsSmsFallBackContentFromDetails(details) {
+  if (!details || typeof details !== 'object') return {};
+  const nestedSmsFallback = details?.versions?.base?.content?.RCS?.smsFallBackContent;
+  const rootSmsFallback = details?.smsFallBackContent;
+  const nestedRecord =
+    nestedSmsFallback != null && typeof nestedSmsFallback === 'object' ? nestedSmsFallback : {};
+  const rootRecord =
+    rootSmsFallback != null && typeof rootSmsFallback === 'object' ? rootSmsFallback : {};
+  return { ...rootRecord, ...nestedRecord };
+}
+
+/**
+ * Merge SMS fallback slot maps from API/templateData (`apiShape`) and editor state (`localShape`).
+ * Spreading `{ ...api, ...local }` lets `rcsSmsFallbackVarMapped: {}` on local wipe a populated API map,
+ * which keeps Done disabled in DLT campaigns until fixed.
+ */
+export function mergeRcsSmsFallbackVarMapLayers(apiShape = {}, localShape = {}) {
+  const readMap = (o) => {
+    if (!o || typeof o !== 'object') return {};
+    const camel = o.rcsSmsFallbackVarMapped;
+    const kebab = o['rcs-sms-fallback-var-mapped'];
+    const src =
+      camel && typeof camel === 'object'
+        ? camel
+        : kebab && typeof kebab === 'object'
+          ? kebab
+          : {};
+    return { ...src };
+  };
+  return { ...readMap(apiShape), ...readMap(localShape) };
+}
+
+/**
+ * First non-empty trimmed string for SMS fallback body used in DLT slot checks / payload `templateContent`.
+ * Prefer **raw** template fields before resolved `message` so `{#…#}` / `{{…}}` tokens are not lost
+ * when `message` is consumer-resolved text (campaigns).
+ */
+/**
+ * Whether an SMS fallback object carries template body, name, or var-map data (same rule as Rcs `createPayload`).
+ */
+export function hasMeaningfulSmsFallbackShape(s) {
+  return !!(
+    s
+    && (
+      String(
+        s.content
+        || s.templateContent
+        || s.message
+        || s.smsContent
+        || s.smsTemplateContent
+        || '',
+      ).trim() !== ''
+      || String(s.templateName || s.smsTemplateName || '').trim() !== ''
+      || (s.rcsSmsFallbackVarMapped && Object.keys(s.rcsSmsFallbackVarMapped).length > 0)
+      || (s[RCS_SMS_FALLBACK_VAR_MAPPED_PROP]
+        && Object.keys(s[RCS_SMS_FALLBACK_VAR_MAPPED_PROP]).length > 0)
+    )
+  );
+}
+
+/**
+ * Library `templateData`: merged root + nested `smsFallBackContent` (nested wins), matching `createPayload`.
+ */
+export function getLibrarySmsFallbackApiBaselineFromTemplateData(templateData) {
+  const smsFromTemplateRoot = get(
+    templateData,
+    'versions.base.content.RCS.smsFallBackContent',
+  );
+  return {
+    ...(templateData?.smsFallBackContent && typeof templateData.smsFallBackContent === 'object'
+      ? templateData.smsFallBackContent
+      : {}),
+    ...(smsFromTemplateRoot && typeof smsFromTemplateRoot === 'object'
+      ? smsFromTemplateRoot
+      : {}),
+  };
+}
+
+export function pickFirstSmsFallbackTemplateString(sms = {}) {
+  if (!sms || typeof sms !== 'object') return '';
+  const keys = [
+    'templateContent',
+    'smsTemplateContent',
+    'content',
+    'smsContent',
+    'message',
+  ];
+  for (let i = 0; i < keys.length; i += 1) {
+    const v = sms[keys[i]];
+    if (v == null) continue;
+    const s = String(v).trim();
+    if (s) return s;
+  }
+  return '';
+}
+
+/**
+ * Campaign reopen: payloads often keep tag/label values on numeric keys (`"1"`, `"2"`, …) while
+ * semantic keys (`user_name`, …) stay `""`. Copy non-empty slot values onto empty semantic keys so
+ * VarSegment editors prepopulate after Done → Edit without changing global resolve behavior.
+ */
+export function syncCardVarMappedSemanticsFromSlots(
+  cardVarMappedInput,
+  templateTitle,
+  templateDesc,
+  rcsVarRegex,
+) {
+  const cardVarMappedSynced =
+    cardVarMappedInput != null && typeof cardVarMappedInput === 'object'
+      ? { ...cardVarMappedInput }
+      : {};
+  const getVarNameFromToken = (token = '') => token.replace(/^\{\{|\}\}$/g, '');
+  const templateVarTokens = [
+    ...(templateTitle?.match(rcsVarRegex) ?? []),
+    ...(templateDesc?.match(rcsVarRegex) ?? []),
+  ];
+  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];
+    }
+  });
+  return cardVarMappedSynced;
+}
+
+/**
+ * Maps resolved campaign values back to `{{semanticKey}}` using `cardVarMapped` keys.
+ * Used when hydrating library/journey RCS edit from payloads without existing `{{…}}` tokens.
+ */
+export function getUnmappedDesc(str, mapping) {
+  if (!str) return '';
+  if (!mapping || Object.keys(mapping).length === 0) return str;
+  let result = str;
+  const replacements = [];
+  Object.entries(mapping).forEach(([key, value]) => {
+    const raw = (value ?? '').toString();
+    if (!raw || raw?.trim?.() === '') return;
+    const braced = /^\{\{[\s\S]*\}\}$/.test(raw) ? raw : `{{${raw}}}`;
+    replacements.push({ key, needle: raw });
+    if (braced !== raw) replacements.push({ key, needle: braced });
+  });
+  const seen = new Set();
+  const uniq = replacements
+    .filter(({ key, needle }) => {
+      const id = `${key}::${needle}`;
+      if (seen.has(id)) return false;
+      seen.add(id);
+      return true;
+    })
+    .sort((a, b) => (b.needle.length - a.needle.length));
+
+  uniq.forEach(({ key, needle }) => {
+    if (!needle) return;
+    const escaped = needle.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    const regex = new RegExp(escaped, 'g');
+    result = result.replace(regex, `{{${key}}}`);
+  });
+  return result;
+}
+
+export function hasRcsVarTokens(s, rcsVarRegex) {
+  return (s?.match(rcsVarRegex) ?? []).length > 0;
+}
+
+/**
+ * Library / journey: only run `getUnmappedDesc` when the loaded copy has no `{{…}}` tokens
+ * (e.g. fully resolved campaign text). If the API already has numeric or named slots, keep as-is.
+ */
+export function normalizeLibraryLoadedTitleDesc({
+  loadedTitle,
+  loadedDesc,
+  isFullMode,
+  cardVarMappedAfterHydration,
+  rcsVarRegex,
+}) {
+  const normalizedTitle =
+    !isFullMode
+    && !isEmpty(cardVarMappedAfterHydration)
+    && !hasRcsVarTokens(loadedTitle, rcsVarRegex)
+      ? getUnmappedDesc(loadedTitle, cardVarMappedAfterHydration)
+      : loadedTitle;
+  const normalizedDesc =
+    !isFullMode
+    && !isEmpty(cardVarMappedAfterHydration)
+    && !hasRcsVarTokens(loadedDesc, rcsVarRegex)
+      ? getUnmappedDesc(loadedDesc, cardVarMappedAfterHydration)
+      : loadedDesc;
+  return { normalizedTitle, normalizedDesc };
+}