diff --git a/ui/src/playlist/PlaylistDetails.js b/ui/src/playlist/PlaylistDetails.js index 7aaed0342..1ef99dcfb 100644 --- a/ui/src/playlist/PlaylistDetails.js +++ b/ui/src/playlist/PlaylistDetails.js @@ -35,7 +35,8 @@ const useStyles = makeStyles((theme) => ({ }, })) -const PlaylistDetails = ({ record }) => { +const PlaylistDetails = (props) => { + const { record = {} } = props const translate = useTranslate() const classes = useStyles() @@ -43,13 +44,22 @@ const PlaylistDetails = ({ record }) => { - {record.name} + {record.name || translate('ra.page.loading')} {record.comment} - {record.songCount}{' '} - {translate('resources.song.name', { smart_count: record.songCount })}{' '} - · + {record.songCount ? ( + + {record.songCount}{' '} + {translate('resources.song.name', { + smart_count: record.songCount, + })} + {' · '} + + + ) : ( +   + )} diff --git a/ui/src/playlist/PlaylistShow.js b/ui/src/playlist/PlaylistShow.js index 29de548cc..d0a574f44 100644 --- a/ui/src/playlist/PlaylistShow.js +++ b/ui/src/playlist/PlaylistShow.js @@ -9,14 +9,10 @@ import PlaylistSongBulkActions from './PlaylistSongBulkActions' const PlaylistShow = (props) => { const viewVersion = useSelector((s) => s.admin.ui && s.admin.ui.viewVersion) - const { data: record, loading, error } = useGetOne('playlist', props.id, { + const { data: record, error } = useGetOne('playlist', props.id, { v: viewVersion, }) - if (loading) { - return null - } - if (error) { return

ERROR: {error}

} @@ -27,14 +23,16 @@ const PlaylistShow = (props) => { } + title={} actions={<PlaylistActions />} filter={{ playlist_id: props.id }} resource={'playlistTrack'} exporter={false} perPage={-1} pagination={null} - bulkActionButtons={<PlaylistSongBulkActions playlistId={props.id} />} + bulkActionButtons={ + <PlaylistSongBulkActions playlistId={props.id} record={record} /> + } /> </> )