Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(UI): Warn if track is already present when adding to playlist - 1604 #1897

Merged
merged 2 commits into from
Sep 29, 2022
Merged

fix(UI): Warn if track is already present when adding to playlist - 1604 #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0629e3a
fix(UI): Warn if track is already present when adding to playlist - 1604
Sep 29, 2022
7860b4f
fix tests
Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 24 additions & 19 deletions ui/src/dialogs/AddToPlaylistDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import {
} from '../actions'
import { SelectPlaylistInput } from './SelectPlaylistInput'
import DuplicateSongDialog from './DuplicateSongDialog'
import { httpClient } from '../dataProvider'
import { REST_URL } from '../consts'

export const AddToPlaylistDialog = () => {
const { open, selectedIds, onSuccess, duplicateSong, duplicateIds } =
Expand All @@ -44,34 +46,37 @@ export const AddToPlaylistDialog = () => {

const addToPlaylist = (playlistId, distinctIds) => {
const trackIds = Array.isArray(distinctIds) ? distinctIds : selectedIds
dataProvider
.create('playlistTrack', {
data: { ids: trackIds },
filter: { playlist_id: playlistId },
})
.then(() => {
const len = trackIds.length
notify('message.songsAddedToPlaylist', 'info', { smart_count: len })
onSuccess && onSuccess(value, len)
refresh()
})
.catch(() => {
notify('ra.page.error', 'warning')
})
if (trackIds.length) {
dataProvider
.create('playlistTrack', {
data: { ids: trackIds },
filter: { playlist_id: playlistId },
})
.then(() => {
const len = trackIds.length
notify('message.songsAddedToPlaylist', 'info', { smart_count: len })
onSuccess && onSuccess(value, len)
refresh()
})
.catch(() => {
notify('ra.page.error', 'warning')
})
} else {
notify('message.songsAddedToPlaylist', 'info', { smart_count: 0 })
}
}

const checkDuplicateSong = (playlistObject) => {
dataProvider
.getOne('playlist', { id: playlistObject.id })
httpClient(`${REST_URL}/playlist/${playlistObject.id}/tracks`)
deluan marked this conversation as resolved.
Show resolved Hide resolved
.then((res) => {
const tracks = res.data.tracks
const tracks = res.json
if (tracks) {
const dupSng = tracks.filter((song) =>
selectedIds.some((id) => id === song.id)
selectedIds.some((id) => id === song.mediaFileId)
)

if (dupSng.length) {
const dupIds = dupSng.map((song) => song.id)
const dupIds = dupSng.map((song) => song.mediaFileId)
dispatch(openDuplicateSongWarning(dupIds))
}
}
Expand Down
8 changes: 8 additions & 0 deletions ui/src/dialogs/AddToPlaylistDialog.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,19 @@ const createTestUtils = (mockDataProvider) =>
</DataProviderContext.Provider>
)

jest.mock('../dataProvider', () => ({
...jest.requireActual('../dataProvider'),
httpClient: jest.fn(),
}))

describe('AddToPlaylistDialog', () => {
beforeAll(() => localStorage.setItem('userId', 'admin'))
afterEach(cleanup)

it('adds distinct songs to already existing playlists', async () => {
const dataProvider = require('../dataProvider')
jest.spyOn(dataProvider, 'httpClient').mockResolvedValue({ data: mockData })

const mockDataProvider = {
getList: jest
.fn()
Expand Down