diff --git a/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js b/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js index d2934f834..66a7fced0 100644 --- a/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js +++ b/frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js @@ -82,6 +82,8 @@ class AddNewArtistSearchResult extends Component { } = this.state; const linkProps = isExistingArtist ? { to: `/artist/${foreignArtistId}` } : { onPress: this.onPress }; + + const endedString = artistType === 'Person' ? 'Deceased' : 'Ended'; const height = calculateHeight(230, isSmallScreen); @@ -153,7 +155,7 @@ class AddNewArtistSearchResult extends Component { kind={kinds.DANGER} size={sizes.LARGE} > - Ended + {endedString} : null } diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js index 85831a955..4539783fa 100644 --- a/frontend/src/Artist/Details/ArtistDetails.js +++ b/frontend/src/Artist/Details/ArtistDetails.js @@ -191,6 +191,7 @@ class ArtistDetails extends Component { overview, links, images, + artistType, alternateTitles, tags, isSaving, @@ -230,6 +231,7 @@ class ArtistDetails extends Component { } = this.state; const continuing = status === 'continuing'; + const endedString = artistType === 'Person' ? 'Deceased' : 'Ended'; let trackFilesCountMessage = 'No track files'; @@ -504,7 +506,7 @@ class ArtistDetails extends Component { /> - {continuing ? 'Continuing' : 'Ended'} + {continuing ? 'Continuing' : endedString} @@ -678,6 +680,7 @@ ArtistDetails.propTypes = { statistics: PropTypes.object.isRequired, qualityProfileId: PropTypes.number.isRequired, monitored: PropTypes.bool.isRequired, + artistType: PropTypes.string.isRequired, albumTypes: PropTypes.arrayOf(PropTypes.string), status: PropTypes.string.isRequired, overview: PropTypes.string.isRequired, diff --git a/frontend/src/Artist/Editor/ArtistEditorRow.js b/frontend/src/Artist/Editor/ArtistEditorRow.js index ae95c465f..dd4051694 100644 --- a/frontend/src/Artist/Editor/ArtistEditorRow.js +++ b/frontend/src/Artist/Editor/ArtistEditorRow.js @@ -29,6 +29,7 @@ class ArtistEditorRow extends Component { status, foreignArtistId, artistName, + artistType, monitored, languageProfile, metadataProfile, @@ -50,6 +51,7 @@ class ArtistEditorRow extends Component { /> @@ -107,6 +109,7 @@ ArtistEditorRow.propTypes = { status: PropTypes.string.isRequired, foreignArtistId: PropTypes.string.isRequired, artistName: PropTypes.string.isRequired, + artistType: PropTypes.string.isRequired, monitored: PropTypes.bool.isRequired, languageProfile: PropTypes.object.isRequired, metadataProfile: PropTypes.object.isRequired, diff --git a/frontend/src/Artist/Index/Table/ArtistIndexRow.js b/frontend/src/Artist/Index/Table/ArtistIndexRow.js index b77c499c4..389dbeee1 100644 --- a/frontend/src/Artist/Index/Table/ArtistIndexRow.js +++ b/frontend/src/Artist/Index/Table/ArtistIndexRow.js @@ -139,6 +139,7 @@ class ArtistIndexRow extends Component { ); @@ -36,6 +39,7 @@ function ArtistStatusCell(props) { ArtistStatusCell.propTypes = { className: PropTypes.string.isRequired, + artistType: PropTypes.string.isRequired, monitored: PropTypes.bool.isRequired, status: PropTypes.string.isRequired, component: PropTypes.func