Merge pull request #23 from marmelab/fix_custom_app_doc

[RFR] Fix custom app documentation
marmelab · Sep 8, 2016 · a8ce290 · a8ce290
2 parents 7bebbee + 361a30d
commit a8ce290
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/docs/Custom-App.md b/docs/Custom-App.md
@@ -32,7 +32,7 @@ import { Delete } from 'admin-on-rest/lib/mui';
 
 // create a Redux app
 const reducer = combineReducers({
-    admin: adminReducer(['posts, comments, users']),
+    admin: adminReducer([{ name: 'posts' }, { name: 'comments' }, { name: 'users' }]),
     routing: routerReducer,
 });
 const sagaMiddleware = createSagaMiddleware();
@@ -52,9 +52,9 @@ const App = () => (
         <Router history={history}>
             <Route path="/" component={Layout}>
                 <IndexRoute component={Dashboard} restClient={restClient} />
-                <CrudRoute key="posts" path="posts" list={PostList} edit={PostEdit} create={PostCreate} remove={Delete} />
-                <CrudRoute key="comments" path="comments" list={CommentList} edit={CommentEdit} create={CommentCreate} remove={Delete} />
-                <CrudRoute key="users" path="users" list={UserList} edit={UserEdit} create={UserCreate} remove={Delete} />
+                <CrudRoute path="posts" list={PostList} edit={PostEdit} create={PostCreate} remove={Delete} />
+                <CrudRoute path="comments" list={CommentList} edit={CommentEdit} create={CommentCreate} remove={Delete} />
+                <CrudRoute path="users" list={UserList} edit={UserEdit} create={UserCreate} remove={Delete} />
             </Route>
         </Router>
     </Provider>
@@ -109,9 +109,9 @@ The `<Layout>` component has the responsibility for displaying the menu. So you
 const MyMenu = () => (
     <Paper style={{ flex: '0 0 15em', order: -1 }}>
         <List>
-            <ListItem key="posts" containerElement={<Link to={`/posts`} />} primaryText="Posts" leftIcon={<MyPostIcon />} />
-            <ListItem key="comments" containerElement={<Link to={`/comments`} />} primaryText="Comments" leftIcon={<MyPostIcon />} />
-            <ListItem key="users" containerElement={<Link to={`/users`} />} primaryText="Users" leftIcon={<MyPostIcon />} />
+            <ListItem containerElement={<Link to={`/posts`} />} primaryText="Posts" leftIcon={<MyPostIcon />} />
+            <ListItem containerElement={<Link to={`/comments`} />} primaryText="Comments" leftIcon={<MyPostIcon />} />
+            <ListItem containerElement={<Link to={`/users`} />} primaryText="Users" leftIcon={<MyPostIcon />} />
             )}
         </List>
     </Paper>

diff --git a/src/mui/list/Datagrid.js b/src/mui/list/Datagrid.js
@@ -50,6 +50,8 @@ Datagrid.propTypes = {
 };
 
 Datagrid.defaultProps = {
+    data: {},
+    ids: [],
     selectable: true,
 };