From f0eb626324469f06ccdfb529ae3e05a5541fb4fd Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 7 Jan 2024 15:30:54 +0200 Subject: [PATCH] Set fallback values for statistics --- frontend/src/Album/Delete/DeleteAlbumModalContent.js | 8 ++++---- frontend/src/Album/Details/AlbumDetails.js | 4 ++-- frontend/src/Album/Edit/EditAlbumModalContent.js | 6 +++++- frontend/src/Artist/Delete/DeleteArtistModalContent.js | 4 ++-- frontend/src/Artist/Details/AlbumRow.js | 9 +++++---- frontend/src/Artist/Details/ArtistDetails.js | 4 ++-- .../Artist/Index/Select/AlbumStudio/AlbumStudioAlbum.tsx | 6 +++++- frontend/src/InteractiveImport/Album/SelectAlbumRow.js | 9 +++++---- frontend/src/Store/Actions/artistIndexActions.js | 6 +++--- 9 files changed, 33 insertions(+), 23 deletions(-) diff --git a/frontend/src/Album/Delete/DeleteAlbumModalContent.js b/frontend/src/Album/Delete/DeleteAlbumModalContent.js index c637c3dd49..e45985c97c 100644 --- a/frontend/src/Album/Delete/DeleteAlbumModalContent.js +++ b/frontend/src/Album/Delete/DeleteAlbumModalContent.js @@ -58,8 +58,8 @@ class DeleteAlbumModalContent extends Component { } = this.props; const { - trackFileCount, - sizeOnDisk + trackFileCount = 0, + sizeOnDisk = 0 } = statistics; const deleteFiles = this.state.deleteFiles; @@ -133,14 +133,14 @@ class DeleteAlbumModalContent extends Component { diff --git a/frontend/src/Album/Details/AlbumDetails.js b/frontend/src/Album/Details/AlbumDetails.js index c3e68e4c6c..783216a615 100644 --- a/frontend/src/Album/Details/AlbumDetails.js +++ b/frontend/src/Album/Details/AlbumDetails.js @@ -216,8 +216,8 @@ class AlbumDetails extends Component { } = this.props; const { - trackFileCount, - sizeOnDisk + trackFileCount = 0, + sizeOnDisk = 0 } = statistics; const { diff --git a/frontend/src/Album/Edit/EditAlbumModalContent.js b/frontend/src/Album/Edit/EditAlbumModalContent.js index 8c5ed58a6c..b924f937ba 100644 --- a/frontend/src/Album/Edit/EditAlbumModalContent.js +++ b/frontend/src/Album/Edit/EditAlbumModalContent.js @@ -43,6 +43,10 @@ class EditAlbumModalContent extends Component { ...otherProps } = this.props; + const { + trackFileCount = 0 + } = statistics; + const { monitored, anyReleaseOk, @@ -96,7 +100,7 @@ class EditAlbumModalContent extends Component { type={inputTypes.ALBUM_RELEASE_SELECT} name="releases" helpText={translate('ReleasesHelpText')} - isDisabled={anyReleaseOk.value && statistics.trackFileCount > 0} + isDisabled={anyReleaseOk.value && trackFileCount > 0} albumReleases={releases} onChange={onInputChange} /> diff --git a/frontend/src/Artist/Delete/DeleteArtistModalContent.js b/frontend/src/Artist/Delete/DeleteArtistModalContent.js index 10e19ae201..0542f718bc 100644 --- a/frontend/src/Artist/Delete/DeleteArtistModalContent.js +++ b/frontend/src/Artist/Delete/DeleteArtistModalContent.js @@ -56,8 +56,8 @@ class DeleteArtistModalContent extends Component { } = this.props; const { - trackFileCount, - sizeOnDisk + trackFileCount = 0, + sizeOnDisk = 0 } = statistics; const deleteFiles = this.state.deleteFiles; diff --git a/frontend/src/Artist/Details/AlbumRow.js b/frontend/src/Artist/Details/AlbumRow.js index d8f27b8473..52cd079755 100644 --- a/frontend/src/Artist/Details/AlbumRow.js +++ b/frontend/src/Artist/Details/AlbumRow.js @@ -85,9 +85,9 @@ class AlbumRow extends Component { } = this.props; const { - trackCount, - trackFileCount, - totalTrackCount + trackCount = 0, + trackFileCount = 0, + totalTrackCount = 0 } = statistics; return ( @@ -257,7 +257,8 @@ AlbumRow.propTypes = { AlbumRow.defaultProps = { statistics: { trackCount: 0, - trackFileCount: 0 + trackFileCount: 0, + totalTrackCount: 0 } }; diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js index ff276cf778..c6fb445b72 100644 --- a/frontend/src/Artist/Details/ArtistDetails.js +++ b/frontend/src/Artist/Details/ArtistDetails.js @@ -222,8 +222,8 @@ class ArtistDetails extends Component { } = this.props; const { - trackFileCount, - sizeOnDisk + trackFileCount = 0, + sizeOnDisk = 0 } = statistics; const { diff --git a/frontend/src/Artist/Index/Select/AlbumStudio/AlbumStudioAlbum.tsx b/frontend/src/Artist/Index/Select/AlbumStudio/AlbumStudioAlbum.tsx index f7e133a840..ec4ef90744 100644 --- a/frontend/src/Artist/Index/Select/AlbumStudio/AlbumStudioAlbum.tsx +++ b/frontend/src/Artist/Index/Select/AlbumStudio/AlbumStudioAlbum.tsx @@ -33,7 +33,11 @@ function AlbumStudioAlbum(props: AlbumStudioAlbumProps) { isSaving = false, } = props; - const { trackFileCount, totalTrackCount, percentOfTracks } = statistics; + const { + trackFileCount = 0, + totalTrackCount = 0, + percentOfTracks = 0, + } = statistics; const dispatch = useDispatch(); const onAlbumMonitoredPress = useCallback(() => { diff --git a/frontend/src/InteractiveImport/Album/SelectAlbumRow.js b/frontend/src/InteractiveImport/Album/SelectAlbumRow.js index 68d50fb8b2..6b50a1ce9c 100644 --- a/frontend/src/InteractiveImport/Album/SelectAlbumRow.js +++ b/frontend/src/InteractiveImport/Album/SelectAlbumRow.js @@ -44,9 +44,9 @@ class SelectAlbumRow extends Component { } = this.props; const { - trackCount, - trackFileCount, - totalTrackCount + trackCount = 0, + trackFileCount = 0, + totalTrackCount = 0 } = statistics; const extendedTitle = disambiguation ? `${title} (${disambiguation})` : title; @@ -134,7 +134,8 @@ SelectAlbumRow.propTypes = { SelectAlbumRow.defaultProps = { statistics: { trackCount: 0, - trackFileCount: 0 + trackFileCount: 0, + totalTrackCount: 0 } }; diff --git a/frontend/src/Store/Actions/artistIndexActions.js b/frontend/src/Store/Actions/artistIndexActions.js index aa78daf40e..756a6ee251 100644 --- a/frontend/src/Store/Actions/artistIndexActions.js +++ b/frontend/src/Store/Actions/artistIndexActions.js @@ -176,7 +176,7 @@ export const defaultState = { const { trackCount = 0, - trackFileCount + trackFileCount = 0 } = statistics; const progress = trackCount ? trackFileCount / trackCount * 100 : 100; @@ -201,7 +201,7 @@ export const defaultState = { albumCount: function(item) { const { statistics = {} } = item; - return statistics.albumCount; + return statistics.albumCount || 0; }, trackCount: function(item) { @@ -229,7 +229,7 @@ export const defaultState = { const { trackCount = 0, - trackFileCount + trackFileCount = 0 } = statistics; const progress = trackCount ?