🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Remove duplicated star code from SongContextMenu
Deluanb364170d4fbb
diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.jsindex 8a6e6374d..60d1690c7 100644--- a/ui/src/common/ContextMenus.js+++ b/ui/src/common/ContextMenus.js@@ -30,7 +30,7 @@ const ContextMenu = ({visible,songQueryParams,}) => {- const classes = useStyles({ color, visible, starred: record.starred })+ const classes = useStyles({ color, visible })const dataProvider = useDataProvider()const dispatch = useDispatch()const translate = useTranslate()diff --git a/ui/src/common/SongContextMenu.js b/ui/src/common/SongContextMenu.jsindex 6125e76db..bbf3de9cf 100644--- a/ui/src/common/SongContextMenu.js+++ b/ui/src/common/SongContextMenu.js@@ -1,15 +1,14 @@import React, { useState } from 'react'import PropTypes from 'prop-types'import { useDispatch } from 'react-redux'-import { useUpdate, useTranslate, useRefresh, useNotify } from 'react-admin'+import { useTranslate } from 'react-admin'import { IconButton, Menu, MenuItem } from '@material-ui/core'import { makeStyles } from '@material-ui/core/styles'import MoreVertIcon from '@material-ui/icons/MoreVert'-import StarIcon from '@material-ui/icons/Star'-import StarBorderIcon from '@material-ui/icons/StarBorder'import { addTracks, setTrack } from '../audioplayer'import { openAddToPlaylist } from '../dialogs/dialogState'import subsonic from '../subsonic'+import StarButton from './StarButton'const useStyles = makeStyles({noWrap: {@@ -18,10 +17,6 @@ const useStyles = makeStyles({menu: {visibility: (props) => (props.visible ? 'visible' : 'hidden'),},- star: {- visibility: (props) =>- props.visible || props.starred ? 'visible' : 'hidden',- },})const SongContextMenu = ({@@ -31,11 +26,9 @@ const SongContextMenu = ({onAddToPlaylist,visible,}) => {- const classes = useStyles({ visible, starred: record.starred })+ const classes = useStyles({ visible })const dispatch = useDispatch()const translate = useTranslate()- const notify = useNotify()- const refresh = useRefresh()const [anchorEl, setAnchorEl] = useState(null)const options = {playNow: {@@ -80,52 +73,14 @@ const SongContextMenu = ({e.stopPropagation()}- const [toggleStarred, { loading: updating }] = useUpdate(- resource,- record.id,- {- ...record,- starred: !record.starred,- },- {- undoable: false,- onFailure: (error) => {- console.log(error)- notify('ra.page.error', 'warning')- refresh()- },- }- )-- const handleToggleStar = (e) => {- toggleStarred()- e.stopPropagation()- }-const open = Boolean(anchorEl)return (<span className={classes.noWrap}>{showStar && (- <IconButton- onClick={handleToggleStar}- size={'small'}- disabled={updating}- className={classes.star}- >- {record.starred ? (- <StarIcon fontSize={'small'} />- ) : (- <StarBorderIcon fontSize={'small'} />- )}- </IconButton>+ <StarButton record={record} resource={resource} visible={visible} />)}- <IconButton- onClick={handleClick}- size={'small'}- className={classes.menu}- disabled={updating}- >+ <IconButton onClick={handleClick} size={'small'} className={classes.menu}><MoreVertIcon fontSize={'small'} /></IconButton><Menudiff --git a/ui/src/common/StarButton.js b/ui/src/common/StarButton.jsindex 281ce7797..33e9de537 100644--- a/ui/src/common/StarButton.js+++ b/ui/src/common/StarButton.js@@ -67,6 +67,7 @@ StarButton.propTypes = {}StarButton.defaultProps = {+ record: {},visible: true,showStar: true,addLabel: true,