shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): Don't display empty dropdown when no trailer available (#804)

Browse Source
This commit is contained in:
TheCatLady
2021-02-02 04:44:46 -05:00
committed by GitHub
parent 6e9ac275e1
commit 95c2a21697
3 changed files with 74 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Common/ButtonWithDropdown/index.tsx
View File

@@ -92,8 +92,8 @@ const ButtonWithDropdown: React.FC<ButtonWithDropdownProps> = ({
> >
{text} {text}
</button> </button>
<span className="relative z-10 block -ml-px">
{children && ( {children && (
<span className="relative z-10 block -ml-px">
<button <button
type="button" type="button"
className={`relative inline-flex items-center h-full px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out rounded-r-md focus:z-10 ${styleClasses.dropdownSideButtonClasses}`} className={`relative inline-flex items-center h-full px-2 py-2 text-sm font-medium leading-5 text-white transition duration-150 ease-in-out rounded-r-md focus:z-10 ${styleClasses.dropdownSideButtonClasses}`}
@@ -117,7 +117,6 @@ const ButtonWithDropdown: React.FC<ButtonWithDropdownProps> = ({
</svg> </svg>
)} )}
</button> </button>
)}
<Transition <Transition
show={isOpen} show={isOpen}
enter="transition ease-out duration-100 opacity-0" enter="transition ease-out duration-100 opacity-0"
@@ -136,6 +135,7 @@ const ButtonWithDropdown: React.FC<ButtonWithDropdownProps> = ({
</div> </div>
</Transition> </Transition>
</span> </span>
)}
</span> </span>
); );
}; };

14
src/components/MovieDetails/index.tsx
View File

@@ -417,10 +417,17 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
} }
}} }}
> >
{data.mediaInfo?.plexUrl || {(
trailerUrl
? data.mediaInfo?.plexUrl ||
(data.mediaInfo?.plexUrl4k && (data.mediaInfo?.plexUrl4k &&
(hasPermission(Permission.REQUEST_4K) || (hasPermission(Permission.REQUEST_4K) ||
hasPermission(Permission.REQUEST_4K_MOVIE))) ? ( hasPermission(Permission.REQUEST_4K_MOVIE)))
: data.mediaInfo?.plexUrl &&
data.mediaInfo?.plexUrl4k &&
(hasPermission(Permission.REQUEST_4K) ||
hasPermission(Permission.REQUEST_4K_MOVIE))
) ? (
<> <>
{data.mediaInfo?.plexUrl && {data.mediaInfo?.plexUrl &&
data.mediaInfo?.plexUrl4k && data.mediaInfo?.plexUrl4k &&
@@ -435,8 +442,7 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
{intl.formatMessage(messages.play4konplex)} {intl.formatMessage(messages.play4konplex)}
</ButtonWithDropdown.Item> </ButtonWithDropdown.Item>
)} )}
{(data.mediaInfo?.plexUrl || data.mediaInfo?.plexUrl4k) && {trailerUrl && (
trailerUrl && (
<ButtonWithDropdown.Item <ButtonWithDropdown.Item
onClick={() => { onClick={() => {
window.open(trailerUrl, '_blank'); window.open(trailerUrl, '_blank');

20
src/components/TvDetails/index.tsx
View File

@@ -443,15 +443,22 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
} }
}} }}
> >
{data.mediaInfo?.plexUrl || {(
trailerUrl
? data.mediaInfo?.plexUrl ||
(data.mediaInfo?.plexUrl4k && (data.mediaInfo?.plexUrl4k &&
(hasPermission(Permission.REQUEST_4K) || (hasPermission(Permission.REQUEST_4K) ||
hasPermission(Permission.REQUEST_4K_TV))) ? ( hasPermission(Permission.REQUEST_4K_TV)))
: data.mediaInfo?.plexUrl &&
data.mediaInfo?.plexUrl4k &&
(hasPermission(Permission.REQUEST_4K) ||
hasPermission(Permission.REQUEST_4K_TV))
) ? (
<> <>
{data.mediaInfo?.plexUrl && {data.mediaInfo?.plexUrl &&
data.mediaInfo?.plexUrl4k && data.mediaInfo?.plexUrl4k &&
(hasPermission(Permission.REQUEST_4K) || (hasPermission(Permission.REQUEST_4K) ||
hasPermission(Permission.REQUEST_4K_TV)) && ( hasPermission(Permission.REQUEST_4K_TV)) ? (
<ButtonWithDropdown.Item <ButtonWithDropdown.Item
onClick={() => { onClick={() => {
window.open(data.mediaInfo?.plexUrl4k, '_blank'); window.open(data.mediaInfo?.plexUrl4k, '_blank');
@@ -460,9 +467,8 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
> >
{intl.formatMessage(messages.play4konplex)} {intl.formatMessage(messages.play4konplex)}
</ButtonWithDropdown.Item> </ButtonWithDropdown.Item>
)} ) : null}
{(data.mediaInfo?.plexUrl || data.mediaInfo?.plexUrl4k) && {trailerUrl ? (
trailerUrl && (
<ButtonWithDropdown.Item <ButtonWithDropdown.Item
onClick={() => { onClick={() => {
window.open(trailerUrl, '_blank'); window.open(trailerUrl, '_blank');
@@ -471,7 +477,7 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
> >
{intl.formatMessage(messages.watchtrailer)} {intl.formatMessage(messages.watchtrailer)}
</ButtonWithDropdown.Item> </ButtonWithDropdown.Item>
)} ) : null}
</> </>
) : null} ) : null}
</ButtonWithDropdown> </ButtonWithDropdown>