feat(frontend): add i18n strings for request list and request item

src/components/RequestList/RequestItem/index.tsx

@@ -1,6 +1,11 @@
 import React, { useContext } from 'react';
 import type { MediaRequest } from '../../../../server/entity/MediaRequest';
-import { useIntl, FormattedDate, FormattedRelativeTime } from 'react-intl';
+import {
+  useIntl,
+  FormattedDate,
+  FormattedRelativeTime,
+  defineMessages,
+} from 'react-intl';
 import { useUser, Permission } from '../../../hooks/useUser';
 import { LanguageContext } from '../../../context/LanguageContext';
 import type { MovieDetails } from '../../../../server/models/Movie';
@@ -13,6 +18,13 @@ import { MediaRequestStatus } from '../../../../server/constants/media';
 import Button from '../../Common/Button';
 import axios from 'axios';
 import globalMessages from '../../../i18n/globalMessages';
+import Link from 'next/link';
+
+const messages = defineMessages({
+  requestedby: 'Requested by {username}',
+  seasons: 'Seasons',
+  notavailable: 'N/A',
+});
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
   return (movie as MovieDetails).title !== undefined;
@@ -20,9 +32,10 @@ const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
 
 interface RequestItemProps {
   request: MediaRequest;
+  onDelete: () => void;
 }
 
-const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
+const RequestItem: React.FC<RequestItemProps> = ({ request, onDelete }) => {
   const intl = useIntl();
   const { hasPermission } = useUser();
   const { locale } = useContext(LanguageContext);
@@ -33,15 +46,26 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
   const { data: title, error } = useSWR<MovieDetails | TvDetails>(
     `${url}?language=${locale}`
   );
+  const { data: requestData, error: requestError, revalidate } = useSWR<
+    MediaRequest
+  >(`/api/v1/request/${request.id}`, {
+    initialData: request,
+  });
 
   const modifyRequest = async (type: 'approve' | 'decline') => {
     const response = await axios.get(`/api/v1/request/${request.id}/${type}`);
 
     if (response) {
-      // revalidate();
+      revalidate();
     }
   };
 
+  const deleteRequest = async () => {
+    await axios.delete(`/api/v1/request/${request.id}`);
+
+    onDelete();
+  };
+
   if (!title && !error) {
     return (
       <tr className="w-full bg-gray-800 animate-pulse h-24">
@@ -50,7 +74,7 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
     );
   }
 
-  if (!title) {
+  if (!title || !requestData) {
     return (
       <tr className="w-full bg-gray-800 animate-pulse h-24">
         <td colSpan={6}></td>
@@ -64,23 +88,43 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
         noPadding
         className="w-20 px-4 relative hidden sm:table-cell align-middle"
       >
-        <img
+        <Link
-          src={`//image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`}
+          href={
-          alt=""
+            request.type === 'movie'
-          className="rounded-md shadow-sm cursor-pointer transition transform-gpu duration-300 scale-100 hover:scale-105 hover:shadow-md"
+              ? `/movie/${request.media.tmdbId}`
-        />
+              : `/tv/${request.media.tmdbId}`
+          }
+        >
+          <a>
+            <img
+              src={`//image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`}
+              alt=""
+              className="rounded-md shadow-sm cursor-pointer transition transform-gpu duration-300 scale-100 hover:scale-105 hover:shadow-md"
+            />
+          </a>
+        </Link>
       </Table.TD>
       <Table.TD>
-        <h2 className="text-white text-xl mr-2">
+        <Link
-          {isMovie(title) ? title.title : title.name}
+          href={
-        </h2>
+            requestData.type === 'movie'
+              ? `/movie/${requestData.media.tmdbId}`
+              : `/tv/${requestData.media.tmdbId}`
+          }
+        >
+          <a className="text-white text-xl mr-2 hover:underline">
+            {isMovie(title) ? title.title : title.name}
+          </a>
+        </Link>
         <div className="text-sm">
-          Requested by {request.requestedBy.username}
+          {intl.formatMessage(messages.requestedby, {
+            username: requestData.requestedBy.username,
+          })}
         </div>
-        {request.seasons.length > 0 && (
+        {requestData.seasons.length > 0 && (
           <div className="hidden mt-2 text-sm sm:flex items-center">
-            <span className="mr-2">Seasons</span>
+            <span className="mr-2">{intl.formatMessage(messages.seasons)}</span>
-            {request.seasons.map((season) => (
+            {requestData.seasons.map((season) => (
               <span key={`season-${season.id}`} className="mr-2">
                 <Badge>{season.seasonNumber}</Badge>
               </span>
@@ -89,25 +133,24 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
         )}
       </Table.TD>
       <Table.TD>
-        <StatusBadge status={request.media.status} />
+        <StatusBadge status={requestData.media.status} />
       </Table.TD>
       <Table.TD>
         <div className="flex flex-col">
-          <span>Requested at</span>
           <span className="text-sm text-gray-300">
-            <FormattedDate value={request.createdAt} />
+            <FormattedDate value={requestData.createdAt} />
           </span>
         </div>
       </Table.TD>
       <Table.TD>
         <div className="flex flex-col">
-          <span>Modified by</span>
+          {requestData.modifiedBy ? (
-          {request.modifiedBy ? (
             <span className="text-sm text-gray-300">
-              {request.modifiedBy.username} (
+              {requestData.modifiedBy.username} (
               <FormattedRelativeTime
                 value={Math.floor(
-                  (new Date(request.updatedAt).getTime() - Date.now()) / 1000
+                  (new Date(requestData.updatedAt).getTime() - Date.now()) /
+                    1000
                 )}
                 updateIntervalInSeconds={1}
               />
@@ -119,7 +162,30 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
         </div>
       </Table.TD>
       <Table.TD alignText="right">
-        {request.status === MediaRequestStatus.PENDING &&
+        {requestData.status !== MediaRequestStatus.PENDING && (
+          <Button
+            buttonType="danger"
+            buttonSize="sm"
+            onClick={() => deleteRequest()}
+          >
+            <svg
+              className="w-4 h-4 mr-0 sm:mr-1"
+              fill="currentColor"
+              viewBox="0 0 20 20"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                fillRule="evenodd"
+                d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z"
+                clipRule="evenodd"
+              />
+            </svg>
+            <span className="hidden sm:block">
+              {intl.formatMessage(globalMessages.delete)}
+            </span>
+          </Button>
+        )}
+        {requestData.status === MediaRequestStatus.PENDING &&
           hasPermission(Permission.MANAGE_REQUESTS) && (
             <>
               <span className="mr-2">
@@ -171,35 +237,6 @@ const RequestItem: React.FC<RequestItemProps> = ({ request }) => {
             </>
           )}
       </Table.TD>
-      {/* <div className="flex justify-start flex-1 items-center">
-        <div className="mr-12">
-          <div className="flex flex-col">
-            <span>Requested at</span>
-            <span className="text-sm text-gray-300">
-              <FormattedDate value={request.createdAt} />
-            </span>
-          </div>
-        </div>
-        <div>
-          <div className="flex flex-col">
-            <span>Modified by</span>
-            {request.modifiedBy ? (
-              <span className="text-sm text-gray-300">
-                {request.modifiedBy.username} (
-                <FormattedRelativeTime
-                  value={Math.floor(
-                    (new Date(request.updatedAt).getTime() - Date.now()) / 1000
-                  )}
-                  updateIntervalInSeconds={1}
-                />
-                )
-              </span>
-            ) : (
-              <span className="text-sm text-gray-300">N/A</span>
-            )}
-          </div>
-        </div>
-      </div> */}
     </tr>
   );
 };

src/components/RequestList/index.tsx

@@ -6,11 +6,25 @@ import RequestItem from './RequestItem';
 import Header from '../Common/Header';
 import Table from '../Common/Table';
 import Button from '../Common/Button';
+import { defineMessages, useIntl } from 'react-intl';
+
+const messages = defineMessages({
+  requests: 'Requests',
+  mediaInfo: 'Media Info',
+  status: 'Status',
+  requestedAt: 'Requested At',
+  modifiedBy: 'Last Modified By',
+  showingresults:
+    'Showing <strong>{from}</strong> to <strong>{to}</strong> of <strong>{total}</strong> results',
+  next: 'Next',
+  previous: 'Previous',
+});
 
 const RequestList: React.FC = () => {
+  const intl = useIntl();
   const [pageIndex, setPageIndex] = useState(0);
 
-  const { data, error } = useSWR<RequestResultsResponse>(
+  const { data, error, revalidate } = useSWR<RequestResultsResponse>(
     `/api/v1/request?take=10&skip=${pageIndex * 10}`
   );
   if (!data && !error) {
@@ -26,14 +40,14 @@ const RequestList: React.FC = () => {
 
   return (
     <>
-      <Header>Requests</Header>
+      <Header>{intl.formatMessage(messages.requests)}</Header>
       <Table>
         <thead>
           <Table.TH className="hidden sm:table-cell"></Table.TH>
-          <Table.TH>Media Info</Table.TH>
+          <Table.TH>{intl.formatMessage(messages.mediaInfo)}</Table.TH>
-          <Table.TH>Status</Table.TH>
+          <Table.TH>{intl.formatMessage(messages.status)}</Table.TH>
-          <Table.TH></Table.TH>
+          <Table.TH>{intl.formatMessage(messages.requestedAt)}</Table.TH>
-          <Table.TH></Table.TH>
+          <Table.TH>{intl.formatMessage(messages.modifiedBy)}</Table.TH>
           <Table.TH></Table.TH>
         </thead>
         <Table.TBody>
@@ -42,6 +56,7 @@ const RequestList: React.FC = () => {
               <RequestItem
                 request={request}
                 key={`request-list-${request.id}`}
+                onDelete={() => revalidate()}
               />
             );
           })}
@@ -53,19 +68,17 @@ const RequestList: React.FC = () => {
               >
                 <div className="hidden sm:block">
                   <p className="text-sm">
-                    Showing
+                    {intl.formatMessage(messages.showingresults, {
-                    <span className="font-medium px-1">{pageIndex * 10}</span>
+                      from: pageIndex * 10,
-                    to
+                      to:
-                    <span className="font-medium px-1">
+                        data.results.length < 10
-                      {data.results.length < 10
+                          ? pageIndex * 10 + data.results.length
-                        ? pageIndex * 10 + data.results.length
+                          : pageIndex + 1 * 10,
-                        : pageIndex + 1 * 10}
+                      total: data.pageInfo.results,
-                    </span>
+                      strong: function strong(msg) {
-                    of
+                        return <span className="font-medium">{msg}</span>;
-                    <span className="font-medium px-1">
+                      },
-                      {data.pageInfo.results}
+                    })}
-                    </span>
-                    results
                   </p>
                 </div>
                 <div className="flex-1 flex justify-start sm:justify-end">
@@ -74,14 +87,14 @@ const RequestList: React.FC = () => {
                       disabled={!hasPrevPage}
                       onClick={() => setPageIndex((current) => current - 1)}
                     >
-                      Previous
+                      {intl.formatMessage(messages.previous)}
                     </Button>
                   </span>
                   <Button
                     disabled={!hasNextPage}
                     onClick={() => setPageIndex((current) => current + 1)}
                   >
-                    Next
+                    {intl.formatMessage(messages.next)}
                   </Button>
                 </div>
               </nav>

src/components/TvDetails/index.tsx

@@ -156,12 +156,12 @@ const TvDetails: React.FC<TvDetailsProps> = ({ tv }) => {
       />
       <SlideOver
         show={showManager}
-        title="Manage Series"
+        title={intl.formatMessage(messages.manageModalTitle)}
         onClose={() => setShowManager(false)}
         subText={data.name}
       >
         <h3 className="text-xl mb-2">
-          {intl.formatMessage(messages.manageModalTitle)}
+          {intl.formatMessage(messages.manageModalRequests)}
         </h3>
         <div className="bg-gray-600 shadow overflow-hidden rounded-md">
           <ul>

src/i18n/globalMessages.ts

@@ -13,6 +13,7 @@ const globalMessages = defineMessages({
   cancel: 'Cancel',
   approve: 'Approve',
   decline: 'Decline',
+  delete: 'Delete',
 });
 
 export default globalMessages;