Check permissions before adding songs to playlists
This commit is contained in:
@@ -19,6 +19,7 @@ import {
|
|||||||
ArtistLinkField,
|
ArtistLinkField,
|
||||||
RangeField,
|
RangeField,
|
||||||
} from '../common'
|
} from '../common'
|
||||||
|
import { DraggableTypes } from '../consts'
|
||||||
|
|
||||||
const useStyles = makeStyles(
|
const useStyles = makeStyles(
|
||||||
(theme) => ({
|
(theme) => ({
|
||||||
@@ -103,7 +104,7 @@ const Cover = withContentRect('bounds')(
|
|||||||
// noinspection JSSuspiciousNameCombination
|
// noinspection JSSuspiciousNameCombination
|
||||||
const classes = useCoverStyles({ height: contentRect.bounds.width })
|
const classes = useCoverStyles({ height: contentRect.bounds.width })
|
||||||
const [, dragAlbumRef] = useDrag(() => ({
|
const [, dragAlbumRef] = useDrag(() => ({
|
||||||
type: 'album',
|
type: DraggableTypes.ALBUM,
|
||||||
item: { albumIds: [record.id] },
|
item: { albumIds: [record.id] },
|
||||||
options: { dropEffect: 'copy' },
|
options: { dropEffect: 'copy' },
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {
|
|||||||
useSelectedFields,
|
useSelectedFields,
|
||||||
} from '../common'
|
} from '../common'
|
||||||
import config from '../config'
|
import config from '../config'
|
||||||
|
import { DraggableTypes } from '../consts'
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
columnIcon: {
|
columnIcon: {
|
||||||
@@ -51,7 +52,7 @@ const useStyles = makeStyles({
|
|||||||
const AlbumDatagridRow = (props) => {
|
const AlbumDatagridRow = (props) => {
|
||||||
const { record } = props
|
const { record } = props
|
||||||
const [, dragAlbumRef] = useDrag(() => ({
|
const [, dragAlbumRef] = useDrag(() => ({
|
||||||
type: 'album',
|
type: DraggableTypes.ALBUM,
|
||||||
item: { albumIds: [record.id] },
|
item: { albumIds: [record.id] },
|
||||||
options: { dropEffect: 'copy' },
|
options: { dropEffect: 'copy' },
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import {
|
|||||||
} from '../common'
|
} from '../common'
|
||||||
import config from '../config'
|
import config from '../config'
|
||||||
import ArtistListActions from './ArtistListActions'
|
import ArtistListActions from './ArtistListActions'
|
||||||
|
import { DraggableTypes } from '../consts'
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
contextHeader: {
|
contextHeader: {
|
||||||
@@ -84,7 +85,7 @@ const ArtistFilter = (props) => {
|
|||||||
const ArtistDatagridRow = (props) => {
|
const ArtistDatagridRow = (props) => {
|
||||||
const { record } = props
|
const { record } = props
|
||||||
const [, dragArtistRef] = useDrag(() => ({
|
const [, dragArtistRef] = useDrag(() => ({
|
||||||
type: 'artist',
|
type: DraggableTypes.ARTIST,
|
||||||
item: { artistIds: [record.id] },
|
item: { artistIds: [record.id] },
|
||||||
options: { dropEffect: 'copy' },
|
options: { dropEffect: 'copy' },
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import clsx from 'clsx'
|
|||||||
import { useDrag } from 'react-dnd'
|
import { useDrag } from 'react-dnd'
|
||||||
import { playTracks } from '../actions'
|
import { playTracks } from '../actions'
|
||||||
import { AlbumContextMenu } from '../common'
|
import { AlbumContextMenu } from '../common'
|
||||||
|
import { DraggableTypes } from '../consts'
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
subtitle: {
|
subtitle: {
|
||||||
@@ -106,7 +107,7 @@ export const SongDatagridRow = ({
|
|||||||
)
|
)
|
||||||
|
|
||||||
const [, dragDiscRef] = useDrag(() => ({
|
const [, dragDiscRef] = useDrag(() => ({
|
||||||
type: 'disc',
|
type: DraggableTypes.DISC,
|
||||||
item: {
|
item: {
|
||||||
discs: [{ albumId: record.albumId, discNumber: record.discNumber }],
|
discs: [{ albumId: record.albumId, discNumber: record.discNumber }],
|
||||||
},
|
},
|
||||||
@@ -114,7 +115,7 @@ export const SongDatagridRow = ({
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
const [, dragSongRef] = useDrag(() => ({
|
const [, dragSongRef] = useDrag(() => ({
|
||||||
type: 'song',
|
type: DraggableTypes.SONG,
|
||||||
item: { ids: [record.id] },
|
item: { ids: [record.id] },
|
||||||
options: { dropEffect: 'copy' },
|
options: { dropEffect: 'copy' },
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -3,3 +3,18 @@ export const REST_URL = '/api'
|
|||||||
export const M3U_MIME_TYPE = 'audio/x-mpegurl'
|
export const M3U_MIME_TYPE = 'audio/x-mpegurl'
|
||||||
|
|
||||||
export const AUTO_THEME_ID = 'AUTO_THEME_ID'
|
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
|
||||||
|
)
|
||||||
|
|||||||
@@ -12,35 +12,28 @@ import QueueMusicOutlinedIcon from '@material-ui/icons/QueueMusicOutlined'
|
|||||||
import { BiCog } from 'react-icons/all'
|
import { BiCog } from 'react-icons/all'
|
||||||
import { useDrop } from 'react-dnd'
|
import { useDrop } from 'react-dnd'
|
||||||
import SubMenu from './SubMenu'
|
import SubMenu from './SubMenu'
|
||||||
|
import { isWritable } from '../common'
|
||||||
|
import { DraggableTypes } from '../consts'
|
||||||
|
|
||||||
const PlaylistMenuItemLink = ({ pls, sidebarIsOpen }) => {
|
const PlaylistMenuItemLink = ({ pls, sidebarIsOpen }) => {
|
||||||
const dataProvider = useDataProvider()
|
const dataProvider = useDataProvider()
|
||||||
const notify = useNotify()
|
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(() => ({
|
const [, dropRef] = useDrop(() => ({
|
||||||
accept: ['song', 'album', 'disc', 'artist'],
|
accept: isWritable(pls.owner) ? DraggableTypes.ALL : [],
|
||||||
drop: (item) => {
|
drop: (item) =>
|
||||||
addToPlaylist(pls.id, 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 (
|
return (
|
||||||
<MenuItemLink
|
<MenuItemLink
|
||||||
to={`/playlist/${pls.id}/show`}
|
to={`/playlist/${pls.id}/show`}
|
||||||
|
|||||||
Reference in New Issue
Block a user