Add: New icon for deleted episodes with status missing from disk

Signed-off-by: Stevie Robinson <stevie.robinson@gmail.com>
(cherry picked from commit 79907c881cc92ce9ee3973d5cf21749fe5fc58da)

Closes #9604

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,25 +9,24 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '6.0.1'
+  majorVersion: '5.3.1'
   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'
   linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-13'
+  macImage: 'macOS-11'
 
 trigger:
   branches:
     include:
     - develop
     - master
-    - zeus
   paths:
     exclude:
       - .github

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/HistoryEventTypeCell.js

@@ -6,7 +6,7 @@ import { icons, kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryEventTypeCell.css';
 
-function getIconName(eventType) {
+function getIconName(eventType, data) {
   switch (eventType) {
     case 'grabbed':
       return icons.DOWNLOADING;
@@ -17,7 +17,7 @@ function getIconName(eventType) {
     case 'downloadFailed':
       return icons.DOWNLOADING;
     case 'movieFileDeleted':
-      return icons.DELETE;
+      return data.reason === 'MissingFromDisk' ? icons.FILE_MISSING : icons.DELETE;
     case 'movieFileRenamed':
       return icons.ORGANIZE;
     case 'downloadIgnored':
@@ -47,7 +47,7 @@ function getTooltip(eventType, data) {
     case 'downloadFailed':
       return translate('MovieDownloadFailedTooltip');
     case 'movieFileDeleted':
-      return translate('MovieFileDeletedTooltip');
+      return data.reason === 'MissingFromDisk' ? translate('MovieFileMissingTooltip') : translate('MovieFileDeletedTooltip');
     case 'movieFileRenamed':
       return translate('MovieFileRenamedTooltip');
     case 'downloadIgnored':
@@ -58,7 +58,7 @@ function getTooltip(eventType, data) {
 }
 
 function HistoryEventTypeCell({ eventType, data }) {
-  const iconName = getIconName(eventType);
+  const iconName = getIconName(eventType, data);
   const iconKind = getIconKind(eventType);
   const tooltip = getTooltip(eventType, data);
 

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/AddNewMovieModalContent.js

@@ -20,6 +20,10 @@ class AddNewMovieModalContent extends Component {
   //
   // Listeners
 
+  onQualityProfileIdChange = ({ value }) => {
+    this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
+  };
+
   onAddMoviePress = () => {
     this.props.onAddMoviePress();
   };
@@ -36,7 +40,7 @@ class AddNewMovieModalContent extends Component {
       isAdding,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       folder,
@@ -126,9 +130,9 @@ class AddNewMovieModalContent extends Component {
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
-                    onChange={onInputChange}
-                    {...qualityProfileIds}
+                    name="qualityProfileId"
+                    onChange={this.onQualityProfileIdChange}
+                    {...qualityProfileId}
                   />
                 </FormGroup>
 
@@ -185,7 +189,7 @@ AddNewMovieModalContent.propTypes = {
   addError: PropTypes.object,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.object),
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js

@@ -58,7 +58,7 @@ class AddNewMovieModalContentConnector extends Component {
       tmdbId,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       tags
@@ -68,7 +68,7 @@ class AddNewMovieModalContentConnector extends Component {
       tmdbId,
       rootFolderPath: rootFolderPath.value,
       monitor: monitor.value,
-      qualityProfileIds: qualityProfileIds.value,
+      qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
       searchForMovie: searchForMovie.value,
       tags: tags.value
@@ -93,7 +93,7 @@ AddNewMovieModalContentConnector.propTypes = {
   tmdbId: PropTypes.number.isRequired,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.object),
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,

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,30 +62,28 @@ class AddNewMovieSearchResult extends Component {
       titleSlug,
       year,
       studio,
+      genres,
       status,
       overview,
       ratings,
       folder,
       images,
+      existingMovieId,
       isExistingMovie,
       isExclusionMovie,
       isSmallScreen,
       colorImpairedMode,
       id,
       monitored,
+      hasFile,
       isAvailable,
-      queueStatus,
-      queueState,
+      movieFile,
+      queueItem,
       runtime,
       movieRuntimeFormat,
-      certification,
-      statistics
+      certification
     } = this.props;
 
-    const {
-      movieFileCount
-    } = statistics;
-
     const {
       isNewAddMovieModalOpen
     } = this.state;
@@ -124,13 +123,13 @@ class AddNewMovieSearchResult extends Component {
                 {
                   isExistingMovie &&
                     <MovieIndexProgressBar
+                      movieId={existingMovieId}
+                      movieFile={movieFile}
                       monitored={monitored}
-                      hasFile={movieFileCount > 0}
+                      hasFile={hasFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
-                      queueStatus={queueStatus}
-                      queueState={queueState}
                       isAvailable={isAvailable}
                     />
                 }
@@ -201,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
@@ -219,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}
@@ -238,9 +270,10 @@ class AddNewMovieSearchResult extends Component {
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    hasMovieFiles={movieFileCount > 0}
+                    hasMovieFiles={hasFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
+                    queueItem={queueItem}
                     id={id}
                     useLabel={true}
                     colorImpairedMode={colorImpairedMode}
@@ -277,32 +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,
-  statistics: PropTypes.object
+  certification: PropTypes.string
 };
 
 AddNewMovieSearchResult.defaultProps = {
-  statistics: {
-    movieFileCount: 0
-  }
+  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/ImportMovieFooter.js

@@ -25,13 +25,13 @@ class ImportMovieFooter extends Component {
 
     const {
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability
     } = props;
 
     this.state = {
       monitor: defaultMonitor,
-      qualityProfileIds: defaultQualityProfileIds,
+      qualityProfileId: defaultQualityProfileId,
       minimumAvailability: defaultMinimumAvailability
     };
   }
@@ -39,16 +39,16 @@ class ImportMovieFooter extends Component {
   componentDidUpdate(prevProps, prevState) {
     const {
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability,
       isMonitorMixed,
-      isQualityProfileIdsMixed,
+      isQualityProfileIdMixed,
       isMinimumAvailabilityMixed
     } = this.props;
 
     const {
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability
     } = this.state;
 
@@ -60,10 +60,10 @@ class ImportMovieFooter extends Component {
       newState.monitor = defaultMonitor;
     }
 
-    if (isQualityProfileIdsMixed && qualityProfileIds !== MIXED) {
-      newState.qualityProfileIds = MIXED;
-    } else if (!isQualityProfileIdsMixed && qualityProfileIds !== defaultQualityProfileIds) {
-      newState.qualityProfileIds = defaultQualityProfileIds;
+    if (isQualityProfileIdMixed && qualityProfileId !== MIXED) {
+      newState.qualityProfileId = MIXED;
+    } else if (!isQualityProfileIdMixed && qualityProfileId !== defaultQualityProfileId) {
+      newState.qualityProfileId = defaultQualityProfileId;
     }
 
     if (isMinimumAvailabilityMixed && minimumAvailability !== MIXED) {
@@ -94,7 +94,7 @@ class ImportMovieFooter extends Component {
       isImporting,
       isLookingUpMovie,
       isMonitorMixed,
-      isQualityProfileIdsMixed,
+      isQualityProfileIdMixed,
       isMinimumAvailabilityMixed,
       hasUnsearchedItems,
       importError,
@@ -105,7 +105,7 @@ class ImportMovieFooter extends Component {
 
     const {
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability
     } = this.state;
 
@@ -148,10 +148,10 @@ class ImportMovieFooter extends Component {
 
           <FormInputGroup
             type={inputTypes.QUALITY_PROFILE_SELECT}
-            name="qualityProfileIds"
-            value={qualityProfileIds}
+            name="qualityProfileId"
+            value={qualityProfileId}
             isDisabled={!selectedCount}
-            includeMixed={isQualityProfileIdsMixed}
+            includeMixed={isQualityProfileIdMixed}
             onChange={this.onInputChange}
           />
         </div>
@@ -257,10 +257,10 @@ ImportMovieFooter.propTypes = {
   isImporting: PropTypes.bool.isRequired,
   isLookingUpMovie: PropTypes.bool.isRequired,
   defaultMonitor: PropTypes.string.isRequired,
-  defaultQualityProfileIds: PropTypes.arrayOf(PropTypes.number),
+  defaultQualityProfileId: PropTypes.number,
   defaultMinimumAvailability: PropTypes.string,
   isMonitorMixed: PropTypes.bool.isRequired,
-  isQualityProfileIdsMixed: PropTypes.bool.isRequired,
+  isQualityProfileIdMixed: PropTypes.bool.isRequired,
   isMinimumAvailabilityMixed: PropTypes.bool.isRequired,
   hasUnsearchedItems: PropTypes.bool.isRequired,
   importError: PropTypes.object,

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

@@ -18,7 +18,7 @@ function createMapStateToProps() {
     (addMovie, importMovie, selectedIds) => {
       const {
         monitor: defaultMonitor,
-        qualityProfileIds: defaultQualityProfileIds,
+        qualityProfileId: defaultQualityProfileId,
         minimumAvailability: defaultMinimumAvailability
       } = addMovie.defaults;
 
@@ -30,7 +30,7 @@ function createMapStateToProps() {
       } = importMovie;
 
       const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
-      const isQualityProfileIdsMixed = isMixed(items, selectedIds, defaultQualityProfileIds, 'qualityProfileIds');
+      const isQualityProfileIdMixed = isMixed(items, selectedIds, defaultQualityProfileId, 'qualityProfileId');
       const isMinimumAvailabilityMixed = isMixed(items, selectedIds, defaultMinimumAvailability, 'minimumAvailability');
       const hasUnsearchedItems = !isLookingUpMovie && items.some((item) => !item.isPopulated);
 
@@ -39,10 +39,10 @@ function createMapStateToProps() {
         isLookingUpMovie,
         isImporting,
         defaultMonitor,
-        defaultQualityProfileIds,
+        defaultQualityProfileId,
         defaultMinimumAvailability,
         isMonitorMixed,
-        isQualityProfileIdsMixed,
+        isQualityProfileIdMixed,
         isMinimumAvailabilityMixed,
         importError,
         hasUnsearchedItems

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

@@ -11,7 +11,7 @@ function ImportMovieRow(props) {
   const {
     id,
     monitor,
-    qualityProfileIds,
+    qualityProfileId,
     minimumAvailability,
     selectedMovie,
     isExistingMovie,
@@ -62,8 +62,8 @@ function ImportMovieRow(props) {
       <VirtualTableRowCell className={styles.qualityProfile}>
         <FormInputGroup
           type={inputTypes.QUALITY_PROFILE_SELECT}
-          name="qualityProfileIds"
-          value={qualityProfileIds}
+          name="qualityProfileId"
+          value={qualityProfileId}
           onChange={onInputChange}
         />
       </VirtualTableRowCell>
@@ -74,7 +74,7 @@ function ImportMovieRow(props) {
 ImportMovieRow.propTypes = {
   id: PropTypes.string.isRequired,
   monitor: PropTypes.string.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,
   selectedMovie: PropTypes.object,
   isExistingMovie: PropTypes.bool.isRequired,

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

@@ -15,7 +15,7 @@ class ImportMovieTable extends Component {
     const {
       unmappedFolders,
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability,
       onMovieLookup,
       onSetImportMovieValue
@@ -23,7 +23,7 @@ class ImportMovieTable extends Component {
 
     const values = {
       monitor: defaultMonitor,
-      qualityProfileIds: defaultQualityProfileIds,
+      qualityProfileId: defaultQualityProfileId,
       minimumAvailability: defaultMinimumAvailability
     };
 
@@ -167,7 +167,7 @@ ImportMovieTable.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object),
   unmappedFolders: PropTypes.arrayOf(PropTypes.object),
   defaultMonitor: PropTypes.string.isRequired,
-  defaultQualityProfileIds: PropTypes.arrayOf(PropTypes.number),
+  defaultQualityProfileId: PropTypes.number,
   defaultMinimumAvailability: PropTypes.string,
   allSelected: PropTypes.bool.isRequired,
   allUnselected: PropTypes.bool.isRequired,

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

@@ -13,7 +13,7 @@ function createMapStateToProps() {
     (addMovie, importMovie, dimensions, allMovies) => {
       return {
         defaultMonitor: addMovie.defaults.monitor,
-        defaultQualityProfileIds: addMovie.defaults.qualityProfileIds,
+        defaultQualityProfileId: addMovie.defaults.qualityProfileId,
         defaultMinimumAvailability: addMovie.defaults.minimumAvailability,
         items: importMovie.items,
         isSmallScreen: dimensions.isSmallScreen,

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/Import/SelectMovie/ImportMovieSelectMovie.js

@@ -5,7 +5,6 @@ import FormInputButton from 'Components/Form/FormInputButton';
 import TextInput from 'Components/Form/TextInput';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import SpinnerButton from 'Components/Link/SpinnerButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Portal from 'Components/Portal';
 import { icons, kinds } from 'Helpers/Props';
@@ -243,7 +242,7 @@ class ImportMovieSelectMovie extends Component {
                           <FormInputButton
                             kind={kinds.DEFAULT}
                             spinnerIcon={icons.REFRESH}
-                            ButtonComponent={SpinnerButton}
+                            canSpin={true}
                             isSpinning={isFetching}
                             onPress={this.onRefreshPress}
                           >

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';
@@ -43,9 +44,19 @@ export interface CustomFilter {
   filers: PropertyFilter[];
 }
 
+export interface AppSectionState {
+  dimensions: {
+    isSmallScreen: boolean;
+    width: number;
+    height: number;
+  };
+}
+
 interface AppState {
+  app: AppSectionState;
   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/Calendar/CalendarPageConnector.js

@@ -25,7 +25,7 @@ function createMissingMovieIdsSelector() {
         const inCinemas = movie.inCinemas;
 
         if (
-          (!movie.statistics || movie.statistics.movieFileCount === 0) &&
+          !movie.hasFile &&
           moment(inCinemas).isAfter(start) &&
           moment(inCinemas).isBefore(end) &&
           isBefore(movie.inCinemas) &&

frontend/src/Collection/AddNewCollectionMovieModalContent.js

@@ -46,7 +46,7 @@ class AddNewCollectionMovieModalContent extends Component {
       onInputChange,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie
     } = this.props;
@@ -126,13 +126,13 @@ class AddNewCollectionMovieModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>{translate('QualityProfiles')}</FormLabel>
+                  <FormLabel>{translate('QualityProfile')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
+                    name="qualityProfileId"
                     onChange={this.onQualityProfileIdChange}
-                    {...qualityProfileIds}
+                    {...qualityProfileId}
                   />
                 </FormGroup>
 
@@ -189,7 +189,7 @@ AddNewCollectionMovieModalContent.propTypes = {
   addError: PropTypes.object,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.object,
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,

frontend/src/Collection/AddNewCollectionMovieModalContentConnector.js

@@ -25,7 +25,7 @@ function createMapStateToProps() {
       const collectionDefaults = {
         rootFolderPath: collection.rootFolderPath,
         monitor: 'movieOnly',
-        qualityProfileIds: collection.qualityProfileIds,
+        qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         searchForMovie: collection.searchOnAdd,
         tags: collection.tags || []
@@ -70,7 +70,7 @@ class AddNewCollectionMovieModalContentConnector extends Component {
       title,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       tags
@@ -81,7 +81,7 @@ class AddNewCollectionMovieModalContentConnector extends Component {
       title,
       rootFolderPath: rootFolderPath.value,
       monitor: monitor.value,
-      qualityProfileIds: qualityProfileIds.value,
+      qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
       searchForMovie: searchForMovie.value,
       tags: tags.value
@@ -109,7 +109,7 @@ AddNewCollectionMovieModalContentConnector.propTypes = {
   title: PropTypes.string.isRequired,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.object,
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,

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/Edit/EditCollectionModalContent.js

@@ -46,7 +46,7 @@ class EditCollectionModalContent extends Component {
 
     const {
       monitored,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       // Id,
       rootFolderPath,
@@ -105,12 +105,12 @@ class EditCollectionModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>{translate('QualityProfiles')}</FormLabel>
+                  <FormLabel>{translate('QualityProfile')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
-                    {...qualityProfileIds}
+                    name="qualityProfileId"
+                    {...qualityProfileId}
                     onChange={onInputChange}
                   />
                 </FormGroup>

frontend/src/Collection/Edit/EditCollectionModalContentConnector.js

@@ -39,7 +39,7 @@ function createMapStateToProps() {
 
       const movieSettings = {
         monitored: collection.monitored,
-        qualityProfileIds: collection.qualityProfileIds,
+        qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         rootFolderPath: collection.rootFolderPath,
         tags: collection.tags,

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,16 +14,15 @@ class CollectionMovieLabel extends Component {
     const {
       id,
       title,
+      year,
       status,
       monitored,
       isAvailable,
+      hasFile,
       onMonitorTogglePress,
-      isSaving,
-      statistics
+      isSaving
     } = this.props;
 
-    const { movieFileCount } = statistics;
-
     return (
       <div className={styles.movie}>
         <div className={styles.movieTitle}>
@@ -37,9 +36,7 @@ class CollectionMovieLabel extends Component {
           }
 
           <span>
-            {
-              title
-            }
+            {title} {year > 0 ? `(${year})` : ''}
           </span>
         </div>
 
@@ -48,11 +45,11 @@ class CollectionMovieLabel extends Component {
             <div
               className={classNames(
                 styles.movieStatus,
-                styles[getStatusStyle(status, monitored, movieFileCount > 0, isAvailable, 'kinds')]
+                styles[getStatusStyle(status, monitored, hasFile, isAvailable, 'kinds')]
               )}
             >
               {
-                movieFileCount > 0 ? translate('Downloaded') : translate('Missing')
+                hasFile ? translate('Downloaded') : translate('Missing')
               }
             </div>
         }
@@ -64,10 +61,11 @@ class CollectionMovieLabel extends Component {
 CollectionMovieLabel.propTypes = {
   id: PropTypes.number,
   title: PropTypes.string.isRequired,
+  year: PropTypes.number.isRequired,
   status: PropTypes.string,
-  statistics: PropTypes.object.isRequired,
   isAvailable: PropTypes.bool,
   monitored: PropTypes.bool,
+  hasFile: PropTypes.bool,
   isSaving: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
   movieFileId: PropTypes.number,
@@ -77,7 +75,9 @@ CollectionMovieLabel.propTypes = {
 CollectionMovieLabel.defaultProps = {
   isSaving: false,
   statistics: {
-    movieFileCount: 0
+    episodeFileCount: 0,
+    totalEpisodeCount: 0,
+    percentOfEpisodes: 0
   }
 };
 

frontend/src/Collection/Overview/CollectionOverview.js

@@ -96,7 +96,7 @@ class CollectionOverview extends Component {
   render() {
     const {
       monitored,
-      qualityProfileIds,
+      qualityProfileId,
       rootFolderPath,
       genres,
       id,
@@ -212,7 +212,7 @@ class CollectionOverview extends Component {
                         <span className={styles.qualityProfileName}>
                           {
                             <QualityProfileNameConnector
-                              qualityProfileIds={qualityProfileIds}
+                              qualityProfileId={qualityProfileId}
                             />
                           }
                         </span>
@@ -325,7 +325,7 @@ class CollectionOverview extends Component {
 CollectionOverview.propTypes = {
   id: PropTypes.number.isRequired,
   monitored: PropTypes.bool.isRequired,
-  qualityProfileIds: PropTypes.number.isRequired,
+  qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,
   searchOnAdd: PropTypes.bool.isRequired,
   rootFolderPath: PropTypes.string.isRequired,

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/FormInputButton.js

@@ -2,19 +2,33 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
+import SpinnerButton from 'Components/Link/SpinnerButton';
 import { kinds } from 'Helpers/Props';
 import styles from './FormInputButton.css';
 
 function FormInputButton(props) {
   const {
     className,
-    ButtonComponent,
+    canSpin,
     isLastButton,
     ...otherProps
   } = props;
 
+  if (canSpin) {
+    return (
+      <SpinnerButton
+        className={classNames(
+          className,
+          !isLastButton && styles.middleButton
+        )}
+        kind={kinds.PRIMARY}
+        {...otherProps}
+      />
+    );
+  }
+
   return (
-    <ButtonComponent
+    <Button
       className={classNames(
         className,
         !isLastButton && styles.middleButton
@@ -27,14 +41,14 @@ function FormInputButton(props) {
 
 FormInputButton.propTypes = {
   className: PropTypes.string.isRequired,
-  ButtonComponent: PropTypes.elementType.isRequired,
-  isLastButton: PropTypes.bool.isRequired
+  isLastButton: PropTypes.bool.isRequired,
+  canSpin: PropTypes.bool.isRequired
 };
 
 FormInputButton.defaultProps = {
   className: styles.button,
-  ButtonComponent: Button,
-  isLastButton: true
+  isLastButton: true,
+  canSpin: false
 };
 
 export default FormInputButton;

frontend/src/Components/Form/FormInputGroup.css

@@ -6,6 +6,7 @@
 .inputGroup {
   display: flex;
   flex: 1 1 auto;
+  flex-wrap: wrap;
 }
 
 .inputContainer {

frontend/src/Components/Form/FormInputGroup.js

@@ -21,7 +21,6 @@ import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
 import PathInputConnector from './PathInputConnector';
-import PlexMachineInputConnector from './PlexMachineInputConnector';
 import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector';
 import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
 import TagInputConnector from './TagInputConnector';
@@ -64,9 +63,6 @@ function getComponent(type) {
     case inputTypes.PATH:
       return PathInputConnector;
 
-    case inputTypes.PLEX_MACHINE_SELECT:
-      return PlexMachineInputConnector;
-
     case inputTypes.QUALITY_PROFILE_SELECT:
       return QualityProfileSelectInputConnector;
 

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/OAuthInput.js

@@ -5,7 +5,6 @@ import { kinds } from 'Helpers/Props';
 
 function OAuthInput(props) {
   const {
-    className,
     label,
     authorizing,
     error,
@@ -13,21 +12,21 @@ function OAuthInput(props) {
   } = props;
 
   return (
-    <SpinnerErrorButton
-      className={className}
-      kind={kinds.PRIMARY}
-      isSpinning={authorizing}
-      error={error}
-      onPress={onPress}
-    >
-      {label}
-    </SpinnerErrorButton>
+    <div>
+      <SpinnerErrorButton
+        kind={kinds.PRIMARY}
+        isSpinning={authorizing}
+        error={error}
+        onPress={onPress}
+      >
+        {label}
+      </SpinnerErrorButton>
+    </div>
   );
 }
 
 OAuthInput.propTypes = {
-  className: PropTypes.string,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
+  label: PropTypes.string.isRequired,
   authorizing: PropTypes.bool.isRequired,
   error: PropTypes.object,
   onPress: PropTypes.func.isRequired

frontend/src/Components/Form/PlexMachineInput.js

@@ -1,44 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import SelectInput from './SelectInput';
-
-function PlexMachineInput(props) {
-  const {
-    isFetching,
-    isDisabled,
-    value,
-    values,
-    onChange,
-    ...otherProps
-  } = props;
-
-  const helpText = 'Authenticate with plex.tv to show servers to use for authentication';
-
-  return (
-    <>
-      {
-        isFetching ?
-          <LoadingIndicator /> :
-          <SelectInput
-            value={value}
-            values={values}
-            isDisabled={isDisabled}
-            onChange={onChange}
-            helpText={helpText}
-            {...otherProps}
-          />
-      }
-    </>
-  );
-}
-
-PlexMachineInput.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  value: PropTypes.string,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default PlexMachineInput;

frontend/src/Components/Form/PlexMachineInputConnector.js

@@ -1,115 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchPlexResources } from 'Store/Actions/settingsActions';
-import PlexMachineInput from './PlexMachineInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { value }) => value,
-    (state) => state.oAuth,
-    (state) => state.settings.plex,
-    (value, oAuth, plex) => {
-
-      let values = [{ key: value, value }];
-      let isDisabled = true;
-
-      if (plex.isPopulated) {
-        const serverValues = plex.items.filter((item) => item.provides.includes('server')).map((item) => {
-          return ({
-            key: item.clientIdentifier,
-            value: `${item.name} / ${item.owned ? 'Owner' : 'User'} / ${item.clientIdentifier}`
-          });
-        });
-
-        if (serverValues.find((item) => item.key === value)) {
-          values = serverValues;
-        } else {
-          values = values.concat(serverValues);
-        }
-
-        isDisabled = false;
-      }
-
-      return ({
-        accessToken: oAuth.result?.accessToken,
-        values,
-        isDisabled,
-        ...plex
-      });
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchPlexResources: fetchPlexResources
-};
-
-class PlexMachineInputConnector extends Component {
-
-  //
-  // Lifecycle
-  componentDidMount = () => {
-    const {
-      accessToken,
-      dispatchFetchPlexResources
-    } = this.props;
-
-    if (accessToken) {
-      dispatchFetchPlexResources({ accessToken });
-    }
-
-  };
-
-  componentDidUpdate(prevProps) {
-    const {
-      accessToken,
-      dispatchFetchPlexResources
-    } = this.props;
-
-    const oldToken = prevProps.accessToken;
-    if (accessToken && accessToken !== oldToken) {
-      dispatchFetchPlexResources({ accessToken });
-    }
-  }
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      isDisabled,
-      value,
-      values,
-      onChange
-    } = this.props;
-
-    return (
-      <PlexMachineInput
-        isFetching={isFetching}
-        isPopulated={isPopulated}
-        isDisabled={isDisabled}
-        value={value}
-        values={values}
-        onChange={onChange}
-        {...this.props}
-      />
-    );
-  }
-}
-
-PlexMachineInputConnector.propTypes = {
-  dispatchFetchPlexResources: PropTypes.func.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.string.isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  oAuth: PropTypes.object,
-  accessToken: PropTypes.string,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(PlexMachineInputConnector);

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/QualityProfileSelectInputConnector.js

@@ -47,6 +47,32 @@ function createMapStateToProps() {
 
 class QualityProfileSelectInputConnector extends Component {
 
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      name,
+      value,
+      values
+    } = this.props;
+
+    if (!value || !values.some((option) => option.key === value || parseInt(option.key) === value)) {
+      const firstValue = values.find((option) => !isNaN(parseInt(option.key)));
+
+      if (firstValue) {
+        this.onChange({ name, value: firstValue.key });
+      }
+    }
+  }
+
+  //
+  // Listeners
+
+  onChange = ({ name, value }) => {
+    this.props.onChange({ name, value: value === 'noChange' ? value : parseInt(value) });
+  };
+
   //
   // Render
 
@@ -54,7 +80,7 @@ class QualityProfileSelectInputConnector extends Component {
     return (
       <EnhancedSelectInput
         {...this.props}
-        onChange={this.props.onChange}
+        onChange={this.onChange}
       />
     );
   }
@@ -62,7 +88,7 @@ class QualityProfileSelectInputConnector extends Component {
 
 QualityProfileSelectInputConnector.propTypes = {
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.arrayOf(PropTypes.string)]),
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   includeNoChange: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired

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/Form/SelectInput.css

@@ -12,10 +12,6 @@
   composes: hasWarning from '~Components/Form/Input.css';
 }
 
-.hasButton {
-  composes: hasButton from '~Components/Form/Input.css';
-}
-
 .isDisabled {
   opacity: 0.7;
   cursor: not-allowed;

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

@@ -1,7 +1,6 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'hasButton': string;
   'hasError': string;
   'hasWarning': string;
   'isDisabled': string;

frontend/src/Components/Form/SelectInput.js

@@ -28,7 +28,6 @@ class SelectInput extends Component {
       isDisabled,
       hasError,
       hasWarning,
-      hasButton,
       autoFocus,
       onBlur
     } = this.props;
@@ -39,7 +38,6 @@ class SelectInput extends Component {
           className,
           hasError && styles.hasError,
           hasWarning && styles.hasWarning,
-          hasButton && styles.hasButton,
           isDisabled && disabledClassName
         )}
         disabled={isDisabled}
@@ -82,7 +80,6 @@ SelectInput.propTypes = {
   isDisabled: PropTypes.bool,
   hasError: PropTypes.bool,
   hasWarning: PropTypes.bool,
-  hasButton: PropTypes.bool,
   autoFocus: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired,
   onBlur: PropTypes.func

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

@@ -12,7 +12,7 @@ import styles from './PageHeaderActionsMenu.css';
 
 function PageHeaderActionsMenu(props) {
   const {
-    cookieAuth,
+    formsAuth,
     onKeyboardShortcutsPress,
     onRestartPress,
     onShutdownPress
@@ -24,6 +24,7 @@ function PageHeaderActionsMenu(props) {
         <MenuButton className={styles.menuButton} aria-label="Menu Button">
           <Icon
             name={icons.INTERACTIVE}
+            title={translate('Menu')}
           />
         </MenuButton>
 
@@ -56,20 +57,22 @@ function PageHeaderActionsMenu(props) {
           </MenuItem>
 
           {
-            cookieAuth &&
-              <>
-                <div className={styles.separator} />
-                <MenuItem
-                  to={`${window.Radarr.urlBase}/logout?ReturnUrl=/`}
-                  noRouter={true}
-                >
-                  <Icon
-                    className={styles.itemIcon}
-                    name={icons.LOGOUT}
-                  />
-                  Logout
-                </MenuItem>
-              </>
+            formsAuth &&
+              <div className={styles.separator} />
+          }
+
+          {
+            formsAuth &&
+              <MenuItem
+                to={`${window.Radarr.urlBase}/logout`}
+                noRouter={true}
+              >
+                <Icon
+                  className={styles.itemIcon}
+                  name={icons.LOGOUT}
+                />
+                Logout
+              </MenuItem>
           }
         </MenuContent>
       </Menu>
@@ -78,7 +81,7 @@ function PageHeaderActionsMenu(props) {
 }
 
 PageHeaderActionsMenu.propTypes = {
-  cookieAuth: PropTypes.bool.isRequired,
+  formsAuth: PropTypes.bool.isRequired,
   onKeyboardShortcutsPress: PropTypes.func.isRequired,
   onRestartPress: PropTypes.func.isRequired,
   onShutdownPress: PropTypes.func.isRequired

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

@@ -10,7 +10,7 @@ function createMapStateToProps() {
     (state) => state.system.status,
     (status) => {
       return {
-        cookieAuth: ['forms', 'oidc', 'plex'].includes(status.item.authentication)
+        formsAuth: status.item.authentication === 'forms'
       };
     }
   );

frontend/src/Components/QualityProfileList.css

@@ -1,3 +0,0 @@
-.tags {
-  flex: 1 0 auto;
-}

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

@@ -1,7 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'tags': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Components/QualityProfileList.tsx

@@ -1,46 +0,0 @@
-import _ from 'lodash';
-import React from 'react';
-import { useSelector } from 'react-redux';
-import { createSelector } from 'reselect';
-import AppState from 'App/State/AppState';
-import { kinds } from 'Helpers/Props';
-import Label from './Label';
-import styles from './QualityProfileList.css';
-
-interface QualityProfileListProps {
-  qualityProfileIds: number[];
-}
-
-function QualityProfileList(props: QualityProfileListProps) {
-  const { qualityProfileIds } = props;
-  const { qualityProfileList } = useSelector(
-    createSelector(
-      (state: AppState) => state.settings.qualityProfiles.items,
-      (qualityProfileList) => {
-        return {
-          qualityProfileList,
-        };
-      }
-    )
-  );
-
-  return (
-    <div className={styles.tags}>
-      {qualityProfileIds.map((t) => {
-        const qualityProfile = _.find(qualityProfileList, { id: t });
-
-        if (!qualityProfile) {
-          return null;
-        }
-
-        return (
-          <Label key={qualityProfile.id} kind={kinds.INFO}>
-            {qualityProfile.name}
-          </Label>
-        );
-      })}
-    </div>
-  );
-}
-
-export default QualityProfileList;

frontend/src/Components/QualityProfileListConnector.js

@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import QualityProfileList from './QualityProfileList';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.qualityProfiles.items,
-    (qualityProfileList) => {
-      return {
-        qualityProfileList
-      };
-    }
-  );
-}
-
-export default connect(createMapStateToProps)(QualityProfileList);

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

@@ -2,38 +2,19 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useRef } from 'react';
 import Alert from 'Components/Alert';
 import FormGroup from 'Components/Form/FormGroup';
-import FormInputButton from 'Components/Form/FormInputButton';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
-import OAuthInputConnector from 'Components/Form/OAuthInputConnector';
-import Icon from 'Components/Icon';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { icons, inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes, kinds } from 'Helpers/Props';
 import { authenticationMethodOptions, authenticationRequiredOptions } from 'Settings/General/SecuritySettings';
 import translate from 'Utilities/String/translate';
 import styles from './AuthenticationRequiredModalContent.css';
 
-const oauthData = {
-  implementation: { value: 'PlexImport' },
-  configContract: { value: 'PlexListSettings' },
-  fields: [
-    {
-      type: 'textbox',
-      name: 'accessToken'
-    },
-    {
-      type: 'oAuth',
-      name: 'signIn',
-      value: 'startAuth'
-    }
-  ]
-};
-
 function onModalClose() {
   // No-op
 }
@@ -41,7 +22,6 @@ function onModalClose() {
 function AuthenticationRequiredModalContent(props) {
   const {
     isPopulated,
-    plexServersPopulated,
     error,
     isSaving,
     settings,
@@ -55,17 +35,10 @@ function AuthenticationRequiredModalContent(props) {
     authenticationRequired,
     username,
     password,
-    plexAuthServer,
-    plexRequireOwner,
-    oidcClientId,
-    oidcClientSecret,
-    oidcAuthority
+    passwordConfirmation
   } = settings;
 
   const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
-  const showUserPass = authenticationMethod && ['basic', 'forms'].includes(authenticationMethod.value);
-  const plexEnabled = authenticationMethod && authenticationMethod.value === 'plex';
-  const oidcEnabled = authenticationMethod && authenticationMethod.value === 'oidc';
 
   const didMount = useRef(false);
 
@@ -91,7 +64,7 @@ function AuthenticationRequiredModalContent(props) {
           className={styles.authRequiredAlert}
           kind={kinds.WARNING}
         >
-          {translate('AuthenticationRequiredWarning', { appName: 'Radarr' })}
+          {translate('AuthenticationRequiredWarning')}
         </Alert>
 
         {
@@ -104,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}
@@ -125,111 +98,41 @@ function AuthenticationRequiredModalContent(props) {
                 />
               </FormGroup>
 
-              {
-                showUserPass &&
-                  <>
-                    <FormGroup>
-                      <FormLabel>{translate('Username')}</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('Username')}</FormLabel>
 
-                      <FormInputGroup
-                        type={inputTypes.TEXT}
-                        name="username"
-                        onChange={onInputChange}
-                        helpTextWarning={username?.value ? undefined : translate('AuthenticationRequiredUsernameHelpTextWarning')}
-                        {...username}
-                      />
-                    </FormGroup>
+                <FormInputGroup
+                  type={inputTypes.TEXT}
+                  name="username"
+                  onChange={onInputChange}
+                  helpTextWarning={username?.value ? undefined : translate('AuthenticationRequiredUsernameHelpTextWarning')}
+                  {...username}
+                />
+              </FormGroup>
 
-                    <FormGroup>
-                      <FormLabel>{translate('Password')}</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('Password')}</FormLabel>
 
-                      <FormInputGroup
-                        type={inputTypes.PASSWORD}
-                        name="password"
-                        onChange={onInputChange}
-                        helpTextWarning={password?.value ? undefined : translate('AuthenticationRequiredPasswordHelpTextWarning')}
-                        {...password}
-                      />
-                    </FormGroup>
-                  </>
-              }
+                <FormInputGroup
+                  type={inputTypes.PASSWORD}
+                  name="password"
+                  onChange={onInputChange}
+                  helpTextWarning={password?.value ? undefined : translate('AuthenticationRequiredPasswordHelpTextWarning')}
+                  {...password}
+                />
+              </FormGroup>
 
-              {
-                plexEnabled &&
-                  <>
-                    <FormGroup>
-                      <FormLabel>Plex Server</FormLabel>
+              <FormGroup>
+                <FormLabel>{translate('PasswordConfirmation')}</FormLabel>
 
-                      <FormInputGroup
-                        type={inputTypes.PLEX_MACHINE_SELECT}
-                        name="plexAuthServer"
-                        buttons={[
-                          <FormInputButton
-                            key="auth"
-                            ButtonComponent={OAuthInputConnector}
-                            label={plexServersPopulated ? <Icon name={icons.REFRESH} /> : 'Fetch'}
-                            name="plexAuth"
-                            provider="importList"
-                            providerData={oauthData}
-                            section="settings.importLists"
-                            onChange={onInputChange}
-                          />
-                        ]}
-                        onChange={onInputChange}
-                        {...plexAuthServer}
-                      />
-                    </FormGroup>
-
-                    <FormGroup>
-                      <FormLabel>Restrict Access to Server Owner</FormLabel>
-
-                      <FormInputGroup
-                        type={inputTypes.CHECK}
-                        name="plexRequireOwner"
-                        onChange={onInputChange}
-                        {...plexRequireOwner}
-                      />
-                    </FormGroup>
-                  </>
-              }
-
-              {
-                oidcEnabled &&
-                  <>
-                    <FormGroup>
-                      <FormLabel>Authority</FormLabel>
-
-                      <FormInputGroup
-                        type={inputTypes.TEXT}
-                        name="oidcAuthority"
-                        onChange={onInputChange}
-                        {...oidcAuthority}
-                      />
-                    </FormGroup>
-
-                    <FormGroup>
-                      <FormLabel>ClientId</FormLabel>
-
-                      <FormInputGroup
-                        type={inputTypes.TEXT}
-                        name="oidcClientId"
-                        onChange={onInputChange}
-                        {...oidcClientId}
-                      />
-                    </FormGroup>
-
-                    <FormGroup>
-                      <FormLabel>ClientSecret</FormLabel>
-
-                      <FormInputGroup
-                        type={inputTypes.PASSWORD}
-                        name="oidcClientSecret"
-                        onChange={onInputChange}
-                        {...oidcClientSecret}
-                      />
-                    </FormGroup>
-                  </>
-              }
+                <FormInputGroup
+                  type={inputTypes.PASSWORD}
+                  name="passwordConfirmation"
+                  onChange={onInputChange}
+                  helpTextWarning={passwordConfirmation?.value ? undefined : translate('AuthenticationRequiredPasswordConfirmationHelpTextWarning')}
+                  {...passwordConfirmation}
+                />
+              </FormGroup>
             </div> :
             null
         }
@@ -255,7 +158,6 @@ function AuthenticationRequiredModalContent(props) {
 
 AuthenticationRequiredModalContent.propTypes = {
   isPopulated: PropTypes.bool.isRequired,
-  plexServersPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,

frontend/src/FirstRun/AuthenticationRequiredModalContentConnector.js

@@ -13,11 +13,9 @@ const SECTION = 'general';
 function createMapStateToProps() {
   return createSelector(
     createSettingsSectionSelector(SECTION),
-    (state) => state.settings.plex,
-    (sectionSettings, plex) => {
+    (sectionSettings) => {
       return {
-        ...sectionSettings,
-        plexServersPopulated: plex.isPopulated
+        ...sectionSettings
       };
     }
   );

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';