@capillarytech/creatives-library 9.0.70-alpha.sprint-cap-modalintact.12 → 9.0.70

package/package.json

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

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -20,6 +20,7 @@ import { RICH_MEDIA, MAP_TEMPLATE, CREATE } from '../WeChat/Wrapper/constants';
 import CallTask from '../CallTask';
 import MobliPushEdit from '../MobilePush/Edit';
 import * as constants from './constants';
+import { SMS as SMS_LOWERCASE } from '../../constants/unified';
 import LineContainer from '../Line/Container';
 import FTP from '../FTP';
 import Viber from '../Viber';
@@ -272,7 +273,7 @@ export function SlideBoxContent(props) {
     isEditSms: true,
     location: creativesLocationProps,
     isFullMode,
-    route: { name: 'sms' },
+    route: { name: SMS_LOWERCASE },
     isGetFormData,
     getFormSubscriptionData: getFormData,
     getDefaultTags: type,
@@ -670,7 +671,7 @@ export function SlideBoxContent(props) {
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         setIsLoadingContent={setIsLoadingContent}
         location={creativesLocationProps}
-        route={{ name: 'sms' }}
+        route={{ name: SMS_LOWERCASE }}
         isCreateSms={isCreateSms}
         isComponent
         templateData={templateData}

package/v2Containers/CreativesContainer/constants.js

@@ -25,6 +25,7 @@ export const INAPP = "INAPP";
 export const WEBPUSH = "WEBPUSH";
 export const WEBPUSH_BRAND_ICON = "WEBPUSH_BRAND_ICON";
 export const PREVIEW = "preview";
+export const CREATE_TEMPLATE = "createTemplate";
 export const EDIT_TEMPLATE = "editTemplate";
 export const JOURNEY = "journey";
 export const HTML = "HTML";

package/v2Containers/CreativesContainer/index.js

@@ -1205,8 +1205,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,
@@ -1221,7 +1221,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') : "";
@@ -1239,7 +1239,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 = [{}],
@@ -1714,13 +1714,13 @@ export class Creatives extends React.Component {
 
   getFormData = (template) => {
     // Full-mode save that stays open: host only refreshes its list (creates need edit permission).
-    const canStayOpen = this.state.slidBoxContent !== 'createTemplate' || this.props.switchToEditAfterCreate;
+    const canStayOpen = this.state.slidBoxContent !== constants.CREATE_TEMPLATE || this.props.switchToEditAfterCreate;
     if (this.props.isFullMode && template?.keepSlideBoxOpen && canStayOpen) {
       this.setState({ isGetFormData: false });
       if (template.continuedAsEdit) {
         this.handleCreateContinuedAsEdit(); // header switches to the edit title
       }
-      this.props.getCreativesData({ channel: this.state.currentChannel.toUpperCase(), keepSlideBoxOpen: true });
+      this.props.getCreativesData({ channel: this.state.currentChannel?.toUpperCase(), keepSlideBoxOpen: true });
       return;
     }
     // Always reset isGetFormData so the child does not re-send form data on every re-render
@@ -2356,8 +2356,8 @@ export class Creatives extends React.Component {
                 channel={currentChannel}
                 messages={this.props.messages}
                 // Edit title after an in-place create
-                slidBoxContent={this.state.isCreateContinuedAsEdit && this.state.slidBoxContent === 'createTemplate'
-                  ? 'editTemplate'
+                slidBoxContent={this.state.isCreateContinuedAsEdit && this.state.slidBoxContent === constants.CREATE_TEMPLATE
+                  ? constants.EDIT_TEMPLATE
                   : this.state.slidBoxContent}
                 templateData={templateData}
                 onShowTemplates={this.onShowTemplates}

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',

package/v2Containers/Email/index.js

@@ -1038,7 +1038,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const savedResponse = createResponse.templateId;
         const {versions, ...rest} = _.isPlainObject(savedResponse) ? savedResponse : {};
         const savedTemplateId = rest._id || (_.isString(savedResponse) ? savedResponse : '')
-          || previouslySavedTemplate?._id || this.props.Email.templateDetails?._id;
+          || previouslySavedTemplate?._id || this.props.Email?.templateDetails?._id;
         const savedTemplate = { ...this.lastSavePayload, _id: savedTemplateId, name: rest.name || this.lastSavePayload?.name };
         this.originalBaseTemplateContent = _.get(savedTemplate, ['versions', 'base', this.getBaseLanguage(), 'template-content']);
         this.setState({ savedTemplate, exportHtmlContentLocked: false });
@@ -2089,7 +2089,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   exportHtml = () => {
     // After a full-mode save the stored details are stale (or absent for a create): export what was just saved
-    const templateDetails = this.state.savedTemplate || this.props.Email.templateDetails;
+    const templateDetails = this.state.savedTemplate || this.props.Email?.templateDetails;
     if (_.isEmpty(templateDetails) || this.state.exportHtmlContentLocked) {
       CapNotification.error({ message: this.props.intl.formatMessage(messages.exportHtmlError) });
       return;

package/v2Containers/Sms/Create/index.js

@@ -269,7 +269,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       savedTemplateId,
     } = this.state;
     const isUpdate = !!savedTemplateId; // a later save of the template created in this session
-    if (editResponse.templateId) {
+    if (editResponse?.templateId) {
       const savedResponse = editResponse.templateId; // the template or just its id
       const templateId = (_.isPlainObject(savedResponse) ? savedResponse._id : savedResponse) || savedTemplateId;
       gtmPush('creativeDetails', {

package/v2Containers/Sms/Edit/index.js

@@ -272,7 +272,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const {
       formData
     } = this.state;
-    if (editResponse.templateId) {
+    if (editResponse?.templateId) {
       gtmPush('creativeDetails', {
         id: editResponse.templateId,
         name: formData?.['template-name'],
@@ -288,7 +288,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       const type = this.props.location.query.type;
       if (this.props.isFullMode) {
         // Stay in edit mode with the saved content; the slidebox is closed only via its close icon
-        const {versions, ...rest} = editResponse.templateId;
+        const {versions, ...rest} = _.isPlainObject(editResponse.templateId) ? editResponse.templateId : {};
         this.props.getFormSubscriptionData({ value: versions, ...rest, validity: true, keepSlideBoxOpen: true });
       } else {
         this.resetSchema();
@@ -544,7 +544,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   resetSchema() {
     // Back to Edit's own injected layout (a fresh copy, since versions mutate the active schema)
-    this.setState({ schema: _.cloneDeep(this.injectedSchema || this.props.metaEntities.layouts[0].definition) });
+    this.setState({ schema: _.cloneDeep(this.injectedSchema || this.props.metaEntities?.layouts?.[0]?.definition) });
   }
 
   validateFormData(formData) {