🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Removed the `albumSong` workaround, as React-Admin's cache seems to behave better now
Deluan8a56584aedcb
diff --git a/ui/src/App.js b/ui/src/App.jsindex 1389a24ec..689421ab5 100644--- a/ui/src/App.js+++ b/ui/src/App.js@@ -112,7 +112,6 @@ const Admin = (props) => {) : (<Resource name="transcoding" />),- <Resource name="albumSong" />,<Resource name="translation" />,<Resource name="playlistTrack" />,<Resource name="keepalive" />,diff --git a/ui/src/album/AlbumShow.js b/ui/src/album/AlbumShow.jsindex b471643a2..92a0833cd 100644--- a/ui/src/album/AlbumShow.js+++ b/ui/src/album/AlbumShow.js@@ -33,14 +33,14 @@ const AlbumShowLayout = (props) => {<ReferenceManyField{...context}addLabel={false}- reference="albumSong"+ reference="song"target="album_id"sort={{ field: 'album', order: 'ASC' }}perPage={0}pagination={null}><AlbumSongs- resource={'albumSong'}+ resource={'song'}exporter={false}album={record}actions={diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.jsindex 958c50b1f..8a5ac8c3a 100644--- a/ui/src/album/AlbumSongs.js+++ b/ui/src/album/AlbumSongs.js@@ -115,7 +115,6 @@ const AlbumSongs = (props) => {rating: isDesktop && config.enableStarRating && (<RatingFieldsource="rating"- resource={'albumSong'}sortable={false}className={classes.ratingField}/>diff --git a/ui/src/audioplayer/PlayerToolbar.js b/ui/src/audioplayer/PlayerToolbar.jsindex 6560b32b9..9e79d056f 100644--- a/ui/src/audioplayer/PlayerToolbar.js+++ b/ui/src/audioplayer/PlayerToolbar.js@@ -1,5 +1,4 @@import React, { useCallback } from 'react'-import { useLocation } from 'react-router-dom'import { useGetOne } from 'react-admin'import { GlobalHotKeys } from 'react-hotkeys'import { LoveButton, useToggleLove } from '../common'@@ -10,10 +9,8 @@ const Placeholder = () =>config.enableFavourites && <LoveButton disabled={true} resource={'song'} />const Toolbar = ({ id }) => {- const location = useLocation()- const resource = location.pathname.startsWith('/song') ? 'song' : 'albumSong'- const { data, loading } = useGetOne(resource, id)- const [toggleLove, toggling] = useToggleLove(resource, data)+ const { data, loading } = useGetOne('song', id)+ const [toggleLove, toggling] = useToggleLove('song', data)const handlers = {TOGGLE_LOVE: useCallback(() => toggleLove(), [toggleLove]),@@ -24,7 +21,7 @@ const Toolbar = ({ id }) => {{config.enableFavourites && (<LoveButtonrecord={data}- resource={resource}+ resource={'song'}disabled={loading || toggling}/>)}diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.jsindex 2c3a6001e..d48be2da5 100644--- a/ui/src/common/ContextMenus.js+++ b/ui/src/common/ContextMenus.js@@ -111,7 +111,7 @@ const ContextMenu = ({const key = e.target.getAttribute('value')if (options[key].needData) {dataProvider- .getList('albumSong', songQueryParams)+ .getList('song', songQueryParams).then((response) => {let { data, ids } = extractSongsData(response)options[key].action(data, ids)diff --git a/ui/src/common/PlayButton.js b/ui/src/common/PlayButton.jsindex 43c3c10b4..e8ee36112 100644--- a/ui/src/common/PlayButton.js+++ b/ui/src/common/PlayButton.js@@ -19,7 +19,7 @@ export const PlayButton = ({ record, size, className }) => {const dispatch = useDispatch()const playAlbum = (record) => {dataProvider- .getList('albumSong', {+ .getList('song', {pagination: { page: 1, perPage: -1 },sort: { field: 'discNumber, trackNumber', order: 'ASC' },filter: { album_id: record.id, disc_number: record.discNumber },diff --git a/ui/src/dataProvider/wrapperDataProvider.js b/ui/src/dataProvider/wrapperDataProvider.jsindex 7c83a099f..1c166f05b 100644--- a/ui/src/dataProvider/wrapperDataProvider.js+++ b/ui/src/dataProvider/wrapperDataProvider.js@@ -6,9 +6,6 @@ const dataProvider = jsonServerProvider(REST_URL, httpClient)const mapResource = (resource, params) => {switch (resource) {- case 'albumSong':- return ['song', params]-case 'playlistTrack':// /api/playlistTrack?playlist_id=123 => /api/playlist/123/trackslet plsId = '0'