From 7404d68143e830df73b9d2779a6d7ea65bc9fd4f Mon Sep 17 00:00:00 2001 From: Danshil Kokil Mungur Date: Mon, 19 Sep 2022 20:11:16 +0400 Subject: [PATCH] fix(ui): hide null dates in episodes list (#3035) --- server/api/themoviedb/interfaces.ts | 2 +- server/models/Tv.ts | 2 +- src/components/TvDetails/Season/index.tsx | 4 +++- src/components/TvDetails/index.tsx | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/api/themoviedb/interfaces.ts b/server/api/themoviedb/interfaces.ts index 2282fe052..c39ac637e 100644 --- a/server/api/themoviedb/interfaces.ts +++ b/server/api/themoviedb/interfaces.ts @@ -191,7 +191,7 @@ export interface TmdbVideo { export interface TmdbTvEpisodeResult { id: number; - air_date: string; + air_date: string | null; episode_number: number; name: string; overview: string; diff --git a/server/models/Tv.ts b/server/models/Tv.ts index 7f809cbf4..fb719bef0 100644 --- a/server/models/Tv.ts +++ b/server/models/Tv.ts @@ -29,7 +29,7 @@ import type { Video } from './Movie'; interface Episode { id: number; name: string; - airDate: string; + airDate: string | null; episodeNumber: number; overview: string; productionCode: string; diff --git a/src/components/TvDetails/Season/index.tsx b/src/components/TvDetails/Season/index.tsx index a8f45764b..40eb33376 100644 --- a/src/components/TvDetails/Season/index.tsx +++ b/src/components/TvDetails/Season/index.tsx @@ -41,7 +41,9 @@ const Season = ({ seasonNumber, tvId }: SeasonProps) => {

{episode.name}

- + {episode.airDate && ( + + )}
{episode.overview &&

{episode.overview}

}
diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx index 50643aa1e..fdcc61a4f 100644 --- a/src/components/TvDetails/index.tsx +++ b/src/components/TvDetails/index.tsx @@ -829,6 +829,7 @@ const TvDetails = ({ tv }: TvDetailsProps) => { )} {data.nextEpisodeToAir && + data.nextEpisodeToAir.airDate && data.nextEpisodeToAir.airDate !== data.firstAirDate && (
{intl.formatMessage(messages.nextAirDate)}