Backport changes from 2.9.2 and 2.9.3

Author: fzaninotto

.huskyrc

@@ -0,0 +1,5 @@
+{
+  "hooks": {
+    "pre-commit": "lint-staged"
+  }
+}

.lintstagedrc

@@ -0,0 +1,10 @@
+{
+  "*.{js,jsx,ts,tsx}": [
+      "eslint --fix",
+      "git add",
+  ],
+  "*.{json,css,md}": [
+      "prettier",
+      "git add"
+  ]
+}

.prettierrc.js

@@ -12,4 +12,4 @@ module.exports = {
     tabWidth: 4,
     trailingComma: 'es5',
     useTabs: false
-}
+}

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## v2.9.3
+
+* Fix issue with `<TabbedForm>` when used inside a dialog ([3335](https://github.com/marmelab/react-admin/pull/3335)) ([griiettner](https://github.com/griiettner))
+* Fix `<AutoCompleteArrayInput>` not showing error message ([3327](https://github.com/marmelab/react-admin/pull/3327)) ([hithacker](https://github.com/hithacker))
+* Fix `<ListView>` component isn't exported ([3319](https://github.com/marmelab/react-admin/pull/3319)) ([cherniavskii](https://github.com/cherniavskii))
+* Fix `<MenuItemLink>` `primaryText` documentation ([3316](https://github.com/marmelab/react-admin/pull/3316)) ([fzaninotto](https://github.com/fzaninotto))
+* Fix typo in `callback` side effect documentation ([3297](https://github.com/marmelab/react-admin/pull/3297)) ([0xflotus](https://github.com/0xflotus))
+* Fix `<SelectInput>` is resettable even when it's disabled ([3293](https://github.com/marmelab/react-admin/pull/3293)) ([sagarbakhtar](https://github.com/sagarbakhtar))
+* Fix `<CheckboxGroupInput>` `options` documentation ([3292](https://github.com/marmelab/react-admin/pull/3292)) ([sagarbakhtar](https://github.com/sagarbakhtar))
+* Fix custom `<LogoutButton>` documentation ([3283](https://github.com/marmelab/react-admin/pull/3283)) ([sagarbakhtar](https://github.com/sagarbakhtar))
+* Fix posts list export in demo app ([3279](https://github.com/marmelab/react-admin/pull/3279)) ([fargito](https://github.com/fargito))
+* Fix nested property filter is hidden on location change but still applied ([3274](https://github.com/marmelab/react-admin/pull/3274)) ([donatascn](https://github.com/donatascn))
+* Fix duplicate API call in `<ReferenceArrayInput>` ([3252](https://github.com/marmelab/react-admin/pull/3252)) ([fargito](https://github.com/fargito))
+* Fix `<RichTextInput>` validation bugs ([3223](https://github.com/marmelab/react-admin/pull/3223)) ([cherniavskii](https://github.com/cherniavskii))
+* Fix `<AutocompleteInput>` popup re-renders after choice is selected ([3190](https://github.com/marmelab/react-admin/pull/3190)) ([FACOLOMBANI](https://github.com/FACOLOMBANI))
+* Replace tslint with eslint (because tslint is deprecated) ([3322](https://github.com/marmelab/react-admin/pull/3322)) ([djhi](https://github.com/djhi))
+* Update Prettier ([3304](https://github.com/marmelab/react-admin/pull/3304)) ([djhi](https://github.com/djhi))
+* Add `ra-auth-acl` to the ecosystem ([3301](https://github.com/marmelab/react-admin/pull/3301)) ([Kmaschta](https://github.com/Kmaschta))
+* Add pre-commit hooks to ensure code style is consistent on commits ([3306](https://github.com/marmelab/react-admin/pull/3306)) ([3334](https://github.com/marmelab/react-admin/pull/3334)) ([djhi](https://github.com/djhi))
+
+## v2.9.2
+
+* Fix spinner position in Login and Save buttons ([3276](https://github.com/marmelab/react-admin/pull/3276)) ([Luwangel](https://github.com/Luwangel))
+* Fix slow List view when fetching lots of rows ([3275](https://github.com/marmelab/react-admin/pull/3275)) ([slecoustre](https://github.com/slecoustre))
+* Fix `<BooleanInput>` does not show errors ([3271](https://github.com/marmelab/react-admin/pull/3271)) ([fargito](https://github.com/fargito))
+* Fix `<Query>` component sending request on every update ([3267](https://github.com/marmelab/react-admin/pull/3267)) ([fargito](https://github.com/fargito))
+* Fix duplicated entry in Reference documentation ([3259](https://github.com/marmelab/react-admin/pull/3259)) ([mabhub](https://github.com/mabhub))
+* Fix duplicated code formatting rules ([3258](https://github.com/marmelab/react-admin/pull/3258)) ([fargito](https://github.com/fargito))
+* Fix empty list after changing the items per page count ([3257](https://github.com/marmelab/react-admin/pull/3257)) ([sagarbakhtar](https://github.com/sagarbakhtar))
+* Fix `<RichTextInput>` does not use theme color to show focus ([3231](https://github.com/marmelab/react-admin/pull/3231)) ([cherniavskii](https://github.com/cherniavskii))
+* Add Bulgarian translation link ([3260](https://github.com/marmelab/react-admin/pull/3260)) ([ptodorov0](https://github.com/ptodorov0))
+
 ## v2.9.1
 
 * Fix handling of deleted references ([3216](https://github.com/marmelab/react-admin/pull/3216)) ([djhi](https://github.com/djhi))

Makefile

@@ -117,7 +117,8 @@ test-unit: ## launch unit tests
 	fi
 
 test-unit-watch: ## launch unit tests and watch for changes
-	yarn -s test-unit --watch
+	echo "Running unit tests..."; \
+	yarn -s test-unit; \
 
 test-e2e: ## launch end-to-end tests
 	@if [ "$(build)" != "false" ]; then \

README.md

@@ -191,7 +191,9 @@ or
 yarn test
 ```
 
-When working on the end to end tests, you can leverage [cypress](https://www.cypress.io/) runner by starting the simple example yourself (`make run-simple`) and starting cypress in another terminal (`make test-e2e-local` or `yarn test-e2e-local`).
+Besides, tests related to the modified files are ran automatically at commit.
+
+When working on the end to end tests, you can leverage [cypress](https://www.cypress.io/) runner by starting the simple example yourself (`make run-simple` or `yarn run-simple`) and starting cypress in another terminal (`make test-e2e-local` or `yarn test-e2e-local`).
 
 If you have coding standards problems, you can fix them automatically using `prettier` by calling
 
@@ -205,6 +207,8 @@ or
 yarn prettier
 ```
 
+However, these commands are ran automatically at each commit so you shouldn't have to worry about them.
+
 If you want to contribute to the documentation, install [jekyll](https://jekyllrb.com/docs/home/), then call
 
 ```sh

cypress/.eslintrc

@@ -1,9 +1,7 @@
 {
     "extends": "../.eslintrc",
-    "plugins": [
-        "cypress"
-    ],
-      "env": {
+    "plugins": ["cypress"],
+    "env": {
         "cypress/globals": true
     }
-}
+}

cypress/integration/create.js

@@ -76,6 +76,11 @@ describe('Create Page', () => {
                 name: 'teaser',
                 value: 'Test teaser',
             },
+            {
+                type: 'rich-text-input',
+                name: 'body',
+                value: 'Test body',
+            },
         ];
 
         CreatePage.setValues(values);
@@ -103,6 +108,11 @@ describe('Create Page', () => {
                 name: 'teaser',
                 value: 'Test teaser',
             },
+            {
+                type: 'rich-text-input',
+                name: 'body',
+                value: 'Test body',
+            },
         ];
 
         CreatePage.setValues(values);
@@ -124,6 +134,11 @@ describe('Create Page', () => {
                 name: 'teaser',
                 value: 'Test teaser',
             },
+            {
+                type: 'rich-text-input',
+                name: 'body',
+                value: 'Test body',
+            },
         ];
         CreatePage.setValues(values);
         CreatePage.submitAndAdd();
@@ -153,6 +168,11 @@ describe('Create Page', () => {
                 name: 'commentable',
                 value: false,
             },
+            {
+                type: 'rich-text-input',
+                name: 'body',
+                value: 'Test body',
+            },
         ];
 
         CreatePage.setValues(values);
@@ -212,4 +232,53 @@ describe('Create Page', () => {
             expect(el).to.have.value('The real Slim Shady!')
         );
     });
+
+    it('should not show rich text input error message when field is untouched', () => {
+        cy.get(CreatePage.elements.richTextInputError).should('not.exist');
+    });
+
+    it('should show rich text input error message when form is submitted', () => {
+        CreatePage.submit();
+        cy.get(CreatePage.elements.richTextInputError)
+            .should('exist')
+            .contains('Required');
+    });
+
+    it('should not show rich text input error message when form is submitted and input is filled with text', () => {
+        CreatePage.submit();
+        cy.get(CreatePage.elements.richTextInputError)
+            .should('exist')
+            .contains('Required');
+        cy.get(CreatePage.elements.input('body', 'rich-text-input')).type(
+            'text'
+        );
+        cy.get(CreatePage.elements.richTextInputError).should('not.exist');
+    });
+
+    it('should show body in edit view after creating new post', () => {
+        const values = [
+            {
+                type: 'input',
+                name: 'title',
+                value: 'Test title',
+            },
+            {
+                type: 'textarea',
+                name: 'teaser',
+                value: 'Test teaser',
+            },
+            {
+                type: 'rich-text-input',
+                name: 'body',
+                value: 'Test body',
+            },
+        ];
+
+        CreatePage.setValues(values);
+        CreatePage.submit();
+        EditPage.gotoTab(2);
+        cy.get(EditPage.elements.input('body', 'rich-text-input')).contains(
+            'Test body'
+        );
+    });
 });

cypress/integration/edit.js

@@ -25,7 +25,7 @@ describe('Edit Page', () => {
         });
 
         it('should allow to update elements', () => {
-            EditPostPage.setInputValue('title', 'Lorem Ipsum');
+            EditPostPage.setInputValue('input', 'title', 'Lorem Ipsum');
             EditPostPage.submit();
             // Ensure react-admin has handled the update as it will redirect to the list page
             // once done
@@ -37,7 +37,7 @@ describe('Edit Page', () => {
         });
 
         it('should redirect to list page after edit success', () => {
-            EditPostPage.setInputValue('title', 'Lorem Ipsum +');
+            EditPostPage.setInputValue('input', 'title', 'Lorem Ipsum +');
             EditPostPage.submit();
             cy.url().then(url => expect(url).to.contain('/#/posts'));
         });
@@ -71,13 +71,14 @@ describe('Edit Page', () => {
         );
 
         // This validate that the current redux form values are not kept after we navigate
-        EditCommentPage.setInputValue('body', 'Test');
+        EditCommentPage.setInputValue('input', 'body', 'Test');
 
         CreatePostPage.navigate();
 
-        cy.get(CreatePostPage.elements.bodyInput).should(el =>
-            // When the Quill editor is empty, it add the "ql-blank" CSS class
-            expect(el).to.have.class('ql-blank')
+        cy.get(CreatePostPage.elements.input('body', 'rich-text-input')).should(
+            el =>
+                // When the Quill editor is empty, it add the "ql-blank" CSS class
+                expect(el).to.have.class('ql-blank')
         );
     });
 
@@ -116,7 +117,7 @@ describe('Edit Page', () => {
         );
 
         // This validate that the current redux form values are not kept after we navigate
-        EditPostPage.setInputValue('title', 'Another title');
+        EditPostPage.setInputValue('input', 'title', 'Another title');
 
         CreatePostPage.navigate();
         cy.get(CreatePostPage.elements.input('title')).should(el =>

cypress/integration/list.js

@@ -218,7 +218,7 @@ describe('List Page', () => {
             cy.get('#13-expand').should(el => expect(el).to.exist);
 
             cy.get('[aria-label="Expand"]')
-                .eq(0) // We still targets the first button labeled Expand because the previous one should now have a Close label
+                .eq(0) // We still target the first button labeled Expand because the previous one should now have a Close label
                 .click()
                 .should(el => expect(el).to.have.attr('aria-expanded', 'true'))
                 .should(el => expect(el).to.have.attr('aria-label', 'Close'));

cypress/support/CreatePage.js

@@ -2,9 +2,14 @@ export default url => ({
     elements: {
         addAuthor: '.button-add-authors',
         body: 'body',
-        bodyInput: '.ra-input-body .ql-editor',
-        input: (name, type = 'input') => `.create-page ${type}[name='${name}']`,
+        input: (name, type = 'input') => {
+            if (type === 'rich-text-input') {
+                return `.ra-input-${name} .ql-editor`;
+            }
+            return `.create-page ${type}[name='${name}']`;
+        },
         inputs: `.ra-input`,
+        richTextInputError: '.create-page .ra-rich-text-input-error',
         snackbar: 'div[role="alertdialog"]',
         submitButton: ".create-page div[role='toolbar'] button[type='submit']",
         submitAndShowButton:
@@ -37,6 +42,9 @@ export default url => ({
             cy.get(this.elements.input(name, type)).clear();
         }
         cy.get(this.elements.input(name, type)).type(value);
+        if (type === 'rich-text-input') {
+            cy.wait(500);
+        }
     },
 
     setValues(values, clearPreviousValue = true) {

cypress/support/EditPage.js

@@ -2,7 +2,12 @@ export default url => ({
     elements: {
         body: 'body',
         deleteButton: '.ra-delete-button',
-        input: name => `.edit-page [name='${name}']`,
+        input: (name, type = 'input') => {
+            if (type === 'rich-text-input') {
+                return `.ra-input-${name} .ql-editor`;
+            }
+            return `.edit-page [name='${name}']`;
+        },
         inputs: `.ra-input`,
         tabs: `.form-tab`,
         snackbar: 'div[role="alertdialog"]',
@@ -20,11 +25,14 @@ export default url => ({
         return cy.get(this.elements.title);
     },
 
-    setInputValue(name, value, clearPreviousValue = true) {
+    setInputValue(type, name, value, clearPreviousValue = true) {
         if (clearPreviousValue) {
             cy.get(this.elements.input(name)).clear();
         }
-        return cy.get(this.elements.input(name)).type(value);
+        cy.get(this.elements.input(name)).type(value);
+        if (type === 'rich-text-input') {
+            cy.wait(500);
+        }
     },
 
     clickInput(name) {

docs/Actions.md

@@ -204,7 +204,7 @@ React-admin can handle the following side effects:
 - `redirectTo`: Redirect the user to another page. The property value should be the path to redirect the user to.
 - `refresh`: Force a rerender of the current view (equivalent to pressing the Refresh button). Set to true to enable.
 - `unselectAll`: Unselect all lines in the current datagrid. Set to true to enable.
-- `callback`: Execute an arbitrary function. The value should be the function to execute. React-admin will call the function with an object as parameter (`{ requestPayload, payload, error }`). The `payload` contains the decoded response body when it's successfull. When it's failed, the response body is passed in the `error`.
+- `callback`: Execute an arbitrary function. The value should be the function to execute. React-admin will call the function with an object as parameter (`{ requestPayload, payload, error }`). The `payload` contains the decoded response body when it's successful. When it's failed, the response body is passed in the `error`.
 - `basePath`: This is not a side effect, but it's used internally to compute redirection paths. Set it when you have a redirection side effect.
 
 ## Optimistic Rendering and Undo
@@ -565,7 +565,7 @@ The side effects accepted in the `meta` field of the action are the same as in t
 - `redirectTo`: Redirect the user to another page. The property value should be the path to redirect the user to.
 - `refresh`: Force a rerender of the current view (equivalent to pressing the Refresh button). Set to true to enable.
 - `unselectAll`: Unselect all lines in the current datagrid. Set to true to enable.
-- `callback`: Execute an arbitrary function. The value should be the function to execute. React-admin will call the function with an object as parameter (`{ requestPayload, payload, error }`). The `payload` contains the decoded response body when it's successfull. When it's failed, the response body is passed in the `error`.
+- `callback`: Execute an arbitrary function. The value should be the function to execute. React-admin will call the function with an object as parameter (`{ requestPayload, payload, error }`). The `payload` contains the decoded response body when it's successful. When it's failed, the response body is passed in the `error`.
 - `basePath`: This is not a side effect, but it's used internally to compute redirection paths. Set it when you have a redirection side effect.
 
 ## Making An Action Undoable

docs/Admin.md

@@ -173,8 +173,9 @@ const Menu = ({ resources, onMenuClick, logout }) => (
     <div>
         {resources.map(resource => (
             <MenuItemLink
+                key={resource.name}
                 to={`/${resource.name}`}
-                primaryText={resource.name}
+                primaryText={resource.options && resource.options.label || resource.name}
                 leftIcon={createElement(resource.icon)}
                 onClick={onMenuClick}
             />

docs/Authentication.md

@@ -287,7 +287,7 @@ const MyLogoutButton = ({ userLogout, ...rest }) => (
         xsmall={
             <MenuItem
                 onClick={userLogout}
-                {...sanitizeRestProps(rest)}
+                {...rest}
             >
                 <ExitIcon /> Logout
             </MenuItem>
@@ -296,7 +296,7 @@ const MyLogoutButton = ({ userLogout, ...rest }) => (
             <Button
                 onClick={userLogout}
                 size="small"
-                {...sanitizeRestProps(rest)}
+                {...rest}
             >
                 <ExitIcon /> Logout
             </Button>

docs/DataProviders.md

@@ -73,8 +73,6 @@ Due to the breaking changes, the following providers are no longer working with
 * **[DynamoDb](https://github.com/abiglobalhealth/aor-dynamodb-client)**: [abiglobalhealth/aor-dynamodb-client](https://github.com/abiglobalhealth/aor-dynamodb-client)
 * **[Epilogue](https://github.com/dchester/epilogue)**: [dunghuynh/aor-epilogue-client](https://github.com/dunghuynh/aor-epilogue-client)
 * **[Firebase](https://firebase.google.com/)**: [sidferreira/aor-firebase-client](https://github.com/sidferreira/aor-firebase-client)		
-* **[Firebase - Firestore](https://firebase.google.com/docs/firestore)**: [benwinding/react-admin-firebase](https://github.com/benwinding/react-admin-firebase)		
-* **[JSON API](http://jsonapi.org/)**: [moonlight-labs/aor-jsonapi-client](https://github.com/moonlight-labs/aor-jsonapi-client)		
 * **[Loopback](http://loopback.io/)**: [kimkha/aor-loopback](https://github.com/kimkha/aor-loopback)		
 * **[Parse Server](https://github.com/ParsePlatform/parse-server)**: [leperone/aor-parseserver-client](https://github.com/leperone/aor-parseserver-client)
 * **[PostgREST](http://postgrest.com/en/v0.4/)**: [tomberek/aor-postgrest-client](https://github.com/tomberek/aor-postgrest-client)