From 362f4c3de2ef0db0dcb854c42fa1b8d2f9b4f2ff Mon Sep 17 00:00:00 2001 From: Clara Moraes Date: Sat, 20 Mar 2021 14:42:32 -0300 Subject: [PATCH] seasonBar: Show season special at the end of the list. Specials are labeled as season '0', so this commit changes how the list is sorted, making the season 0 go to the end of the list, and labelling it as "Specials" instead of "Season 0". Fixes: #195 --- src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js | 4 ++-- src/routes/MetaDetails/VideosList/VideosList.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js index 53135692a..061bea71c 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js @@ -12,7 +12,7 @@ const SeasonsBar = ({ className, seasons, season, onSelect }) => { const options = React.useMemo(() => { return seasons.map((season) => ({ value: String(season), - label: `Season ${season}` + label: season > 0 ? `Season ${season}` : `Specials` })); }, [seasons]); const selected = React.useMemo(() => { @@ -53,7 +53,7 @@ const SeasonsBar = ({ className, seasons, season, onSelect }) => { 0 ? `Season ${season}` : `Specials`} options={options} selected={selected} onSelect={seasonOnSelect} diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index b240b8a16..f5adc83e3 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -25,7 +25,7 @@ const VideosList = ({ className, metaItem, season, seasonOnSelect }) => { typeof season === 'number' && seasons.indexOf(season) === index; }) - .sort((a, b) => a - b); + .sort((a, b) => (a || Number.MAX_SAFE_INTEGER) - (b || Number.MAX_SAFE_INTEGER)); }, [videos]); const selectedSeason = React.useMemo(() => { return seasons.includes(season) ?