fixup! Remove db calls from list threads

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://dev.azure.com/Radarr/Radarr/_apis/build/status/Radarr.Radarr?branchName=develop)](https://dev.azure.com/Radarr/Radarr/_build/latest?definitionId=1&branchName=develop)
 [![Translated](https://translate.servarr.com/widgets/servarr/-/radarr/svg-badge.svg)](https://translate.servarr.com/engage/radarr/?utm_source=widget)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation/docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)](https://wiki.servarr.com/radarr/installation#docker)
 ![Github Downloads](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/Radarr/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/Radarr/sponsors/badge.svg)](#sponsors)

azure-pipelines.yml

@@ -9,13 +9,13 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.3.0'
+  majorVersion: '5.1.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.417'
+  dotnetVersion: '6.0.413'
   nodeVersion: '16.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'

frontend/src/Activity/Blocklist/Blocklist.js

@@ -36,7 +36,6 @@ class Blocklist extends Component {
       lastToggled: null,
       selectedState: {},
       isConfirmRemoveModalOpen: false,
-      isConfirmClearModalOpen: false,
       items: props.items
     };
   }
@@ -91,19 +90,6 @@ class Blocklist extends Component {
     this.setState({ isConfirmRemoveModalOpen: false });
   };
 
-  onClearBlocklistPress = () => {
-    this.setState({ isConfirmClearModalOpen: true });
-  };
-
-  onClearBlocklistConfirmed = () => {
-    this.props.onClearBlocklistPress();
-    this.setState({ isConfirmClearModalOpen: false });
-  };
-
-  onConfirmClearModalClose = () => {
-    this.setState({ isConfirmClearModalOpen: false });
-  };
-
   //
   // Render
 
@@ -117,6 +103,7 @@ class Blocklist extends Component {
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
+      onClearBlocklistPress,
       ...otherProps
     } = this.props;
 
@@ -124,8 +111,7 @@ class Blocklist extends Component {
       allSelected,
       allUnselected,
       selectedState,
-      isConfirmRemoveModalOpen,
+      isConfirmRemoveModalOpen
-      isConfirmClearModalOpen
     } = this.state;
 
     const selectedIds = this.getSelectedIds();
@@ -145,9 +131,8 @@ class Blocklist extends Component {
             <PageToolbarButton
               label={translate('Clear')}
               iconName={icons.CLEAR}
-              isDisabled={!items.length}
               isSpinning={isClearingBlocklistExecuting}
-              onPress={this.onClearBlocklistPress}
+              onPress={onClearBlocklistPress}
             />
           </PageToolbarSection>
 
@@ -230,16 +215,6 @@ class Blocklist extends Component {
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}
         />
-
-        <ConfirmModal
-          isOpen={isConfirmClearModalOpen}
-          kind={kinds.DANGER}
-          title={translate('ClearBlocklist')}
-          message={translate('ClearBlocklistMessageText')}
-          confirmLabel={translate('Clear')}
-          onConfirm={this.onClearBlocklistConfirmed}
-          onCancel={this.onConfirmClearModalClose}
-        />
       </PageContent>
     );
   }

frontend/src/Activity/Queue/QueueDetails.js

@@ -81,9 +81,4 @@ QueueDetails.propTypes = {
   progressBar: PropTypes.node.isRequired
 };
 
-QueueDetails.defaultProps = {
-  trackedDownloadStatus: 'ok',
-  trackedDownloadState: 'downloading'
-};
-
 export default QueueDetails;

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import { tooltipPositions } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import QueueStatus from './QueueStatus';
 import styles from './QueueStatusCell.css';
 
@@ -40,8 +41,8 @@ QueueStatusCell.propTypes = {
 };
 
 QueueStatusCell.defaultProps = {
-  trackedDownloadStatus: 'ok',
+  trackedDownloadStatus: translate('Ok'),
-  trackedDownloadState: 'downloading'
+  trackedDownloadState: translate('Downloading')
 };
 
 export default QueueStatusCell;

frontend/src/Activity/Queue/TimeleftCell.js

@@ -1,9 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import Tooltip from 'Components/Tooltip/Tooltip';
-import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatTime from 'Utilities/Date/formatTime';
 import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
@@ -28,13 +25,11 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell className={styles.timeleft}>
+      <TableRowCell
-        <Tooltip
+        className={styles.timeleft}
-          anchor={<Icon name={icons.INFO} />}
+        title={translate('DelayingDownloadUntil', { date, time })}
-          tooltip={translate('DelayingDownloadUntil', { date, time })}
+      >
-          kind={kinds.INVERSE}
+        -
-          position={tooltipPositions.TOP}
-        />
       </TableRowCell>
     );
   }
@@ -44,13 +39,11 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell className={styles.timeleft}>
+      <TableRowCell
-        <Tooltip
+        className={styles.timeleft}
-          anchor={<Icon name={icons.INFO} />}
+        title={translate('RetryingDownloadOn', { date, time })}
-          tooltip={translate('RetryingDownloadOn', { date, time })}
+      >
-          kind={kinds.INVERSE}
+        -
-          position={tooltipPositions.TOP}
-        />
       </TableRowCell>
     );
   }

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import TextInput from 'Components/Form/TextInput';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
@@ -131,12 +130,7 @@ class AddNewMovie extends Component {
                 <div className={styles.helpText}>
                   {translate('FailedLoadingSearchResults')}
                 </div>
-                <Alert kind={kinds.WARNING}>{getErrorMessage(error)}</Alert>
+                <div>{getErrorMessage(error)}</div>
-                <div>
-                  <Link to="https://wiki.servarr.com/radarr/troubleshooting#invalid-response-received-from-tmdb">
-                    {translate('WhySearchesCouldBeFailing')}
-                  </Link>
-                </div>
               </div> : null
           }
 

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css

@@ -85,13 +85,8 @@
   margin-top: 20px;
 }
 
-.studio,
-.genres {
-  margin-left: 5px;
-}
-
 .links {
-  margin-left: 5px;
+  margin-left: 8px;
   pointer-events: all;
 }
 

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css.d.ts

@@ -5,7 +5,6 @@ interface CssExports {
   'certification': string;
   'content': string;
   'exclusionIcon': string;
-  'genres': string;
   'icons': string;
   'links': string;
   'overlay': string;
@@ -15,7 +14,6 @@ interface CssExports {
   'runtime': string;
   'searchResult': string;
   'statusContainer': string;
-  'studio': string;
   'title': string;
   'titleContainer': string;
   'titleRow': string;

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Icon from 'Components/Icon';
-import ImdbRating from 'Components/ImdbRating';
 import Label from 'Components/Label';
 import Link from 'Components/Link/Link';
 import TmdbRating from 'Components/TmdbRating';
@@ -62,13 +61,11 @@ class AddNewMovieSearchResult extends Component {
       titleSlug,
       year,
       studio,
-      genres,
       status,
       overview,
       ratings,
       folder,
       images,
-      existingMovieId,
       isExistingMovie,
       isExclusionMovie,
       isSmallScreen,
@@ -77,8 +74,8 @@ class AddNewMovieSearchResult extends Component {
       monitored,
       hasFile,
       isAvailable,
-      movieFile,
+      queueStatus,
-      queueItem,
+      queueState,
       runtime,
       movieRuntimeFormat,
       certification
@@ -123,13 +120,13 @@ class AddNewMovieSearchResult extends Component {
                 {
                   isExistingMovie &&
                     <MovieIndexProgressBar
-                      movieId={existingMovieId}
-                      movieFile={movieFile}
                       monitored={monitored}
                       hasFile={hasFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
+                      queueStatus={queueStatus}
+                      queueState={queueState}
                       isAvailable={isAvailable}
                     />
                 }
@@ -200,46 +197,13 @@ class AddNewMovieSearchResult extends Component {
                 />
               </Label>
 
-              {
-                ratings.imdb ?
-                  <Label size={sizes.LARGE}>
-                    <ImdbRating
-                      ratings={ratings}
-                      iconSize={13}
-                    />
-                  </Label> :
-                  null
-              }
-
               {
                 !!studio &&
                   <Label size={sizes.LARGE}>
-                    <Icon
+                    {studio}
-                      name={icons.STUDIO}
-                      size={13}
-                    />
-
-                    <span className={styles.studio}>
-                      {studio}
-                    </span>
                   </Label>
               }
 
-              {
-                genres.length > 0 ?
-                  <Label size={sizes.LARGE}>
-                    <Icon
-                      name={icons.GENRE}
-                      size={13}
-                    />
-
-                    <span className={styles.genres}>
-                      {genres.slice(0, 3).join(', ')}
-                    </span>
-                  </Label> :
-                  null
-              }
-
               <Tooltip
                 anchor={
                   <Label
@@ -251,15 +215,15 @@ class AddNewMovieSearchResult extends Component {
                     />
 
                     <span className={styles.links}>
-                      {translate('Links')}
+                      Links
                     </span>
                   </Label>
                 }
                 tooltip={
                   <MovieDetailsLinks
                     tmdbId={tmdbId}
-                    imdbId={imdbId}
                     youTubeTrailerId={youTubeTrailerId}
+                    imdbId={imdbId}
                   />
                 }
                 canFlip={true}
@@ -273,7 +237,6 @@ class AddNewMovieSearchResult extends Component {
                     hasMovieFiles={hasFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
-                    queueItem={queueItem}
                     id={id}
                     useLabel={true}
                     colorImpairedMode={colorImpairedMode}
@@ -310,30 +273,25 @@ AddNewMovieSearchResult.propTypes = {
   titleSlug: PropTypes.string.isRequired,
   year: PropTypes.number.isRequired,
   studio: PropTypes.string,
-  genres: PropTypes.arrayOf(PropTypes.string),
   status: PropTypes.string.isRequired,
   overview: PropTypes.string,
   ratings: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
-  existingMovieId: PropTypes.number,
   isExistingMovie: PropTypes.bool.isRequired,
   isExclusionMovie: PropTypes.bool.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
   id: PropTypes.number,
+  queueItems: PropTypes.arrayOf(PropTypes.object),
   monitored: PropTypes.bool.isRequired,
   hasFile: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
-  movieFile: PropTypes.object,
-  queueItem: PropTypes.object,
   colorImpairedMode: PropTypes.bool,
+  queueStatus: PropTypes.string,
+  queueState: PropTypes.string,
   runtime: PropTypes.number.isRequired,
   movieRuntimeFormat: PropTypes.string.isRequired,
   certification: PropTypes.string
 };
 
-AddNewMovieSearchResult.defaultProps = {
-  genres: []
-};
-
 export default AddNewMovieSearchResult;

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -12,17 +12,15 @@ function createMapStateToProps() {
     createDimensionsSelector(),
     (state) => state.queue.details.items,
     (state, { internalId }) => internalId,
-    (state) => state.settings.ui.item.movieRuntimeFormat,
+    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => {
-    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId, movieRuntimeFormat) => {
+      const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0);
-      const queueItem = queueItems.find((item) => internalId > 0 && item.movieId === internalId);
 
       return {
-        existingMovieId: internalId,
         isExistingMovie,
         isExclusionMovie,
         isSmallScreen: dimensions.isSmallScreen,
-        queueItem,
+        queueStatus: firstQueueItem ? firstQueueItem.status : null,
-        movieRuntimeFormat
+        queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null
       };
     }
   );

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

@@ -32,7 +32,7 @@
 .contentContainer {
   z-index: $popperZIndex;
   margin-top: 4px;
-  /* 400px container width with 8px padding on each side */
+  /* 400px container witdh with 8px padding on each side */
   width: 384px;
 }
 

frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolder.js

@@ -148,7 +148,7 @@ class ImportMovieSelectFolder extends Component {
                       className={styles.addErrorAlert}
                       kind={kinds.DANGER}
                     >
-                      {translate('AddRootFolderError')}
+                      {translate('UnableToAddRootFolder')}
 
                       <ul>
                         {

frontend/src/AddMovie/ImportMovie/SelectFolder/ImportMovieSelectFolderConnector.js

@@ -5,13 +5,12 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addRootFolder, deleteRootFolder, fetchRootFolders } from 'Store/Actions/rootFolderActions';
-import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
 import ImportMovieSelectFolder from './ImportMovieSelectFolder';
 
 function createMapStateToProps() {
   return createSelector(
-    createRootFoldersSelector(),
+    (state) => state.rootFolders,
     createSystemStatusSelector(),
     (rootFolders, systemStatus) => {
       return {

frontend/src/App/AppUpdatedModalContent.js

@@ -65,12 +65,12 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('AppUpdated')}
+        {translate('AppUpdated', { appName: 'Radarr' })}
       </ModalHeader>
 
       <ModalBody>
         <div>
-          <InlineMarkdown data={translate('AppUpdatedVersion', { version })} blockClassName={styles.version} />
+          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Radarr', version })} blockClassName={styles.version} />
         </div>
 
         {

frontend/src/App/ConnectionLostModal.js

@@ -28,11 +28,11 @@ function ConnectionLostModal(props) {
 
         <ModalBody>
           <div>
-            {translate('ConnectionLostToBackend')}
+            {translate('ConnectionLostToBackend', { appName: 'Radarr' })}
           </div>
 
           <div className={styles.automatic}>
-            {translate('ConnectionLostReconnect')}
+            {translate('ConnectionLostReconnect', { appName: 'Radarr' })}
           </div>
         </ModalBody>
         <ModalFooter>

frontend/src/App/State/QueueAppState.ts

@@ -1,10 +1,40 @@
-import Queue from 'typings/Queue';
+import ModelBase from 'App/ModelBase';
+import Language from 'Language/Language';
+import { QualityModel } from 'Quality/Quality';
+import CustomFormat from 'typings/CustomFormat';
 import AppSectionState, {
   AppSectionFilterState,
   AppSectionItemState,
   Error,
 } from './AppSectionState';
 
+export interface StatusMessage {
+  title: string;
+  messages: string[];
+}
+
+export interface Queue extends ModelBase {
+  languages: Language[];
+  quality: QualityModel;
+  customFormats: CustomFormat[];
+  size: number;
+  title: string;
+  sizeleft: number;
+  timeleft: string;
+  estimatedCompletionTime: string;
+  status: string;
+  trackedDownloadStatus: string;
+  trackedDownloadState: string;
+  statusMessages: StatusMessage[];
+  errorMessage: string;
+  downloadId: string;
+  protocol: string;
+  downloadClient: string;
+  outputPath: string;
+  movieHasFile: boolean;
+  movieId?: number;
+}
+
 export interface QueueDetailsAppState extends AppSectionState<Queue> {
   params: unknown;
 }

frontend/src/Calendar/CalendarConnector.js

@@ -55,7 +55,7 @@ class CalendarConnector extends Component {
       gotoCalendarToday
     } = this.props;
 
-    registerPagePopulator(this.repopulate, ['movieFileUpdated', 'movieFileDeleted']);
+    registerPagePopulator(this.repopulate);
 
     if (useCurrentPage) {
       fetchCalendar();

frontend/src/Collection/CollectionConnector.js

@@ -6,7 +6,6 @@ import * as commandNames from 'Commands/commandNames';
 import withScrollPosition from 'Components/withScrollPosition';
 import { executeCommand } from 'Store/Actions/commandActions';
 import { saveMovieCollections, setMovieCollectionsFilter, setMovieCollectionsSort } from 'Store/Actions/movieCollectionActions';
-import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import scrollPositions from 'Store/scrollPositions';
 import createCollectionClientSideCollectionItemsSelector from 'Store/Selectors/createCollectionClientSideCollectionItemsSelector';
@@ -39,12 +38,6 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchFetchRootFolders() {
       dispatch(fetchRootFolders());
     },
-    dispatchFetchQueueDetails() {
-      dispatch(fetchQueueDetails());
-    },
-    dispatchClearQueueDetails() {
-      dispatch(clearQueueDetails());
-    },
     onUpdateSelectedPress(payload) {
       dispatch(saveMovieCollections(payload));
     },
@@ -70,12 +63,10 @@ class CollectionConnector extends Component {
   componentDidMount() {
     registerPagePopulator(this.repopulate);
     this.props.dispatchFetchRootFolders();
-    this.props.dispatchFetchQueueDetails();
   }
 
   componentWillUnmount() {
     unregisterPagePopulator(this.repopulate);
-    this.props.dispatchClearQueueDetails();
   }
 
   //
@@ -108,9 +99,7 @@ CollectionConnector.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   view: PropTypes.string.isRequired,
   onUpdateSelectedPress: PropTypes.func.isRequired,
-  dispatchFetchRootFolders: PropTypes.func.isRequired,
+  dispatchFetchRootFolders: PropTypes.func.isRequired
-  dispatchFetchQueueDetails: PropTypes.func.isRequired,
-  dispatchClearQueueDetails: PropTypes.func.isRequired
 };
 
 export default withScrollPosition(

frontend/src/Collection/Overview/CollectionMovie.js

@@ -70,7 +70,6 @@ class CollectionMovie extends Component {
       hasFile,
       folder,
       isAvailable,
-      movieFile,
       isExistingMovie,
       posterWidth,
       posterHeight,
@@ -132,8 +131,6 @@ class CollectionMovie extends Component {
                 id ?
                   <div className={styles.overlayStatus}>
                     <MovieIndexProgressBar
-                      movieId={id}
-                      movieFile={movieFile}
                       monitored={monitored}
                       hasFile={hasFile}
                       status={status}
@@ -183,7 +180,6 @@ CollectionMovie.propTypes = {
   hasFile: PropTypes.bool,
   folder: PropTypes.string,
   isAvailable: PropTypes.bool,
-  movieFile: PropTypes.object,
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   posterWidth: PropTypes.number.isRequired,
   posterHeight: PropTypes.number.isRequired,

frontend/src/Components/DescriptionList/DescriptionListItemDescription.css

@@ -1,7 +1,9 @@
+.description {
+  line-height: $lineHeight;
+}
+
 .description {
   margin-left: 0;
-  line-height: $lineHeight;
-  overflow-wrap: break-word;
 }
 
 @media (min-width: 768px) {

frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx

@@ -23,19 +23,19 @@ const EVENT_TYPE_OPTIONS = [
     },
   },
   {
-    id: 6,
+    id: 5,
     get name() {
       return translate('Deleted');
     },
   },
   {
-    id: 8,
+    id: 6,
     get name() {
       return translate('Renamed');
     },
   },
   {
-    id: 9,
+    id: 7,
     get name() {
       return translate('Ignored');
     },

frontend/src/Components/Form/RootFolderSelectInputConnector.js

@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { addRootFolder } from 'Store/Actions/rootFolderActions';
-import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import translate from 'Utilities/String/translate';
 import RootFolderSelectInput from './RootFolderSelectInput';
 
@@ -11,7 +10,7 @@ const ADD_NEW_KEY = 'addNew';
 
 function createMapStateToProps() {
   return createSelector(
-    createRootFoldersSelector(),
+    (state) => state.rootFolders,
     (state, { value }) => value,
     (state, { includeMissingValue }) => includeMissingValue,
     (state, { includeNoChange }) => includeNoChange,

frontend/src/Components/Modal/Modal.css

@@ -63,12 +63,6 @@
   width: 1280px;
 }
 
-.extraExtraLarge {
-  composes: modal;
-
-  width: 1600px;
-}
-
 @media only screen and (max-width: $breakpointExtraLarge) {
   .modal.extraLarge {
     width: 90%;
@@ -96,8 +90,7 @@
   .modal.small,
   .modal.medium,
   .modal.large,
-  .modal.extraLarge,
+  .modal.extraLarge {
-  .modal.extraExtraLarge {
     max-height: 100%;
     width: 100%;
     height: 100% !important;

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

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

frontend/src/Components/SignalRConnector.js

@@ -167,7 +167,7 @@ class SignalRConnector extends Component {
     const resource = body.resource;
     const status = resource.status;
 
-    // Both successful and failed commands need to be
+    // Both sucessful and failed commands need to be
     // completed, otherwise they spin until they timeout.
 
     if (status === 'completed' || status === 'failed') {
@@ -187,8 +187,6 @@ class SignalRConnector extends Component {
       repopulatePage('movieFileUpdated');
     } else if (body.action === 'deleted') {
       this.props.dispatchRemoveItem({ section, id: body.resource.id });
-
-      repopulatePage('movieFileDeleted');
     }
   };
 

frontend/src/Content/Images/Icons/manifest.json

@@ -15,5 +15,5 @@
     "start_url": "../../../../",
     "theme_color": "#3a3f51",
     "background_color": "#3a3f51",
-    "display": "minimal-ui"
+    "display": "standalone"
 }

frontend/src/Diag/ConsoleApi.js

@@ -1,120 +0,0 @@
-import createAjaxRequest from 'Utilities/createAjaxRequest';
-
-// This file contains some helpers for power users in a browser console
-
-let hasWarned = false;
-
-function checkActivationWarning() {
-  if (!hasWarned) {
-    console.log('Activated RadarrApi console helpers.');
-    console.warn('Be warned: There will be no further confirmation checks.');
-    hasWarned = true;
-  }
-}
-
-function attachAsyncActions(promise) {
-  promise.filter = function() {
-    const args = arguments;
-    const res = this.then((d) => d.filter(...args));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.map = function() {
-    const args = arguments;
-    const res = this.then((d) => d.map(...args));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.all = function() {
-    const res = this.then((d) => Promise.all(d));
-    attachAsyncActions(res);
-    return res;
-  };
-
-  promise.forEach = function(action) {
-    const res = this.then((d) => Promise.all(d.map(action)));
-    attachAsyncActions(res);
-    return res;
-  };
-}
-
-class ResourceApi {
-  constructor(api, url) {
-    this.api = api;
-    this.url = url;
-  }
-
-  single(id) {
-    return this.api.fetch(`${this.url}/${id}`);
-  }
-
-  all() {
-    return this.api.fetch(this.url);
-  }
-
-  filter(pred) {
-    return this.all().filter(pred);
-  }
-
-  update(resource) {
-    return this.api.fetch(`${this.url}/${resource.id}`, { method: 'PUT', data: resource });
-  }
-
-  delete(resource) {
-    if (typeof resource === 'object' && resource !== null && resource.id) {
-      resource = resource.id;
-    }
-
-    if (!resource || !Number.isInteger(resource)) {
-      throw Error('Invalid resource', resource);
-    }
-
-    return this.api.fetch(`${this.url}/${resource}`, { method: 'DELETE' });
-  }
-
-  fetch(url, options) {
-    return this.api.fetch(`${this.url}${url}`, options);
-  }
-}
-
-class ConsoleApi {
-  constructor() {
-    this.movie = new ResourceApi(this, '/movie');
-  }
-
-  resource(url) {
-    return new ResourceApi(this, url);
-  }
-
-  fetch(url, options) {
-    checkActivationWarning();
-
-    options = options || {};
-
-    const req = {
-      url,
-      method: options.method || 'GET'
-    };
-
-    if (options.data) {
-      req.dataType = 'json';
-      req.data = JSON.stringify(options.data);
-    }
-
-    const promise = createAjaxRequest(req).request;
-
-    promise.fail((xhr) => {
-      console.error(`Failed to fetch ${url}`, xhr);
-    });
-
-    attachAsyncActions(promise);
-
-    return promise;
-  }
-}
-
-window.RadarrApi = new ConsoleApi();
-
-export default ConsoleApi;

frontend/src/DiscoverMovie/DiscoverMovieConnector.js

@@ -78,8 +78,7 @@ function createMapDispatchToProps(dispatch, props) {
 
     onImportListSyncPress() {
       dispatch(executeCommand({
-        name: commandNames.IMPORT_LIST_SYNC,
+        name: commandNames.IMPORT_LIST_SYNC
-        commandFinished: this.dispatchFetchListMovies
       }));
     }
   };

frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.css

@@ -50,7 +50,7 @@ $hoverScale: 1.05;
 .title {
   @add-mixin truncate;
 
-  background-color: var(--movieBackgroundColor);
+  background-color: #fafbfc;
   text-align: center;
   font-size: $smallFontSize;
 }
@@ -68,19 +68,6 @@ $hoverScale: 1.05;
   color: var(--white);
 }
 
-.existing {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1;
-  width: 0;
-  height: 0;
-  border-width: 25px 25px 0 0;
-  border-style: solid;
-  border-color: #37bc9b transparent transparent;
-  color: var(--white);
-}
-
 .controls {
   position: absolute;
   bottom: 10px;

frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.css.d.ts

@@ -7,7 +7,6 @@ interface CssExports {
   'controls': string;
   'editorSelect': string;
   'excluded': string;
-  'existing': string;
   'externalLinks': string;
   'link': string;
   'overlayTitle': string;

frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.js

@@ -92,7 +92,6 @@ class DiscoverMoviePoster extends Component {
       showRelativeDates,
       shortDateFormat,
       timeFormat,
-      movieRuntimeFormat,
       ...otherProps
     } = this.props;
 
@@ -111,7 +110,7 @@ class DiscoverMoviePoster extends Component {
 
     return (
       <div className={styles.content}>
-        <div className={styles.posterContainer} title={title}>
+        <div className={styles.posterContainer}>
           {
             <div className={styles.editorSelect}>
               <CheckInput
@@ -159,14 +158,6 @@ class DiscoverMoviePoster extends Component {
               />
           }
 
-          {
-            isExisting &&
-              <div
-                className={styles.existing}
-                title={translate('Existing')}
-              />
-          }
-
           <Link
             className={styles.link}
             style={elementStyle}
@@ -194,7 +185,7 @@ class DiscoverMoviePoster extends Component {
 
         {
           showTitle &&
-            <div className={styles.title} title={title}>
+            <div className={styles.title}>
               {title}
             </div>
         }
@@ -203,7 +194,6 @@ class DiscoverMoviePoster extends Component {
           showRelativeDates={showRelativeDates}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
-          movieRuntimeFormat={movieRuntimeFormat}
           {...otherProps}
         />
 
@@ -246,7 +236,6 @@ DiscoverMoviePoster.propTypes = {
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
-  movieRuntimeFormat: PropTypes.string.isRequired,
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterConnector.js

@@ -5,11 +5,9 @@ import DiscoverMoviePoster from './DiscoverMoviePoster';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.settings.ui.item.movieRuntimeFormat,
     createDimensionsSelector(),
-    (movieRuntimeFormat, dimensions) => {
+    ( dimensions) => {
       return {
-        movieRuntimeFormat,
         isSmallScreen: dimensions.isSmallScreen
       };
     }

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.css

@@ -1,5 +1,5 @@
 .info {
-  background-color: var(--movieBackgroundColor);
+  background-color: #fafbfc;
   text-align: center;
   font-size: $smallFontSize;
 }

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

@@ -1,12 +1,9 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Icon from 'Components/Icon';
 import TmdbRating from 'Components/TmdbRating';
-import { icons } from 'Helpers/Props';
 import { getMovieStatusDetails } from 'Movie/MovieStatus';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
-import translate from 'Utilities/String/translate';
 import styles from './DiscoverMoviePosterInfo.css';
 
 function DiscoverMoviePosterInfo(props) {
@@ -22,13 +19,12 @@ function DiscoverMoviePosterInfo(props) {
     sortKey,
     showRelativeDates,
     shortDateFormat,
-    timeFormat,
+    timeFormat
-    movieRuntimeFormat
   } = props;
 
   if (sortKey === 'status' && status) {
     return (
-      <div className={styles.info} title={translate('Status')}>
+      <div className={styles.info}>
         {getMovieStatusDetails(status).title}
       </div>
     );
@@ -36,7 +32,7 @@ function DiscoverMoviePosterInfo(props) {
 
   if (sortKey === 'studio' && studio) {
     return (
-      <div className={styles.info} title={translate('Studio')}>
+      <div className={styles.info}>
         {studio}
       </div>
     );
@@ -54,8 +50,8 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info} title={translate('InCinemas')}>
+      <div className={styles.info}>
-        <Icon name={icons.IN_CINEMAS} /> {inCinemasDate}
+        {`In Cinemas ${inCinemasDate}`}
       </div>
     );
   }
@@ -72,8 +68,8 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info} title={translate('DigitalRelease')}>
+      <div className={styles.info}>
-        <Icon name={icons.MOVIE_FILE} /> {digitalReleaseDate}
+        {`Digital ${digitalReleaseDate}`}
       </div>
     );
   }
@@ -90,15 +86,15 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info} title={translate('PhysicalRelease')}>
+      <div className={styles.info}>
-        <Icon name={icons.DISC} /> {physicalReleaseDate}
+        {`Released ${physicalReleaseDate}`}
       </div>
     );
   }
 
   if (sortKey === 'certification' && certification) {
     return (
-      <div className={styles.info} title={translate('Certification')}>
+      <div className={styles.info}>
         {certification}
       </div>
     );
@@ -106,8 +102,8 @@ function DiscoverMoviePosterInfo(props) {
 
   if (sortKey === 'runtime' && runtime) {
     return (
-      <div className={styles.info} title={translate('Runtime')}>
+      <div className={styles.info}>
-        {formatRuntime(runtime, movieRuntimeFormat)}
+        {formatRuntime(runtime)}
       </div>
     );
   }
@@ -115,7 +111,9 @@ function DiscoverMoviePosterInfo(props) {
   if (sortKey === 'ratings' && ratings) {
     return (
       <div className={styles.info}>
-        <TmdbRating ratings={ratings} />
+        <TmdbRating
+          ratings={ratings}
+        />
       </div>
     );
   }
@@ -135,8 +133,7 @@ DiscoverMoviePosterInfo.propTypes = {
   sortKey: PropTypes.string.isRequired,
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
+  timeFormat: PropTypes.string.isRequired
-  movieRuntimeFormat: PropTypes.string.isRequired
 };
 
 export default DiscoverMoviePosterInfo;

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -76,7 +76,6 @@ class DiscoverMovieRow extends Component {
       ratings,
       popularity,
       certification,
-      movieRuntimeFormat,
       collection,
       columns,
       isExisting,
@@ -231,7 +230,7 @@ class DiscoverMovieRow extends Component {
                   key={name}
                   className={styles[name]}
                 >
-                  {formatRuntime(runtime, movieRuntimeFormat)}
+                  {formatRuntime(runtime)}
                 </VirtualTableRowCell>
               );
             }
@@ -398,7 +397,6 @@ DiscoverMovieRow.propTypes = {
   popularity: PropTypes.number.isRequired,
   certification: PropTypes.string,
   collection: PropTypes.object,
-  movieRuntimeFormat: PropTypes.string.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,

frontend/src/DiscoverMovie/Table/DiscoverMovieRowConnector.js

@@ -5,11 +5,9 @@ import DiscoverMovieRow from './DiscoverMovieRow';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.settings.ui.item.movieRuntimeFormat,
     createDimensionsSelector(),
-    (movieRuntimeFormat, dimensions) => {
+    (dimensions) => {
       return {
-        movieRuntimeFormat,
         isSmallScreen: dimensions.isSmallScreen
       };
     }

frontend/src/FirstRun/AuthenticationRequiredModalContent.js

@@ -34,8 +34,7 @@ function AuthenticationRequiredModalContent(props) {
     authenticationMethod,
     authenticationRequired,
     username,
-    password,
+    password
-    passwordConfirmation
   } = settings;
 
   const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
@@ -64,7 +63,7 @@ function AuthenticationRequiredModalContent(props) {
           className={styles.authRequiredAlert}
           kind={kinds.WARNING}
         >
-          {translate('AuthenticationRequiredWarning')}
+          {translate('AuthenticationRequiredWarning', { appName: 'Radarr' })}
         </Alert>
 
         {
@@ -77,7 +76,7 @@ function AuthenticationRequiredModalContent(props) {
                   type={inputTypes.SELECT}
                   name="authenticationMethod"
                   values={authenticationMethodOptions}
-                  helpText={translate('AuthenticationMethodHelpText')}
+                  helpText={translate('AuthenticationMethodHelpText', { appName: 'Radarr' })}
                   helpTextWarning={authenticationMethod.value === 'none' ? translate('AuthenticationMethodHelpTextWarning') : undefined}
                   helpLink="https://wiki.servarr.com/radarr/faq#forced-authentication"
                   onChange={onInputChange}
@@ -121,18 +120,6 @@ function AuthenticationRequiredModalContent(props) {
                   {...password}
                 />
               </FormGroup>
-
-              <FormGroup>
-                <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.PASSWORD}
-                  name="passwordConfirmation"
-                  onChange={onInputChange}
-                  helpTextWarning={passwordConfirmation?.value ? undefined : translate('AuthenticationRequiredPasswordConfirmationHelpTextWarning')}
-                  {...passwordConfirmation}
-                />
-              </FormGroup>
             </div> :
             null
         }

frontend/src/Helpers/Props/sizes.js

@@ -3,6 +3,5 @@ export const SMALL = 'small';
 export const MEDIUM = 'medium';
 export const LARGE = 'large';
 export const EXTRA_LARGE = 'extraLarge';
-export const EXTRA_EXTRA_LARGE = 'extraExtraLarge';
 
-export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE, EXTRA_EXTRA_LARGE];
+export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE];

frontend/src/InteractiveSearch/InteractiveSearchContent.js

@@ -3,16 +3,13 @@ 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 { 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';
+import styles from './InteractiveSearchContent.css';
 
 const columns = [
   {
@@ -27,6 +24,23 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
+  },
+  {
+    name: 'rejections',
+    label: React.createElement(Icon, {
+      name: icons.DANGER,
+      title: () => translate('Rejections')
+    }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
+  },
   {
     name: 'title',
     label: () => translate('Title'),
@@ -70,6 +84,12 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'customFormat',
+    label: () => translate('Formats'),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'customFormatScore',
     label: React.createElement(Icon, {
@@ -87,27 +107,10 @@ const columns = [
     }),
     isSortable: true,
     isVisible: true
-  },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
-  {
-    name: 'rejections',
-    label: React.createElement(Icon, {
-      name: icons.DANGER,
-      title: () => translate('Rejections')
-    }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
   }
 ];
 
-function InteractiveSearch(props) {
+function InteractiveSearchContent(props) {
   const {
     searchPayload,
     isFetching,
@@ -115,36 +118,18 @@ function InteractiveSearch(props) {
     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
       }
@@ -218,23 +203,19 @@ function InteractiveSearch(props) {
   );
 }
 
-InteractiveSearch.propTypes = {
+InteractiveSearchContent.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;
+export default InteractiveSearchContent;

frontend/src/InteractiveSearch/InteractiveSearchContentConnector.js

@@ -2,11 +2,10 @@ 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';
+import InteractiveSearchContent from './InteractiveSearchContent';
 
 function createMapStateToProps(appState) {
   return createSelector(
@@ -30,12 +29,8 @@ function createMapDispatchToProps(dispatch, props) {
       dispatch(releaseActions.fetchReleases(payload));
     },
 
-    dispatchFetchMovieHistory({ movieId }) {
+    dispatchClearReleases(payload) {
-      dispatch(fetchMovieHistory({ movieId }));
+      dispatch(releaseActions.clearReleases(payload));
-    },
-
-    dispatchClearMovieHistory() {
-      dispatch(clearMovieHistory());
     },
 
     onSortPress(sortKey, sortDirection) {
@@ -43,7 +38,8 @@ function createMapDispatchToProps(dispatch, props) {
     },
 
     onFilterSelect(selectedFilterKey) {
-      dispatch(releaseActions.setReleasesFilter({ selectedFilterKey }));
+      const action = releaseActions.setReleasesFilter;
+      dispatch(action({ selectedFilterKey }));
     },
 
     onGrabPress(payload) {
@@ -52,7 +48,7 @@ function createMapDispatchToProps(dispatch, props) {
   };
 }
 
-class InteractiveSearchConnector extends Component {
+class InteractiveSearchContentConnector extends Component {
 
   //
   // Lifecycle
@@ -61,8 +57,7 @@ class InteractiveSearchConnector extends Component {
     const {
       searchPayload,
       isPopulated,
-      dispatchFetchReleases,
+      dispatchFetchReleases
-      dispatchFetchMovieHistory
     } = this.props;
 
     // If search results are not yet isPopulated fetch them,
@@ -70,12 +65,6 @@ class InteractiveSearchConnector extends Component {
     if (!isPopulated) {
       dispatchFetchReleases(searchPayload);
     }
-
-    dispatchFetchMovieHistory(searchPayload);
-  }
-
-  componentWillUnmount() {
-    this.props.dispatchClearMovieHistory();
   }
 
   //
@@ -84,26 +73,24 @@ class InteractiveSearchConnector extends Component {
   render() {
     const {
       dispatchFetchReleases,
-      dispatchFetchMovieHistory,
+      dispatchClearReleases,
-      dispatchClearMovieHistory,
       ...otherProps
     } = this.props;
 
     return (
 
-      <InteractiveSearch
+      <InteractiveSearchContent
         {...otherProps}
       />
     );
   }
 }
 
-InteractiveSearchConnector.propTypes = {
+InteractiveSearchContentConnector.propTypes = {
   searchPayload: PropTypes.object.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   dispatchFetchReleases: PropTypes.func.isRequired,
-  dispatchFetchMovieHistory: PropTypes.func.isRequired,
+  dispatchClearReleases: PropTypes.func.isRequired
-  dispatchClearMovieHistory: PropTypes.func.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(InteractiveSearchConnector);
+export default connect(createMapStateToProps, createMapDispatchToProps)(InteractiveSearchContentConnector);

frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js

@@ -4,7 +4,7 @@ import FilterMenu from 'Components/Menu/FilterMenu';
 import PageMenuButton from 'Components/Menu/PageMenuButton';
 import { align } from 'Helpers/Props';
 import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector';
-import styles from './InteractiveSearch.css';
+import styles from './InteractiveSearchContent.css';
 
 function InteractiveSearchFilterMenu(props) {
   const {

frontend/src/InteractiveSearch/InteractiveSearchRow.css

@@ -1,29 +1,23 @@
-.protocol {
+.cell {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
+}
+
+.protocol {
+  composes: cell;
 
   width: 80px;
 }
 
-.titleContent {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  word-break: break-all;
-}
-
 .indexer {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   width: 85px;
 }
 
 .quality,
+.customFormat,
 .languages {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
-}
-
-.quality {
-  white-space: nowrap;
 }
 
 .languages {
@@ -31,7 +25,7 @@
 }
 
 .customFormatScore {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   width: 55px;
   font-weight: bold;
@@ -39,28 +33,31 @@
 }
 
 .rejected,
-.indexerFlags,
+.indexerFlags {
-.download {
+  composes: cell;
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 50px;
 }
 
 .age,
 .size {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   white-space: nowrap;
 }
 
 .peers {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   width: 75px;
 }
 
+.titleContent {
+  overflow-wrap: break-word;
+}
+
 .history {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   width: 75px;
 }
@@ -70,7 +67,7 @@
 }
 
 .download {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell;
 
   width: 80px;
 }

frontend/src/InteractiveSearch/InteractiveSearchRow.css.d.ts

@@ -3,6 +3,8 @@
 interface CssExports {
   'age': string;
   'blocklist': string;
+  'cell': string;
+  'customFormat': string;
   'customFormatScore': string;
   'download': string;
   'downloadIcon': string;

frontend/src/InteractiveSearch/InteractiveSearchRow.tsx

@@ -133,9 +133,9 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
     longDateFormat,
     timeFormat,
     grabError,
-    historyGrabbedData = {} as MovieHistory,
+    historyGrabbedData,
-    historyFailedData = {} as MovieHistory,
+    historyFailedData,
-    blocklistData = {} as MovieBlocklist,
+    blocklistData,
     searchPayload,
     onGrabPress,
   } = props;
@@ -199,6 +199,53 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
         {formatAge(age, ageHours, ageMinutes)}
       </TableRowCell>
 
+      <TableRowCell className={styles.download}>
+        <SpinnerIconButton
+          name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
+          kind={getDownloadKind(isGrabbed, grabError)}
+          title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
+          isSpinning={isGrabbing}
+          onPress={onGrabPressWrapper}
+        />
+
+        <Link
+          className={styles.manualDownloadContent}
+          title={translate('OverrideAndAddToDownloadQueue')}
+          onPress={onOverridePress}
+        >
+          <div className={styles.manualDownloadContent}>
+            <Icon
+              className={styles.interactiveIcon}
+              name={icons.INTERACTIVE}
+              size={12}
+            />
+
+            <Icon
+              className={styles.downloadIcon}
+              name={icons.CIRCLE_DOWN}
+              size={10}
+            />
+          </div>
+        </Link>
+      </TableRowCell>
+
+      <TableRowCell className={styles.rejected}>
+        {rejections.length ? (
+          <Popover
+            anchor={<Icon name={icons.DANGER} kind={kinds.DANGER} />}
+            title={translate('ReleaseRejected')}
+            body={
+              <ul>
+                {rejections.map((rejection, index) => {
+                  return <li key={index}>{rejection}</li>;
+                })}
+              </ul>
+            }
+            position={tooltipPositions.RIGHT}
+          />
+        ) : null}
+      </TableRowCell>
+
       <TableRowCell>
         <div className={styles.titleContent}>
           <Link to={infoUrl} title={title}>
@@ -266,7 +313,11 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.quality}>
-        <MovieQuality quality={quality} showRevision={true} />
+        <MovieQuality quality={quality} />
+      </TableRowCell>
+
+      <TableRowCell className={styles.customFormat}>
+        <MovieFormats formats={customFormats} />
       </TableRowCell>
 
       <TableRowCell className={styles.customFormatScore}>
@@ -297,53 +348,6 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
         ) : null}
       </TableRowCell>
 
-      <TableRowCell className={styles.rejected}>
-        {rejections.length ? (
-          <Popover
-            anchor={<Icon name={icons.DANGER} kind={kinds.DANGER} />}
-            title={translate('ReleaseRejected')}
-            body={
-              <ul>
-                {rejections.map((rejection, index) => {
-                  return <li key={index}>{rejection}</li>;
-                })}
-              </ul>
-            }
-            position={tooltipPositions.LEFT}
-          />
-        ) : null}
-      </TableRowCell>
-
-      <TableRowCell className={styles.download}>
-        <SpinnerIconButton
-          name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-          kind={getDownloadKind(isGrabbed, grabError)}
-          title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
-          isSpinning={isGrabbing}
-          onPress={onGrabPressWrapper}
-        />
-
-        <Link
-          className={styles.manualDownloadContent}
-          title={translate('OverrideAndAddToDownloadQueue')}
-          onPress={onOverridePress}
-        >
-          <div className={styles.manualDownloadContent}>
-            <Icon
-              className={styles.interactiveIcon}
-              name={icons.INTERACTIVE}
-              size={12}
-            />
-
-            <Icon
-              className={styles.downloadIcon}
-              name={icons.CIRCLE_DOWN}
-              size={10}
-            />
-          </div>
-        </Link>
-      </TableRowCell>
-
       <ConfirmModal
         isOpen={isConfirmGrabModalOpen}
         kind={kinds.WARNING}

frontend/src/InteractiveSearch/InteractiveSearchTable.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import InteractiveSearchContentConnector from './InteractiveSearchContentConnector';
+
+function InteractiveSearchTable(props) {
+
+  return (
+    <InteractiveSearchContentConnector
+      searchPayload={props}
+    />
+  );
+}
+
+InteractiveSearchTable.propTypes = {
+};
+
+export default InteractiveSearchTable;

frontend/src/Movie/Details/Credits/Cast/MovieCastPoster.js

@@ -1,8 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import { icons } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCastPoster extends Component {
@@ -57,7 +60,7 @@ class MovieCastPoster extends Component {
       images,
       posterWidth,
       posterHeight,
-      importList
+      importListId
     } = this.props;
 
     const {
@@ -66,31 +69,36 @@ class MovieCastPoster extends Component {
 
     const elementStyle = {
       width: `${posterWidth}px`,
-      height: `${posterHeight}px`,
+      height: `${posterHeight}px`
-      borderRadius: '5px'
     };
 
     const contentStyle = {
       width: `${posterWidth}px`
     };
 
-    const monitored = importList !== undefined && importList.enabled && importList.enableAuto;
-    const importListId = importList ? importList.id : 0;
-
     return (
       <div
         className={styles.content}
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <Label className={styles.controls}>
-            <MonitorToggleButton
+            {
-              className={styles.action}
+              importListId > 0 ?
-              monitored={monitored}
+                <IconButton
-              size={20}
+                  className={styles.action}
-              onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
+                  name={icons.EDIT}
-            />
+                  title={translate('EditPerson')}
-          </div>
+                  onPress={this.onEditImportListPress}
+                /> :
+                <IconButton
+                  className={styles.action}
+                  name={icons.ADD}
+                  title={translate('FollowPerson')}
+                  onPress={this.onAddImportListPress}
+                />
+            }
+          </Label>
 
           <div
             style={elementStyle}
@@ -140,8 +148,12 @@ MovieCastPoster.propTypes = {
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   posterWidth: PropTypes.number.isRequired,
   posterHeight: PropTypes.number.isRequired,
-  importList: PropTypes.object,
+  importListId: PropTypes.number.isRequired,
   onImportListSelect: PropTypes.func.isRequired
 };
 
+MovieCastPoster.defaultProps = {
+  importListId: 0
+};
+
 export default MovieCastPoster;

frontend/src/Movie/Details/Credits/Crew/MovieCrewPoster.js

@@ -1,8 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import { icons } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCrewPoster extends Component {
@@ -57,7 +60,7 @@ class MovieCrewPoster extends Component {
       images,
       posterWidth,
       posterHeight,
-      importList
+      importListId
     } = this.props;
 
     const {
@@ -66,31 +69,36 @@ class MovieCrewPoster extends Component {
 
     const elementStyle = {
       width: `${posterWidth}px`,
-      height: `${posterHeight}px`,
+      height: `${posterHeight}px`
-      borderRadius: '5px'
     };
 
     const contentStyle = {
       width: `${posterWidth}px`
     };
 
-    const monitored = importList !== undefined && importList.enabled && importList.enableAuto;
-    const importListId = importList ? importList.id : 0;
-
     return (
       <div
         className={styles.content}
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <Label className={styles.controls}>
-            <MonitorToggleButton
+            {
-              className={styles.action}
+              importListId > 0 ?
-              monitored={monitored}
+                <IconButton
-              size={20}
+                  className={styles.action}
-              onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
+                  name={icons.EDIT}
-            />
+                  title={translate('EditPerson')}
-          </div>
+                  onPress={this.onEditImportListPress}
+                /> :
+                <IconButton
+                  className={styles.action}
+                  name={icons.ADD}
+                  title={translate('FollowPerson')}
+                  onPress={this.onAddImportListPress}
+                />
+            }
+          </Label>
 
           <div
             style={elementStyle}
@@ -140,8 +148,12 @@ MovieCrewPoster.propTypes = {
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   posterWidth: PropTypes.number.isRequired,
   posterHeight: PropTypes.number.isRequired,
-  importList: PropTypes.object,
+  importListId: PropTypes.number.isRequired,
   onImportListSelect: PropTypes.func.isRequired
 };
 
+MovieCrewPoster.defaultProps = {
+  importListId: 0
+};
+
 export default MovieCrewPoster;

frontend/src/Movie/Details/Credits/Crew/MovieCrewPostersConnector.js

@@ -5,29 +5,6 @@ import { createSelector } from 'reselect';
 import MovieCreditPosters from '../MovieCreditPosters';
 import MovieCrewPoster from './MovieCrewPoster';
 
-function crewSort(a, b) {
-  const jobOrder = ['Director', 'Writer', 'Producer', 'Executive Producer', 'Director of Photography'];
-
-  const indexA = jobOrder.indexOf(a.job);
-  const indexB = jobOrder.indexOf(b.job);
-
-  if (indexA === -1 && indexB === -1) {
-    return 0;
-  } else if (indexA === -1) {
-    return 1;
-  } else if (indexB === -1) {
-    return -1;
-  }
-
-  if (indexA < indexB) {
-    return -1;
-  } else if (indexA > indexB) {
-    return 1;
-  }
-
-  return 0;
-}
-
 function createMapStateToProps() {
   return createSelector(
     (state) => state.movieCredits.items,
@@ -40,10 +17,8 @@ function createMapStateToProps() {
         return acc;
       }, []);
 
-      const sortedCrew = crew.sort(crewSort);
-
       return {
-        items: _.uniqBy(sortedCrew, 'personName')
+        items: crew
       };
     }
   );

frontend/src/Movie/Details/Credits/MovieCreditPoster.css

@@ -1,13 +1,17 @@
 $hoverScale: 1.05;
 
 .content {
-  border-radius: '5px';
   transition: all 200ms ease-in;
 
   &:hover {
     z-index: 2;
     box-shadow: 0 0 12px var(--black);
     transition: all 200ms ease-in;
+
+    .controls {
+      opacity: 0.9;
+      transition: opacity 200ms linear 150ms;
+    }
   }
 }
 
@@ -46,18 +50,22 @@ $hoverScale: 1.05;
 
 .controls {
   position: absolute;
-  top: 10px;
+  bottom: 10px;
+  left: 10px;
   z-index: 3;
+  border-radius: 4px;
+  background-color: #707070;
+  color: var(--white);
+  font-size: $smallFontSize;
+  opacity: 0;
+  transition: opacity 0;
 }
 
 .action {
-  composes: toggleButton from '~Components/MonitorToggleButton.css';
+  composes: button from '~Components/Link/IconButton.css';
-
-  width: 25px;
-  color: var(--white);
 
   &:hover {
-    color: var(--iconButtonHoverLightColor);
+    color: var(--radarrYellow);
   }
 }
 

frontend/src/Movie/Details/Credits/MovieCreditPosterConnector.js

@@ -1,19 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 import { selectImportListSchema, setImportListFieldValue, setImportListValue } from 'Store/Actions/settingsActions';
 import createMovieCreditListSelector from 'Store/Selectors/createMovieCreditListSelector';
 
 function createMapStateToProps() {
-  return createSelector(
+  return createMovieCreditListSelector();
-    createMovieCreditListSelector(),
-    (importList) => {
-      return {
-        importList
-      };
-    }
-  );
 }
 
 const mapDispatchToProps = {
@@ -28,7 +20,7 @@ class MovieCreditPosterConnector extends Component {
   // Listeners
 
   onImportListSelect = () => {
-    this.props.selectImportListSchema({ implementation: 'TMDbPersonImport', implementationName: 'TMDb Person', presetName: undefined });
+    this.props.selectImportListSchema({ implementation: 'TMDbPersonImport', presetName: undefined });
     this.props.setImportListFieldValue({ name: 'personId', value: this.props.tmdbId.toString() });
     this.props.setImportListValue({ name: 'name', value: `${this.props.personName} - ${this.props.tmdbId}` });
   };

frontend/src/Movie/Details/Credits/MovieCreditPosters.css

@@ -2,16 +2,6 @@
   flex: 1 0 auto;
 }
 
-.movie {
-  padding: 10px;
-}
-
 .container {
   padding: 10px;
 }
-
-.sliderContainer {
-  --swiper-navigation-color: var(--white);
-
-  display: block;
-}

frontend/src/Movie/Details/Credits/MovieCreditPosters.css.d.ts

@@ -3,8 +3,6 @@
 interface CssExports {
   'container': string;
   'grid': string;
-  'movie': string;
-  'sliderContainer': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Movie/Details/Credits/MovieCreditPosters.js

@@ -1,19 +1,34 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { Navigation } from 'swiper';
+import { Grid, WindowScroller } from 'react-virtualized';
-import { Swiper, SwiperSlide } from 'swiper/react';
+import Measure from 'Components/Measure';
 import dimensions from 'Styles/Variables/dimensions';
+import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder';
 import MovieCreditPosterConnector from './MovieCreditPosterConnector';
 import styles from './MovieCreditPosters.css';
 
-// Import Swiper styles
-import 'swiper/css';
-import 'swiper/css/navigation';
-
 // Poster container dimensions
 const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
 const columnPaddingSmallScreen = parseInt(dimensions.movieIndexColumnPaddingSmallScreen);
 
+const additionalColumnCount = {
+  small: 3,
+  medium: 2,
+  large: 1
+};
+
+function calculateColumnWidth(width, posterSize, isSmallScreen) {
+  const maxiumColumnWidth = isSmallScreen ? 172 : 182;
+  const columns = Math.floor(width / maxiumColumnWidth);
+  const remainder = width % maxiumColumnWidth;
+
+  if (remainder === 0 && posterSize === 'large') {
+    return maxiumColumnWidth;
+  }
+
+  return Math.floor(width / (columns + additionalColumnCount[posterSize]));
+}
+
 function calculateRowHeight(posterHeight, isSmallScreen) {
   const titleHeight = 19;
   const characterHeight = 19;
@@ -28,6 +43,10 @@ function calculateRowHeight(posterHeight, isSmallScreen) {
   return heights.reduce((acc, height) => acc + height, 0);
 }
 
+function calculatePosterHeight(posterWidth) {
+  return Math.ceil((250 / 170) * posterWidth);
+}
+
 class MovieCreditPosters extends Component {
 
   //
@@ -44,12 +63,61 @@ class MovieCreditPosters extends Component {
       posterHeight: 238,
       rowHeight: calculateRowHeight(238, props.isSmallScreen)
     };
+
+    this._isInitialized = false;
+    this._grid = null;
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    const {
+      items
+    } = this.props;
+
+    const {
+      width,
+      columnWidth,
+      columnCount,
+      rowHeight
+    } = this.state;
+
+    if (this._grid &&
+        (prevState.width !== width ||
+            prevState.columnWidth !== columnWidth ||
+            prevState.columnCount !== columnCount ||
+            prevState.rowHeight !== rowHeight ||
+            hasDifferentItemsOrOrder(prevProps.items, items))) {
+      // recomputeGridSize also forces Grid to discard its cache of rendered cells
+      this._grid.recomputeGridSize();
+    }
   }
 
   //
-  // Render
+  // Control
 
-  render() {
+  setGridRef = (ref) => {
+    this._grid = ref;
+  };
+
+  calculateGrid = (width = this.state.width, isSmallScreen) => {
+
+    const padding = isSmallScreen ? columnPaddingSmallScreen : columnPadding;
+    const columnWidth = calculateColumnWidth(width, 'small', isSmallScreen);
+    const columnCount = Math.max(Math.floor(width / columnWidth), 1);
+    const posterWidth = columnWidth - padding;
+    const posterHeight = calculatePosterHeight(posterWidth);
+    const rowHeight = calculateRowHeight(posterHeight, isSmallScreen);
+
+    this.setState({
+      width,
+      columnWidth,
+      columnCount,
+      posterWidth,
+      posterHeight,
+      rowHeight
+    });
+  };
+
+  cellRenderer = ({ key, rowIndex, columnIndex, style }) => {
     const {
       items,
       itemComponent
@@ -58,43 +126,99 @@ class MovieCreditPosters extends Component {
     const {
       posterWidth,
       posterHeight,
+      columnCount
+    } = this.state;
+
+    const movieIdx = rowIndex * columnCount + columnIndex;
+    const movie = items[movieIdx];
+
+    if (!movie) {
+      return null;
+    }
+
+    return (
+      <div
+        className={styles.container}
+        key={key}
+        style={style}
+      >
+        <MovieCreditPosterConnector
+          key={movie.order}
+          component={itemComponent}
+          posterWidth={posterWidth}
+          posterHeight={posterHeight}
+          tmdbId={movie.personTmdbId}
+          personName={movie.personName}
+          job={movie.job}
+          character={movie.character}
+          images={movie.images}
+        />
+      </div>
+    );
+  };
+
+  //
+  // Listeners
+
+  onMeasure = ({ width }) => {
+    this.calculateGrid(width, this.props.isSmallScreen);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      items
+    } = this.props;
+
+    const {
+      width,
+      columnWidth,
+      columnCount,
       rowHeight
     } = this.state;
 
-    return (
+    const rowCount = Math.ceil(items.length / columnCount);
 
-      <div className={styles.sliderContainer}>
+    return (
-        <Swiper
+      <Measure
-          slidesPerView='auto'
+        whitelist={['width']}
-          spaceBetween={10}
+        onMeasure={this.onMeasure}
-          slidesPerGroup={3}
+      >
-          navigation={true}
+        <WindowScroller
-          loop={false}
+          scrollElement={undefined}
-          loopFillGroupWithBlank={true}
-          className="mySwiper"
-          modules={[Navigation]}
-          onInit={(swiper) => {
-            swiper.navigation.init();
-            swiper.navigation.update();
-          }}
         >
-          {items.map((credit) => (
+          {({ height, registerChild, onChildScroll, scrollTop }) => {
-            <SwiperSlide key={credit.id} style={{ width: posterWidth, height: rowHeight }}>
+            if (!height) {
-              <MovieCreditPosterConnector
+              return <div />;
-                key={credit.id}
+            }
-                component={itemComponent}
+
-                posterWidth={posterWidth}
+            return (
-                posterHeight={posterHeight}
+              <div ref={registerChild}>
-                tmdbId={credit.personTmdbId}
+                <Grid
-                personName={credit.personName}
+                  ref={this.setGridRef}
-                job={credit.job}
+                  className={styles.grid}
-                character={credit.character}
+                  autoHeight={true}
-                images={credit.images}
+                  height={height}
-              />
+                  columnCount={columnCount}
-            </SwiperSlide>
+                  columnWidth={columnWidth}
-          ))}
+                  rowCount={rowCount}
-        </Swiper>
+                  rowHeight={rowHeight}
-      </div>
+                  width={width}
+                  onScroll={onChildScroll}
+                  scrollTop={scrollTop}
+                  overscanRowCount={2}
+                  cellRenderer={this.cellRenderer}
+                  scrollToAlignment={'start'}
+                  isScrollingOptOut={true}
+                />
+              </div>
+            );
+          }
+          }
+        </WindowScroller>
+      </Measure>
     );
   }
 }

frontend/src/Movie/Details/MovieAlternateTitles.css

@@ -0,0 +1,3 @@
+.alternateTitle {
+  white-space: nowrap;
+}

frontend/src/Movie/Details/MovieAlternateTitles.js

@@ -0,0 +1,28 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import styles from './MovieAlternateTitles.css';
+
+function MovieAlternateTitles({ alternateTitles }) {
+  return (
+    <ul>
+      {
+        alternateTitles.filter((x, i, a) => a.indexOf(x) === i).map((alternateTitle) => {
+          return (
+            <li
+              key={alternateTitle}
+              className={styles.alternateTitle}
+            >
+              {alternateTitle}
+            </li>
+          );
+        })
+      }
+    </ul>
+  );
+}
+
+MovieAlternateTitles.propTypes = {
+  alternateTitles: PropTypes.arrayOf(PropTypes.string).isRequired
+};
+
+export default MovieAlternateTitles;

frontend/src/Movie/Details/MovieDetails.css

@@ -5,7 +5,7 @@
 .header {
   position: relative;
   width: 100%;
-  height: 425px;
+  height: 375px;
 }
 
 .errorMessage {
@@ -39,11 +39,10 @@
 }
 
 .poster {
-  z-index: 2;
   flex-shrink: 0;
   margin-right: 35px;
-  width: 250px;
+  width: 217px;
-  height: 368px;
+  height: 319px;
 }
 
 .info {

frontend/src/Movie/Details/MovieDetails.js

@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
 import TextTruncate from 'react-text-truncate';
 import Alert from 'Components/Alert';
-import FieldSet from 'Components/FieldSet';
 import Icon from 'Components/Icon';
 import ImdbRating from 'Components/ImdbRating';
 import InfoLabel from 'Components/InfoLabel';
@@ -23,11 +23,12 @@ import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, sizes, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
+import InteractiveSearchFilterMenuConnector from 'InteractiveSearch/InteractiveSearchFilterMenuConnector';
+import InteractiveSearchTable from 'InteractiveSearch/InteractiveSearchTable';
 import DeleteMovieModal from 'Movie/Delete/DeleteMovieModal';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
-import MovieHistoryModal from 'Movie/History/MovieHistoryModal';
+import MovieHistoryTable from 'Movie/History/MovieHistoryTable';
 import MoviePoster from 'Movie/MoviePoster';
-import MovieInteractiveSearchModalConnector from 'Movie/Search/MovieInteractiveSearchModalConnector';
 import MovieFileEditorTable from 'MovieFile/Editor/MovieFileEditorTable';
 import ExtraFileTable from 'MovieFile/Extras/ExtraFileTable';
 import OrganizePreviewModalConnector from 'Organize/OrganizePreviewModalConnector';
@@ -37,6 +38,8 @@ import * as keyCodes from 'Utilities/Constants/keyCodes';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import formatBytes from 'Utilities/Number/formatBytes';
 import translate from 'Utilities/String/translate';
+import selectAll from 'Utilities/Table/selectAll';
+import toggleSelected from 'Utilities/Table/toggleSelected';
 import MovieCollectionLabelConnector from './../MovieCollectionLabelConnector';
 import MovieCastPostersConnector from './Credits/Cast/MovieCastPostersConnector';
 import MovieCrewPostersConnector from './Credits/Crew/MovieCrewPostersConnector';
@@ -54,6 +57,14 @@ function getFanartUrl(images) {
   return _.find(images, { coverType: 'fanart' })?.url;
 }
 
+function getExpandedState(newState) {
+  return {
+    allExpanded: newState.allSelected,
+    allCollapsed: newState.allUnselected,
+    expandedState: newState.selectedState
+  };
+}
+
 class MovieDetails extends Component {
 
   //
@@ -67,8 +78,10 @@ class MovieDetails extends Component {
       isEditMovieModalOpen: false,
       isDeleteMovieModalOpen: false,
       isInteractiveImportModalOpen: false,
-      isInteractiveSearchModalOpen: false,
+      allExpanded: false,
-      isMovieHistoryModalOpen: false,
+      allCollapsed: false,
+      expandedState: {},
+      selectedTabIndex: 0,
       overviewHeight: 0,
       titleWidth: 0
     };
@@ -101,6 +114,10 @@ class MovieDetails extends Component {
     this.setState({ isOrganizeModalOpen: false });
   };
 
+  onManageEpisodesPress = () => {
+    this.setState({ isManageEpisodesOpen: true });
+  };
+
   onInteractiveImportPress = () => {
     this.setState({ isInteractiveImportModalOpen: true });
   };
@@ -117,14 +134,6 @@ class MovieDetails extends Component {
     this.setState({ isEditMovieModalOpen: false });
   };
 
-  onInteractiveSearchPress = () => {
-    this.setState({ isInteractiveSearchModalOpen: true });
-  };
-
-  onInteractiveSearchModalClose = () => {
-    this.setState({ isInteractiveSearchModalOpen: false });
-  };
-
   onDeleteMoviePress = () => {
     this.setState({
       isEditMovieModalOpen: false,
@@ -136,12 +145,27 @@ class MovieDetails extends Component {
     this.setState({ isDeleteMovieModalOpen: false });
   };
 
-  onMovieHistoryPress = () => {
+  onExpandAllPress = () => {
-    this.setState({ isMovieHistoryModalOpen: true });
+    const {
+      allExpanded,
+      expandedState
+    } = this.state;
+
+    this.setState(getExpandedState(selectAll(expandedState, !allExpanded)));
   };
 
-  onMovieHistoryModalClose = () => {
+  onExpandPress = (seasonNumber, isExpanded) => {
-    this.setState({ isMovieHistoryModalOpen: false });
+    this.setState((state) => {
+      const convertedState = {
+        allSelected: state.allExpanded,
+        allUnselected: state.allCollapsed,
+        selectedState: state.expandedState
+      };
+
+      const newState = toggleSelected(convertedState, [], seasonNumber, isExpanded, false);
+
+      return getExpandedState(newState);
+    });
   };
 
   onMeasure = ({ height }) => {
@@ -180,12 +204,7 @@ class MovieDetails extends Component {
     if (
       touchStart < 50 ||
       this.props.isSidebarVisible ||
-      this.state.isOrganizeModalOpen ||
+      this.state.isEventModalOpen
-      this.state.isEditMovieModalOpen ||
-      this.state.isDeleteMovieModalOpen ||
-      this.state.isInteractiveImportModalOpen ||
-      this.state.isInteractiveSearchModalOpen ||
-      this.state.isMovieHistoryModalOpen
     ) {
       return;
     }
@@ -220,6 +239,10 @@ class MovieDetails extends Component {
     }
   };
 
+  onTabSelect = (index, lastIndex) => {
+    this.setState({ selectedTabIndex: index });
+  };
+
   //
   // Render
 
@@ -263,7 +286,7 @@ class MovieDetails extends Component {
       onMonitorTogglePress,
       onRefreshPress,
       onSearchPress,
-      queueItem,
+      queueItems,
       movieRuntimeFormat
     } = this.props;
 
@@ -272,10 +295,9 @@ class MovieDetails extends Component {
       isEditMovieModalOpen,
       isDeleteMovieModalOpen,
       isInteractiveImportModalOpen,
-      isInteractiveSearchModalOpen,
-      isMovieHistoryModalOpen,
       overviewHeight,
-      titleWidth
+      titleWidth,
+      selectedTabIndex
     } = this.state;
 
     const fanartUrl = getFanartUrl(images);
@@ -302,14 +324,6 @@ class MovieDetails extends Component {
               onPress={onSearchPress}
             />
 
-            <PageToolbarButton
-              label={translate('InteractiveSearch')}
-              iconName={icons.INTERACTIVE}
-              isSpinning={isSearching}
-              title={undefined}
-              onPress={this.onInteractiveSearchPress}
-            />
-
             <PageToolbarSeparator />
 
             <PageToolbarButton
@@ -320,17 +334,11 @@ class MovieDetails extends Component {
             />
 
             <PageToolbarButton
-              label={translate('ManageFiles')}
+              label={translate('ManualImport')}
-              iconName={icons.MOVIE_FILE}
+              iconName={icons.INTERACTIVE}
               onPress={this.onInteractiveImportPress}
             />
 
-            <PageToolbarButton
-              label={translate('History')}
-              iconName={icons.HISTORY}
-              onPress={this.onMovieHistoryPress}
-            />
-
             <PageToolbarSeparator />
 
             <PageToolbarButton
@@ -536,7 +544,7 @@ class MovieDetails extends Component {
                         hasMovieFiles={hasMovieFiles}
                         monitored={monitored}
                         isAvailable={isAvailable}
-                        queueItem={queueItem}
+                        queueItem={(queueItems.length > 0) ? queueItems[0] : null}
                       />
                     </span>
                   </InfoLabel>
@@ -646,33 +654,101 @@ class MovieDetails extends Component {
                 null
             }
 
-            <FieldSet legend={translate('Files')}>
+            <Tabs selectedIndex={selectedTabIndex} onSelect={this.onTabSelect}>
-              <MovieFileEditorTable
+              <TabList
-                movieId={id}
+                className={styles.tabList}
-              />
+              >
+                <Tab
+                  className={styles.tab}
+                  selectedClassName={styles.selectedTab}
+                >
+                  {translate('History')}
+                </Tab>
 
-              <ExtraFileTable
+                <Tab
-                movieId={id}
+                  className={styles.tab}
-              />
+                  selectedClassName={styles.selectedTab}
-            </FieldSet>
+                >
+                  {translate('Search')}
+                </Tab>
 
-            <FieldSet legend={translate('Cast')}>
+                <Tab
-              <MovieCastPostersConnector
+                  className={styles.tab}
-                isSmallScreen={isSmallScreen}
+                  selectedClassName={styles.selectedTab}
-              />
+                >
-            </FieldSet>
+                  {translate('Files')}
+                </Tab>
 
-            <FieldSet legend={translate('Crew')}>
+                <Tab
-              <MovieCrewPostersConnector
+                  className={styles.tab}
-                isSmallScreen={isSmallScreen}
+                  selectedClassName={styles.selectedTab}
-              />
+                >
-            </FieldSet>
+                  {translate('Titles')}
+                </Tab>
+
+                <Tab
+                  className={styles.tab}
+                  selectedClassName={styles.selectedTab}
+                >
+                  {translate('Cast')}
+                </Tab>
+
+                <Tab
+                  className={styles.tab}
+                  selectedClassName={styles.selectedTab}
+                >
+                  {translate('Crew')}
+                </Tab>
+
+                {
+                  selectedTabIndex === 1 &&
+                    <div className={styles.filterIcon}>
+                      <InteractiveSearchFilterMenuConnector />
+                    </div>
+                }
+
+              </TabList>
+
+              <TabPanel>
+                <MovieHistoryTable
+                  movieId={id}
+                />
+              </TabPanel>
+
+              <TabPanel>
+                <InteractiveSearchTable
+                  movieId={id}
+                />
+              </TabPanel>
+
+              <TabPanel>
+                <MovieFileEditorTable
+                  movieId={id}
+                />
+                <ExtraFileTable
+                  movieId={id}
+                />
+              </TabPanel>
+
+              <TabPanel>
+                <MovieTitlesTable
+                  movieId={id}
+                />
+              </TabPanel>
+
+              <TabPanel>
+                <MovieCastPostersConnector
+                  isSmallScreen={isSmallScreen}
+                />
+              </TabPanel>
+
+              <TabPanel>
+                <MovieCrewPostersConnector
+                  isSmallScreen={isSmallScreen}
+                />
+              </TabPanel>
+            </Tabs>
 
-            <FieldSet legend={translate('Titles')}>
-              <MovieTitlesTable
-                movieId={id}
-              />
-            </FieldSet>
           </div>
 
           <OrganizePreviewModalConnector
@@ -688,12 +764,6 @@ class MovieDetails extends Component {
             onDeleteMoviePress={this.onDeleteMoviePress}
           />
 
-          <MovieHistoryModal
-            isOpen={isMovieHistoryModalOpen}
-            movieId={id}
-            onModalClose={this.onMovieHistoryModalClose}
-          />
-
           <DeleteMovieModal
             isOpen={isDeleteMovieModalOpen}
             movieId={id}
@@ -704,19 +774,12 @@ class MovieDetails extends Component {
           <InteractiveImportModal
             isOpen={isInteractiveImportModalOpen}
             movieId={id}
-            modalTitle={translate('ManageFiles')}
             folder={path}
             allowMovieChange={false}
             showFilterExistingFiles={true}
             showImportMode={false}
             onModalClose={this.onInteractiveImportModalClose}
           />
-
-          <MovieInteractiveSearchModalConnector
-            isOpen={isInteractiveSearchModalOpen}
-            movieId={id}
-            onModalClose={this.onInteractiveSearchModalClose}
-          />
         </PageContentBody>
       </PageContent>
     );
@@ -767,7 +830,7 @@ MovieDetails.propTypes = {
   onRefreshPress: PropTypes.func.isRequired,
   onSearchPress: PropTypes.func.isRequired,
   onGoToMovie: PropTypes.func.isRequired,
-  queueItem: PropTypes.object,
+  queueItems: PropTypes.arrayOf(PropTypes.object),
   movieRuntimeFormat: PropTypes.string.isRequired
 };
 

frontend/src/Movie/Details/MovieDetailsConnector.js

@@ -11,6 +11,7 @@ import { toggleMovieMonitored } from 'Store/Actions/movieActions';
 import { clearMovieBlocklist, fetchMovieBlocklist } from 'Store/Actions/movieBlocklistActions';
 import { clearMovieCredits, fetchMovieCredits } from 'Store/Actions/movieCreditsActions';
 import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
+import { clearMovieHistory, fetchMovieHistory } from 'Store/Actions/movieHistoryActions';
 import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { cancelFetchReleases, clearReleases } from 'Store/Actions/releaseActions';
 import { fetchImportListSchema } from 'Store/Actions/settingsActions';
@@ -33,11 +34,14 @@ const selectMovieFiles = createSelector(
 
     const hasMovieFiles = !!items.length;
 
+    const sizeOnDisk = items.map((item) => item.size).reduce((prev, curr) => prev + curr, 0);
+
     return {
       isMovieFilesFetching: isFetching,
       isMovieFilesPopulated: isPopulated,
       movieFilesError: error,
-      hasMovieFiles
+      hasMovieFiles,
+      sizeOnDisk
     };
   }
 );
@@ -101,7 +105,8 @@ function createMapStateToProps() {
         isMovieFilesFetching,
         isMovieFilesPopulated,
         movieFilesError,
-        hasMovieFiles
+        hasMovieFiles,
+        sizeOnDisk
       } = movieFiles;
 
       const {
@@ -140,8 +145,6 @@ function createMapStateToProps() {
         return acc;
       }, []);
 
-      const queueItem = queueItems.find((item) => item.movieId === movie.id);
-
       return {
         ...movie,
         alternateTitles,
@@ -157,11 +160,12 @@ function createMapStateToProps() {
         movieCreditsError,
         extraFilesError,
         hasMovieFiles,
+        sizeOnDisk,
         previousMovie,
         nextMovie,
         isSmallScreen: dimensions.isSmallScreen,
         isSidebarVisible,
-        queueItem,
+        queueItems,
         movieRuntimeFormat
       };
     }
@@ -176,6 +180,12 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchClearMovieFiles() {
       dispatch(clearMovieFiles());
     },
+    dispatchFetchMovieHistory({ movieId }) {
+      dispatch(fetchMovieHistory({ movieId }));
+    },
+    dispatchClearMovieHistory() {
+      dispatch(clearMovieHistory());
+    },
     dispatchFetchMovieCredits({ movieId }) {
       dispatch(fetchMovieCredits({ movieId }));
     },
@@ -271,6 +281,7 @@ class MovieDetailsConnector extends Component {
 
     this.props.dispatchFetchMovieFiles({ movieId });
     this.props.dispatchFetchMovieBlocklist({ movieId });
+    this.props.dispatchFetchMovieHistory({ movieId });
     this.props.dispatchFetchExtraFiles({ movieId });
     this.props.dispatchFetchMovieCredits({ movieId });
     this.props.dispatchFetchQueueDetails({ movieId });
@@ -281,6 +292,7 @@ class MovieDetailsConnector extends Component {
     this.props.dispatchCancelFetchReleases();
     this.props.dispatchClearMovieBlocklist();
     this.props.dispatchClearMovieFiles();
+    this.props.dispatchClearMovieHistory();
     this.props.dispatchClearExtraFiles();
     this.props.dispatchClearMovieCredits();
     this.props.dispatchClearQueueDetails();
@@ -337,6 +349,8 @@ MovieDetailsConnector.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   dispatchFetchMovieFiles: PropTypes.func.isRequired,
   dispatchClearMovieFiles: PropTypes.func.isRequired,
+  dispatchFetchMovieHistory: PropTypes.func.isRequired,
+  dispatchClearMovieHistory: PropTypes.func.isRequired,
   dispatchFetchExtraFiles: PropTypes.func.isRequired,
   dispatchClearExtraFiles: PropTypes.func.isRequired,
   dispatchFetchMovieCredits: PropTypes.func.isRequired,

frontend/src/Movie/Details/MovieStatusLabel.js

@@ -8,6 +8,7 @@ import translate from 'Utilities/String/translate';
 import styles from './MovieStatusLabel.css';
 
 function getMovieStatus(hasFile, isMonitored, isAvailable, queueItem = false) {
+
   if (queueItem) {
     const queueStatus = queueItem.status;
     const queueState = queueItem.trackedDownloadStatus;
@@ -115,4 +116,8 @@ MovieStatusLabel.propTypes = {
   colorImpairedMode: PropTypes.bool
 };
 
+MovieStatusLabel.defaultProps = {
+  title: ''
+};
+
 export default MovieStatusLabel;

frontend/src/Movie/Details/Titles/MovieTitlesTable.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import MovieTitlesTableContentConnector from './MovieTitlesTableContentConnector';
-import styles from './MovieTitlesTable.css';
 
 function MovieTitlesTable(props) {
   const {
@@ -8,11 +7,9 @@ function MovieTitlesTable(props) {
   } = props;
 
   return (
-    <div className={styles.container}>
+    <MovieTitlesTableContentConnector
-      <MovieTitlesTableContentConnector
+      {...otherProps}
-        {...otherProps}
+    />
-      />
-    </div>
   );
 }
 

frontend/src/Movie/Details/Titles/MovieTitlesTableContentConnector.js

@@ -6,43 +6,31 @@ import MovieTitlesTableContent from './MovieTitlesTableContent';
 
 function createMapStateToProps() {
   return createSelector(
-    (state, { movieId }) => movieId,
     (state) => state.movies,
-    (movieId, movies) => {
+    (movies) => {
-      const {
+      return movies;
-        isFetching,
-        isPopulated,
-        error,
-        items
-      } = movies;
-
-      const alternateTitles = items.find((m) => m.id === movieId)?.alternateTitles;
-
-      return {
-        isFetching,
-        isPopulated,
-        error,
-        alternateTitles
-      };
     }
   );
 }
 
+const mapDispatchToProps = {
+//  fetchMovies
+};
+
 class MovieTitlesTableContentConnector extends Component {
 
   //
   // Render
 
   render() {
-    const {
+    const movie = this.props.items.filter((obj) => {
-      alternateTitles,
+      return obj.id === this.props.movieId;
-      ...otherProps
+    });
-    } = this.props;
 
     return (
       <MovieTitlesTableContent
-        {...otherProps}
+        {...this.props}
-        items={alternateTitles}
+        items={movie[0].alternateTitles}
       />
     );
   }
@@ -50,11 +38,7 @@ class MovieTitlesTableContentConnector extends Component {
 
 MovieTitlesTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired,
-  alternateTitles: PropTypes.arrayOf(PropTypes.object).isRequired
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
 };
 
-MovieTitlesTableContentConnector.defaultProps = {
+export default connect(createMapStateToProps, mapDispatchToProps)(MovieTitlesTableContentConnector);
-  alternateTitles: []
-};
-
-export default connect(createMapStateToProps)(MovieTitlesTableContentConnector);

frontend/src/Movie/History/MovieHistoryModal.js

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

frontend/src/Movie/History/MovieHistoryModalContent.js

@@ -1,141 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Alert from 'Components/Alert';
-import Icon from 'Components/Icon';
-import Button from 'Components/Link/Button';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-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 Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import { icons, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import MovieHistoryRowConnector from './MovieHistoryRowConnector';
-
-const columns = [
-  {
-    name: 'eventType',
-    isVisible: true
-  },
-  {
-    name: 'sourceTitle',
-    label: () => translate('SourceTitle'),
-    isVisible: true
-  },
-  {
-    name: 'languages',
-    label: () => translate('Languages'),
-    isVisible: true
-  },
-  {
-    name: 'quality',
-    label: () => translate('Quality'),
-    isVisible: true
-  },
-  {
-    name: 'customFormats',
-    label: () => translate('CustomFormats'),
-    isSortable: false,
-    isVisible: true
-  },
-  {
-    name: 'customFormatScore',
-    label: React.createElement(Icon, {
-      name: icons.SCORE,
-      title: () => translate('CustomFormatScore')
-    }),
-    isSortable: true,
-    isVisible: true
-  },
-  {
-    name: 'date',
-    label: () => translate('Date'),
-    isVisible: true
-  },
-  {
-    name: 'actions',
-    isVisible: true
-  }
-];
-
-class MovieHistoryModalContent extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      error,
-      items,
-      onMarkAsFailedPress,
-      onModalClose
-    } = this.props;
-
-    const hasItems = !!items.length;
-
-    return (
-      <ModalContent onModalClose={onModalClose}>
-        <ModalHeader>
-          {translate('History')}
-        </ModalHeader>
-
-        <ModalBody>
-          {
-            isFetching &&
-              <LoadingIndicator />
-          }
-
-          {
-            !isFetching && !!error &&
-              <Alert kind={kinds.DANGER}>{translate('HistoryLoadError')}</Alert>
-          }
-
-          {
-            isPopulated && !hasItems && !error &&
-              <div>{translate('NoHistory')}</div>
-          }
-
-          {
-            isPopulated && hasItems && !error &&
-              <Table columns={columns}>
-                <TableBody>
-                  {
-                    items.map((item) => {
-                      return (
-                        <MovieHistoryRowConnector
-                          key={item.id}
-                          {...item}
-                          onMarkAsFailedPress={onMarkAsFailedPress}
-                        />
-                      );
-                    })
-                  }
-                </TableBody>
-              </Table>
-          }
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={onModalClose}>
-            {translate('Close')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-MovieHistoryModalContent.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onMarkAsFailedPress: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default MovieHistoryModalContent;

frontend/src/Movie/History/MovieHistoryRow.js

@@ -7,7 +7,8 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import { icons, kinds } from 'Helpers/Props';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
@@ -102,11 +103,20 @@ class MovieHistoryRow extends Component {
         </TableRowCell>
 
         <TableRowCell>
-          <MovieFormats formats={customFormats} />
+          <MovieFormats
+            formats={customFormats}
+          />
         </TableRowCell>
 
         <TableRowCell className={styles.customFormatScore}>
-          {formatCustomFormatScore(customFormatScore, customFormats.length)}
+          <Tooltip
+            anchor={formatCustomFormatScore(
+              customFormatScore,
+              customFormats.length
+            )}
+            tooltip={<MovieFormats formats={customFormats} />}
+            position={tooltipPositions.TOP}
+          />
         </TableRowCell>
 
         <RelativeDateCellConnector
@@ -124,7 +134,6 @@ class MovieHistoryRow extends Component {
               <IconButton
                 title={translate('MarkAsFailed')}
                 name={icons.REMOVE}
-                size={14}
                 onPress={this.onMarkAsFailedPress}
               />
           }

frontend/src/Movie/History/MovieHistoryTable.css

@@ -1,4 +1,5 @@
 .container {
+  margin-top: 20px;
   border: 1px solid var(--borderColor);
   border-radius: 4px;
   background-color: var(--inputBackgroundColor);

frontend/src/Movie/History/MovieHistoryTable.js

@@ -0,0 +1,22 @@
+import React from 'react';
+import MovieHistoryTableContentConnector from './MovieHistoryTableContentConnector';
+import styles from './MovieHistoryTable.css';
+
+function MovieHistoryTable(props) {
+  const {
+    ...otherProps
+  } = props;
+
+  return (
+    <div className={styles.container}>
+      <MovieHistoryTableContentConnector
+        {...otherProps}
+      />
+    </div>
+  );
+}
+
+MovieHistoryTable.propTypes = {
+};
+
+export default MovieHistoryTable;

frontend/src/Movie/History/MovieHistoryTableContent.js

@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import IconButton from 'Components/Link/IconButton';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import MovieHistoryRowConnector from './MovieHistoryRowConnector';
+import styles from './MovieHistoryTableContent.css';
+
+const columns = [
+  {
+    name: 'eventType',
+    isVisible: true
+  },
+  {
+    name: 'sourceTitle',
+    label: () => translate('SourceTitle'),
+    isVisible: true
+  },
+  {
+    name: 'languages',
+    label: () => translate('Languages'),
+    isVisible: true
+  },
+  {
+    name: 'quality',
+    label: () => translate('Quality'),
+    isVisible: true
+  },
+  {
+    name: 'customFormats',
+    label: () => translate('CustomFormats'),
+    isSortable: false,
+    isVisible: true
+  },
+  {
+    name: 'customFormatScore',
+    label: React.createElement(Icon, {
+      name: icons.SCORE,
+      title: 'Custom format score'
+    }),
+    isSortable: true,
+    isVisible: true
+  },
+  {
+    name: 'date',
+    label: () => translate('Date'),
+    isVisible: true
+  },
+  {
+    name: 'actions',
+    label: React.createElement(IconButton, { name: icons.ADVANCED_SETTINGS }),
+    isVisible: true
+  }
+];
+
+class MovieHistoryTableContent extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      isPopulated,
+      error,
+      items,
+      onMarkAsFailedPress
+    } = this.props;
+
+    const hasItems = !!items.length;
+
+    return (
+      <div>
+        {
+          isFetching &&
+            <LoadingIndicator />
+        }
+
+        {
+          !isFetching && !!error &&
+            <div className={styles.blankpad}>
+              {translate('UnableToLoadHistory')}
+            </div>
+        }
+
+        {
+          isPopulated && !hasItems && !error &&
+            <div className={styles.blankpad}>
+              {translate('NoHistory')}
+            </div>
+        }
+
+        {
+          isPopulated && hasItems && !error &&
+            <Table columns={columns}>
+              <TableBody>
+                {
+                  items.map((item) => {
+                    return (
+                      <MovieHistoryRowConnector
+                        key={item.id}
+                        {...item}
+                        onMarkAsFailedPress={onMarkAsFailedPress}
+                      />
+                    );
+                  })
+                }
+              </TableBody>
+            </Table>
+        }
+      </div>
+    );
+  }
+}
+
+MovieHistoryTableContent.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onMarkAsFailedPress: PropTypes.func.isRequired
+};
+
+export default MovieHistoryTableContent;

frontend/src/Movie/History/MovieHistoryTableContentConnector.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { clearMovieHistory, fetchMovieHistory, movieHistoryMarkAsFailed } from 'Store/Actions/movieHistoryActions';
+import { movieHistoryMarkAsFailed } from 'Store/Actions/movieHistoryActions';
-import MovieHistoryModalContent from './MovieHistoryModalContent';
+import MovieHistoryTableContent from './MovieHistoryTableContent';
 
 function createMapStateToProps() {
   return createSelector(
@@ -15,29 +15,10 @@ function createMapStateToProps() {
 }
 
 const mapDispatchToProps = {
-  fetchMovieHistory,
-  clearMovieHistory,
   movieHistoryMarkAsFailed
 };
 
-class MovieHistoryModalContentConnector extends Component {
+class MovieHistoryTableContentConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    const {
-      movieId
-    } = this.props;
-
-    this.props.fetchMovieHistory({
-      movieId
-    });
-  }
-
-  componentWillUnmount() {
-    this.props.clearMovieHistory();
-  }
 
   //
   // Listeners
@@ -58,7 +39,7 @@ class MovieHistoryModalContentConnector extends Component {
 
   render() {
     return (
-      <MovieHistoryModalContent
+      <MovieHistoryTableContent
         {...this.props}
         onMarkAsFailedPress={this.onMarkAsFailedPress}
       />
@@ -66,11 +47,9 @@ class MovieHistoryModalContentConnector extends Component {
   }
 }
 
-MovieHistoryModalContentConnector.propTypes = {
+MovieHistoryTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired,
-  fetchMovieHistory: PropTypes.func.isRequired,
-  clearMovieHistory: PropTypes.func.isRequired,
   movieHistoryMarkAsFailed: PropTypes.func.isRequired
 };
 
-export default connect(createMapStateToProps, mapDispatchToProps)(MovieHistoryModalContentConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(MovieHistoryTableContentConnector);

frontend/src/Movie/Index/MovieIndexSearchButton.tsx

@@ -1,12 +1,11 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useSelect } from 'App/SelectContext';
 import ClientSideCollectionAppState from 'App/State/ClientSideCollectionAppState';
 import MoviesAppState, { MovieIndexAppState } from 'App/State/MoviesAppState';
 import { MOVIE_SEARCH } from 'Commands/commandNames';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import { icons, kinds } from 'Helpers/Props';
+import { icons } from 'Helpers/Props';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector';
@@ -22,12 +21,11 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
   const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
   const {
     items,
+    totalItems,
   }: MoviesAppState & MovieIndexAppState & ClientSideCollectionAppState =
     useSelector(createMovieClientSideCollectionItemsSelector('movieIndex'));
 
   const dispatch = useDispatch();
-  const [isConfirmModalOpen, setIsConfirmModalOpen] = useState(false);
-
   const { isSelectMode, selectedFilterKey } = props;
   const [selectState] = useSelect();
   const { selectedState } = selectState;
@@ -52,8 +50,6 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
       : translate('SearchAll');
 
   const onPress = useCallback(() => {
-    setIsConfirmModalOpen(false);
-
     dispatch(
       executeCommand({
         name: MOVIE_SEARCH,
@@ -62,36 +58,14 @@ function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {
     );
   }, [dispatch, moviesToSearch]);
 
-  const onConfirmPress = useCallback(() => {
-    setIsConfirmModalOpen(true);
-  }, [setIsConfirmModalOpen]);
-
-  const onConfirmModalClose = useCallback(() => {
-    setIsConfirmModalOpen(false);
-  }, [setIsConfirmModalOpen]);
-
   return (
-    <>
+    <PageToolbarButton
-      <PageToolbarButton
+      label={isSelectMode ? searchSelectLabel : searchIndexLabel}
-        label={isSelectMode ? searchSelectLabel : searchIndexLabel}
+      isSpinning={isSearching}
-        isSpinning={isSearching}
+      isDisabled={!totalItems}
-        isDisabled={!items.length}
+      iconName={icons.SEARCH}
-        iconName={icons.SEARCH}
+      onPress={onPress}
-        onPress={moviesToSearch.length > 5 ? onConfirmPress : onPress}
+    />
-      />
-
-      <ConfirmModal
-        isOpen={isConfirmModalOpen}
-        kind={kinds.DANGER}
-        title={isSelectMode ? searchSelectLabel : searchIndexLabel}
-        message={translate('SearchMoviesConfirmationMessageText', {
-          count: moviesToSearch.length,
-        })}
-        confirmLabel={isSelectMode ? searchSelectLabel : searchIndexLabel}
-        onConfirm={onPress}
-        onCancel={onConfirmModalClose}
-      />
-    </>
   );
 }
 

frontend/src/Movie/Index/Table/MovieIndexRow.tsx

@@ -26,7 +26,7 @@ import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import { SelectStateInputProps } from 'typings/props';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import formatBytes from 'Utilities/Number/formatBytes';
-import firstCharToUpper from 'Utilities/String/firstCharToUpper';
+import titleCase from 'Utilities/String/titleCase';
 import translate from 'Utilities/String/translate';
 import MovieIndexProgressBar from '../ProgressBar/MovieIndexProgressBar';
 import MovieStatusCell from './MovieStatusCell';
@@ -286,7 +286,7 @@ function MovieIndexRow(props: MovieIndexRowProps) {
         if (name === 'minimumAvailability') {
           return (
             <VirtualTableRowCell key={name} className={styles[name]}>
-              {translate(firstCharToUpper(minimumAvailability))}
+              {titleCase(minimumAvailability)}
             </VirtualTableRowCell>
           );
         }

frontend/src/Movie/Index/createMovieQueueDetailsSelector.ts

@@ -11,10 +11,7 @@ function createMovieQueueDetailsSelector(movieId: number) {
     (queueItems) => {
       return queueItems.reduce(
         (acc: MovieQueueDetails, item) => {
-          if (
+          if (item.movieId !== movieId) {
-            item.trackedDownloadState === 'imported' ||
-            item.movieId !== movieId
-          ) {
             return acc;
           }
 

frontend/src/Movie/MovieQuality.js

@@ -3,7 +3,6 @@ import React from 'react';
 import Label from 'Components/Label';
 import { kinds } from 'Helpers/Props';
 import formatBytes from 'Utilities/Number/formatBytes';
-import translate from 'Utilities/String/translate';
 
 function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
   const revision = quality.revision;
@@ -29,36 +28,6 @@ function getTooltip(title, quality, size, isMonitored, isCutoffNotMet) {
   return title;
 }
 
-function revisionLabel(className, quality, showRevision) {
-  if (!showRevision) {
-    return;
-  }
-
-  if (quality.revision.isRepack) {
-    return (
-      <Label
-        className={className}
-        kind={kinds.PRIMARY}
-        title={translate('Repack')}
-      >
-        R
-      </Label>
-    );
-  }
-
-  if (quality.revision.version && quality.revision.version > 1) {
-    return (
-      <Label
-        className={className}
-        kind={kinds.PRIMARY}
-        title={translate('Proper')}
-      >
-        P
-      </Label>
-    );
-  }
-}
-
 function MovieQuality(props) {
   const {
     className,
@@ -66,8 +35,7 @@ function MovieQuality(props) {
     quality,
     size,
     isMonitored,
-    isCutoffNotMet,
+    isCutoffNotMet
-    showRevision
   } = props;
 
   let kind = kinds.DEFAULT;
@@ -82,15 +50,13 @@ function MovieQuality(props) {
   }
 
   return (
-    <span>
+    <Label
-      <Label
+      className={className}
-        className={className}
+      kind={kind}
-        kind={kind}
+      title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
-        title={getTooltip(title, quality, size, isMonitored, isCutoffNotMet)}
+    >
-      >
+      {quality.quality.name}
-        {quality.quality.name}
+    </Label>
-      </Label>{revisionLabel(className, quality, showRevision)}
-    </span>
   );
 }
 
@@ -100,14 +66,12 @@ MovieQuality.propTypes = {
   quality: PropTypes.object.isRequired,
   size: PropTypes.number,
   isMonitored: PropTypes.bool,
-  isCutoffNotMet: PropTypes.bool,
+  isCutoffNotMet: PropTypes.bool
-  showRevision: PropTypes.bool
 };
 
 MovieQuality.defaultProps = {
   title: '',
-  isMonitored: true,
+  isMonitored: true
-  showRevision: false
 };
 
 export default MovieQuality;

frontend/src/Movie/Search/MovieInteractiveSearchModal.js

@@ -1,35 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import MovieInteractiveSearchModalContent from './MovieInteractiveSearchModalContent';
-
-function MovieInteractiveSearchModal(props) {
-  const {
-    isOpen,
-    movieId,
-    onModalClose
-  } = props;
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      closeOnBackgroundClick={false}
-      onModalClose={onModalClose}
-      size={sizes.EXTRA_EXTRA_LARGE}
-    >
-      <MovieInteractiveSearchModalContent
-        movieId={movieId}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-MovieInteractiveSearchModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  movieId: PropTypes.number.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default MovieInteractiveSearchModal;

frontend/src/Movie/Search/MovieInteractiveSearchModalConnector.js

@@ -1,59 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { cancelFetchReleases, clearReleases } from 'Store/Actions/releaseActions';
-import MovieInteractiveSearchModal from './MovieInteractiveSearchModal';
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    dispatchCancelFetchReleases() {
-      dispatch(cancelFetchReleases());
-    },
-
-    dispatchClearReleases() {
-      dispatch(clearReleases());
-    },
-
-    onModalClose() {
-      dispatch(cancelFetchReleases());
-      dispatch(clearReleases());
-      props.onModalClose();
-    }
-  };
-}
-
-class MovieInteractiveSearchModalConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentWillUnmount() {
-    this.props.dispatchCancelFetchReleases();
-    this.props.dispatchClearReleases();
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      dispatchCancelFetchReleases,
-      dispatchClearReleases,
-      ...otherProps
-    } = this.props;
-
-    return (
-      <MovieInteractiveSearchModal
-        {...otherProps}
-      />
-    );
-  }
-}
-
-MovieInteractiveSearchModalConnector.propTypes = {
-  ...MovieInteractiveSearchModal.propTypes,
-  dispatchCancelFetchReleases: PropTypes.func.isRequired,
-  dispatchClearReleases: PropTypes.func.isRequired
-};
-
-export default connect(null, createMapDispatchToProps)(MovieInteractiveSearchModalConnector);

frontend/src/Movie/Search/MovieInteractiveSearchModalContent.js

@@ -1,44 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Button from 'Components/Link/Button';
-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 { scrollDirections } from 'Helpers/Props';
-import InteractiveSearchConnector from 'InteractiveSearch/InteractiveSearchConnector';
-import translate from 'Utilities/String/translate';
-
-function MovieInteractiveSearchModalContent(props) {
-  const {
-    movieId,
-    onModalClose
-  } = props;
-
-  return (
-    <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>
-        {translate('InteractiveSearchModalHeader')}
-      </ModalHeader>
-
-      <ModalBody scrollDirection={scrollDirections.BOTH}>
-        <InteractiveSearchConnector
-          searchPayload={{ movieId }}
-        />
-      </ModalBody>
-
-      <ModalFooter>
-        <Button onPress={onModalClose}>
-          {translate('Close')}
-        </Button>
-      </ModalFooter>
-    </ModalContent>
-  );
-}
-
-MovieInteractiveSearchModalContent.propTypes = {
-  movieId: PropTypes.number.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default MovieInteractiveSearchModalContent;

frontend/src/MovieFile/Editor/MovieFileEditorTable.css

@@ -1,4 +1,5 @@
 .container {
+  margin-top: 20px;
   border: 1px solid var(--borderColor);
   border-radius: 4px;
   background-color: var(--inputBackgroundColor);

frontend/src/RootFolder/RootFolderRow.js

@@ -0,0 +1,82 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Label from 'Components/Label';
+import IconButton from 'Components/Link/IconButton';
+import Link from 'Components/Link/Link';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRow from 'Components/Table/TableRow';
+import { icons, kinds } from 'Helpers/Props';
+import formatBytes from 'Utilities/Number/formatBytes';
+import translate from 'Utilities/String/translate';
+import styles from './RootFolderRow.css';
+
+function RootFolderRow(props) {
+  const {
+    id,
+    path,
+    accessible,
+    freeSpace,
+    unmappedFolders,
+    onDeletePress
+  } = props;
+
+  const isUnavailable = !accessible;
+
+  return (
+    <TableRow>
+      <TableRowCell>
+        {
+          isUnavailable ?
+            <div className={styles.unavailablePath}>
+              {path}
+
+              <Label
+                className={styles.unavailableLabel}
+                kind={kinds.DANGER}
+              >
+                {translate('Unavailable')}
+              </Label>
+            </div> :
+
+            <Link
+              className={styles.link}
+              to={`/add/import/${id}`}
+            >
+              {path}
+            </Link>
+        }
+      </TableRowCell>
+
+      <TableRowCell className={styles.freeSpace}>
+        {(isUnavailable || isNaN(freeSpace)) ? '-' : formatBytes(freeSpace)}
+      </TableRowCell>
+
+      <TableRowCell className={styles.unmappedFolders}>
+        {isUnavailable ? '-' : unmappedFolders.length}
+      </TableRowCell>
+
+      <TableRowCell className={styles.actions}>
+        <IconButton
+          title={translate('RemoveRootFolder')}
+          name={icons.REMOVE}
+          onPress={onDeletePress}
+        />
+      </TableRowCell>
+    </TableRow>
+  );
+}
+
+RootFolderRow.propTypes = {
+  id: PropTypes.number.isRequired,
+  path: PropTypes.string.isRequired,
+  accessible: PropTypes.bool.isRequired,
+  freeSpace: PropTypes.number,
+  unmappedFolders: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onDeletePress: PropTypes.func.isRequired
+};
+
+RootFolderRow.defaultProps = {
+  unmappedFolders: []
+};
+
+export default RootFolderRow;

frontend/src/RootFolder/RootFolders.js

@@ -0,0 +1,92 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Alert from 'Components/Alert';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import RootFolderRowConnector from './RootFolderRowConnector';
+
+const rootFolderColumns = [
+  {
+    name: 'path',
+    get label() {
+      return translate('Path');
+    },
+    isVisible: true
+  },
+  {
+    name: 'freeSpace',
+    get label() {
+      return translate('FreeSpace');
+    },
+    isVisible: true
+  },
+  {
+    name: 'unmappedFolders',
+    get label() {
+      return translate('UnmappedFolders');
+    },
+    isVisible: true
+  },
+  {
+    name: 'actions',
+    isVisible: true
+  }
+];
+
+function RootFolders(props) {
+  const {
+    isFetching,
+    isPopulated,
+    error,
+    items
+  } = props;
+
+  if (isFetching && !isPopulated) {
+    return (
+      <LoadingIndicator />
+    );
+  }
+
+  if (!isFetching && !!error) {
+    return (
+      <Alert kind={kinds.DANGER}>
+        {translate('UnableToLoadRootFolders')}
+      </Alert>
+    );
+  }
+
+  return (
+    <Table
+      columns={rootFolderColumns}
+    >
+      <TableBody>
+        {
+          items.map((rootFolder) => {
+            return (
+              <RootFolderRowConnector
+                key={rootFolder.id}
+                id={rootFolder.id}
+                path={rootFolder.path}
+                accessible={rootFolder.accessible}
+                freeSpace={rootFolder.freeSpace}
+                unmappedFolders={rootFolder.unmappedFolders}
+              />
+            );
+          })
+        }
+      </TableBody>
+    </Table>
+  );
+}
+
+RootFolders.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
+};
+
+export default RootFolders;

frontend/src/RootFolder/RootFolders.tsx

@@ -49,7 +49,7 @@ function RootFolders() {
 
   if (!isFetching && !!error) {
     return (
-      <Alert kind={kinds.DANGER}>{translate('RootFoldersLoadError')}</Alert>
+      <Alert kind={kinds.DANGER}>{translate('UnableToLoadRootFolders')}</Alert>
     );
   }
 

frontend/src/Settings/CustomFormats/CustomFormats/CustomFormat.js

@@ -152,7 +152,7 @@ class CustomFormat extends Component {
           isOpen={this.state.isDeleteCustomFormatModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteCustomFormat')}
-          message={translate('DeleteCustomFormatMessageText', { customFormatName: name })}
+          message={translate('DeleteCustomFormatMessageText', { name })}
           confirmLabel={translate('Delete')}
           isSpinning={isDeleting}
           onConfirm={this.onConfirmDeleteCustomFormat}

frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx

@@ -14,11 +14,9 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
   bulkDeleteDownloadClients,
   bulkEditDownloadClients,
-  setManageDownloadClientsSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -82,8 +80,6 @@ const COLUMNS = [
 
 interface ManageDownloadClientsModalContentProps {
   onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }
 
 function ManageDownloadClientsModalContent(
@@ -98,8 +94,6 @@ function ManageDownloadClientsModalContent(
     isSaving,
     error,
     items,
-    sortKey,
-    sortDirection,
   }: DownloadClientAppState = useSelector(
     createClientSideCollectionSelector('settings.downloadClients')
   );
@@ -120,13 +114,6 @@ function ManageDownloadClientsModalContent(
 
   const selectedCount = selectedIds.length;
 
-  const onSortPress = useCallback(
-    (value: string) => {
-      dispatch(setManageDownloadClientsSort({ sortKey: value }));
-    },
-    [dispatch]
-  );
-
   const onDeletePress = useCallback(() => {
     setIsDeleteModalOpen(true);
   }, [setIsDeleteModalOpen]);
@@ -232,9 +219,6 @@ function ManageDownloadClientsModalContent(
             allSelected={allSelected}
             allUnselected={allUnselected}
             onSelectAllChange={onSelectAllChange}
-            sortKey={sortKey}
-            sortDirection={sortDirection}
-            onSortPress={onSortPress}
           >
             <TableBody>
               {items.map((item) => {

frontend/src/Settings/General/SecuritySettings.js

@@ -124,7 +124,6 @@ class SecuritySettings extends Component {
       authenticationRequired,
       username,
       password,
-      passwordConfirmation,
       apiKey,
       certificateValidation
     } = settings;
@@ -140,8 +139,8 @@ class SecuritySettings extends Component {
             type={inputTypes.SELECT}
             name="authenticationMethod"
             values={authenticationMethodOptions}
-            helpText={translate('AuthenticationMethodHelpText')}
+            helpText={translate('AuthenticationMethodHelpText', { appName: 'Radarr' })}
-            helpTextWarning={translate('AuthenticationRequiredWarning')}
+            helpTextWarning={translate('AuthenticationRequiredWarning', { appName: 'Radarr' })}
             onChange={onInputChange}
             {...authenticationMethod}
           />
@@ -194,21 +193,6 @@ class SecuritySettings extends Component {
             null
         }
 
-        {
-          authenticationEnabled ?
-            <FormGroup>
-              <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.PASSWORD}
-                name="passwordConfirmation"
-                onChange={onInputChange}
-                {...passwordConfirmation}
-              />
-            </FormGroup> :
-            null
-        }
-
         <FormGroup>
           <FormLabel>{translate('ApiKey')}</FormLabel>
 

frontend/src/Settings/General/UpdateSettings.js

@@ -83,7 +83,7 @@ function UpdateSettings(props) {
                 type={inputTypes.CHECK}
                 name="updateAutomatically"
                 helpText={translate('UpdateAutomaticallyHelpText')}
-                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker') : undefined}
+                helpTextWarning={updateMechanism.value === 'docker' ? translate('AutomaticUpdatesDisabledDocker', { appName: 'Radarr' }) : undefined}
                 onChange={onInputChange}
                 {...updateAutomatically}
               />

frontend/src/Settings/ImportLists/ImportLists/ImportList.js

@@ -74,15 +74,9 @@ class ImportList extends Component {
         <div className={styles.enabled}>
 
           {
-            enabled ?
+            enabled &&
               <Label kind={kinds.SUCCESS}>
                 {translate('Enabled')}
-              </Label> :
-              <Label
-                kind={kinds.DISABLED}
-                outline={true}
-              >
-                {translate('Disabled')}
               </Label>
           }
 
@@ -92,6 +86,16 @@ class ImportList extends Component {
                 {translate('Auto')}
               </Label>
           }
+
+          {
+            !enabled && !enableAuto &&
+              <Label
+                kind={kinds.DISABLED}
+                outline={true}
+              >
+                {translate('Disabled')}
+              </Label>
+          }
         </div>
 
         <div className={styles.enabled}>

frontend/src/Settings/ImportLists/ImportLists/Manage/Edit/ManageImportListsEditModalContent.tsx

@@ -12,10 +12,8 @@ import translate from 'Utilities/String/translate';
 import styles from './ManageImportListsEditModalContent.css';
 
 interface SavePayload {
-  enabled?: boolean;
   enableAuto?: boolean;
   qualityProfileId?: number;
-  minimumAvailability?: string;
   rootFolderPath?: string;
 }
 
@@ -27,7 +25,7 @@ interface ManageImportListsEditModalContentProps {
 
 const NO_CHANGE = 'noChange';
 
-const enableOptions = [
+const autoAddOptions = [
   {
     key: NO_CHANGE,
     get value() {
@@ -54,23 +52,16 @@ function ManageImportListsEditModalContent(
 ) {
   const { importListIds, onSavePress, onModalClose } = props;
 
-  const [enabled, setEnabled] = useState(NO_CHANGE);
   const [enableAuto, setEnableAuto] = useState(NO_CHANGE);
   const [qualityProfileId, setQualityProfileId] = useState<string | number>(
     NO_CHANGE
   );
-  const [minimumAvailability, setMinimumAvailability] = useState(NO_CHANGE);
   const [rootFolderPath, setRootFolderPath] = useState(NO_CHANGE);
 
   const save = useCallback(() => {
     let hasChanges = false;
     const payload: SavePayload = {};
 
-    if (enabled !== NO_CHANGE) {
-      hasChanges = true;
-      payload.enabled = enabled === 'enabled';
-    }
-
     if (enableAuto !== NO_CHANGE) {
       hasChanges = true;
       payload.enableAuto = enableAuto === 'enabled';
@@ -81,11 +72,6 @@ function ManageImportListsEditModalContent(
       payload.qualityProfileId = qualityProfileId as number;
     }
 
-    if (minimumAvailability !== NO_CHANGE) {
-      hasChanges = true;
-      payload.minimumAvailability = minimumAvailability as string;
-    }
-
     if (rootFolderPath !== NO_CHANGE) {
       hasChanges = true;
       payload.rootFolderPath = rootFolderPath;
@@ -96,31 +82,17 @@ function ManageImportListsEditModalContent(
     }
 
     onModalClose();
-  }, [
+  }, [enableAuto, qualityProfileId, rootFolderPath, onSavePress, onModalClose]);
-    enabled,
-    enableAuto,
-    qualityProfileId,
-    minimumAvailability,
-    rootFolderPath,
-    onSavePress,
-    onModalClose,
-  ]);
 
   const onInputChange = useCallback(
     ({ name, value }: { name: string; value: string }) => {
       switch (name) {
-        case 'enabled':
-          setEnabled(value);
-          break;
         case 'enableAuto':
           setEnableAuto(value);
           break;
         case 'qualityProfileId':
           setQualityProfileId(value);
           break;
-        case 'minimumAvailability':
-          setMinimumAvailability(value);
-          break;
         case 'rootFolderPath':
           setRootFolderPath(value);
           break;
@@ -138,18 +110,6 @@ function ManageImportListsEditModalContent(
       <ModalHeader>{translate('EditSelectedImportLists')}</ModalHeader>
 
       <ModalBody>
-        <FormGroup>
-          <FormLabel>{translate('Enabled')}</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.SELECT}
-            name="enabled"
-            value={enabled}
-            values={enableOptions}
-            onChange={onInputChange}
-          />
-        </FormGroup>
-
         <FormGroup>
           <FormLabel>{translate('AutomaticAdd')}</FormLabel>
 
@@ -157,7 +117,7 @@ function ManageImportListsEditModalContent(
             type={inputTypes.SELECT}
             name="enableAuto"
             value={enableAuto}
-            values={enableOptions}
+            values={autoAddOptions}
             onChange={onInputChange}
           />
         </FormGroup>
@@ -175,19 +135,6 @@ function ManageImportListsEditModalContent(
           />
         </FormGroup>
 
-        <FormGroup>
-          <FormLabel>{translate('MinimumAvailability')}</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.AVAILABILITY_SELECT}
-            name="minimumAvailability"
-            value={minimumAvailability}
-            includeNoChange={true}
-            includeNoChangeDisabled={false}
-            onChange={onInputChange}
-          />
-        </FormGroup>
-
         <FormGroup>
           <FormLabel>{translate('RootFolder')}</FormLabel>
 

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
 import ManageImportListsModalContent from './ManageImportListsModalContent';
 
 interface ManageImportListsModalProps {
@@ -12,7 +11,7 @@ function ManageImportListsModal(props: ManageImportListsModalProps) {
   const { isOpen, onModalClose } = props;
 
   return (
-    <Modal isOpen={isOpen} size={sizes.EXTRA_LARGE} onModalClose={onModalClose}>
+    <Modal isOpen={isOpen} onModalClose={onModalClose}>
       <ManageImportListsModalContent onModalClose={onModalClose} />
     </Modal>
   );

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalContent.tsx

@@ -52,24 +52,12 @@ const COLUMNS = [
     isSortable: true,
     isVisible: true,
   },
-  {
-    name: 'minimumAvailability',
-    label: () => translate('MinimumAvailability'),
-    isSortable: true,
-    isVisible: true,
-  },
   {
     name: 'rootFolderPath',
     label: () => translate('RootFolder'),
     isSortable: true,
     isVisible: true,
   },
-  {
-    name: 'enabled',
-    label: () => translate('Enabled'),
-    isSortable: true,
-    isVisible: true,
-  },
   {
     name: 'enableAuto',
     label: () => translate('AutomaticAdd'),

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css

@@ -1,12 +1,10 @@
 .name,
 .tags,
-.enabled,
 .enableAuto,
-.minimumAvailability,
 .qualityProfileId,
 .rootFolderPath,
 .implementation {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   word-break: break-all;
-}
+}

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.css.d.ts

@@ -2,9 +2,7 @@
 // Please do not change this file!
 interface CssExports {
   'enableAuto': string;
-  'enabled': string;
   'implementation': string;
-  'minimumAvailability': string;
   'name': string;
   'qualityProfileId': string;
   'rootFolderPath': string;

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModalRow.tsx

@@ -7,8 +7,6 @@ import TableRow from 'Components/Table/TableRow';
 import TagListConnector from 'Components/TagListConnector';
 import { createQualityProfileSelectorForHook } from 'Store/Selectors/createQualityProfileSelector';
 import { SelectStateInputProps } from 'typings/props';
-import firstCharToUpper from 'Utilities/String/firstCharToUpper';
-import translate from 'Utilities/String/translate';
 import styles from './ManageImportListsModalRow.css';
 
 interface ManageImportListsModalRowProps {
@@ -16,10 +14,8 @@ interface ManageImportListsModalRowProps {
   name: string;
   rootFolderPath: string;
   qualityProfileId: number;
-  minimumAvailability: string;
   implementation: string;
   tags: number[];
-  enabled: boolean;
   enableAuto: boolean;
   columns: Column[];
   isSelected?: boolean;
@@ -32,10 +28,8 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
     isSelected,
     name,
     rootFolderPath,
-    minimumAvailability,
     qualityProfileId,
     implementation,
-    enabled,
     enableAuto,
     tags,
     onSelectedChange,
@@ -69,23 +63,15 @@ function ManageImportListsModalRow(props: ManageImportListsModalRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.qualityProfileId}>
-        {qualityProfile?.name ?? translate('None')}
+        {qualityProfile?.name ?? 'None'}
-      </TableRowCell>
-
-      <TableRowCell className={styles.minimumAvailability}>
-        {translate(firstCharToUpper(minimumAvailability))}
       </TableRowCell>
 
       <TableRowCell className={styles.rootFolderPath}>
         {rootFolderPath}
       </TableRowCell>
 
-      <TableRowCell className={styles.enabled}>
-        {enabled ? translate('Yes') : translate('No')}
-      </TableRowCell>
-
       <TableRowCell className={styles.enableAuto}>
-        {enableAuto ? translate('Yes') : translate('No')}
+        {enableAuto ? 'Yes' : 'No'}
       </TableRowCell>
 
       <TableRowCell className={styles.tags}>

frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx

@@ -14,11 +14,9 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
 import {
   bulkDeleteIndexers,
   bulkEditIndexers,
-  setManageIndexersSort,
 } from 'Store/Actions/settingsActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { SelectStateInputProps } from 'typings/props';
@@ -82,8 +80,6 @@ const COLUMNS = [
 
 interface ManageIndexersModalContentProps {
   onModalClose(): void;
-  sortKey?: string;
-  sortDirection?: SortDirection;
 }
 
 function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
@@ -96,8 +92,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
     isSaving,
     error,
     items,
-    sortKey,
-    sortDirection,
   }: IndexerAppState = useSelector(
     createClientSideCollectionSelector('settings.indexers')
   );
@@ -118,13 +112,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
 
   const selectedCount = selectedIds.length;
 
-  const onSortPress = useCallback(
-    (value: string) => {
-      dispatch(setManageIndexersSort({ sortKey: value }));
-    },
-    [dispatch]
-  );
-
   const onDeletePress = useCallback(() => {
     setIsDeleteModalOpen(true);
   }, [setIsDeleteModalOpen]);
@@ -227,9 +214,6 @@ function ManageIndexersModalContent(props: ManageIndexersModalContentProps) {
             allSelected={allSelected}
             allUnselected={allUnselected}
             onSelectAllChange={onSelectAllChange}
-            sortKey={sortKey}
-            sortDirection={sortDirection}
-            onSortPress={onSortPress}
           >
             <TableBody>
               {items.map((item) => {

frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.js

@@ -0,0 +1,72 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
+import Icon from 'Components/Icon';
+import Button from 'Components/Link/Button';
+import { icons, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './AddRootFolder.css';
+
+class AddRootFolder extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isAddNewRootFolderModalOpen: false
+    };
+  }
+
+  //
+  // Lifecycle
+
+  onAddNewRootFolderPress = () => {
+    this.setState({ isAddNewRootFolderModalOpen: true });
+  };
+
+  onNewRootFolderSelect = ({ value }) => {
+    this.props.onNewRootFolderSelect(value);
+  };
+
+  onAddRootFolderModalClose = () => {
+    this.setState({ isAddNewRootFolderModalOpen: false });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <div className={styles.addRootFolderButtonContainer}>
+        <Button
+          kind={kinds.PRIMARY}
+          size={sizes.LARGE}
+          onPress={this.onAddNewRootFolderPress}
+        >
+          <Icon
+            className={styles.importButtonIcon}
+            name={icons.DRIVE}
+          />
+          {translate('AddRootFolder')}
+        </Button>
+
+        <FileBrowserModal
+          isOpen={this.state.isAddNewRootFolderModalOpen}
+          name="rootFolderPath"
+          value=""
+          onChange={this.onNewRootFolderSelect}
+          onModalClose={this.onAddRootFolderModalClose}
+        />
+      </div>
+    );
+  }
+}
+
+AddRootFolder.propTypes = {
+  onNewRootFolderSelect: PropTypes.func.isRequired
+};
+
+export default AddRootFolder;

frontend/src/Settings/MediaManagement/RootFolder/AddRootFolder.tsx

@@ -1,18 +1,14 @@
 import React, { useCallback, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
-import Alert from 'Components/Alert';
 import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import { icons, kinds, sizes } from 'Helpers/Props';
 import { addRootFolder } from 'Store/Actions/rootFolderActions';
-import createRootFoldersSelector from 'Store/Selectors/createRootFoldersSelector';
 import translate from 'Utilities/String/translate';
 import styles from './AddRootFolder.css';
 
 function AddRootFolder() {
-  const { isSaving, saveError } = useSelector(createRootFoldersSelector());
-
   const dispatch = useDispatch();
 
   const [isAddNewRootFolderModalOpen, setIsAddNewRootFolderModalOpen] =
@@ -34,42 +30,24 @@ function AddRootFolder() {
   }, [setIsAddNewRootFolderModalOpen]);
 
   return (
-    <>
+    <div className={styles.addRootFolderButtonContainer}>
-      {!isSaving && saveError ? (
+      <Button
-        <Alert kind={kinds.DANGER}>
+        kind={kinds.PRIMARY}
-          {translate('AddRootFolderError')}
+        size={sizes.LARGE}
+        onPress={onAddNewRootFolderPress}
+      >
+        <Icon className={styles.importButtonIcon} name={icons.DRIVE} />
+        {translate('AddRootFolder')}
+      </Button>
 
-          <ul>
+      <FileBrowserModal
-            {Array.isArray(saveError.responseJSON) ? (
+        isOpen={isAddNewRootFolderModalOpen}
-              saveError.responseJSON.map((e, index) => {
+        name="rootFolderPath"
-                return <li key={index}>{e.errorMessage}</li>;
+        value=""
-              })
+        onChange={onNewRootFolderSelect}
-            ) : (
+        onModalClose={onAddRootFolderModalClose}
-              <li>{JSON.stringify(saveError.responseJSON)}</li>
+      />
-            )}
+    </div>
-          </ul>
-        </Alert>
-      ) : null}
-
-      <div className={styles.addRootFolderButtonContainer}>
-        <Button
-          kind={kinds.PRIMARY}
-          size={sizes.LARGE}
-          onPress={onAddNewRootFolderPress}
-        >
-          <Icon className={styles.importButtonIcon} name={icons.DRIVE} />
-          {translate('AddRootFolder')}
-        </Button>
-
-        <FileBrowserModal
-          isOpen={isAddNewRootFolderModalOpen}
-          name="rootFolderPath"
-          value=""
-          onChange={onNewRootFolderSelect}
-          onModalClose={onAddRootFolderModalClose}
-        />
-      </div>
-    </>
   );
 }
 

frontend/src/Store/Actions/Settings/downloadClients.js

@@ -1,5 +1,4 @@
 import { createAction } from 'redux-actions';
-import { sortDirections } from 'Helpers/Props';
 import createBulkEditItemHandler from 'Store/Actions/Creators/createBulkEditItemHandler';
 import createBulkRemoveItemHandler from 'Store/Actions/Creators/createBulkRemoveItemHandler';
 import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
@@ -8,7 +7,6 @@ import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHand
 import createSaveProviderHandler, { createCancelSaveProviderHandler } from 'Store/Actions/Creators/createSaveProviderHandler';
 import createTestAllProvidersHandler from 'Store/Actions/Creators/createTestAllProvidersHandler';
 import createTestProviderHandler, { createCancelTestProviderHandler } from 'Store/Actions/Creators/createTestProviderHandler';
-import createSetClientSideCollectionSortReducer from 'Store/Actions/Creators/Reducers/createSetClientSideCollectionSortReducer';
 import createSetProviderFieldValueReducer from 'Store/Actions/Creators/Reducers/createSetProviderFieldValueReducer';
 import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
 import { createThunk } from 'Store/thunks';
@@ -33,9 +31,9 @@ export const DELETE_DOWNLOAD_CLIENT = 'settings/downloadClients/deleteDownloadCl
 export const TEST_DOWNLOAD_CLIENT = 'settings/downloadClients/testDownloadClient';
 export const CANCEL_TEST_DOWNLOAD_CLIENT = 'settings/downloadClients/cancelTestDownloadClient';
 export const TEST_ALL_DOWNLOAD_CLIENTS = 'settings/downloadClients/testAllDownloadClients';
-export const BULK_EDIT_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkEditDownloadClients';
+
 export const BULK_DELETE_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkDeleteDownloadClients';
-export const SET_MANAGE_DOWNLOAD_CLIENTS_SORT = 'settings/downloadClients/setManageDownloadClientsSort';
+export const BULK_EDIT_DOWNLOAD_CLIENTS = 'settings/downloadClients/bulkEditDownloadClients';
 
 //
 // Action Creators
@@ -50,9 +48,9 @@ export const deleteDownloadClient = createThunk(DELETE_DOWNLOAD_CLIENT);
 export const testDownloadClient = createThunk(TEST_DOWNLOAD_CLIENT);
 export const cancelTestDownloadClient = createThunk(CANCEL_TEST_DOWNLOAD_CLIENT);
 export const testAllDownloadClients = createThunk(TEST_ALL_DOWNLOAD_CLIENTS);
-export const bulkEditDownloadClients = createThunk(BULK_EDIT_DOWNLOAD_CLIENTS);
+
 export const bulkDeleteDownloadClients = createThunk(BULK_DELETE_DOWNLOAD_CLIENTS);
-export const setManageDownloadClientsSort = createAction(SET_MANAGE_DOWNLOAD_CLIENTS_SORT);
+export const bulkEditDownloadClients = createThunk(BULK_EDIT_DOWNLOAD_CLIENTS);
 
 export const setDownloadClientValue = createAction(SET_DOWNLOAD_CLIENT_VALUE, (payload) => {
   return {
@@ -92,9 +90,7 @@ export default {
     isTesting: false,
     isTestingAll: false,
     items: [],
-    pendingChanges: {},
+    pendingChanges: {}
-    sortKey: 'name',
-    sortDirection: sortDirections.DESCENDING
   },
 
   //
@@ -128,10 +124,7 @@ export default {
 
         return selectedSchema;
       });
-    },
+    }
-
-    [SET_MANAGE_DOWNLOAD_CLIENTS_SORT]: createSetClientSideCollectionSortReducer(section)
-
   }
 
 };