feat(regions): add region/original language setting for filtering Discover (#732) (#942)

src/components/Discover/DiscoverTvUpcoming.tsx

@@ -0,0 +1,93 @@
+import React, { useContext } from 'react';
+import { useSWRInfinite } from 'swr';
+import type { TvResult } from '../../../server/models/Search';
+import ListView from '../Common/ListView';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { LanguageContext } from '../../context/LanguageContext';
+import Header from '../Common/Header';
+import useSettings from '../../hooks/useSettings';
+import { MediaStatus } from '../../../server/constants/media';
+import PageTitle from '../Common/PageTitle';
+
+const messages = defineMessages({
+  upcomingtv: 'Upcoming Series',
+});
+
+interface SearchResult {
+  page: number;
+  totalResults: number;
+  totalPages: number;
+  results: TvResult[];
+}
+
+const DiscoverTvUpcoming: React.FC = () => {
+  const intl = useIntl();
+  const settings = useSettings();
+  const { locale } = useContext(LanguageContext);
+  const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
+    (pageIndex: number, previousPageData: SearchResult | null) => {
+      if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
+        return null;
+      }
+
+      return `/api/v1/discover/tv/upcoming?page=${
+        pageIndex + 1
+      }&language=${locale}`;
+    },
+    {
+      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>;
+  }
+
+  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 title={intl.formatMessage(messages.upcomingtv)} />
+      <div className="mt-1 mb-5">
+        <Header>
+          <FormattedMessage {...messages.upcomingtv} />
+        </Header>
+      </div>
+      <ListView
+        items={titles}
+        isEmpty={isEmpty}
+        isReachingEnd={isReachingEnd}
+        isLoading={
+          isLoadingInitialData || (isLoadingMore && (titles?.length ?? 0) > 0)
+        }
+        onScrollBottom={fetchMore}
+      />
+    </>
+  );
+};
+
+export default DiscoverTvUpcoming;

src/components/Discover/index.tsx

@@ -15,6 +15,7 @@ const messages = defineMessages({
   recentrequests: 'Recent Requests',
   popularmovies: 'Popular Movies',
   populartv: 'Popular Series',
+  upcomingtv: 'Upcoming Series',
   recentlyAdded: 'Recently Added',
   nopending: 'No Pending Requests',
   upcoming: 'Upcoming Movies',
@@ -97,12 +98,6 @@ const Discover: React.FC = () => {
         placeholder={<RequestCard.Placeholder />}
         emptyMessage={intl.formatMessage(messages.nopending)}
       />
-      <MediaSlider
-        sliderKey="upcoming"
-        title={intl.formatMessage(messages.upcoming)}
-        linkUrl="/discover/movies/upcoming"
-        url="/api/v1/discover/movies/upcoming"
-      />
       <MediaSlider
         sliderKey="trending"
         title={intl.formatMessage(messages.trending)}
@@ -115,12 +110,24 @@ const Discover: React.FC = () => {
         url="/api/v1/discover/movies"
         linkUrl="/discover/movies"
       />
+      <MediaSlider
+        sliderKey="upcoming"
+        title={intl.formatMessage(messages.upcoming)}
+        linkUrl="/discover/movies/upcoming"
+        url="/api/v1/discover/movies/upcoming"
+      />
       <MediaSlider
         sliderKey="popular-tv"
         title={intl.formatMessage(messages.populartv)}
         url="/api/v1/discover/tv"
         linkUrl="/discover/tv"
       />
+      <MediaSlider
+        sliderKey="upcoming-tv"
+        title={intl.formatMessage(messages.upcomingtv)}
+        url="/api/v1/discover/tv/upcoming"
+        linkUrl="/discover/tv/upcoming"
+      />
     </>
   );
 };