diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx index f48d8fc0..6efdb6a1 100644 --- a/src/components/RequestCard/index.tsx +++ b/src/components/RequestCard/index.tsx @@ -38,6 +38,7 @@ const messages = defineMessages({ editrequest: 'Edit Request', cancelrequest: 'Cancel Request', deleterequest: 'Delete Request', + unknowntitle: 'Unknown Title', }); const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => { @@ -136,6 +137,14 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => { requestData.is4k ? 'status4k' : 'status' ] } + downloadItem={ + requestData.media[ + requestData.is4k + ? 'downloadStatus4k' + : 'downloadStatus' + ] + } + title={intl.formatMessage(messages.unknowntitle)} inProgress={ ( requestData.media[ @@ -146,6 +155,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => { ).length > 0 } is4k={requestData.is4k} + mediaType={requestData.type} plexUrl={requestData.is4k ? plexUrl4k : plexUrl} serviceUrl={ requestData.is4k @@ -398,9 +408,9 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => { requestData.media[requestData.is4k ? 'status4k' : 'status'] } downloadItem={ - (requestData.media?.downloadStatus4k ?? []).length > 0 - ? requestData.media?.downloadStatus4k - : requestData.media?.downloadStatus + requestData.media[ + requestData.is4k ? 'downloadStatus4k' : 'downloadStatus' + ] } title={isMovie(title) ? title.title : title.name} inProgress={ diff --git a/src/components/RequestList/RequestItem/index.tsx b/src/components/RequestList/RequestItem/index.tsx index 31c9009a..864ca7e4 100644 --- a/src/components/RequestList/RequestItem/index.tsx +++ b/src/components/RequestList/RequestItem/index.tsx @@ -39,6 +39,7 @@ const messages = defineMessages({ cancelRequest: 'Cancel Request', tmdbid: 'TMDB ID', tvdbid: 'TheTVDB ID', + unknowntitle: 'Unknown Title', }); const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => { @@ -128,6 +129,12 @@ const RequestItemError = ({ requestData.is4k ? 'status4k' : 'status' ] } + downloadItem={ + requestData.media[ + requestData.is4k ? 'downloadStatus4k' : 'downloadStatus' + ] + } + title={intl.formatMessage(messages.unknowntitle)} inProgress={ ( requestData.media[ @@ -138,6 +145,7 @@ const RequestItemError = ({ ).length > 0 } is4k={requestData.is4k} + mediaType={requestData.type} plexUrl={requestData.is4k ? plexUrl4k : plexUrl} serviceUrl={ requestData.is4k @@ -464,9 +472,9 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => { requestData.media[requestData.is4k ? 'status4k' : 'status'] } downloadItem={ - requestData.media?.downloadStatus4k - ? requestData.media?.downloadStatus4k - : requestData.media?.downloadStatus + requestData.media[ + requestData.is4k ? 'downloadStatus4k' : 'downloadStatus' + ] } title={isMovie(title) ? title.title : title.name} inProgress={ diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx index 02bf383a..b301b11f 100644 --- a/src/components/StatusBadge/index.tsx +++ b/src/components/StatusBadge/index.tsx @@ -251,7 +251,7 @@ const StatusBadge = ({ href={mediaLink} className={`${ inProgress && - 'relative !bg-gray-700 !bg-opacity-80 !px-0 hover:overflow-hidden hover:!bg-gray-700' + 'relative !bg-gray-700 !bg-opacity-80 !px-0 hover:!bg-gray-700' } overflow-hidden`} > {inProgress && badgeDownloadProgress} diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index 18322e25..4ffb110e 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -330,6 +330,7 @@ "components.RequestCard.seasons": "{seasonCount, plural, one {Season} other {Seasons}}", "components.RequestCard.tmdbid": "TMDB ID", "components.RequestCard.tvdbid": "TheTVDB ID", + "components.RequestCard.unknowntitle": "Unknown Title", "components.RequestList.RequestItem.cancelRequest": "Cancel Request", "components.RequestList.RequestItem.deleterequest": "Delete Request", "components.RequestList.RequestItem.editrequest": "Edit Request", @@ -342,6 +343,7 @@ "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Season} other {Seasons}}", "components.RequestList.RequestItem.tmdbid": "TMDB ID", "components.RequestList.RequestItem.tvdbid": "TheTVDB ID", + "components.RequestList.RequestItem.unknowntitle": "Unknown Title", "components.RequestList.requests": "Requests", "components.RequestList.showallrequests": "Show All Requests", "components.RequestList.sortAdded": "Most Recent",