Remove title for actions in movie history

Closes #9549

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.0.3'
+  majorVersion: '5.3.0'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.413'
+  dotnetVersion: '6.0.417'
   nodeVersion: '16.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'

frontend/src/Activity/Blocklist/Blocklist.js

@@ -36,6 +36,7 @@ class Blocklist extends Component {
       lastToggled: null,
       selectedState: {},
       isConfirmRemoveModalOpen: false,
+      isConfirmClearModalOpen: false,
       items: props.items
     };
   }
@@ -90,6 +91,19 @@ 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
 
@@ -103,7 +117,6 @@ class Blocklist extends Component {
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
-      onClearBlocklistPress,
       ...otherProps
     } = this.props;
 
@@ -111,7 +124,8 @@ class Blocklist extends Component {
       allSelected,
       allUnselected,
       selectedState,
-      isConfirmRemoveModalOpen
+      isConfirmRemoveModalOpen,
+      isConfirmClearModalOpen
     } = this.state;
 
     const selectedIds = this.getSelectedIds();
@@ -131,8 +145,9 @@ class Blocklist extends Component {
             <PageToolbarButton
               label={translate('Clear')}
               iconName={icons.CLEAR}
+              isDisabled={!items.length}
               isSpinning={isClearingBlocklistExecuting}
-              onPress={onClearBlocklistPress}
+              onPress={this.onClearBlocklistPress}
             />
           </PageToolbarSection>
 
@@ -215,6 +230,16 @@ 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/History/History.js

@@ -14,6 +14,7 @@ import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptions
 import TablePager from 'Components/Table/TablePager';
 import { align, icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import HistoryFilterModal from './HistoryFilterModal';
 import HistoryRowConnector from './HistoryRowConnector';
 
 class History extends Component {
@@ -33,6 +34,7 @@ class History extends Component {
       columns,
       selectedFilterKey,
       filters,
+      customFilters,
       totalRecords,
       onFilterSelect,
       onFirstPagePress,
@@ -70,7 +72,8 @@ class History extends Component {
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={[]}
+              customFilters={customFilters}
+              filterModalConnectorComponent={HistoryFilterModal}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -144,8 +147,9 @@ History.propTypes = {
   moviesError: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.string.isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   onFilterSelect: PropTypes.func.isRequired,
   onFirstPagePress: PropTypes.func.isRequired

frontend/src/Activity/History/HistoryConnector.js

@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import withCurrentPage from 'Components/withCurrentPage';
 import * as historyActions from 'Store/Actions/historyActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import History from './History';
 
@@ -11,11 +12,13 @@ function createMapStateToProps() {
   return createSelector(
     (state) => state.history,
     (state) => state.movies,
-    (history, movies) => {
+    createCustomFiltersSelector('history'),
+    (history, movies, customFilters) => {
       return {
         isMoviesFetching: movies.isFetching,
         isMoviesPopulated: movies.isPopulated,
         moviesError: movies.error,
+        customFilters,
         ...history
       };
     }

frontend/src/Activity/History/HistoryFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setHistoryFilter } from 'Store/Actions/historyActions';
+
+function createHistorySelector() {
+  return createSelector(
+    (state: AppState) => state.history.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.history.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface HistoryFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function HistoryFilterModal(props: HistoryFilterModalProps) {
+  const sectionItems = useSelector(createHistorySelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'history';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setHistoryFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/Queue/Queue.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -21,6 +22,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
+import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
 import RemoveQueueItemsModal from './RemoveQueueItemsModal';
@@ -153,11 +155,16 @@ class Queue extends Component {
       isMoviesPopulated,
       moviesError,
       columns,
+      selectedFilterKey,
+      filters,
+      customFilters,
+      count,
       totalRecords,
       isGrabbing,
       isRemoving,
       isRefreshMonitoredDownloadsExecuting,
       onRefreshPress,
+      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -220,6 +227,15 @@ class Queue extends Component {
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
+
+            <FilterMenu
+              alignMenu={align.RIGHT}
+              selectedFilterKey={selectedFilterKey}
+              filters={filters}
+              customFilters={customFilters}
+              filterModalConnectorComponent={QueueFilterModal}
+              onFilterSelect={onFilterSelect}
+            />
           </PageToolbarSection>
         </PageToolbar>
 
@@ -241,7 +257,11 @@ class Queue extends Component {
           {
             isAllPopulated && !hasError && !items.length ?
               <Alert kind={kinds.INFO}>
-                {translate('QueueIsEmpty')}
+                {
+                  selectedFilterKey !== 'all' && count > 0 ?
+                    translate('QueueFilterHasNoItems') :
+                    translate('QueueIsEmpty')
+                }
               </Alert> :
               null
           }
@@ -325,13 +345,22 @@ Queue.propTypes = {
   moviesError: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: 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,
+  count: PropTypes.number.isRequired,
   totalRecords: PropTypes.number,
   isGrabbing: PropTypes.bool.isRequired,
   isRemoving: PropTypes.bool.isRequired,
   isRefreshMonitoredDownloadsExecuting: PropTypes.bool.isRequired,
   onRefreshPress: PropTypes.func.isRequired,
   onGrabSelectedPress: PropTypes.func.isRequired,
-  onRemoveSelectedPress: PropTypes.func.isRequired
+  onRemoveSelectedPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired
+};
+
+Queue.defaultProps = {
+  count: 0
 };
 
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -6,6 +6,7 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import { executeCommand } from 'Store/Actions/commandActions';
 import * as queueActions from 'Store/Actions/queueActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Queue from './Queue';
@@ -15,12 +16,16 @@ function createMapStateToProps() {
     (state) => state.movies,
     (state) => state.queue.options,
     (state) => state.queue.paged,
+    (state) => state.queue.status.item,
+    createCustomFiltersSelector('queue'),
     createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
-    (movies, options, queue, isRefreshMonitoredDownloadsExecuting) => {
+    (movies, options, queue, status, customFilters, isRefreshMonitoredDownloadsExecuting) => {
       return {
+        count: options.includeUnknownMovieItems ? status.totalCount : status.count,
         isMoviesFetching: movies.isFetching,
         isMoviesPopulated: movies.isPopulated,
         moviesError: movies.error,
+        customFilters,
         isRefreshMonitoredDownloadsExecuting,
         ...options,
         ...queue
@@ -106,6 +111,10 @@ class QueueConnector extends Component {
     this.props.setQueueSort({ sortKey });
   };
 
+  onFilterSelect = (selectedFilterKey) => {
+    this.props.setQueueFilter({ selectedFilterKey });
+  };
+
   onTableOptionChange = (payload) => {
     this.props.setQueueTableOption(payload);
 
@@ -140,6 +149,7 @@ class QueueConnector extends Component {
         onLastPagePress={this.onLastPagePress}
         onPageSelect={this.onPageSelect}
         onSortPress={this.onSortPress}
+        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onRefreshPress={this.onRefreshPress}
         onGrabSelectedPress={this.onGrabSelectedPress}
@@ -162,6 +172,7 @@ QueueConnector.propTypes = {
   gotoQueueLastPage: PropTypes.func.isRequired,
   gotoQueuePage: PropTypes.func.isRequired,
   setQueueSort: PropTypes.func.isRequired,
+  setQueueFilter: PropTypes.func.isRequired,
   setQueueTableOption: PropTypes.func.isRequired,
   clearQueue: PropTypes.func.isRequired,
   grabQueueItems: PropTypes.func.isRequired,

frontend/src/Activity/Queue/QueueDetails.js

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

frontend/src/Activity/Queue/QueueFilterModal.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setQueueFilter } from 'Store/Actions/queueActions';
+
+function createQueueSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.items,
+    (queueItems) => {
+      return queueItems;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.queue.paged.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface QueueFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function QueueFilterModal(props: QueueFilterModalProps) {
+  const sectionItems = useSelector(createQueueSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'queue';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setQueueFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -2,7 +2,6 @@ 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';
 
@@ -41,8 +40,8 @@ QueueStatusCell.propTypes = {
 };
 
 QueueStatusCell.defaultProps = {
-  trackedDownloadStatus: translate('Ok'),
-  trackedDownloadState: translate('Downloading')
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading'
 };
 
 export default QueueStatusCell;

frontend/src/Activity/Queue/TimeleftCell.js

@@ -1,6 +1,9 @@
 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';
@@ -25,11 +28,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={translate('DelayingDownloadUntil', { date, time })}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('DelayingDownloadUntil', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }
@@ -39,11 +44,13 @@ function TimeleftCell(props) {
     const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
 
     return (
-      <TableRowCell
-        className={styles.timeleft}
-        title={translate('RetryingDownloadOn', { date, time })}
-      >
-        -
+      <TableRowCell className={styles.timeleft}>
+        <Tooltip
+          anchor={<Icon name={icons.INFO} />}
+          tooltip={translate('RetryingDownloadOn', { date, time })}
+          kind={kinds.INVERSE}
+          position={tooltipPositions.TOP}
+        />
       </TableRowCell>
     );
   }

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -1,5 +1,6 @@
 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';
@@ -130,7 +131,12 @@ class AddNewMovie extends Component {
                 <div className={styles.helpText}>
                   {translate('FailedLoadingSearchResults')}
                 </div>
-                <div>{getErrorMessage(error)}</div>
+                <Alert kind={kinds.WARNING}>{getErrorMessage(error)}</Alert>
+                <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,8 +85,13 @@
   margin-top: 20px;
 }
 
+.studio,
+.genres {
+  margin-left: 5px;
+}
+
 .links {
-  margin-left: 8px;
+  margin-left: 5px;
   pointer-events: all;
 }
 

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

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -1,6 +1,7 @@
 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';
@@ -61,11 +62,13 @@ class AddNewMovieSearchResult extends Component {
       titleSlug,
       year,
       studio,
+      genres,
       status,
       overview,
       ratings,
       folder,
       images,
+      existingMovieId,
       isExistingMovie,
       isExclusionMovie,
       isSmallScreen,
@@ -74,8 +77,8 @@ class AddNewMovieSearchResult extends Component {
       monitored,
       hasFile,
       isAvailable,
-      queueStatus,
-      queueState,
+      movieFile,
+      queueItem,
       runtime,
       movieRuntimeFormat,
       certification
@@ -120,13 +123,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}
                     />
                 }
@@ -197,13 +200,46 @@ class AddNewMovieSearchResult extends Component {
                 />
               </Label>
 
+              {
+                ratings.imdb ?
+                  <Label size={sizes.LARGE}>
+                    <ImdbRating
+                      ratings={ratings}
+                      iconSize={13}
+                    />
+                  </Label> :
+                  null
+              }
+
               {
                 !!studio &&
                   <Label size={sizes.LARGE}>
-                    {studio}
+                    <Icon
+                      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
@@ -215,15 +251,15 @@ class AddNewMovieSearchResult extends Component {
                     />
 
                     <span className={styles.links}>
-                      Links
+                      {translate('Links')}
                     </span>
                   </Label>
                 }
                 tooltip={
                   <MovieDetailsLinks
                     tmdbId={tmdbId}
-                    youTubeTrailerId={youTubeTrailerId}
                     imdbId={imdbId}
+                    youTubeTrailerId={youTubeTrailerId}
                   />
                 }
                 canFlip={true}
@@ -237,6 +273,7 @@ class AddNewMovieSearchResult extends Component {
                     hasMovieFiles={hasFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
+                    queueItem={queueItem}
                     id={id}
                     useLabel={true}
                     colorImpairedMode={colorImpairedMode}
@@ -273,25 +310,30 @@ 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,15 +12,17 @@ function createMapStateToProps() {
     createDimensionsSelector(),
     (state) => state.queue.details.items,
     (state, { internalId }) => internalId,
-    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => {
-      const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0);
+    (state) => state.settings.ui.item.movieRuntimeFormat,
+    (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId, movieRuntimeFormat) => {
+      const queueItem = queueItems.find((item) => internalId > 0 && item.movieId === internalId);
 
       return {
+        existingMovieId: internalId,
         isExistingMovie,
         isExclusionMovie,
         isSmallScreen: dimensions.isSmallScreen,
-        queueStatus: firstQueueItem ? firstQueueItem.status : null,
-        queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null
+        queueItem,
+        movieRuntimeFormat
       };
     }
   );

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

@@ -32,7 +32,7 @@
 .contentContainer {
   z-index: $popperZIndex;
   margin-top: 4px;
-  /* 400px container witdh with 8px padding on each side */
+  /* 400px container width 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('UnableToAddRootFolder')}
+                      {translate('AddRootFolderError')}
 
                       <ul>
                         {

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

@@ -5,12 +5,13 @@ 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(
-    (state) => state.rootFolders,
+    createRootFoldersSelector(),
     createSystemStatusSelector(),
     (rootFolders, systemStatus) => {
       return {

frontend/src/App/AppUpdatedModalContent.js

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

frontend/src/App/ConnectionLostModal.js

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

frontend/src/App/State/AppSectionState.ts

@@ -1,4 +1,5 @@
 import SortDirection from 'Helpers/Props/SortDirection';
+import { FilterBuilderProp } from './AppState';
 
 export interface Error {
   responseJSON: {
@@ -20,6 +21,10 @@ export interface PagedAppSectionState {
   pageSize: number;
 }
 
+export interface AppSectionFilterState<T> {
+  filterBuilderProps: FilterBuilderProp<T>[];
+}
+
 export interface AppSectionSchemaState<T> {
   isSchemaFetching: boolean;
   isSchemaPopulated: boolean;

frontend/src/App/State/AppState.ts

@@ -1,6 +1,7 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
+import HistoryAppState from './HistoryAppState';
 import MovieCollectionAppState from './MovieCollectionAppState';
 import MovieFilesAppState from './MovieFilesAppState';
 import MoviesAppState, { MovieIndexAppState } from './MoviesAppState';
@@ -46,6 +47,7 @@ export interface CustomFilter {
 interface AppState {
   calendar: CalendarAppState;
   commands: CommandAppState;
+  history: HistoryAppState;
   interactiveImport: InteractiveImportAppState;
   movieCollections: MovieCollectionAppState;
   movieFiles: MovieFilesAppState;

frontend/src/App/State/CalendarAppState.ts

@@ -1,9 +1,10 @@
-import AppSectionState from 'App/State/AppSectionState';
+import AppSectionState, {
+  AppSectionFilterState,
+} from 'App/State/AppSectionState';
 import Movie from 'Movie/Movie';
-import { FilterBuilderProp } from './AppState';
 
-interface CalendarAppState extends AppSectionState<Movie> {
-  filterBuilderProps: FilterBuilderProp<Movie>[];
-}
+interface CalendarAppState
+  extends AppSectionState<Movie>,
+    AppSectionFilterState<Movie> {}
 
 export default CalendarAppState;

frontend/src/App/State/HistoryAppState.ts

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

frontend/src/App/State/MovieCollectionAppState.ts

@@ -1,6 +1,8 @@
 import AppSectionState from 'App/State/AppSectionState';
 import MovieCollection from 'typings/MovieCollection';
 
-type MovieCollectionAppState = AppSectionState<MovieCollection>;
+interface MovieCollectionAppState extends AppSectionState<MovieCollection> {
+  itemMap: Record<number, number>;
+}
 
 export default MovieCollectionAppState;

frontend/src/App/State/QueueAppState.ts

@@ -1,41 +1,17 @@
-import ModelBase from 'App/ModelBase';
-import Language from 'Language/Language';
-import { QualityModel } from 'Quality/Quality';
-import CustomFormat from 'typings/CustomFormat';
-import AppSectionState, { 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;
-}
+import Queue from 'typings/Queue';
+import AppSectionState, {
+  AppSectionFilterState,
+  AppSectionItemState,
+  Error,
+} from './AppSectionState';
 
 export interface QueueDetailsAppState extends AppSectionState<Queue> {
   params: unknown;
 }
 
-export interface QueuePagedAppState extends AppSectionState<Queue> {
+export interface QueuePagedAppState
+  extends AppSectionState<Queue>,
+    AppSectionFilterState<Queue> {
   isGrabbing: boolean;
   grabError: Error;
   isRemoving: boolean;

frontend/src/Calendar/Agenda/Agenda.js

@@ -42,9 +42,9 @@ function Agenda(props) {
     <div className={styles.agenda}>
       {
         items.map((item, index) => {
-          const momentDate = moment(item.inCinemas);
+          const momentDate = moment(item.sortDate);
           const showDate = index === 0 ||
-            !moment(items[index - 1].inCinemas).isSame(momentDate, 'day');
+            !moment(items[index - 1].sortDate).isSame(momentDate, 'day');
 
           return (
             <AgendaEventConnector

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -88,7 +88,7 @@
 }
 
 @media only screen and (max-width: $breakpointSmall) {
-  .event {
+  .overlay {
     flex-direction: column;
   }
 
@@ -111,5 +111,4 @@
 .releaseIcon {
   margin-right: 20px;
   width: 25px;
-  text-align: right;
 }

frontend/src/Calendar/Agenda/AgendaEvent.js

@@ -95,7 +95,7 @@ class AgendaEvent extends Component {
 
         <div className={styles.overlay}>
           <div className={styles.date}>
-            {(showDate) ? startTime.format(longDateFormat) : null}
+            {showDate ? startTime.format(longDateFormat) : null}
           </div>
 
           <div className={styles.releaseIcon}>

frontend/src/Calendar/CalendarConnector.js

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

frontend/src/Calendar/CalendarFilterModal.tsx

@@ -23,13 +23,11 @@ function createFilterBuilderPropsSelector() {
   );
 }
 
-interface SeriesIndexFilterModalProps {
+interface CalendarFilterModalProps {
   isOpen: boolean;
 }
 
-export default function CalendarFilterModal(
-  props: SeriesIndexFilterModalProps
-) {
+export default function CalendarFilterModal(props: CalendarFilterModalProps) {
   const sectionItems = useSelector(createCalendarSelector());
   const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
   const customFilterType = 'calendar';

frontend/src/Collection/CollectionConnector.js

@@ -6,6 +6,7 @@ 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';
@@ -38,6 +39,12 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchFetchRootFolders() {
       dispatch(fetchRootFolders());
     },
+    dispatchFetchQueueDetails() {
+      dispatch(fetchQueueDetails());
+    },
+    dispatchClearQueueDetails() {
+      dispatch(clearQueueDetails());
+    },
     onUpdateSelectedPress(payload) {
       dispatch(saveMovieCollections(payload));
     },
@@ -63,10 +70,12 @@ class CollectionConnector extends Component {
   componentDidMount() {
     registerPagePopulator(this.repopulate);
     this.props.dispatchFetchRootFolders();
+    this.props.dispatchFetchQueueDetails();
   }
 
   componentWillUnmount() {
     unregisterPagePopulator(this.repopulate);
+    this.props.dispatchClearQueueDetails();
   }
 
   //
@@ -99,7 +108,9 @@ 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/CollectionItemConnector.js

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

frontend/src/Collection/Overview/CollectionMovie.js

@@ -61,6 +61,7 @@ class CollectionMovie extends Component {
     const {
       id,
       title,
+      status,
       overview,
       year,
       tmdbId,
@@ -69,6 +70,7 @@ class CollectionMovie extends Component {
       hasFile,
       folder,
       isAvailable,
+      movieFile,
       isExistingMovie,
       posterWidth,
       posterHeight,
@@ -123,13 +125,15 @@ class CollectionMovie extends Component {
 
             <div className={styles.overlay}>
               <div className={styles.overlayTitle}>
-                {title}
+                {title} {year > 0 ? `(${year})` : ''}
               </div>
 
               {
-                id &&
+                id ?
                   <div className={styles.overlayStatus}>
                     <MovieIndexProgressBar
+                      movieId={id}
+                      movieFile={movieFile}
                       monitored={monitored}
                       hasFile={hasFile}
                       status={status}
@@ -138,7 +142,8 @@ class CollectionMovie extends Component {
                       detailedProgressBar={detailedProgressBar}
                       isAvailable={isAvailable}
                     />
-                  </div>
+                  </div> :
+                  null
               }
             </div>
           </Link>
@@ -171,12 +176,14 @@ CollectionMovie.propTypes = {
   id: PropTypes.number,
   title: PropTypes.string.isRequired,
   year: PropTypes.number.isRequired,
+  status: PropTypes.string.isRequired,
   overview: PropTypes.string.isRequired,
   monitored: PropTypes.bool,
   collectionId: PropTypes.number.isRequired,
   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/Collection/Overview/CollectionMovieLabel.css

@@ -5,7 +5,7 @@
   margin: 2px 4px;
   border: 1px solid var(--borderColor);
   border-radius: 4px;
-  background-color: #eee;
+  background-color: var(--inputBackgroundColor);
   cursor: default;
 }
 
@@ -17,7 +17,7 @@
   padding: 0 4px;
   border-left: 4px;
   border-left-style: solid;
-  background-color: var(--white);
+  background-color: var(--themeLightColor);
   color: var(--defaultColor);
 }
 

frontend/src/Collection/Overview/CollectionMovieLabel.js

@@ -14,6 +14,7 @@ class CollectionMovieLabel extends Component {
     const {
       id,
       title,
+      year,
       status,
       monitored,
       isAvailable,
@@ -35,9 +36,7 @@ class CollectionMovieLabel extends Component {
           }
 
           <span>
-            {
-              title
-            }
+            {title} {year > 0 ? `(${year})` : ''}
           </span>
         </div>
 
@@ -62,6 +61,7 @@ class CollectionMovieLabel extends Component {
 CollectionMovieLabel.propTypes = {
   id: PropTypes.number,
   title: PropTypes.string.isRequired,
+  year: PropTypes.number.isRequired,
   status: PropTypes.string,
   isAvailable: PropTypes.bool,
   monitored: PropTypes.bool,

frontend/src/Collection/Overview/CollectionOverviews.js

@@ -28,7 +28,6 @@ function calculatePosterWidth(posterSize, isSmallScreen) {
 }
 
 function calculateRowHeight(posterHeight, sortKey, isSmallScreen, overviewOptions) {
-
   const heights = [
     overviewOptions.showPosters ? posterHeight : 75,
     isSmallScreen ? columnPaddingSmallScreen : columnPadding
@@ -122,8 +121,8 @@ class CollectionOverviews extends Component {
       overviewOptions
     } = this.props;
 
-    const posterWidth = calculatePosterWidth(overviewOptions.size, isSmallScreen);
-    const posterHeight = calculatePosterHeight(posterWidth);
+    const posterWidth = overviewOptions.showPosters ? calculatePosterWidth(overviewOptions.size, isSmallScreen) : 0;
+    const posterHeight = overviewOptions.showPosters ? calculatePosterHeight(posterWidth) : 0;
     const rowHeight = calculateRowHeight(posterHeight, sortKey, isSmallScreen, overviewOptions);
 
     this.setState({

frontend/src/Components/DescriptionList/DescriptionListItemDescription.css

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

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

@@ -6,9 +6,12 @@ import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Prop
 import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
+import HistoryEventTypeFilterBuilderRowValue from './HistoryEventTypeFilterBuilderRowValue';
 import ImportListFilterBuilderRowValueConnector from './ImportListFilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
+import LanguageFilterBuilderRowValue from './LanguageFilterBuilderRowValue';
 import MinimumAvailabilityFilterBuilderRowValue from './MinimumAvailabilityFilterBuilderRowValue';
+import MovieFilterBuilderRowValue from './MovieFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
 import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector';
@@ -58,9 +61,15 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.DATE:
       return DateFilterBuilderRowValue;
 
+    case filterBuilderValueTypes.HISTORY_EVENT_TYPE:
+      return HistoryEventTypeFilterBuilderRowValue;
+
     case filterBuilderValueTypes.INDEXER:
       return IndexerFilterBuilderRowValueConnector;
 
+    case filterBuilderValueTypes.LANGUAGE:
+      return LanguageFilterBuilderRowValue;
+
     case filterBuilderValueTypes.PROTOCOL:
       return ProtocolFilterBuilderRowValue;
 
@@ -70,6 +79,9 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.QUALITY_PROFILE:
       return QualityProfileFilterBuilderRowValueConnector;
 
+    case filterBuilderValueTypes.MOVIE:
+      return MovieFilterBuilderRowValue;
+
     case filterBuilderValueTypes.RELEASE_STATUS:
       return ReleaseStatusFilterBuilderRowValue;
 

frontend/src/Components/Filter/Builder/FilterBuilderRowValueProps.ts

@@ -0,0 +1,16 @@
+import { FilterBuilderProp } from 'App/State/AppState';
+
+interface FilterBuilderRowOnChangeProps {
+  name: string;
+  value: unknown[];
+}
+
+interface FilterBuilderRowValueProps {
+  filterType?: string;
+  filterValue: string | number | object | string[] | number[] | object[];
+  selectedFilterBuilderProp: FilterBuilderProp<unknown>;
+  sectionItem: unknown[];
+  onChange: (payload: FilterBuilderRowOnChangeProps) => void;
+}
+
+export default FilterBuilderRowValueProps;

frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css

@@ -1,5 +1,5 @@
 .tag {
-  height: 21px;
+  display: flex;
 
   &.isLastTag {
     .or {
@@ -18,4 +18,5 @@
 .or {
   margin: 0 3px;
   color: var(--themeDarkColor);
+  line-height: 31px;
 }

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

@@ -7,7 +7,7 @@ import styles from './FilterBuilderRowValueTag.css';
 
 function FilterBuilderRowValueTag(props) {
   return (
-    <span
+    <div
       className={styles.tag}
     >
       <TagInputTag
@@ -22,7 +22,7 @@ function FilterBuilderRowValueTag(props) {
             {translate('Or')}
           </div>
       }
-    </span>
+    </div>
   );
 }
 

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

@@ -0,0 +1,51 @@
+import React from 'react';
+import translate from 'Utilities/String/translate';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+const EVENT_TYPE_OPTIONS = [
+  {
+    id: 1,
+    get name() {
+      return translate('Grabbed');
+    },
+  },
+  {
+    id: 3,
+    get name() {
+      return translate('Imported');
+    },
+  },
+  {
+    id: 4,
+    get name() {
+      return translate('Failed');
+    },
+  },
+  {
+    id: 6,
+    get name() {
+      return translate('Deleted');
+    },
+  },
+  {
+    id: 8,
+    get name() {
+      return translate('Renamed');
+    },
+  },
+  {
+    id: 9,
+    get name() {
+      return translate('Ignored');
+    },
+  },
+];
+
+function HistoryEventTypeFilterBuilderRowValue(
+  props: FilterBuilderRowValueProps
+) {
+  return <FilterBuilderRowValue {...props} tagList={EVENT_TYPE_OPTIONS} />;
+}
+
+export default HistoryEventTypeFilterBuilderRowValue;

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import createLanguagesSelector from 'Store/Selectors/createLanguagesSelector';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+function LanguageFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+  const { items } = useSelector(createLanguagesSelector());
+
+  return <FilterBuilderRowValue {...props} tagList={items} />;
+}
+
+export default LanguageFilterBuilderRowValue;

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import Movie from 'Movie/Movie';
+import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
+import sortByName from 'Utilities/Array/sortByName';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
+
+function MovieFilterBuilderRowValue(props: FilterBuilderRowValueProps) {
+  const allMovies: Movie[] = useSelector(createAllMoviesSelector());
+
+  const tagList = allMovies
+    .map((movie) => ({ id: movie.id, name: movie.title }))
+    .sort(sortByName);
+
+  return <FilterBuilderRowValue {...props} tagList={tagList} />;
+}
+
+export default MovieFilterBuilderRowValue;

frontend/src/Components/Form/FormLabel.css

@@ -2,8 +2,10 @@
   display: flex;
   justify-content: flex-end;
   margin-right: $formLabelRightMarginWidth;
+  padding-top: 8px;
+  min-height: 35px;
+  text-align: end;
   font-weight: bold;
-  line-height: 35px;
 }
 
 .hasError {

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -37,6 +37,8 @@ function getType({ type, selectOptionsProviderAction }) {
       return inputTypes.OAUTH;
     case 'rootFolder':
       return inputTypes.ROOT_FOLDER_SELECT;
+    case 'qualityProfile':
+      return inputTypes.QUALITY_PROFILE_SELECT;
     default:
       return inputTypes.TEXT;
   }

frontend/src/Components/Form/RootFolderSelectInputConnector.js

@@ -3,6 +3,7 @@ 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';
 
@@ -10,7 +11,7 @@ const ADD_NEW_KEY = 'addNew';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.rootFolders,
+    createRootFoldersSelector(),
     (state, { value }) => value,
     (state, { includeMissingValue }) => includeMissingValue,
     (state, { includeNoChange }) => includeNoChange,

frontend/src/Components/Modal/Modal.css

@@ -63,6 +63,12 @@
   width: 1280px;
 }
 
+.extraExtraLarge {
+  composes: modal;
+
+  width: 1600px;
+}
+
 @media only screen and (max-width: $breakpointExtraLarge) {
   .modal.extraLarge {
     width: 90%;
@@ -90,7 +96,8 @@
   .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,6 +1,7 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'extraExtraLarge': string;
   'extraLarge': string;
   'large': string;
   'medium': string;

frontend/src/Components/Modal/ModalContent.js

@@ -3,6 +3,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './ModalContent.css';
 
 function ModalContent(props) {
@@ -28,6 +29,7 @@ function ModalContent(props) {
             <Icon
               name={icons.CLOSE}
               size={18}
+              title={translate('Close')}
             />
           </Link>
       }

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

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

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

@@ -24,6 +24,7 @@ function PageHeaderActionsMenu(props) {
         <MenuButton className={styles.menuButton} aria-label="Menu Button">
           <Icon
             name={icons.INTERACTIVE}
+            title={translate('Menu')}
           />
         </MenuButton>
 

frontend/src/Components/SignalRConnector.js

@@ -167,7 +167,7 @@ class SignalRConnector extends Component {
     const resource = body.resource;
     const status = resource.status;
 
-    // Both sucessful and failed commands need to be
+    // Both successful and failed commands need to be
     // completed, otherwise they spin until they timeout.
 
     if (status === 'completed' || status === 'failed') {
@@ -187,6 +187,8 @@ 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": "standalone"
+    "display": "minimal-ui"
 }

frontend/src/Diag/ConsoleApi.js

@@ -0,0 +1,120 @@
+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,7 +78,8 @@ 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: #fafbfc;
+  background-color: var(--movieBackgroundColor);
   text-align: center;
   font-size: $smallFontSize;
 }
@@ -68,6 +68,19 @@ $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,6 +7,7 @@ interface CssExports {
   'controls': string;
   'editorSelect': string;
   'excluded': string;
+  'existing': string;
   'externalLinks': string;
   'link': string;
   'overlayTitle': string;

frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.js

@@ -92,6 +92,7 @@ class DiscoverMoviePoster extends Component {
       showRelativeDates,
       shortDateFormat,
       timeFormat,
+      movieRuntimeFormat,
       ...otherProps
     } = this.props;
 
@@ -110,7 +111,7 @@ class DiscoverMoviePoster extends Component {
 
     return (
       <div className={styles.content}>
-        <div className={styles.posterContainer}>
+        <div className={styles.posterContainer} title={title}>
           {
             <div className={styles.editorSelect}>
               <CheckInput
@@ -158,6 +159,14 @@ class DiscoverMoviePoster extends Component {
               />
           }
 
+          {
+            isExisting &&
+              <div
+                className={styles.existing}
+                title={translate('Existing')}
+              />
+          }
+
           <Link
             className={styles.link}
             style={elementStyle}
@@ -185,7 +194,7 @@ class DiscoverMoviePoster extends Component {
 
         {
           showTitle &&
-            <div className={styles.title}>
+            <div className={styles.title} title={title}>
               {title}
             </div>
         }
@@ -194,6 +203,7 @@ class DiscoverMoviePoster extends Component {
           showRelativeDates={showRelativeDates}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
+          movieRuntimeFormat={movieRuntimeFormat}
           {...otherProps}
         />
 
@@ -236,6 +246,7 @@ 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,9 +5,11 @@ import DiscoverMoviePoster from './DiscoverMoviePoster';
 
 function createMapStateToProps() {
   return createSelector(
+    (state) => state.settings.ui.item.movieRuntimeFormat,
     createDimensionsSelector(),
-    ( dimensions) => {
+    (movieRuntimeFormat, dimensions) => {
       return {
+        movieRuntimeFormat,
         isSmallScreen: dimensions.isSmallScreen
       };
     }

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.css

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

@@ -1,9 +1,12 @@
 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) {
@@ -19,12 +22,13 @@ function DiscoverMoviePosterInfo(props) {
     sortKey,
     showRelativeDates,
     shortDateFormat,
-    timeFormat
+    timeFormat,
+    movieRuntimeFormat
   } = props;
 
   if (sortKey === 'status' && status) {
     return (
-      <div className={styles.info}>
+      <div className={styles.info} title={translate('Status')}>
         {getMovieStatusDetails(status).title}
       </div>
     );
@@ -32,7 +36,7 @@ function DiscoverMoviePosterInfo(props) {
 
   if (sortKey === 'studio' && studio) {
     return (
-      <div className={styles.info}>
+      <div className={styles.info} title={translate('Studio')}>
         {studio}
       </div>
     );
@@ -50,8 +54,8 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info}>
-        {`In Cinemas ${inCinemasDate}`}
+      <div className={styles.info} title={translate('InCinemas')}>
+        <Icon name={icons.IN_CINEMAS} /> {inCinemasDate}
       </div>
     );
   }
@@ -68,8 +72,8 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info}>
-        {`Digital ${digitalReleaseDate}`}
+      <div className={styles.info} title={translate('DigitalRelease')}>
+        <Icon name={icons.MOVIE_FILE} /> {digitalReleaseDate}
       </div>
     );
   }
@@ -86,15 +90,15 @@ function DiscoverMoviePosterInfo(props) {
     );
 
     return (
-      <div className={styles.info}>
-        {`Released ${physicalReleaseDate}`}
+      <div className={styles.info} title={translate('PhysicalRelease')}>
+        <Icon name={icons.DISC} /> {physicalReleaseDate}
       </div>
     );
   }
 
   if (sortKey === 'certification' && certification) {
     return (
-      <div className={styles.info}>
+      <div className={styles.info} title={translate('Certification')}>
         {certification}
       </div>
     );
@@ -102,8 +106,8 @@ function DiscoverMoviePosterInfo(props) {
 
   if (sortKey === 'runtime' && runtime) {
     return (
-      <div className={styles.info}>
-        {formatRuntime(runtime)}
+      <div className={styles.info} title={translate('Runtime')}>
+        {formatRuntime(runtime, movieRuntimeFormat)}
       </div>
     );
   }
@@ -111,9 +115,7 @@ function DiscoverMoviePosterInfo(props) {
   if (sortKey === 'ratings' && ratings) {
     return (
       <div className={styles.info}>
-        <TmdbRating
-          ratings={ratings}
-        />
+        <TmdbRating ratings={ratings} />
       </div>
     );
   }
@@ -133,7 +135,8 @@ 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,6 +76,7 @@ class DiscoverMovieRow extends Component {
       ratings,
       popularity,
       certification,
+      movieRuntimeFormat,
       collection,
       columns,
       isExisting,
@@ -230,7 +231,7 @@ class DiscoverMovieRow extends Component {
                   key={name}
                   className={styles[name]}
                 >
-                  {formatRuntime(runtime)}
+                  {formatRuntime(runtime, movieRuntimeFormat)}
                 </VirtualTableRowCell>
               );
             }
@@ -397,6 +398,7 @@ 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,9 +5,11 @@ import DiscoverMovieRow from './DiscoverMovieRow';
 
 function createMapStateToProps() {
   return createSelector(
+    (state) => state.settings.ui.item.movieRuntimeFormat,
     createDimensionsSelector(),
-    (dimensions) => {
+    (movieRuntimeFormat, dimensions) => {
       return {
+        movieRuntimeFormat,
         isSmallScreen: dimensions.isSmallScreen
       };
     }

frontend/src/FirstRun/AuthenticationRequiredModalContent.js

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

@@ -2,10 +2,13 @@ export const BOOL = 'bool';
 export const BYTES = 'bytes';
 export const DATE = 'date';
 export const DEFAULT = 'default';
+export const HISTORY_EVENT_TYPE = 'historyEventType';
 export const INDEXER = 'indexer';
+export const LANGUAGE = 'language';
 export const PROTOCOL = 'protocol';
 export const QUALITY = 'quality';
 export const QUALITY_PROFILE = 'qualityProfile';
+export const MOVIE = 'movie';
 export const RELEASE_STATUS = 'releaseStatus';
 export const MINIMUM_AVAILABILITY = 'minimumAvailability';
 export const TAG = 'tag';

frontend/src/Helpers/Props/sizes.js

@@ -3,5 +3,6 @@ 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];
+export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE, EXTRA_EXTRA_LARGE];

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -3,13 +3,16 @@ 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 { icons, kinds, sortDirections } from 'Helpers/Props';
+import { align, icons, kinds, sortDirections } from 'Helpers/Props';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
+import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector';
 import InteractiveSearchRowConnector from './InteractiveSearchRowConnector';
-import styles from './InteractiveSearchContent.css';
+import styles from './InteractiveSearch.css';
 
 const columns = [
   {
@@ -24,23 +27,6 @@ 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'),
@@ -84,12 +70,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'customFormat',
-    label: () => translate('Formats'),
-    isSortable: true,
-    isVisible: true
-  },
   {
     name: 'customFormatScore',
     label: React.createElement(Icon, {
@@ -107,10 +87,27 @@ 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 InteractiveSearchContent(props) {
+function InteractiveSearch(props) {
   const {
     searchPayload,
     isFetching,
@@ -118,18 +115,36 @@ function InteractiveSearchContent(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
       }
@@ -203,19 +218,23 @@ function InteractiveSearchContent(props) {
   );
 }
 
-InteractiveSearchContent.propTypes = {
+InteractiveSearch.propTypes = {
   searchPayload: PropTypes.object.isRequired,
   isFetching: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   totalReleasesCount: PropTypes.number.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   sortKey: PropTypes.string,
   sortDirection: PropTypes.string,
   longDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
   onSortPress: PropTypes.func.isRequired,
+  onFilterSelect: PropTypes.func.isRequired,
   onGrabPress: PropTypes.func.isRequired
 };
 
-export default InteractiveSearchContent;
+export default InteractiveSearch;

frontend/src/InteractiveSearch/InteractiveSearchConnector.js

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

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 './InteractiveSearchContent.css';
+import styles from './InteractiveSearch.css';
 
 function InteractiveSearchFilterMenu(props) {
   const {

frontend/src/InteractiveSearch/InteractiveSearchRow.css

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

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

@@ -3,8 +3,6 @@
 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,
-    historyFailedData,
-    blocklistData,
+    historyGrabbedData = {} as MovieHistory,
+    historyFailedData = {} as MovieHistory,
+    blocklistData = {} as MovieBlocklist,
     searchPayload,
     onGrabPress,
   } = props;
@@ -199,53 +199,6 @@ 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}>
@@ -313,11 +266,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.quality}>
-        <MovieQuality quality={quality} />
-      </TableRowCell>
-
-      <TableRowCell className={styles.customFormat}>
-        <MovieFormats formats={customFormats} />
+        <MovieQuality quality={quality} showRevision={true} />
       </TableRowCell>
 
       <TableRowCell className={styles.customFormatScore}>
@@ -348,6 +297,53 @@ 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

@@ -1,16 +0,0 @@
-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,11 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import { icons } from 'Helpers/Props';
+import MonitorToggleButton from 'Components/MonitorToggleButton';
 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 {
@@ -60,7 +57,7 @@ class MovieCastPoster extends Component {
       images,
       posterWidth,
       posterHeight,
-      importListId
+      importList
     } = this.props;
 
     const {
@@ -69,36 +66,31 @@ 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}>
-          <Label className={styles.controls}>
-            {
-              importListId > 0 ?
-                <IconButton
-                  className={styles.action}
-                  name={icons.EDIT}
-                  title={translate('EditPerson')}
-                  onPress={this.onEditImportListPress}
-                /> :
-                <IconButton
-                  className={styles.action}
-                  name={icons.ADD}
-                  title={translate('FollowPerson')}
-                  onPress={this.onAddImportListPress}
-                />
-            }
-          </Label>
+          <div className={styles.controls}>
+            <MonitorToggleButton
+              className={styles.action}
+              monitored={monitored}
+              size={20}
+              onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
+            />
+          </div>
 
           <div
             style={elementStyle}
@@ -148,12 +140,8 @@ MovieCastPoster.propTypes = {
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   posterWidth: PropTypes.number.isRequired,
   posterHeight: PropTypes.number.isRequired,
-  importListId: PropTypes.number.isRequired,
+  importList: PropTypes.object,
   onImportListSelect: PropTypes.func.isRequired
 };
 
-MovieCastPoster.defaultProps = {
-  importListId: 0
-};
-
 export default MovieCastPoster;

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

@@ -1,11 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import { icons } from 'Helpers/Props';
+import MonitorToggleButton from 'Components/MonitorToggleButton';
 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 {
@@ -60,7 +57,7 @@ class MovieCrewPoster extends Component {
       images,
       posterWidth,
       posterHeight,
-      importListId
+      importList
     } = this.props;
 
     const {
@@ -69,36 +66,31 @@ 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}>
-          <Label className={styles.controls}>
-            {
-              importListId > 0 ?
-                <IconButton
-                  className={styles.action}
-                  name={icons.EDIT}
-                  title={translate('EditPerson')}
-                  onPress={this.onEditImportListPress}
-                /> :
-                <IconButton
-                  className={styles.action}
-                  name={icons.ADD}
-                  title={translate('FollowPerson')}
-                  onPress={this.onAddImportListPress}
-                />
-            }
-          </Label>
+          <div className={styles.controls}>
+            <MonitorToggleButton
+              className={styles.action}
+              monitored={monitored}
+              size={20}
+              onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
+            />
+          </div>
 
           <div
             style={elementStyle}
@@ -148,12 +140,8 @@ MovieCrewPoster.propTypes = {
   images: PropTypes.arrayOf(PropTypes.object).isRequired,
   posterWidth: PropTypes.number.isRequired,
   posterHeight: PropTypes.number.isRequired,
-  importListId: PropTypes.number.isRequired,
+  importList: PropTypes.object,
   onImportListSelect: PropTypes.func.isRequired
 };
 
-MovieCrewPoster.defaultProps = {
-  importListId: 0
-};
-
 export default MovieCrewPoster;

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

@@ -5,6 +5,29 @@ 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,
@@ -17,8 +40,10 @@ function createMapStateToProps() {
         return acc;
       }, []);
 
+      const sortedCrew = crew.sort(crewSort);
+
       return {
-        items: crew
+        items: _.uniqBy(sortedCrew, 'personName')
       };
     }
   );

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

@@ -1,17 +1,13 @@
 $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;
-    }
   }
 }
 
@@ -50,22 +46,18 @@ $hoverScale: 1.05;
 
 .controls {
   position: absolute;
-  bottom: 10px;
-  left: 10px;
+  top: 10px;
   z-index: 3;
-  border-radius: 4px;
-  background-color: #707070;
-  color: var(--white);
-  font-size: $smallFontSize;
-  opacity: 0;
-  transition: opacity 0;
 }
 
 .action {
-  composes: button from '~Components/Link/IconButton.css';
+  composes: toggleButton from '~Components/MonitorToggleButton.css';
+
+  width: 25px;
+  color: var(--white);
 
   &:hover {
-    color: var(--radarrYellow);
+    color: var(--iconButtonHoverLightColor);
   }
 }
 

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

@@ -1,11 +1,19 @@
 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 createMovieCreditListSelector();
+  return createSelector(
+    createMovieCreditListSelector(),
+    (importList) => {
+      return {
+        importList
+      };
+    }
+  );
 }
 
 const mapDispatchToProps = {
@@ -20,7 +28,7 @@ class MovieCreditPosterConnector extends Component {
   // Listeners
 
   onImportListSelect = () => {
-    this.props.selectImportListSchema({ implementation: 'TMDbPersonImport', presetName: undefined });
+    this.props.selectImportListSchema({ implementation: 'TMDbPersonImport', implementationName: 'TMDb Person', 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,6 +2,16 @@
   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,6 +3,8 @@
 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,34 +1,19 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { Grid, WindowScroller } from 'react-virtualized';
-import Measure from 'Components/Measure';
+import { Navigation } from 'swiper';
+import { Swiper, SwiperSlide } from 'swiper/react';
 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;
@@ -43,10 +28,6 @@ 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 {
 
   //
@@ -63,61 +44,12 @@ 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();
-    }
   }
 
   //
-  // 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 }) => {
+  render() {
     const {
       items,
       itemComponent
@@ -126,99 +58,43 @@ 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;
 
-    const rowCount = Math.ceil(items.length / columnCount);
-
     return (
-      <Measure
-        whitelist={['width']}
-        onMeasure={this.onMeasure}
-      >
-        <WindowScroller
-          scrollElement={undefined}
-        >
-          {({ height, registerChild, onChildScroll, scrollTop }) => {
-            if (!height) {
-              return <div />;
-            }
 
-            return (
-              <div ref={registerChild}>
-                <Grid
-                  ref={this.setGridRef}
-                  className={styles.grid}
-                  autoHeight={true}
-                  height={height}
-                  columnCount={columnCount}
-                  columnWidth={columnWidth}
-                  rowCount={rowCount}
-                  rowHeight={rowHeight}
-                  width={width}
-                  onScroll={onChildScroll}
-                  scrollTop={scrollTop}
-                  overscanRowCount={2}
-                  cellRenderer={this.cellRenderer}
-                  scrollToAlignment={'start'}
-                  isScrollingOptOut={true}
-                />
-              </div>
-            );
-          }
-          }
-        </WindowScroller>
-      </Measure>
+      <div className={styles.sliderContainer}>
+        <Swiper
+          slidesPerView='auto'
+          spaceBetween={10}
+          slidesPerGroup={3}
+          navigation={true}
+          loop={false}
+          loopFillGroupWithBlank={true}
+          className="mySwiper"
+          modules={[Navigation]}
+          onInit={(swiper) => {
+            swiper.navigation.init();
+            swiper.navigation.update();
+          }}
+        >
+          {items.map((credit) => (
+            <SwiperSlide key={credit.id} style={{ width: posterWidth, height: rowHeight }}>
+              <MovieCreditPosterConnector
+                key={credit.id}
+                component={itemComponent}
+                posterWidth={posterWidth}
+                posterHeight={posterHeight}
+                tmdbId={credit.personTmdbId}
+                personName={credit.personName}
+                job={credit.job}
+                character={credit.character}
+                images={credit.images}
+              />
+            </SwiperSlide>
+          ))}
+        </Swiper>
+      </div>
     );
   }
 }

frontend/src/Movie/Details/MovieAlternateTitles.css

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

frontend/src/Movie/Details/MovieAlternateTitles.js

@@ -1,28 +0,0 @@
-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: 375px;
+  height: 425px;
 }
 
 .errorMessage {
@@ -39,10 +39,11 @@
 }
 
 .poster {
+  z-index: 2;
   flex-shrink: 0;
   margin-right: 35px;
-  width: 217px;
-  height: 319px;
+  width: 250px;
+  height: 368px;
 }
 
 .info {
@@ -202,6 +203,12 @@
   .headerContent {
     padding: 15px;
   }
+
+  .title {
+    font-weight: 300;
+    font-size: 30px;
+    line-height: 30px;
+  }
 }
 
 @media only screen and (max-width: $breakpointLarge) {

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,12 +23,11 @@ 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 MovieHistoryTable from 'Movie/History/MovieHistoryTable';
+import MovieHistoryModal from 'Movie/History/MovieHistoryModal';
 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';
@@ -38,13 +37,11 @@ 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';
 import MovieDetailsLinks from './MovieDetailsLinks';
-import MovieReleaseDatesConnector from './MovieReleaseDatesConnector';
+import MovieReleaseDates from './MovieReleaseDates';
 import MovieStatusLabel from './MovieStatusLabel';
 import MovieTagsConnector from './MovieTagsConnector';
 import MovieTitlesTable from './Titles/MovieTitlesTable';
@@ -57,14 +54,6 @@ 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 {
 
   //
@@ -78,10 +67,8 @@ class MovieDetails extends Component {
       isEditMovieModalOpen: false,
       isDeleteMovieModalOpen: false,
       isInteractiveImportModalOpen: false,
-      allExpanded: false,
-      allCollapsed: false,
-      expandedState: {},
-      selectedTabIndex: 0,
+      isInteractiveSearchModalOpen: false,
+      isMovieHistoryModalOpen: false,
       overviewHeight: 0,
       titleWidth: 0
     };
@@ -114,10 +101,6 @@ class MovieDetails extends Component {
     this.setState({ isOrganizeModalOpen: false });
   };
 
-  onManageEpisodesPress = () => {
-    this.setState({ isManageEpisodesOpen: true });
-  };
-
   onInteractiveImportPress = () => {
     this.setState({ isInteractiveImportModalOpen: true });
   };
@@ -134,6 +117,14 @@ class MovieDetails extends Component {
     this.setState({ isEditMovieModalOpen: false });
   };
 
+  onInteractiveSearchPress = () => {
+    this.setState({ isInteractiveSearchModalOpen: true });
+  };
+
+  onInteractiveSearchModalClose = () => {
+    this.setState({ isInteractiveSearchModalOpen: false });
+  };
+
   onDeleteMoviePress = () => {
     this.setState({
       isEditMovieModalOpen: false,
@@ -145,27 +136,12 @@ class MovieDetails extends Component {
     this.setState({ isDeleteMovieModalOpen: false });
   };
 
-  onExpandAllPress = () => {
-    const {
-      allExpanded,
-      expandedState
-    } = this.state;
-
-    this.setState(getExpandedState(selectAll(expandedState, !allExpanded)));
+  onMovieHistoryPress = () => {
+    this.setState({ isMovieHistoryModalOpen: true });
   };
 
-  onExpandPress = (seasonNumber, isExpanded) => {
-    this.setState((state) => {
-      const convertedState = {
-        allSelected: state.allExpanded,
-        allUnselected: state.allCollapsed,
-        selectedState: state.expandedState
-      };
-
-      const newState = toggleSelected(convertedState, [], seasonNumber, isExpanded, false);
-
-      return getExpandedState(newState);
-    });
+  onMovieHistoryModalClose = () => {
+    this.setState({ isMovieHistoryModalOpen: false });
   };
 
   onMeasure = ({ height }) => {
@@ -204,7 +180,12 @@ class MovieDetails extends Component {
     if (
       touchStart < 50 ||
       this.props.isSidebarVisible ||
-      this.state.isEventModalOpen
+      this.state.isOrganizeModalOpen ||
+      this.state.isEditMovieModalOpen ||
+      this.state.isDeleteMovieModalOpen ||
+      this.state.isInteractiveImportModalOpen ||
+      this.state.isInteractiveSearchModalOpen ||
+      this.state.isMovieHistoryModalOpen
     ) {
       return;
     }
@@ -239,10 +220,6 @@ class MovieDetails extends Component {
     }
   };
 
-  onTabSelect = (index, lastIndex) => {
-    this.setState({ selectedTabIndex: index });
-  };
-
   //
   // Render
 
@@ -286,7 +263,7 @@ class MovieDetails extends Component {
       onMonitorTogglePress,
       onRefreshPress,
       onSearchPress,
-      queueItems,
+      queueItem,
       movieRuntimeFormat
     } = this.props;
 
@@ -295,9 +272,10 @@ class MovieDetails extends Component {
       isEditMovieModalOpen,
       isDeleteMovieModalOpen,
       isInteractiveImportModalOpen,
+      isInteractiveSearchModalOpen,
+      isMovieHistoryModalOpen,
       overviewHeight,
-      titleWidth,
-      selectedTabIndex
+      titleWidth
     } = this.state;
 
     const fanartUrl = getFanartUrl(images);
@@ -324,6 +302,14 @@ class MovieDetails extends Component {
               onPress={onSearchPress}
             />
 
+            <PageToolbarButton
+              label={translate('InteractiveSearch')}
+              iconName={icons.INTERACTIVE}
+              isSpinning={isSearching}
+              title={undefined}
+              onPress={this.onInteractiveSearchPress}
+            />
+
             <PageToolbarSeparator />
 
             <PageToolbarButton
@@ -334,11 +320,17 @@ class MovieDetails extends Component {
             />
 
             <PageToolbarButton
-              label={translate('ManualImport')}
-              iconName={icons.INTERACTIVE}
+              label={translate('ManageFiles')}
+              iconName={icons.MOVIE_FILE}
               onPress={this.onInteractiveImportPress}
             />
 
+            <PageToolbarButton
+              label={translate('History')}
+              iconName={icons.HISTORY}
+              onPress={this.onMovieHistoryPress}
+            />
+
             <PageToolbarSeparator />
 
             <PageToolbarButton
@@ -433,7 +425,7 @@ class MovieDetails extends Component {
                             }
                             title={translate('ReleaseDates')}
                             body={
-                              <MovieReleaseDatesConnector
+                              <MovieReleaseDates
                                 inCinemas={inCinemas}
                                 physicalRelease={physicalRelease}
                                 digitalRelease={digitalRelease}
@@ -544,7 +536,7 @@ class MovieDetails extends Component {
                         hasMovieFiles={hasMovieFiles}
                         monitored={monitored}
                         isAvailable={isAvailable}
-                        queueItem={(queueItems.length > 0) ? queueItems[0] : null}
+                        queueItem={queueItem}
                       />
                     </span>
                   </InfoLabel>
@@ -654,101 +646,33 @@ class MovieDetails extends Component {
                 null
             }
 
-            <Tabs selectedIndex={selectedTabIndex} onSelect={this.onTabSelect}>
-              <TabList
-                className={styles.tabList}
-              >
-                <Tab
-                  className={styles.tab}
-                  selectedClassName={styles.selectedTab}
-                >
-                  {translate('History')}
-                </Tab>
+            <FieldSet legend={translate('Files')}>
+              <MovieFileEditorTable
+                movieId={id}
+              />
 
-                <Tab
-                  className={styles.tab}
-                  selectedClassName={styles.selectedTab}
-                >
-                  {translate('Search')}
-                </Tab>
+              <ExtraFileTable
+                movieId={id}
+              />
+            </FieldSet>
 
-                <Tab
-                  className={styles.tab}
-                  selectedClassName={styles.selectedTab}
-                >
-                  {translate('Files')}
-                </Tab>
+            <FieldSet legend={translate('Cast')}>
+              <MovieCastPostersConnector
+                isSmallScreen={isSmallScreen}
+              />
+            </FieldSet>
 
-                <Tab
-                  className={styles.tab}
-                  selectedClassName={styles.selectedTab}
-                >
-                  {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('Crew')}>
+              <MovieCrewPostersConnector
+                isSmallScreen={isSmallScreen}
+              />
+            </FieldSet>
 
+            <FieldSet legend={translate('Titles')}>
+              <MovieTitlesTable
+                movieId={id}
+              />
+            </FieldSet>
           </div>
 
           <OrganizePreviewModalConnector
@@ -764,6 +688,12 @@ class MovieDetails extends Component {
             onDeleteMoviePress={this.onDeleteMoviePress}
           />
 
+          <MovieHistoryModal
+            isOpen={isMovieHistoryModalOpen}
+            movieId={id}
+            onModalClose={this.onMovieHistoryModalClose}
+          />
+
           <DeleteMovieModal
             isOpen={isDeleteMovieModalOpen}
             movieId={id}
@@ -774,12 +704,19 @@ 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>
     );
@@ -830,7 +767,7 @@ MovieDetails.propTypes = {
   onRefreshPress: PropTypes.func.isRequired,
   onSearchPress: PropTypes.func.isRequired,
   onGoToMovie: PropTypes.func.isRequired,
-  queueItems: PropTypes.arrayOf(PropTypes.object),
+  queueItem: PropTypes.object,
   movieRuntimeFormat: PropTypes.string.isRequired
 };
 

frontend/src/Movie/Details/MovieDetailsConnector.js

@@ -11,7 +11,6 @@ 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';
@@ -34,14 +33,11 @@ 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,
-      sizeOnDisk
+      hasMovieFiles
     };
   }
 );
@@ -105,8 +101,7 @@ function createMapStateToProps() {
         isMovieFilesFetching,
         isMovieFilesPopulated,
         movieFilesError,
-        hasMovieFiles,
-        sizeOnDisk
+        hasMovieFiles
       } = movieFiles;
 
       const {
@@ -145,6 +140,8 @@ function createMapStateToProps() {
         return acc;
       }, []);
 
+      const queueItem = queueItems.find((item) => item.movieId === movie.id);
+
       return {
         ...movie,
         alternateTitles,
@@ -160,12 +157,11 @@ function createMapStateToProps() {
         movieCreditsError,
         extraFilesError,
         hasMovieFiles,
-        sizeOnDisk,
         previousMovie,
         nextMovie,
         isSmallScreen: dimensions.isSmallScreen,
         isSidebarVisible,
-        queueItems,
+        queueItem,
         movieRuntimeFormat
       };
     }
@@ -180,12 +176,6 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchClearMovieFiles() {
       dispatch(clearMovieFiles());
     },
-    dispatchFetchMovieHistory({ movieId }) {
-      dispatch(fetchMovieHistory({ movieId }));
-    },
-    dispatchClearMovieHistory() {
-      dispatch(clearMovieHistory());
-    },
     dispatchFetchMovieCredits({ movieId }) {
       dispatch(fetchMovieCredits({ movieId }));
     },
@@ -281,7 +271,6 @@ 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 });
@@ -292,7 +281,6 @@ 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();
@@ -349,8 +337,6 @@ 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/MovieReleaseDates.js

@@ -1,67 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Icon from 'Components/Icon';
-import { icons } from 'Helpers/Props';
-import getRelativeDate from 'Utilities/Date/getRelativeDate';
-import styles from './MovieReleaseDates.css';
-
-function MovieReleaseDates(props) {
-  const {
-    showRelativeDates,
-    shortDateFormat,
-    timeFormat,
-    inCinemas,
-    physicalRelease,
-    digitalRelease
-  } = props;
-
-  return (
-    <div>
-      {
-        !!inCinemas &&
-          <div >
-            <div className={styles.dateIcon}>
-              <Icon
-                name={icons.IN_CINEMAS}
-              />
-            </div>
-            {getRelativeDate(inCinemas, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
-          </div>
-      }
-      {
-        !!digitalRelease &&
-          <div >
-            <div className={styles.dateIcon}>
-              <Icon
-                name={icons.MOVIE_FILE}
-              />
-            </div>
-            {getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
-          </div>
-      }
-      {
-        !!physicalRelease &&
-          <div >
-            <div className={styles.dateIcon}>
-              <Icon
-                name={icons.DISC}
-              />
-            </div>
-            {getRelativeDate(physicalRelease, shortDateFormat, showRelativeDates, { timeFormat, timeForToday: false })}
-          </div>
-      }
-    </div>
-  );
-}
-
-MovieReleaseDates.propTypes = {
-  showRelativeDates: PropTypes.bool.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  longDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  inCinemas: PropTypes.string,
-  physicalRelease: PropTypes.string,
-  digitalRelease: PropTypes.string
-};
-
-export default MovieReleaseDates;

frontend/src/Movie/Details/MovieReleaseDates.tsx

@@ -0,0 +1,64 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import Icon from 'Components/Icon';
+import { icons } from 'Helpers/Props';
+import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import getRelativeDate from 'Utilities/Date/getRelativeDate';
+import translate from 'Utilities/String/translate';
+import styles from './MovieReleaseDates.css';
+
+interface MovieReleaseDatesProps {
+  inCinemas: string;
+  physicalRelease: string;
+  digitalRelease: string;
+}
+
+function MovieReleaseDates(props: MovieReleaseDatesProps) {
+  const { inCinemas, physicalRelease, digitalRelease } = props;
+
+  const { showRelativeDates, shortDateFormat, timeFormat } = useSelector(
+    createUISettingsSelector()
+  );
+
+  return (
+    <div>
+      {inCinemas ? (
+        <div title={translate('InCinemas')}>
+          <div className={styles.dateIcon}>
+            <Icon name={icons.IN_CINEMAS} />
+          </div>
+          {getRelativeDate(inCinemas, shortDateFormat, showRelativeDates, {
+            timeFormat,
+            timeForToday: false,
+          })}
+        </div>
+      ) : null}
+      {digitalRelease ? (
+        <div title={translate('DigitalRelease')}>
+          <div className={styles.dateIcon}>
+            <Icon name={icons.MOVIE_FILE} />
+          </div>
+          {getRelativeDate(digitalRelease, shortDateFormat, showRelativeDates, {
+            timeFormat,
+            timeForToday: false,
+          })}
+        </div>
+      ) : null}
+      {physicalRelease ? (
+        <div title={translate('PhysicalRelease')}>
+          <div className={styles.dateIcon}>
+            <Icon name={icons.DISC} />
+          </div>
+          {getRelativeDate(
+            physicalRelease,
+            shortDateFormat,
+            showRelativeDates,
+            { timeFormat, timeForToday: false }
+          )}
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
+export default MovieReleaseDates;

frontend/src/Movie/Details/MovieReleaseDatesConnector.js

@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import MovieReleaseDates from './MovieReleaseDates';
-
-function createMapStateToProps() {
-  return createSelector(
-    createUISettingsSelector(),
-    (uiSettings) => {
-      return {
-        showRelativeDates: uiSettings.showRelativeDates,
-        shortDateFormat: uiSettings.shortDateFormat,
-        longDateFormat: uiSettings.longDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
-    }
-  );
-}
-
-export default connect(createMapStateToProps, null)(MovieReleaseDates);

frontend/src/Movie/Details/MovieStatusLabel.js

@@ -8,7 +8,6 @@ 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;
@@ -116,8 +115,4 @@ MovieStatusLabel.propTypes = {
   colorImpairedMode: PropTypes.bool
 };
 
-MovieStatusLabel.defaultProps = {
-  title: ''
-};
-
 export default MovieStatusLabel;

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

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

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

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

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

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