🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Add Album comment to Album details
Deluanb0ea517fdd35
diff --git a/ui/src/album/AlbumDetails.js b/ui/src/album/AlbumDetails.jsindex 0827c1a0d..166d2af64 100644--- a/ui/src/album/AlbumDetails.js+++ b/ui/src/album/AlbumDetails.js@@ -1,15 +1,170 @@-import React from 'react'-import { Card, CardContent, CardMedia, Typography } from '@material-ui/core'+import React, { useMemo } from 'react'+import {+ Card,+ CardContent,+ CardMedia,+ Typography,+ Collapse,+ makeStyles,+ IconButton,+ Fab,+ useMediaQuery,+} from '@material-ui/core'+import classnames from 'classnames'import { useTranslate } from 'react-admin'import Lightbox from 'react-image-lightbox'import 'react-image-lightbox/style.css'+import ExpandMoreIcon from '@material-ui/icons/ExpandMore'import subsonic from '../subsonic'-import { DurationField, StarButton, SizeField } from '../common'-import { ArtistLinkField, formatRange } from '../common'+import {+ DurationField,+ StarButton,+ SizeField,+ ArtistLinkField,+ formatRange,+ MultiLineTextField,+} from '../common'-const AlbumDetails = ({ classes, record }) => {+const useStyles = makeStyles((theme) => ({+ container: {+ [theme.breakpoints.down('xs')]: {+ padding: '0.7em',+ minWidth: '24em',+ },+ [theme.breakpoints.up('sm')]: {+ padding: '1em',+ minWidth: '32em',+ },+ },+ starButton: {+ bottom: theme.spacing(-1.5),+ right: theme.spacing(-1.5),+ },+ albumCover: {+ display: 'inline-flex',+ justifyContent: 'flex-end',+ alignItems: 'flex-end',+ cursor: 'pointer',++ [theme.breakpoints.down('xs')]: {+ height: '8em',+ width: '8em',+ },+ [theme.breakpoints.up('sm')]: {+ height: '10em',+ width: '10em',+ },+ [theme.breakpoints.up('lg')]: {+ height: '15em',+ width: '15em',+ },+ },++ albumDetails: {+ display: 'inline-block',+ verticalAlign: 'top',+ [theme.breakpoints.down('xs')]: {+ width: '14em',+ },+ [theme.breakpoints.up('sm')]: {+ width: '26em',+ },+ [theme.breakpoints.up('lg')]: {+ width: '43em',+ },+ },+ albumTitle: {+ whiteSpace: 'nowrap',+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ },+ comment: {+ whiteSpace: 'nowrap',+ marginTop: '1em',+ display: 'inline-block',+ [theme.breakpoints.down('xs')]: {+ width: '10em',+ },+ [theme.breakpoints.up('sm')]: {+ width: '10em',+ },+ [theme.breakpoints.up('lg')]: {+ width: '10em',+ },+ },+ commentFirstLine: {+ float: 'left',+ marginRight: '5px',+ whiteSpace: 'nowrap',+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ },+ expand: {+ marginTop: '-5px',+ transform: 'rotate(0deg)',+ marginLeft: 'auto',+ transition: theme.transitions.create('transform', {+ duration: theme.transitions.duration.shortest,+ }),+ },+ expandOpen: {+ transform: 'rotate(180deg)',+ },+}))++const AlbumComment = ({ classes, record, commentNumLines }) => {+ const [expanded, setExpanded] = React.useState(false)++ const handleExpandClick = React.useCallback(() => {+ commentNumLines > 1 && setExpanded(!expanded)+ }, [expanded, setExpanded, commentNumLines])++ return (+ <div className={classes.comment}>+ <div onClick={handleExpandClick}>+ <MultiLineTextField+ record={record}+ source={'comment'}+ maxLines={1}+ className={classes.commentFirstLine}+ />+ </div>+ {commentNumLines > 1 && (+ <IconButton+ size={'small'}+ className={classnames(classes.expand, {+ [classes.expandOpen]: expanded,+ })}+ onClick={handleExpandClick}+ aria-expanded={expanded}+ aria-label="show more"+ >+ <ExpandMoreIcon />+ </IconButton>+ )}+ <Collapse in={expanded} timeout="auto" unmountOnExit>+ <MultiLineTextField+ record={record}+ source={'comment'}+ firstLine={1}+ className={classes.commentFirstLine}+ />+ </Collapse>+ </div>+ )+}++const AlbumDetails = ({ record }) => {+ const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('lg'))+ const classes = useStyles()const [isLightboxOpen, setLightboxOpen] = React.useState(false)const translate = useTranslate()++ const commentNumLines = useMemo(+ () => record.comment && record.comment.split('\n').length,+ [record]+ )+const genreYear = (record) => {let genreDateLine = []if (record.genre) {@@ -38,14 +193,23 @@ const AlbumDetails = ({ classes, record }) => {() => setLightboxOpen(false),[])-return (<Card className={classes.container}><CardMediaimage={imageUrl}className={classes.albumCover}onClick={handleOpenLightbox}- ></CardMedia>+ >+ <StarButton+ className={classes.starButton}+ record={record}+ resource={'album'}+ size={isDesktop ? 'default' : 'small'}+ aria-label="star"+ color="primary"+ component={Fab}+ />+ </CardMedia><CardContent className={classes.albumDetails}><Typography variant="h5" className={classes.albumTitle}>{record.name}@@ -60,8 +224,23 @@ const AlbumDetails = ({ classes, record }) => {{' · '} <DurationField record={record} source={'duration'} /> {' · '}<SizeField record={record} source="size" /></Typography>- <StarButton record={record} resource={'album'} size={'large'} />+ {isDesktop && record['comment'] && (+ <AlbumComment+ classes={classes}+ record={record}+ commentNumLines={commentNumLines}+ />+ )}</CardContent>+ {!isDesktop && record['comment'] && (+ <div>+ <AlbumComment+ classes={classes}+ record={record}+ commentNumLines={commentNumLines}+ />+ </div>+ )}{isLightboxOpen && (<Lightboxdiff --git a/ui/src/album/AlbumListView.js b/ui/src/album/AlbumListView.jsindex 6abf17ad9..09d13f31f 100644--- a/ui/src/album/AlbumListView.js+++ b/ui/src/album/AlbumListView.js@@ -12,16 +12,16 @@ import {} from 'react-admin'import { useMediaQuery } from '@material-ui/core'import StarBorderIcon from '@material-ui/icons/StarBorder'+import { makeStyles } from '@material-ui/core/styles'import {ArtistLinkField,DurationField,RangeField,SimpleList,SizeField,+ MultiLineTextField,+ AlbumContextMenu,} from '../common'-import { AlbumContextMenu } from '../common'-import { makeStyles } from '@material-ui/core/styles'-import MultiLineTextField from '../common/MultiLineTextField'const useStyles = makeStyles({columnIcon: {diff --git a/ui/src/album/AlbumShow.js b/ui/src/album/AlbumShow.jsindex 841a0f431..9b7aa61e1 100644--- a/ui/src/album/AlbumShow.js+++ b/ui/src/album/AlbumShow.js@@ -2,13 +2,11 @@ import React from 'react'import { useGetOne } from 'react-admin'import AlbumDetails from './AlbumDetails'import { Title } from '../common'-import { useStyles } from './styles'import { SongBulkActions } from '../common'import AlbumActions from './AlbumActions'import AlbumSongs from './AlbumSongs'const AlbumShow = (props) => {- const classes = useStyles()const { data: record, loading, error } = useGetOne('album', props.id)if (loading) {@@ -21,7 +19,7 @@ const AlbumShow = (props) => {return (<>- <AlbumDetails {...props} classes={classes} record={record} />+ <AlbumDetails {...props} record={record} /><AlbumSongs{...props}albumId={props.id}diff --git a/ui/src/album/styles.js b/ui/src/album/styles.jsdeleted file mode 100644index 0db2ca9fb..000000000--- a/ui/src/album/styles.js+++ /dev/null@@ -1,54 +0,0 @@-import { makeStyles } from '@material-ui/core/styles'--export const useStyles = makeStyles((theme) => ({- container: {- [theme.breakpoints.down('xs')]: {- padding: '0.7em',- minWidth: '24em',- },- [theme.breakpoints.up('sm')]: {- padding: '1em',- minWidth: '32em',- },- },- albumCover: {- display: 'inline-flex',- justifyContent: 'center',- alignItems: 'center',- cursor: 'pointer',-- [theme.breakpoints.down('xs')]: {- height: '8em',- width: '8em',- },- [theme.breakpoints.up('sm')]: {- height: '10em',- width: '10em',- },- [theme.breakpoints.up('lg')]: {- height: '15em',- width: '15em',- },- '&:hover $playButton': {- opacity: 1,- },- },- albumDetails: {- display: 'inline-block',- verticalAlign: 'top',- [theme.breakpoints.down('xs')]: {- width: '14em',- },- [theme.breakpoints.up('sm')]: {- width: '26em',- },- [theme.breakpoints.up('lg')]: {- width: '43em',- },- },- albumTitle: {- whiteSpace: 'nowrap',- overflow: 'hidden',- textOverflow: 'ellipsis',- },-}))diff --git a/ui/src/common/MultiLineTextField.js b/ui/src/common/MultiLineTextField.jsindex 2f267925f..bc36326a3 100644--- a/ui/src/common/MultiLineTextField.js+++ b/ui/src/common/MultiLineTextField.js@@ -4,10 +4,22 @@ import Typography from '@material-ui/core/Typography'import sanitizeFieldRestProps from './sanitizeFieldRestProps'import md5 from 'md5-hex'-const MultiLineTextField = memo(- ({ className, emptyText, source, record = {}, stripTags, ...rest }) => {+export const MultiLineTextField = memo(+ ({+ className,+ emptyText,+ source,+ record,+ firstLine,+ maxLines,+ addLabel,+ ...rest+ }) => {const value = get(record, source)- const lines = value ? value.split('\n') : []+ let lines = value ? value.split('\n') : []+ if (maxLines || firstLine) {+ lines = lines.slice(firstLine, maxLines)+ }return (<Typography@@ -18,20 +30,24 @@ const MultiLineTextField = memo(>{lines.length === 0 && emptyText? emptyText- : lines.map((line, idx) => (- <div- data-testid={`${source}.${idx}`}- key={md5(line)}- dangerouslySetInnerHTML={{ __html: line }}- />- ))}+ : lines.map((line, idx) =>+ line === '' ? (+ <br key={md5(line + idx)} />+ ) : (+ <div+ data-testid={`${source}.${idx}`}+ key={md5(line + idx)}+ dangerouslySetInnerHTML={{ __html: line }}+ />+ )+ )}</Typography>)})MultiLineTextField.defaultProps = {+ record: {},addLabel: true,+ firstLine: 0,}--export default MultiLineTextFielddiff --git a/ui/src/common/SongDetails.js b/ui/src/common/SongDetails.jsindex 714c7e0b7..b26ceed22 100644--- a/ui/src/common/SongDetails.js+++ b/ui/src/common/SongDetails.js@@ -8,7 +8,7 @@ import TableRow from '@material-ui/core/TableRow'import { BooleanField, DateField, TextField, useTranslate } from 'react-admin'import inflection from 'inflection'import { BitrateField, SizeField } from './index'-import MultiLineTextField from './MultiLineTextField'+import { MultiLineTextField } from './MultiLineTextField'export const SongDetails = (props) => {const translate = useTranslate()diff --git a/ui/src/common/StarButton.js b/ui/src/common/StarButton.jsindex 9958747fa..133f35d15 100644--- a/ui/src/common/StarButton.js+++ b/ui/src/common/StarButton.js@@ -15,7 +15,16 @@ const useStyles = makeStyles({},})-export const StarButton = ({ resource, record, color, visible, size }) => {+export const StarButton = ({+ resource,+ record,+ color,+ visible,+ size,+ component: Button,+ addLabel,+ ...rest+}) => {const [loading, setLoading] = useState(false)const classes = useStyles({ color, visible, starred: record.starred })const notify = useNotify()@@ -56,18 +65,19 @@ export const StarButton = ({ resource, record, color, visible, size }) => {}return (- <IconButton+ <ButtononClick={handleToggleStar}size={'small'}disabled={loading}className={classes.star}+ {...rest}>{record.starred ? (<StarIcon fontSize={size} />) : (<StarBorderIcon fontSize={size} />)}- </IconButton>+ </Button>)}@@ -77,6 +87,7 @@ StarButton.propTypes = {visible: PropTypes.bool,color: PropTypes.string,size: PropTypes.string,+ component: PropTypes.object,}StarButton.defaultProps = {@@ -85,4 +96,5 @@ StarButton.defaultProps = {visible: true,size: 'small',color: 'inherit',+ component: IconButton,}diff --git a/ui/src/common/index.js b/ui/src/common/index.jsindex 856f5d64c..2cae83232 100644--- a/ui/src/common/index.js+++ b/ui/src/common/index.js@@ -6,6 +6,7 @@ export * from './ContextMenus'export * from './DocLink'export * from './DurationField'export * from './List'+export * from './MultiLineTextField'export * from './Pagination'export * from './PlayButton'export * from './QuickFilter'