@capillarytech/creatives-library 8.0.325-alpha.0 → 8.0.325

package/package.json

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

package/v2Components/CommonTestAndPreview/_commonTestAndPreview.scss

@@ -150,7 +150,8 @@
   margin-right: 0.5rem;
 }
 
-.cap-slide-box-v2.common-test-and-preview-slidebox .cap-slide-box-v2-container {
+/* CapSlideBox defaults to z-index 100; RCS SMS fallback slidebox + tag popovers use 10010–10020 — must stack above or close control is not clickable. */
+.cap-slide-box-v2.common-test-and-preview-slidebox {
   z-index: 10030;
 }
 

package/v2Containers/CreativesContainer/index.js

@@ -743,6 +743,7 @@ export class Creatives extends React.Component {
             smsFallBackContent = {},
             creativeName = "",
             channel = constants.RCS,
+            accountId = "",
             rcsCardVarMapped,
           } = templateData || {};
           const { isFullMode: isFullModeForRcsPayload } = this.props;
@@ -784,6 +785,7 @@ export class Creatives extends React.Component {
                   RCS: {
                     rcsContent: {
                       ...rcsContent,
+                      ...(accountId && !isFullMode && { accountId }),
                       cardContent: [
                         {
                           ...cardContent,
@@ -1235,7 +1237,7 @@ export class Creatives extends React.Component {
           };
         }
         break;
-      case constants.FACEBOOK: {
+      case constants.FACEBOOK:
         if (template.value) {
           const FacebookAd = template?.value?.versions?.base?.content?.FacebookAd;
           const { type } = FacebookAd[0];
@@ -1279,9 +1281,8 @@ export class Creatives extends React.Component {
             selectedMarketingObjective: template.value.selectedMarketingObjective,
           };
         }
-      }
         break;
-      case constants.RCS: {
+      case constants.RCS:
         if (template.value) {
           const { isFullMode: isFullModeForRcsConsumerPayload } = this.props;
           const { name = "", versions = {} } = template.value || {};
@@ -1329,6 +1330,7 @@ export class Creatives extends React.Component {
             contentType = "",
             cardType = "",
             cardSettings = {},
+            accountId = "",
           } = get(versions, 'base.content.RCS.rcsContent', {});
           const rootRcsCardVarMappedFromSubmit = get(template, 'value.rcsCardVarMapped');
           const firstCardFromSubmit = Array.isArray(cardContentFromSubmit)
@@ -1358,6 +1360,7 @@ export class Creatives extends React.Component {
             channel,
             creativeName: name,
             rcsContent,
+            accountId: accountId,
             ...(includeRootRcsCardVarMappedOnConsumerPayload
               ? { rcsCardVarMapped: cardVarMappedFromFirstRcsCard }
               : {}),
@@ -1379,9 +1382,8 @@ export class Creatives extends React.Component {
             };
           }
         }
-      }
         break;
-      case constants.ZALO: {
+      case constants.ZALO:
         if (template.value) {
           templateData = {
             ...template.value,
@@ -1390,7 +1392,6 @@ export class Creatives extends React.Component {
             delete templateData.type;
           }
         }
-      }
         break;
       case constants.WEBPUSH: {
         if (template.value) {

package/v2Containers/Rcs/index.js

@@ -262,6 +262,7 @@ export const Rcs = (props) => {
   const [accessToken, setAccessToken] = useState('');
   const [hostName, setHostName] = useState('');
   const [accountName, setAccountName] = useState('');
+  const [rcsAccount, setRcsAccount] = useState('');
   useEffect(() => {
     const accountObj = accountData.selectedRcsAccount || {};
     if (!isEmpty(accountObj)) {
@@ -277,12 +278,14 @@ export const Rcs = (props) => {
       setAccessToken(configs.accessToken || '');
       setHostName(accountObj.hostName || '');
       setAccountName(accountObj.name || '');
+      setRcsAccount(accountObj.id || '');
     } else {
       setAccountId('');
       setWecrmAccountId('');
       setAccessToken('');
       setHostName('');
       setAccountName('');
+      setRcsAccount('');
     }
   }, [accountData.selectedRcsAccount]);
 
@@ -750,7 +753,10 @@ export const Rcs = (props) => {
         get(details, 'versions.base.content.RCS.rcsContent.cardSettings', '')
         || get(details, 'rcsContent.cardSettings', '');
       setMediaData(mediaData, mediaType, cardSettings);
-
+      if (details?.edit) {
+        const rcsAccountId = get(details, 'versions.base.content.RCS.rcsContent.accountId', '');
+        setRcsAccount(rcsAccountId);
+      }
       const smsFallbackContent = mergeRcsSmsFallBackContentFromDetails(details);
       const base = get(smsFallbackContent, 'versions.base', {});
       const updatedEditor = base['updated-sms-editor'] ?? base['sms-editor'];
@@ -1966,6 +1972,7 @@ const onTitleAddVar = () => {
           content: {
             RCS: {
               rcsContent: {
+                ...(rcsAccount && !isFullMode && { accountId: rcsAccount }),
                 cardType: STANDALONE,
                 cardSettings: {
                   cardOrientation: isMediaTypeImage ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.orientation || VERTICAL : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.orientation || VERTICAL,