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

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

@@ -0,0 +1,60 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import { Edit } 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: {
+    getWeCrmAccounts: jest.fn(),
+    setTemplateDetails: jest.fn(),
+    getTemplateDetails: jest.fn(),
+    clearEditResponse: jest.fn(),
+    clearData: jest.fn(),
+    editTemplate: jest.fn(),
+  },
+  globalActions: { fetchSchemaForEntity: jest.fn(), addMessageToQueue: jest.fn() },
+  Templates: { selectedWeChatAccount: { id: 'acc-1' } },
+  Edit: {},
+  Create: {},
+  params: {},
+  templateData: {},
+  location: { query: { type: 'library', module: 'default' }, pathname: '/mobilepush/edit/' },
+  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,
+});
+
+describe('MobilePush/Edit — full mode keeps the slidebox open after saving', () => {
+  it('keeps the form (and its _id) and asks the host to stay open', () => {
+    const props = baseProps();
+    const wrapper = shallow(<Edit {...props} />);
+    const instance = wrapper.instance();
+    instance.getTransformedData = () => ({ _id: 'mp-9', name: 'Push', definition: { mode: 'text' } });
+    const formData = { 0: { 'message-title': 'Hi' } };
+    wrapper.setState({ formData, editData: { _id: 'mp-9' } });
+
+    instance.onUpdateTemplateComplete({ templateId: 'mp-9' });
+
+    expect(wrapper.state('formData')).toEqual(formData);
+    expect(wrapper.state('editData')).toEqual({ _id: 'mp-9' });
+    expect(props.getFormLibraryData).toHaveBeenCalledWith({ validity: true, keepSlideBoxOpen: true });
+  });
+
+  it('resets the host Save trigger when the update fails so the user can retry', () => {
+    const props = baseProps({ Edit: { editTemplateError: false } });
+    const wrapper = shallow(<Edit {...props} />);
+
+    wrapper.setProps({ Edit: { editTemplateError: true, editTemplateErrorMessage: 'boom' } });
+
+    expect(props.onValidationFail).toHaveBeenCalled();
+  });
+});

package/v2Containers/MobilePushNew/index.js

@@ -8,7 +8,9 @@ import {
   injectReducer,
   injectSaga,
 } from "@capillarytech/vulcan-react-sdk/utils";
-import { cloneDeep, get, isEmpty } from "lodash";
+import {
+  cloneDeep, get, isEmpty, isPlainObject,
+} from "lodash";
 import CapCheckbox from "@capillarytech/cap-ui-library/CapCheckbox";
 import CapInput from "@capillarytech/cap-ui-library/CapInput";
 import CapButton from "@capillarytech/cap-ui-library/CapButton";
@@ -541,6 +543,9 @@ export const MobilePushNew = ({
   const [showTestAndPreviewSlidebox, setShowTestAndPreviewSlidebox] = useState(false);
 
   const [iosContent, setIosContent] = useState(INITIAL_CONTENT);
+  // Full mode: id of the template created in this session — the form stays as is and later saves update it
+  const [savedTemplateId, setSavedTemplateId] = useState('');
+  const prevIsGetFormDataRef = useRef(false);
   // Refs to track object references for debugging
   const prevEditDataRef = useRef(null);
   const prevUploadedAssetDataRef = useRef(null);
@@ -2405,9 +2410,10 @@ export const MobilePushNew = ({
         intl,
       });
 
-      // Add template ID for edit mode
-      if ((isEditMode || computedCreativesMode === 'edit') && templateId) {
-        payload._id = templateId;
+      // Update when editing, or when continuing a template created earlier in this session (full mode)
+      const isUpdate = ((isEditMode || computedCreativesMode === 'edit') && !!templateId) || !!savedTemplateId;
+      if (isUpdate) {
+        payload._id = templateId || savedTemplateId;
       }
 
       const content = getContent(payload);
@@ -2427,7 +2433,7 @@ export const MobilePushNew = ({
           channel: MOBILE_PUSH_CHANNEL,
           timeTaken,
           content,
-          mode: (isEditMode || computedCreativesMode === 'edit') ? EDIT : CREATE,
+          mode: isUpdate ? EDIT : CREATE,
           imageAdded: definitionMode === IMAGE.toLowerCase(),
         });
         // --- BEGIN: Library mode communication fix ---
@@ -2460,6 +2466,29 @@ export const MobilePushNew = ({
         }
         // --- END: Library mode communication fix ---
 
+        // Full mode stays open; later saves update the template (host handles edit toast/refresh).
+        if (isFullMode) {
+          if (!isUpdate && response && (response.templateId || response._id)) {
+            const message = `${intl.formatMessage(messages.templateCreateSuccess)}`;
+            CapNotification.success({ key: 'createSuccess', message });
+            const savedResponse = response.templateId || response._id;
+            const newTemplateId = (isPlainObject(savedResponse) ? savedResponse._id : savedResponse) || '';
+            setSavedTemplateId(newTemplateId);
+            setTimeout(() => {
+              mobilePushActions.clearCreateResponse();
+            }, 100);
+            if (getFormLibraryData) {
+              getFormLibraryData({ _id: newTemplateId, validity: true, keepSlideBoxOpen: true });
+            }
+          } else if (isUpdate) {
+            // Let the host's edit-response handler read the response before it is cleared
+            setTimeout(() => {
+              mobilePushActions.clearEditResponse();
+            }, 100);
+          }
+          return;
+        }
+
         // Show success toast and refresh list after create (not edit)
         if ((!isEditMode || computedCreativesMode !== 'edit') && response && (response.templateId || response._id)) {
           const message = `${intl.formatMessage(messages.templateCreateSuccess)}`;
@@ -2505,7 +2534,7 @@ export const MobilePushNew = ({
 
       // --- Only call create/edit API in full mode ---
       if (isFullMode) {
-        if (isEditMode || computedCreativesMode === 'edit') {
+        if (isUpdate) {
           mobilePushActions.editTemplate(payload, (response) => {
             // Guard: If response is an Error object, show error notification and return
             if (response instanceof Error) {
@@ -2579,6 +2608,8 @@ export const MobilePushNew = ({
     isCarouselDataValid,
     isFullMode,
     templateId,
+    savedTemplateId,
+    computedCreativesMode,
   ]);
 
   // Helper to sync content between platforms
@@ -2931,7 +2962,10 @@ export const MobilePushNew = ({
   // In library mode: run liquid validation (extractTags) first; on success liquidMiddleWare calls handleSave
   // In full mode: call handleSave directly
   useEffect(() => {
-    if (isGetFormData) {
+    // Save once per Save click (false → true), not on every dependency change.
+    const isNewSaveClick = isGetFormData && !prevIsGetFormDataRef.current;
+    prevIsGetFormDataRef.current = isGetFormData;
+    if (isNewSaveClick) {
       if (!isFullMode) {
         liquidMiddleWare();
       } else {

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

@@ -117,3 +117,64 @@ describe('MobilePushNew', () => {
     await screen.findByPlaceholderText('Enter title');
   });
 });
+
+describe('MobilePushNew — full mode keeps the slidebox open after saving', () => {
+  const buildProps = (overrides = {}) => ({
+    accountData: {
+      ...accountData, accountId: 'acc-1', licenseCode: 'lic-1', sourceType: 'FCM',
+    },
+    templateData: {},
+    location: {},
+    injectedTags: {},
+    getDefaultTags: jest.fn(),
+    globalActions: { ...globalActions, addMessageToQueue: jest.fn() },
+    isFullMode: true,
+    isGetFormData: false,
+    getFormLibraryData: jest.fn(),
+    onValidationFail: jest.fn(),
+    onCreateComplete: jest.fn(),
+    handleClose: jest.fn(),
+    mobilePushActions: {
+      createTemplate: jest.fn((payload, callback) => callback({ templateId: 'mp-1' })),
+      editTemplate: jest.fn((payload, callback) => callback({ templateId: { _id: 'mp-1' } })),
+      clearCreateResponse: jest.fn(),
+      clearEditResponse: jest.fn(),
+      getWeCrmAccounts: jest.fn(),
+      getTemplateDetails: jest.fn(),
+      setTemplateDetails: jest.fn(),
+      uploadAsset: jest.fn(),
+      clearAsset: jest.fn(),
+      clearData: jest.fn(),
+      getIosCtas: jest.fn(),
+    },
+    ...overrides,
+  });
+  const ComponentWithStore = (props) => (
+    <Provider store={store}>
+      <ComponentToRender {...props} />
+    </Provider>
+  );
+
+  it('creates on the first save, stays open, and updates the same template on the next save', async () => {
+    const props = buildProps();
+    const { rerender } = render(<ComponentWithStore {...props} />);
+
+    fireEvent.change(await screen.findByPlaceholderText('Enter creative name'), { target: { value: 'Promo push' } });
+    fireEvent.change(await screen.findByPlaceholderText('Enter title'), { target: { value: 'Hello' } });
+    fireEvent.change(await screen.findByPlaceholderText('Enter message'), { target: { value: 'World' } });
+
+    rerender(<ComponentWithStore {...props} isGetFormData />); // Save click 1
+    expect(props.mobilePushActions.createTemplate).toHaveBeenCalledTimes(1);
+    expect(props.mobilePushActions.createTemplate.mock.calls[0][0]._id).toBeUndefined();
+    expect(props.getFormLibraryData).toHaveBeenCalledWith({ _id: 'mp-1', validity: true, keepSlideBoxOpen: true });
+    expect(props.handleClose).not.toHaveBeenCalled();
+    expect(props.onCreateComplete).not.toHaveBeenCalled();
+    expect(screen.getByPlaceholderText('Enter title')).toHaveValue('Hello'); // form kept as is
+
+    rerender(<ComponentWithStore {...props} isGetFormData={false} />);
+    rerender(<ComponentWithStore {...props} isGetFormData />); // Save click 2
+    expect(props.mobilePushActions.editTemplate).toHaveBeenCalledTimes(1);
+    expect(props.mobilePushActions.editTemplate.mock.calls[0][0]._id).toBe('mp-1');
+    expect(props.handleClose).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/Sms/Create/index.js

@@ -18,6 +18,7 @@ import './_smsCreate.scss';
 import FormBuilder from '../../../v2Components/FormBuilder';
 import * as actions from './actions';
 import messages from './messages';
+import editMessages from '../Edit/messages';
 import * as charCount from '../../../utils/smsCharCount';
 import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
 import {getMessageObject} from '../../../utils/messageUtils';
@@ -29,7 +30,7 @@ import { EMBEDDED, FULL } from '../../SmsTrai/Edit/constants';
 import {showError} from '../commonMethods';
 import withCreatives from '../../../hoc/withCreatives';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { CREATE, TRACK_CREATE_SMS } from '../../App/constants';
+import { CREATE, EDIT, TRACK_CREATE_SMS } from '../../App/constants';
 import injectReducer from '../../../utils/injectReducer';
 import v2SmsCreateReducer from './reducer';
 import * as globalActions from '../../Cap/actions';
@@ -57,6 +58,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       showTestAndPreviewSlidebox: false,
       isTestAndPreviewMode: false,
       pendingGetFormData: false,
+      // Full mode: id of the template created in this session — the form stays as is and later saves update it
+      savedTemplateId: '',
     };
     // Tracks the last validity value reported to SmsFallback so componentDidUpdate
     // does not dispatch on every render and create an infinite update loop.
@@ -263,30 +266,41 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     });
     const {
       formData,
+      savedTemplateId,
     } = this.state;
-    if (editResponse.templateId) {
+    const isUpdate = !!savedTemplateId; // a later save of the template created in this session
+    if (editResponse?.templateId) {
+      const savedResponse = editResponse.templateId; // the template or just its id
+      const templateId = (_.isPlainObject(savedResponse) ? savedResponse._id : savedResponse) || savedTemplateId;
       gtmPush('creativeDetails', {
-        id: editResponse.templateId,
+        id: templateId,
         name: formData?.['template-name'],
         channel: SMS,
         timeTaken,
         content: formData?.base?.['sms-editor'],
-        mode: CREATE,
+        mode: isUpdate ? EDIT : CREATE,
       });
-      this.resetSchema();
-      this.setState({
-        formData: {},
-        tabCount: 1,
-        currentTab: 1,
-        editData: {},
-      });
-      const message = this.props.intl.formatMessage(messages.smsTemplateCreatedSuccess);
+      const message = this.props.intl.formatMessage(isUpdate ? editMessages.templateEditedSuccessfully : messages.smsTemplateCreatedSuccess);
       CapNotification.success({key: 'createMessageSuccess', message});
       const module = this.props.location.query.module ? this.props.location.query.module : 'default';
       const type = this.props.location.query.type;
       if (this.props.isFullMode) {
-        this.props.getFormSubscriptionData({ value: editResponse.templateId, validity: true});
+        // Stay open: later saves update this template; first save switches the header.
+        this.setState({ savedTemplateId: templateId });
+        this.props.getFormSubscriptionData({
+          _id: templateId,
+          validity: true,
+          keepSlideBoxOpen: true,
+          ...(isUpdate ? {} : { continuedAsEdit: true }),
+        });
       } else {
+        this.resetSchema();
+        this.setState({
+          formData: {},
+          tabCount: 1,
+          currentTab: 1,
+          editData: {},
+        });
         this.props.router.push({
           pathname: `/sms/`,
           query: type === EMBEDDED ? {type: EMBEDDED, module} : {module},
@@ -995,7 +1009,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   validateAndSaveFormData = () => {
-    this.setState({startValidation: true});
+    // Re-arm per Save click (saves only on startValidation false → true).
+    this.setState({startValidation: false}, () => this.setState({startValidation: true}));
   }
   stopValidation = () => {
     this.setState({startValidation: false});
@@ -1083,6 +1098,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     obj.name = formData['template-name'];
     obj.versions.base = formData.base;
+    if (this.state.savedTemplateId) {
+      obj._id = this.state.savedTemplateId; // created earlier in this session: update it
+    }
 
     this.props.actions.createTemplate(obj, this.onCreateTemplateComplete);
   }

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

@@ -0,0 +1,92 @@
+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() },
+}));
+
+// Shallow-render the plain class (bypassing the withCreatives/Redux HOC) to exercise the
+// full-mode save flow: the form stays open and a create continues in place as an update.
+const baseProps = (overrides = {}) => ({
+  actions: { createTemplate: jest.fn() },
+  globalActions: { fetchSchemaForEntity: jest.fn(), addMessageToQueue: jest.fn() },
+  Create: {},
+  location: { query: { module: 'default' }, pathname: '/sms/create' },
+  route: { name: 'sms' },
+  router: { push: jest.fn() },
+  metaEntities: {},
+  intl: { formatMessage: (m) => (m && (m.defaultMessage || m.id)) || '' },
+  isFullMode: true,
+  getFormSubscriptionData: jest.fn(),
+  ...overrides,
+});
+
+const formData = {
+  0: { 'sms-editor': 'Hello {{optout}}', base: true },
+  base: { 'sms-editor': 'Hello {{optout}}', base: true },
+  'template-name': 'Promo',
+};
+
+describe('Sms/Create — full mode keeps the slidebox open after saving', () => {
+  it('create: keeps the form, remembers the id, and asks the host to stay open + switch the header', () => {
+    const props = baseProps();
+    const wrapper = shallow(<Create {...props} />);
+    wrapper.setState({ formData, tabCount: 1 });
+    const instance = wrapper.instance();
+
+    instance.saveFormData();
+    expect(props.actions.createTemplate.mock.calls[0][0]._id).toBeUndefined();
+    instance.onCreateTemplateComplete({ templateId: 'sms-1' });
+
+    expect(wrapper.state('savedTemplateId')).toBe('sms-1');
+    expect(wrapper.state('formData')).toEqual(formData);
+    expect(props.getFormSubscriptionData).toHaveBeenCalledWith({
+      _id: 'sms-1', validity: true, keepSlideBoxOpen: true, continuedAsEdit: true,
+    });
+    expect(props.router.push).not.toHaveBeenCalled();
+  });
+
+  it('the next save updates the created template (and does not re-send the header switch)', () => {
+    const props = baseProps();
+    const wrapper = shallow(<Create {...props} />);
+    wrapper.setState({ formData, tabCount: 1, savedTemplateId: 'sms-1' });
+    const instance = wrapper.instance();
+
+    instance.saveFormData();
+    expect(props.actions.createTemplate.mock.calls[0][0]._id).toBe('sms-1');
+    instance.onCreateTemplateComplete({ templateId: { _id: 'sms-1' } });
+
+    expect(props.getFormSubscriptionData).toHaveBeenCalledWith({ _id: 'sms-1', validity: true, keepSlideBoxOpen: true });
+  });
+
+  it('re-arms validation on every Save click (false, then true)', () => {
+    const wrapper = shallow(<Create {...baseProps()} />);
+    wrapper.setState({ startValidation: true }); // left set by the previous save
+    const instance = wrapper.instance();
+    const updates = [];
+    const originalSetState = instance.setState.bind(instance);
+    instance.setState = (update, callback) => {
+      if (update && typeof update === 'object' && 'startValidation' in update) updates.push(update.startValidation);
+      return originalSetState(update, callback);
+    };
+
+    instance.validateAndSaveFormData();
+
+    expect(updates).toEqual([false, true]);
+    expect(wrapper.state('startValidation')).toBe(true);
+  });
+
+  it('outside full mode keeps the old behaviour (form reset and navigation)', () => {
+    const props = baseProps({ isFullMode: false, metaEntities: { layouts: [{ definition: {} }] } });
+    const wrapper = shallow(<Create {...props} />);
+    wrapper.setState({ formData, tabCount: 1 });
+
+    wrapper.instance().onCreateTemplateComplete({ templateId: 'sms-1' });
+
+    expect(wrapper.state('formData')).toEqual({});
+    expect(props.router.push).toHaveBeenCalled();
+    expect(props.getFormSubscriptionData).not.toHaveBeenCalled();
+  });
+});

package/v2Containers/Sms/Edit/index.js

@@ -151,8 +151,10 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.setEditState(nextProps.templateDetails);
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.schema)) {
-      this.setState({schema: nextProps.metaEntities.layouts[0].definition, loadingStatus: this.state.loadingStatus + 1}, () => {
-        this.injectEvents(nextProps.metaEntities.layouts[0].definition);
+      // Copy the shared SMS layout (also used by Sms/Create) so Edit's handlers don't leak into it.
+      const schema = _.cloneDeep(nextProps.metaEntities.layouts[0].definition);
+      this.setState({schema, loadingStatus: this.state.loadingStatus + 1}, () => {
+        this.injectEvents(schema);
       });
       if (this.props.location.query.module !== 'library' || (this.props.location.query.module === 'library' && this.props.getDefaultTags)) {
         const query = {
@@ -170,7 +172,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         }
       }
     }
-    if (nextProps.Edit.editResponse && nextProps.Edit.editResponse.templateId) {
+    // Full mode stays in edit mode after saving — handled in onUpdateTemplateComplete
+    if (!this.props.isFullMode && nextProps.Edit.editResponse && nextProps.Edit.editResponse.templateId) {
       this.resetSchema();
       this.setState({
         formData: {},
@@ -269,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'],
@@ -278,22 +281,23 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         content: formData?.base?.['sms-editor'],
         mode: EDIT
       })
-      this.resetSchema();
-      this.setState({
-        formData: {},
-        tabCount: 1,
-        currentTab: 1,
-        editData: {},
-      });
       const message = this.props.intl.formatMessage(messages.templateEditedSuccessfully);
       CapNotification.success({key: 'editTemplateSuccess', message});
       this.props.actions.clearEditResponse();
       const module = this.props.location.query.module ? this.props.location.query.module : 'default';
       const type = this.props.location.query.type;
       if (this.props.isFullMode) {
-        const {versions, ...rest} = editResponse.templateId;
-        this.props.getFormSubscriptionData({ value: versions, ...rest, validity: true});
+        // Stay in edit mode with the saved content; the slidebox is closed only via its close icon
+        const {versions, ...rest} = _.isPlainObject(editResponse.templateId) ? editResponse.templateId : {};
+        this.props.getFormSubscriptionData({ value: versions, ...rest, validity: true, keepSlideBoxOpen: true });
       } else {
+        this.resetSchema();
+        this.setState({
+          formData: {},
+          tabCount: 1,
+          currentTab: 1,
+          editData: {},
+        });
         this.props.router.push({
           pathname: `/sms/`,
           query: type === 'embedded' ? {type: 'embedded', module} : {module},
@@ -539,7 +543,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   resetSchema() {
-    this.setState({ schema: this.props.metaEntities.layouts[0].definition });
+    // 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) });
   }
 
   validateFormData(formData) {
@@ -569,6 +574,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       tempContainer = this.injectContainer(tempContainer);
       return tempContainer;
     });
+    this.injectedSchema = _.cloneDeep(schema); // pristine injected layout for resetSchema
     this.setState({schema, loadingStatus: this.state.loadingStatus + 1});
     return schema;
   }
@@ -982,6 +988,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     //Logic to save in db etc
     //saveFormData gets called only when validation result is true
 
+    // Reset so the next Save click re-triggers FormBuilder (it only reacts to false → true).
+    this.stopValidation();
     const editData = _.cloneDeep(this.state.editData);
     const formData = _.cloneDeep(this.state.formData);
     editData.name = formData['template-name'];

package/v2Containers/Sms/Edit/tests/index.test.js

@@ -83,3 +83,69 @@ describe('Sms/Edit — onEmbeddedSmsFooterValidity reporting', () => {
     expect(onEmbeddedSmsFooterValidity).not.toHaveBeenCalled();
   });
 });
+
+describe('Sms/Edit — full mode saves repeatedly while the slidebox stays open', () => {
+  const fullModeProps = () => ({
+    ...baseProps(),
+    isFullMode: true,
+    location: { query: { module: 'default' } },
+  });
+  const savedState = {
+    editData: { _id: 'tpl-1', name: 'old', versions: { base: {}, history: [{}] } },
+    formData: { 'template-name': 'new', 0: { 'sms-editor': 'Hi' }, base: { 'sms-editor': 'Hi' } },
+  };
+
+  it('resets startValidation on submit so the next Save click triggers validation + API again', () => {
+    const props = fullModeProps();
+    const wrapper = shallow(<Edit {...props} />);
+    wrapper.setState(savedState);
+
+    wrapper.instance().validateAndSaveFormData();
+    expect(wrapper.state('startValidation')).toBe(true);
+    wrapper.instance().saveFormData(); // FormBuilder's onSubmit after validation passes
+    expect(props.actions.editTemplate).toHaveBeenCalledTimes(1);
+    expect(wrapper.state('startValidation')).toBe(false);
+
+    // Second Save: a fresh false → true edge for FormBuilder
+    wrapper.instance().validateAndSaveFormData();
+    expect(wrapper.state('startValidation')).toBe(true);
+    wrapper.instance().saveFormData();
+    expect(props.actions.editTemplate).toHaveBeenCalledTimes(2);
+  });
+
+  it('keeps the form and asks the host to keep the slidebox open after a successful save', () => {
+    const props = fullModeProps();
+    const wrapper = shallow(<Edit {...props} />);
+    wrapper.setState(savedState);
+
+    wrapper.instance().onUpdateTemplateComplete({ templateId: { _id: 'tpl-1', versions: { base: {} } } });
+
+    expect(wrapper.state('formData')).toEqual(savedState.formData);
+    expect(props.getFormSubscriptionData).toHaveBeenCalledWith(
+      expect.objectContaining({ _id: 'tpl-1', validity: true, keepSlideBoxOpen: true }),
+    );
+  });
+});
+
+describe('Sms/Edit — does not mutate the shared SMS layout', () => {
+  it('injects into its own copy so Edit handlers never leak into Create', () => {
+    const sharedLayout = {
+      standalone: {
+        sections: [{
+          type: 'multicols',
+          inputFields: [{ cols: [{ id: 'save-button', type: 'button', value: 'Save' }] }],
+        }],
+      },
+      containers: [],
+    };
+    const props = { ...baseProps(), isFullMode: true, location: { query: { module: 'default' } } };
+    const wrapper = shallow(<Edit {...props} />);
+
+    wrapper.setProps({ metaEntities: { layouts: [{ definition: sharedLayout }] } });
+
+    const ownSaveButton = wrapper.state('schema').standalone.sections[0].inputFields[0].cols[0];
+    expect(ownSaveButton.value).toBe('Save');
+    expect(ownSaveButton.injectedEvents).toBeDefined();
+    expect(sharedLayout.standalone.sections[0].inputFields[0].cols[0].injectedEvents).toBeUndefined();
+  });
+});

package/v2Containers/Templates/index.js

@@ -726,9 +726,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       });
       
       this.getAllTemplates({params, resetPage: true});
-      
-      this.props.mobilePushNewActions.clearData();
-      
+
+      // Open form still uses this data; cleared on close (onCreateComplete).
+      if (!this.state.routeParams) {
+        this.props.mobilePushNewActions.clearData();
+      }
+
       this.props.mobilePushNewActions.clearEditResponse();
       
       // Reset flag after a delay to allow for next edit
@@ -1728,6 +1731,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   onCreateComplete = (isReloadTemplates) => {
+    // Push edit data kept for the open slidebox (see the MobilePushNew edit-response handling) is cleared on close
+    if (this.state.channel?.toLowerCase() === MOBILE_PUSH_LOWERCASE && this.props.mobilePushNewActions?.clearData) {
+      this.props.mobilePushNewActions.clearData();
+    }
     this.setState({routeParams: null, previewOpen: false}, () => {
       if (this.isFullMode() && isReloadTemplates) {
         this.getAllTemplates({params: {}}, true);
@@ -5205,9 +5212,15 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                   messages={messages}
                   isFullMode={isFullMode}
                   templateData={creativesParams}
-                  getCreativesData={() => {
+                  getCreativesData={(creativesData) => {
+                    // Saved but slidebox stays open: refresh the list without closing.
+                    if (creativesData?.keepSlideBoxOpen) {
+                      this.getAllTemplates({params: {}}, true);
+                      return;
+                    }
                     this.onCreateComplete(true);
                   }}
+                  switchToEditAfterCreate={this.canPerform(PERMISSIONS.CREATIVE_EDIT)}
                   channel={route.name.toUpperCase()}
                   handleCloseCreatives={this.onCreateComplete}
                   selectedWeChatAccount={get(