fix(frontend): check if swr is validating to determine if we should fetch new data

fixes #719

src/components/Common/ListView/index.tsx

@@ -38,7 +38,7 @@ const ListView: React.FC<ListViewProps> = ({
         </div>
       )}
       <ul className="cardList">
-        {items?.map((title) => {
+        {items?.map((title, index) => {
           let titleCard: React.ReactNode;
 
           switch (title.mediaType) {
@@ -90,7 +90,7 @@ const ListView: React.FC<ListViewProps> = ({
               break;
           }
 
-          return <li key={title.id}>{titleCard}</li>;
+          return <li key={`${title.id}-${index}`}>{titleCard}</li>;
         })}
         {isLoading &&
           !isReachingEnd &&

src/components/MovieDetails/MovieRecommendations.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import useSWR, { useSWRInfinite } from 'swr';
+import useSWR from 'swr';
 import type { MovieResult } from '../../../server/models/Search';
 import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
@@ -7,75 +7,38 @@ import Header from '../Common/Header';
 import type { MovieDetails } from '../../../server/models/Movie';
 import { LanguageContext } from '../../context/LanguageContext';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import useSettings from '../../hooks/useSettings';
-import { MediaStatus } from '../../../server/constants/media';
 import PageTitle from '../Common/PageTitle';
+import useDiscover from '../../hooks/useDiscover';
+import Error from '../../pages/_error';
 
 const messages = defineMessages({
   recommendations: 'Recommendations',
   recommendationssubtext: 'If you liked {title}, you might also like…',
 });
 
-interface SearchResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: MovieResult[];
-}
-
 const MovieRecommendations: React.FC = () => {
-  const settings = useSettings();
   const intl = useIntl();
   const router = useRouter();
   const { locale } = useContext(LanguageContext);
   const { data: movieData, error: movieError } = useSWR<MovieDetails>(
     `/api/v1/movie/${router.query.movieId}?language=${locale}`
   );
-  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
+  const {
-    (pageIndex: number, previousPageData: SearchResult | null) => {
+    isLoadingInitialData,
-      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
+    isEmpty,
-        return null;
+    isLoadingMore,
-      }
+    isReachingEnd,
-
+    titles,
-      return `/api/v1/movie/${router.query.movieId}/recommendations?page=${
+    fetchMore,
-        pageIndex + 1
+    error,
-      }&language=${locale}`;
+  } = useDiscover<MovieResult>(
-    },
+    `/api/v1/movie/${router.query.movieId}/recommendations`
-    {
-      initialSize: 3,
-    }
   );
 
-  const isLoadingInitialData = !data && !error;
-  const isLoadingMore =
-    isLoadingInitialData ||
-    (size > 0 && data && typeof data[size - 1] === 'undefined');
-
-  const fetchMore = () => {
-    setSize(size + 1);
-  };
-
   if (error) {
-    return <div>{error}</div>;
+    return <Error statusCode={500} />;
   }
 
-  let titles = (data ?? []).reduce(
-    (a, v) => [...a, ...v.results],
-    [] as MovieResult[]
-  );
-
-  if (settings.currentSettings.hideAvailable) {
-    titles = titles.filter(
-      (i) =>
-        i.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-        i.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE
-    );
-  }
-
-  const isEmpty = !isLoadingInitialData && titles?.length === 0;
-  const isReachingEnd =
-    isEmpty || (data && data[data.length - 1]?.results.length < 20);
-
   return (
     <>
       <PageTitle

src/components/MovieDetails/MovieSimilar.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import useSWR, { useSWRInfinite } from 'swr';
+import useSWR from 'swr';
 import type { MovieResult } from '../../../server/models/Search';
 import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
@@ -7,75 +7,36 @@ import Header from '../Common/Header';
 import { LanguageContext } from '../../context/LanguageContext';
 import type { MovieDetails } from '../../../server/models/Movie';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import { MediaStatus } from '../../../server/constants/media';
-import useSettings from '../../hooks/useSettings';
 import PageTitle from '../Common/PageTitle';
+import useDiscover from '../../hooks/useDiscover';
+import Error from '../../pages/_error';
 
 const messages = defineMessages({
   similar: 'Similar Titles',
   similarsubtext: 'Other movies similar to {title}',
 });
 
-interface SearchResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: MovieResult[];
-}
-
 const MovieSimilar: React.FC = () => {
-  const settings = useSettings();
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
   const { data: movieData, error: movieError } = useSWR<MovieDetails>(
     `/api/v1/movie/${router.query.movieId}?language=${locale}`
   );
-  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
+  const {
-    (pageIndex: number, previousPageData: SearchResult | null) => {
+    isLoadingInitialData,
-      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
+    isEmpty,
-        return null;
+    isLoadingMore,
-      }
+    isReachingEnd,
-
+    titles,
-      return `/api/v1/movie/${router.query.movieId}/similar?page=${
+    fetchMore,
-        pageIndex + 1
+    error,
-      }&language=${locale}`;
+  } = useDiscover<MovieResult>(`/api/v1/movie/${router.query.movieId}/similar`);
-    },
-    {
-      initialSize: 3,
-    }
-  );
-
-  const isLoadingInitialData = !data && !error;
-  const isLoadingMore =
-    isLoadingInitialData ||
-    (size > 0 && data && typeof data[size - 1] === 'undefined');
-
-  const fetchMore = () => {
-    setSize(size + 1);
-  };
 
   if (error) {
-    return <div>{error}</div>;
+    return <Error statusCode={500} />;
   }
 
-  let titles = (data ?? []).reduce(
-    (a, v) => [...a, ...v.results],
-    [] as MovieResult[]
-  );
-
-  if (settings.currentSettings.hideAvailable) {
-    titles = titles.filter(
-      (i) =>
-        i.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-        i.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE
-    );
-  }
-
-  const isEmpty = !isLoadingInitialData && titles?.length === 0;
-  const isReachingEnd =
-    isEmpty || (data && data[data.length - 1]?.results.length < 20);
-
   return (
     <>
       <PageTitle

src/components/Search/index.tsx

@@ -1,71 +1,42 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { useRouter } from 'next/router';
 import {
   TvResult,
   MovieResult,
   PersonResult,
 } from '../../../server/models/Search';
-import { useSWRInfinite } from 'swr';
 import ListView from '../Common/ListView';
-import { LanguageContext } from '../../context/LanguageContext';
 import { defineMessages, useIntl } from 'react-intl';
 import Header from '../Common/Header';
 import PageTitle from '../Common/PageTitle';
 import Error from '../../pages/_error';
+import useDiscover from '../../hooks/useDiscover';
 
 const messages = defineMessages({
   search: 'Search',
   searchresults: 'Search Results',
 });
 
-interface SearchResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: (MovieResult | TvResult | PersonResult)[];
-}
-
 const Search: React.FC = () => {
   const intl = useIntl();
-  const { locale } = useContext(LanguageContext);
   const router = useRouter();
-  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
-    (pageIndex: number, previousPageData: SearchResult | null) => {
-      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
-        return null;
-      }
 
-      return `/api/v1/search/?query=${router.query.query}&page=${
+  const {
-        pageIndex + 1
+    isLoadingInitialData,
-      }&language=${locale}`;
+    isEmpty,
-    },
+    isLoadingMore,
-    {
+    isReachingEnd,
-      initialSize: 3,
+    titles,
-    }
+    fetchMore,
-  );
+    error,
-
+  } = useDiscover<MovieResult | TvResult | PersonResult>(`/api/v1/search`, {
-  const isLoadingInitialData = !data && !error;
+    query: router.query.query,
-  const isLoadingMore =
+  });
-    isLoadingInitialData ||
-    (size > 0 && data && typeof data[size - 1] === 'undefined');
-
-  const fetchMore = () => {
-    setSize(size + 1);
-  };
 
   if (error) {
-    return <Error statusCode={error.code} />;
+    return <Error statusCode={500} />;
   }
 
-  const titles = data?.reduce(
-    (a, v) => [...a, ...v.results],
-    [] as (MovieResult | TvResult | PersonResult)[]
-  );
-
-  const isEmpty = !isLoadingInitialData && titles?.length === 0;
-  const isReachingEnd =
-    isEmpty || (data && data[data.length - 1]?.results.length < 20);
-
   return (
     <>
       <PageTitle title={intl.formatMessage(messages.search)} />

src/components/TvDetails/TvRecommendations.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import useSWR, { useSWRInfinite } from 'swr';
+import useSWR from 'swr';
 import type { TvResult } from '../../../server/models/Search';
 import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
@@ -7,75 +7,36 @@ import { LanguageContext } from '../../context/LanguageContext';
 import Header from '../Common/Header';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { TvDetails } from '../../../server/models/Tv';
-import { MediaStatus } from '../../../server/constants/media';
-import useSettings from '../../hooks/useSettings';
 import PageTitle from '../Common/PageTitle';
+import Error from '../../pages/_error';
+import useDiscover from '../../hooks/useDiscover';
 
 const messages = defineMessages({
   recommendations: 'Recommendations',
   recommendationssubtext: 'If you liked {title}, you might also like…',
 });
 
-interface SearchResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: TvResult[];
-}
-
 const TvRecommendations: React.FC = () => {
-  const settings = useSettings();
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
   const { data: tvData, error: tvError } = useSWR<TvDetails>(
     `/api/v1/tv/${router.query.tvId}?language=${locale}`
   );
-  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
+  const {
-    (pageIndex: number, previousPageData: SearchResult | null) => {
+    isLoadingInitialData,
-      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
+    isEmpty,
-        return null;
+    isLoadingMore,
-      }
+    isReachingEnd,
-
+    titles,
-      return `/api/v1/tv/${router.query.tvId}/recommendations?page=${
+    fetchMore,
-        pageIndex + 1
+    error,
-      }&language=${locale}`;
+  } = useDiscover<TvResult>(`/api/v1/tv/${router.query.tvId}/recommendations`);
-    },
-    {
-      initialSize: 3,
-    }
-  );
-
-  const isLoadingInitialData = !data && !error;
-  const isLoadingMore =
-    isLoadingInitialData ||
-    (size > 0 && data && typeof data[size - 1] === 'undefined');
-
-  const fetchMore = () => {
-    setSize(size + 1);
-  };
 
   if (error) {
-    return <div>{error}</div>;
+    return <Error statusCode={500} />;
   }
 
-  let titles = (data ?? []).reduce(
-    (a, v) => [...a, ...v.results],
-    [] as TvResult[]
-  );
-
-  if (settings.currentSettings.hideAvailable) {
-    titles = titles.filter(
-      (i) =>
-        i.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-        i.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE
-    );
-  }
-
-  const isEmpty = !isLoadingInitialData && titles?.length === 0;
-  const isReachingEnd =
-    isEmpty || (data && data[data.length - 1]?.results.length < 20);
-
   return (
     <>
       <PageTitle

src/components/TvDetails/TvSimilar.tsx

@@ -1,81 +1,42 @@
 import React, { useContext } from 'react';
-import useSWR, { useSWRInfinite } from 'swr';
+import useSWR from 'swr';
-import type { MovieResult } from '../../../server/models/Search';
+import type { TvResult } from '../../../server/models/Search';
 import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
 import { LanguageContext } from '../../context/LanguageContext';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import type { TvDetails } from '../../../server/models/Tv';
 import Header from '../Common/Header';
-import { MediaStatus } from '../../../server/constants/media';
-import useSettings from '../../hooks/useSettings';
 import PageTitle from '../Common/PageTitle';
+import useDiscover from '../../hooks/useDiscover';
+import Error from '../../pages/_error';
 
 const messages = defineMessages({
   similar: 'Similar Series',
   similarsubtext: 'Other series similar to {title}',
 });
 
-interface SearchResult {
-  page: number;
-  totalResults: number;
-  totalPages: number;
-  results: MovieResult[];
-}
-
 const TvSimilar: React.FC = () => {
-  const settings = useSettings();
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
   const { data: tvData, error: tvError } = useSWR<TvDetails>(
     `/api/v1/tv/${router.query.tvId}?language=${locale}`
   );
-  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
+  const {
-    (pageIndex: number, previousPageData: SearchResult | null) => {
+    isLoadingInitialData,
-      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
+    isEmpty,
-        return null;
+    isLoadingMore,
-      }
+    isReachingEnd,
-
+    titles,
-      return `/api/v1/tv/${router.query.tvId}/similar?page=${
+    fetchMore,
-        pageIndex + 1
+    error,
-      }&language=${locale}`;
+  } = useDiscover<TvResult>(`/api/v1/tv/${router.query.tvId}/similar`);
-    },
-    {
-      initialSize: 3,
-    }
-  );
-
-  const isLoadingInitialData = !data && !error;
-  const isLoadingMore =
-    isLoadingInitialData ||
-    (size > 0 && data && typeof data[size - 1] === 'undefined');
-
-  const fetchMore = () => {
-    setSize(size + 1);
-  };
 
   if (error) {
-    return <div>{error}</div>;
+    return <Error statusCode={500} />;
   }
 
-  let titles = (data ?? []).reduce(
-    (a, v) => [...a, ...v.results],
-    [] as MovieResult[]
-  );
-
-  if (settings.currentSettings.hideAvailable) {
-    titles = titles.filter(
-      (i) =>
-        i.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-        i.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE
-    );
-  }
-
-  const isEmpty = !isLoadingInitialData && titles?.length === 0;
-  const isReachingEnd =
-    isEmpty || (data && data[data.length - 1]?.results.length < 20);
-
   return (
     <>
       <PageTitle title={[intl.formatMessage(messages.similar), tvData?.name]} />

src/hooks/useDiscover.ts

@@ -35,7 +35,7 @@ const useDiscover = <T extends BaseMedia, S = Record<string, never>>(
 ): DiscoverResult<T, S> => {
   const settings = useSettings();
   const { locale } = useContext(LanguageContext);
-  const { data, error, size, setSize } = useSWRInfinite<
+  const { data, error, size, setSize, isValidating } = useSWRInfinite<
     BaseSearchResult<T> & S
   >(
     (pageIndex: number, previousPageData) => {
@@ -63,7 +63,10 @@ const useDiscover = <T extends BaseMedia, S = Record<string, never>>(
   const isLoadingInitialData = !data && !error;
   const isLoadingMore =
     isLoadingInitialData ||
-    (size > 0 && !!data && typeof data[size - 1] === 'undefined');
+    (size > 0 &&
+      !!data &&
+      typeof data[size - 1] === 'undefined' &&
+      isValidating);
 
   const fetchMore = () => {
     setSize(size + 1);