Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: Gallyam Biktashev <gallyamb@gmail.com>
Co-authored-by: GkhnGRBZ <gkhn.gurbuz@hotmail.com>
Co-authored-by: Lizandra Candido da Silva <lizandra.c.s@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/pt_BR/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/ru/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/tr/
Translation: Servarr/Radarr

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
       "nodeGypDependencies": true,
-      "version": "16",
+      "version": "20",
       "nvmVersion": "latest"
     }
   },

README.md

@@ -87,4 +87,4 @@ This project is also supported by DigitalOcean
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2024
+* Copyright 2010-2025

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.15.1'
+  majorVersion: '5.20.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -1116,20 +1116,20 @@ stages:
         vmImage: ${{ variables.windowsImage }}
       steps:
       - checkout: self # Need history for Sonar analysis
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@3
         env:
           SONAR_SCANNER_OPTS: ''
         inputs:
           SonarCloud: 'SonarCloud'
           organization: 'radarr'
-          scannerMode: 'CLI'
+          scannerMode: 'cli'
           configMode: 'manual'
           cliProjectKey: 'Radarr_Radarr.UI'
           cliProjectName: 'RadarrUI'
           cliProjectVersion: '$(radarrVersion)'
           cliSources: './frontend'
-      - task: SonarCloudAnalyze@2
-      
+      - task: SonarCloudAnalyze@3
+
     - job: Api_Docs
       displayName: API Docs
       dependsOn: Prepare
@@ -1205,12 +1205,12 @@ stages:
         submodules: true
       - powershell: Set-Service SCardSvr -StartupType Manual
         displayName: Enable Windows Test Service
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@3
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
           SonarCloud: 'SonarCloud'
           organization: 'radarr'
-          scannerMode: 'MSBuild'
+          scannerMode: 'dotnet'
           projectKey: 'Radarr_Radarr'
           projectName: 'Radarr'
           projectVersion: '$(radarrVersion)'
@@ -1223,7 +1223,7 @@ stages:
           ./build.sh --backend -f net6.0 -r win-x64
           TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@3
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
       - task: reportgenerator@5.3.11

docs.sh

@@ -1,13 +1,18 @@
+#!/bin/bash
+set -e
+
+FRAMEWORK="net6.0"
 PLATFORM=$1
+ARCHITECTURE="${2:-x64}"
 
 if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-x64"
+  RUNTIME="win-$ARCHITECTURE"
 elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-x64"
+  RUNTIME="linux-$ARCHITECTURE"
 elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-x64"
+  RUNTIME="osx-$ARCHITECTURE"
 else
-  echo "Platform must be provided as first arguement: Windows, Linux or Mac"
+  echo "Platform must be provided as first argument: Windows, Linux or Mac"
   exit 1
 fi
 
@@ -35,7 +40,7 @@ dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p
 dotnet new tool-manifest
 dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli
 
-dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/$application" v3 &
+dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v3 &
 
 sleep 45
 

frontend/.eslintrc.js

@@ -210,7 +210,6 @@ module.exports = {
     'no-undef-init': 'off',
     'no-undefined': 'off',
     'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }],
-    'no-use-before-define': 'error',
 
     // Node.js and CommonJS
 

frontend/build/webpack.config.js

@@ -26,6 +26,7 @@ module.exports = (env) => {
   const config = {
     mode: isProduction ? 'production' : 'development',
     devtool: isProduction ? 'source-map' : 'eval-source-map',
+    target: 'web',
 
     stats: {
       children: false
@@ -186,7 +187,7 @@ module.exports = (env) => {
                       loose: true,
                       debug: false,
                       useBuiltIns: 'entry',
-                      corejs: 3
+                      corejs: '3.39'
                     }
                   ]
                 ]

frontend/src/Activity/History/Details/HistoryDetails.tsx

@@ -41,6 +41,7 @@ function HistoryDetails(props: HistoryDetailsProps) {
       indexer,
       releaseGroup,
       movieMatchType,
+      releaseSource,
       customFormatScore,
       nzbInfoUrl,
       downloadClient,
@@ -53,6 +54,31 @@ function HistoryDetails(props: HistoryDetailsProps) {
 
     const downloadClientNameInfo = downloadClientName ?? downloadClient;
 
+    let releaseSourceMessage = '';
+
+    switch (releaseSource) {
+      case 'Unknown':
+        releaseSourceMessage = translate('Unknown');
+        break;
+      case 'Rss':
+        releaseSourceMessage = translate('Rss');
+        break;
+      case 'Search':
+        releaseSourceMessage = translate('Search');
+        break;
+      case 'UserInvokedSearch':
+        releaseSourceMessage = translate('UserInvokedSearch');
+        break;
+      case 'InteractiveSearch':
+        releaseSourceMessage = translate('InteractiveSearch');
+        break;
+      case 'ReleasePush':
+        releaseSourceMessage = translate('ReleasePush');
+        break;
+      default:
+        releaseSourceMessage = '';
+    }
+
     return (
       <DescriptionList>
         <DescriptionListItem
@@ -88,6 +114,14 @@ function HistoryDetails(props: HistoryDetailsProps) {
           />
         ) : null}
 
+        {releaseSource ? (
+          <DescriptionListItem
+            descriptionClassName={styles.description}
+            title={translate('ReleaseSource')}
+            data={releaseSourceMessage}
+          />
+        ) : null}
+
         {nzbInfoUrl ? (
           <span>
             <DescriptionListItemTitle>
@@ -131,7 +165,7 @@ function HistoryDetails(props: HistoryDetailsProps) {
   }
 
   if (eventType === 'downloadFailed') {
-    const { message } = data as DownloadFailedHistory;
+    const { message, indexer } = data as DownloadFailedHistory;
 
     return (
       <DescriptionList>
@@ -145,6 +179,10 @@ function HistoryDetails(props: HistoryDetailsProps) {
           <DescriptionListItem title={translate('GrabId')} data={downloadId} />
         ) : null}
 
+        {indexer ? (
+          <DescriptionListItem title={translate('Indexer')} data={indexer} />
+        ) : null}
+
         {message ? (
           <DescriptionListItem title={translate('Message')} data={message} />
         ) : null}

frontend/src/Activity/History/Details/HistoryDetailsModal.tsx

@@ -37,7 +37,7 @@ interface HistoryDetailsModalProps {
   sourceTitle: string;
   data: HistoryData;
   downloadId?: string;
-  isMarkingAsFailed: boolean;
+  isMarkingAsFailed?: boolean;
   onMarkAsFailedPress: () => void;
   onModalClose: () => void;
 }

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -82,8 +82,7 @@ class AddNewMovie extends Component {
     const {
       error,
       items,
-      hasExistingMovies,
-      colorImpairedMode
+      hasExistingMovies
     } = this.props;
 
     const term = this.state.term;
@@ -150,7 +149,6 @@ class AddNewMovie extends Component {
                     return (
                       <AddNewMovieSearchResultConnector
                         key={item.tmdbId}
-                        colorImpairedMode={colorImpairedMode}
                         {...item}
                       />
                     );
@@ -223,8 +221,7 @@ AddNewMovie.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   hasExistingMovies: PropTypes.bool.isRequired,
   onMovieLookupChange: PropTypes.func.isRequired,
-  onClearMovieLookup: PropTypes.func.isRequired,
-  colorImpairedMode: PropTypes.bool.isRequired
+  onClearMovieLookup: PropTypes.func.isRequired
 };
 
 export default AddNewMovie;

frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js

@@ -6,7 +6,6 @@ import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions';
 import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
 import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import parseUrl from 'Utilities/String/parseUrl';
@@ -17,15 +16,13 @@ function createMapStateToProps() {
     (state) => state.addMovie,
     (state) => state.movies.items.length,
     (state) => state.router.location,
-    createUISettingsSelector(),
-    (addMovie, existingMoviesCount, location, uiSettings) => {
+    (addMovie, existingMoviesCount, location) => {
       const { params } = parseUrl(location.search);
 
       return {
         ...addMovie,
         term: params.term,
-        hasExistingMovies: existingMoviesCount > 0,
-        colorImpairedMode: uiSettings.enableColorImpairedMode
+        hasExistingMovies: existingMoviesCount > 0
       };
     }
   );

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css

@@ -91,6 +91,10 @@
   margin-left: 5px;
 }
 
+.genres {
+  pointer-events: all;
+}
+
 .links {
   margin-left: 5px;
   pointer-events: all;

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -10,6 +10,7 @@ import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
 import MovieDetailsLinks from 'Movie/Details/MovieDetailsLinks';
 import MovieStatusLabel from 'Movie/Details/MovieStatusLabel';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
+import MovieGenres from 'Movie/MovieGenres';
 import MoviePoster from 'Movie/MoviePoster';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import translate from 'Utilities/String/translate';
@@ -73,12 +74,9 @@ class AddNewMovieSearchResult extends Component {
       isExistingMovie,
       isExcluded,
       isSmallScreen,
-      colorImpairedMode,
-      id,
       monitored,
       isAvailable,
       movieFile,
-      queueItem,
       runtime,
       movieRuntimeFormat,
       certification
@@ -249,9 +247,7 @@ class AddNewMovieSearchResult extends Component {
                       name={icons.GENRE}
                       size={13}
                     />
-                    <span className={styles.genres}>
-                      {genres.slice(0, 3).join(', ')}
-                    </span>
+                    <MovieGenres className={styles.genres} genres={genres} />
                   </Label> :
                   null
               }
@@ -280,20 +276,18 @@ class AddNewMovieSearchResult extends Component {
                 }
                 canFlip={true}
                 kind={kinds.INVERSE}
-                position={tooltipPositions.BOTTOM}
+                position={tooltipPositions.TOP}
               />
 
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    status={status}
-                    hasMovieFiles={hasMovieFile}
+                    movieId={existingMovieId}
                     monitored={monitored}
                     isAvailable={isAvailable}
-                    queueItem={queueItem}
-                    id={id}
+                    hasMovieFiles={hasMovieFile}
+                    status={status}
                     useLabel={true}
-                    colorImpairedMode={colorImpairedMode}
                   />
               }
             </div>
@@ -338,12 +332,9 @@ AddNewMovieSearchResult.propTypes = {
   isExistingMovie: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool,
   isSmallScreen: PropTypes.bool.isRequired,
-  id: PropTypes.number,
   monitored: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
-  queueItem: PropTypes.object,
-  colorImpairedMode: PropTypes.bool,
   runtime: PropTypes.number.isRequired,
   movieRuntimeFormat: PropTypes.string.isRequired,
   certification: PropTypes.string

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -8,19 +8,16 @@ function createMapStateToProps() {
   return createSelector(
     createExistingMovieSelector(),
     createDimensionsSelector(),
-    (state) => state.queue.details.items,
     (state) => state.movieFiles.items,
     (state, { internalId }) => internalId,
     (state) => state.settings.ui.item.movieRuntimeFormat,
-    (isExistingMovie, dimensions, queueItems, movieFiles, internalId, movieRuntimeFormat) => {
-      const queueItem = queueItems.find((item) => internalId > 0 && item.movieId === internalId);
+    (isExistingMovie, dimensions, movieFiles, internalId, movieRuntimeFormat) => {
       const movieFile = movieFiles.find((item) => internalId > 0 && item.movieId === internalId);
 
       return {
         existingMovieId: internalId,
         isExistingMovie,
         isSmallScreen: dimensions.isSmallScreen,
-        queueItem,
         movieFile,
         movieRuntimeFormat
       };

frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js

@@ -81,7 +81,6 @@ ImportMovieRow.propTypes = {
   selectedMovie: PropTypes.object,
   isExistingMovie: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  queued: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   onSelectedChange: PropTypes.func.isRequired,
   onInputChange: PropTypes.func.isRequired

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js

@@ -131,7 +131,7 @@ class ImportMovieSelectMovie extends Component {
               id={this._buttonId}
             >
               <Link
-                ref={ref}
+                // ref={ref}
                 className={styles.button}
                 component="div"
                 onPress={this.onPress}
@@ -255,7 +255,7 @@ class ImportMovieSelectMovie extends Component {
                             items.map((item) => {
                               return (
                                 <ImportMovieSearchResultConnector
-                                  key={item.tvdbId}
+                                  key={item.tmdbId}
                                   tmdbId={item.tmdbId}
                                   title={item.title}
                                   year={item.year}

frontend/src/App/AppRoutes.tsx

@@ -10,7 +10,7 @@ import CollectionConnector from 'Collection/CollectionConnector';
 import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import DiscoverMovieConnector from 'DiscoverMovie/DiscoverMovieConnector';
-import MovieDetailsPageConnector from 'Movie/Details/MovieDetailsPageConnector';
+import MovieDetailsPage from 'Movie/Details/MovieDetailsPage';
 import MovieIndex from 'Movie/Index/MovieIndex';
 import CustomFormatSettingsPage from 'Settings/CustomFormats/CustomFormatSettingsPage';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
@@ -67,7 +67,7 @@ function AppRoutes() {
 
       <Route path="/add/discover" component={DiscoverMovieConnector} />
 
-      <Route path="/movie/:titleSlug" component={MovieDetailsPageConnector} />
+      <Route path="/movie/:titleSlug" component={MovieDetailsPage} />
 
       {/*
         Calendar

frontend/src/App/State/AppSectionState.ts

@@ -1,11 +1,16 @@
 import Column from 'Components/Table/Column';
 import { SortDirection } from 'Helpers/Props/sortDirections';
+import { ValidationFailure } from 'typings/pending';
 import { FilterBuilderProp, PropertyFilter } from './AppState';
 
 export interface Error {
-  responseJSON: {
-    message: string;
-  };
+  status?: number;
+  responseJSON:
+    | {
+        message: string | undefined;
+      }
+    | ValidationFailure[]
+    | undefined;
 }
 
 export interface AppSectionDeleteState {
@@ -51,6 +56,16 @@ export interface AppSectionItemState<T> {
   item: T;
 }
 
+export interface AppSectionProviderState<T>
+  extends AppSectionDeleteState,
+    AppSectionSaveState {
+  isFetching: boolean;
+  isPopulated: boolean;
+  error: Error;
+  items: T[];
+  pendingChanges: Partial<T>;
+}
+
 interface AppSectionState<T> {
   isFetching: boolean;
   isPopulated: boolean;

frontend/src/App/State/AppState.ts

@@ -1,15 +1,19 @@
 import BlocklistAppState from './BlocklistAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
-import HistoryAppState from './HistoryAppState';
+import ExtraFilesAppState from './ExtraFilesAppState';
+import HistoryAppState, { MovieHistoryAppState } from './HistoryAppState';
 import InteractiveImportAppState from './InteractiveImportAppState';
+import MovieBlocklistAppState from './MovieBlocklistAppState';
 import MovieCollectionAppState from './MovieCollectionAppState';
 import MovieCreditAppState from './MovieCreditAppState';
 import MovieFilesAppState from './MovieFilesAppState';
 import MoviesAppState, { MovieIndexAppState } from './MoviesAppState';
+import OrganizePreviewAppState from './OrganizePreviewAppState';
 import ParseAppState from './ParseAppState';
 import PathsAppState from './PathsAppState';
 import QueueAppState from './QueueAppState';
+import ReleasesAppState from './ReleasesAppState';
 import RootFolderAppState from './RootFolderAppState';
 import SettingsAppState from './SettingsAppState';
 import SystemAppState from './SystemAppState';
@@ -50,6 +54,7 @@ export interface CustomFilter {
 export interface AppSectionState {
   isConnected: boolean;
   isReconnecting: boolean;
+  isSidebarVisible: boolean;
   version: string;
   prevVersion?: string;
   dimensions: {
@@ -64,16 +69,21 @@ interface AppState {
   blocklist: BlocklistAppState;
   calendar: CalendarAppState;
   commands: CommandAppState;
+  extraFiles: ExtraFilesAppState;
   history: HistoryAppState;
   interactiveImport: InteractiveImportAppState;
+  movieBlocklist: MovieBlocklistAppState;
   movieCollections: MovieCollectionAppState;
   movieCredits: MovieCreditAppState;
   movieFiles: MovieFilesAppState;
+  movieHistory: MovieHistoryAppState;
   movieIndex: MovieIndexAppState;
   movies: MoviesAppState;
+  organizePreview: OrganizePreviewAppState;
   parse: ParseAppState;
   paths: PathsAppState;
   queue: QueueAppState;
+  releases: ReleasesAppState;
   rootFolders: RootFolderAppState;
   settings: SettingsAppState;
   system: SystemAppState;

frontend/src/App/State/ExtraFilesAppState.ts

@@ -0,0 +1,6 @@
+import AppSectionState from 'App/State/AppSectionState';
+import { ExtraFile } from 'MovieFile/ExtraFile';
+
+type ExtraFilesAppState = AppSectionState<ExtraFile>;
+
+export default ExtraFilesAppState;

frontend/src/App/State/HistoryAppState.ts

@@ -5,6 +5,8 @@ import AppSectionState, {
 } from 'App/State/AppSectionState';
 import History from 'typings/History';
 
+export type MovieHistoryAppState = AppSectionState<History>;
+
 interface HistoryAppState
   extends AppSectionState<History>,
     AppSectionFilterState<History>,

frontend/src/App/State/MetadataAppState.ts

@@ -0,0 +1,6 @@
+import { AppSectionProviderState } from 'App/State/AppSectionState';
+import Metadata from 'typings/Metadata';
+
+type MetadataAppState = AppSectionProviderState<Metadata>;
+
+export default MetadataAppState;

frontend/src/App/State/MovieBlocklistAppState.ts

@@ -0,0 +1,6 @@
+import AppSectionState from 'App/State/AppSectionState';
+import Blocklist from 'typings/Blocklist';
+
+type MovieBlocklistAppState = AppSectionState<Blocklist>;
+
+export default MovieBlocklistAppState;

frontend/src/App/State/MovieCollectionAppState.ts

@@ -1,7 +1,11 @@
-import AppSectionState from 'App/State/AppSectionState';
+import AppSectionState, {
+  AppSectionSaveState,
+} from 'App/State/AppSectionState';
 import MovieCollection from 'typings/MovieCollection';
 
-interface MovieCollectionAppState extends AppSectionState<MovieCollection> {
+interface MovieCollectionAppState
+  extends AppSectionState<MovieCollection>,
+    AppSectionSaveState {
   itemMap: Record<number, number>;
 }
 

frontend/src/App/State/MovieCreditAppState.ts

@@ -1,6 +1,6 @@
 import AppSectionState from 'App/State/AppSectionState';
 import MovieCredit from 'typings/MovieCredit';
 
-interface MovieCreditAppState extends AppSectionState<MovieCredit> {}
+type MovieCreditAppState = AppSectionState<MovieCredit>;
 
 export default MovieCreditAppState;

frontend/src/App/State/MoviesAppState.ts

@@ -64,6 +64,8 @@ interface MoviesAppState
   deleteOptions: {
     addImportExclusion: boolean;
   };
+
+  pendingChanges: Partial<Movie>;
 }
 
 export default MoviesAppState;

frontend/src/App/State/OrganizePreviewAppState.ts

@@ -0,0 +1,13 @@
+import ModelBase from 'App/ModelBase';
+import AppSectionState from 'App/State/AppSectionState';
+
+export interface OrganizePreviewModel extends ModelBase {
+  movieId: number;
+  movieFileId: number;
+  existingPath: string;
+  newPath: string;
+}
+
+type OrganizePreviewAppState = AppSectionState<OrganizePreviewModel>;
+
+export default OrganizePreviewAppState;

frontend/src/App/State/ReleasesAppState.ts

@@ -0,0 +1,10 @@
+import AppSectionState, {
+  AppSectionFilterState,
+} from 'App/State/AppSectionState';
+import Release from 'typings/Release';
+
+interface ReleasesAppState
+  extends AppSectionState<Release>,
+    AppSectionFilterState<Release> {}
+
+export default ReleasesAppState;

frontend/src/App/State/SettingsAppState.ts

@@ -20,6 +20,7 @@ import NamingConfig from 'typings/Settings/NamingConfig';
 import NamingExample from 'typings/Settings/NamingExample';
 import ReleaseProfile from 'typings/Settings/ReleaseProfile';
 import UiSettings from 'typings/Settings/UiSettings';
+import MetadataAppState from './MetadataAppState';
 
 export interface DownloadClientAppState
   extends AppSectionState<DownloadClient>,
@@ -36,8 +37,7 @@ export interface NamingAppState
   extends AppSectionItemState<NamingConfig>,
     AppSectionSaveState {}
 
-export interface NamingExamplesAppState
-  extends AppSectionItemState<NamingExample> {}
+export type NamingExamplesAppState = AppSectionItemState<NamingExample>;
 
 export interface ImportListAppState
   extends AppSectionState<ImportList>,
@@ -97,6 +97,7 @@ interface SettingsAppState {
   indexerFlags: IndexerFlagSettingsAppState;
   indexers: IndexerAppState;
   languages: LanguageSettingsAppState;
+  metadata: MetadataAppState;
   naming: NamingAppState;
   namingExamples: NamingExamplesAppState;
   notifications: NotificationAppState;

frontend/src/Collection/CollectionItemConnector.js

@@ -22,7 +22,7 @@ function createMapStateToProps() {
       return {
         ...collection,
         movies: [...collection.movies].sort((a, b) => b.year - a.year),
-        genres: Array.from(new Set(allGenres)).slice(0, 3)
+        genres: Array.from(new Set(allGenres))
       };
     }
   );

frontend/src/Collection/Overview/CollectionMovie.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Link from 'Components/Link/Link';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
-import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
+import EditMovieModal from 'Movie/Edit/EditMovieModal';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MoviePoster from 'Movie/MoviePoster';
 import translate from 'Utilities/String/translate';
@@ -172,7 +172,7 @@ class CollectionMovie extends Component {
           collectionId={collectionId}
         />
 
-        <EditMovieModalConnector
+        <EditMovieModal
           isOpen={isEditMovieModalOpen}
           movieId={id}
           onModalClose={this.onEditMovieModalClose}

frontend/src/Collection/Overview/CollectionOverview.js

@@ -10,7 +10,8 @@ import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 import { icons, sizes } from 'Helpers/Props';
-import QualityProfileNameConnector from 'Settings/Profiles/Quality/QualityProfileNameConnector';
+import MovieGenres from 'Movie/MovieGenres';
+import QualityProfileName from 'Settings/Profiles/Quality/QualityProfileName';
 import dimensions from 'Styles/Variables/dimensions';
 import fonts from 'Styles/Variables/fonts';
 import translate from 'Utilities/String/translate';
@@ -211,7 +212,7 @@ class CollectionOverview extends Component {
                         />
                         <span className={styles.qualityProfileName}>
                           {
-                            <QualityProfileNameConnector
+                            <QualityProfileName
                               qualityProfileId={qualityProfileId}
                             />
                           }
@@ -242,12 +243,10 @@ class CollectionOverview extends Component {
                         size={sizes.MEDIUM}
                       >
                         <Icon
-                          name={icons.PROFILE}
+                          name={icons.GENRE}
                           size={13}
                         />
-                        <span className={styles.genres}>
-                          {genres.join(', ')}
-                        </span>
+                        <MovieGenres className={styles.genres} genres={genres} />
                       </Label>
                   }
 

frontend/src/Components/Error/ErrorBoundaryError.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import StackTrace from 'stacktrace-js';
+import translate from 'Utilities/String/translate';
 import styles from './ErrorBoundaryError.css';
 
 interface ErrorBoundaryErrorProps {
@@ -18,7 +19,7 @@ function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
     className = styles.container,
     messageClassName = styles.message,
     detailsClassName = styles.details,
-    message = 'There was an error loading this content',
+    message = translate('ErrorLoadingContent'),
     error,
     info,
   } = props;

frontend/src/Components/Filter/Builder/ReleaseStatusFilterBuilderRowValue.js

@@ -3,7 +3,10 @@ import translate from 'Utilities/String/translate';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 const statusTagList = [
-  { id: 'tba', name: 'TBA' },
+  { id: 'tba',
+    get name() {
+      return translate('Tba');
+    } },
   {
     id: 'announced',
     get name() {

frontend/src/Components/Filter/CustomFilters/CustomFiltersModalContent.js

@@ -53,7 +53,7 @@ function CustomFiltersModalContent(props) {
 
         <div className={styles.addButtonContainer}>
           <Button onPress={onAddCustomFilter}>
-            Add Custom Filter
+            {translate('AddCustomFilter')}
           </Button>
         </div>
       </ModalBody>

frontend/src/Components/Form/IndexerSelectInputConnector.js

@@ -1,9 +1,11 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchIndexers } from 'Store/Actions/settingsActions';
 import sortByProp from 'Utilities/Array/sortByProp';
+import translate from 'Utilities/String/translate';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
@@ -18,15 +20,17 @@ function createMapStateToProps() {
         items
       } = indexers;
 
-      const values = items.sort(sortByProp('name')).map((indexer) => ({
-        key: indexer.id,
-        value: indexer.name
-      }));
+      const values = _.map(items.sort(sortByProp('name')), (indexer) => {
+        return {
+          key: indexer.id,
+          value: indexer.name
+        };
+      });
 
       if (includeAny) {
         values.unshift({
           key: 0,
-          value: '(Any)'
+          value: `(${translate('Any')})`
         });
       }
 

frontend/src/Components/Form/KeyValueListInput.js

@@ -1,156 +0,0 @@
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import KeyValueListInputItem from './KeyValueListInputItem';
-import styles from './KeyValueListInput.css';
-
-class KeyValueListInput extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isFocused: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onItemChange = (index, itemValue) => {
-    const {
-      name,
-      value,
-      onChange
-    } = this.props;
-
-    const newValue = [...value];
-
-    if (index == null) {
-      newValue.push(itemValue);
-    } else {
-      newValue.splice(index, 1, itemValue);
-    }
-
-    onChange({
-      name,
-      value: newValue
-    });
-  };
-
-  onRemoveItem = (index) => {
-    const {
-      name,
-      value,
-      onChange
-    } = this.props;
-
-    const newValue = [...value];
-    newValue.splice(index, 1);
-
-    onChange({
-      name,
-      value: newValue
-    });
-  };
-
-  onFocus = () => {
-    this.setState({
-      isFocused: true
-    });
-  };
-
-  onBlur = () => {
-    this.setState({
-      isFocused: false
-    });
-
-    const {
-      name,
-      value,
-      onChange
-    } = this.props;
-
-    const newValue = value.reduce((acc, v) => {
-      if (v.key || v.value) {
-        acc.push(v);
-      }
-
-      return acc;
-    }, []);
-
-    if (newValue.length !== value.length) {
-      onChange({
-        name,
-        value: newValue
-      });
-    }
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      className,
-      value,
-      keyPlaceholder,
-      valuePlaceholder,
-      hasError,
-      hasWarning
-    } = this.props;
-
-    const { isFocused } = this.state;
-
-    return (
-      <div className={classNames(
-        className,
-        isFocused && styles.isFocused,
-        hasError && styles.hasError,
-        hasWarning && styles.hasWarning
-      )}
-      >
-        {
-          [...value, { key: '', value: '' }].map((v, index) => {
-            return (
-              <KeyValueListInputItem
-                key={index}
-                index={index}
-                keyValue={v.key}
-                value={v.value}
-                keyPlaceholder={keyPlaceholder}
-                valuePlaceholder={valuePlaceholder}
-                isNew={index === value.length}
-                onChange={this.onItemChange}
-                onRemove={this.onRemoveItem}
-                onFocus={this.onFocus}
-                onBlur={this.onBlur}
-              />
-            );
-          })
-        }
-      </div>
-    );
-  }
-}
-
-KeyValueListInput.propTypes = {
-  className: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.arrayOf(PropTypes.object).isRequired,
-  hasError: PropTypes.bool,
-  hasWarning: PropTypes.bool,
-  keyPlaceholder: PropTypes.string,
-  valuePlaceholder: PropTypes.string,
-  onChange: PropTypes.func.isRequired
-};
-
-KeyValueListInput.defaultProps = {
-  className: styles.inputContainer,
-  value: []
-};
-
-export default KeyValueListInput;

frontend/src/Components/Form/KeyValueListInput.tsx

@@ -0,0 +1,104 @@
+import classNames from 'classnames';
+import React, { useCallback, useState } from 'react';
+import { InputOnChange } from 'typings/inputs';
+import KeyValueListInputItem from './KeyValueListInputItem';
+import styles from './KeyValueListInput.css';
+
+interface KeyValue {
+  key: string;
+  value: string;
+}
+
+export interface KeyValueListInputProps {
+  className?: string;
+  name: string;
+  value: KeyValue[];
+  hasError?: boolean;
+  hasWarning?: boolean;
+  keyPlaceholder?: string;
+  valuePlaceholder?: string;
+  onChange: InputOnChange<KeyValue[]>;
+}
+
+function KeyValueListInput({
+  className = styles.inputContainer,
+  name,
+  value = [],
+  hasError = false,
+  hasWarning = false,
+  keyPlaceholder,
+  valuePlaceholder,
+  onChange,
+}: KeyValueListInputProps): JSX.Element {
+  const [isFocused, setIsFocused] = useState(false);
+
+  const handleItemChange = useCallback(
+    (index: number | null, itemValue: KeyValue) => {
+      const newValue = [...value];
+
+      if (index === null) {
+        newValue.push(itemValue);
+      } else {
+        newValue.splice(index, 1, itemValue);
+      }
+
+      onChange({ name, value: newValue });
+    },
+    [value, name, onChange]
+  );
+
+  const handleRemoveItem = useCallback(
+    (index: number) => {
+      const newValue = [...value];
+      newValue.splice(index, 1);
+      onChange({ name, value: newValue });
+    },
+    [value, name, onChange]
+  );
+
+  const onFocus = useCallback(() => setIsFocused(true), []);
+
+  const onBlur = useCallback(() => {
+    setIsFocused(false);
+
+    const newValue = value.reduce((acc: KeyValue[], v) => {
+      if (v.key || v.value) {
+        acc.push(v);
+      }
+      return acc;
+    }, []);
+
+    if (newValue.length !== value.length) {
+      onChange({ name, value: newValue });
+    }
+  }, [value, name, onChange]);
+
+  return (
+    <div
+      className={classNames(
+        className,
+        isFocused && styles.isFocused,
+        hasError && styles.hasError,
+        hasWarning && styles.hasWarning
+      )}
+    >
+      {[...value, { key: '', value: '' }].map((v, index) => (
+        <KeyValueListInputItem
+          key={index}
+          index={index}
+          keyValue={v.key}
+          value={v.value}
+          keyPlaceholder={keyPlaceholder}
+          valuePlaceholder={valuePlaceholder}
+          isNew={index === value.length}
+          onChange={handleItemChange}
+          onRemove={handleRemoveItem}
+          onFocus={onFocus}
+          onBlur={onBlur}
+        />
+      ))}
+    </div>
+  );
+}
+
+export default KeyValueListInput;

frontend/src/Components/Form/KeyValueListInputItem.css

@@ -5,13 +5,19 @@
 
   &:last-child {
     margin-bottom: 0;
+    border-bottom: 0;
   }
 }
 
-.inputWrapper {
+.keyInputWrapper {
   flex: 1 0 0;
 }
 
+.valueInputWrapper {
+  flex: 1 0 0;
+  min-width: 40px;
+}
+
 .buttonWrapper {
   flex: 0 0 22px;
 }
@@ -20,4 +26,10 @@
 .valueInput {
   width: 100%;
   border: none;
+  background-color: transparent;
+  color: var(--textColor);
+
+  &::placeholder {
+    color: var(--helpTextColor);
+  }
 }

frontend/src/Components/Form/KeyValueListInputItem.css.d.ts

@@ -2,10 +2,11 @@
 // Please do not change this file!
 interface CssExports {
   'buttonWrapper': string;
-  'inputWrapper': string;
   'itemContainer': string;
   'keyInput': string;
+  'keyInputWrapper': string;
   'valueInput': string;
+  'valueInputWrapper': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Components/Form/KeyValueListInputItem.js

@@ -1,124 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import IconButton from 'Components/Link/IconButton';
-import { icons } from 'Helpers/Props';
-import TextInput from './TextInput';
-import styles from './KeyValueListInputItem.css';
-
-class KeyValueListInputItem extends Component {
-
-  //
-  // Listeners
-
-  onKeyChange = ({ value: keyValue }) => {
-    const {
-      index,
-      value,
-      onChange
-    } = this.props;
-
-    onChange(index, { key: keyValue, value });
-  };
-
-  onValueChange = ({ value }) => {
-    // TODO: Validate here or validate at a lower level component
-
-    const {
-      index,
-      keyValue,
-      onChange
-    } = this.props;
-
-    onChange(index, { key: keyValue, value });
-  };
-
-  onRemovePress = () => {
-    const {
-      index,
-      onRemove
-    } = this.props;
-
-    onRemove(index);
-  };
-
-  onFocus = () => {
-    this.props.onFocus();
-  };
-
-  onBlur = () => {
-    this.props.onBlur();
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      keyValue,
-      value,
-      keyPlaceholder,
-      valuePlaceholder,
-      isNew
-    } = this.props;
-
-    return (
-      <div className={styles.itemContainer}>
-        <div className={styles.inputWrapper}>
-          <TextInput
-            className={styles.keyInput}
-            name="key"
-            value={keyValue}
-            placeholder={keyPlaceholder}
-            onChange={this.onKeyChange}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-          />
-        </div>
-
-        <div className={styles.inputWrapper}>
-          <TextInput
-            className={styles.valueInput}
-            name="value"
-            value={value}
-            placeholder={valuePlaceholder}
-            onChange={this.onValueChange}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-          />
-        </div>
-
-        <div className={styles.buttonWrapper}>
-          {
-            isNew ?
-              null :
-              <IconButton
-                name={icons.REMOVE}
-                tabIndex={-1}
-                onPress={this.onRemovePress}
-              />
-          }
-        </div>
-      </div>
-    );
-  }
-}
-
-KeyValueListInputItem.propTypes = {
-  index: PropTypes.number,
-  keyValue: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  keyPlaceholder: PropTypes.string.isRequired,
-  valuePlaceholder: PropTypes.string.isRequired,
-  isNew: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  onRemove: PropTypes.func.isRequired,
-  onFocus: PropTypes.func.isRequired,
-  onBlur: PropTypes.func.isRequired
-};
-
-KeyValueListInputItem.defaultProps = {
-  keyPlaceholder: 'Key',
-  valuePlaceholder: 'Value'
-};
-
-export default KeyValueListInputItem;

frontend/src/Components/Form/KeyValueListInputItem.tsx

@@ -0,0 +1,89 @@
+import React, { useCallback } from 'react';
+import IconButton from 'Components/Link/IconButton';
+import { icons } from 'Helpers/Props';
+import TextInput from './TextInput';
+import styles from './KeyValueListInputItem.css';
+
+interface KeyValueListInputItemProps {
+  index: number;
+  keyValue: string;
+  value: string;
+  keyPlaceholder?: string;
+  valuePlaceholder?: string;
+  isNew: boolean;
+  onChange: (index: number, itemValue: { key: string; value: string }) => void;
+  onRemove: (index: number) => void;
+  onFocus: () => void;
+  onBlur: () => void;
+}
+
+function KeyValueListInputItem({
+  index,
+  keyValue,
+  value,
+  keyPlaceholder = 'Key',
+  valuePlaceholder = 'Value',
+  isNew,
+  onChange,
+  onRemove,
+  onFocus,
+  onBlur,
+}: KeyValueListInputItemProps): JSX.Element {
+  const handleKeyChange = useCallback(
+    ({ value: keyValue }: { value: string }) => {
+      onChange(index, { key: keyValue, value });
+    },
+    [index, value, onChange]
+  );
+
+  const handleValueChange = useCallback(
+    ({ value }: { value: string }) => {
+      onChange(index, { key: keyValue, value });
+    },
+    [index, keyValue, onChange]
+  );
+
+  const handleRemovePress = useCallback(() => {
+    onRemove(index);
+  }, [index, onRemove]);
+
+  return (
+    <div className={styles.itemContainer}>
+      <div className={styles.keyInputWrapper}>
+        <TextInput
+          className={styles.keyInput}
+          name="key"
+          value={keyValue}
+          placeholder={keyPlaceholder}
+          onChange={handleKeyChange}
+          onFocus={onFocus}
+          onBlur={onBlur}
+        />
+      </div>
+
+      <div className={styles.valueInputWrapper}>
+        <TextInput
+          className={styles.valueInput}
+          name="value"
+          value={value}
+          placeholder={valuePlaceholder}
+          onChange={handleValueChange}
+          onFocus={onFocus}
+          onBlur={onBlur}
+        />
+      </div>
+
+      <div className={styles.buttonWrapper}>
+        {isNew ? null : (
+          <IconButton
+            name={icons.REMOVE}
+            tabIndex={-1}
+            onPress={handleRemovePress}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default KeyValueListInputItem;

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -14,6 +14,8 @@ function getType({ type, selectOptionsProviderAction }) {
       return inputTypes.CHECK;
     case 'device':
       return inputTypes.DEVICE;
+    case 'keyValueList':
+      return inputTypes.KEY_VALUE_LIST;
     case 'password':
       return inputTypes.PASSWORD;
     case 'number':
@@ -137,6 +139,8 @@ ProviderFieldFormGroup.propTypes = {
   type: PropTypes.string.isRequired,
   advanced: PropTypes.bool.isRequired,
   hidden: PropTypes.string,
+  isDisabled: PropTypes.bool,
+  provider: PropTypes.string,
   pending: PropTypes.bool.isRequired,
   errors: PropTypes.arrayOf(PropTypes.object).isRequired,
   warnings: PropTypes.arrayOf(PropTypes.object).isRequired,

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -33,7 +33,7 @@ function createMapStateToProps() {
       if (includeMixed) {
         values.unshift({
           key: 'mixed',
-          value: '(Mixed)',
+          value: `(${translate('Mixed')})`,
           isDisabled: true
         });
       }

frontend/src/Components/Form/RootFolderSelectInputConnector.js

@@ -55,7 +55,7 @@ function createMapStateToProps() {
 
       values.push({
         key: ADD_NEW_KEY,
-        value: 'Add a new path'
+        value: translate('AddANewPath')
       });
 
       return {

frontend/src/Components/Form/RootFolderSelectInputOption.js

@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
 import EnhancedSelectInputOption from './EnhancedSelectInputOption';
 import styles from './RootFolderSelectInputOption.css';
 
@@ -47,14 +48,14 @@ function RootFolderSelectInputOption(props) {
           freeSpace == null ?
             null :
             <div className={styles.freeSpace}>
-              {formatBytes(freeSpace)} Free
+              {translate('RootFolderSelectFreeSpace', { freeSpace: formatBytes(freeSpace) })}
             </div>
         }
 
         {
           isMissing ?
             <div className={styles.isMissing}>
-              Missing
+              {translate('Missing')}
             </div> :
             null
         }
@@ -67,8 +68,8 @@ RootFolderSelectInputOption.propTypes = {
   id: PropTypes.string.isRequired,
   value: PropTypes.string.isRequired,
   freeSpace: PropTypes.number,
-  movieFolder: PropTypes.string,
   isMissing: PropTypes.bool,
+  movieFolder: PropTypes.string,
   isMobile: PropTypes.bool.isRequired,
   isWindows: PropTypes.bool
 };

frontend/src/Components/Form/RootFolderSelectInputSelectedValue.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
 import EnhancedSelectInputSelectedValue from './EnhancedSelectInputSelectedValue';
 import styles from './RootFolderSelectInputSelectedValue.css';
 
@@ -39,7 +40,7 @@ function RootFolderSelectInputSelectedValue(props) {
       {
         freeSpace != null && includeFreeSpace &&
           <div className={styles.freeSpace}>
-            {formatBytes(freeSpace)} Free
+            {translate('RootFolderSelectFreeSpace', { freeSpace: formatBytes(freeSpace) })}
           </div>
       }
     </EnhancedSelectInputSelectedValue>

frontend/src/Components/Form/UMaskInput.js

@@ -8,27 +8,37 @@ import styles from './UMaskInput.css';
 const umaskOptions = [
   {
     key: '755',
-    value: '755 - Owner write, Everyone else read',
+    get value() {
+      return translate('Umask755Description', { octal: '755' });
+    },
     hint: 'drwxr-xr-x'
   },
   {
     key: '775',
-    value: '775 - Owner & Group write, Other read',
+    get value() {
+      return translate('Umask775Description', { octal: '775' });
+    },
     hint: 'drwxrwxr-x'
   },
   {
     key: '770',
-    value: '770 - Owner & Group write',
+    get value() {
+      return translate('Umask770Description', { octal: '770' });
+    },
     hint: 'drwxrwx---'
   },
   {
     key: '750',
-    value: '750 - Owner write, Group read',
+    get value() {
+      return translate('Umask750Description', { octal: '750' });
+    },
     hint: 'drwxr-x---'
   },
   {
     key: '777',
-    value: '777 - Everyone write',
+    get value() {
+      return translate('Umask777Description', { octal: '777' });
+    },
     hint: 'drwxrwxrwx'
   }
 ];

frontend/src/Components/Icon.tsx

@@ -8,17 +8,20 @@ import { kinds } from 'Helpers/Props';
 import { Kind } from 'Helpers/Props/kinds';
 import styles from './Icon.css';
 
+export type IconName = FontAwesomeIconProps['icon'];
+export type IconKind = Extract<Kind, keyof typeof styles>;
+
 export interface IconProps
   extends Omit<
     FontAwesomeIconProps,
     'icon' | 'spin' | 'name' | 'title' | 'size'
   > {
   containerClassName?: ComponentProps<'span'>['className'];
-  name: FontAwesomeIconProps['icon'];
-  kind?: Extract<Kind, keyof typeof styles>;
+  name: IconName;
+  kind?: IconKind;
   size?: number;
   isSpinning?: FontAwesomeIconProps['spin'];
-  title?: string | (() => string);
+  title?: string | (() => string) | null;
 }
 
 export default function Icon({

frontend/src/Components/InfoLabel.css

@@ -16,6 +16,10 @@
 
 /** Kinds **/
 
+.default {
+  color: inherit;
+}
+
 /** Sizes **/
 
 .small {

frontend/src/Components/InfoLabel.css.d.ts

@@ -1,6 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'default': string;
   'label': string;
   'large': string;
   'medium': string;

frontend/src/Components/InfoLabel.js

@@ -1,54 +0,0 @@
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React from 'react';
-import { kinds, sizes } from 'Helpers/Props';
-import styles from './InfoLabel.css';
-
-function InfoLabel(props) {
-  const {
-    className,
-    name,
-    kind,
-    size,
-    outline,
-    children,
-    ...otherProps
-  } = props;
-
-  return (
-    <span
-      className={classNames(
-        className,
-        styles[kind],
-        styles[size],
-        outline && styles.outline
-      )}
-      {...otherProps}
-    >
-      <div className={styles.name}>
-        {name}
-      </div>
-      <div>
-        {children}
-      </div>
-    </span>
-  );
-}
-
-InfoLabel.propTypes = {
-  className: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  kind: PropTypes.oneOf(kinds.all).isRequired,
-  size: PropTypes.oneOf(sizes.all).isRequired,
-  outline: PropTypes.bool.isRequired,
-  children: PropTypes.node.isRequired
-};
-
-InfoLabel.defaultProps = {
-  className: styles.label,
-  kind: kinds.DEFAULT,
-  size: sizes.SMALL,
-  outline: false
-};
-
-export default InfoLabel;

frontend/src/Components/InfoLabel.tsx

@@ -0,0 +1,41 @@
+import classNames from 'classnames';
+import React, { ComponentProps, ReactNode } from 'react';
+import { Kind } from 'Helpers/Props/kinds';
+import { Size } from 'Helpers/Props/sizes';
+import styles from './InfoLabel.css';
+
+interface InfoLabelProps extends ComponentProps<'span'> {
+  className?: string;
+  name: string;
+  kind?: Extract<Kind, keyof typeof styles>;
+  size?: Extract<Size, keyof typeof styles>;
+  outline?: boolean;
+  children: ReactNode;
+}
+
+function InfoLabel({
+  className = styles.label,
+  name,
+  kind = 'default',
+  size = 'small',
+  outline = false,
+  children,
+  ...otherProps
+}: InfoLabelProps) {
+  return (
+    <span
+      className={classNames(
+        className,
+        styles[kind],
+        styles[size],
+        outline && styles.outline
+      )}
+      {...otherProps}
+    >
+      <div className={styles.name}>{name}</div>
+      <div>{children}</div>
+    </span>
+  );
+}
+
+export default InfoLabel;

frontend/src/Components/Marquee.js

@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 
@@ -7,26 +8,15 @@ const TIMEOUT = 1 / FPS * 1000;
 
 class Marquee extends Component {
 
-  static propTypes = {
-    text: PropTypes.string,
-    title: PropTypes.string,
-    hoverToStop: PropTypes.bool,
-    loop: PropTypes.bool,
-    className: PropTypes.string
-  };
+  constructor(props, context) {
+    super(props, context);
 
-  static defaultProps = {
-    text: '',
-    title: '',
-    hoverToStop: true,
-    loop: false
-  };
-
-  state = {
-    animatedWidth: 0,
-    overflowWidth: 0,
-    direction: 0
-  };
+    this.state = {
+      animatedWidth: 0,
+      overflowWidth: 0,
+      direction: 0
+    };
+  }
 
   componentDidMount() {
     this.measureText();
@@ -138,7 +128,7 @@ class Marquee extends Component {
           ref={(el) => {
             this.container = el;
           }}
-          className={`ui-marquee ${this.props.className}`}
+          className={classNames('ui-marquee', this.props.className)}
           style={{ overflow: 'hidden' }}
         >
           <span
@@ -159,7 +149,7 @@ class Marquee extends Component {
         ref={(el) => {
           this.container = el;
         }}
-        className={`ui-marquee ${this.props.className}`.trim()}
+        className={classNames('ui-marquee', this.props.className)}
         style={{ overflow: 'hidden' }}
         onMouseEnter={this.onHandleMouseEnter}
         onMouseLeave={this.onHandleMouseLeave}
@@ -178,4 +168,20 @@ class Marquee extends Component {
   }
 }
 
+Marquee.propTypes = {
+  text: PropTypes.string,
+  title: PropTypes.string,
+  hoverToStop: PropTypes.bool,
+  loop: PropTypes.bool,
+  className: PropTypes.string
+};
+
+Marquee.defaultProps = {
+  text: '',
+  title: '',
+  hoverToStop: true,
+  loop: false,
+  className: ''
+};
+
 export default Marquee;

frontend/src/Components/Menu/FilterMenu.js

@@ -58,9 +58,9 @@ class FilterMenu extends Component {
         >
           <ButtonComponent
             iconName={icons.FILTER}
+            showIndicator={selectedFilterKey !== 'all'}
             text={translate('Filter')}
             isDisabled={isDisabled}
-            showIndicator={selectedFilterKey !== 'all'}
           />
 
           <FilterMenuContent

frontend/src/Components/Menu/Menu.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import Portal from 'Components/Portal';
 import { align } from 'Helpers/Props';
-import getUniqueElememtId from 'Utilities/getUniqueElementId';
+import getUniqueElementId from 'Utilities/getUniqueElementId';
 import styles from './Menu.css';
 
 const sharedPopperOptions = {
@@ -38,8 +38,8 @@ class Menu extends Component {
     super(props, context);
 
     this._scheduleUpdate = null;
-    this._menuButtonId = getUniqueElememtId();
-    this._menuContentId = getUniqueElememtId();
+    this._menuButtonId = getUniqueElementId();
+    this._menuContentId = getUniqueElementId();
 
     this.state = {
       isMenuOpen: false,

frontend/src/Components/Modal/ModalError.js

@@ -18,7 +18,7 @@ function ModalError(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        Error
+        {translate('Error')}
       </ModalHeader>
 
       <ModalBody>
@@ -26,7 +26,7 @@ function ModalError(props) {
           messageClassName={styles.message}
           detailsClassName={styles.details}
           {...otherProps}
-          message={translate('ThereWasAnErrorLoadingThisItem')}
+          message={translate('ErrorLoadingItem')}
         />
       </ModalBody>
 

frontend/src/Components/Page/Header/KeyboardShortcutsModalContent.js

@@ -56,7 +56,7 @@ function KeyboardShortcutsModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        Keyboard Shortcuts
+        {translate('KeyboardShortcuts')}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Components/Page/Header/MovieSearchInput.js

@@ -92,7 +92,7 @@ class MovieSearchInput extends Component {
     if (item.type === ADD_NEW_TYPE) {
       return (
         <div className={styles.addNewMovieSuggestion}>
-          Search for {query}
+          {translate('SearchForQuery', { query })}
         </div>
       );
     }

frontend/src/Components/Page/Header/PageHeader.js

@@ -79,7 +79,7 @@ class PageHeader extends Component {
           <IconButton
             className={styles.donate}
             name={icons.HEART}
-            aria-label="Donate"
+            aria-label={translate('Donate')}
             to="https://radarr.video/donate"
             size={14}
             title={translate('Donate')}

frontend/src/Components/Page/PageContentError.js

@@ -10,7 +10,7 @@ function PageContentError(props) {
       <PageContentBody>
         <ErrorBoundaryError
           {...props}
-          message={translate('ThereWasAnErrorLoadingThisPage')}
+          message={translate('ErrorLoadingPage')}
         />
       </PageContentBody>
     </div>

frontend/src/Components/Page/Sidebar/PageSidebarItem.css

@@ -24,6 +24,7 @@
   composes: link;
 
   padding: 10px 24px;
+  padding-left: 35px;
 }
 
 .isActiveLink {
@@ -41,10 +42,6 @@
   text-align: center;
 }
 
-.noIcon {
-  margin-left: 25px;
-}
-
 .status {
   float: right;
 }

frontend/src/Components/Page/Sidebar/PageSidebarItem.css.d.ts

@@ -8,7 +8,6 @@ interface CssExports {
   'isActiveParentLink': string;
   'item': string;
   'link': string;
-  'noIcon': string;
   'status': string;
 }
 export const cssExports: CssExports;

frontend/src/Components/Page/Sidebar/PageSidebarItem.js

@@ -63,9 +63,7 @@ class PageSidebarItem extends Component {
               </span>
           }
 
-          <span className={isChildItem ? styles.noIcon : null}>
-            {typeof title === 'function' ? title() : title}
-          </span>
+          {typeof title === 'function' ? title() : title}
 
           {
             !!StatusComponent &&

frontend/src/Components/Page/Toolbar/PageToolbarButton.css

@@ -23,11 +23,14 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
   height: 24px;
 }
 
 .label {
   padding: 0 3px;
+  max-width: 100%;
+  max-height: 100%;
   color: var(--toolbarLabelColor);
   font-size: $extraSmallFontSize;
   line-height: calc($extraSmallFontSize + 1px);

frontend/src/Components/Page/Toolbar/PageToolbarButton.js

@@ -1,58 +0,0 @@
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React from 'react';
-import Icon from 'Components/Icon';
-import Link from 'Components/Link/Link';
-import { icons } from 'Helpers/Props';
-import styles from './PageToolbarButton.css';
-
-function PageToolbarButton(props) {
-  const {
-    label,
-    iconName,
-    spinningName,
-    isDisabled,
-    isSpinning,
-    ...otherProps
-  } = props;
-
-  return (
-    <Link
-      className={classNames(
-        styles.toolbarButton,
-        isDisabled && styles.isDisabled
-      )}
-      isDisabled={isDisabled || isSpinning}
-      {...otherProps}
-    >
-      <Icon
-        name={isSpinning ? (spinningName || iconName) : iconName}
-        isSpinning={isSpinning}
-        size={21}
-      />
-
-      <div className={styles.labelContainer}>
-        <div className={styles.label}>
-          {label}
-        </div>
-      </div>
-    </Link>
-  );
-}
-
-PageToolbarButton.propTypes = {
-  label: PropTypes.string.isRequired,
-  iconName: PropTypes.object.isRequired,
-  spinningName: PropTypes.object,
-  isSpinning: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  onPress: PropTypes.func
-};
-
-PageToolbarButton.defaultProps = {
-  spinningName: icons.SPINNER,
-  isDisabled: false,
-  isSpinning: false
-};
-
-export default PageToolbarButton;

frontend/src/Components/Page/Toolbar/PageToolbarButton.tsx

@@ -0,0 +1,50 @@
+import classNames from 'classnames';
+import React from 'react';
+import Icon, { IconName } from 'Components/Icon';
+import Link, { LinkProps } from 'Components/Link/Link';
+import { icons } from 'Helpers/Props';
+import styles from './PageToolbarButton.css';
+
+export interface PageToolbarButtonProps extends LinkProps {
+  label: string;
+  iconName: IconName;
+  spinningName?: IconName;
+  isSpinning?: boolean;
+  isDisabled?: boolean;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  overflowComponent?: React.ComponentType<any>;
+}
+
+function PageToolbarButton({
+  label,
+  iconName,
+  spinningName = icons.SPINNER,
+  isDisabled = false,
+  isSpinning = false,
+  overflowComponent,
+  ...otherProps
+}: PageToolbarButtonProps) {
+  return (
+    <Link
+      className={classNames(
+        styles.toolbarButton,
+        isDisabled && styles.isDisabled
+      )}
+      isDisabled={isDisabled || isSpinning}
+      title={label}
+      {...otherProps}
+    >
+      <Icon
+        name={isSpinning ? spinningName || iconName : iconName}
+        isSpinning={isSpinning}
+        size={21}
+      />
+
+      <div className={styles.labelContainer}>
+        <div className={styles.label}>{label}</div>
+      </div>
+    </Link>
+  );
+}
+
+export default PageToolbarButton;

frontend/src/Components/Table/Cells/TableRowCell.tsx

@@ -1,7 +1,7 @@
 import React, { ComponentPropsWithoutRef } from 'react';
 import styles from './TableRowCell.css';
 
-export interface TableRowCellProps extends ComponentPropsWithoutRef<'td'> {}
+export type TableRowCellProps = ComponentPropsWithoutRef<'td'>;
 
 export default function TableRowCell({
   className = styles.cell,

frontend/src/Components/Table/Column.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SortDirection } from 'Helpers/Props/sortDirections';
 
 type PropertyFunction<T> = () => T;
 
@@ -9,6 +10,7 @@ interface Column {
   className?: string;
   columnLabel?: string;
   isSortable?: boolean;
+  fixedSortDirection?: SortDirection;
   isVisible: boolean;
   isModifiable?: boolean;
 }

frontend/src/Components/Table/TableOptions/TableOptionsModal.js

@@ -170,11 +170,11 @@ class TableOptionsModal extends Component {
                     {
                       canModifyColumns ?
                         <FormGroup>
-                          <FormLabel>{translate('Columns')}</FormLabel>
+                          <FormLabel>{translate('TableColumns')}</FormLabel>
 
                           <div>
                             <FormInputHelpText
-                              text={translate('TableOptionsColumnsMessage')}
+                              text={translate('TableColumnsHelpText')}
                             />
 
                             <div className={styles.columns}>

frontend/src/Components/Table/TablePager.js

@@ -6,6 +6,7 @@ import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './TablePager.css';
 
 class TablePager extends Component {
@@ -156,7 +157,7 @@ class TablePager extends Component {
 
         <div className={styles.recordsContainer}>
           <div className={styles.records}>
-            Total records: {totalRecords}
+            {translate('TotalRecords', { totalRecords })}
           </div>
         </div>
       </div>

frontend/src/Components/TraktRating.tsx

@@ -15,7 +15,7 @@ function TraktRating(props: TraktRatingProps) {
   const { ratings, iconSize = 14, hideIcon = false } = props;
 
   const traktImage =
-    'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTguMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiAgICAgdmlld0JveD0iMCAwIDE0NC44IDE0NC44IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNDQuOCAxNDQuOCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGc+ICAgIDxwYXRoIGZpbGw9IiNFRDIyMjQiIGQ9Ik0yOS41LDExMS44YzEwLjYsMTEuNiwyNS45LDE4LjgsNDIuOSwxOC44YzguNywwLDE2LjktMS45LDI0LjMtNS4zTDU2LjMsODVMMjkuNSwxMTEuOHoiLz4gICAgPHBhdGggZmlsbD0iI0VEMjIyNCIgZD0iTTU2LjEsNjAuNkwyNS41LDkxLjFMMjEuNCw4N2wzMi4yLTMyLjJoMGwzNy42LTM3LjZjLTUuOS0yLTEyLjItMy4xLTE4LjgtMy4xYy0zMi4yLDAtNTguMywyNi4xLTU4LjMsNTguMyAgICAgICBjMCwxMy4xLDQuMywyNS4yLDExLjcsMzVsMzAuNS0zMC41bDIuMSwybDQzLjcsNDMuN2MwLjktMC41LDEuNy0xLDIuNS0xLjZMNTYuMyw3Mi43TDI3LDEwMmwtNC4xLTQuMWwzMy40LTMzLjRsMi4xLDJsNTEsNTAuOSAgICAgICBjMC44LTAuNiwxLjUtMS4zLDIuMi0xLjlsLTU1LTU1TDU2LjEsNjAuNnoiLz4gICAgPHBhdGggZmlsbD0iI0VEMUMyNCIgZD0iTTExNS43LDExMS40YzkuMy0xMC4zLDE1LTI0LDE1LTM5YzAtMjMuNC0xMy44LTQzLjUtMzMuNi01Mi44TDYwLjQsNTYuMkwxMTUuNywxMTEuNHogTTc0LjUsNjYuOGwtNC4xLTQuMSAgICAgICBsMjguOS0yOC45bDQuMSw0LjFMNzQuNSw2Ni44eiBNMTAxLjksMjcuMUw2OC42LDYwLjRsLTQuMS00LjFMOTcuOCwyM0wxMDEuOSwyNy4xeiIvPiAgICA8Zz4gICAgICAgPGc+ICAgICAgICAgIDxwYXRoIGZpbGw9IiNFRDIyMjQiIGQ9Ik03Mi40LDE0NC44QzMyLjUsMTQ0LjgsMCwxMTIuMywwLDcyLjRDMCwzMi41LDMyLjUsMCw3Mi40LDBzNzIuNCwzMi41LDcyLjQsNzIuNCAgICAgICAgICAgICBDMTQ0LjgsMTEyLjMsMTEyLjMsMTQ0LjgsNzIuNCwxNDQuOHogTTcyLjQsNy4zQzM2LjUsNy4zLDcuMywzNi41LDcuMyw3Mi40czI5LjIsNjUuMSw2NS4xLDY1LjFzNjUuMS0yOS4yLDY1LjEtNjUuMSAgICAgICAgICAgICBTMTA4LjMsNy4zLDcyLjQsNy4zeiIvPiAgICAgICA8L2c+ICAgIDwvZz48L2c+PC9zdmc+';
+    'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iTGF5ZXJfMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiPgogIDxkZWZzPgogICAgPHN0eWxlPgogICAgICAuY2xzLTEgewogICAgICAgIGZpbGw6ICM5ZjQyYzY7CiAgICAgIH0KCiAgICAgIC5jbHMtMiB7CiAgICAgICAgZmlsbDogI2ZmZjsKICAgICAgfQogICAgPC9zdHlsZT4KICA8L2RlZnM+CiAgPGcgaWQ9Il94MkRfLXByb2R1Y3Rpb24iPgogICAgPGcgaWQ9ImxvZ29tYXJrLmNpcmNsZS5jb2xvciI+CiAgICAgIDxwYXRoIGlkPSJiYWNrZ3JvdW5kIiBjbGFzcz0iY2xzLTEiIGQ9Ik00OCwyNGMwLDYuNjItMi42OSwxMi42Mi03LjAzLDE2Ljk3LTQuMzQsNC4zNC0xMC4zNCw3LjAzLTE2Ljk3LDcuMDNDMTAuNzUsNDgsMCwzNy4yNSwwLDI0YzAtNi42MywyLjY5LTEyLjYzLDcuMDMtMTYuOTdDMTEuMzcsMi42OCwxNy4zNywwLDI0LDBzMTIuNjMsMi42OCwxNi45Nyw3LjAzYy4xNC4xNC4yNy4yOC40LjQyLjQ4LjUuOTQsMS4wMiwxLjM3LDEuNTYuMjEuMjYuNDEuNTIuNi43OS40My41Ny44MiwxLjE2LDEuMTgsMS43Ni4xOC4yOS4zNS41OC41MS44Ny4zNS42NC42OCwxLjI5Ljk2LDEuOTcsMS4zLDIuOTQsMi4wMSw2LjE4LDIuMDEsOS42WiIvPgogICAgICA8ZyBpZD0iY2hlY2tib3giPgogICAgICAgIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEyLjkzLDE4LjY3bC0xLjQ3LDEuNDYsMTQuNCwxNC40LDEuNDctMS40Ny00LjMyLTQuMzEsMTkuNzMtMTkuNzRjLS40My0uNTQtLjg5LTEuMDYtMS4zNy0xLjU2bC0xOS44MywxOS44My04LjYxLTguNjFaTTI4LjAyLDMyLjM3bDEuNDYtMS40Ni0yLjE1LTIuMTYsMTcuMTktMTcuMTljLS4zNi0uNi0uNzUtMS4xOS0xLjE4LTEuNzZsLTE4Ljk0LDE4Ljk1LDMuNjIsMy42MlpNMzAuMTgsMzAuMjFsMTUuODEtMTUuODFjLS4yOC0uNjgtLjYxLTEuMzMtLjk2LTEuOTdsLTE2LjMyLDE2LjMyLDEuNDcsMS40NlpNMTMuNjIsMTcuOTdsNy45Miw3LjkyLDEuNDctMS40Ny03LjkyLTcuOTItMS40NywxLjQ3Wk0yNS4xNywyMi4yN2wtNy45Mi03LjkyLTEuNDcsMS40Nyw3LjkyLDcuOTIsMS40Ny0xLjQ3Wk0yNCw0MS4zMmMtOS41NSwwLTE3LjMyLTcuNzctMTcuMzItMTcuMzJTMTQuNDUsNi42NywyNCw2LjY3YzIuNiwwLDUuMTEuNTYsNy40NCwxLjY4bC44OS0xLjg3Yy0yLjYxLTEuMjUtNS40Mi0xLjg4LTguMzMtMS44OEMxMy4zMSw0LjYsNC42MSwxMy4zLDQuNjEsMjRzOC43LDE5LjQsMTkuNCwxOS40YzcuNjQsMCwxNC41OS00LjUxLDE3LjcxLTExLjQ4bC0xLjg5LS44NWMtMi43OSw2LjIzLTksMTAuMjYtMTUuODIsMTAuMjZaIi8+CiAgICAgIDwvZz4KICAgIDwvZz4KICA8L2c+Cjwvc3ZnPg==';
 
   const { value = 0, votes = 0 } = ratings.trakt;
 

frontend/src/Components/keyboardShortcuts.js

@@ -7,63 +7,63 @@ export const shortcuts = {
   OPEN_KEYBOARD_SHORTCUTS_MODAL: {
     key: '?',
     get name() {
-      return translate('OpenThisModal');
+      return translate('KeyboardShortcutsOpenModal');
     }
   },
 
   CLOSE_MODAL: {
     key: 'Esc',
     get name() {
-      return translate('CloseCurrentModal');
+      return translate('KeyboardShortcutsCloseModal');
     }
   },
 
   ACCEPT_CONFIRM_MODAL: {
     key: 'Enter',
     get name() {
-      return translate('AcceptConfirmationModal');
+      return translate('KeyboardShortcutsConfirmModal');
     }
   },
 
   MOVIE_SEARCH_INPUT: {
     key: 's',
     get name() {
-      return translate('FocusSearchBox');
+      return translate('KeyboardShortcutsFocusSearchBox');
     }
   },
 
   SAVE_SETTINGS: {
     key: 'mod+s',
     get name() {
-      return translate('SaveSettings');
+      return translate('KeyboardShortcutsSaveSettings');
     }
   },
 
   SCROLL_TOP: {
     key: 'mod+home',
     get name() {
-      return translate('MovieIndexScrollTop');
+      return translate('KeyboardShortcutsMovieIndexScrollTop');
     }
   },
 
   SCROLL_BOTTOM: {
     key: 'mod+end',
     get name() {
-      return translate('MovieIndexScrollBottom');
+      return translate('KeyboardShortcutsMovieIndexScrollBottom');
     }
   },
 
   DETAILS_NEXT: {
     key: '→',
     get name() {
-      return translate('MovieDetailsNextMovie');
+      return translate('KeyboardShortcutsMovieDetailsNextMovie');
     }
   },
 
   DETAILS_PREVIOUS: {
     key: '←',
     get name() {
-      return translate('MovieDetailsPreviousMovie');
+      return translate('KeyboardShortcutsMovieDetailsPreviousMovie');
     }
   }
 };

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.css

@@ -85,10 +85,16 @@ $hoverScale: 1.05;
   flex: 1 0 auto;
 }
 
+.overviewContainer {
+  display: flex;
+  justify-content: space-between;
+  flex: 0 1 1000px;
+  flex-direction: column;
+}
+
 .overview {
   composes: link;
 
-  flex: 0 1 1000px;
   overflow: hidden;
   min-height: 0;
 }

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.css.d.ts

@@ -11,6 +11,7 @@ interface CssExports {
   'link': string;
   'lists': string;
   'overview': string;
+  'overviewContainer': string;
   'poster': string;
   'posterContainer': string;
   'title': string;

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js

@@ -133,14 +133,20 @@ class DiscoverMovieOverview extends Component {
                 />
               </div>
 
-              <MoviePoster
-                className={styles.poster}
+              <Link
+                className={styles.link}
                 style={elementStyle}
-                images={images}
-                size={250}
-                lazy={false}
-                overflow={true}
-              />
+                {...linkProps}
+              >
+                <MoviePoster
+                  className={styles.poster}
+                  style={elementStyle}
+                  images={images}
+                  size={250}
+                  lazy={false}
+                  overflow={true}
+                />
+              </Link>
             </div>
           </div>
 
@@ -242,11 +248,13 @@ class DiscoverMovieOverview extends Component {
             </div>
 
             <div className={styles.details}>
-              <div className={styles.overview}>
-                <TextTruncate
-                  line={Math.floor(overviewHeight / (defaultFontSize * lineHeight))}
-                  text={overview}
-                />
+              <div className={styles.overviewContainer}>
+                <Link className={styles.overview} {...linkProps}>
+                  <TextTruncate
+                    line={Math.floor(overviewHeight / (defaultFontSize * lineHeight))}
+                    text={overview}
+                  />
+                </Link>
               </div>
 
               <DiscoverMovieOverviewInfo
@@ -255,7 +263,6 @@ class DiscoverMovieOverview extends Component {
                 {...overviewOptions}
                 {...otherProps}
               />
-
             </div>
           </div>
         </div>

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverviewInfo.js

@@ -49,7 +49,7 @@ function isVisible(row, props) {
     valueProp
   } = row;
 
-  return _.has(props, valueProp) && (_.get(props, showProp) || props.sortKey === name);
+  return _.has(props, valueProp) && _.get(props, valueProp) !== null && (props[showProp] || props.sortKey === name);
 }
 
 function getInfoRowProps(row, props) {

frontend/src/Helpers/Props/filterBuilderTypes.js

@@ -1,3 +1,4 @@
+import translate from 'Utilities/String/translate';
 import * as filterTypes from './filterTypes';
 
 export const ARRAY = 'array';
@@ -20,49 +21,127 @@ export const all = [
 
 export const possibleFilterTypes = {
   [ARRAY]: [
-    { key: filterTypes.CONTAINS, value: 'contains' },
-    { key: filterTypes.NOT_CONTAINS, value: 'does not contain' }
+    {
+      key: filterTypes.CONTAINS,
+      value: () => translate('FilterContains')
+    },
+    {
+      key: filterTypes.NOT_CONTAINS,
+      value: () => translate('FilterDoesNotContain')
+    }
   ],
 
   [CONTAINS]: [
-    { key: filterTypes.CONTAINS, value: 'contains' }
+    {
+      key: filterTypes.CONTAINS,
+      value: () => translate('FilterContains')
+    }
   ],
 
   [DATE]: [
-    { key: filterTypes.LESS_THAN, value: 'is before' },
-    { key: filterTypes.GREATER_THAN, value: 'is after' },
-    { key: filterTypes.IN_LAST, value: 'in the last' },
-    { key: filterTypes.NOT_IN_LAST, value: 'not in the last' },
-    { key: filterTypes.IN_NEXT, value: 'in the next' },
-    { key: filterTypes.NOT_IN_NEXT, value: 'not in the next' }
+    {
+      key: filterTypes.LESS_THAN,
+      value: () => translate('FilterIsBefore')
+    },
+    {
+      key: filterTypes.GREATER_THAN,
+      value: () => translate('FilterIsAfter')
+    },
+    {
+      key: filterTypes.IN_LAST,
+      value: () => translate('FilterInLast')
+    },
+    {
+      key: filterTypes.NOT_IN_LAST,
+      value: () => translate('FilterNotInLast')
+    },
+    {
+      key: filterTypes.IN_NEXT,
+      value: () => translate('FilterInNext')
+    },
+    {
+      key: filterTypes.NOT_IN_NEXT,
+      value: () => translate('FilterNotInNext')
+    }
   ],
 
   [EQUAL]: [
-    { key: filterTypes.EQUAL, value: 'is' }
+    {
+      key: filterTypes.EQUAL,
+      value: () => translate('FilterIs')
+    }
   ],
 
   [EXACT]: [
-    { key: filterTypes.EQUAL, value: 'is' },
-    { key: filterTypes.NOT_EQUAL, value: 'is not' }
+    {
+      key: filterTypes.EQUAL,
+      value: () => translate('FilterIs')
+    },
+    {
+      key: filterTypes.NOT_EQUAL,
+      value: () => translate('FilterIsNot')
+    }
   ],
 
   [NUMBER]: [
-    { key: filterTypes.EQUAL, value: 'equal' },
-    { key: filterTypes.GREATER_THAN, value: 'greater than' },
-    { key: filterTypes.GREATER_THAN_OR_EQUAL, value: 'greater than or equal' },
-    { key: filterTypes.LESS_THAN, value: 'less than' },
-    { key: filterTypes.LESS_THAN_OR_EQUAL, value: 'less than or equal' },
-    { key: filterTypes.NOT_EQUAL, value: 'not equal' }
+    {
+      key: filterTypes.EQUAL,
+      value: () => translate('FilterEqual')
+    },
+    {
+      key: filterTypes.GREATER_THAN,
+      value: () => translate('FilterGreaterThan')
+    },
+    {
+      key: filterTypes.GREATER_THAN_OR_EQUAL,
+      value: () => translate('FilterGreaterThanOrEqual')
+    },
+    {
+      key: filterTypes.LESS_THAN,
+      value: () => translate('FilterLessThan')
+    },
+    {
+      key: filterTypes.LESS_THAN_OR_EQUAL,
+      value: () => translate('FilterLessThanOrEqual')
+    },
+    {
+      key: filterTypes.NOT_EQUAL,
+      value: () => translate('FilterNotEqual')
+    }
   ],
 
   [STRING]: [
-    { key: filterTypes.CONTAINS, value: 'contains' },
-    { key: filterTypes.NOT_CONTAINS, value: 'does not contain' },
-    { key: filterTypes.EQUAL, value: 'equal' },
-    { key: filterTypes.NOT_EQUAL, value: 'not equal' },
-    { key: filterTypes.STARTS_WITH, value: 'starts with' },
-    { key: filterTypes.NOT_STARTS_WITH, value: 'does not start with' },
-    { key: filterTypes.ENDS_WITH, value: 'ends with' },
-    { key: filterTypes.NOT_ENDS_WITH, value: 'does not end with' }
+    {
+      key: filterTypes.CONTAINS,
+      value: () => translate('FilterContains')
+    },
+    {
+      key: filterTypes.NOT_CONTAINS,
+      value: () => translate('FilterDoesNotContain')
+    },
+    {
+      key: filterTypes.EQUAL,
+      value: () => translate('FilterEqual')
+    },
+    {
+      key: filterTypes.NOT_EQUAL,
+      value: () => translate('FilterNotEqual')
+    },
+    {
+      key: filterTypes.STARTS_WITH,
+      value: () => translate('FilterStartsWith')
+    },
+    {
+      key: filterTypes.NOT_STARTS_WITH,
+      value: () => translate('FilterDoesNotStartWith')
+    },
+    {
+      key: filterTypes.ENDS_WITH,
+      value: () => translate('FilterEndsWith')
+    },
+    {
+      key: filterTypes.NOT_ENDS_WITH,
+      value: () => translate('FilterDoesNotEndWith')
+    }
   ]
 };

frontend/src/Helpers/Props/kinds.ts

@@ -36,4 +36,5 @@ export type Kind =
   | 'primary'
   | 'purple'
   | 'success'
-  | 'warning';
+  | 'warning'
+  | 'queue';

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx

@@ -192,10 +192,9 @@ const importModeSelector = createSelector(
   }
 );
 
-interface InteractiveImportModalContentProps {
+export interface InteractiveImportModalContentProps {
   downloadId?: string;
   movieId?: number;
-  seasonNumber?: number;
   showMovie?: boolean;
   allowMovieChange?: boolean;
   showDelete?: boolean;
@@ -217,7 +216,6 @@ function InteractiveImportModalContent(
   const {
     downloadId,
     movieId,
-    seasonNumber,
     allowMovieChange = true,
     showMovie = true,
     showFilterExistingFiles = false,
@@ -343,7 +341,6 @@ function InteractiveImportModalContent(
         fetchInteractiveImportItems({
           downloadId,
           movieId,
-          seasonNumber,
           folder,
           filterExistingFiles,
         })

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx

@@ -24,6 +24,7 @@ import {
   reprocessInteractiveImportItems,
   updateInteractiveImportItem,
 } from 'Store/Actions/interactiveImportActions';
+import CustomFormat from 'typings/CustomFormat';
 import { SelectStateInputProps } from 'typings/props';
 import Rejection from 'typings/Rejection';
 import formatBytes from 'Utilities/Number/formatBytes';
@@ -52,7 +53,7 @@ interface InteractiveImportRowProps {
   quality?: QualityModel;
   languages?: Language[];
   size: number;
-  customFormats?: object[];
+  customFormats?: CustomFormat[];
   customFormatScore?: number;
   indexerFlags: number;
   rejections: Rejection[];

frontend/src/InteractiveImport/InteractiveImport.ts

@@ -2,6 +2,7 @@ import ModelBase from 'App/ModelBase';
 import Language from 'Language/Language';
 import Movie from 'Movie/Movie';
 import { QualityModel } from 'Quality/Quality';
+import CustomFormat from 'typings/CustomFormat';
 import Rejection from 'typings/Rejection';
 
 export interface InteractiveImportCommandOptions {
@@ -27,7 +28,7 @@ interface InteractiveImport extends ModelBase {
   languages: Language[];
   movie?: Movie;
   qualityWeight: number;
-  customFormats: object[];
+  customFormats: CustomFormat[];
   indexerFlags: number;
   rejections: Rejection[];
   movieFileId?: number;

frontend/src/InteractiveImport/InteractiveImportModal.tsx

@@ -4,9 +4,12 @@ import usePrevious from 'Helpers/Hooks/usePrevious';
 import { sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import InteractiveImportSelectFolderModalContent from './Folder/InteractiveImportSelectFolderModalContent';
-import InteractiveImportModalContent from './Interactive/InteractiveImportModalContent';
+import InteractiveImportModalContent, {
+  InteractiveImportModalContentProps,
+} from './Interactive/InteractiveImportModalContent';
 
-interface InteractiveImportModalProps {
+interface InteractiveImportModalProps
+  extends Omit<InteractiveImportModalContentProps, 'modalTitle'> {
   isOpen: boolean;
   folder?: string;
   downloadId?: string;

frontend/src/InteractiveImport/Movie/SelectMovieModalContent.tsx

@@ -65,7 +65,7 @@ interface RowItemData {
 }
 
 function Row({ index, style, data }: ListChildComponentProps<RowItemData>) {
-  const { items, columns, onMovieSelect } = data;
+  const { items, onMovieSelect } = data;
   const movie = index >= items.length ? null : items[index];
 
   const handlePress = useCallback(() => {
@@ -88,13 +88,11 @@ function Row({ index, style, data }: ListChildComponentProps<RowItemData>) {
       onPress={handlePress}
     >
       <SelectMovieRow
-        id={movie.id}
+        key={movie.id}
         title={movie.title}
         tmdbId={movie.tmdbId}
         imdbId={movie.imdbId}
         year={movie.year}
-        columns={columns}
-        onMovieSelect={onMovieSelect}
       />
     </VirtualTableRowButton>
   );
@@ -181,7 +179,9 @@ function SelectMovieModalContent(props: SelectMovieModalContentProps) {
 
   return (
     <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>{modalTitle} - Select Movie</ModalHeader>
+      <ModalHeader>
+        {translate('SelectMovieModalTitle', { modalTitle })}
+      </ModalHeader>
 
       <ModalBody
         className={styles.modalBody}
@@ -189,7 +189,7 @@ function SelectMovieModalContent(props: SelectMovieModalContentProps) {
       >
         <TextInput
           className={styles.filterInput}
-          placeholder="Filter movies"
+          placeholder={translate('FilterMoviePlaceholder')}
           name="filter"
           value={filter}
           autoFocus={true}
@@ -225,7 +225,7 @@ function SelectMovieModalContent(props: SelectMovieModalContentProps) {
       </ModalBody>
 
       <ModalFooter>
-        <Button onPress={onModalClose}>Cancel</Button>
+        <Button onPress={onModalClose}>{translate('Cancel')}</Button>
       </ModalFooter>
     </ModalContent>
   );

frontend/src/InteractiveImport/Movie/SelectMovieRow.js

@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Label from 'Components/Label';
-import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
-import styles from './SelectMovieRow.css';
-
-class SelectMovieRow extends Component {
-
-  //
-  // Listeners
-
-  onPress = () => {
-    this.props.onMovieSelect(this.props.id);
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <>
-        <VirtualTableRowCell className={styles.title}>
-          {this.props.title}
-        </VirtualTableRowCell>
-
-        <VirtualTableRowCell className={styles.year}>
-          {this.props.year}
-        </VirtualTableRowCell>
-
-        <VirtualTableRowCell className={styles.imdbId}>
-          {
-            this.props.imdbId ?
-              <Label>{this.props.imdbId}</Label> :
-              null
-          }
-        </VirtualTableRowCell>
-
-        <VirtualTableRowCell className={styles.tmdbId}>
-          <Label>{this.props.tmdbId}</Label>
-        </VirtualTableRowCell>
-      </>
-    );
-  }
-}
-
-SelectMovieRow.propTypes = {
-  id: PropTypes.number.isRequired,
-  title: PropTypes.string.isRequired,
-  tmdbId: PropTypes.number.isRequired,
-  imdbId: PropTypes.string,
-  year: PropTypes.number.isRequired,
-  onMovieSelect: PropTypes.func.isRequired
-};
-
-export default SelectMovieRow;

frontend/src/InteractiveImport/Movie/SelectMovieRow.tsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import Label from 'Components/Label';
+import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
+import styles from './SelectMovieRow.css';
+
+interface SelectMovieRowProps {
+  title: string;
+  tmdbId: number;
+  imdbId?: string;
+  year: number;
+}
+
+function SelectMovieRow({ title, year, tmdbId, imdbId }: SelectMovieRowProps) {
+  return (
+    <>
+      <VirtualTableRowCell className={styles.title}>
+        {title}
+      </VirtualTableRowCell>
+
+      <VirtualTableRowCell className={styles.year}>{year}</VirtualTableRowCell>
+
+      <VirtualTableRowCell className={styles.imdbId}>
+        {imdbId ? <Label>{imdbId}</Label> : null}
+      </VirtualTableRowCell>
+
+      <VirtualTableRowCell className={styles.tmdbId}>
+        <Label>{tmdbId}</Label>
+      </VirtualTableRowCell>
+    </>
+  );
+}
+
+export default SelectMovieRow;

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -1,240 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment } from 'react';
-import Alert from 'Components/Alert';
-import Icon from 'Components/Icon';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import PageMenuButton from 'Components/Menu/PageMenuButton';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import { align, icons, kinds, sortDirections } from 'Helpers/Props';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import translate from 'Utilities/String/translate';
-import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector';
-import InteractiveSearchRowConnector from './InteractiveSearchRowConnector';
-import styles from './InteractiveSearch.css';
-
-const columns = [
-  {
-    name: 'protocol',
-    label: () => translate('Source'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'age',
-    label: () => translate('Age'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'title',
-    label: () => translate('Title'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'indexer',
-    label: () => translate('Indexer'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'history',
-    label: () => translate('History'),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
-  {
-    name: 'size',
-    label: () => translate('Size'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'peers',
-    label: () => translate('Peers'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'languages',
-    label: () => translate('Language'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'qualityWeight',
-    label: () => translate('Quality'),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'customFormatScore',
-    label: React.createElement(Icon, {
-      name: icons.SCORE,
-      title: () => translate('CustomFormatScore')
-    }),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'indexerFlags',
-    label: React.createElement(Icon, {
-      name: icons.FLAG,
-      title: () => translate('IndexerFlags')
-    }),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'rejections',
-    label: React.createElement(Icon, {
-      name: icons.DANGER,
-      title: () => translate('Rejections')
-    }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  }
-];
-
-function InteractiveSearch(props) {
-  const {
-    searchPayload,
-    isFetching,
-    isPopulated,
-    error,
-    totalReleasesCount,
-    items,
-    selectedFilterKey,
-    filters,
-    customFilters,
-    sortKey,
-    sortDirection,
-    longDateFormat,
-    timeFormat,
-    onSortPress,
-    onFilterSelect,
-    onGrabPress
-  } = props;
-
-  const errorMessage = getErrorMessage(error);
-  const type = 'movies';
-
-  return (
-    <div>
-      <div className={styles.filterMenuContainer}>
-        <FilterMenu
-          alignMenu={align.RIGHT}
-          selectedFilterKey={selectedFilterKey}
-          filters={filters}
-          customFilters={customFilters}
-          buttonComponent={PageMenuButton}
-          filterModalConnectorComponent={InteractiveSearchFilterModalConnector}
-          filterModalConnectorComponentProps={{ type }}
-          onFilterSelect={onFilterSelect}
-        />
-      </div>
-
-      {
-        isFetching ? <LoadingIndicator /> : null
-      }
-
-      {
-        !isFetching && error ?
-          <Alert kind={kinds.DANGER} className={styles.alert}>
-            {
-              errorMessage ?
-                <Fragment>
-                  {translate('InteractiveSearchResultsFailedErrorMessage', { message: errorMessage.charAt(0).toLowerCase() + errorMessage.slice(1) })}
-                </Fragment> :
-                translate('MovieSearchResultsLoadError')
-            }
-          </Alert> :
-          null
-      }
-
-      {
-        !isFetching && isPopulated && !totalReleasesCount ?
-          <Alert kind={kinds.INFO} className={styles.alert}>
-            {translate('NoResultsFound')}
-          </Alert> :
-          null
-      }
-
-      {
-        !!totalReleasesCount && isPopulated && !items.length ?
-          <Alert kind={kinds.WARNING} className={styles.alert}>
-            {translate('AllResultsHiddenFilter')}
-          </Alert> :
-          null
-      }
-
-      {
-        isPopulated && !!items.length ?
-          <Table
-            columns={columns}
-            sortKey={sortKey}
-            sortDirection={sortDirection}
-            onSortPress={onSortPress}
-          >
-            <TableBody>
-              {
-                items.map((item) => {
-                  return (
-                    <InteractiveSearchRowConnector
-                      key={`${item.indexerId}-${item.guid}`}
-                      {...item}
-                      searchPayload={searchPayload}
-                      longDateFormat={longDateFormat}
-                      timeFormat={timeFormat}
-                      onGrabPress={onGrabPress}
-                    />
-                  );
-                })
-              }
-            </TableBody>
-          </Table> :
-          null
-      }
-
-      {
-        totalReleasesCount !== items.length && !!items.length ?
-          <Alert kind={kinds.INFO} className={styles.alert}>
-            {translate('SomeResultsHiddenFilter')}
-          </Alert> :
-          null
-      }
-    </div>
-  );
-}
-
-InteractiveSearch.propTypes = {
-  searchPayload: PropTypes.object.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  totalReleasesCount: PropTypes.number.isRequired,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  sortKey: PropTypes.string,
-  sortDirection: PropTypes.string,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  onSortPress: PropTypes.func.isRequired,
-  onFilterSelect: PropTypes.func.isRequired,
-  onGrabPress: PropTypes.func.isRequired
-};
-
-export default InteractiveSearch;

frontend/src/InteractiveSearch/InteractiveSearch.tsx

@@ -0,0 +1,263 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import ClientSideCollectionAppState from 'App/State/ClientSideCollectionAppState';
+import ReleasesAppState from 'App/State/ReleasesAppState';
+import Alert from 'Components/Alert';
+import Icon from 'Components/Icon';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
+import PageMenuButton from 'Components/Menu/PageMenuButton';
+import Column from 'Components/Table/Column';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { align, icons, kinds, sortDirections } from 'Helpers/Props';
+import { SortDirection } from 'Helpers/Props/sortDirections';
+import { fetchMovieBlocklist } from 'Store/Actions/movieBlocklistActions';
+import { fetchMovieHistory } from 'Store/Actions/movieHistoryActions';
+import {
+  fetchReleases,
+  grabRelease,
+  setReleasesFilter,
+  setReleasesSort,
+} from 'Store/Actions/releaseActions';
+import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
+import getErrorMessage from 'Utilities/Object/getErrorMessage';
+import translate from 'Utilities/String/translate';
+import InteractiveSearchFilterModal from './InteractiveSearchFilterModal';
+import InteractiveSearchPayload from './InteractiveSearchPayload';
+import InteractiveSearchRow from './InteractiveSearchRow';
+import styles from './InteractiveSearch.css';
+
+const columns: Column[] = [
+  {
+    name: 'protocol',
+    label: () => translate('Source'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'age',
+    label: () => translate('Age'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'title',
+    label: () => translate('Title'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'indexer',
+    label: () => translate('Indexer'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'history',
+    label: () => translate('History'),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true,
+  },
+  {
+    name: 'size',
+    label: () => translate('Size'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'peers',
+    label: () => translate('Peers'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'languages',
+    label: () => translate('Language'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'qualityWeight',
+    label: () => translate('Quality'),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: () => translate('CustomFormatScore'),
+    }),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'indexerFlags',
+    label: React.createElement(Icon, {
+      name: icons.FLAG,
+      title: () => translate('IndexerFlags'),
+    }),
+    isSortable: true,
+    isVisible: true,
+  },
+  {
+    name: 'rejections',
+    label: React.createElement(Icon, {
+      name: icons.DANGER,
+      title: () => translate('Rejections'),
+    }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true,
+  },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true,
+  },
+];
+
+interface InteractiveSearchProps {
+  searchPayload: InteractiveSearchPayload;
+}
+
+function InteractiveSearch({ searchPayload }: InteractiveSearchProps) {
+  const {
+    isFetching,
+    isPopulated,
+    error,
+    items,
+    totalItems,
+    selectedFilterKey,
+    filters,
+    customFilters,
+    sortKey,
+    sortDirection,
+  }: ReleasesAppState & ClientSideCollectionAppState = useSelector(
+    createClientSideCollectionSelector('releases')
+  );
+
+  const dispatch = useDispatch();
+
+  const handleFilterSelect = useCallback(
+    (selectedFilterKey: string | number) => {
+      dispatch(setReleasesFilter({ selectedFilterKey }));
+    },
+    [dispatch]
+  );
+
+  const handleSortPress = useCallback(
+    (sortKey: string, sortDirection?: SortDirection) => {
+      dispatch(setReleasesSort({ sortKey, sortDirection }));
+    },
+    [dispatch]
+  );
+
+  const handleGrabPress = useCallback(
+    (payload: object) => {
+      dispatch(grabRelease(payload));
+    },
+    [dispatch]
+  );
+
+  useEffect(
+    () => {
+      // Only fetch releases if they are not already being fetched and not yet populated.
+
+      if (!isFetching && !isPopulated) {
+        dispatch(fetchReleases(searchPayload));
+
+        const { movieId } = searchPayload;
+
+        if (movieId) {
+          dispatch(fetchMovieBlocklist({ movieId }));
+          dispatch(fetchMovieHistory({ movieId }));
+        }
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const errorMessage = getErrorMessage(error);
+
+  return (
+    <div>
+      <div className={styles.filterMenuContainer}>
+        <FilterMenu
+          alignMenu={align.RIGHT}
+          selectedFilterKey={selectedFilterKey}
+          filters={filters}
+          customFilters={customFilters}
+          buttonComponent={PageMenuButton}
+          filterModalConnectorComponent={InteractiveSearchFilterModal}
+          filterModalConnectorComponentProps={{ type: 'movies' }}
+          onFilterSelect={handleFilterSelect}
+        />
+      </div>
+
+      {isFetching ? <LoadingIndicator /> : null}
+
+      {!isFetching && error ? (
+        <Alert kind={kinds.DANGER} className={styles.alert}>
+          {errorMessage ? (
+            <>
+              {translate('InteractiveSearchResultsFailedErrorMessage', {
+                message:
+                  errorMessage.charAt(0).toLowerCase() + errorMessage.slice(1),
+              })}
+            </>
+          ) : (
+            translate('MovieSearchResultsLoadError')
+          )}
+        </Alert>
+      ) : null}
+
+      {!isFetching && isPopulated && !totalItems ? (
+        <Alert kind={kinds.INFO} className={styles.alert}>
+          {translate('NoResultsFound')}
+        </Alert>
+      ) : null}
+
+      {!!totalItems && isPopulated && !items.length ? (
+        <Alert kind={kinds.WARNING} className={styles.alert}>
+          {translate('AllResultsHiddenFilter')}
+        </Alert>
+      ) : null}
+
+      {isPopulated && !!items.length ? (
+        <Table
+          columns={columns}
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onSortPress={handleSortPress}
+        >
+          <TableBody>
+            {items.map((item) => {
+              return (
+                <InteractiveSearchRow
+                  key={`${item.indexerId}-${item.guid}`}
+                  {...item}
+                  searchPayload={searchPayload}
+                  onGrabPress={handleGrabPress}
+                />
+              );
+            })}
+          </TableBody>
+        </Table>
+      ) : null}
+
+      {totalItems !== items.length && !!items.length ? (
+        <Alert kind={kinds.INFO} className={styles.alert}>
+          {translate('SomeResultsHiddenFilter')}
+        </Alert>
+      ) : null}
+    </div>
+  );
+}
+
+export default InteractiveSearch;

frontend/src/InteractiveSearch/InteractiveSearchConnector.js

@@ -1,109 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { clearMovieHistory, fetchMovieHistory } from 'Store/Actions/movieHistoryActions';
-import * as releaseActions from 'Store/Actions/releaseActions';
-import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import InteractiveSearch from './InteractiveSearch';
-
-function createMapStateToProps(appState) {
-  return createSelector(
-    (state) => state.releases.items.length,
-    createClientSideCollectionSelector('releases'),
-    createUISettingsSelector(),
-    (totalReleasesCount, releases, uiSettings) => {
-      return {
-        totalReleasesCount,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat,
-        ...releases
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    dispatchFetchReleases(payload) {
-      dispatch(releaseActions.fetchReleases(payload));
-    },
-
-    dispatchFetchMovieHistory({ movieId }) {
-      dispatch(fetchMovieHistory({ movieId }));
-    },
-
-    dispatchClearMovieHistory() {
-      dispatch(clearMovieHistory());
-    },
-
-    onSortPress(sortKey, sortDirection) {
-      dispatch(releaseActions.setReleasesSort({ sortKey, sortDirection }));
-    },
-
-    onFilterSelect(selectedFilterKey) {
-      dispatch(releaseActions.setReleasesFilter({ selectedFilterKey }));
-    },
-
-    onGrabPress(payload) {
-      dispatch(releaseActions.grabRelease(payload));
-    }
-  };
-}
-
-class InteractiveSearchConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    const {
-      searchPayload,
-      isPopulated,
-      dispatchFetchReleases,
-      dispatchFetchMovieHistory
-    } = this.props;
-
-    // If search results are not yet isPopulated fetch them,
-    // otherwise re-show the existing props.
-    if (!isPopulated) {
-      dispatchFetchReleases(searchPayload);
-    }
-
-    dispatchFetchMovieHistory(searchPayload);
-  }
-
-  componentWillUnmount() {
-    this.props.dispatchClearMovieHistory();
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      dispatchFetchReleases,
-      dispatchFetchMovieHistory,
-      dispatchClearMovieHistory,
-      ...otherProps
-    } = this.props;
-
-    return (
-
-      <InteractiveSearch
-        {...otherProps}
-      />
-    );
-  }
-}
-
-InteractiveSearchConnector.propTypes = {
-  searchPayload: PropTypes.object.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  dispatchFetchReleases: PropTypes.func.isRequired,
-  dispatchFetchMovieHistory: PropTypes.func.isRequired,
-  dispatchClearMovieHistory: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(InteractiveSearchConnector);

frontend/src/InteractiveSearch/InteractiveSearchFilterModal.tsx

@@ -0,0 +1,55 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setReleasesFilter } from 'Store/Actions/releaseActions';
+
+function createReleasesSelector() {
+  return createSelector(
+    (state: AppState) => state.releases.items,
+    (releases) => {
+      return releases;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.releases.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface InteractiveSearchFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function InteractiveSearchFilterModal({
+  ...otherProps
+}: InteractiveSearchFilterModalProps) {
+  const sectionItems = useSelector(createReleasesSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setReleasesFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...otherProps}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType="releases"
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/InteractiveSearch/InteractiveSearchFilterModalConnector.js

@@ -1,29 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import FilterModal from 'Components/Filter/FilterModal';
-import { setReleasesFilter } from 'Store/Actions/releaseActions';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.releases.items,
-    (state) => state.releases.filterBuilderProps,
-    (sectionItems, filterBuilderProps) => {
-      return {
-        sectionItems,
-        filterBuilderProps,
-        customFilterType: 'releases'
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    dispatchSetFilter(payload) {
-      const action = setReleasesFilter;
-      dispatch(action(payload));
-    }
-  };
-}
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(FilterModal);

frontend/src/InteractiveSearch/InteractiveSearchPayload.ts

@@ -0,0 +1,7 @@
+interface MovieSearchPayload {
+  movieId: number;
+}
+
+type InteractiveSearchPayload = MovieSearchPayload;
+
+export default InteractiveSearchPayload;

frontend/src/InteractiveSearch/InteractiveSearchRow.tsx

@@ -1,5 +1,8 @@
 import React, { useCallback, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
+import AppState from 'App/State/AppState';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
@@ -8,21 +11,18 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
-import type DownloadProtocol from 'DownloadClient/DownloadProtocol';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
-import Language from 'Language/Language';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguages from 'Movie/MovieLanguages';
 import MovieQuality from 'Movie/MovieQuality';
-import { QualityModel } from 'Quality/Quality';
-import CustomFormat from 'typings/CustomFormat';
-import MovieBlocklist from 'typings/MovieBlocklist';
-import MovieHistory from 'typings/MovieHistory';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import Release from 'typings/Release';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
 import formatBytes from 'Utilities/Number/formatBytes';
 import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
+import InteractiveSearchPayload from './InteractiveSearchPayload';
 import OverrideMatchModal from './OverrideMatch/OverrideMatchModal';
 import Peers from './Peers';
 import styles from './InteractiveSearchRow.css';
@@ -71,37 +71,42 @@ function getDownloadTooltip(
   return translate('AddToDownloadQueue');
 }
 
-interface InteractiveSearchRowProps {
-  guid: string;
-  protocol: DownloadProtocol;
-  age: number;
-  ageHours: number;
-  ageMinutes: number;
-  publishDate: string;
-  title: string;
-  infoUrl: string;
-  indexerId: number;
-  indexer: string;
-  size: number;
-  seeders?: number;
-  leechers?: number;
-  quality: QualityModel;
-  languages: Language[];
-  customFormats: CustomFormat[];
-  customFormatScore: number;
-  mappedMovieId?: number;
-  indexerFlags: string[];
-  rejections: string[];
-  downloadAllowed: boolean;
-  isGrabbing: boolean;
-  isGrabbed: boolean;
-  grabError?: string;
-  historyFailedData?: MovieHistory;
-  historyGrabbedData?: MovieHistory;
-  blocklistData?: MovieBlocklist;
-  longDateFormat: string;
-  timeFormat: string;
-  searchPayload: object;
+function releaseHistorySelector({ guid }: Release) {
+  return createSelector(
+    (state: AppState) => state.movieHistory.items,
+    (state: AppState) => state.movieBlocklist.items,
+    (movieHistory, movieBlocklist) => {
+      let historyFailedData = null;
+      let blocklistedData = null;
+
+      const historyGrabbedData = movieHistory.find(
+        ({ eventType, data }) =>
+          eventType === 'grabbed' && 'guid' in data && data.guid === guid
+      );
+
+      if (historyGrabbedData) {
+        historyFailedData = movieHistory.find(
+          ({ eventType, sourceTitle }) =>
+            eventType === 'downloadFailed' &&
+            sourceTitle === historyGrabbedData.sourceTitle
+        );
+
+        blocklistedData = movieBlocklist.find(
+          (item) => item.sourceTitle === historyGrabbedData.sourceTitle
+        );
+      }
+
+      return {
+        historyGrabbedData,
+        historyFailedData,
+        blocklistedData,
+      };
+    }
+  );
+}
+
+interface InteractiveSearchRowProps extends Release {
+  searchPayload: InteractiveSearchPayload;
   onGrabPress(...args: unknown[]): void;
 }
 
@@ -130,16 +135,18 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
     downloadAllowed,
     isGrabbing = false,
     isGrabbed = false,
-    longDateFormat,
-    timeFormat,
     grabError,
-    historyGrabbedData = {} as MovieHistory,
-    historyFailedData = {} as MovieHistory,
-    blocklistData = {} as MovieBlocklist,
     searchPayload,
     onGrabPress,
   } = props;
 
+  const { longDateFormat, timeFormat } = useSelector(
+    createUISettingsSelector()
+  );
+
+  const { historyGrabbedData, historyFailedData, blocklistedData } =
+    useSelector(releaseHistorySelector(props));
+
   const [isConfirmGrabModalOpen, setIsConfirmGrabModalOpen] = useState(false);
   const [isOverrideModalOpen, setIsOverrideModalOpen] = useState(false);
 
@@ -211,44 +218,52 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
 
       <TableRowCell className={styles.history}>
         {historyGrabbedData?.date && !historyFailedData?.date ? (
-          <Icon
-            name={icons.DOWNLOADING}
-            kind={kinds.DEFAULT}
-            title={`${translate('Grabbed')}: ${formatDateTime(
-              historyGrabbedData.date,
-              longDateFormat,
-              timeFormat,
-              { includeSeconds: true }
-            )}`}
+          <Tooltip
+            anchor={<Icon name={icons.DOWNLOADING} kind={kinds.DEFAULT} />}
+            tooltip={translate('GrabbedAt', {
+              date: formatDateTime(
+                historyGrabbedData.date,
+                longDateFormat,
+                timeFormat,
+                { includeSeconds: true }
+              ),
+            })}
+            kind={kinds.INVERSE}
+            position={tooltipPositions.LEFT}
           />
         ) : null}
 
         {historyFailedData?.date ? (
-          <Icon
-            name={icons.DOWNLOADING}
-            kind={kinds.DANGER}
-            title={`${translate('Failed')}: ${formatDateTime(
-              historyFailedData.date,
-              longDateFormat,
-              timeFormat,
-              { includeSeconds: true }
-            )}`}
+          <Tooltip
+            anchor={<Icon name={icons.DOWNLOADING} kind={kinds.DANGER} />}
+            tooltip={translate('FailedAt', {
+              date: formatDateTime(
+                historyFailedData.date,
+                longDateFormat,
+                timeFormat,
+                { includeSeconds: true }
+              ),
+            })}
+            kind={kinds.INVERSE}
+            position={tooltipPositions.LEFT}
           />
         ) : null}
 
-        {blocklistData?.date ? (
+        {blocklistedData?.date ? (
           <Icon
             className={
               historyGrabbedData || historyFailedData ? styles.blocklist : ''
             }
             name={icons.BLOCKLIST}
             kind={kinds.DANGER}
-            title={`${translate('Blocklisted')}: ${formatDateTime(
-              blocklistData.date,
-              longDateFormat,
-              timeFormat,
-              { includeSeconds: true }
-            )}`}
+            title={translate('BlocklistedAt', {
+              date: formatDateTime(
+                blocklistedData.date,
+                longDateFormat,
+                timeFormat,
+                { includeSeconds: true }
+              ),
+            })}
           />
         ) : null}
       </TableRowCell>

frontend/src/InteractiveSearch/InteractiveSearchRowConnector.js

@@ -1,62 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import InteractiveSearchRow from './InteractiveSearchRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { guid }) => guid,
-    (state) => state.movieHistory.items,
-    (state) => state.movieBlocklist.items,
-    (guid, movieHistory, movieBlocklist) => {
-
-      let blocklistData = {};
-      let historyFailedData = {};
-
-      const historyGrabbedData = movieHistory.find((movie) => movie.eventType === 'grabbed' && movie.data.guid === guid);
-      if (historyGrabbedData) {
-        historyFailedData = movieHistory.find((movie) => movie.eventType === 'downloadFailed' && movie.sourceTitle === historyGrabbedData.sourceTitle);
-        blocklistData = movieBlocklist.find((item) => item.sourceTitle === historyGrabbedData.sourceTitle);
-      }
-
-      return {
-        historyGrabbedData,
-        historyFailedData,
-        blocklistData
-      };
-    }
-  );
-}
-
-class InteractiveSearchRowConnector extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      historyGrabbedData,
-      historyFailedData,
-      blocklistData,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <InteractiveSearchRow
-        historyGrabbedData={historyGrabbedData}
-        historyFailedData={historyFailedData}
-        blocklistData={blocklistData}
-        {...otherProps}
-      />
-    );
-  }
-}
-
-InteractiveSearchRowConnector.propTypes = {
-  historyGrabbedData: PropTypes.object,
-  historyFailedData: PropTypes.object,
-  blocklistData: PropTypes.object
-};
-
-export default connect(createMapStateToProps)(InteractiveSearchRowConnector);

frontend/src/InteractiveSearch/Peers.tsx

@@ -1,9 +1,8 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
 
-function getKind(seeders) {
+function getKind(seeders: number = 0) {
   if (seeders > 50) {
     return kinds.PRIMARY;
   }
@@ -19,7 +18,7 @@ function getKind(seeders) {
   return kinds.DANGER;
 }
 
-function getPeersTooltipPart(peers, peersUnit) {
+function getPeersTooltipPart(peers: number | undefined, peersUnit: string) {
   if (peers == null) {
     return `Unknown ${peersUnit}s`;
   }
@@ -31,27 +30,27 @@ function getPeersTooltipPart(peers, peersUnit) {
   return `${peers} ${peersUnit}s`;
 }
 
-function Peers(props) {
-  const {
-    seeders,
-    leechers
-  } = props;
+interface PeersProps {
+  seeders?: number;
+  leechers?: number;
+}
+
+function Peers(props: PeersProps) {
+  const { seeders, leechers } = props;
 
   const kind = getKind(seeders);
 
   return (
     <Label
       kind={kind}
-      title={`${getPeersTooltipPart(seeders, 'seeder')}, ${getPeersTooltipPart(leechers, 'leecher')}`}
+      title={`${getPeersTooltipPart(seeders, 'seeder')}, ${getPeersTooltipPart(
+        leechers,
+        'leecher'
+      )}`}
     >
       {seeders == null ? '-' : seeders} / {leechers == null ? '-' : leechers}
     </Label>
   );
 }
 
-Peers.propTypes = {
-  seeders: PropTypes.number,
-  leechers: PropTypes.number
-};
-
 export default Peers;

frontend/src/Movie/Delete/DeleteMovieModal.js

@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import DeleteMovieModalContentConnector from './DeleteMovieModalContentConnector';
-
-function DeleteMovieModal(props) {
-  const {
-    isOpen,
-    onModalClose,
-    previousMovie,
-    ...otherProps
-  } = props;
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      size={sizes.MEDIUM}
-      onModalClose={onModalClose}
-    >
-      <DeleteMovieModalContentConnector
-        {...otherProps}
-        onModalClose={onModalClose}
-        previousMovie={previousMovie}
-      />
-    </Modal>
-  );
-}
-
-DeleteMovieModal.propTypes = {
-  ...DeleteMovieModalContentConnector.propTypes,
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  previousMovie: PropTypes.string
-};
-
-export default DeleteMovieModal;

frontend/src/Movie/Delete/DeleteMovieModal.tsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import DeleteMovieModalContent, {
+  DeleteMovieModalContentProps,
+} from './DeleteMovieModalContent';
+
+interface DeleteMovieModalProps extends DeleteMovieModalContentProps {
+  isOpen: boolean;
+}
+
+function DeleteMovieModal({
+  isOpen,
+  onModalClose,
+  ...otherProps
+}: DeleteMovieModalProps) {
+  return (
+    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={onModalClose}>
+      <DeleteMovieModalContent {...otherProps} onModalClose={onModalClose} />
+    </Modal>
+  );
+}
+
+export default DeleteMovieModal;

frontend/src/Movie/Delete/DeleteMovieModalContent.js

@@ -1,163 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Icon from 'Components/Icon';
-import Button from 'Components/Link/Button';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { icons, inputTypes, kinds } from 'Helpers/Props';
-import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
-import styles from './DeleteMovieModalContent.css';
-
-class DeleteMovieModalContent extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      deleteFiles: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onDeleteFilesChange = ({ value }) => {
-    this.setState({ deleteFiles: value });
-  };
-
-  onDeleteMovieConfirmed = () => {
-    const deleteFiles = this.state.deleteFiles;
-    const addImportExclusion = this.props.deleteOptions.addImportExclusion;
-
-    this.setState({ deleteFiles: false });
-    this.props.onDeletePress(deleteFiles, addImportExclusion);
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      title,
-      path,
-      statistics = {},
-      deleteOptions,
-      onModalClose,
-      onDeleteOptionChange
-    } = this.props;
-
-    const {
-      movieFileCount = 0,
-      sizeOnDisk = 0
-    } = statistics;
-
-    const deleteFiles = this.state.deleteFiles;
-    const addImportExclusion = deleteOptions.addImportExclusion;
-
-    return (
-      <ModalContent
-        onModalClose={onModalClose}
-      >
-        <ModalHeader>
-          {translate('DeleteHeader', { title })}
-        </ModalHeader>
-
-        <ModalBody>
-          <div className={styles.pathContainer}>
-            <Icon
-              className={styles.pathIcon}
-              name={icons.FOLDER}
-            />
-
-            {path}
-          </div>
-
-          <FormGroup>
-            <FormLabel>
-              {translate('AddListExclusion')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="addImportExclusion"
-              value={addImportExclusion}
-              helpText={translate('AddListExclusionMovieHelpText')}
-              kind={kinds.DANGER}
-              onChange={onDeleteOptionChange}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>{movieFileCount === 0 ? translate('DeleteMovieFolder') : translate('DeleteMovieFiles', { movieFileCount })}</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="deleteFiles"
-              value={deleteFiles}
-              helpText={movieFileCount === 0 ? translate('DeleteMovieFolderHelpText') : translate('DeleteMovieFilesHelpText')}
-              kind={kinds.DANGER}
-              onChange={this.onDeleteFilesChange}
-            />
-          </FormGroup>
-
-          {
-            deleteFiles ?
-              <div className={styles.deleteFilesMessage}>
-                <div><InlineMarkdown data={translate('DeleteMovieFolderConfirmation', { path })} blockClassName={styles.folderPath} /></div>
-
-                {
-                  movieFileCount ?
-                    <div className={styles.deleteCount}>
-                      {translate('DeleteMovieFolderMovieCount', { movieFileCount, size: formatBytes(sizeOnDisk) })}
-                    </div> :
-                    null
-                }
-              </div> :
-              null
-          }
-
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={onModalClose}>
-            {translate('Close')}
-          </Button>
-
-          <Button
-            kind={kinds.DANGER}
-            onPress={this.onDeleteMovieConfirmed}
-          >
-            {translate('Delete')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-DeleteMovieModalContent.propTypes = {
-  title: PropTypes.string.isRequired,
-  path: PropTypes.string.isRequired,
-  statistics: PropTypes.object.isRequired,
-  hasFile: PropTypes.bool.isRequired,
-  deleteOptions: PropTypes.object.isRequired,
-  onDeleteOptionChange: PropTypes.func.isRequired,
-  onDeletePress: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-DeleteMovieModalContent.defaultProps = {
-  statistics: {}
-};
-
-export default DeleteMovieModalContent;

frontend/src/Movie/Delete/DeleteMovieModalContent.tsx

@@ -0,0 +1,149 @@
+import React, { useCallback, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import AppState from 'App/State/AppState';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Icon from 'Components/Icon';
+import Button from 'Components/Link/Button';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { icons, inputTypes, kinds } from 'Helpers/Props';
+import { Statistics } from 'Movie/Movie';
+import useMovie from 'Movie/useMovie';
+import { deleteMovie, setDeleteOption } from 'Store/Actions/movieActions';
+import { CheckInputChanged } from 'typings/inputs';
+import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
+import styles from './DeleteMovieModalContent.css';
+
+export interface DeleteMovieModalContentProps {
+  movieId: number;
+  onModalClose: () => void;
+}
+
+function DeleteMovieModalContent({
+  movieId,
+  onModalClose,
+}: DeleteMovieModalContentProps) {
+  const dispatch = useDispatch();
+  const {
+    title,
+    path,
+    collection,
+    statistics = {} as Statistics,
+  } = useMovie(movieId)!;
+  const { addImportExclusion } = useSelector(
+    (state: AppState) => state.movies.deleteOptions
+  );
+
+  const { movieFileCount = 0, sizeOnDisk = 0 } = statistics;
+
+  const [deleteFiles, setDeleteFiles] = useState(false);
+
+  const handleDeleteFilesChange = useCallback(
+    ({ value }: CheckInputChanged) => {
+      setDeleteFiles(value);
+    },
+    []
+  );
+
+  const handleDeleteMovieConfirmed = useCallback(() => {
+    dispatch(
+      deleteMovie({
+        id: movieId,
+        collectionTmdbId: collection?.tmdbId,
+        deleteFiles,
+        addImportExclusion,
+      })
+    );
+  }, [movieId, collection, addImportExclusion, deleteFiles, dispatch]);
+
+  const handleDeleteOptionChange = useCallback(
+    ({ name, value }: CheckInputChanged) => {
+      dispatch(setDeleteOption({ [name]: value }));
+    },
+    [dispatch]
+  );
+
+  return (
+    <ModalContent onModalClose={onModalClose}>
+      <ModalHeader>{translate('DeleteHeader', { title })}</ModalHeader>
+
+      <ModalBody>
+        <div className={styles.pathContainer}>
+          <Icon className={styles.pathIcon} name={icons.FOLDER} />
+
+          {path}
+        </div>
+
+        <FormGroup>
+          <FormLabel>{translate('AddListExclusion')}</FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.CHECK}
+            name="addImportExclusion"
+            value={addImportExclusion}
+            helpText={translate('AddListExclusionMovieHelpText')}
+            kind={kinds.DANGER}
+            onChange={handleDeleteOptionChange}
+          />
+        </FormGroup>
+
+        <FormGroup>
+          <FormLabel>
+            {movieFileCount === 0
+              ? translate('DeleteMovieFolder')
+              : translate('DeleteMovieFiles', { movieFileCount })}
+          </FormLabel>
+
+          <FormInputGroup
+            type={inputTypes.CHECK}
+            name="deleteFiles"
+            value={deleteFiles}
+            helpText={
+              movieFileCount === 0
+                ? translate('DeleteMovieFolderHelpText')
+                : translate('DeleteMovieFilesHelpText')
+            }
+            kind={kinds.DANGER}
+            onChange={handleDeleteFilesChange}
+          />
+        </FormGroup>
+
+        {deleteFiles ? (
+          <div className={styles.deleteFilesMessage}>
+            <div>
+              <InlineMarkdown
+                data={translate('DeleteMovieFolderConfirmation', { path })}
+                blockClassName={styles.folderPath}
+              />
+            </div>
+
+            {movieFileCount ? (
+              <div className={styles.deleteCount}>
+                {translate('DeleteMovieFolderMovieCount', {
+                  movieFileCount,
+                  size: formatBytes(sizeOnDisk),
+                })}
+              </div>
+            ) : null}
+          </div>
+        ) : null}
+      </ModalBody>
+
+      <ModalFooter>
+        <Button onPress={onModalClose}>{translate('Close')}</Button>
+
+        <Button kind={kinds.DANGER} onPress={handleDeleteMovieConfirmed}>
+          {translate('Delete')}
+        </Button>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+export default DeleteMovieModalContent;

frontend/src/Movie/Delete/DeleteMovieModalContentConnector.js

@@ -1,45 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { deleteMovie, setDeleteOption } from 'Store/Actions/movieActions';
-import createMovieSelector from 'Store/Selectors/createMovieSelector';
-import DeleteMovieModalContent from './DeleteMovieModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.movies.deleteOptions,
-    createMovieSelector(),
-    (deleteOptions, movie) => {
-      return {
-        ...movie,
-        deleteOptions
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    onDeleteOptionChange(option) {
-      dispatch(
-        setDeleteOption({
-          [option.name]: option.value
-        })
-      );
-    },
-
-    onDeletePress(deleteFiles, addImportExclusion) {
-      dispatch(
-        deleteMovie({
-          id: props.movieId,
-          collectionTmdbId: this.collection?.tmdbId,
-          deleteFiles,
-          addImportExclusion
-        })
-      );
-
-      props.onModalClose(true);
-    }
-  };
-}
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(DeleteMovieModalContent);

frontend/src/Movie/Details/MovieDetails.css

@@ -160,10 +160,10 @@
 }
 
 .overview {
-  flex: 1 0 auto;
+  flex: 1 0 0;
   margin-top: 8px;
-  padding-left: 7px;
   min-height: 0;
+  text-wrap: balance;
   font-size: $intermediateFontSize;
 }