mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-01 04:08:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(watchlist): discover local watchlist item display and profile local watchlist slider visibility

Browse Source 
Previously when you expand the `Your Watchlist` slider from the discover page to see all your
watchlist items, you only see the first 20 items. This commit fixes that so you can see all your
local watchlist items when you expand that slider. In addition, this commit also fixes the visiblity
of profile watchlist slider for local watchlists
This commit is contained in:
fallenbagel
2023-11-08 00:19:44 +05:00
parent f92231850c
commit 3cb9494e62
5 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/UserProfile/index.tsx
View File

@@ -34,6 +34,7 @@ const messages = defineMessages({
seriesrequest: 'Series Requests',
recentlywatched: 'Recently Watched',
plexwatchlist: 'Plex Watchlist',
localWatchlist: "{username}'s Watchlist",
emptywatchlist:
'Media added to your <PlexWatchlistSupportLink>Plex Watchlist</PlexWatchlistSupportLink> will appear here.',
});
@@ -78,17 +79,17 @@ const UserProfile = () => {
? `/api/v1/user/${user.id}/watch_data`
: null
);
const { data: watchlistItems, error: watchlistError } =
useSWR<WatchlistResponse>(
user?.userType === UserType.PLEX &&
(user.id === currentUser?.id ||
currentHasPermission(
[Permission.MANAGE_REQUESTS, Permission.WATCHLIST_VIEW],
{
type: 'or',
}
))
? `/api/v1/user/${user.id}/watchlist`
user?.id === currentUser?.id ||
currentHasPermission(
[Permission.MANAGE_REQUESTS, Permission.WATCHLIST_VIEW],
{
type: 'or',
}
)
? `/api/v1/user/${user?.id}/watchlist`
: null,
{
revalidateOnMount: true,
@@ -117,6 +118,13 @@ const UserProfile = () => {
return <Error statusCode={404} />;
}
const watchlistSliderTitle = intl.formatMessage(
user.userType === UserType.PLEX
? messages.plexwatchlist
: messages.localWatchlist,
{ username: user.displayName }
);
return (
<>
<PageTitle title={user.displayName} />
@@ -309,12 +317,11 @@ const UserProfile = () => {
/>
</>
)}
{user.userType === UserType.PLEX &&
(user.id === currentUser?.id ||
currentHasPermission(
[Permission.MANAGE_REQUESTS, Permission.WATCHLIST_VIEW],
{ type: 'or' }
)) &&
{(user.id === currentUser?.id ||
currentHasPermission(
[Permission.MANAGE_REQUESTS, Permission.WATCHLIST_VIEW],
{ type: 'or' }
)) &&
(!watchlistItems ||
!!watchlistItems.results.length ||
(user.id === currentUser?.id &&
@@ -327,11 +334,11 @@ const UserProfile = () => {
href={
user.id === currentUser?.id
? '/profile/watchlist'
: `/users/${user?.id}/watchlist`
: `/users/${user.id}/watchlist`
}
>
<a className="slider-title">
<span>{intl.formatMessage(messages.plexwatchlist)}</span>
<span>{watchlistSliderTitle}</span>
<ArrowRightCircleIcon />
</a>
</Link>