@capillarytech/creatives-library 9.0.69 → 9.0.70-alpha.sprint-cap-213712.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "9.0.69",
+  "version": "9.0.70-alpha.sprint-cap-213712.13",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/CreativesContainer/index.js

@@ -1203,8 +1203,8 @@ export class Creatives extends React.Component {
           const { Templates, templateData: templateDataProps } = this.props;
           const { accountDetails: selectedAccountDetails, accountId: selectedAccountId } = templateDataProps || {};
           const selectedLineAccount = Templates && Templates.selectedLineAccount;
-          const accountDetails = selectedAccountDetails || (selectedLineAccount ? JSON.stringify(selectedLineAccount) : '');
-          const accountId = selectedAccountId || (selectedLineAccount ? selectedLineAccount.id : '');
+          const accountDetails = (selectedLineAccount ? JSON.stringify(selectedLineAccount) : selectedAccountDetails);
+          const accountId = (selectedLineAccount ? selectedLineAccount.id : '') || selectedAccountId || '';
           templateData = {
             channel,
             accountId,
@@ -1219,7 +1219,7 @@ export class Creatives extends React.Component {
           const { accountDetails: selectedAccountDetails, accountId: selectedAccountId } = templateDataProps || {};
           const selectedViberAccount = Templates && Templates.selectedViberAccount;
           const accountDetails = (selectedViberAccount ? JSON.stringify(selectedViberAccount) : selectedAccountDetails);
-          const accountId = selectedAccountId || (selectedViberAccount ? selectedViberAccount.id : '');
+          const accountId = (selectedViberAccount ? selectedViberAccount.id : '') || selectedAccountId || '';
           const { versions } = template.value;
           const content = cloneDeep(versions.base.content);
           content.scenarioKey = accountDetails ? get(JSON.parse(accountDetails), 'configs.scenario_key') : "";
@@ -1237,7 +1237,7 @@ export class Creatives extends React.Component {
           const selectedWhatsappAccount = Templates?.selectedWhatsappAccount;
           const { accountDetails: selectedAccountDetails, accountId: selectedAccountId } = templateDataProps || {};
           const accountDetails = (selectedWhatsappAccount || selectedAccountDetails);
-          const accountId = selectedAccountId || (selectedWhatsappAccount?.id || '');
+          const accountId = selectedWhatsappAccount?.id || selectedAccountId || '';
           const { versions } = template.value;
           const {
             languages = [{}],

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

@@ -139,6 +139,26 @@ describe('Test SlideBoxContent container', () => {
     expect(getCreativesData).toHaveBeenCalledTimes(2);
   });
 
+  it('WhatsApp getCreativesData prefers the live-selected account id over a stale carried-over accountId', async () => {
+    renderFunction('WHATSAPP', 'editTemplate', whatsappTemplates, {
+      accountId: 853,
+      accountName: 'Mochishoes_rcs',
+    });
+    const data = await renderedComponent
+      .instance()
+      .getCreativesData('WHATSAPP', whatsappGetCreativeData1, whatsappGetCreativeData1);
+    expect(data.accountId).toBe(12721);
+    expect(data.accountName).toBe('WhatsappAccount');
+  });
+
+  it('WhatsApp getCreativesData resolves the live account id when there is no carryover (fresh content)', async () => {
+    renderFunction('WHATSAPP', 'editTemplate', whatsappTemplates, {});
+    const data = await renderedComponent
+      .instance()
+      .getCreativesData('WHATSAPP', whatsappGetCreativeData1, whatsappGetCreativeData1);
+    expect(data.accountId).toBe(12721);
+  });
+
   it('It should clear templateData, on channel change.', async () => {
     renderFunction(
       'WHATSAPP',