Skip to content

Commit

Permalink
Check permissions before adding songs to playlists
Browse files Browse the repository at this point in the history
  • Loading branch information
deluan committed Oct 2, 2021
1 parent 6c3e45d commit 9c29ee3
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 26 deletions.
3 changes: 2 additions & 1 deletion ui/src/album/AlbumGridView.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
ArtistLinkField,
RangeField,
} from '../common'
import { DraggableTypes } from '../consts'

const useStyles = makeStyles(
(theme) => ({
Expand Down Expand Up @@ -103,7 +104,7 @@ const Cover = withContentRect('bounds')(
// noinspection JSSuspiciousNameCombination
const classes = useCoverStyles({ height: contentRect.bounds.width })
const [, dragAlbumRef] = useDrag(() => ({
type: 'album',
type: DraggableTypes.ALBUM,
item: { albumIds: [record.id] },
options: { dropEffect: 'copy' },
}))
Expand Down
3 changes: 2 additions & 1 deletion ui/src/album/AlbumTableView.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
useSelectedFields,
} from '../common'
import config from '../config'
import { DraggableTypes } from '../consts'

const useStyles = makeStyles({
columnIcon: {
Expand Down Expand Up @@ -51,7 +52,7 @@ const useStyles = makeStyles({
const AlbumDatagridRow = (props) => {
const { record } = props
const [, dragAlbumRef] = useDrag(() => ({
type: 'album',
type: DraggableTypes.ALBUM,
item: { albumIds: [record.id] },
options: { dropEffect: 'copy' },
}))
Expand Down
3 changes: 2 additions & 1 deletion ui/src/artist/ArtistList.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
} from '../common'
import config from '../config'
import ArtistListActions from './ArtistListActions'
import { DraggableTypes } from '../consts'

const useStyles = makeStyles({
contextHeader: {
Expand Down Expand Up @@ -84,7 +85,7 @@ const ArtistFilter = (props) => {
const ArtistDatagridRow = (props) => {
const { record } = props
const [, dragArtistRef] = useDrag(() => ({
type: 'artist',
type: DraggableTypes.ARTIST,
item: { artistIds: [record.id] },
options: { dropEffect: 'copy' },
}))
Expand Down
5 changes: 3 additions & 2 deletions ui/src/common/SongDatagrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import clsx from 'clsx'
import { useDrag } from 'react-dnd'
import { playTracks } from '../actions'
import { AlbumContextMenu } from '../common'
import { DraggableTypes } from '../consts'

const useStyles = makeStyles({
subtitle: {
Expand Down Expand Up @@ -106,15 +107,15 @@ export const SongDatagridRow = ({
)

const [, dragDiscRef] = useDrag(() => ({
type: 'disc',
type: DraggableTypes.DISC,
item: {
discs: [{ albumId: record.albumId, discNumber: record.discNumber }],
},
options: { dropEffect: 'copy' },
}))

const [, dragSongRef] = useDrag(() => ({
type: 'song',
type: DraggableTypes.SONG,
item: { ids: [record.id] },
options: { dropEffect: 'copy' },
}))
Expand Down
15 changes: 15 additions & 0 deletions ui/src/consts.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,18 @@ export const REST_URL = '/api'
export const M3U_MIME_TYPE = 'audio/x-mpegurl'

export const AUTO_THEME_ID = 'AUTO_THEME_ID'

export const DraggableTypes = {
SONG: 'song',
ALBUM: 'album',
DISC: 'disc',
ARTIST: 'artist',
ALL: [],
}

DraggableTypes.ALL.push(
DraggableTypes.SONG,
DraggableTypes.ALBUM,
DraggableTypes.DISC,
DraggableTypes.ARTIST
)
35 changes: 14 additions & 21 deletions ui/src/layout/PlaylistsSubMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,28 @@ import QueueMusicOutlinedIcon from '@material-ui/icons/QueueMusicOutlined'
import { BiCog } from 'react-icons/all'
import { useDrop } from 'react-dnd'
import SubMenu from './SubMenu'
import { isWritable } from '../common'
import { DraggableTypes } from '../consts'

const PlaylistMenuItemLink = ({ pls, sidebarIsOpen }) => {
const dataProvider = useDataProvider()
const notify = useNotify()

const addToPlaylist = (playlistId, data) => {
dataProvider
.addToPlaylist(playlistId, data)
.then((res) => {
notify('message.songsAddedToPlaylist', 'info', {
smart_count: res.data?.added,
})
})
.catch(() => {
notify('ra.page.error', 'warning')
})
}

const [, dropRef] = useDrop(() => ({
accept: ['song', 'album', 'disc', 'artist'],
drop: (item) => {
addToPlaylist(pls.id, item)
},
accept: isWritable(pls.owner) ? DraggableTypes.ALL : [],
drop: (item) =>
dataProvider
.addToPlaylist(pls.id, item)
.then((res) => {
notify('message.songsAddedToPlaylist', 'info', {
smart_count: res.data?.added,
})
})
.catch(() => {
notify('ra.page.error', 'warning')
}),
}))

if (!pls) {
return null
}

return (
<MenuItemLink
to={`/playlist/${pls.id}/show`}
Expand Down

0 comments on commit 9c29ee3

Please sign in to comment.