Merge pull request #2107 from marmelab/next

Prepare 2.2.0

Author: fzaninotto

.travis.yml

@@ -12,10 +12,10 @@ dist: trusty
 cache:
   yarn: true
   directories:
-    - node_modules
+    - ~/.cache
 before_install:
     - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
-    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
+    - curl -o- -L https://yarnpkg.com/install.sh | bash
     - source ~/.bashrc
     - sh -e /etc/init.d/xvfb start
     - sleep 3

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v2.2.0
+
+* Add Export feature ([fzaninotto](https://github.com/fzaninotto))
+* Add the `callback` side effect ([fzaninotto](https://github.com/fzaninotto))
+* Add Error Page ([fzaninotto](https://github.com/fzaninotto))
+* Add clear button on inputs ([djhi](https://github.com/djhi))
+* Add ability to clone a record ([fzaninotto](https://github.com/fzaninotto))
+* Add validation for `dataProvider` response format ([djhi](https://github.com/djhi), [fzaninotto](https://github.com/fzaninotto))
+* Add Tooltips To Icon Buttons ([fzaninotto](https://github.com/fzaninotto))
+* Add ability to alter values after submission and before saving them ([djhi](https://github.com/djhi))
+* Add support for forms in lists ([djhi](https://github.com/djhi))
+* Add support for `asyncBlurFields` in forms ([fzaninotto](https://github.com/fzaninotto))
+* Add redirection to the previous page when a `FETCH_ERROR` occurs ([djhi](https://github.com/djhi))
+* Add `<CreateActions>` and `<RecordTitle>` components ([djhi](https://github.com/djhi))
+* Update the UI to make the `<AppBar>` dense ([fzaninotto](https://github.com/fzaninotto))
+* Update the UI to make the page heading smaller ([fzaninotto](https://github.com/fzaninotto))
+* Update the `<ListView>` implementation to make it easier to override ([fzaninotto](https://github.com/fzaninotto))
+* Fix bug with `defaultValues` and `<TabbedForm>` ([djhi](https://github.com/djhi))
+* Fix bug with `defaultValues` and `<FormDataConsumer>` ([djhi](https://github.com/djhi))
+* Fix bug with Form state being persisted between resources ([djhi](https://github.com/djhi))
+* Fix `defaultValue` for `<ArrayInput>` ([djhi](https://github.com/djhi))
+
 ## v2.1.5
 
 * Fix `NumberField` style regression in Show views ([djhi](https://github.com/djhi))

cypress/integration/create.js

@@ -4,6 +4,7 @@ import loginPageFactory from '../support/LoginPage';
 
 describe('Create Page', () => {
     const CreatePage = createPageFactory('/#/posts/create');
+    const UserCreatePage = createPageFactory('/#/users/create');
     const ShowPage = showPageFactory('/#/posts/14/show');
     const LoginPage = loginPageFactory('/#/login');
 
@@ -21,7 +22,18 @@ describe('Create Page', () => {
         );
     });
 
-    it('should have a working array input with references', () => {
+    it('should put the ArrayInput default value', () => {
+        const currentDate = new Date();
+        const currentDateString = currentDate.toISOString().slice(0, 10);
+        cy.get(CreatePage.elements.input('backlinks[0].date')).should(el =>
+            expect(el).to.have.value(currentDateString)
+        );
+        cy.get(CreatePage.elements.input('backlinks[0].url')).should(el =>
+            expect(el).to.have.value('http://google.com')
+        );
+    });
+
+  it('should have a working array input with references', () => {
         cy.get(CreatePage.elements.addAuthor).click();
         cy.get(CreatePage.elements.input('authors[0].user_id')).should(
             el => expect(el).to.exist
@@ -75,6 +87,33 @@ describe('Create Page', () => {
         ShowPage.delete();
     });
 
+    it('should allow to call a custom action updating values before submit', () => {
+        const values = [
+            {
+                type: 'input',
+                name: 'title',
+                value: 'Test title',
+            },
+            {
+                type: 'textarea',
+                name: 'teaser',
+                value: 'Test teaser',
+            },
+            {
+                type: 'checkbox',
+                name: 'commentable',
+                value: false,
+            },
+        ];
+
+        CreatePage.setValues(values);
+        CreatePage.submitWithAverageNote();
+        ShowPage.waitUntilVisible();
+        ShowPage.gotoTab(3);
+        cy.contains('10');
+        ShowPage.delete();
+    });
+
     it('should not accept creation without required fields', () => {
         const values = [
             {
@@ -87,4 +126,40 @@ describe('Create Page', () => {
         CreatePage.submit();
         cy.contains('Required field');
     });
+
+    it('should not reset form values when an input with defaultValue is dynamically added', () => {
+        const values = [
+            {
+                type: 'input',
+                name: 'title',
+                value: 'Test title',
+            },
+        ];
+        CreatePage.setValues(values);
+        cy.get(CreatePage.elements.input('average_note')).should(el =>
+            expect(el).to.have.value('5')
+        );
+        cy.get(CreatePage.elements.input('title')).should(el =>
+            expect(el).to.have.value('Test title')
+        );
+    });
+
+    it('should not reset the form value when switching tabs', () => {
+        LoginPage.navigate();
+        LoginPage.login('admin', 'password');
+        UserCreatePage.navigate();
+
+        CreatePage.setValues([
+            {
+                type: 'input',
+                name: 'name',
+                value: 'The real Slim Shady!',
+            },
+        ]);
+        CreatePage.gotoTab(2);
+        CreatePage.gotoTab(1);
+        cy.get(CreatePage.elements.input('name')).should(el =>
+            expect(el).to.have.value('The real Slim Shady!')
+        );
+    });
 });

cypress/support/CreatePage.js

@@ -7,8 +7,11 @@ export default url => ({
         snackbar: 'div[role="alertdialog"]',
         submitButton: ".create-page button[type='submit']",
         submitAndAddButton:
-            ".create-page form>div:last-child button[type='button']",
+            ".create-page form>div:last-child button[type='button']:nth-child(2)",
+        submitCommentable:
+            ".create-page form>div:last-child button[type='button']:last-child",
         descInput: '.ql-editor',
+        tab: index => `.form-tab:nth-of-type(${index})`,
     },
 
     navigate() {
@@ -20,6 +23,12 @@ export default url => ({
     },
 
     setInputValue(type, name, value, clearPreviousValue = true) {
+        if (type === 'checkbox') {
+            if (value === true) {
+                return cy.get(this.elements.input(name, 'input')).check();
+            }
+            return cy.get(this.elements.input(name, 'input')).check();
+        }
         if (clearPreviousValue) {
             cy.get(this.elements.input(name, type)).clear();
         }
@@ -28,10 +37,12 @@ export default url => ({
 
     setValues(values, clearPreviousValue = true) {
         values.forEach(val => {
-            if (clearPreviousValue) {
-                cy.get(this.elements.input(val.name, val.type)).clear();
-            }
-            cy.get(this.elements.input(val.name, val.type)).type(val.value);
+            this.setInputValue(
+                val.type,
+                val.name,
+                val.value,
+                clearPreviousValue
+            );
         });
     },
 
@@ -48,4 +59,15 @@ export default url => ({
         cy.get(this.elements.body).click(); // dismiss notification
         cy.wait(200); // let the notification disappear (could block further submits)
     },
+
+    submitWithAverageNote() {
+        cy.get(this.elements.submitCommentable).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)
+    },
+
+    gotoTab(index) {
+        cy.get(this.elements.tab(index)).click();
+    },
 });