diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.js index 2ec206c58..ff54e8954 100644 --- a/ui/src/album/AlbumList.js +++ b/ui/src/album/AlbumList.js @@ -3,7 +3,6 @@ import { useSelector } from 'react-redux' import { AutocompleteInput, Filter, - List, NullableBooleanInput, NumberInput, ReferenceInput, @@ -11,7 +10,7 @@ import { Pagination, useTranslate, } from 'react-admin' -import { Title } from '../common' +import { List } from '../common' import { withWidth } from '@material-ui/core' import AlbumListActions from './AlbumListActions' import AlbumListView from './AlbumListView' @@ -60,9 +59,6 @@ const AlbumList = (props) => { return ( - } exporter={false} bulkActionButtons={false} actions={} diff --git a/ui/src/artist/ArtistList.js b/ui/src/artist/ArtistList.js index 3d61dca5b..c33c8373d 100644 --- a/ui/src/artist/ArtistList.js +++ b/ui/src/artist/ArtistList.js @@ -2,12 +2,11 @@ import React from 'react' import { Datagrid, Filter, - List, NumberField, SearchInput, TextField, } from 'react-admin' -import { artistLink, Pagination, Title } from '../common' +import { artistLink, List } from '../common' const ArtistFilter = (props) => ( @@ -18,15 +17,10 @@ const ArtistFilter = (props) => ( const ArtistList = (props) => ( - } sort={{ field: 'name', order: 'ASC' }} exporter={false} bulkActionButtons={false} filters={} - perPage={15} - pagination={} > diff --git a/ui/src/common/List.js b/ui/src/common/List.js new file mode 100644 index 000000000..ccd479976 --- /dev/null +++ b/ui/src/common/List.js @@ -0,0 +1,23 @@ +import React from 'react' +import { List as RAList } from 'react-admin' +import Pagination from './Pagination' +import { Title } from './index' + +const List = (props) => { + const { resource } = props + return ( + + } + perPage={15} + pagination={} + {...props} + /> + ) +} + +export default List diff --git a/ui/src/common/index.js b/ui/src/common/index.js index f54c19543..2b9bb28c3 100644 --- a/ui/src/common/index.js +++ b/ui/src/common/index.js @@ -9,6 +9,7 @@ import ArtistLinkField, { artistLink } from './ArtistLinkField' import SongDetails from './SongDetails' import SizeField from './SizeField' import DocLink from './DocLink' +import List from './List' export { Title, @@ -16,6 +17,7 @@ export { SizeField, BitrateField, Pagination, + List, PlayButton, SimpleList, RangeField, diff --git a/ui/src/player/PlayerList.js b/ui/src/player/PlayerList.js index 4d9e7f653..2bf176877 100644 --- a/ui/src/player/PlayerList.js +++ b/ui/src/player/PlayerList.js @@ -1,25 +1,18 @@ import React from 'react' import { Datagrid, - List, TextField, DateField, FunctionField, ReferenceField, } from 'react-admin' import { useMediaQuery } from '@material-ui/core' -import { SimpleList, Title } from '../common' +import { SimpleList, List } from '../common' const PlayerList = (props) => { const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs')) return ( - - } - exporter={false} - {...props} - > + {isXsmall ? ( r.client} diff --git a/ui/src/song/SongList.js b/ui/src/song/SongList.js index 24587881a..4eea4af60 100644 --- a/ui/src/song/SongList.js +++ b/ui/src/song/SongList.js @@ -3,18 +3,16 @@ import { Datagrid, Filter, FunctionField, - List, NumberField, SearchInput, TextField, } from 'react-admin' import { useMediaQuery } from '@material-ui/core' -import { DurationField, Pagination, SimpleList, Title } from '../common' +import { DurationField, SimpleList, List, SongDetails } from '../common' import { useDispatch } from 'react-redux' import { setTrack } from '../audioplayer' import { SongBulkActions } from './SongBulkActions' import { AlbumLinkField } from './AlbumLinkField' -import { SongDetails } from '../common' import { SongContextMenu } from './SongContextMenu' const SongFilter = (props) => ( @@ -30,15 +28,11 @@ const SongList = (props) => { return ( - } sort={{ field: 'title', order: 'ASC' }} exporter={false} bulkActionButtons={} filters={} perPage={isXsmall ? 50 : 15} - pagination={} > {isXsmall ? ( { const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs')) return ( - - } - exporter={false} - {...props} - > + {isXsmall ? ( r.name} diff --git a/ui/src/user/UserList.js b/ui/src/user/UserList.js index cc1af8c32..74775fc15 100644 --- a/ui/src/user/UserList.js +++ b/ui/src/user/UserList.js @@ -4,13 +4,12 @@ import { Datagrid, Filter, DateField, - List, SearchInput, SimpleList, TextField, } from 'react-admin' import { useMediaQuery } from '@material-ui/core' -import { Title } from '../common' +import { List } from '../common' const UserFilter = (props) => ( @@ -24,9 +23,6 @@ const UserList = (props) => { return ( - } sort={{ field: 'userName', order: 'ASC' }} exporter={false} filters={}