π§ Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Reformat code with Prettier's new rules.
Caio Cotts86757663d666
diff --git a/ui/src/album/AlbumDetails.js b/ui/src/album/AlbumDetails.jsindex 5e2ee9b65..e5fcb5eb7 100644--- a/ui/src/album/AlbumDetails.js+++ b/ui/src/album/AlbumDetails.js@@ -113,7 +113,7 @@ const useStyles = makeStyles(}),{name: 'NDAlbumDetails',- }+ },)const AlbumComment = ({ record }) => {@@ -141,7 +141,7 @@ const AlbumComment = ({ record }) => {timeout={'auto'}className={clsx(classes.commentBlock,- lines.length > 1 && classes.pointerCursor+ lines.length > 1 && classes.pointerCursor,)}><Typography variant={'body1'} onClick={handleExpandClick}>@@ -216,9 +216,9 @@ const Details = (props) => {addDetail(<>{[translate('resources.album.fields.originalDate'), originalDate].join(- ' '+ ' ',)}- </>+ </>,)yearRange && addDetail(<>{['β«', !isXsmall ? date : yearRange].join(' ')}</>)@@ -230,7 +230,7 @@ const Details = (props) => {? [translate('resources.album.fields.releaseDate'), releaseDate]: ['β', record.releaseDate.substring(0, 4)]).join(' ')}- </>+ </>,)const showReleases = record.releases > 1@@ -245,7 +245,7 @@ const Details = (props) => {}),].join(' '): ['(', record.releases, ')))'].join(' ')}- </>+ </>,)addDetail(@@ -255,7 +255,7 @@ const Details = (props) => {translate('resources.song.name', {smart_count: record.songCount,})}- </>+ </>,)!isXsmall && addDetail(<DurationField source={'duration'} />)!isXsmall && addDetail(<SizeField source="size" />)@@ -299,7 +299,7 @@ const AlbumDetails = (props) => {const handleOpenLightbox = React.useCallback(() => setLightboxOpen(true), [])const handleCloseLightbox = React.useCallback(() => setLightboxOpen(false),- []+ [],)return (<Card className={classes.root}>diff --git a/ui/src/album/AlbumExternalLinks.js b/ui/src/album/AlbumExternalLinks.jsindex caf4c82ea..4b956b496 100644--- a/ui/src/album/AlbumExternalLinks.js+++ b/ui/src/album/AlbumExternalLinks.js@@ -35,7 +35,7 @@ const AlbumExternalLinks = (props) => {encodeURIComponent(record.name)}`,'message.openIn.lastfm',- <ImLastfm2 className="lastfm-icon" />+ <ImLastfm2 className="lastfm-icon" />,)}@@ -43,7 +43,7 @@ const AlbumExternalLinks = (props) => {addLink(`https://musicbrainz.org/release/${record.mbzAlbumId}`,'message.openIn.musicbrainz',- <MusicBrainz className="musicbrainz-icon" />+ <MusicBrainz className="musicbrainz-icon" />,)return <div className={className}>{intersperse(links, ' ')}</div>diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.jsindex 2c01e8517..765722254 100644--- a/ui/src/album/AlbumGridView.js+++ b/ui/src/album/AlbumGridView.js@@ -78,7 +78,7 @@ const useStyles = makeStyles(albumContainer: {},albumPlayButton: { color: 'white' },}),- { name: 'NDAlbumGridView' }+ { name: 'NDAlbumGridView' },)const useCoverStyles = makeStyles({@@ -98,32 +98,34 @@ const getColsForWidth = (width) => {return 9}-const Cover = withContentRect('bounds')(- ({ record, measureRef, contentRect }) => {- // Force height to be the same as the width determined by the GridList- // noinspection JSSuspiciousNameCombination- const classes = useCoverStyles({ height: contentRect.bounds.width })- const [, dragAlbumRef] = useDrag(- () => ({- type: DraggableTypes.ALBUM,- item: { albumIds: [record.id] },- options: { dropEffect: 'copy' },- }),- [record]- )- return (- <div ref={measureRef}>- <div ref={dragAlbumRef}>- <img- src={subsonic.getCoverArtUrl(record, 300)}- alt={record.name}- className={classes.cover}- />- </div>+const Cover = withContentRect('bounds')(({+ record,+ measureRef,+ contentRect,+}) => {+ // Force height to be the same as the width determined by the GridList+ // noinspection JSSuspiciousNameCombination+ const classes = useCoverStyles({ height: contentRect.bounds.width })+ const [, dragAlbumRef] = useDrag(+ () => ({+ type: DraggableTypes.ALBUM,+ item: { albumIds: [record.id] },+ options: { dropEffect: 'copy' },+ }),+ [record],+ )+ return (+ <div ref={measureRef}>+ <div ref={dragAlbumRef}>+ <img+ src={subsonic.getCoverArtUrl(record, 300)}+ alt={record.name}+ className={classes.cover}+ /></div>- )- }-)+ </div>+ )+})const AlbumGridTile = ({ showArtist, record, basePath, ...props }) => {const classes = useStyles()diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.jsindex 10ba7e100..4bae75e47 100644--- a/ui/src/album/AlbumList.js+++ b/ui/src/album/AlbumList.js@@ -104,7 +104,7 @@ const AlbumList = (props) => {'size','createdAt',],- ['createdAt', 'size']+ ['createdAt', 'size'],)// If it does not have filter/sort params (usually coming from Menu),diff --git a/ui/src/album/AlbumListActions.js b/ui/src/album/AlbumListActions.jsindex 45825dd5d..102dd6072 100644--- a/ui/src/album/AlbumListActions.js+++ b/ui/src/album/AlbumListActions.js@@ -64,7 +64,7 @@ const AlbumViewToggler = React.forwardRef(</ButtonGroup></div>)- }+ },)const AlbumListActions = ({diff --git a/ui/src/album/AlbumShow.js b/ui/src/album/AlbumShow.jsindex 92a0833cd..1b706295a 100644--- a/ui/src/album/AlbumShow.js+++ b/ui/src/album/AlbumShow.js@@ -18,7 +18,7 @@ const useStyles = makeStyles(}),{name: 'NDAlbumShow',- }+ },)const AlbumShowLayout = (props) => {diff --git a/ui/src/album/AlbumSongs.js b/ui/src/album/AlbumSongs.jsindex ef81bc02c..3ad0eb318 100644--- a/ui/src/album/AlbumSongs.js+++ b/ui/src/album/AlbumSongs.js@@ -83,7 +83,7 @@ const useStyles = makeStyles(visibility: 'hidden',},}),- { name: 'RaList' }+ { name: 'RaList' },)const AlbumSongs = (props) => {diff --git a/ui/src/album/AlbumTableView.js b/ui/src/album/AlbumTableView.jsindex b11d55f0e..be8e49725 100644--- a/ui/src/album/AlbumTableView.js+++ b/ui/src/album/AlbumTableView.js@@ -59,7 +59,7 @@ const AlbumDatagridRow = (props) => {item: { albumIds: [record?.id] },options: { dropEffect: 'copy' },}),- [record]+ [record],)return <DatagridRow ref={dragAlbumRef} {...props} />}diff --git a/ui/src/artist/ArtistExternalLink.js b/ui/src/artist/ArtistExternalLink.jsindex c25f19ffd..9efa3925b 100644--- a/ui/src/artist/ArtistExternalLink.js+++ b/ui/src/artist/ArtistExternalLink.js@@ -11,7 +11,7 @@ const ArtistExternalLinks = ({ artistInfo, record }) => {const translate = useTranslate()let linkButtons = []const lastFMlink = artistInfo?.biography?.match(- /<a\s+(?:[^>]*?\s+)?href=(["'])(.*?)\1/+ /<a\s+(?:[^>]*?\s+)?href=(["'])(.*?)\1/,)const addLink = (url, title, icon) => {@@ -34,13 +34,13 @@ const ArtistExternalLinks = ({ artistInfo, record }) => {addLink(lastFMlink[2],'message.openIn.lastfm',- <ImLastfm2 className="lastfm-icon" />+ <ImLastfm2 className="lastfm-icon" />,)} else if (artistInfo?.lastFmUrl) {addLink(artistInfo?.lastFmUrl,'message.openIn.lastfm',- <ImLastfm2 className="lastfm-icon" />+ <ImLastfm2 className="lastfm-icon" />,)}}@@ -49,7 +49,7 @@ const ArtistExternalLinks = ({ artistInfo, record }) => {addLink(`https://musicbrainz.org/artist/${artistInfo.musicBrainzId}`,'message.openIn.musicbrainz',- <MusicBrainz className="musicbrainz-icon" />+ <MusicBrainz className="musicbrainz-icon" />,)return <div>{intersperse(linkButtons, ' ')}</div>diff --git a/ui/src/artist/ArtistList.js b/ui/src/artist/ArtistList.jsindex dbc0e0ebd..546ade21c 100644--- a/ui/src/artist/ArtistList.js+++ b/ui/src/artist/ArtistList.js@@ -90,7 +90,7 @@ const ArtistDatagridRow = (props) => {item: { artistIds: [record?.id] },options: { dropEffect: 'copy' },}),- [record]+ [record],)return <DatagridRow ref={dragArtistRef} {...props} />}@@ -132,7 +132,7 @@ const ArtistListView = ({ hasShow, hasEdit, hasList, width, ...rest }) => {resource: 'artist',columns: toggleableFields,},- ['size']+ ['size'],)return isXsmall ? (diff --git a/ui/src/artist/DesktopArtistDetails.js b/ui/src/artist/DesktopArtistDetails.jsindex d49eff8fd..5d56bdef7 100644--- a/ui/src/artist/DesktopArtistDetails.js+++ b/ui/src/artist/DesktopArtistDetails.js@@ -65,7 +65,7 @@ const useStyles = makeStyles(wordBreak: 'break-word',},}),- { name: 'NDDesktopArtistDetails' }+ { name: 'NDDesktopArtistDetails' },)const DesktopArtistDetails = ({ artistInfo, record, biography }) => {@@ -77,7 +77,7 @@ const DesktopArtistDetails = ({ artistInfo, record, biography }) => {const handleOpenLightbox = React.useCallback(() => setLightboxOpen(true), [])const handleCloseLightbox = React.useCallback(() => setLightboxOpen(false),- []+ [],)return (diff --git a/ui/src/artist/MobileArtistDetails.js b/ui/src/artist/MobileArtistDetails.jsindex 683280d9e..4f1bac909 100644--- a/ui/src/artist/MobileArtistDetails.js+++ b/ui/src/artist/MobileArtistDetails.js@@ -72,7 +72,7 @@ const useStyles = makeStyles(wordBreak: 'break-word',},}),- { name: 'NDMobileArtistDetails' }+ { name: 'NDMobileArtistDetails' },)const MobileArtistDetails = ({ artistInfo, biography, record }) => {@@ -85,7 +85,7 @@ const MobileArtistDetails = ({ artistInfo, biography, record }) => {const handleOpenLightbox = React.useCallback(() => setLightboxOpen(true), [])const handleCloseLightbox = React.useCallback(() => setLightboxOpen(false),- []+ [],)return (diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.jsindex 6b4720173..174940aa2 100644--- a/ui/src/audioplayer/Player.js+++ b/ui/src/audioplayer/Player.js@@ -48,7 +48,7 @@ const Player = () => {const isDesktop = useMediaQuery('(min-width:810px)')const isMobilePlayer =/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(- navigator.userAgent+ navigator.userAgent,)const { authenticated } = useAuthState()@@ -60,7 +60,7 @@ const Player = () => {enableCoverAnimation: config.enableCoverAnimation,})const showNotifications = useSelector(- (state) => state.settings.notifications || false+ (state) => state.settings.notifications || false,)const gainInfo = useSelector((state) => state.replayGain)const [context, setContext] = useState(null)@@ -100,7 +100,7 @@ const Player = () => {numericGain = calculateReplayGain(gainInfo.preAmp,song.rgAlbumGain,- song.rgAlbumPeak+ song.rgAlbumPeak,)break}@@ -108,7 +108,7 @@ const Player = () => {numericGain = calculateReplayGain(gainInfo.preAmp,song.rgTrackGain,- song.rgTrackPeak+ song.rgTrackPeak,)break}@@ -160,7 +160,7 @@ const Player = () => {),locale: locale(translate),}),- [gainInfo, isDesktop, playerTheme, translate]+ [gainInfo, isDesktop, playerTheme, translate],)const options = useMemo(() => {@@ -181,12 +181,12 @@ const Player = () => {const onAudioListsChange = useCallback((_, audioLists, audioInfo) => dispatch(syncQueue(audioInfo, audioLists)),- [dispatch]+ [dispatch],)const nextSong = useCallback(() => {const idx = playerState.queue.findIndex(- (item) => item.uuid === playerState.current.uuid+ (item) => item.uuid === playerState.current.uuid,)return idx !== null ? playerState.queue[idx + 1] : null}, [playerState])@@ -221,13 +221,13 @@ const Player = () => {setScrobbled(true)}},- [startTime, scrobbled, nextSong, preloaded]+ [startTime, scrobbled, nextSong, preloaded],)const onAudioVolumeChange = useCallback(// sqrt to compensate for the logarithmic volume(volume) => dispatch(setVolume(Math.sqrt(volume))),- [dispatch]+ [dispatch],)const onAudioPlay = useCallback(@@ -260,12 +260,12 @@ const Player = () => {sendNotification(song.title,`${song.artist} - ${song.album}`,- info.cover+ info.cover,)}}},- [context, dispatch, showNotifications, startTime]+ [context, dispatch, showNotifications, startTime],)const onAudioPlayTrackChange = useCallback(() => {@@ -279,7 +279,7 @@ const Player = () => {const onAudioPause = useCallback((info) => dispatch(currentPlaying(info)),- [dispatch]+ [dispatch],)const onAudioEnded = useCallback(@@ -291,7 +291,7 @@ const Player = () => {.getOne('keepalive', { id: info.trackId }).catch((e) => console.log('Keepalive error:', e))},- [dispatch, dataProvider]+ [dispatch, dataProvider],)const onCoverClick = useCallback((mode, audioLists, audioInfo) => {@@ -313,7 +313,7 @@ const Player = () => {const handlers = useMemo(() => keyHandlers(audioInstance, playerState),- [audioInstance, playerState]+ [audioInstance, playerState],)useEffect(() => {diff --git a/ui/src/audioplayer/keyHandlers.js b/ui/src/audioplayer/keyHandlers.jsindex 444ea2c12..793276de0 100644--- a/ui/src/audioplayer/keyHandlers.js+++ b/ui/src/audioplayer/keyHandlers.js@@ -1,14 +1,14 @@const keyHandlers = (audioInstance, playerState) => {const nextSong = () => {const idx = playerState.queue.findIndex(- (item) => item.uuid === playerState.current.uuid+ (item) => item.uuid === playerState.current.uuid,)return idx !== null ? playerState.queue[idx + 1] : null}const prevSong = () => {const idx = playerState.queue.findIndex(- (item) => item.uuid === playerState.current.uuid+ (item) => item.uuid === playerState.current.uuid,)return idx !== null ? playerState.queue[idx - 1] : null}diff --git a/ui/src/audioplayer/styles.js b/ui/src/audioplayer/styles.jsindex 38b7831b9..30a14d4db 100644--- a/ui/src/audioplayer/styles.js+++ b/ui/src/audioplayer/styles.js@@ -87,7 +87,7 @@ const useStyle = makeStyles(},},}),- { name: 'NDAudioPlayer' }+ { name: 'NDAudioPlayer' },)export default useStylediff --git a/ui/src/common/AddToPlaylistButton.js b/ui/src/common/AddToPlaylistButton.jsindex 021bd308a..9cddc7499 100644--- a/ui/src/common/AddToPlaylistButton.js+++ b/ui/src/common/AddToPlaylistButton.js@@ -12,7 +12,10 @@ export const AddToPlaylistButton = ({ resource, selectedIds, className }) => {const handleClick = () => {dispatch(- openAddToPlaylist({ selectedIds, onSuccess: () => unselectAll(resource) })+ openAddToPlaylist({+ selectedIds,+ onSuccess: () => unselectAll(resource),+ }),)}diff --git a/ui/src/common/ArtistLinkField.js b/ui/src/common/ArtistLinkField.jsindex 26623658a..09df55521 100644--- a/ui/src/common/ArtistLinkField.js+++ b/ui/src/common/ArtistLinkField.js@@ -14,28 +14,31 @@ export const useGetHandleArtistClick = (width) => {}}-export const ArtistLinkField = withWidth()(- ({ record, className, width, source }) => {- const artistLink = useGetHandleArtistClick(width)+export const ArtistLinkField = withWidth()(({+ record,+ className,+ width,+ source,+}) => {+ const artistLink = useGetHandleArtistClick(width)- const id = record[source + 'Id']- return (- <>- {id ? (- <Link- to={artistLink(id)}- onClick={(e) => e.stopPropagation()}- className={className}- >- {record[source]}- </Link>- ) : (- record[source]- )}- </>- )- }-)+ const id = record[source + 'Id']+ return (+ <>+ {id ? (+ <Link+ to={artistLink(id)}+ onClick={(e) => e.stopPropagation()}+ className={className}+ >+ {record[source]}+ </Link>+ ) : (+ record[source]+ )}+ </>+ )+})ArtistLinkField.propTypes = {record: PropTypes.object,diff --git a/ui/src/common/ArtistSimpleList.js b/ui/src/common/ArtistSimpleList.jsindex de6994479..476da992e 100644--- a/ui/src/common/ArtistSimpleList.js+++ b/ui/src/common/ArtistSimpleList.js@@ -23,7 +23,7 @@ const useStyles = makeStyles(top: '26px',},},- { name: 'RaArtistSimpleList' }+ { name: 'RaArtistSimpleList' },)export const ArtistSimpleList = ({@@ -69,7 +69,7 @@ export const ArtistSimpleList = ({</ListItemSecondaryAction></ListItem></span>- )+ ),)}</List>)diff --git a/ui/src/common/BatchPlayButton.js b/ui/src/common/BatchPlayButton.jsindex f3b68f35e..f4c136922 100644--- a/ui/src/common/BatchPlayButton.js+++ b/ui/src/common/BatchPlayButton.js@@ -30,7 +30,7 @@ export const BatchPlayButton = ({// Add tracks to a map for easy lookup by ID, needed for the next stepconst tracks = response.data.reduce((acc, cur) => ({ ...acc, [cur.id]: cur }),- {}+ {},)// Add the tracks to the queue in the selection orderdispatch(action(tracks, selectedIds))diff --git a/ui/src/common/BatchShareButton.js b/ui/src/common/BatchShareButton.jsindex bcf76c3d4..8294953bb 100644--- a/ui/src/common/BatchShareButton.js+++ b/ui/src/common/BatchShareButton.js@@ -18,8 +18,8 @@ export const BatchShareButton = ({ resource, selectedIds, className }) => {_: 'ra.action.bulk_actions',smart_count: selectedIds.length,}),- 'message.shareBatchDialogTitle'- )+ 'message.shareBatchDialogTitle',+ ),)unselectAll(resource)}diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.jsindex a492548a4..ba41b70b0 100644--- a/ui/src/common/ContextMenus.js+++ b/ui/src/common/ContextMenus.js@@ -97,8 +97,8 @@ const ContextMenu = ({record,record.duration !== undefined? DOWNLOAD_MENU_ALBUM- : DOWNLOAD_MENU_ARTIST- )+ : DOWNLOAD_MENU_ARTIST,+ ),)},},@@ -127,7 +127,7 @@ const ContextMenu = ({let extractSongsData = function (response) {const data = response.data.reduce((acc, cur) => ({ ...acc, [cur.id]: cur }),- {}+ {},)const ids = response.data.map((r) => r.id)return { data, ids }@@ -186,7 +186,7 @@ const ContextMenu = ({<MenuItem value={key} key={key} onClick={handleItemClick}>{options[key].label}</MenuItem>- )+ ),)}</Menu></span>diff --git a/ui/src/common/Linkify.js b/ui/src/common/Linkify.jsindex 87947905a..0a09e0d76 100644--- a/ui/src/common/Linkify.js+++ b/ui/src/common/Linkify.js@@ -10,7 +10,7 @@ const useStyles = makeStyles(color: theme.palette.primary.main,},}),- { name: 'RaLink' }+ { name: 'RaLink' },)const Linkify = ({ text, ...rest }) => {@@ -45,7 +45,7 @@ const Linkify = ({ text, ...rest }) => {href={href}>{href}- </Link>+ </Link>,)lastIndex = match.index + href.length@@ -57,7 +57,7 @@ const Linkify = ({ text, ...rest }) => {<spankey={'last-span-key'}dangerouslySetInnerHTML={{ __html: text.substring(lastIndex) }}- />+ />,)}diff --git a/ui/src/common/LoveButton.js b/ui/src/common/LoveButton.jsindex eea91e826..4f89fd57b 100644--- a/ui/src/common/LoveButton.js+++ b/ui/src/common/LoveButton.js@@ -36,7 +36,7 @@ export const LoveButton = ({toggleLove()e.stopPropagation()},- [toggleLove]+ [toggleLove],)if (!config.enableFavourites) {diff --git a/ui/src/common/MultiLineTextField.js b/ui/src/common/MultiLineTextField.jsindex 5148482dd..8f45da04f 100644--- a/ui/src/common/MultiLineTextField.js+++ b/ui/src/common/MultiLineTextField.js@@ -39,11 +39,11 @@ export const MultiLineTextField = memo(key={md5(line + idx)}dangerouslySetInnerHTML={{ __html: line }}/>- )+ ),)}</Typography>)- }+ },)MultiLineTextField.defaultProps = {diff --git a/ui/src/common/MultiLineTextField.test.js b/ui/src/common/MultiLineTextField.test.jsindex 44dede43f..8f29166a3 100644--- a/ui/src/common/MultiLineTextField.test.js+++ b/ui/src/common/MultiLineTextField.test.js@@ -20,9 +20,9 @@ describe('<MultiLineTextField />', () => {record={{ id: 123, body }}emptyText="NA"source="body"- />+ />,)expect(screen.getByText('NA')).toBeInTheDocument()- }+ },)})diff --git a/ui/src/common/PlayButton.js b/ui/src/common/PlayButton.jsindex e40927ef2..ddc676004 100644--- a/ui/src/common/PlayButton.js+++ b/ui/src/common/PlayButton.js@@ -10,7 +10,7 @@ export const PlayButton = ({ record, size, className }) => {let extractSongsData = function (response) {const data = response.data.reduce((acc, cur) => ({ ...acc, [cur.id]: cur }),- {}+ {},)const ids = response.data.map((r) => r.id)return { data, ids }diff --git a/ui/src/common/QualityInfo.js b/ui/src/common/QualityInfo.jsindex e8beb3236..e663d3092 100644--- a/ui/src/common/QualityInfo.js+++ b/ui/src/common/QualityInfo.js@@ -16,7 +16,7 @@ const useStyle = makeStyles(}),{name: 'NDQualityInfo',- }+ },)export const QualityInfo = ({ record, size, gainMode, preAmp, className }) => {diff --git a/ui/src/common/QuickFilter.test.js b/ui/src/common/QuickFilter.test.jsindex 56426af94..36df2aa0e 100644--- a/ui/src/common/QuickFilter.test.js+++ b/ui/src/common/QuickFilter.test.js@@ -22,7 +22,7 @@ describe('QuickFilter', () => {resource={'song'}source={'name'}label={<StarIcon data-testid="label-icon-test" />}- />+ />,)expect(screen.getByTestId('label-icon-test')).not.toBeNull()})diff --git a/ui/src/common/RatingField.js b/ui/src/common/RatingField.jsindex fe9171527..dc8acb7b0 100644--- a/ui/src/common/RatingField.js+++ b/ui/src/common/RatingField.js@@ -40,7 +40,7 @@ export const RatingField = ({(e, val) => {rate(val, e.target.name)},- [rate]+ [rate],)return (@@ -50,7 +50,7 @@ export const RatingField = ({className={clsx(className,classes.rating,- rating > 0 ? classes.show : classes.hide+ rating > 0 ? classes.show : classes.hide,)}value={rating}size={size}diff --git a/ui/src/common/SimpleList.js b/ui/src/common/SimpleList.jsindex 1a4f72fba..b803993a2 100644--- a/ui/src/common/SimpleList.js+++ b/ui/src/common/SimpleList.js@@ -19,7 +19,7 @@ const useStyles = makeStyles(},tertiary: { float: 'right', opacity: 0.541176 },},- { name: 'RaSimpleList' }+ { name: 'RaSimpleList' },)const LinkOrNot = ({diff --git a/ui/src/common/SongContextMenu.js b/ui/src/common/SongContextMenu.jsindex 3b8f60835..16a1c4cad 100644--- a/ui/src/common/SongContextMenu.js+++ b/ui/src/common/SongContextMenu.js@@ -61,7 +61,7 @@ export const SongContextMenu = ({openAddToPlaylist({selectedIds: [record.mediaFileId || record.id],onSuccess: (id) => onAddToPlaylist(id),- })+ }),),},share: {@@ -69,7 +69,11 @@ export const SongContextMenu = ({label: translate('ra.action.share'),action: (record) =>dispatch(- openShareMenu([record.mediaFileId || record.id], 'song', record.title)+ openShareMenu(+ [record.mediaFileId || record.id],+ 'song',+ record.title,+ ),),},download: {@@ -127,7 +131,7 @@ export const SongContextMenu = ({<MenuItem value={key} key={key} onClick={handleItemClick}>{options[key].label}</MenuItem>- )+ ),)}</Menu></span>diff --git a/ui/src/common/SongDatagrid.js b/ui/src/common/SongDatagrid.jsindex 42a617a73..c2ace92a8 100644--- a/ui/src/common/SongDatagrid.js+++ b/ui/src/common/SongDatagrid.js@@ -97,7 +97,7 @@ const ReleaseRow = forwardRef(</TableCell></TableRow>)- }+ },)const DiscSubtitleRow = forwardRef(@@ -141,7 +141,7 @@ const DiscSubtitleRow = forwardRef(</TableCell></TableRow>)- }+ },)export const SongDatagridRow = ({@@ -156,7 +156,7 @@ export const SongDatagridRow = ({}) => {const classes = useStyles()const fields = React.Children.toArray(children).filter((c) =>- isValidElement(c)+ isValidElement(c),)const [, dragDiscRef] = useDrag(@@ -173,7 +173,7 @@ export const SongDatagridRow = ({},options: { dropEffect: 'copy' },}),- [record]+ [record],)const [, dragSongRef] = useDrag(@@ -182,7 +182,7 @@ export const SongDatagridRow = ({item: { ids: [record?.mediaFileId || record?.id] },options: { dropEffect: 'copy' },}),- [record]+ [record],)if (!record || !record.title) {@@ -251,14 +251,14 @@ const SongDatagridBody = ({idsToPlay = ids.filter((id) =>data[id].releaseDate === releaseDate &&- data[id].discNumber === discNumber+ data[id].discNumber === discNumber,)} else {idsToPlay = ids.filter((id) => data[id].releaseDate === releaseDate)}dispatch(playTracks(data, idsToPlay))},- [dispatch, data, ids]+ [dispatch, data, ids],)const firstTracksOfDiscs = useMemo(() => {@@ -280,7 +280,7 @@ const SongDatagridBody = ({acc.push(id)}return acc- }, [])+ }, []),)if (!showDiscSubtitles || (set.size < 2 && !foundSubtitle)) {set.clear()@@ -304,7 +304,7 @@ const SongDatagridBody = ({acc.push(id)}return acc- }, [])+ }, []),)if (!showReleaseDivider || set.size < 2) {set.clear()diff --git a/ui/src/common/SongSimpleList.js b/ui/src/common/SongSimpleList.jsindex 61a2893f7..d398d3455 100644--- a/ui/src/common/SongSimpleList.js+++ b/ui/src/common/SongSimpleList.js@@ -47,7 +47,7 @@ const useStyles = makeStyles(top: '26px',},},- { name: 'RaSongSimpleList' }+ { name: 'RaSongSimpleList' },)export const SongSimpleList = ({@@ -108,7 +108,7 @@ export const SongSimpleList = ({</ListItemSecondaryAction></ListItem></span>- )+ ),)}</List>)diff --git a/ui/src/common/ToggleFieldsMenu.js b/ui/src/common/ToggleFieldsMenu.jsindex f8ee30d0f..32ae51def 100644--- a/ui/src/common/ToggleFieldsMenu.js+++ b/ui/src/common/ToggleFieldsMenu.js@@ -36,7 +36,7 @@ export const ToggleFieldsMenu = ({const dispatch = useDispatch()const translate = useTranslate()const toggleableColumns = useSelector(- (state) => state.settings.toggleableFields[resource]+ (state) => state.settings.toggleableFields[resource],)const omittedColumns =useSelector((state) => state.settings.omittedFields[resource]) || []@@ -58,7 +58,7 @@ export const ToggleFieldsMenu = ({...toggleableColumns,[selectedColumn]: !toggleableColumns[selectedColumn],},- })+ }),)}@@ -95,7 +95,7 @@ export const ToggleFieldsMenu = ({<Checkbox checked={val} />{translate(`resources.${resource}.fields.${key}`)}</MenuItem>- ) : null+ ) : null,)}</div></div>diff --git a/ui/src/common/Writable.js b/ui/src/common/Writable.jsindex 27a46f9e0..0dc625460 100644--- a/ui/src/common/Writable.js+++ b/ui/src/common/Writable.js@@ -15,7 +15,7 @@ export const Writable = (props) => {const { record = {}, children } = propsif (isWritable(record.ownerId)) {return Children.map(children, (child) =>- isValidElement(child) ? cloneElement(child, props) : child+ isValidElement(child) ? cloneElement(child, props) : child,)}return nulldiff --git a/ui/src/common/useAlbumsPerPage.js b/ui/src/common/useAlbumsPerPage.jsindex 6d3edf046..6a02bdeb7 100644--- a/ui/src/common/useAlbumsPerPage.js+++ b/ui/src/common/useAlbumsPerPage.js@@ -19,7 +19,7 @@ const getPerPageOptions = (width) => {export const useAlbumsPerPage = (width) => {const perPage =useSelector(- (state) => state?.admin.resources?.album?.list?.params?.perPage+ (state) => state?.admin.resources?.album?.list?.params?.perPage,) || getPerPage(width)return [perPage, getPerPageOptions(width)]diff --git a/ui/src/common/useResourceRefresh.js b/ui/src/common/useResourceRefresh.jsindex 4c2008089..d9f6aee52 100644--- a/ui/src/common/useResourceRefresh.js+++ b/ui/src/common/useResourceRefresh.js@@ -7,7 +7,7 @@ export const useResourceRefresh = (...visibleResources) => {const refresh = useRefresh()const dataProvider = useDataProvider()const refreshData = useSelector(- (state) => state.activity?.refresh || { lastReceived: lastTime }+ (state) => state.activity?.refresh || { lastReceived: lastTime },)const { resources, lastReceived } = refreshDatadiff --git a/ui/src/common/useSelectedFields.js b/ui/src/common/useSelectedFields.jsindex 07ccc9180..0560de523 100644--- a/ui/src/common/useSelectedFields.js+++ b/ui/src/common/useSelectedFields.js@@ -12,7 +12,7 @@ export const useSelectedFields = ({}) => {const dispatch = useDispatch()const resourceFields = useSelector(- (state) => state.settings.toggleableFields+ (state) => state.settings.toggleableFields,)?.[resource]const omittedFields = useSelector((state) => state.settings.omittedFields)?.[resource@@ -81,7 +81,7 @@ useSelectedFields.propTypes = {export const useSetToggleableFields = (resource,toggleableColumns,- defaultOff = []+ defaultOff = [],) => {const current = useSelector((state) => state.settings.toggleableFields)?.albumconst dispatch = useDispatch()@@ -95,7 +95,7 @@ export const useSetToggleableFields = (...{ [cur]: true },}}, {}),- })+ }),)dispatch(setOmittedFields({ [resource]: defaultOff }))}diff --git a/ui/src/consts.js b/ui/src/consts.jsindex 20c8bac2b..b0524669e 100644--- a/ui/src/consts.js+++ b/ui/src/consts.js@@ -16,7 +16,7 @@ DraggableTypes.ALL.push(DraggableTypes.SONG,DraggableTypes.ALBUM,DraggableTypes.DISC,- DraggableTypes.ARTIST+ DraggableTypes.ARTIST,)export const DEFAULT_SHARE_BITRATE = 128diff --git a/ui/src/dialogs/AboutDialog.test.js b/ui/src/dialogs/AboutDialog.test.jsindex 389034fec..5c4e2f77f 100644--- a/ui/src/dialogs/AboutDialog.test.js+++ b/ui/src/dialogs/AboutDialog.test.js@@ -30,7 +30,7 @@ describe('<LinkToVersion />', () => {const link = screen.queryByRole('link')expect(link.href).toBe(- 'https://github.com/navidrome/navidrome/releases/tag/v0.40.0'+ 'https://github.com/navidrome/navidrome/releases/tag/v0.40.0',)expect(link.textContent).toBe('0.40.0')@@ -44,7 +44,7 @@ describe('<LinkToVersion />', () => {const link = screen.queryByRole('link')expect(link.href).toBe(- 'https://github.com/navidrome/navidrome/compare/v0.40.0...300a0292'+ 'https://github.com/navidrome/navidrome/compare/v0.40.0...300a0292',)expect(link.textContent).toBe('0.40.0-SNAPSHOT')diff --git a/ui/src/dialogs/AddToPlaylistDialog.js b/ui/src/dialogs/AddToPlaylistDialog.jsindex 47098f22f..6033d1031 100644--- a/ui/src/dialogs/AddToPlaylistDialog.js+++ b/ui/src/dialogs/AddToPlaylistDialog.js@@ -72,7 +72,7 @@ export const AddToPlaylistDialog = () => {const tracks = res.jsonif (tracks) {const dupSng = tracks.filter((song) =>- selectedIds.some((id) => id === song.mediaFileId)+ selectedIds.some((id) => id === song.mediaFileId),)if (dupSng.length) {@@ -128,7 +128,7 @@ export const AddToPlaylistDialog = () => {}const handleSkip = () => {const distinctSongs = selectedIds.filter(- (id) => duplicateIds.indexOf(id) < 0+ (id) => duplicateIds.indexOf(id) < 0,)value.slice(-1).pop().distinctIds = distinctSongsdispatch(closeDuplicateSongDialog())diff --git a/ui/src/dialogs/AddToPlaylistDialog.test.js b/ui/src/dialogs/AddToPlaylistDialog.test.jsindex 0932af306..66f8a6687 100644--- a/ui/src/dialogs/AddToPlaylistDialog.test.js+++ b/ui/src/dialogs/AddToPlaylistDialog.test.js@@ -59,7 +59,7 @@ const createTestUtils = (mockDataProvider) =>><AddToPlaylistDialog /></TestContext>- </DataProviderContext.Provider>+ </DataProviderContext.Provider>,)jest.mock('../dataProvider', () => ({@@ -104,7 +104,7 @@ describe('AddToPlaylistDialog', () => {{data: { ids: selectedIds },filter: { playlist_id: 'sample-id1' },- }+ },)})await waitFor(() => {@@ -114,7 +114,7 @@ describe('AddToPlaylistDialog', () => {{data: { ids: selectedIds },filter: { playlist_id: 'sample-id2' },- }+ },)})})@@ -153,7 +153,7 @@ describe('AddToPlaylistDialog', () => {{data: { ids: selectedIds },filter: { playlist_id: 'created-id1' },- }+ },)})diff --git a/ui/src/dialogs/DownloadMenuDialog.js b/ui/src/dialogs/DownloadMenuDialog.jsindex 290431598..2104cbcad 100644--- a/ui/src/dialogs/DownloadMenuDialog.js+++ b/ui/src/dialogs/DownloadMenuDialog.js@@ -14,7 +14,7 @@ import { useTranscodingOptions } from './useTranscodingOptions'const DownloadMenuDialog = () => {const { open, record, recordType } = useSelector(- (state) => state.downloadMenuDialog+ (state) => state.downloadMenuDialog,)const dispatch = useDispatch()const translate = useTranslate()diff --git a/ui/src/dialogs/HelpDialog.js b/ui/src/dialogs/HelpDialog.jsindex bba473813..adbce99b2 100644--- a/ui/src/dialogs/HelpDialog.js+++ b/ui/src/dialogs/HelpDialog.js@@ -54,7 +54,7 @@ const HelpTable = (props) => {</TableContainer></DialogContent></Dialog>,- document.body+ document.body,)}diff --git a/ui/src/dialogs/ListenBrainzTokenDialog.js b/ui/src/dialogs/ListenBrainzTokenDialog.jsindex 571c5af17..8966675ff 100644--- a/ui/src/dialogs/ListenBrainzTokenDialog.js+++ b/ui/src/dialogs/ListenBrainzTokenDialog.js@@ -58,7 +58,7 @@ export const ListenBrainzTokenDialog = ({ setLinked }) => {event.stopPropagation()})},- [dispatch, notify, setLinked, token]+ [dispatch, notify, setLinked, token],)const handleClickClose = (event) => {@@ -74,7 +74,7 @@ export const ListenBrainzTokenDialog = ({ setLinked }) => {handleSave(event)}},- [token, handleSave]+ [token, handleSave],)return (diff --git a/ui/src/dialogs/SelectPlaylistInput.js b/ui/src/dialogs/SelectPlaylistInput.jsindex e35af00fa..372d5f408 100644--- a/ui/src/dialogs/SelectPlaylistInput.js+++ b/ui/src/dialogs/SelectPlaylistInput.js@@ -25,7 +25,7 @@ export const SelectPlaylistInput = ({ onChange }) => {'playlist',{ page: 1, perPage: -1 },{ field: 'name', order: 'ASC' },- { smart: false }+ { smart: false },)const options =diff --git a/ui/src/dialogs/SelectPlaylistInput.test.js b/ui/src/dialogs/SelectPlaylistInput.test.jsindex 13fab2afb..60daa90cd 100644--- a/ui/src/dialogs/SelectPlaylistInput.test.js+++ b/ui/src/dialogs/SelectPlaylistInput.test.js@@ -65,7 +65,7 @@ describe('SelectPlaylistInput', () => {><SelectPlaylistInput onChange={onChangeHandler} /></TestContext>- </DataProviderContext.Provider>+ </DataProviderContext.Provider>,)await waitFor(() => {diff --git a/ui/src/dialogs/ShareDialog.js b/ui/src/dialogs/ShareDialog.jsindex 3de15fe32..68156bf58 100644--- a/ui/src/dialogs/ShareDialog.js+++ b/ui/src/dialogs/ShareDialog.js@@ -33,7 +33,7 @@ export const ShareDialog = () => {const translate = useTranslate()const [description, setDescription] = useState('')const [downloadable, setDownloadable] = useState(- config.defaultDownloadableShare && config.enableDownloads+ config.defaultDownloadableShare && config.enableDownloads,)useEffect(() => {setDescription('')@@ -66,7 +66,7 @@ export const ShareDialog = () => {type: 'warning',multiLine: true,duration: 0,- }+ },)})} else prompt(translate('message.shareCopyToClipboard'), url)@@ -75,7 +75,7 @@ export const ShareDialog = () => {notify(translate('ra.page.error') + ': ' + error.message, {type: 'warning',}),- }+ },)const handleShare = (e) => {diff --git a/ui/src/dialogs/useTranscodingOptions.js b/ui/src/dialogs/useTranscodingOptions.jsindex 4a0e421d9..9019f0ab0 100644--- a/ui/src/dialogs/useTranscodingOptions.js+++ b/ui/src/dialogs/useTranscodingOptions.js@@ -20,7 +20,7 @@ export const useTranscodingOptions = () => {page: 1,perPage: 1000,},- { field: 'name', order: 'ASC' }+ { field: 'name', order: 'ASC' },)const formatOptions = useMemo(@@ -30,7 +30,7 @@ export const useTranscodingOptions = () => {: Object.values(formats).map((f) => {return { id: f.targetFormat, name: f.name }}),- [formats, loadingFormats]+ [formats, loadingFormats],)const handleOriginal = useCallback(@@ -41,7 +41,7 @@ export const useTranscodingOptions = () => {setMaxBitRate(DEFAULT_SHARE_BITRATE)}},- [setUseOriginalFormat, setFormat, setMaxBitRate]+ [setUseOriginalFormat, setFormat, setMaxBitRate],)const TranscodingOptionsInput = useMemo(() => {diff --git a/ui/src/eventStream.js b/ui/src/eventStream.jsindex d5df78971..481739d92 100644--- a/ui/src/eventStream.js+++ b/ui/src/eventStream.js@@ -30,7 +30,7 @@ const startEventStream = async (dispatchFn) => {newStream.addEventListener('serverStart', eventHandler(dispatchFn))newStream.addEventListener('scanStatus',- throttledEventHandler(dispatchFn)+ throttledEventHandler(dispatchFn),)newStream.addEventListener('refreshResource', eventHandler(dispatchFn))newStream.addEventListener('keepAlive', eventHandler(dispatchFn))diff --git a/ui/src/i18n/useGetLanguageChoices.js b/ui/src/i18n/useGetLanguageChoices.jsindex 0c6773ae6..0c708691f 100644--- a/ui/src/i18n/useGetLanguageChoices.js+++ b/ui/src/i18n/useGetLanguageChoices.js@@ -6,7 +6,7 @@ const useGetLanguageChoices = () => {'translation',{ page: 1, perPage: -1 },{ field: '', order: '' },- {}+ {},)const choices = [{ id: 'en', name: 'English' }]diff --git a/ui/src/layout/AppBar.js b/ui/src/layout/AppBar.jsindex c72f36bff..47406c4c1 100644--- a/ui/src/layout/AppBar.js+++ b/ui/src/layout/AppBar.js@@ -31,7 +31,7 @@ const useStyles = makeStyles(}),{name: 'NDAppBar',- }+ },)const AboutMenuItem = forwardRef(({ onClick, ...rest }, ref) => {@@ -90,7 +90,7 @@ const CustomUserMenu = ({ onClick, ...rest }) => {}return renderSettingsMenuItemLink(userResource,- permissions !== 'admin' ? localStorage.getItem('userId') : null+ permissions !== 'admin' ? localStorage.getItem('userId') : null,)}diff --git a/ui/src/layout/DynamicMenuIcon.test.js b/ui/src/layout/DynamicMenuIcon.test.jsindex 3d8e238fb..51b0ba635 100644--- a/ui/src/layout/DynamicMenuIcon.test.js+++ b/ui/src/layout/DynamicMenuIcon.test.js@@ -17,7 +17,7 @@ describe('<DynamicMenuIcon />', () => {render(<Router history={history}><DynamicMenuIcon icon={StarIcon} path={'test'} />- </Router>+ </Router>,)expect(screen.getByTestId('icon')).not.toBeNull()})@@ -34,7 +34,7 @@ describe('<DynamicMenuIcon />', () => {activeIcon={StarBorderIcon}path={'otherpath'}/>- </Router>+ </Router>,)expect(screen.getByTestId('icon')).not.toBeNull()})@@ -51,7 +51,7 @@ describe('<DynamicMenuIcon />', () => {activeIcon={StarBorderIcon}path={'path'}/>- </Router>+ </Router>,)expect(screen.getByTestId('activeIcon')).not.toBeNull()})diff --git a/ui/src/layout/Login.js b/ui/src/layout/Login.jsindex a197b495b..aac04faf4 100644--- a/ui/src/layout/Login.js+++ b/ui/src/layout/Login.js@@ -82,7 +82,7 @@ const useStyles = makeStyles(textDecoration: 'none',},}),- { name: 'NDLogin' }+ { name: 'NDLogin' },)const renderInput = ({@@ -263,14 +263,14 @@ const Login = ({ location }) => {typeof error === 'string'? error: typeof error === 'undefined' || !error.message- ? 'ra.auth.sign_in_error'- : error.message,- 'warning'+ ? 'ra.auth.sign_in_error'+ : error.message,+ 'warning',)- }+ },)},- [dispatch, login, notify, setLoading, location]+ [dispatch, login, notify, setLoading, location],)const validateLogin = useCallback(@@ -284,7 +284,7 @@ const Login = ({ location }) => {}return errors},- [translate]+ [translate],)const validateSignup = useCallback(@@ -302,7 +302,7 @@ const Login = ({ location }) => {}return errors},- [translate, validateLogin]+ [translate, validateLogin],)if (config.firstTime) {@@ -348,7 +348,7 @@ const LoginWithTheme = (props) => {}).catch((e) => {throw new Error(- 'Cannot load language "' + config.defaultLanguage + '": ' + e+ 'Cannot load language "' + config.defaultLanguage + '": ' + e,)})}diff --git a/ui/src/layout/Menu.js b/ui/src/layout/Menu.jsindex 7ed21ae8f..50670a168 100644--- a/ui/src/layout/Menu.js+++ b/ui/src/layout/Menu.js@@ -121,7 +121,7 @@ const Menu = ({ dense = false }) => {dense={dense}>{Object.keys(albumLists).map((type) =>- renderAlbumMenuItemLink(type, albumLists[type])+ renderAlbumMenuItemLink(type, albumLists[type]),)}</SubMenu>{resources.filter(subItems(undefined)).map(renderResourceMenuItemLink)}diff --git a/ui/src/layout/PlaylistsSubMenu.js b/ui/src/layout/PlaylistsSubMenu.jsindex e16aa7e18..a9f70b875 100644--- a/ui/src/layout/PlaylistsSubMenu.js+++ b/ui/src/layout/PlaylistsSubMenu.js@@ -93,7 +93,7 @@ const PlaylistsSubMenu = ({ state, setState, sidebarIsOpen, dense }) => {const onPlaylistConfig = useCallback(() => history.push('/playlist'),- [history]+ [history],)return (diff --git a/ui/src/layout/SubMenu.js b/ui/src/layout/SubMenu.jsindex d06d61bbd..418f4c651 100644--- a/ui/src/layout/SubMenu.js+++ b/ui/src/layout/SubMenu.js@@ -42,7 +42,7 @@ const useStyles = makeStyles(}),{name: 'NDSubMenu',- }+ },)const SubMenu = ({diff --git a/ui/src/layout/UserMenu.js b/ui/src/layout/UserMenu.jsindex 980a82b32..c7a3deaf4 100644--- a/ui/src/layout/UserMenu.js+++ b/ui/src/layout/UserMenu.js@@ -118,7 +118,7 @@ const UserMenu = (props) => {? cloneElement(menuItem, {onClick: handleClose,})- : null+ : null,)}{!config.auth && logout}</MenuList>diff --git a/ui/src/personal/LastfmScrobbleToggle.js b/ui/src/personal/LastfmScrobbleToggle.jsindex 92faf307f..84532de36 100644--- a/ui/src/personal/LastfmScrobbleToggle.js+++ b/ui/src/personal/LastfmScrobbleToggle.js@@ -20,11 +20,11 @@ const Progress = (props) => {useEffect(() => {const callbackEndpoint = baseUrl(- `/api/lastfm/link/callback?uid=${localStorage.getItem('userId')}`+ `/api/lastfm/link/callback?uid=${localStorage.getItem('userId')}`,)const callbackUrl = `${window.location.origin}${callbackEndpoint}`openedTab.current = openInNewTab(- `https://www.last.fm/api/auth/?api_key=${config.lastFMApiKey}&cb=${callbackUrl}`+ `https://www.last.fm/api/auth/?api_key=${config.lastFMApiKey}&cb=${callbackUrl}`,)}, [])diff --git a/ui/src/personal/SelectTheme.js b/ui/src/personal/SelectTheme.jsindex e69d996ff..6ec39b09b 100644--- a/ui/src/personal/SelectTheme.js+++ b/ui/src/personal/SelectTheme.js@@ -21,7 +21,7 @@ export const SelectTheme = (props) => {themeChoices.push(...Object.keys(themes).map((key) => {return { id: key, name: themes[key].themeName }- })+ }),)themeChoices.push({id: helpKey,diff --git a/ui/src/playlist/PlaylistActions.js b/ui/src/playlist/PlaylistActions.jsindex d98596c3b..1e7bef9b8 100644--- a/ui/src/playlist/PlaylistActions.js+++ b/ui/src/playlist/PlaylistActions.js@@ -59,7 +59,7 @@ const PlaylistActions = ({ className, ids, data, record, ...rest }) => {.then((res) => {const data = res.data.reduce((acc, curr) => ({ ...acc, [curr.id]: curr }),- {}+ {},)dispatch(action(data))})@@ -67,7 +67,7 @@ const PlaylistActions = ({ className, ids, data, record, ...rest }) => {notify('ra.page.error', 'warning')})},- [dataProvider, dispatch, record, data, ids, notify]+ [dataProvider, dispatch, record, data, ids, notify],)const handlePlay = React.useCallback(() => {@@ -108,7 +108,7 @@ const PlaylistActions = ({ className, ids, data, record, ...rest }) => {link.click()link.parentNode.removeChild(link)}),- [record]+ [record],)return (diff --git a/ui/src/playlist/PlaylistDetails.js b/ui/src/playlist/PlaylistDetails.jsindex 954f0c841..4e80b666f 100644--- a/ui/src/playlist/PlaylistDetails.js+++ b/ui/src/playlist/PlaylistDetails.js@@ -38,7 +38,7 @@ const useStyles = makeStyles(}),{name: 'NDPlaylistDetails',- }+ },)const PlaylistDetails = (props) => {diff --git a/ui/src/playlist/PlaylistList.js b/ui/src/playlist/PlaylistList.jsindex 9f5667d7b..71a8c75db 100644--- a/ui/src/playlist/PlaylistList.js+++ b/ui/src/playlist/PlaylistList.js@@ -65,7 +65,7 @@ const TogglePublicInput = ({ resource, source }) => {console.log(error)notify('ra.page.error', 'warning')},- }+ },)const handleClick = (e) => {@@ -108,7 +108,7 @@ const PlaylistList = (props) => {),comment: <TextField source="comment" />,}),- [isDesktop, isXsmall]+ [isDesktop, isXsmall],)const columns = useSelectedFields({diff --git a/ui/src/playlist/PlaylistShow.js b/ui/src/playlist/PlaylistShow.jsindex 66fb383a0..ca300bbd0 100644--- a/ui/src/playlist/PlaylistShow.js+++ b/ui/src/playlist/PlaylistShow.js@@ -20,7 +20,7 @@ const useStyles = makeStyles(}),{name: 'NDPlaylistShow',- }+ },)const PlaylistShowLayout = (props) => {diff --git a/ui/src/playlist/PlaylistSongs.js b/ui/src/playlist/PlaylistSongs.jsindex a968eefa6..f249c9793 100644--- a/ui/src/playlist/PlaylistSongs.js+++ b/ui/src/playlist/PlaylistSongs.js@@ -72,7 +72,7 @@ const useStyles = makeStyles(visibility: (props) => (props.isDesktop ? 'hidden' : 'visible'),},}),- { name: 'RaList' }+ { name: 'RaList' },)const ReorderableList = ({ readOnly, children, ...rest }) => {@@ -99,7 +99,7 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {refetch()}},- [playlistId, refetch]+ [playlistId, refetch],)const reorder = useCallback(@@ -117,7 +117,7 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {notify('ra.page.error', 'warning')})},- [dataProvider, notify, refetch]+ [dataProvider, notify, refetch],)const handleDragEnd = useCallback(@@ -126,7 +126,7 @@ const PlaylistSongs = ({ playlistId, readOnly, actions, ...props }) => {const fromId = ids[from]reorder(playlistId, fromId, toId)},- [playlistId, reorder, ids]+ [playlistId, reorder, ids],)const toggleableFields = useMemo(() => {diff --git a/ui/src/radio/StreamField.js b/ui/src/radio/StreamField.jsindex 302a7f199..2327f3c1a 100644--- a/ui/src/radio/StreamField.js+++ b/ui/src/radio/StreamField.js@@ -26,7 +26,7 @@ export const StreamField = (props) => {evt.preventDefault()dispatch(setTrack(await songFromRadio(record)))},- [dispatch, record]+ [dispatch, record],)return (diff --git a/ui/src/reducers/albumView.js b/ui/src/reducers/albumView.jsindex ec47a1d5e..ef6833471 100644--- a/ui/src/reducers/albumView.js+++ b/ui/src/reducers/albumView.js@@ -4,7 +4,7 @@ export const albumViewReducer = (previousState = {grid: true,},- payload+ payload,) => {const { type } = payloadswitch (type) {diff --git a/ui/src/reducers/dialogReducer.js b/ui/src/reducers/dialogReducer.jsindex f80cb7350..e43f46b6f 100644--- a/ui/src/reducers/dialogReducer.js+++ b/ui/src/reducers/dialogReducer.js@@ -24,7 +24,7 @@ export const shareDialogReducer = (resource: '',name: '',},- payload+ payload,) => {const { type, ids, resource, name, label } = payloadswitch (type) {@@ -52,7 +52,7 @@ export const addToPlaylistDialogReducer = (open: false,duplicateSong: false,},- payload+ payload,) => {const { type } = payloadswitch (type) {@@ -82,7 +82,7 @@ export const downloadMenuDialogReducer = (previousState = {open: false,},- payload+ payload,) => {const { type } = payloadswitch (type) {@@ -125,7 +125,7 @@ export const expandInfoDialogReducer = (previousState = {open: false,},- payload+ payload,) => {const { type } = payloadswitch (type) {@@ -149,7 +149,7 @@ export const listenBrainzTokenDialogReducer = (previousState = {open: false,},- payload+ payload,) => {const { type } = payloadswitch (type) {diff --git a/ui/src/reducers/playerReducer.js b/ui/src/reducers/playerReducer.jsindex be8259f26..a6597ef36 100644--- a/ui/src/reducers/playerReducer.js+++ b/ui/src/reducers/playerReducer.js@@ -55,7 +55,7 @@ const mapToAudioLists = (item) => {updatedAt: item.updatedAt,album: item.album,},- 300+ 300,),}}@@ -140,7 +140,7 @@ const reduceSyncQueue = (state, { data: { audioInfo, audioLists } }) => {const reduceCurrent = (state, { data }) => {const current = data.ended ? {} : dataconst savedPlayIndex = state.queue.findIndex(- (item) => item.uuid === current.uuid+ (item) => item.uuid === current.uuid,)return {...state,diff --git a/ui/src/reducers/replayGainReducer.js b/ui/src/reducers/replayGainReducer.jsindex 49d9e0ba0..6d51db2bf 100644--- a/ui/src/reducers/replayGainReducer.js+++ b/ui/src/reducers/replayGainReducer.js@@ -18,7 +18,7 @@ const initialState = {export const replayGainReducer = (previousState = initialState,- { type, payload }+ { type, payload },) => {switch (type) {case CHANGE_GAIN: {diff --git a/ui/src/reducers/themeReducer.js b/ui/src/reducers/themeReducer.jsindex ef5ccc7ce..2a5d5bac6 100644--- a/ui/src/reducers/themeReducer.js+++ b/ui/src/reducers/themeReducer.js@@ -5,14 +5,14 @@ import themes from '../themes'const defaultTheme = () => {return (Object.keys(themes).find(- (t) => themes[t].themeName === config.defaultTheme+ (t) => themes[t].themeName === config.defaultTheme,) || 'DarkTheme')}export const themeReducer = (previousState = defaultTheme(),- { type, payload }+ { type, payload },) => {if (type === CHANGE_THEME) {return payloaddiff --git a/ui/src/serviceWorker.js b/ui/src/serviceWorker.jsindex 420ee107e..deb3b798a 100644--- a/ui/src/serviceWorker.js+++ b/ui/src/serviceWorker.js@@ -16,8 +16,8 @@ const isLocalhost = Boolean(window.location.hostname === '[::1]' ||// 127.0.0.0/8 are considered localhost for IPv4.window.location.hostname.match(- /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/- )+ /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/,+ ),)export function register(config) {@@ -43,7 +43,7 @@ export function register(config) {navigator.serviceWorker.ready.then(() => {console.log('This web app is being served cache-first by a service ' +- 'worker. To learn more, visit https://bit.ly/CRA-PWA'+ 'worker. To learn more, visit https://bit.ly/CRA-PWA',)})} else {@@ -71,7 +71,7 @@ function registerValidSW(swUrl, config) {// content until all client tabs are closed.console.log('New content is available and will be used when all ' +- 'tabs for this page are closed. See https://bit.ly/CRA-PWA.'+ 'tabs for this page are closed. See https://bit.ly/CRA-PWA.',)// Execute callback@@ -123,7 +123,7 @@ function checkValidServiceWorker(swUrl, config) {}).catch(() => {console.log(- 'No internet connection found. App is running in offline mode.'+ 'No internet connection found. App is running in offline mode.',)})}diff --git a/ui/src/share/ShareList.js b/ui/src/share/ShareList.jsindex 0219e49db..b7b9edb5a 100644--- a/ui/src/share/ShareList.js+++ b/ui/src/share/ShareList.js@@ -48,7 +48,7 @@ const ShareList = (props) => {type: 'warning',multiLine: true,duration: 0,- }+ },)})} else prompt(translate('message.shareCopyToClipboard'), url)diff --git a/ui/src/store/createAdminStore.js b/ui/src/store/createAdminStore.jsindex ba8d40771..82545f634 100644--- a/ui/src/store/createAdminStore.js+++ b/ui/src/store/createAdminStore.js@@ -48,7 +48,9 @@ const createAdminStore = ({const store = createStore(resettableAppReducer,persistedState,- composeEnhancers(applyMiddleware(sagaMiddleware, routerMiddleware(history)))+ composeEnhancers(+ applyMiddleware(sagaMiddleware, routerMiddleware(history)),+ ),)store.subscribe(@@ -61,7 +63,7 @@ const createAdminStore = ({settings: state.settings,})}),- 1000+ 1000,)sagaMiddleware.run(saga)diff --git a/ui/src/subsonic/index.js b/ui/src/subsonic/index.jsindex 1616a70d5..674135a1f 100644--- a/ui/src/subsonic/index.js+++ b/ui/src/subsonic/index.js@@ -27,7 +27,7 @@ const scrobble = (id, time, submission = true) =>url('scrobble', id, {...(submission && time && { time }),submission,- })+ }),)const nowPlaying = (id) => scrobble(id, null, false)@@ -74,7 +74,7 @@ const streamUrl = (id, options) => {url('stream', id, {ts: true,...options,- })+ }),)}diff --git a/ui/src/themes/useCurrentTheme.js b/ui/src/themes/useCurrentTheme.jsindex 61138d7b4..9793d1e15 100644--- a/ui/src/themes/useCurrentTheme.js+++ b/ui/src/themes/useCurrentTheme.js@@ -14,7 +14,7 @@ const useCurrentTheme = () => {const themeName =Object.keys(themes).find((t) => t === state.theme) ||Object.keys(themes).find(- (t) => themes[t].themeName === config.defaultTheme+ (t) => themes[t].themeName === config.defaultTheme,) ||'DarkTheme'return themes[themeName]diff --git a/ui/src/user/DeleteUserButton.js b/ui/src/user/DeleteUserButton.jsindex 11b8e7473..9bf133fb4 100644--- a/ui/src/user/DeleteUserButton.js+++ b/ui/src/user/DeleteUserButton.js@@ -24,7 +24,7 @@ const useStyles = makeStyles(},},}),- { name: 'RaDeleteWithConfirmButton' }+ { name: 'RaDeleteWithConfirmButton' },)const DeleteUserButton = (props) => {diff --git a/ui/src/user/UserCreate.js b/ui/src/user/UserCreate.jsindex 5d817dd01..42ea1ce94 100644--- a/ui/src/user/UserCreate.js+++ b/ui/src/user/UserCreate.js@@ -33,7 +33,7 @@ const UserCreate = (props) => {resource: 'user',payload: { data: values },},- { returnPromise: true }+ { returnPromise: true },)notify('resources.user.notifications.created', 'info', {smart_count: 1,@@ -45,7 +45,7 @@ const UserCreate = (props) => {}}},- [mutate, notify, redirect]+ [mutate, notify, redirect],)return (diff --git a/ui/src/user/UserEdit.js b/ui/src/user/UserEdit.jsindex 81883f0ce..9b3013961 100644--- a/ui/src/user/UserEdit.js+++ b/ui/src/user/UserEdit.js@@ -85,7 +85,7 @@ const UserEdit = (props) => {resource: 'user',payload: { id: values.id, data: values },},- { returnPromise: true }+ { returnPromise: true },)notify('resources.user.notifications.updated', 'info', {smart_count: 1,@@ -97,7 +97,7 @@ const UserEdit = (props) => {}}},- [mutate, notify, permissions, redirect, refresh]+ [mutate, notify, permissions, redirect, refresh],)return (diff --git a/ui/src/utils/formatters.test.js b/ui/src/utils/formatters.test.jsindex b3e898edc..59538ec32 100644--- a/ui/src/utils/formatters.test.js+++ b/ui/src/utils/formatters.test.js@@ -25,7 +25,7 @@ describe('formatDuration', () => {it('formats days, hours and minutes', () => {expect(formatDuration(hour + minute + 1)).toEqual('01:01:01')expect(formatDuration(3 * day + 3 * hour + 7 * minute)).toEqual(- '3:03:07:00'+ '3:03:07:00',)expect(formatDuration(day)).toEqual('1:00:00:00')expect(formatDuration(day + minute + 0.6)).toEqual('1:00:01:01')diff --git a/ui/src/utils/intersperse.js b/ui/src/utils/intersperse.jsindex 01ff7f87c..ce48f5e86 100644--- a/ui/src/utils/intersperse.js+++ b/ui/src/utils/intersperse.js@@ -15,6 +15,6 @@ export const intersperse = (arr, sep) => {function (xs, x, i) {return xs.concat([sep, x])},- [arr[0]]+ [arr[0]],)}diff --git a/ui/src/utils/urls.js b/ui/src/utils/urls.jsindex fe6c19c6f..e9173f089 100644--- a/ui/src/utils/urls.js+++ b/ui/src/utils/urls.js@@ -10,7 +10,7 @@ export const baseUrl = (path) => {export const shareUrl = (id) => {const url = new URL(baseUrl(config.publicBaseUrl + '/' + id),- window.location.href+ window.location.href,)return url.href}