feat(frontend/api): beginning of new request modal

also includes new api endpoints for seasons
2025-12-27 08:45:06 +01:00 · 2020-10-07 10:01:15 +00:00
parent 1be8b18361
commit 2bf7e10e32
11 changed files with 245 additions and 115 deletions
--- a/src/components/Common/Modal/index.tsx
+++ b/src/components/Common/Modal/index.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
 import Button, { ButtonType } from '../Button';
 import { useTransition, animated } from 'react-spring';
 import { useLockBodyScroll } from '../../../hooks/useLockBodyScroll';
+import LoadingSpinner from '../LoadingSpinner';

 interface ModalProps {
  title?: string;
@@ -16,6 +17,7 @@ interface ModalProps {
  disableScrollLock?: boolean;
  backgroundClickable?: boolean;
  iconSvg?: ReactNode;
+  loading?: boolean;
 }

 const Modal: React.FC<ModalProps> = ({
@@ -31,6 +33,7 @@ const Modal: React.FC<ModalProps> = ({
  disableScrollLock,
  backgroundClickable = true,
  iconSvg,
+  loading = false,
 }) => {
  useLockBodyScroll(!!visible, disableScrollLock);
  const transitions = useTransition(visible, null, {
@@ -39,7 +42,13 @@ const Modal: React.FC<ModalProps> = ({
    leave: { opacity: 0 },
    config: { tension: 500, velocity: 40, friction: 60 },
  });
-  const containerTransitions = useTransition(visible, null, {
+  const containerTransitions = useTransition(visible && !loading, null, {
+    from: { opacity: 0, transform: 'scale(0.5)' },
+    enter: { opacity: 1, transform: 'scale(1)' },
+    leave: { opacity: 0, transform: 'scale(0.5)' },
+    config: { tension: 500, velocity: 40, friction: 60 },
+  });
+  const loadingTransitions = useTransition(visible && loading, null, {
    from: { opacity: 0, transform: 'scale(0.5)' },
    enter: { opacity: 1, transform: 'scale(1)' },
    leave: { opacity: 0, transform: 'scale(0.5)' },
@@ -72,6 +81,14 @@ const Modal: React.FC<ModalProps> = ({
                }
              }}
            >
+              {loadingTransitions.map(
+                ({ props, item, key }) =>
+                  item && (
+                    <animated.div style={props} key={key}>
+                      <LoadingSpinner />
+                    </animated.div>
+                  )
+              )}
              {containerTransitions.map(
                ({ props, item, key }) =>
                  item && (
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -9,11 +9,7 @@ import {
 import type { MovieDetails as MovieDetailsType } from '../../../server/models/Movie';
 import useSWR from 'swr';
 import { useRouter } from 'next/router';
-import { useToasts } from 'react-toast-notifications';
 import Button from '../Common/Button';
-import MovieRequestModal from '../RequestModal/MovieRequestModal';
-import type { MediaRequest } from '../../../server/entity/MediaRequest';
-import axios from 'axios';
 import type { MovieResult } from '../../../server/models/Search';
 import Link from 'next/link';
 import Slider from '../Slider';
@@ -22,8 +18,8 @@ import PersonCard from '../PersonCard';
 import { LanguageContext } from '../../context/LanguageContext';
 import LoadingSpinner from '../Common/LoadingSpinner';
 import { useUser, Permission } from '../../hooks/useUser';
-import PendingRequest from '../PendingRequest';
 import { MediaStatus } from '../../../server/constants/media';
+import RequestModal from '../RequestModal';

 const messages = defineMessages({
  releasedate: 'Release Date',
@@ -64,13 +60,11 @@ enum MediaRequestStatus {
 }

 const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
-  const { user, hasPermission } = useUser();
+  const { hasPermission } = useUser();
  const router = useRouter();
  const intl = useIntl();
  const { locale } = useContext(LanguageContext);
-  const { addToast } = useToasts();
  const [showRequestModal, setShowRequestModal] = useState(false);
-  const [showCancelModal, setShowCancelModal] = useState(false);
  const { data, error, revalidate } = useSWR<MovieDetailsType>(
    `/api/v1/movie/${router.query.movieId}?language=${locale}`,
    {
@@ -84,27 +78,6 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
    `/api/v1/movie/${router.query.movieId}/similar?language=${locale}`
  );

-  const request = async () => {
-    const response = await axios.post<MediaRequest>('/api/v1/request', {
-      mediaId: data?.id,
-      mediaType: 'movie',
-    });
-
-    if (response.data) {
-      revalidate();
-      addToast(
-        <span>
-          <strong>{data?.title}</strong> succesfully requested!
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-  };
-
-  const cancelRequest = async () => {
-    // fix this
-  };
-
  if (!data && !error) {
    return <LoadingSpinner />;
  }
@@ -121,19 +94,13 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
        backgroundImage: `linear-gradient(180deg, rgba(45, 55, 72, 0.47) 0%, #1A202E 100%), url(//image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath})`,
      }}
    >
-      <MovieRequestModal
-        type="request"
-        visible={showRequestModal}
-        title={data.title}
+      <RequestModal
+        tmdbId={data.id}
+        show={showRequestModal}
+        type="movie"
+        requestId={data.mediaInfo?.requests?.[0]?.id}
+        onComplete={() => revalidate()}
        onCancel={() => setShowRequestModal(false)}
-        onOk={() => request()}
-      />
-      <MovieRequestModal
-        type="cancel"
-        visible={showCancelModal}
-        title={data.title}
-        onCancel={() => setShowCancelModal(false)}
-        onOk={() => cancelRequest()}
      />
      <div className="flex flex-col items-center md:flex-row md:items-end pt-4">
        <div className="mr-4 flex-shrink-0">
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -3,6 +3,12 @@ import Modal from '../Common/Modal';
 import { useUser } from '../../hooks/useUser';
 import { Permission } from '../../../server/lib/permissions';
 import { defineMessages, useIntl } from 'react-intl';
+import { MediaRequest } from '../../../server/entity/MediaRequest';
+import useSWR from 'swr';
+import { MovieDetails } from '../../../server/models/Movie';
+import { useToasts } from 'react-toast-notifications';
+import axios from 'axios';
+import type { MediaStatus } from '../../../server/constants/media';

 const messages = defineMessages({
  requestadmin:
@@ -12,42 +18,72 @@ const messages = defineMessages({
 });

 interface RequestModalProps {
-  type: 'request' | 'cancel';
+  request?: MediaRequest;
+  tmdbId: number;
  visible?: boolean;
-  onCancel: () => void;
-  onOk: () => void;
-  title: string;
+  onCancel?: () => void;
+  onComplete?: (newStatus: MediaStatus) => void;
+  onUpdating?: (isUpdating: boolean) => void;
 }

 const MovieRequestModal: React.FC<RequestModalProps> = ({
-  type,
  visible,
  onCancel,
-  onOk,
-  title,
+  onComplete,
+  request,
+  tmdbId,
+  onUpdating,
 }) => {
+  const { addToast } = useToasts();
+  const { data, error } = useSWR<MovieDetails>(`/api/v1/movie/${tmdbId}`);
  const intl = useIntl();
  const { hasPermission } = useUser();

+  const sendRequest = async () => {
+    if (onUpdating) {
+      onUpdating(true);
+    }
+    const response = await axios.post<MediaRequest>('/api/v1/request', {
+      mediaId: data?.id,
+      mediaType: 'movie',
+    });
+
+    if (response.data) {
+      if (onComplete) {
+        onComplete(response.data.media.status);
+      }
+      addToast(
+        <span>
+          <strong>{data?.title}</strong> succesfully requested!
+        </span>,
+        { appearance: 'success', autoDismiss: true }
+      );
+      if (onUpdating) {
+        onUpdating(false);
+      }
+    }
+  };
+
  let text = hasPermission(Permission.MANAGE_REQUESTS)
    ? intl.formatMessage(messages.requestadmin)
    : undefined;

-  if (type === 'cancel') {
+  if (request) {
    text = intl.formatMessage(messages.cancelrequest);
  }

  return (
    <Modal
      visible={visible}
+      loading={!data && !error}
      backgroundClickable
      onCancel={onCancel}
-      onOk={onOk}
-      title={type === 'request' ? `Request ${title}` : 'Cancel Request'}
-      okText={type === 'request' ? 'Request' : 'Cancel Request'}
-      okButtonType={type === 'cancel' ? 'danger' : 'primary'}
+      onOk={() => sendRequest()}
+      title={!request ? `Request ${data?.title}` : 'Cancel Request'}
+      okText={!request ? 'Request' : 'Cancel Request'}
+      okButtonType={!!request ? 'danger' : 'primary'}
      iconSvg={
-        type === 'request' ? (
+        !request ? (
          <svg
            className="w-6 h-6"
            fill="none"
--- a/src/components/RequestModal/index.tsx
+++ b/src/components/RequestModal/index.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import useSWR from 'swr';
+import MovieRequestModal from './MovieRequestModal';
+import type { MediaRequest } from '../../../server/entity/MediaRequest';
+import type { MediaStatus } from '../../../server/constants/media';
+
+interface RequestModalProps {
+  requestId?: number;
+  show: boolean;
+  type: 'movie' | 'tv';
+  tmdbId: number;
+  onComplete?: (newStatus: MediaStatus) => void;
+  onError?: (error: string) => void;
+  onCancel?: () => void;
+  onUpdating?: (isUpdating: boolean) => void;
+}
+
+const RequestModal: React.FC<RequestModalProps> = ({
+  type,
+  requestId,
+  show,
+  tmdbId,
+  onComplete,
+  onError,
+  onUpdating,
+  onCancel,
+}) => {
+  const { data } = useSWR<MediaRequest>(
+    requestId ? `/api/v1/request/${requestId}` : null
+  );
+  if (type === 'tv') {
+    return null;
+  }
+
+  return (
+    <MovieRequestModal
+      onComplete={onComplete}
+      onCancel={onCancel}
+      visible={show}
+      request={data}
+      tmdbId={tmdbId}
+      onUpdating={onUpdating}
+    />
+  );
+};
+
+export default RequestModal;
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -12,6 +12,7 @@ import { MediaRequest } from '../../../server/entity/MediaRequest';
 import MovieRequestModal from '../RequestModal/MovieRequestModal';
 import Link from 'next/link';
 import { MediaStatus } from '../../../server/constants/media';
+import RequestModal from '../RequestModal';

 interface TitleCardProps {
  id: number;
@@ -35,42 +36,12 @@ const TitleCard: React.FC<TitleCardProps> = ({
  mediaType,
  requestId,
 }) => {
-  const { addToast } = useToasts();
  const [isUpdating, setIsUpdating] = useState(false);
  const [currentStatus, setCurrentStatus] = useState(status);
  const [showDetail, setShowDetail] = useState(false);
  const [showRequestModal, setShowRequestModal] = useState(false);
  const [showCancelModal, setShowCancelModal] = useState(false);

-  const request = async () => {
-    setIsUpdating(true);
-    const response = await axios.post<MediaRequest>('/api/v1/request', {
-      mediaId: id,
-      mediaType,
-    });
-
-    if (response.data) {
-      setCurrentStatus(response.data.media.status);
-      addToast(
-        <span>
-          <strong>{title}</strong> succesfully requested!
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-    setIsUpdating(false);
-  };
-
-  const cancelRequest = async () => {
-    const response = await axios.delete<MediaRequest>(
-      `/api/v1/request/${requestId}`
-    );
-
-    if (response.data.id) {
-      setCurrentStatus(undefined);
-    }
-  };
-
  // Just to get the year from the date
  if (year) {
    year = year.slice(0, 4);
@@ -78,19 +49,14 @@ const TitleCard: React.FC<TitleCardProps> = ({

  return (
    <div className="w-36 sm:w-36 md:w-44">
-      <MovieRequestModal
-        type="request"
-        visible={showRequestModal}
-        title={title}
+      <RequestModal
+        tmdbId={id}
+        show={showRequestModal}
+        type={mediaType === 'movie' ? 'movie' : 'tv'}
+        requestId={requestId}
+        onComplete={(newStatus) => setCurrentStatus(newStatus)}
+        onUpdating={(status) => setIsUpdating(status)}
        onCancel={() => setShowRequestModal(false)}
-        onOk={() => request()}
-      />
-      <MovieRequestModal
-        type="cancel"
-        visible={showCancelModal}
-        title={title}
-        onCancel={() => setShowCancelModal(false)}
-        onOk={() => cancelRequest()}
      />
      <div
        className="titleCard outline-none cursor-default"