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

package/v2Containers/Line/Container/tests/__snapshots__/index.test.js.snap

@@ -9072,14 +9072,14 @@ new message content.",
                           />
                         </DefaultLoadingIcon>
                         <FormattedMessage
-                          defaultMessage="Done"
-                          id="creatives.containersV2.LineContainer.doneButtonLabel"
+                          defaultMessage="Save"
+                          id="creatives.containersV2.save"
                           key=".2"
                           style={Object {}}
                           values={Object {}}
                         >
                           <span>
-                            Done
+                            Save
                           </span>
                         </FormattedMessage>
                       </button>
@@ -12368,7 +12368,24 @@ new message content.",
         },
       }
     }
-    getFormSubscriptionData={[MockFunction]}
+    getFormSubscriptionData={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     handleClose={[MockFunction]}
     intl={
       Object {
@@ -13215,19 +13232,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -18352,14 +18357,14 @@ new message content.",
                           />
                         </DefaultLoadingIcon>
                         <FormattedMessage
-                          defaultMessage="Done"
-                          id="creatives.containersV2.LineContainer.doneButtonLabel"
+                          defaultMessage="Save"
+                          id="creatives.containersV2.save"
                           key=".2"
                           style={Object {}}
                           values={Object {}}
                         >
                           <span>
-                            Done
+                            Save
                           </span>
                         </FormattedMessage>
                       </button>
@@ -21656,7 +21661,24 @@ new message content.",
         },
       }
     }
-    getFormSubscriptionData={[MockFunction]}
+    getFormSubscriptionData={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     handleClose={[MockFunction]}
     intl={
       Object {
@@ -22563,19 +22585,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -31248,7 +31258,24 @@ new message content.",
         },
       }
     }
-    getFormSubscriptionData={[MockFunction]}
+    getFormSubscriptionData={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     handleClose={[MockFunction]}
     intl={
       Object {
@@ -32215,19 +32242,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -43056,6 +43071,12 @@ new message content.",
     getFormSubscriptionData={
       [MockFunction] {
         "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
           Array [
             Object {
               "_id": "629f7ecf134738019b2e332e",
@@ -43093,6 +43114,10 @@ new message content.",
             "type": "return",
             "value": undefined,
           },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
         ],
       }
     }
@@ -44062,19 +44087,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -59351,14 +59364,14 @@ new message content.",
                           />
                         </DefaultLoadingIcon>
                         <FormattedMessage
-                          defaultMessage="Done"
-                          id="creatives.containersV2.LineContainer.doneButtonLabel"
+                          defaultMessage="Save"
+                          id="creatives.containersV2.save"
                           key=".2"
                           style={Object {}}
                           values={Object {}}
                         >
                           <span>
-                            Done
+                            Save
                           </span>
                         </FormattedMessage>
                       </button>
@@ -62244,7 +62257,24 @@ new message content.",
         },
       }
     }
-    getFormSubscriptionData={[MockFunction]}
+    getFormSubscriptionData={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     handleClose={[MockFunction]}
     intl={
       Object {
@@ -62633,19 +62663,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -67532,14 +67550,14 @@ new message content.",
                           />
                         </DefaultLoadingIcon>
                         <FormattedMessage
-                          defaultMessage="Done"
-                          id="creatives.containersV2.LineContainer.doneButtonLabel"
+                          defaultMessage="Save"
+                          id="creatives.containersV2.save"
                           key=".2"
                           style={Object {}}
                           values={Object {}}
                         >
                           <span>
-                            Done
+                            Save
                           </span>
                         </FormattedMessage>
                       </button>
@@ -70433,7 +70451,24 @@ new message content.",
         },
       }
     }
-    getFormSubscriptionData={[MockFunction]}
+    getFormSubscriptionData={
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      }
+    }
     handleClose={[MockFunction]}
     intl={
       Object {
@@ -70882,19 +70917,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {
@@ -78921,6 +78944,12 @@ new message content.",
     getFormSubscriptionData={
       [MockFunction] {
         "calls": Array [
+          Array [
+            Object {
+              "keepSlideBoxOpen": true,
+              "validity": true,
+            },
+          ],
           Array [
             Object {
               "_id": "62a810e4d4715c768d6ee9cf",
@@ -79036,6 +79065,10 @@ new message content.",
             "type": "return",
             "value": undefined,
           },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
         ],
       }
     }
@@ -79487,19 +79520,7 @@ new message content.",
         "weCRMtemplates": Array [],
       }
     }
-    onCreateComplete={
-      [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    onCreateComplete={[MockFunction]}
     onShowTemplates={[MockFunction]}
     params={
       Object {

package/v2Containers/Line/Container/tests/index.test.js

@@ -108,3 +108,71 @@ describe('line wrapper test/>', () => {
     expect(renderedComponent).toMatchSnapshot();
   });
 });
+
+describe('LineContainer — full mode keeps the slidebox open after saving', () => {
+  // eslint-disable-next-line global-require
+  const { act } = require('react-dom/test-utils');
+  const renderLine = (overrides = {}) => {
+    const props = {
+      intl: { formatMessage: jest.fn() },
+      isFullMode: true,
+      Line: mockData.Line1,
+      onShowTemplates: jest.fn(),
+      handleClose: jest.fn(),
+      onCreateComplete: jest.fn(),
+      getFormSubscriptionData: jest.fn(),
+      Templates: mockData.Templates1,
+      lineData: mockData.Templates1,
+      templateData: mockData.templateData1,
+      params: {},
+      templateActions: { getWeCrmAccounts: jest.fn(), getAllTemplates: jest.fn(), setChannelAccount: jest.fn() },
+      actions: {
+        getTemplateDetails: jest.fn(),
+        createTemplate: jest.fn(),
+        clearEditResponse: jest.fn(),
+        editTemplate: jest.fn(),
+      },
+      ...overrides,
+    };
+    const wrapper = mountWithIntl(
+      <Provider store={store}>
+        <LineContainer {...props} />
+      </Provider>,
+    );
+    // Invoke the main button's handler directly (its enabled state depends on the mocked Wrapper's content)
+    const clickSave = () => {
+      wrapper.update();
+      act(() => { wrapper.find('CapButton.create-msg').prop('onClick')(); });
+    };
+    return { props, wrapper, clickSave };
+  };
+
+  it('create: stays open (header switches) and the next save updates the created template', () => {
+    const { props, clickSave } = renderLine();
+
+    clickSave();
+    expect(props.actions.createTemplate).toHaveBeenCalledTimes(1);
+    act(() => { props.actions.createTemplate.mock.calls[0][1]({ templateId: 'ln-1' }); });
+
+    expect(props.getFormSubscriptionData).toHaveBeenCalledWith({
+      _id: 'ln-1', validity: true, keepSlideBoxOpen: true, continuedAsEdit: true,
+    });
+    expect(props.onCreateComplete).not.toHaveBeenCalled();
+
+    clickSave();
+    expect(props.actions.createTemplate).toHaveBeenCalledTimes(1);
+    expect(props.actions.editTemplate).toHaveBeenCalledTimes(1);
+    expect(props.actions.editTemplate.mock.calls[0][0]._id).toBe('ln-1');
+  });
+
+  it('edit: stays open after a successful update', () => {
+    const { props, clickSave } = renderLine({ params: mockData.params1 });
+
+    clickSave();
+    expect(props.actions.editTemplate).toHaveBeenCalledTimes(1);
+    act(() => { props.actions.editTemplate.mock.calls[0][1]({ templateId: { _id: 'ln-9' } }); });
+
+    expect(props.getFormSubscriptionData).toHaveBeenCalledWith({ validity: true, keepSlideBoxOpen: true });
+    expect(props.onCreateComplete).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/MobilePush/Create/index.js

@@ -9,7 +9,7 @@ import PropTypes, { object } from 'prop-types';
 import React from 'react';
 import { bindActionCreators } from 'redux';
 import { notification } from 'antd';
-import {get, set, filter, isEmpty, map, forEach, uniqueId, cloneDeep, isEqual, findIndex} from 'lodash';
+import {get, set, filter, isEmpty, map, forEach, uniqueId, cloneDeep, isEqual, findIndex, isPlainObject} from 'lodash';
 import { createStructuredSelector } from 'reselect';
 import { intlShape, FormattedMessage } from 'react-intl';
 import styled from 'styled-components';
@@ -26,9 +26,10 @@ import { gtmPush } from '../../../utils/gtmTrackers';
 
 import { makeSelectTemplates } from '../../Templates/selectors';
 import messages from './messages';
+import editMessages from '../Edit/messages';
 import getEventsMap from '../eventsMap';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { CREATE, TRACK_CREATE_MPUSH } from '../../App/constants';
+import { CREATE, EDIT, TRACK_CREATE_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getContent, getMobilePushEmbeddedContentValidity } from '../commonMethods';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
@@ -53,6 +54,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         formData: {},
         tabCount: 1,
         currentTab: 1,
+        // Full mode: id of the template created in this session; later saves update it
+        savedTemplateId: '',
         loading: false,
         isFormValid: true,
         tabKey: '',
@@ -162,7 +165,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         }
       }
     } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
-      this.startValidation();
+      // Re-arm per Save click (saves only on startValidation false → true).
+      this.setState({ startValidation: false }, this.startValidation);
     }
     if (nextProps.Create.uploadedAssetData) {
       const formData = cloneDeep(this.state.formData);
@@ -1592,6 +1596,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       },
     } = obj || {};
     const label = this.props.location.pathname.indexOf('image') >= 0 ? 'image' : 'text';
+    // Full mode: a template created earlier in this session is updated (same API, with its _id)
+    const { savedTemplateId } = this.state;
+    if (savedTemplateId) {
+      obj._id = savedTemplateId;
+    }
     this.props.actions.createTemplate(obj, (response) => {
     const timeTaken = GA.timeTracker.stopTimer(TRACK_CREATE_MPUSH, {
       category: 'Creatives',
@@ -1604,14 +1613,24 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       channel: MOBILE_PUSH,
       timeTaken,
       content,
-      mode: CREATE,
+      mode: savedTemplateId ? EDIT : CREATE,
       imageAdded: definitionMode === 'image',
     });
 
+    this.props.actions.clearCreateResponse();
+    if (this.props.isFullMode) {
+      // Stay open: next save updates this template.
+      const savedResponse = response?.templateId;
+      const newTemplateId = (isPlainObject(savedResponse) ? savedResponse._id : savedResponse) || savedTemplateId;
+      this.setState({ savedTemplateId: newTemplateId });
+      const message = this.props.intl.formatMessage(savedTemplateId ? editMessages['MOBILEPUSH Template Edited Successfully'] : messages.messageCreateSuccess);
+      CapNotification.success({message, key: 'createMpushSuccess'});
+      this.props.getFormLibraryData({ _id: newTemplateId, validity: true, keepSlideBoxOpen: true });
+      return;
+    }
     this.discardValues();
     const message = this.props.intl.formatMessage(messages.messageCreateSuccess);
     CapNotification.success({message, key: 'createMpushSuccess'});
-    this.props.actions.clearCreateResponse();
     this.props.getFormLibraryData({validity: true});
     });
   };

package/v2Containers/MobilePush/Create/test/stayOpenOnSave.test.js

@@ -0,0 +1,80 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Create } from '../index';
+
+jest.mock('@capillarytech/cap-ui-library', () => ({
+  ...jest.requireActual('@capillarytech/cap-ui-library'),
+  CapNotification: { success: jest.fn(), error: jest.fn() },
+}));
+
+const baseProps = (overrides = {}) => ({
+  actions: {
+    createTemplate: jest.fn((obj, callback) => callback({ templateId: { _id: 'mp-1', name: 'Push' } })),
+    clearCreateResponse: jest.fn(),
+  },
+  globalActions: { fetchSchemaForEntity: jest.fn(), addMessageToQueue: jest.fn() },
+  Templates: { selectedWeChatAccount: { id: 'acc-1' } },
+  Create: {},
+  params: {},
+  location: { query: { type: 'library', module: 'default' }, pathname: '/mobilepush/create/text' },
+  route: { name: 'mobilepush' },
+  router: { push: jest.fn() },
+  metaEntities: {},
+  intl: { formatMessage: (m) => (m && (m.defaultMessage || m.id)) || '' },
+  isFullMode: true,
+  getFormLibraryData: jest.fn(),
+  onValidationFail: jest.fn(),
+  ...overrides,
+});
+
+const render = (overrides) => {
+  const props = baseProps(overrides);
+  const wrapper = shallow(<Create {...props} />);
+  const instance = wrapper.instance();
+  instance.getTransformedData = () => ({ name: 'Push', definition: { mode: 'text' } });
+  instance.discardValues = jest.fn();
+  return { props, wrapper, instance };
+};
+
+describe('MobilePush/Create — full mode keeps the slidebox open after saving', () => {
+  it('remembers the created template, keeps the form and asks the host to stay open', () => {
+    const { props, wrapper, instance } = render();
+
+    instance.saveFormData({});
+
+    expect(props.actions.createTemplate.mock.calls[0][0]._id).toBeUndefined();
+    expect(wrapper.state('savedTemplateId')).toBe('mp-1');
+    expect(instance.discardValues).not.toHaveBeenCalled();
+    expect(props.getFormLibraryData).toHaveBeenCalledWith({ _id: 'mp-1', validity: true, keepSlideBoxOpen: true });
+  });
+
+  it('updates the same template on the next save (plain id response too)', () => {
+    const { props, instance } = render();
+    props.actions.createTemplate.mockImplementation((obj, callback) => callback({ templateId: 'mp-1' }));
+
+    instance.saveFormData({});
+    instance.saveFormData({});
+
+    expect(props.actions.createTemplate).toHaveBeenCalledTimes(2);
+    expect(props.actions.createTemplate.mock.calls[1][0]._id).toBe('mp-1');
+  });
+
+  it('re-arms validation on each Save click (false, then true)', () => {
+    const { wrapper } = render({ isGetFormData: false });
+    wrapper.setState({ startValidation: true }); // left set by the previous save
+
+    wrapper.setProps({ isGetFormData: true });
+
+    expect(wrapper.state('startValidation')).toBe(true);
+  });
+
+  it('library mode is unchanged: form is discarded and the host is told as before', () => {
+    const { props, wrapper, instance } = render({ isFullMode: false });
+
+    instance.saveFormData({});
+
+    expect(instance.discardValues).toHaveBeenCalled();
+    expect(wrapper.state('savedTemplateId')).toBe('');
+    expect(props.getFormLibraryData).toHaveBeenCalledWith({ validity: true });
+  });
+});

package/v2Containers/MobilePush/Edit/index.js

@@ -185,7 +185,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         nextProps.getFormLibraryData(this.getFormData());
       }
     } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
-      this.startValidation();
+      // Re-arm per Save click (saves only on startValidation false → true).
+      this.setState({ startValidation: false }, this.startValidation);
     }
     let selectedWeChatAccount = {};
     const queryType = String(get(this.props, 'location.query.type', ''))?.toLowerCase();
@@ -281,6 +282,10 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     if (nextProps.Edit.editTemplateError && !_.isEqual(nextProps.Edit.editTemplateError, this.props.Edit.editTemplateError)) {
       const message = getMessageObject('error', (nextProps.Edit.editTemplateErrorMessage && nextProps.Edit.editTemplateErrorMessage !== '') ? nextProps.Edit.editTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong), true);
       this.props.globalActions.addMessageToQueue(message);
+      if (this.props.isFullMode && this.props.onValidationFail) {
+        // Slidebox stays open: reset the host's Save trigger so the user can retry
+        this.props.onValidationFail();
+      }
     }
   }
   componentWillUnmount() {
@@ -435,19 +440,20 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
     }
 
-    this.resetSchema();
-    this.setState({
-      formData: {},
-      tabCount: 1,
-      currentTab: 1,
-      editData: {},
-    });
     const message = this.props.intl.formatMessage(messages['MOBILEPUSH Template Edited Successfully']);
     CapNotification.success({message, key: 'editMpushSuccess'});
     this.props.actions.clearEditResponse();
     if (this.props.isFullMode) {
-      this.props.getFormLibraryData({validity: true});
+      // Stay open with the form as is (editData keeps the _id, so later saves update again); host refreshes its list
+      this.props.getFormLibraryData({ validity: true, keepSlideBoxOpen: true });
     } else {
+      this.resetSchema();
+      this.setState({
+        formData: {},
+        tabCount: 1,
+        currentTab: 1,
+        editData: {},
+      });
       const module = this.props.location.query.module ? this.props.location.query.module : 'default';
       const type = this.props.location.query.type;
       this.props.router.push({