Added individual AddToPlaylistDialogs to each list view
This commit is contained in:
@@ -20,7 +20,6 @@ import themeReducer from './personal/themeReducer'
|
|||||||
import { addToPlaylistDialogReducer } from './dialogs/dialogState'
|
import { addToPlaylistDialogReducer } from './dialogs/dialogState'
|
||||||
import createAdminStore from './store/createAdminStore'
|
import createAdminStore from './store/createAdminStore'
|
||||||
import { i18nProvider } from './i18n'
|
import { i18nProvider } from './i18n'
|
||||||
import AddToPlaylistDialog from './dialogs/AddToPlaylistDialog'
|
|
||||||
|
|
||||||
const history = createHashHistory()
|
const history = createHashHistory()
|
||||||
|
|
||||||
@@ -79,9 +78,7 @@ const App = () => (
|
|||||||
<Resource name="translation" />,
|
<Resource name="translation" />,
|
||||||
<Resource name="playlistTrack" />,
|
<Resource name="playlistTrack" />,
|
||||||
|
|
||||||
// Detached components
|
|
||||||
<Player />,
|
<Player />,
|
||||||
<AddToPlaylistDialog />,
|
|
||||||
]}
|
]}
|
||||||
</Admin>
|
</Admin>
|
||||||
</Provider>
|
</Provider>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import AlbumListActions from './AlbumListActions'
|
|||||||
import AlbumListView from './AlbumListView'
|
import AlbumListView from './AlbumListView'
|
||||||
import AlbumGridView from './AlbumGridView'
|
import AlbumGridView from './AlbumGridView'
|
||||||
import { ALBUM_MODE_LIST } from './albumState'
|
import { ALBUM_MODE_LIST } from './albumState'
|
||||||
|
import AddToPlaylistDialog from '../dialogs/AddToPlaylistDialog'
|
||||||
|
|
||||||
const AlbumFilter = (props) => {
|
const AlbumFilter = (props) => {
|
||||||
const translate = useTranslate()
|
const translate = useTranslate()
|
||||||
@@ -57,6 +58,7 @@ const AlbumList = (props) => {
|
|||||||
const { width } = props
|
const { width } = props
|
||||||
const albumView = useSelector((state) => state.albumView)
|
const albumView = useSelector((state) => state.albumView)
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<List
|
<List
|
||||||
{...props}
|
{...props}
|
||||||
exporter={false}
|
exporter={false}
|
||||||
@@ -65,7 +67,9 @@ const AlbumList = (props) => {
|
|||||||
sort={{ field: 'created_at', order: 'DESC' }}
|
sort={{ field: 'created_at', order: 'DESC' }}
|
||||||
filters={<AlbumFilter />}
|
filters={<AlbumFilter />}
|
||||||
perPage={getPerPage(width)}
|
perPage={getPerPage(width)}
|
||||||
pagination={<Pagination rowsPerPageOptions={getPerPageOptions(width)} />}
|
pagination={
|
||||||
|
<Pagination rowsPerPageOptions={getPerPageOptions(width)} />
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{albumView.mode === ALBUM_MODE_LIST ? (
|
{albumView.mode === ALBUM_MODE_LIST ? (
|
||||||
<AlbumListView {...props} />
|
<AlbumListView {...props} />
|
||||||
@@ -73,6 +77,8 @@ const AlbumList = (props) => {
|
|||||||
<AlbumGridView {...props} />
|
<AlbumGridView {...props} />
|
||||||
)}
|
)}
|
||||||
</List>
|
</List>
|
||||||
|
<AddToPlaylistDialog />,
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import {
|
|||||||
SongDatagrid,
|
SongDatagrid,
|
||||||
SongContextMenu,
|
SongContextMenu,
|
||||||
} from '../common'
|
} from '../common'
|
||||||
|
import AddToPlaylistDialog from '../dialogs/AddToPlaylistDialog'
|
||||||
|
|
||||||
const useStyles = makeStyles(
|
const useStyles = makeStyles(
|
||||||
(theme) => ({
|
(theme) => ({
|
||||||
@@ -163,6 +164,7 @@ const AlbumSongs = (props) => {
|
|||||||
)}
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
<AddToPlaylistDialog />,
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
SongContextMenu,
|
SongContextMenu,
|
||||||
SongDatagridRow,
|
SongDatagridRow,
|
||||||
} from '../common'
|
} from '../common'
|
||||||
|
import AddToPlaylistDialog from '../dialogs/AddToPlaylistDialog'
|
||||||
|
|
||||||
const useStyles = makeStyles(
|
const useStyles = makeStyles(
|
||||||
(theme) => ({
|
(theme) => ({
|
||||||
@@ -137,6 +138,7 @@ const PlaylistSongs = (props) => {
|
|||||||
)}
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
<AddToPlaylistDialog />,
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import { useDispatch } from 'react-redux'
|
|||||||
import { setTrack } from '../audioplayer'
|
import { setTrack } from '../audioplayer'
|
||||||
import { SongBulkActions } from './SongBulkActions'
|
import { SongBulkActions } from './SongBulkActions'
|
||||||
import { AlbumLinkField } from './AlbumLinkField'
|
import { AlbumLinkField } from './AlbumLinkField'
|
||||||
|
import AddToPlaylistDialog from '../dialogs/AddToPlaylistDialog'
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
columnIcon: {
|
columnIcon: {
|
||||||
@@ -48,6 +49,7 @@ const SongList = (props) => {
|
|||||||
const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs'))
|
const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs'))
|
||||||
const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
|
const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<List
|
<List
|
||||||
{...props}
|
{...props}
|
||||||
sort={{ field: 'title', order: 'ASC' }}
|
sort={{ field: 'title', order: 'ASC' }}
|
||||||
@@ -100,6 +102,8 @@ const SongList = (props) => {
|
|||||||
</SongDatagrid>
|
</SongDatagrid>
|
||||||
)}
|
)}
|
||||||
</List>
|
</List>
|
||||||
|
<AddToPlaylistDialog />,
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user