Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 162 additions & 0 deletions cypress/e2e/discover.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,30 @@ const stubTitleDetails = (
};

cy.intercept('GET', `/api/v1/${mediaType}/${result.id}`, details);
cy.intercept('GET', `/api/v1/${mediaType}/${result.id}/ratingscombined*`, {});
const emptyResults = {
page: 1,
totalPages: 1,
totalResults: 0,
results: [],
};
cy.intercept(
'GET',
`/api/v1/${mediaType}/${result.id}/recommendations*`,
emptyResults
);
cy.intercept(
'GET',
`/api/v1/${mediaType}/${result.id}/similar*`,
emptyResults
);
if (mediaType === 'tv') {
cy.intercept(
'GET',
`/api/v1/collection-catalog/tv/for-series/${result.id}*`,
{ collections: [] }
);
}
cy.intercept('GET', `**/_next/data/*/${mediaType}/${result.id}.json*`, {
pageProps: { [mediaType]: details },
__N_SSP: true,
Expand Down Expand Up @@ -137,6 +161,9 @@ describe('Discover', () => {
cy.contains('.slider-header', 'Popular Series').scrollIntoView();
cy.wait('@getPopularTv');
clickFirstTitleCardInSlider('Popular Series');
cy.url().should('match', /\/tv\/99001$/);
cy.get('[data-testid="discover-previous"]').should('not.exist');
cy.get('[data-testid="discover-next"]').should('not.exist');
});

it('loads upcoming series', () => {
Expand All @@ -159,6 +186,141 @@ describe('Discover', () => {
clickFirstTitleCardInSlider('Upcoming Series');
});

it('stores the ordered movie context when opening a Discover result', () => {
const movies = [
{ id: 99011, mediaType: 'movie', title: 'Filtered Movie One' },
{ id: 99012, mediaType: 'movie', title: 'Filtered Movie Two' },
{ id: 99013, mediaType: 'movie', title: 'Filtered Movie Three' },
];

cy.intercept('GET', '/api/v1/discover/movies*', {
page: 1,
totalPages: 1,
totalResults: movies.length,
results: movies,
}).as('getFilteredMovies');

cy.visit('/discover/movies?sortBy=popularity.desc');
cy.wait('@getFilteredMovies');
cy.get('[data-poster-region="detail-link"]')
.eq(1)
.should('have.attr', 'href')
.and('include', 'discoverContext=')
.then((href) => {
expect(href).to.match(
/\/movie\/99012\?discoverContext=[a-z0-9_-]{12,64}$/i
);
const contextId = href.match(/[?&]discoverContext=([^&]+)/)?.[1];

expect(contextId).to.match(/^[a-z0-9_-]{12,64}$/i);

cy.get('[data-poster-region="detail-link"]')
.eq(1)
.then(($link) => {
$link[0].addEventListener(
'click',
(event) => event.preventDefault(),
{ once: true }
);
})
.click({ force: true });

cy.window().then((window) => {
const saved = JSON.parse(
window.sessionStorage.getItem(
`seerrng:discover-navigation:${contextId}`
) ?? 'null'
);
expect(saved.items).to.deep.equal([
{ id: 99011, mediaType: 'movie' },
{ id: 99012, mediaType: 'movie' },
{ id: 99013, mediaType: 'movie' },
]);
});
});
cy.location('pathname').should('eq', '/discover/movies');
});

it('moves through the loaded filtered movie results', () => {
const movies = [
{ id: 99011, mediaType: 'movie', title: 'Filtered Movie One' },
{ id: 99012, mediaType: 'movie', title: 'Filtered Movie Two' },
{ id: 99013, mediaType: 'movie', title: 'Filtered Movie Three' },
];

cy.intercept('GET', '/api/v1/discover/movies*', {
page: 1,
totalPages: 1,
totalResults: movies.length,
results: movies,
}).as('getFilteredMovies');
movies.forEach((movie) => stubTitleDetails('movie', movie));

cy.visit('/discover/movies?sortBy=popularity.desc');
cy.wait('@getFilteredMovies');
cy.get('[data-testid="title-card"]').eq(1).trigger('mouseover');
cy.get('[data-poster-region="detail-link"]')
.eq(1)
.should('have.attr', 'href')
.and('include', 'discoverContext=');
cy.get('[data-poster-region="detail-link"]')
.eq(1)
.should('be.visible')
.click();
cy.url().should('include', '/movie/99012?discoverContext=');
cy.get('[data-testid="discover-previous"]').should('be.visible');
cy.get('[data-testid="discover-next"]').should('be.visible').click();
cy.url().should('include', '/movie/99013?discoverContext=');
cy.get('[data-testid="media-title"]').should(
'contain',
'Filtered Movie Three'
);
cy.viewport(390, 844);
cy.get('[data-testid="discover-previous"]').should('be.visible');
cy.get('[data-testid="discover-next"]').should('not.exist');
cy.go('back');
cy.get('[data-testid="discover-previous"]').should('be.visible');
cy.go('back');
cy.location('pathname').should('eq', '/discover/movies');
});

it('moves through the loaded filtered series results', () => {
const series = [
{ id: 99021, mediaType: 'tv', name: 'Filtered Series One' },
{ id: 99022, mediaType: 'tv', name: 'Filtered Series Two' },
];

cy.intercept('GET', '/api/v1/discover/tv*', {
page: 1,
totalPages: 1,
totalResults: series.length,
results: series,
}).as('getFilteredSeries');
series.forEach((title) => stubTitleDetails('tv', title));

cy.visit('/discover/tv?sortBy=first_air_date.desc');
cy.wait('@getFilteredSeries');
cy.get('[data-testid="title-card"]').first().trigger('mouseover');
cy.get('[data-poster-region="detail-link"]')
.first()
.should('have.attr', 'href')
.and('include', 'discoverContext=');
cy.get('[data-poster-region="detail-link"]')
.first()
.should('be.visible')
.click();
cy.url().should('include', '/tv/99021?discoverContext=');
cy.get('[data-testid="discover-previous"]').should('not.exist');
cy.get('[data-testid="discover-next"]').should('be.visible').click();
cy.url().should('include', '/tv/99022?discoverContext=');
cy.get('[data-testid="media-title"]').should(
'contain',
'Filtered Series Two'
);
cy.get('[data-testid="discover-previous"]').should('be.visible');
cy.get('[data-testid="discover-next"]').should('not.exist');
});

it('displays error for media with invalid TMDB ID', () => {
cy.intercept('GET', '/api/v1/movie/998814', { statusCode: 404 });
cy.intercept('GET', '/api/v1/media?*', {
Expand Down
9 changes: 9 additions & 0 deletions release-notes/2026-10-13-discover-detail-navigation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
category: added
audience: users
area: discover
action: none
breaking: false
---

Movie and series details opened from Discover result lists now include previous and next controls that follow the loaded, visible result order. Direct detail links remain unchanged.
84 changes: 82 additions & 2 deletions src/components/Common/ListView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import TitleCard from '@app/components/TitleCard';
import LibraryTitleCard from '@app/components/TitleCard/LibraryTitleCard';
import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
import useCardTextVisibility from '@app/hooks/useCardTextVisibility';
import useDiscoverNavigationContextId from '@app/hooks/useDiscoverNavigationContextId';
import useSettings from '@app/hooks/useSettings';
import { Permission, useUser } from '@app/hooks/useUser';
import useVerticalScroll from '@app/hooks/useVerticalScroll';
Expand All @@ -14,6 +15,10 @@ import useWarmImageCache, {
} from '@app/hooks/useWarmImageCache';
import globalMessages from '@app/i18n/globalMessages';
import defineMessages from '@app/utils/defineMessages';
import {
storeDiscoverNavigationContext,
type DiscoverNavigationItem,
} from '@app/utils/discoverNavigation';
import {
canRequestMissingBookFormat,
isBookInProgress,
Expand All @@ -33,7 +38,8 @@ import type {
TvResult,
} from '@server/models/Search';
import type { SportarrResult } from '@server/models/Sportarr';
import { useMemo } from 'react';
import { useRouter } from 'next/router';
import { useCallback, useMemo } from 'react';
import { useIntl } from 'react-intl';
import { twMerge } from 'tailwind-merge';

Expand Down Expand Up @@ -64,6 +70,7 @@ type ListViewProps = {
watchlistPreviewDisabled?: boolean;
emptyMessage?: React.ReactNode;
emptyClassName?: string;
enableDiscoverNavigation?: boolean;
};

const messages = defineMessages('components.ListView', {
Expand All @@ -85,12 +92,18 @@ const ListView = ({
watchlistPreviewDisabled = false,
emptyMessage,
emptyClassName,
enableDiscoverNavigation = false,
}: ListViewProps) => {
const intl = useIntl();
const { visibility } = useCardTextVisibility();
const { hasPermission } = useUser();
const { currentSettings } = useSettings();
const canManageBlocklist = hasPermission(Permission.MANAGE_BLOCKLIST);
const router = useRouter();
const discoverNavigationContextId = useDiscoverNavigationContextId(
enableDiscoverNavigation && router.isReady,
router.isReady ? router.asPath : undefined
);

const visibleItems = useMemo(
() =>
Expand All @@ -111,6 +124,43 @@ const ListView = ({
[items, canManageBlocklist, currentSettings.hideBlocklisted]
);

const discoverNavigationItems = useMemo(() => {
if (!enableDiscoverNavigation) {
return [];
}

const plexNavigationItems = (plexItems ?? []).flatMap((title) =>
title.tmdbId && (title.mediaType === 'movie' || title.mediaType === 'tv')
? [{ id: title.tmdbId, mediaType: title.mediaType }]
: []
);
const listNavigationItems = (visibleItems ?? []).flatMap((title) =>
(title.mediaType === 'movie' || title.mediaType === 'tv') &&
Number.isSafeInteger(title.id) &&
title.id > 0
? [{ id: title.id, mediaType: title.mediaType }]
: []
);

return [...plexNavigationItems, ...listNavigationItems];
}, [enableDiscoverNavigation, plexItems, visibleItems]);

const createTitleOpenHandler = useCallback(
(currentItem: DiscoverNavigationItem) => {
if (!discoverNavigationContextId) {
return undefined;
}

return () =>
storeDiscoverNavigationContext(
discoverNavigationContextId,
discoverNavigationItems,
currentItem
);
},
[discoverNavigationContextId, discoverNavigationItems]
);

useWarmImageCache(visibleItems ?? [], {
maxUrls: MAIN_MEDIA_POSTER_CACHE_WARM_LIMIT,
posterOnly: true,
Expand Down Expand Up @@ -156,14 +206,32 @@ const ListView = ({
isAddedToWatchlist={true}
canExpand
mutateParent={mutateParent}
discoverNavigationContextId={
title.mediaType === 'movie' || title.mediaType === 'tv'
? discoverNavigationContextId
: undefined
}
onOpen={
title.mediaType === 'movie' || title.mediaType === 'tv'
? createTitleOpenHandler({
id: title.tmdbId,
mediaType: title.mediaType,
})
: undefined
}
/>
) : null;

return card
? [<li key={`${title.ratingKey}-${index}`}>{card}</li>]
: [];
}),
[mutateParent, plexItems]
[
createTitleOpenHandler,
discoverNavigationContextId,
mutateParent,
plexItems,
]
);
const itemCards = useMemo(
() =>
Expand Down Expand Up @@ -193,6 +261,11 @@ const ListView = ({
}
canExpand
showText={visibility.movie === 'always'}
discoverNavigationContextId={discoverNavigationContextId}
onOpen={createTitleOpenHandler({
id: title.id,
mediaType: title.mediaType,
})}
/>
);
break;
Expand Down Expand Up @@ -220,6 +293,11 @@ const ListView = ({
}
canExpand
showText={visibility.tv === 'always'}
discoverNavigationContextId={discoverNavigationContextId}
onOpen={createTitleOpenHandler({
id: title.id,
mediaType: title.mediaType,
})}
/>
);
break;
Expand Down Expand Up @@ -397,6 +475,8 @@ const ListView = ({
posterTitleWeight,
watchlistPreview,
watchlistPreviewDisabled,
discoverNavigationContextId,
createTitleOpenHandler,
]
);
const hasRenderableItems =
Expand Down
Loading
Loading