mirror of
https://github.com/Sonarr/Sonarr
synced 2026-05-07 12:30:56 +02:00
Fix series ending year on details page
This commit is contained in:
parent
f33abc7b85
commit
92f4354d76
2 changed files with 21 additions and 14 deletions
|
|
@ -36,7 +36,7 @@ import DeleteSeriesModal from 'Series/Delete/DeleteSeriesModal';
|
|||
import EditSeriesModal from 'Series/Edit/EditSeriesModal';
|
||||
import SeriesHistoryModal from 'Series/History/SeriesHistoryModal';
|
||||
import MonitoringOptionsModal from 'Series/MonitoringOptions/MonitoringOptionsModal';
|
||||
import { Image, Statistics } from 'Series/Series';
|
||||
import { Image, SeriesStatus, Statistics } from 'Series/Series';
|
||||
import SeriesGenres from 'Series/SeriesGenres';
|
||||
import SeriesPoster from 'Series/SeriesPoster';
|
||||
import { getSeriesStatusDetails } from 'Series/SeriesStatus';
|
||||
|
|
@ -67,10 +67,22 @@ function getFanartUrl(images: Image[]) {
|
|||
return images.find((image) => image.coverType === 'fanart')?.url;
|
||||
}
|
||||
|
||||
function getDateYear(date: string | undefined) {
|
||||
const dateDate = moment.utc(date);
|
||||
function getDateYear(date: string) {
|
||||
return moment.utc(date).format('YYYY');
|
||||
}
|
||||
|
||||
return dateDate.format('YYYY');
|
||||
function getRunningYears(
|
||||
status: SeriesStatus,
|
||||
year: number,
|
||||
lastAired: string | undefined
|
||||
) {
|
||||
if (year === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return status === 'ended' && lastAired
|
||||
? `${year}-${getDateYear(lastAired)}`
|
||||
: `${year}-`;
|
||||
}
|
||||
|
||||
interface ExpandedState {
|
||||
|
|
@ -394,18 +406,13 @@ function SeriesDetails({ seriesId }: SeriesDetailsProps) {
|
|||
genres,
|
||||
tags,
|
||||
year,
|
||||
lastAired,
|
||||
} = series;
|
||||
|
||||
const {
|
||||
episodeCount = 0,
|
||||
episodeFileCount = 0,
|
||||
sizeOnDisk = 0,
|
||||
lastAired,
|
||||
} = statistics;
|
||||
const { episodeCount = 0, episodeFileCount = 0, sizeOnDisk = 0 } = statistics;
|
||||
|
||||
const statusDetails = getSeriesStatusDetails(status);
|
||||
const runningYears =
|
||||
status === 'ended' ? `${year}-${getDateYear(lastAired)}` : `${year}-`;
|
||||
const runningYears = getRunningYears(status, year, lastAired);
|
||||
|
||||
let episodeFilesCountMessage = translate('SeriesDetailsNoEpisodeFiles');
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ export interface Statistics {
|
|||
sizeOnDisk: number;
|
||||
totalEpisodeCount: number;
|
||||
monitoredEpisodeCount: number;
|
||||
lastAired?: string;
|
||||
}
|
||||
|
||||
export interface Season {
|
||||
|
|
@ -73,7 +72,8 @@ interface Series extends ModelBase {
|
|||
certification: string;
|
||||
cleanTitle: string;
|
||||
ended: boolean;
|
||||
firstAired: string;
|
||||
firstAired?: string;
|
||||
lastAired?: string;
|
||||
genres: string[];
|
||||
images: Image[];
|
||||
imdbId?: string;
|
||||
|
|
|
|||
Loading…
Reference in a new issue