Allow adding songs to multiple playlists at once. (#995)

* Add support for multiple playlists

* Fix lint

* Remove console log comment

* Disable 'check' when loading

* Fix lint

* reset playlists on closeAddToPlaylist

* new playlist: accomodate string type on enter

* Fix lint

* multiple new playlists are added correctly

* use makestyle()

* Add tests

* Fix lint
This commit is contained in:
Yash Jipkate
2021-04-24 04:07:08 +05:30
committed by GitHub
parent d829a63686
commit df57cd6bb5
7 changed files with 834 additions and 56 deletions
+39 -41
View File
@@ -1,11 +1,6 @@
import React, { useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import {
useCreate,
useDataProvider,
useNotify,
useTranslate,
} from 'react-admin'
import { useDataProvider, useNotify, useTranslate } from 'react-admin'
import {
Button,
Dialog,
@@ -19,8 +14,6 @@ import {
openDuplicateSongWarning,
} from '../actions'
import { SelectPlaylistInput } from './SelectPlaylistInput'
import { httpClient } from '../dataProvider'
import { REST_URL } from '../consts'
import DuplicateSongDialog from './DuplicateSongDialog'
export const AddToPlaylistDialog = () => {
@@ -37,17 +30,16 @@ export const AddToPlaylistDialog = () => {
const [value, setValue] = useState({})
const [check, setCheck] = useState(false)
const dataProvider = useDataProvider()
const [createAndAddToPlaylist] = useCreate(
'playlist',
{ name: value.name },
{
onSuccess: ({ data }) => {
setValue(data)
addToPlaylist(data.id)
},
onFailure: (error) => notify(`Error: ${error.message}`, 'warning'),
}
)
const createAndAddToPlaylist = (playlistObject) => {
dataProvider
.create('playlist', {
data: { name: playlistObject.name },
})
.then((res) => {
addToPlaylist(res.data.id)
})
.catch((error) => notify(`Error: ${error.message}`, 'warning'))
}
const addToPlaylist = (playlistId, distinctIds) => {
const trackIds = Array.isArray(distinctIds) ? distinctIds : selectedIds
@@ -66,10 +58,11 @@ export const AddToPlaylistDialog = () => {
})
}
const checkDuplicateSong = (playlistId) => {
httpClient(`${REST_URL}/playlist/${playlistId}`)
const checkDuplicateSong = (playlistObject) => {
dataProvider
.getOne('playlist', { id: playlistObject.id })
.then((res) => {
const { tracks } = JSON.parse(res.body)
const tracks = res.data.tracks
if (tracks) {
const dupSng = tracks.filter((song) =>
selectedIds.some((id) => id === song.id)
@@ -77,11 +70,9 @@ export const AddToPlaylistDialog = () => {
if (dupSng.length) {
const dupIds = dupSng.map((song) => song.id)
return dispatch(openDuplicateSongWarning(dupIds))
dispatch(openDuplicateSongWarning(dupIds))
}
return setCheck(true)
}
setCheck(true)
})
.catch((error) => {
@@ -91,47 +82,49 @@ export const AddToPlaylistDialog = () => {
}
const handleSubmit = (e) => {
if (value.id) {
addToPlaylist(value.id)
} else {
createAndAddToPlaylist()
}
value.forEach((playlistObject) => {
if (playlistObject.id) {
addToPlaylist(playlistObject.id, playlistObject.distinctIds)
} else {
createAndAddToPlaylist(playlistObject)
}
})
setCheck(false)
setValue({})
dispatch(closeAddToPlaylist())
e.stopPropagation()
}
const handleClickClose = (e) => {
setCheck(false)
setValue({})
dispatch(closeAddToPlaylist())
e.stopPropagation()
}
const handleChange = (pls) => {
if (pls.id) {
checkDuplicateSong(pls.id)
} else {
setCheck(true)
}
if (!value.length || pls.length > value.length) {
let newlyAdded = pls.slice(-1).pop()
if (newlyAdded.id) {
setCheck(false)
checkDuplicateSong(newlyAdded)
} else setCheck(true)
} else if (pls.length === 0) setCheck(false)
setValue(pls)
}
const handleDuplicateClose = () => {
dispatch(closeDuplicateSongDialog())
dispatch(closeAddToPlaylist())
}
const handleDuplicateSubmit = () => {
addToPlaylist(value.id)
dispatch(closeDuplicateSongDialog())
dispatch(closeAddToPlaylist())
}
const handleSkip = () => {
const distinctSongs = selectedIds.filter(
(id) => duplicateIds.indexOf(id) < 0
)
addToPlaylist(value.id, distinctSongs)
value.slice(-1).pop().distinctIds = distinctSongs
dispatch(closeDuplicateSongDialog())
dispatch(closeAddToPlaylist())
}
return (
@@ -154,7 +147,12 @@ export const AddToPlaylistDialog = () => {
<Button onClick={handleClickClose} color="primary">
{translate('ra.action.cancel')}
</Button>
<Button onClick={handleSubmit} color="primary" disabled={!check}>
<Button
onClick={handleSubmit}
color="primary"
disabled={!check}
data-testid="playlist-add"
>
{translate('ra.action.add')}
</Button>
</DialogActions>