[WIP] Fix create to edit form values

marmelab · Sep 19, 2018 · 7c3c027 · 7c3c027
1 parent 38d8030
commit 7c3c027
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 4 deletions.
diff --git a/cypress/integration/create.js b/cypress/integration/create.js
@@ -63,7 +63,7 @@ describe('Create Page', () => {
         );
     });
 
-    it('should redirect to show page after create success', () => {
+    it.only('should redirect to edit page after create success', () => {
         const values = [
             {
                 type: 'input',
@@ -79,6 +79,33 @@ describe('Create Page', () => {
 
         CreatePage.setValues(values);
         CreatePage.submit();
+        EditPage.waitUntilVisible();
+        cy.get(EditPage.elements.input('title')).should(el =>
+            expect(el).to.have.value('Test title')
+        );
+        cy.get(EditPage.elements.input('teaser')).should(el =>
+            expect(el).to.have.value('Test teaser')
+        );
+
+        EditPage.delete();
+    });
+
+    it('should redirect to show page after create success with "Save and show"', () => {
+        const values = [
+            {
+                type: 'input',
+                name: 'title',
+                value: 'Test title',
+            },
+            {
+                type: 'textarea',
+                name: 'teaser',
+                value: 'Test teaser',
+            },
+        ];
+
+        CreatePage.setValues(values);
+        CreatePage.submitAndShow();
         ShowPage.waitUntilVisible();
         EditPage.navigate();
         EditPage.delete();

diff --git a/cypress/support/CreatePage.js b/cypress/support/CreatePage.js
@@ -7,8 +7,10 @@ export default url => ({
         inputs: `.ra-input`,
         snackbar: 'div[role="alertdialog"]',
         submitButton: ".create-page button[type='submit']",
-        submitAndAddButton:
+        submitAndShowButton:
             ".create-page form>div:last-child button[type='button']:nth-child(2)",
+        submitAndAddButton:
+            ".create-page form>div:last-child button[type='button']:nth-child(3)",
         submitCommentable:
             ".create-page form>div:last-child button[type='button']:last-child",
         descInput: '.ql-editor',
@@ -55,6 +57,13 @@ export default url => ({
         cy.wait(200); // let the notification disappear (could block further submits)
     },
 
+    submitAndShow() {
+        cy.get(this.elements.submitAndShowButton).click();
+        cy.get(this.elements.snackbar);
+        cy.get(this.elements.body).click(); // dismiss notification
+        cy.wait(200); // let the notification disappear (could block further submits)
+    },
+
     submitAndAdd() {
         cy.get(this.elements.submitAndAddButton).click();
         cy.get(this.elements.snackbar);

diff --git a/examples/simple/src/i18n/en.js b/examples/simple/src/i18n/en.js
@@ -66,6 +66,7 @@ export const messages = {
             title: 'Post "%{title}"',
         },
         action: {
+            save_and_edit: 'Save and Edit',
             save_and_add: 'Save and Add',
             save_and_show: 'Save and Show',
             save_with_average_note: 'Save with Note',

diff --git a/examples/simple/src/posts/PostCreate.js b/examples/simple/src/posts/PostCreate.js
@@ -52,10 +52,16 @@ const SaveWithNoteButton = connect(
 
 const PostCreateToolbar = props => (
     <Toolbar {...props}>
+        <SaveButton
+            label="post.action.save_and_edit"
+            redirect="edit"
+            submitOnEnter={true}
+        />
         <SaveButton
             label="post.action.save_and_show"
             redirect="show"
-            submitOnEnter={true}
+            submitOnEnter={false}
+            variant="flat"
         />
         <SaveButton
             label="post.action.save_and_add"

diff --git a/packages/ra-core/src/sideEffect/recordForm.js b/packages/ra-core/src/sideEffect/recordForm.js
@@ -19,8 +19,8 @@ export function* handleLocationChange({ payload }) {
 
     previousLocation = payload;
 
-    yield put(resetForm());
     yield put(destroy(REDUX_FORM_NAME));
+    yield put(resetForm());
 }
 
 export default function* recordForm() {