- }${download.vid_thumb_url}`})
{
- currentTarget.onerror = null; // prevents looping
- currentTarget.src = defaultVideoThumb;
- }}
- />
+
{showIgnored && ignored}
diff --git a/frontend/src/components/EmbeddableVideoPlayer.tsx b/frontend/src/components/EmbeddableVideoPlayer.tsx
index 6ad0a791..e0a52583 100644
--- a/frontend/src/components/EmbeddableVideoPlayer.tsx
+++ b/frontend/src/components/EmbeddableVideoPlayer.tsx
@@ -121,7 +121,11 @@ const EmbeddableVideoPlayer = ({ videoId }: EmbeddableVideoPlayerProps) => {
alt="close-icon"
title="Close player"
onClick={() => {
- setSearchParams({});
+ setSearchParams(params => {
+ const newParams = new URLSearchParams(params);
+ newParams.delete('videoId');
+ return newParams;
+ });
}}
/>
diff --git a/frontend/src/components/Notifications.tsx b/frontend/src/components/Notifications.tsx
index 37b0a551..7e177faf 100644
--- a/frontend/src/components/Notifications.tsx
+++ b/frontend/src/components/Notifications.tsx
@@ -40,7 +40,7 @@ const Notifications = ({
}
setNotificationResponse(notifications);
- }, 500);
+ }, 1000);
return () => {
clearInterval(intervalId);
diff --git a/frontend/src/components/Pagination.tsx b/frontend/src/components/Pagination.tsx
index 979a92cd..b25fc5ef 100644
--- a/frontend/src/components/Pagination.tsx
+++ b/frontend/src/components/Pagination.tsx
@@ -1,4 +1,4 @@
-import { Link } from 'react-router-dom';
+import { Link, useSearchParams } from 'react-router-dom';
import { Fragment } from 'react/jsx-runtime';
import Routes from '../configuration/routes/RouteList';
import { useCallback, useEffect } from 'react';
@@ -23,6 +23,9 @@ interface Props {
const Pagination = ({ pagination, setPage }: Props) => {
const { total_hits, params, prev_pages, current_page, next_pages, last_page, max_hits } =
pagination;
+ const [searchParams] = useSearchParams();
+
+ const videoId = searchParams.get('videoId');
const totalHits = Number(total_hits);
const currentPage = Number(current_page);
@@ -39,7 +42,7 @@ const Pagination = ({ pagination, setPage }: Props) => {
(event: KeyboardEvent) => {
const { code } = event;
- if (code === 'ArrowRight') {
+ if (code === 'ArrowRight' && videoId === null) {
if (currentPage === 0 && totalHits > 1) {
setPage(2);
return;
@@ -52,7 +55,7 @@ const Pagination = ({ pagination, setPage }: Props) => {
setPage(currentPage + 1);
}
- if (code === 'ArrowLeft') {
+ if (code === 'ArrowLeft' && videoId === null) {
if (currentPage === 0) {
return;
}
@@ -65,7 +68,7 @@ const Pagination = ({ pagination, setPage }: Props) => {
setPage(currentPage - 1);
}
},
- [currentPage, lastPage, setPage, totalHits],
+ [currentPage, lastPage, setPage, totalHits, videoId],
);
useEffect(() => {
diff --git a/frontend/src/components/PlaylistThumbnail.tsx b/frontend/src/components/PlaylistThumbnail.tsx
index 2871e76b..26b2e7b8 100644
--- a/frontend/src/components/PlaylistThumbnail.tsx
+++ b/frontend/src/components/PlaylistThumbnail.tsx
@@ -7,9 +7,15 @@ type PlaylistThumbnailProps = {
};
const PlaylistThumbnail = ({ playlistId, playlistThumbnail }: PlaylistThumbnailProps) => {
+ let src = `${getApiUrl()}${playlistThumbnail}`;
+
+ if (playlistThumbnail === undefined) {
+ src = defaultPlaylistThumbnail;
+ }
+
return (
}${playlistThumbnail}`})
{
currentTarget.onerror = null; // prevents looping
diff --git a/frontend/src/components/SubtitleList.tsx b/frontend/src/components/SubtitleList.tsx
index bee073ff..b54e8d8f 100644
--- a/frontend/src/components/SubtitleList.tsx
+++ b/frontend/src/components/SubtitleList.tsx
@@ -2,7 +2,7 @@ import { Link, useSearchParams } from 'react-router-dom';
import Routes from '../configuration/routes/RouteList';
import iconPlay from '/img/icon-play.svg';
import Linkify from './Linkify';
-import getApiUrl from '../configuration/getApiUrl';
+import VideoThumbnail from './VideoThumbail';
type SubtitleListType = {
subtitle_index: number;
@@ -44,15 +44,17 @@ const SubtitleList = ({ subtitleList }: SubtitleListProps) => {