Fixed: Use movie file from state for status label in add search results

.devcontainer/Radarr.code-workspace

@@ -1,13 +0,0 @@
-// This file is used to open the backend and frontend in the same workspace, which is necessary as
-// the frontend has vscode settings that are distinct from the backend
-{
-  "folders": [
-    {
-      "path": ".."
-    },
-    {
-      "path": "../frontend"
-    }
-  ],
-  "settings": {}
-}

.devcontainer/devcontainer.json

@@ -1,19 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
-{
-  "name": "Radarr",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0",
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "nodeGypDependencies": true,
-      "version": "16",
-      "nvmVersion": "latest"
-    }
-  },
-  "forwardPorts": [7878],
-  "customizations": {
-    "vscode": {
-      "extensions": ["esbenp.prettier-vscode"]
-    }
-  }
-}

.github/dependabot.yml

@@ -1,12 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for more information:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-# https://containers.dev/guide/dependabot
-
-version: 2
-updates:
- - package-ecosystem: "devcontainers"
-   directory: "/"
-   schedule:
-     interval: weekly

.gitignore

@@ -126,7 +126,6 @@ coverage*.xml
 coverage*.json
 setup/Output/
 *.~is
-.mono
 
 # VS outout folders
 bin

.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-  "recommendations": [
-    "esbenp.prettier-vscode",
-    "ms-dotnettools.csdevkit",
-    "ms-vscode-remote.remote-containers"
-  ]
-}

.vscode/launch.json

@@ -1,26 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      // Use IntelliSense to find out which attributes exist for C# debugging
-      // Use hover for the description of the existing attributes
-      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
-      "name": "Run Radarr",
-      "type": "coreclr",
-      "request": "launch",
-      "preLaunchTask": "build dotnet",
-      // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/_output/net6.0/Radarr",
-      "args": [],
-      "cwd": "${workspaceFolder}",
-      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-      "console": "integratedTerminal",
-      "stopAtEntry": false
-    },
-    {
-      "name": ".NET Core Attach",
-      "type": "coreclr",
-      "request": "attach"
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,44 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "build dotnet",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "msbuild",
-        "-restore",
-        "${workspaceFolder}/src/Radarr.sln",
-        "-p:GenerateFullPaths=true",
-        "-p:Configuration=Debug",
-        "-p:Platform=Posix",
-        "-consoleloggerparameters:NoSummary;ForceNoAlign"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "publish",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "publish",
-        "${workspaceFolder}/src/Radarr.sln",
-        "-property:GenerateFullPaths=true",
-        "-consoleloggerparameters:NoSummary;ForceNoAlign"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "watch",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "watch",
-        "run",
-        "--project",
-        "${workspaceFolder}/src/Radarr.sln"
-      ],
-      "problemMatcher": "$msCompile"
-    }
-  ]
-}

azure-pipelines.yml

@@ -9,18 +9,18 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.8.3'
+  majorVersion: '5.3.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.424'
-  nodeVersion: '20.X'
+  dotnetVersion: '6.0.417'
+  nodeVersion: '16.X'
   innoVersion: '6.2.2'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-12'
+  macImage: 'macOS-11'
 
 trigger:
   branches:
@@ -166,10 +166,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: UseNode@1
+      - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          version: $(nodeVersion)
+          versionSpec: $(nodeVersion)
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -1089,10 +1089,10 @@ stages:
       pool:
         vmImage: $(imageName)
       steps:
-      - task: UseNode@1
+      - task: NodeTool@0
         displayName: Set Node.js version
         inputs:
-          version: $(nodeVersion)
+          versionSpec: $(nodeVersion)
       - checkout: self
         submodules: true
         fetchDepth: 1
@@ -1116,7 +1116,7 @@ stages:
         vmImage: ${{ variables.windowsImage }}
       steps:
       - checkout: self # Need history for Sonar analysis
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@1
         env:
           SONAR_SCANNER_OPTS: ''
         inputs:
@@ -1128,7 +1128,7 @@ stages:
           cliProjectName: 'RadarrUI'
           cliProjectVersion: '$(radarrVersion)'
           cliSources: './frontend'
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@1
       
     - job: Api_Docs
       displayName: API Docs
@@ -1205,7 +1205,7 @@ stages:
         submodules: true
       - powershell: Set-Service SCardSvr -StartupType Manual
         displayName: Enable Windows Test Service
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
           SonarCloud: 'SonarCloud'
@@ -1223,16 +1223,21 @@ stages:
           ./build.sh --backend -f net6.0 -r win-x64
           TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@1
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
-      - task: reportgenerator@5
+      - task: reportgenerator@4
         displayName: Generate Coverage Report
         inputs:
           reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
           targetdir: '$(Build.SourcesDirectory)/CoverageResults/combined'
           reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
-          publishCodeCoverageResults: true
+      - task: PublishCodeCoverageResults@1
+        displayName: Publish Coverage Report
+        inputs:
+          codeCoverageTool: 'cobertura'
+          summaryFileLocation: './CoverageResults/combined/Cobertura.xml'
+          reportDirectory: './CoverageResults/combined/'
 
   - stage: Report_Out
     dependsOn:

docs.sh

@@ -21,21 +21,15 @@ slnFile=src/Radarr.sln
 
 platform=Posix
 
-if [ "$PLATFORM" = "Windows" ]; then
-  application=Radarr.Console.dll
-else
-  application=Radarr.dll
-fi
-
 dotnet clean $slnFile -c Debug
 dotnet clean $slnFile -c Release
 
 dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
 
 dotnet new tool-manifest
-dotnet tool install --version 6.6.2 Swashbuckle.AspNetCore.Cli
+dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli
 
-dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/$application" v3 &
+dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/radarr.console.dll" v3 &
 
 sleep 45
 

frontend/babel.config.js

@@ -2,8 +2,6 @@ const loose = true;
 
 module.exports = {
   plugins: [
-    '@babel/plugin-transform-logical-assignment-operators',
-
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
     ['@babel/plugin-transform-optional-chaining', { loose }],

frontend/src/Activity/Blocklist/Blocklist.js

@@ -2,7 +2,6 @@ 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 ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
@@ -21,7 +20,6 @@ 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 BlocklistFilterModal from './BlocklistFilterModal';
 import BlocklistRowConnector from './BlocklistRowConnector';
 
 class Blocklist extends Component {
@@ -116,13 +114,9 @@ class Blocklist extends Component {
       error,
       items,
       columns,
-      selectedFilterKey,
-      filters,
-      customFilters,
       totalRecords,
       isRemoving,
       isClearingBlocklistExecuting,
-      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -167,15 +161,6 @@ class Blocklist extends Component {
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
-
-            <FilterMenu
-              alignMenu={align.RIGHT}
-              selectedFilterKey={selectedFilterKey}
-              filters={filters}
-              customFilters={customFilters}
-              filterModalConnectorComponent={BlocklistFilterModal}
-              onFilterSelect={onFilterSelect}
-            />
           </PageToolbarSection>
         </PageToolbar>
 
@@ -195,11 +180,7 @@ class Blocklist extends Component {
           {
             isPopulated && !error && !items.length &&
               <Alert kind={kinds.INFO}>
-                {
-                  selectedFilterKey === 'all' ?
-                    translate('NoHistoryBlocklist') :
-                    translate('BlocklistFilterHasNoItems')
-                }
+                {translate('NoHistoryBlocklist')}
               </Alert>
           }
 
@@ -270,15 +251,11 @@ Blocklist.propTypes = {
   error: 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,
   totalRecords: PropTypes.number,
   isRemoving: PropTypes.bool.isRequired,
   isClearingBlocklistExecuting: PropTypes.bool.isRequired,
   onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired,
-  onFilterSelect: PropTypes.func.isRequired
+  onClearBlocklistPress: PropTypes.func.isRequired
 };
 
 export default Blocklist;

frontend/src/Activity/Blocklist/BlocklistConnector.js

@@ -6,7 +6,6 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import * as blocklistActions from 'Store/Actions/blocklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import Blocklist from './Blocklist';
@@ -14,12 +13,10 @@ import Blocklist from './Blocklist';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.blocklist,
-    createCustomFiltersSelector('blocklist'),
     createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
-    (blocklist, customFilters, isClearingBlocklistExecuting) => {
+    (blocklist, isClearingBlocklistExecuting) => {
       return {
         isClearingBlocklistExecuting,
-        customFilters,
         ...blocklist
       };
     }
@@ -100,14 +97,6 @@ class BlocklistConnector extends Component {
     this.props.setBlocklistSort({ sortKey });
   };
 
-  onFilterSelect = (selectedFilterKey) => {
-    this.props.setBlocklistFilter({ selectedFilterKey });
-  };
-
-  onClearBlocklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  };
-
   onTableOptionChange = (payload) => {
     this.props.setBlocklistTableOption(payload);
 
@@ -116,6 +105,10 @@ class BlocklistConnector extends Component {
     }
   };
 
+  onClearBlocklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
+  };
+
   //
   // Render
 
@@ -129,7 +122,6 @@ class BlocklistConnector extends Component {
         onPageSelect={this.onPageSelect}
         onRemoveSelected={this.onRemoveSelected}
         onSortPress={this.onSortPress}
-        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onClearBlocklistPress={this.onClearBlocklistPress}
         {...this.props}
@@ -150,7 +142,6 @@ BlocklistConnector.propTypes = {
   gotoBlocklistPage: PropTypes.func.isRequired,
   removeBlocklistItems: PropTypes.func.isRequired,
   setBlocklistSort: PropTypes.func.isRequired,
-  setBlocklistFilter: PropTypes.func.isRequired,
   setBlocklistTableOption: PropTypes.func.isRequired,
   clearBlocklist: PropTypes.func.isRequired,
   executeCommand: PropTypes.func.isRequired

frontend/src/Activity/Blocklist/BlocklistFilterModal.tsx

@@ -1,54 +0,0 @@
-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 { setBlocklistFilter } from 'Store/Actions/blocklistActions';
-
-function createBlocklistSelector() {
-  return createSelector(
-    (state: AppState) => state.blocklist.items,
-    (blocklistItems) => {
-      return blocklistItems;
-    }
-  );
-}
-
-function createFilterBuilderPropsSelector() {
-  return createSelector(
-    (state: AppState) => state.blocklist.filterBuilderProps,
-    (filterBuilderProps) => {
-      return filterBuilderProps;
-    }
-  );
-}
-
-interface BlocklistFilterModalProps {
-  isOpen: boolean;
-}
-
-export default function BlocklistFilterModal(props: BlocklistFilterModalProps) {
-  const sectionItems = useSelector(createBlocklistSelector());
-  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
-  const customFilterType = 'blocklist';
-
-  const dispatch = useDispatch();
-
-  const dispatchSetFilter = useCallback(
-    (payload: unknown) => {
-      dispatch(setBlocklistFilter(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

@@ -25,7 +25,7 @@ import toggleSelected from 'Utilities/Table/toggleSelected';
 import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
-import RemoveQueueItemModal from './RemoveQueueItemModal';
+import RemoveQueueItemsModal from './RemoveQueueItemsModal';
 
 class Queue extends Component {
 
@@ -219,7 +219,6 @@ class Queue extends Component {
           >
             <TableOptionsModalWrapper
               columns={columns}
-              maxPageSize={200}
               {...otherProps}
               optionsComponent={QueueOptionsConnector}
             >
@@ -308,16 +307,9 @@ class Queue extends Component {
           }
         </PageContentBody>
 
-        <RemoveQueueItemModal
+        <RemoveQueueItemsModal
           isOpen={isConfirmRemoveModalOpen}
           selectedCount={selectedCount}
-          canChangeCategory={isConfirmRemoveModalOpen && (
-            selectedIds.every((id) => {
-              const item = items.find((i) => i.id === id);
-
-              return !!(item && item.downloadClientHasPostImportCategory);
-            })
-          )}
           canIgnore={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
@@ -325,7 +317,7 @@ class Queue extends Component {
               return !!(item && item.movieId);
             })
           )}
-          pending={isConfirmRemoveModalOpen && (
+          allPending={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
 

frontend/src/Activity/Queue/QueueRow.js

@@ -96,7 +96,6 @@ class QueueRow extends Component {
       indexer,
       outputPath,
       downloadClient,
-      downloadClientHasPostImportCategory,
       estimatedCompletionTime,
       added,
       timeleft,
@@ -374,7 +373,6 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
-          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!movie}
           isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
@@ -404,7 +402,6 @@ QueueRow.propTypes = {
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
-  downloadClientHasPostImportCategory: PropTypes.bool,
   estimatedCompletionTime: PropTypes.string,
   added: PropTypes.string,
   timeleft: PropTypes.string,

frontend/src/Activity/Queue/QueueStatus.js

@@ -70,11 +70,6 @@ function QueueStatus(props) {
     iconName = icons.DOWNLOADED;
     title = translate('Downloaded');
 
-    if (trackedDownloadState === 'importBlocked') {
-      title += ` - ${translate('UnableToImportAutomatically')}`;
-      iconKind = kinds.WARNING;
-    }
-
     if (trackedDownloadState === 'importPending') {
       title += ` - ${translate('WaitingToImport')}`;
       iconKind = kinds.PURPLE;

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -0,0 +1,171 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+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 { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+
+class RemoveQueueItemModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    };
+  }
+
+  //
+  // Control
+
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    });
+  };
+
+  //
+  // Listeners
+
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  };
+
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  };
+
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  };
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      sourceTitle,
+      canIgnore,
+      isPending
+    } = this.props;
+
+    const { remove, blocklist, skipRedownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            {translate('RemoveQueueItem', { sourceTitle })}
+          </ModalHeader>
+
+          <ModalBody>
+            <div>
+              {translate('RemoveQueueItemConfirmation', { sourceTitle })}
+            </div>
+
+            {
+              isPending ?
+                null :
+                <FormGroup>
+                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }
+
+            <FormGroup>
+              <FormLabel>{translate('BlocklistRelease')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
+              />
+            </FormGroup>
+
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              {translate('Close')}
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              {translate('Remove')}
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  sourceTitle: PropTypes.string.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  isPending: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemModal.tsx

@@ -1,231 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-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 { inputTypes, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './RemoveQueueItemModal.css';
-
-interface RemovePressProps {
-  remove: boolean;
-  changeCategory: boolean;
-  blocklist: boolean;
-  skipRedownload: boolean;
-}
-
-interface RemoveQueueItemModalProps {
-  isOpen: boolean;
-  sourceTitle: string;
-  canChangeCategory: boolean;
-  canIgnore: boolean;
-  isPending: boolean;
-  selectedCount?: number;
-  onRemovePress(props: RemovePressProps): void;
-  onModalClose: () => void;
-}
-
-type RemovalMethod = 'removeFromClient' | 'changeCategory' | 'ignore';
-type BlocklistMethod =
-  | 'doNotBlocklist'
-  | 'blocklistAndSearch'
-  | 'blocklistOnly';
-
-function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
-  const {
-    isOpen,
-    sourceTitle,
-    canIgnore,
-    canChangeCategory,
-    isPending,
-    selectedCount,
-    onRemovePress,
-    onModalClose,
-  } = props;
-
-  const multipleSelected = selectedCount && selectedCount > 1;
-
-  const [removalMethod, setRemovalMethod] =
-    useState<RemovalMethod>('removeFromClient');
-  const [blocklistMethod, setBlocklistMethod] =
-    useState<BlocklistMethod>('doNotBlocklist');
-
-  const { title, message } = useMemo(() => {
-    if (!selectedCount) {
-      return {
-        title: translate('RemoveQueueItem', { sourceTitle }),
-        message: translate('RemoveQueueItemConfirmation', { sourceTitle }),
-      };
-    }
-
-    if (selectedCount === 1) {
-      return {
-        title: translate('RemoveSelectedItem'),
-        message: translate('RemoveSelectedItemQueueMessageText'),
-      };
-    }
-
-    return {
-      title: translate('RemoveSelectedItems'),
-      message: translate('RemoveSelectedItemsQueueMessageText', {
-        selectedCount,
-      }),
-    };
-  }, [sourceTitle, selectedCount]);
-
-  const removalMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'removeFromClient',
-        value: translate('RemoveFromDownloadClient'),
-        hint: multipleSelected
-          ? translate('RemoveMultipleFromDownloadClientHint')
-          : translate('RemoveFromDownloadClientHint'),
-      },
-      {
-        key: 'changeCategory',
-        value: translate('ChangeCategory'),
-        isDisabled: !canChangeCategory,
-        hint: multipleSelected
-          ? translate('ChangeCategoryMultipleHint')
-          : translate('ChangeCategoryHint'),
-      },
-      {
-        key: 'ignore',
-        value: multipleSelected
-          ? translate('IgnoreDownloads')
-          : translate('IgnoreDownload'),
-        isDisabled: !canIgnore,
-        hint: multipleSelected
-          ? translate('IgnoreDownloadsHint')
-          : translate('IgnoreDownloadHint'),
-      },
-    ];
-  }, [canChangeCategory, canIgnore, multipleSelected]);
-
-  const blocklistMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'doNotBlocklist',
-        value: translate('DoNotBlocklist'),
-        hint: translate('DoNotBlocklistHint'),
-      },
-      {
-        key: 'blocklistAndSearch',
-        value: translate('BlocklistAndSearch'),
-        isDisabled: isPending,
-        hint: multipleSelected
-          ? translate('BlocklistAndSearchMultipleHint')
-          : translate('BlocklistAndSearchHint'),
-      },
-      {
-        key: 'blocklistOnly',
-        value: translate('BlocklistOnly'),
-        hint: multipleSelected
-          ? translate('BlocklistMultipleOnlyHint')
-          : translate('BlocklistOnlyHint'),
-      },
-    ];
-  }, [isPending, multipleSelected]);
-
-  const handleRemovalMethodChange = useCallback(
-    ({ value }: { value: RemovalMethod }) => {
-      setRemovalMethod(value);
-    },
-    [setRemovalMethod]
-  );
-
-  const handleBlocklistMethodChange = useCallback(
-    ({ value }: { value: BlocklistMethod }) => {
-      setBlocklistMethod(value);
-    },
-    [setBlocklistMethod]
-  );
-
-  const handleConfirmRemove = useCallback(() => {
-    onRemovePress({
-      remove: removalMethod === 'removeFromClient',
-      changeCategory: removalMethod === 'changeCategory',
-      blocklist: blocklistMethod !== 'doNotBlocklist',
-      skipRedownload: blocklistMethod === 'blocklistOnly',
-    });
-
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-  }, [
-    removalMethod,
-    blocklistMethod,
-    setRemovalMethod,
-    setBlocklistMethod,
-    onRemovePress,
-  ]);
-
-  const handleModalClose = useCallback(() => {
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-
-    onModalClose();
-  }, [setRemovalMethod, setBlocklistMethod, onModalClose]);
-
-  return (
-    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={handleModalClose}>
-      <ModalContent onModalClose={handleModalClose}>
-        <ModalHeader>{title}</ModalHeader>
-
-        <ModalBody>
-          <div className={styles.message}>{message}</div>
-
-          {isPending ? null : (
-            <FormGroup>
-              <FormLabel>{translate('RemoveQueueItemRemovalMethod')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.SELECT}
-                name="removalMethod"
-                value={removalMethod}
-                values={removalMethodOptions}
-                isDisabled={!canChangeCategory && !canIgnore}
-                helpTextWarning={translate(
-                  'RemoveQueueItemRemovalMethodHelpTextWarning'
-                )}
-                onChange={handleRemovalMethodChange}
-              />
-            </FormGroup>
-          )}
-
-          <FormGroup>
-            <FormLabel>
-              {multipleSelected
-                ? translate('BlocklistReleases')
-                : translate('BlocklistRelease')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.SELECT}
-              name="blocklistMethod"
-              value={blocklistMethod}
-              values={blocklistMethodOptions}
-              helpText={translate('BlocklistReleaseHelpText')}
-              onChange={handleBlocklistMethodChange}
-            />
-          </FormGroup>
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={handleModalClose}>{translate('Close')}</Button>
-
-          <Button kind={kinds.DANGER} onPress={handleConfirmRemove}>
-            {translate('Remove')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
-
-export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -0,0 +1,174 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+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 { inputTypes, kinds, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './RemoveQueueItemsModal.css';
+
+class RemoveQueueItemsModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    };
+  }
+
+  //
+  // Control
+
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blocklist: false,
+      skipRedownload: false
+    });
+  };
+
+  //
+  // Listeners
+
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  };
+
+  onBlocklistChange = ({ value }) => {
+    this.setState({ blocklist: value });
+  };
+
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  };
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      selectedCount,
+      canIgnore,
+      allPending
+    } = this.props;
+
+    const { remove, blocklist, skipRedownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            {selectedCount > 1 ? translate('RemoveSelectedItems') : translate('RemoveSelectedItem')}
+          </ModalHeader>
+
+          <ModalBody>
+            <div className={styles.message}>
+              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', { selectedCount }) : translate('RemoveSelectedItemQueueMessageText')}
+            </div>
+
+            {
+              allPending ?
+                null :
+                <FormGroup>
+                  <FormLabel>{translate('RemoveFromDownloadClient')}</FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="remove"
+                    value={remove}
+                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    isDisabled={!canIgnore}
+                    onChange={this.onRemoveChange}
+                  />
+                </FormGroup>
+            }
+
+            <FormGroup>
+              <FormLabel>
+                {selectedCount > 1 ? translate('BlocklistReleases') : translate('BlocklistRelease')}
+              </FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blocklist"
+                value={blocklist}
+                helpText={translate('BlocklistReleaseHelpText')}
+                onChange={this.onBlocklistChange}
+              />
+            </FormGroup>
+
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              {translate('Close')}
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              {translate('Remove')}
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemsModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  selectedCount: PropTypes.number.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  allPending: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemsModal;

frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js

@@ -69,7 +69,7 @@ class AddNewMovieConnector extends Component {
       const movieIds = selectUniqueIds(items, 'internalId');
 
       if (movieIds.length) {
-        this.props.fetchMovieFiles({ movieId: movieIds });
+        movieIds.map((movieId) => this.props.fetchMovieFiles({ movieId }));
       }
     }
   }

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -75,6 +75,7 @@ class AddNewMovieSearchResult extends Component {
       colorImpairedMode,
       id,
       monitored,
+      hasFile,
       isAvailable,
       movieFile,
       queueItem,
@@ -87,8 +88,6 @@ class AddNewMovieSearchResult extends Component {
       isNewAddMovieModalOpen
     } = this.state;
 
-    const hasMovieFile = !!movieFile;
-
     const linkProps = isExistingMovie ? { to: `/movie/${titleSlug}` } : { onPress: this.onPress };
     const posterWidth = 167;
     const posterHeight = 250;
@@ -127,7 +126,7 @@ class AddNewMovieSearchResult extends Component {
                       movieId={existingMovieId}
                       movieFile={movieFile}
                       monitored={monitored}
-                      hasFile={hasMovieFile}
+                      hasFile={hasFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
@@ -271,7 +270,7 @@ class AddNewMovieSearchResult extends Component {
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    hasMovieFiles={hasMovieFile}
+                    hasMovieFiles={hasFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
                     queueItem={queueItem}
@@ -323,6 +322,7 @@ AddNewMovieSearchResult.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   id: PropTypes.number,
   monitored: PropTypes.bool.isRequired,
+  hasFile: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
   queueItem: PropTypes.object,

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -25,6 +25,7 @@ function createMapStateToProps() {
         isSmallScreen: dimensions.isSmallScreen,
         queueItem,
         movieFile,
+        hasFile: !!movieFile,
         movieRuntimeFormat
       };
     }

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

@@ -10,7 +10,6 @@ import styles from './ImportMovieRow.css';
 function ImportMovieRow(props) {
   const {
     id,
-    relativePath,
     monitor,
     qualityProfileId,
     minimumAvailability,
@@ -32,7 +31,7 @@ function ImportMovieRow(props) {
       />
 
       <VirtualTableRowCell className={styles.folder}>
-        {relativePath}
+        {id}
       </VirtualTableRowCell>
 
       <VirtualTableRowCell className={styles.movie}>
@@ -74,7 +73,6 @@ function ImportMovieRow(props) {
 
 ImportMovieRow.propTypes = {
   id: PropTypes.string.isRequired,
-  relativePath: PropTypes.string.isRequired,
   monitor: PropTypes.string.isRequired,
   qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,

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

@@ -30,7 +30,7 @@ class ImportMovieTable extends Component {
     unmappedFolders.forEach((unmappedFolder) => {
       const id = unmappedFolder.name;
 
-      onMovieLookup(id, unmappedFolder.path, unmappedFolder.relativePath);
+      onMovieLookup(id, unmappedFolder.path);
 
       onSetImportMovieValue({
         id,

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

@@ -25,11 +25,10 @@ function createMapStateToProps() {
 
 function createMapDispatchToProps(dispatch, props) {
   return {
-    onMovieLookup(name, path, relativePath) {
+    onMovieLookup(name, path) {
       dispatch(queueLookupMovie({
         name,
         path,
-        relativePath,
         term: name
       }));
     },

frontend/src/App/App.js

@@ -12,10 +12,11 @@ function App({ store, history }) {
     <DocumentTitle title={window.Radarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
-          <ApplyTheme />
-          <PageConnector>
-            <AppRoutes app={App} />
-          </PageConnector>
+          <ApplyTheme>
+            <PageConnector>
+              <AppRoutes app={App} />
+            </PageConnector>
+          </ApplyTheme>
         </ConnectedRouter>
       </Provider>
     </DocumentTitle>

frontend/src/App/AppRoutes.js

@@ -33,8 +33,6 @@ import Status from 'System/Status/Status';
 import Tasks from 'System/Tasks/Tasks';
 import UpdatesConnector from 'System/Updates/UpdatesConnector';
 import getPathWithUrlBase from 'Utilities/getPathWithUrlBase';
-import CutoffUnmetConnector from 'Wanted/CutoffUnmet/CutoffUnmetConnector';
-import MissingConnector from 'Wanted/Missing/MissingConnector';
 
 function AppRoutes(props) {
   const {
@@ -123,20 +121,6 @@ function AppRoutes(props) {
         component={BlocklistConnector}
       />
 
-      {/*
-        Wanted
-      */}
-
-      <Route
-        path="/wanted/missing"
-        component={MissingConnector}
-      />
-
-      <Route
-        path="/wanted/cutoffunmet"
-        component={CutoffUnmetConnector}
-      />
-
       {/*
         Settings
       */}

frontend/src/App/ApplyTheme.js

@@ -0,0 +1,49 @@
+import PropTypes from 'prop-types';
+import React, { Fragment, useCallback, useEffect } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import themes from 'Styles/Themes';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.ui.item.theme || window.Radarr.theme,
+    (
+      theme
+    ) => {
+      return {
+        theme
+      };
+    }
+  );
+}
+
+function ApplyTheme({ theme, children }) {
+  // Update the CSS Variables
+  const updateCSSVariables = useCallback(() => {
+    const arrayOfVariableKeys = Object.keys(themes[theme]);
+    const arrayOfVariableValues = Object.values(themes[theme]);
+
+    // Loop through each array key and set the CSS Variables
+    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
+      // Based on our snippet from MDN
+      document.documentElement.style.setProperty(
+        `--${cssVariableKey}`,
+        arrayOfVariableValues[index]
+      );
+    });
+  }, [theme]);
+
+  // On Component Mount and Component Update
+  useEffect(() => {
+    updateCSSVariables(theme);
+  }, [updateCSSVariables, theme]);
+
+  return <Fragment>{children}</Fragment>;
+}
+
+ApplyTheme.propTypes = {
+  theme: PropTypes.string.isRequired,
+  children: PropTypes.object.isRequired
+};
+
+export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/App/ApplyTheme.tsx

@@ -1,37 +0,0 @@
-import React, { Fragment, ReactNode, useCallback, useEffect } from 'react';
-import { useSelector } from 'react-redux';
-import { createSelector } from 'reselect';
-import themes from 'Styles/Themes';
-import AppState from './State/AppState';
-
-interface ApplyThemeProps {
-  children: ReactNode;
-}
-
-function createThemeSelector() {
-  return createSelector(
-    (state: AppState) => state.settings.ui.item.theme || window.Radarr.theme,
-    (theme) => {
-      return theme;
-    }
-  );
-}
-
-function ApplyTheme({ children }: ApplyThemeProps) {
-  const theme = useSelector(createThemeSelector());
-
-  const updateCSSVariables = useCallback(() => {
-    Object.entries(themes[theme]).forEach(([key, value]) => {
-      document.documentElement.style.setProperty(`--${key}`, value);
-    });
-  }, [theme]);
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables();
-  }, [updateCSSVariables, theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-export default ApplyTheme;

frontend/src/App/State/AppState.ts

@@ -1,5 +1,4 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
-import BlocklistAppState from './BlocklistAppState';
 import CalendarAppState from './CalendarAppState';
 import CommandAppState from './CommandAppState';
 import HistoryAppState from './HistoryAppState';
@@ -55,7 +54,6 @@ export interface AppSectionState {
 
 interface AppState {
   app: AppSectionState;
-  blocklist: BlocklistAppState;
   calendar: CalendarAppState;
   commands: CommandAppState;
   history: HistoryAppState;

frontend/src/App/State/BlocklistAppState.ts

@@ -1,8 +0,0 @@
-import Blocklist from 'typings/Blocklist';
-import AppSectionState, { AppSectionFilterState } from './AppSectionState';
-
-interface BlocklistAppState
-  extends AppSectionState<Blocklist>,
-    AppSectionFilterState<Blocklist> {}
-
-export default BlocklistAppState;

frontend/src/App/State/MoviesAppState.ts

@@ -25,7 +25,6 @@ export interface MovieIndexAppState {
     showTmdbRating: boolean;
     showImdbRating: boolean;
     showRottenTomatoesRating: boolean;
-    showTags: boolean;
     showSearchAction: boolean;
   };
 
@@ -38,7 +37,6 @@ export interface MovieIndexAppState {
     showAdded: boolean;
     showPath: boolean;
     showSizeOnDisk: boolean;
-    showTags: boolean;
     showSearchAction: boolean;
   };
 

frontend/src/Calendar/Agenda/AgendaEvent.js

@@ -147,7 +147,7 @@ class AgendaEvent extends Component {
                   className={styles.statusIcon}
                   name={icons.MOVIE_FILE}
                   kind={kinds.WARNING}
-                  title={translate('QualityCutoffNotMet')}
+                  title={translate('QualityCutoffHasNotBeenMet')}
                 />
             }
           </div>

frontend/src/Calendar/Calendar.js

@@ -33,7 +33,9 @@ class Calendar extends Component {
 
         {
           !isFetching && !!error &&
-            <Alert kind={kinds.DANGER}>{translate('CalendarLoadError')}</Alert>
+            <Alert kind={kinds.DANGER}>
+              {translate('UnableToLoadTheCalendar')}
+            </Alert>
         }
 
         {

frontend/src/Calendar/CalendarPage.js

@@ -104,7 +104,7 @@ class CalendarPage extends Component {
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('ICalLink')}
+              label={translate('iCalLink')}
               iconName={icons.CALENDAR}
               onPress={this.onGetCalendarLinkPress}
             />
@@ -112,7 +112,7 @@ class CalendarPage extends Component {
             <PageToolbarSeparator />
 
             <PageToolbarButton
-              label={translate('RssSync')}
+              label={translate('RSSSync')}
               iconName={icons.RSS}
               isSpinning={isRssSyncExecuting}
               onPress={onRssSyncPress}
@@ -180,7 +180,7 @@ class CalendarPage extends Component {
 
           {
             !movieError && movieIsPopulated && !hasMovie &&
-              <NoMovie totalItems={0} />
+              <NoMovie />
           }
 
           {

frontend/src/Calendar/Events/CalendarEvent.css

@@ -48,10 +48,6 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
 .statusContainer {
   display: flex;
   align-items: center;
-
-  &:global(.fullColor) {
-    filter: var(--calendarFullColorFilter)
-  }
 }
 
 .statusIcon {

frontend/src/Calendar/Events/CalendarEvent.js

@@ -76,18 +76,12 @@ class CalendarEvent extends Component {
               {title}
             </div>
 
-            <div
-              className={classNames(
-                styles.statusContainer,
-                fullColorEvents && 'fullColor'
-              )}
-            >
+            <div className={styles.statusContainer}>
               {
                 queueItem ?
                   <span className={styles.statusIcon}>
                     <CalendarEventQueueDetails
                       {...queueItem}
-                      fullColorEvents={fullColorEvents}
                     />
                   </span> :
                   null
@@ -104,14 +98,12 @@ class CalendarEvent extends Component {
               }
 
               {
-                showCutoffUnmetIcon &&
-                !!movieFile &&
-                movieFile.qualityCutoffNotMet ?
+                showCutoffUnmetIcon && !!movieFile && movieFile.qualityCutoffNotMet ?
                   <Icon
                     className={styles.statusIcon}
                     name={icons.MOVIE_FILE}
                     kind={kinds.WARNING}
-                    title={translate('QualityCutoffNotMet')}
+                    title={translate('QualityCutoffHasNotBeenMet')}
                   /> :
                   null
               }

frontend/src/Calendar/Header/CalendarHeader.js

@@ -126,7 +126,7 @@ class CalendarHeader extends Component {
               isDisabled={view === calendarViews.AGENDA}
               onPress={onTodayPress}
             >
-              {translate('Today')}
+              Today
             </Button>
           </div>
 

frontend/src/Calendar/Legend/Legend.js

@@ -20,11 +20,10 @@ function Legend(props) {
   if (showCutoffUnmetIcon) {
     iconsToShow.push(
       <LegendIconItem
-        name={translate('CutoffNotMet')}
+        name={translate('CutoffUnmet')}
         icon={icons.MOVIE_FILE}
-        kind={kinds.WARNING}
-        fullColorEvents={fullColorEvents}
-        tooltip={translate('QualityCutoffNotMet')}
+        kind={fullColorEvents ? kinds.DEFAULT : kinds.WARNING}
+        tooltip={translate('QualityOrLangCutoffHasNotBeenMet')}
       />
     );
   }

frontend/src/Calendar/Legend/LegendIconItem.css

@@ -4,8 +4,4 @@
 
 .icon {
   margin-right: 5px;
-
-  &:global(.fullColorEvents) {
-    filter: var(--calendarFullColorFilter)
-  }
 }

frontend/src/Calendar/Legend/LegendIconItem.js

@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
@@ -7,9 +6,9 @@ import styles from './LegendIconItem.css';
 function LegendIconItem(props) {
   const {
     name,
-    fullColorEvents,
     icon,
     kind,
+    darken,
     tooltip
   } = props;
 
@@ -19,11 +18,9 @@ function LegendIconItem(props) {
       title={tooltip}
     >
       <Icon
-        className={classNames(
-          styles.icon,
-          fullColorEvents && 'fullColorEvents'
-        )}
+        className={styles.icon}
         name={icon}
+        darken={darken}
         kind={kind}
       />
 
@@ -34,10 +31,14 @@ function LegendIconItem(props) {
 
 LegendIconItem.propTypes = {
   name: PropTypes.string.isRequired,
-  fullColorEvents: PropTypes.bool.isRequired,
   icon: PropTypes.object.isRequired,
   kind: PropTypes.string.isRequired,
+  darken: PropTypes.bool.isRequired,
   tooltip: PropTypes.string.isRequired
 };
 
+LegendIconItem.defaultProps = {
+  darken: false
+};
+
 export default LegendIconItem;

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

@@ -135,7 +135,7 @@ class CalendarOptionsModalContent extends Component {
                   type={inputTypes.CHECK}
                   name="showCutoffUnmetIcon"
                   value={showCutoffUnmetIcon}
-                  helpText={translate('IconForCutoffUnmetHelpText')}
+                  helpText={translate('ShowCutoffUnmetIconHelpText')}
                   onChange={this.onOptionInputChange}
                 />
               </FormGroup>
@@ -177,7 +177,7 @@ class CalendarOptionsModalContent extends Component {
                   values={weekColumnOptions}
                   value={calendarWeekColumnHeader}
                   onChange={this.onGlobalInputChange}
-                  helpText={translate('WeekColumnHeaderHelpText')}
+                  helpText={translate('SettingsWeekColumnHeaderHelpText')}
                 />
               </FormGroup>
 

frontend/src/Calendar/iCal/CalendarLinkModalContent.js

@@ -109,7 +109,7 @@ class CalendarLinkModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('CalendarFeed')}
+          {translate('RadarrCalendarFeed')}
         </ModalHeader>
 
         <ModalBody>
@@ -121,19 +121,19 @@ class CalendarLinkModalContent extends Component {
                 type={inputTypes.CHECK}
                 name="unmonitored"
                 value={unmonitored}
-                helpText={translate('ICalIncludeUnmonitoredMoviesHelpText')}
+                helpText={translate('UnmonitoredHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
 
             <FormGroup>
-              <FormLabel>{translate('ICalShowAsAllDayEvents')}</FormLabel>
+              <FormLabel>{translate('ShowAsAllDayEvents')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="asAllDay"
                 value={asAllDay}
-                helpText={translate('ICalShowAsAllDayEventsHelpText')}
+                helpText={translate('AsAllDayHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
@@ -145,7 +145,7 @@ class CalendarLinkModalContent extends Component {
                 type={inputTypes.TAG}
                 name="tags"
                 value={tags}
-                helpText={translate('ICalTagsMoviesHelpText')}
+                helpText={translate('TagsHelpText')}
                 onChange={this.onInputChange}
               />
             </FormGroup>
@@ -160,7 +160,7 @@ class CalendarLinkModalContent extends Component {
                 name="iCalHttpUrl"
                 value={iCalHttpUrl}
                 readOnly={true}
-                helpText={translate('ICalFeedHelpText')}
+                helpText={translate('ICalHttpUrlHelpText')}
                 buttons={[
                   <ClipboardButton
                     key="copy"

frontend/src/Collection/CollectionFooter.js

@@ -14,50 +14,6 @@ import styles from './CollectionFooter.css';
 
 const NO_CHANGE = 'noChange';
 
-const monitoredOptions = [
-  {
-    key: NO_CHANGE,
-    get value() {
-      return translate('NoChange');
-    },
-    isDisabled: true
-  },
-  {
-    key: 'monitored',
-    get value() {
-      return translate('Monitored');
-    }
-  },
-  {
-    key: 'unmonitored',
-    get value() {
-      return translate('Unmonitored');
-    }
-  }
-];
-
-const searchOnAddOptions = [
-  {
-    key: NO_CHANGE,
-    get value() {
-      return translate('NoChange');
-    },
-    isDisabled: true
-  },
-  {
-    key: 'yes',
-    get value() {
-      return translate('Yes');
-    }
-  },
-  {
-    key: 'no',
-    get value() {
-      return translate('No');
-    }
-  }
-];
-
 class CollectionFooter extends Component {
 
   //
@@ -67,12 +23,12 @@ class CollectionFooter extends Component {
     super(props, context);
 
     this.state = {
-      monitored: NO_CHANGE,
       monitor: NO_CHANGE,
+      monitored: NO_CHANGE,
       qualityProfileId: NO_CHANGE,
       minimumAvailability: NO_CHANGE,
       rootFolderPath: NO_CHANGE,
-      searchOnAdd: NO_CHANGE
+      destinationRootFolder: null
     };
   }
 
@@ -88,9 +44,8 @@ class CollectionFooter extends Component {
         monitored: NO_CHANGE,
         monitor: NO_CHANGE,
         qualityProfileId: NO_CHANGE,
-        minimumAvailability: NO_CHANGE,
         rootFolderPath: NO_CHANGE,
-        searchOnAdd: NO_CHANGE
+        minimumAvailability: NO_CHANGE
       });
     }
 
@@ -108,12 +63,11 @@ class CollectionFooter extends Component {
 
   onUpdateSelectedPress = () => {
     const {
-      monitored,
       monitor,
+      monitored,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath,
-      searchOnAdd
+      rootFolderPath
     } = this.state;
 
     const changes = {};
@@ -138,10 +92,6 @@ class CollectionFooter extends Component {
       changes.rootFolderPath = rootFolderPath;
     }
 
-    if (searchOnAdd !== NO_CHANGE) {
-      changes.searchOnAdd = searchOnAdd === 'yes';
-    }
-
     this.props.onUpdateSelectedPress(changes);
   };
 
@@ -159,10 +109,15 @@ class CollectionFooter extends Component {
       monitor,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath,
-      searchOnAdd
+      rootFolderPath
     } = this.state;
 
+    const monitoredOptions = [
+      { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
+      { key: 'monitored', value: translate('Monitored') },
+      { key: 'unmonitored', value: translate('Unmonitored') }
+    ];
+
     const selectedCount = selectedIds.length;
 
     return (
@@ -170,7 +125,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorCollection')}
-            isSaving={isSaving && monitored !== NO_CHANGE}
+            isSaving={isSaving}
           />
 
           <SelectInput
@@ -185,7 +140,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorMovies')}
-            isSaving={isSaving && monitor !== NO_CHANGE}
+            isSaving={isSaving}
           />
 
           <SelectInput
@@ -243,25 +198,10 @@ class CollectionFooter extends Component {
           />
         </div>
 
-        <div className={styles.inputContainer}>
-          <CollectionFooterLabel
-            label={translate('SearchMoviesOnAdd')}
-            isSaving={isSaving && searchOnAdd !== NO_CHANGE}
-          />
-
-          <SelectInput
-            name="searchOnAdd"
-            value={searchOnAdd}
-            values={searchOnAddOptions}
-            isDisabled={!selectedCount}
-            onChange={this.onInputChange}
-          />
-        </div>
-
         <div className={styles.buttonContainer}>
           <div className={styles.buttonContainerContent}>
             <CollectionFooterLabel
-              label={translate('CountCollectionsSelected', { count: selectedCount })}
+              label={translate('CollectionsSelectedInterp', [selectedCount])}
               isSaving={false}
             />
 

frontend/src/Collection/Overview/CollectionMovie.css

@@ -115,16 +115,3 @@ $hoverScale: 1.05;
     color: var(--iconButtonHoverLightColor);
   }
 }
-
-.excluded {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 1;
-  width: 0;
-  height: 0;
-  border-width: 0 25px 25px 0;
-  border-style: solid;
-  border-color: transparent var(--dangerColor) transparent transparent;
-  color: var(--white);
-}

frontend/src/Collection/Overview/CollectionMovie.css.d.ts

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

frontend/src/Collection/Overview/CollectionMovie.js

@@ -5,7 +5,6 @@ import MonitorToggleButton from 'Components/MonitorToggleButton';
 import EditMovieModalConnector from 'Movie/Edit/EditMovieModalConnector';
 import MovieIndexProgressBar from 'Movie/Index/ProgressBar/MovieIndexProgressBar';
 import MoviePoster from 'Movie/MoviePoster';
-import translate from 'Utilities/String/translate';
 import AddNewCollectionMovieModal from './../AddNewCollectionMovieModal';
 import styles from './CollectionMovie.css';
 
@@ -73,7 +72,6 @@ class CollectionMovie extends Component {
       isAvailable,
       movieFile,
       isExistingMovie,
-      isExcluded,
       posterWidth,
       posterHeight,
       detailedProgressBar,
@@ -109,15 +107,6 @@ class CollectionMovie extends Component {
               </div>
           }
 
-          {
-            isExcluded ?
-              <div
-                className={styles.excluded}
-                title={translate('Excluded')}
-              /> :
-              null
-          }
-
           <Link
             className={styles.link}
             style={elementStyle}
@@ -200,7 +189,6 @@ CollectionMovie.propTypes = {
   posterHeight: PropTypes.number.isRequired,
   detailedProgressBar: PropTypes.bool.isRequired,
   isExistingMovie: PropTypes.bool,
-  isExcluded: PropTypes.bool,
   tmdbId: PropTypes.number.isRequired,
   imdbId: PropTypes.string,
   youTubeTrailerId: PropTypes.string,

frontend/src/Commands/Command.ts

@@ -13,7 +13,6 @@ export interface CommandBody {
   trigger: string;
   suppressMessages: boolean;
   movieId?: number;
-  movieIds?: number[];
 }
 
 interface Command extends ModelBase {

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

@@ -1,4 +1,3 @@
-import { maxBy } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -51,7 +50,7 @@ class FilterBuilderModalContent extends Component {
       if (id) {
         dispatchSetFilter({ selectedFilterKey: id });
       } else {
-        const last = maxBy(customFilters, 'id');
+        const last = customFilters[customFilters.length -1];
         dispatchSetFilter({ selectedFilterKey: last.id });
       }
 
@@ -109,7 +108,7 @@ class FilterBuilderModalContent extends Component {
       this.setState({
         labelErrors: [
           {
-            message: translate('LabelIsRequired')
+            message: 'Label is required'
           }
         ]
       });
@@ -147,13 +146,13 @@ class FilterBuilderModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('CustomFilter')}
+          Custom Filter
         </ModalHeader>
 
         <ModalBody>
           <div className={styles.labelContainer}>
             <div className={styles.label}>
-              {translate('Label')}
+              Label
             </div>
 
             <div className={styles.labelInputContainer}>
@@ -167,7 +166,9 @@ class FilterBuilderModalContent extends Component {
             </div>
           </div>
 
-          <div className={styles.label}>{translate('Filters')}</div>
+          <div className={styles.label}>
+            {translate('Filters')}
+          </div>
 
           <div className={styles.rows}>
             {

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

@@ -3,7 +3,6 @@ import React, { Component } from 'react';
 import SelectInput from 'Components/Form/SelectInput';
 import IconButton from 'Components/Link/IconButton';
 import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Props';
-import sortByProp from 'Utilities/Array/sortByProp';
 import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
 import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
@@ -229,7 +228,7 @@ class FilterBuilderRow extends Component {
         key: name,
         value: typeof label === 'function' ? label() : label
       };
-    }).sort(sortByProp('value'));
+    }).sort((a, b) => a.value.localeCompare(b.value));
 
     const ValueComponent = getRowValueConnector(selectedFilterBuilderProp);
 

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

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { filterBuilderTypes } from 'Helpers/Props';
 import * as filterTypes from 'Helpers/Props/filterTypes';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 function createTagListSelector() {
@@ -38,7 +38,7 @@ function createTagListSelector() {
           }
 
           return acc;
-        }, []).sort(sortByProp('name'));
+        }, []).sort(sortByName);
       }
 
       return _.uniqBy(items, 'id');

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

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

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

@@ -37,8 +37,8 @@ class CustomFilter extends Component {
       dispatchSetFilter
     } = this.props;
 
-    // Assume that delete and then unmounting means the deletion was successful.
-    // Moving this check to an ancestor would be more accurate, but would have
+    // Assume that delete and then unmounting means the delete was successful.
+    // Moving this check to a ancestor would be more accurate, but would have
     // more boilerplate.
     if (this.state.isDeleting && id === selectedFilterKey) {
       dispatchSetFilter({ selectedFilterKey: 'all' });

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

@@ -5,7 +5,6 @@ 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 sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import CustomFilter from './CustomFilter';
 import styles from './CustomFiltersModalContent.css';
@@ -32,7 +31,7 @@ function CustomFiltersModalContent(props) {
       <ModalBody>
         {
           customFilters
-            .sort((a, b) => sortByProp(a, b, 'label'))
+            .sort((a, b) => a.label.localeCompare(b.label))
             .map((customFilter) => {
               return (
                 <CustomFilter

frontend/src/Components/Form/AvailabilitySelectInput.js

@@ -36,7 +36,7 @@ function AvailabilitySelectInput(props) {
     values.unshift({
       key: 'noChange',
       value: translate('NoChange'),
-      isDisabled: true
+      disabled: true
     });
   }
 
@@ -44,7 +44,7 @@ function AvailabilitySelectInput(props) {
     values.unshift({
       key: 'mixed',
       value: '(Mixed)',
-      isDisabled: true
+      disabled: true
     });
   }
 

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

@@ -4,8 +4,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchDownloadClients } from 'Store/Actions/settingsActions';
-import sortByProp from 'Utilities/Array/sortByProp';
-import translate from 'Utilities/String/translate';
+import sortByName from 'Utilities/Array/sortByName';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
@@ -23,18 +22,17 @@ function createMapStateToProps() {
 
       const filteredItems = items.filter((item) => item.protocol === protocolFilter);
 
-      const values = _.map(filteredItems.sort(sortByProp('name')), (downloadClient) => {
+      const values = _.map(filteredItems.sort(sortByName), (downloadClient) => {
         return {
           key: downloadClient.id,
-          value: downloadClient.name,
-          hint: `(${downloadClient.id})`
+          value: downloadClient.name
         };
       });
 
       if (includeAny) {
         values.unshift({
           key: 0,
-          value: `(${translate('Any')})`
+          value: '(Any)'
         });
       }
 

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -19,7 +19,7 @@
 
 .isDisabled {
   opacity: 0.7;
-  cursor: not-allowed !important;
+  cursor: not-allowed;
 }
 
 .dropdownArrowContainer {

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -271,32 +271,26 @@ class EnhancedSelectInput extends Component {
     this.setState({ isOpen: !this.state.isOpen });
   };
 
-  onSelect = (newValue) => {
-    const { name, value, values, onChange } = this.props;
-    const additionalProperties = values.find((v) => v.key === newValue)?.additionalProperties;
-
-    if (Array.isArray(value)) {
-      let arrayValue = null;
-      const index = value.indexOf(newValue);
-
+  onSelect = (value) => {
+    if (Array.isArray(this.props.value)) {
+      let newValue = null;
+      const index = this.props.value.indexOf(value);
       if (index === -1) {
-        arrayValue = values.map((v) => v.key).filter((v) => (v === newValue) || value.includes(v));
+        newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v));
       } else {
-        arrayValue = [...value];
-        arrayValue.splice(index, 1);
+        newValue = [...this.props.value];
+        newValue.splice(index, 1);
       }
-      onChange({
-        name,
-        value: arrayValue,
-        additionalProperties
+      this.props.onChange({
+        name: this.props.name,
+        value: newValue
       });
     } else {
       this.setState({ isOpen: false });
 
-      onChange({
-        name,
-        value: newValue,
-        additionalProperties
+      this.props.onChange({
+        name: this.props.name,
+        value
       });
     }
   };
@@ -491,7 +485,7 @@ class EnhancedSelectInput extends Component {
                             values.map((v, index) => {
                               const hasParent = v.parentKey !== undefined;
                               const depth = hasParent ? 1 : 0;
-                              const parentSelected = hasParent && Array.isArray(value) && value.includes(v.parentKey);
+                              const parentSelected = hasParent && value.includes(v.parentKey);
                               return (
                                 <OptionComponent
                                   key={v.key}

frontend/src/Components/Form/EnhancedSelectInputConnector.js

@@ -9,8 +9,7 @@ import EnhancedSelectInput from './EnhancedSelectInput';
 const importantFieldNames = [
   'baseUrl',
   'apiPath',
-  'apiKey',
-  'authToken'
+  'apiKey'
 ];
 
 function getProviderDataKey(providerData) {
@@ -35,9 +34,7 @@ function getSelectOptions(items) {
       key: option.value,
       value: option.name,
       hint: option.hint,
-      parentKey: option.parentValue,
-      isDisabled: option.isDisabled,
-      additionalProperties: option.additionalProperties
+      parentKey: option.parentValue
     };
   });
 }
@@ -150,7 +147,7 @@ EnhancedSelectInputConnector.propTypes = {
   provider: PropTypes.string.isRequired,
   providerData: PropTypes.object.isRequired,
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).isRequired,
+  value: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   selectOptionsProviderAction: PropTypes.string,
   onChange: PropTypes.func.isRequired,

frontend/src/Components/Form/FormInputGroup.js

@@ -17,7 +17,6 @@ import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import LanguageSelectInputConnector from './LanguageSelectInputConnector';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
-import MovieTagInput from './MovieTagInput';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -90,10 +89,6 @@ function getComponent(type) {
 
     case inputTypes.DYNAMIC_SELECT:
       return EnhancedSelectInputConnector;
-
-    case inputTypes.MOVIE_TAG:
-      return MovieTagInput;
-
     case inputTypes.TAG:
       return TagInputConnector;
 
@@ -272,7 +267,6 @@ FormInputGroup.propTypes = {
   name: PropTypes.string.isRequired,
   value: PropTypes.any,
   values: PropTypes.arrayOf(PropTypes.any),
-  isDisabled: PropTypes.bool,
   type: PropTypes.string.isRequired,
   kind: PropTypes.oneOf(kinds.all),
   min: PropTypes.number,
@@ -287,7 +281,6 @@ FormInputGroup.propTypes = {
   includeNoChange: PropTypes.bool,
   includeNoChangeDisabled: PropTypes.bool,
   selectedValueOptions: PropTypes.object,
-  indexerFlags: PropTypes.number,
   pending: PropTypes.bool,
   errors: PropTypes.arrayOf(PropTypes.object),
   warnings: PropTypes.arrayOf(PropTypes.object),

frontend/src/Components/Form/IndexerFlagsSelectInput.tsx

@@ -4,18 +4,22 @@ import { createSelector } from 'reselect';
 import AppState from 'App/State/AppState';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
+interface IndexerFlagsSelectInputProps {
+  name: string;
+  indexerFlags: number;
+  onChange(payload: object): void;
+}
+
 const selectIndexerFlagsValues = (selectedFlags: number) =>
   createSelector(
     (state: AppState) => state.settings.indexerFlags,
     (indexerFlags) => {
-      const value = indexerFlags.items.reduce((acc: number[], { id }) => {
-        // eslint-disable-next-line no-bitwise
-        if ((selectedFlags & id) === id) {
-          acc.push(id);
-        }
-
-        return acc;
-      }, []);
+      const value = indexerFlags.items
+        .filter(
+          // eslint-disable-next-line no-bitwise
+          (item) => (selectedFlags & item.id) === item.id
+        )
+        .map(({ id }) => id);
 
       const values = indexerFlags.items.map(({ id, name }) => ({
         key: id,
@@ -29,12 +33,6 @@ const selectIndexerFlagsValues = (selectedFlags: number) =>
     }
   );
 
-interface IndexerFlagsSelectInputProps {
-  name: string;
-  indexerFlags: number;
-  onChange(payload: object): void;
-}
-
 function IndexerFlagsSelectInput(props: IndexerFlagsSelectInputProps) {
   const { indexerFlags, onChange } = props;
 

frontend/src/Components/Form/IndexerSelectInputConnector.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchIndexers } from 'Store/Actions/settingsActions';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
@@ -18,7 +18,7 @@ function createMapStateToProps() {
         items
       } = indexers;
 
-      const values = items.sort(sortByProp('name')).map((indexer) => ({
+      const values = items.sort(sortByName).map((indexer) => ({
         key: indexer.id,
         value: indexer.name
       }));

frontend/src/Components/Form/MovieMonitoredSelectInput.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import monitorOptions from 'Utilities/Movie/monitorOptions';
 import translate from 'Utilities/String/translate';
-import EnhancedSelectInput from './EnhancedSelectInput';
+import SelectInput from './SelectInput';
 
 function MovieMonitoredSelectInput(props) {
   const values = [...monitorOptions];
@@ -16,7 +16,7 @@ function MovieMonitoredSelectInput(props) {
     values.unshift({
       key: 'noChange',
       value: translate('NoChange'),
-      isDisabled: true
+      disabled: true
     });
   }
 
@@ -24,12 +24,12 @@ function MovieMonitoredSelectInput(props) {
     values.unshift({
       key: 'mixed',
       value: '(Mixed)',
-      isDisabled: true
+      disabled: true
     });
   }
 
   return (
-    <EnhancedSelectInput
+    <SelectInput
       {...props}
       values={values}
     />

frontend/src/Components/Form/MovieTagInput.tsx

@@ -1,53 +0,0 @@
-import React, { useCallback } from 'react';
-import TagInputConnector from './TagInputConnector';
-
-interface MovieTagInputProps {
-  name: string;
-  value: number | number[];
-  onChange: ({
-    name,
-    value,
-  }: {
-    name: string;
-    value: number | number[];
-  }) => void;
-}
-
-export default function MovieTagInput(props: MovieTagInputProps) {
-  const { value, onChange, ...otherProps } = props;
-  const isArray = Array.isArray(value);
-
-  const handleChange = useCallback(
-    ({ name, value: newValue }: { name: string; value: number[] }) => {
-      if (isArray) {
-        onChange({ name, value: newValue });
-      } else {
-        onChange({
-          name,
-          value: newValue.length ? newValue[newValue.length - 1] : 0,
-        });
-      }
-    },
-    [isArray, onChange]
-  );
-
-  let finalValue: number[] = [];
-
-  if (isArray) {
-    finalValue = value;
-  } else if (value === 0) {
-    finalValue = [];
-  } else {
-    finalValue = [value];
-  }
-
-  return (
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore 2786 'TagInputConnector' isn't typed yet
-    <TagInputConnector
-      {...otherProps}
-      value={finalValue}
-      onChange={handleChange}
-    />
-  );
-}

frontend/src/Components/Form/PasswordInput.css

@@ -0,0 +1,5 @@
+.input {
+  composes: input from '~Components/Form/TextInput.css';
+
+  font-family: $passwordFamily;
+}

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

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

frontend/src/Components/Form/PasswordInput.js

@@ -1,5 +1,7 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import TextInput from './TextInput';
+import styles from './PasswordInput.css';
 
 // Prevent a user from copying (or cutting) the password from the input
 function onCopy(e) {
@@ -11,14 +13,17 @@ function PasswordInput(props) {
   return (
     <TextInput
       {...props}
-      type="password"
       onCopy={onCopy}
     />
   );
 }
 
 PasswordInput.propTypes = {
-  ...TextInput.props
+  className: PropTypes.string.isRequired
+};
+
+PasswordInput.defaultProps = {
+  className: styles.input
 };
 
 export default PasswordInput;

frontend/src/Components/Form/ProviderFieldFormGroup.js

@@ -27,8 +27,6 @@ function getType({ type, selectOptionsProviderAction }) {
         return inputTypes.DYNAMIC_SELECT;
       }
       return inputTypes.SELECT;
-    case 'movieTag':
-      return inputTypes.MOVIE_TAG;
     case 'tag':
       return inputTypes.TEXT_TAG;
     case 'tagSelect':

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -4,13 +4,13 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
 import translate from 'Utilities/String/translate';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
   return createSelector(
-    createSortedSectionSelector('settings.qualityProfiles', sortByProp('name')),
+    createSortedSectionSelector('settings.qualityProfiles', sortByName),
     (state, { includeNoChange }) => includeNoChange,
     (state, { includeNoChangeDisabled }) => includeNoChangeDisabled,
     (state, { includeMixed }) => includeMixed,
@@ -26,7 +26,7 @@ function createMapStateToProps() {
         values.unshift({
           key: 'noChange',
           value: translate('NoChange'),
-          isDisabled: includeNoChangeDisabled
+          disabled: includeNoChangeDisabled
         });
       }
 
@@ -34,7 +34,7 @@ function createMapStateToProps() {
         values.unshift({
           key: 'mixed',
           value: '(Mixed)',
-          isDisabled: true
+          disabled: true
         });
       }
 

frontend/src/Components/Form/TextTagInputConnector.js

@@ -91,7 +91,6 @@ class TextTagInputConnector extends Component {
   render() {
     return (
       <TagInput
-        delimiters={['Tab', 'Enter', ',']}
         tagList={[]}
         onTagAdd={this.onTagAdd}
         onTagDelete={this.onTagDelete}

frontend/src/Components/Icon.css

@@ -12,10 +12,18 @@
 
 .info {
   color: var(--infoColor);
+
+  &:global(.darken) {
+    color: color(var(--infoColor) shade(30%));
+  }
 }
 
 .pink {
   color: var(--pink);
+
+  &:global(.darken) {
+    color: color(var(--pink) shade(30%));
+  }
 }
 
 .success {

frontend/src/Components/Icon.js

@@ -18,6 +18,7 @@ class Icon extends PureComponent {
       kind,
       size,
       title,
+      darken,
       isSpinning,
       ...otherProps
     } = this.props;
@@ -26,7 +27,8 @@ class Icon extends PureComponent {
       <FontAwesomeIcon
         className={classNames(
           className,
-          styles[kind]
+          styles[kind],
+          darken && 'darken'
         )}
         icon={name}
         spin={isSpinning}
@@ -59,6 +61,7 @@ Icon.propTypes = {
   kind: PropTypes.string.isRequired,
   size: PropTypes.number.isRequired,
   title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+  darken: PropTypes.bool.isRequired,
   isSpinning: PropTypes.bool.isRequired,
   fixedWidth: PropTypes.bool.isRequired
 };
@@ -66,6 +69,7 @@ Icon.propTypes = {
 Icon.defaultProps = {
   kind: kinds.DEFAULT,
   size: 14,
+  darken: false,
   isSpinning: false,
   fixedWidth: false
 };

frontend/src/Components/ImportListList.js

@@ -19,7 +19,7 @@ function ImportListList({ lists, importListList }) {
           return (
             <Label
               key={list.id}
-              kind={kinds.SUCCESS}
+              kind={kinds.INFO}
               size={sizes.MEDIUM}
             >
               {list.name}

frontend/src/Components/Menu/FilterMenuContent.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import sortByProp from 'Utilities/Array/sortByProp';
 import translate from 'Utilities/String/translate';
 import FilterMenuItem from './FilterMenuItem';
 import MenuContent from './MenuContent';
@@ -48,7 +47,7 @@ class FilterMenuContent extends Component {
 
         {
           customFilters
-            .sort(sortByProp('label'))
+            .sort((a, b) => a.label.localeCompare(b.label))
             .map((filter) => {
               return (
                 <FilterMenuItem

frontend/src/Components/Page/PageConnector.js

@@ -45,7 +45,6 @@ const selectAppProps = createSelector(
 );
 
 const selectIsPopulated = createSelector(
-  (state) => state.movies.isPopulated,
   (state) => state.customFilters.isPopulated,
   (state) => state.tags.isPopulated,
   (state) => state.settings.ui.isPopulated,
@@ -57,7 +56,6 @@ const selectIsPopulated = createSelector(
   (state) => state.movieCollections.isPopulated,
   (state) => state.app.translations.isPopulated,
   (
-    moviesIsPopulated,
     customFiltersIsPopulated,
     tagsIsPopulated,
     uiSettingsIsPopulated,
@@ -70,7 +68,6 @@ const selectIsPopulated = createSelector(
     translationsIsPopulated
   ) => {
     return (
-      moviesIsPopulated &&
       customFiltersIsPopulated &&
       tagsIsPopulated &&
       uiSettingsIsPopulated &&
@@ -86,7 +83,6 @@ const selectIsPopulated = createSelector(
 );
 
 const selectErrors = createSelector(
-  (state) => state.movies.error,
   (state) => state.customFilters.error,
   (state) => state.tags.error,
   (state) => state.settings.ui.error,
@@ -98,7 +94,6 @@ const selectErrors = createSelector(
   (state) => state.movieCollections.error,
   (state) => state.app.translations.error,
   (
-    moviesError,
     customFiltersError,
     tagsError,
     uiSettingsError,
@@ -111,7 +106,6 @@ const selectErrors = createSelector(
     translationsError
   ) => {
     const hasError = !!(
-      moviesError ||
       customFiltersError ||
       tagsError ||
       uiSettingsError ||

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

@@ -71,22 +71,6 @@ const links = [
     ]
   },
 
-  {
-    iconName: icons.WARNING,
-    title: () => translate('Wanted'),
-    to: '/wanted/missing',
-    children: [
-      {
-        title: () => translate('Missing'),
-        to: '/wanted/missing'
-      },
-      {
-        title: () => translate('CutoffUnmet'),
-        to: '/wanted/cutoffunmet'
-      }
-    ]
-  },
-
   {
     iconName: icons.SETTINGS,
     title: () => translate('Settings'),
@@ -117,7 +101,7 @@ const links = [
         to: '/settings/downloadclients'
       },
       {
-        title: () => translate('ImportLists'),
+        title: () => translate('Lists'),
         to: '/settings/importlists'
       },
       {
@@ -137,7 +121,7 @@ const links = [
         to: '/settings/general'
       },
       {
-        title: () => translate('Ui'),
+        title: () => translate('UI'),
         to: '/settings/ui'
       }
     ]

frontend/src/Components/SignalRConnector.js

@@ -244,26 +244,6 @@ class SignalRConnector extends Component {
     this.props.dispatchSetVersion({ version });
   };
 
-  handleWantedCutoff = (body) => {
-    if (body.action === 'updated') {
-      this.props.dispatchUpdateItem({
-        section: 'wanted.cutoffUnmet',
-        updateOnly: true,
-        ...body.resource
-      });
-    }
-  };
-
-  handleWantedMissing = (body) => {
-    if (body.action === 'updated') {
-      this.props.dispatchUpdateItem({
-        section: 'wanted.missing',
-        updateOnly: true,
-        ...body.resource
-      });
-    }
-  };
-
   handleSystemTask = () => {
     this.props.dispatchFetchCommands();
   };

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

@@ -49,12 +49,11 @@ class TableOptionsModal extends Component {
 
   onPageSizeChange = ({ value }) => {
     let pageSizeError = null;
-    const maxPageSize = this.props.maxPageSize ?? 250;
 
     if (value < 5) {
       pageSizeError = translate('TablePageSizeMinimum', { minimumValue: '5' });
-    } else if (value > maxPageSize) {
-      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: `${maxPageSize}` });
+    } else if (value > 250) {
+      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: '250' });
     } else {
       this.props.onTableOptionChange({ pageSize: value });
     }
@@ -249,7 +248,6 @@ TableOptionsModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   pageSize: PropTypes.number,
-  maxPageSize: PropTypes.number,
   canModifyColumns: PropTypes.bool.isRequired,
   optionsComponent: PropTypes.elementType,
   onTableOptionChange: PropTypes.func.isRequired,

frontend/src/Components/TagList.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { kinds } from 'Helpers/Props';
-import sortByProp from 'Utilities/Array/sortByProp';
 import Label from './Label';
 import styles from './TagList.css';
 
@@ -9,7 +8,7 @@ function TagList({ tags, tagList }) {
   const sortedTags = tags
     .map((tagId) => tagList.find((tag) => tag.id === tagId))
     .filter((tag) => !!tag)
-    .sort(sortByProp('label'));
+    .sort((a, b) => a.label.localeCompare(b.label));
 
   return (
     <div className={styles.tags}>

frontend/src/Content/Fonts/fonts.css

@@ -25,3 +25,14 @@
   font-family: 'Ubuntu Mono';
   src: url('UbuntuMono-Regular.eot?#iefix&v=1.3.0') format('embedded-opentype'), url('UbuntuMono-Regular.woff?v=1.3.0') format('woff'), url('UbuntuMono-Regular.ttf?v=1.3.0') format('truetype');
 }
+
+/*
+ * text-security-disc
+ */
+
+@font-face {
+  font-weight: normal;
+  font-style: normal;
+  font-family: 'text-security-disc';
+  src: url('text-security-disc.woff?v=1.3.0') format('woff'), url('text-security-disc.ttf?v=1.3.0') format('truetype');
+}

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

@@ -75,19 +75,9 @@ class DiscoverMovie extends Component {
     const {
       items,
       sortKey,
-      sortDirection,
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      sortDirection
     } = this.props;
 
-    if (includeRecommendations !== prevProps.includeRecommendations ||
-      includeTrending !== prevProps.includeTrending ||
-      includePopular !== prevProps.includePopular
-    ) {
-      this.props.dispatchFetchListMovies();
-    }
-
     if (sortKey !== prevProps.sortKey ||
         sortDirection !== prevProps.sortDirection ||
         hasDifferentItemsOrOrder(prevProps.items, items)
@@ -339,7 +329,10 @@ class DiscoverMovie extends Component {
                 null
             }
 
-            <PageToolbarSeparator />
+            {
+              (view === 'posters' || view === 'overview') &&
+                <PageToolbarSeparator />
+            }
 
             <DiscoverMovieViewMenu
               view={view}
@@ -453,9 +446,6 @@ DiscoverMovie.propTypes = {
   sortKey: PropTypes.string,
   sortDirection: PropTypes.oneOf(sortDirections.all),
   view: PropTypes.string.isRequired,
-  includeRecommendations: PropTypes.bool.isRequired,
-  includeTrending: PropTypes.bool.isRequired,
-  includePopular: PropTypes.bool.isRequired,
   isSyncingLists: PropTypes.bool.isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
   onSortSelect: PropTypes.func.isRequired,
@@ -464,8 +454,7 @@ DiscoverMovie.propTypes = {
   onScroll: PropTypes.func.isRequired,
   onAddMoviesPress: PropTypes.func.isRequired,
   onExcludeMoviesPress: PropTypes.func.isRequired,
-  onImportListSyncPress: PropTypes.func.isRequired,
-  dispatchFetchListMovies: PropTypes.func.isRequired
+  onImportListSyncPress: PropTypes.func.isRequired
 };
 
 export default DiscoverMovie;

frontend/src/DiscoverMovie/DiscoverMovieConnector.js

@@ -17,18 +17,15 @@ import DiscoverMovie from './DiscoverMovie';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.discoverMovie,
     createDiscoverMovieClientSideCollectionItemsSelector('discoverMovie'),
     createCommandExecutingSelector(commandNames.IMPORT_LIST_SYNC),
     createDimensionsSelector(),
     (
-      discoverMovie,
       movies,
       isSyncingLists,
       dimensionsState
     ) => {
       return {
-        ...discoverMovie.options,
         ...movies,
         isSyncingLists,
         isSmallScreen: dimensionsState.isSmallScreen

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js

@@ -97,8 +97,6 @@ class DiscoverMovieOverview extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
-      isPopular,
-      isTrending,
       isSelected,
       overviewOptions,
       ...otherProps
@@ -216,26 +214,6 @@ class DiscoverMovieOverview extends Component {
                   null
               }
 
-              {
-                isPopular ?
-                  <Label
-                    kind={kinds.INFO}
-                  >
-                    {translate('Popular')}
-                  </Label> :
-                  null
-              }
-
-              {
-                isTrending ?
-                  <Label
-                    kind={kinds.INFO}
-                  >
-                    {translate('Trending')}
-                  </Label> :
-                  null
-              }
-
               <ImportListListConnector
                 lists={lists}
               />
@@ -305,8 +283,6 @@ DiscoverMovieOverview.propTypes = {
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,
   isRecommendation: PropTypes.bool.isRequired,
-  isPopular: PropTypes.bool.isRequired,
-  isTrending: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Overview/Options/DiscoverMovieOverviewOptionsModalContent.js

@@ -49,9 +49,7 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings: props.showRatings,
       showYear: props.showYear,
       showGenres: props.showGenres,
-      includeRecommendations: props.includeRecommendations,
-      includeTrending: props.includeTrending,
-      includePopular: props.includePopular
+      includeRecommendations: props.includeRecommendations
     };
   }
 
@@ -63,9 +61,7 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings,
       showCertification,
       showGenres,
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      includeRecommendations
     } = this.props;
 
     const state = {};
@@ -98,14 +94,6 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       state.includeRecommendations = includeRecommendations;
     }
 
-    if (includeTrending !== prevProps.includeTrending) {
-      state.includeTrending = includeTrending;
-    }
-
-    if (includePopular !== prevProps.includePopular) {
-      state.includePopular = includePopular;
-    }
-
     if (!_.isEmpty(state)) {
       this.setState(state);
     }
@@ -147,22 +135,19 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
       showRatings,
       showYear,
       showGenres,
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      includeRecommendations
     } = this.state;
 
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('OverviewOptions')}
+          Overview Options
         </ModalHeader>
 
         <ModalBody>
           <Form>
             <FormGroup>
               <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
-
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="includeRecommendations"
@@ -172,30 +157,6 @@ class DiscoverMovieOverviewOptionsModalContent extends Component {
               />
             </FormGroup>
 
-            <FormGroup>
-              <FormLabel>{translate('IncludeTrending')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="includeTrending"
-                value={includeTrending}
-                helpText={translate('IncludeTrendingMoviesHelpText')}
-                onChange={this.onChangeOption}
-              />
-            </FormGroup>
-
-            <FormGroup>
-              <FormLabel>{translate('IncludePopular')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="includePopular"
-                value={includePopular}
-                helpText={translate('IncludePopularMoviesHelpText')}
-                onChange={this.onChangeOption}
-              />
-            </FormGroup>
-
             <FormGroup>
               <FormLabel>{translate('PosterSize')}</FormLabel>
 
@@ -285,8 +246,6 @@ DiscoverMovieOverviewOptionsModalContent.propTypes = {
   showCertification: PropTypes.bool.isRequired,
   showGenres: PropTypes.bool.isRequired,
   includeRecommendations: PropTypes.bool.isRequired,
-  includeTrending: PropTypes.bool.isRequired,
-  includePopular: PropTypes.bool.isRequired,
   onChangeOverviewOption: PropTypes.func.isRequired,
   onChangeOption: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

@@ -3,7 +3,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import TmdbRating from 'Components/TmdbRating';
 import { icons } from 'Helpers/Props';
-import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
+import { getMovieStatusDetails } from 'Movie/MovieStatus';
 import formatRuntime from 'Utilities/Date/formatRuntime';
 import getRelativeDate from 'Utilities/Date/getRelativeDate';
 import translate from 'Utilities/String/translate';

frontend/src/DiscoverMovie/Posters/Options/DiscoverMoviePosterOptionsModalContent.js

@@ -45,9 +45,7 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     this.state = {
       size: props.size,
       showTitle: props.showTitle,
-      includeRecommendations: props.includeRecommendations,
-      includeTrending: props.includeTrending,
-      includePopular: props.includePopular
+      includeRecommendations: props.includeRecommendations
     };
   }
 
@@ -55,9 +53,7 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     const {
       size,
       showTitle,
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      includeRecommendations
     } = this.props;
 
     const state = {};
@@ -74,14 +70,6 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
       state.includeRecommendations = includeRecommendations;
     }
 
-    if (includeTrending !== prevProps.includeTrending) {
-      state.includeTrending = includeTrending;
-    }
-
-    if (includePopular !== prevProps.includePopular) {
-      state.includePopular = includePopular;
-    }
-
     if (!_.isEmpty(state)) {
       this.setState(state);
     }
@@ -119,15 +107,13 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
     const {
       size,
       showTitle,
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      includeRecommendations
     } = this.state;
 
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {translate('PosterOptions')}
+          Poster Options
         </ModalHeader>
 
         <ModalBody>
@@ -144,30 +130,6 @@ class DiscoverMoviePosterOptionsModalContent extends Component {
               />
             </FormGroup>
 
-            <FormGroup>
-              <FormLabel>{translate('IncludeTrending')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="includeTrending"
-                value={includeTrending}
-                helpText={translate('IncludeTrendingMoviesHelpText')}
-                onChange={this.onChangeOption}
-              />
-            </FormGroup>
-
-            <FormGroup>
-              <FormLabel>{translate('IncludePopular')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.CHECK}
-                name="includePopular"
-                value={includePopular}
-                helpText={translate('IncludePopularMoviesHelpText')}
-                onChange={this.onChangeOption}
-              />
-            </FormGroup>
-
             <FormGroup>
               <FormLabel>{translate('PosterSize')}</FormLabel>
 
@@ -210,8 +172,6 @@ DiscoverMoviePosterOptionsModalContent.propTypes = {
   size: PropTypes.string.isRequired,
   showTitle: PropTypes.bool.isRequired,
   includeRecommendations: PropTypes.bool.isRequired,
-  includeTrending: PropTypes.bool.isRequired,
-  includePopular: PropTypes.bool.isRequired,
   onChangePosterOption: PropTypes.func.isRequired,
   onChangeOption: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css

@@ -57,12 +57,10 @@
   flex: 0 0 115px;
 }
 
-.isTrending,
-.isPopular,
 .isRecommendation {
   composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
 
-  flex: 0 0 30px;
+  flex: 0 0 50px;
 }
 
 .actions {

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css.d.ts

@@ -7,9 +7,7 @@ interface CssExports {
   'digitalRelease': string;
   'genres': string;
   'inCinemas': string;
-  'isPopular': string;
   'isRecommendation': string;
-  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js

@@ -7,7 +7,6 @@ import VirtualTableHeader from 'Components/Table/VirtualTableHeader';
 import VirtualTableHeaderCell from 'Components/Table/VirtualTableHeaderCell';
 import VirtualTableSelectAllHeaderCell from 'Components/Table/VirtualTableSelectAllHeaderCell';
 import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import DiscoverMovieTableOptionsConnector from './DiscoverMovieTableOptionsConnector';
 import styles from './DiscoverMovieHeader.css';
 
@@ -99,43 +98,6 @@ class DiscoverMovieHeader extends Component {
                   <Icon
                     name={icons.RECOMMENDED}
                     size={12}
-                    title={translate('Recommendation')}
-                  />
-                </VirtualTableHeaderCell>
-              );
-            }
-
-            if (name === 'isTrending') {
-              return (
-                <VirtualTableHeaderCell
-                  key={name}
-                  className={styles[name]}
-                  name={name}
-                  isSortable={true}
-                  {...otherProps}
-                >
-                  <Icon
-                    name={icons.TRENDING}
-                    size={12}
-                    title={translate('Trending')}
-                  />
-                </VirtualTableHeaderCell>
-              );
-            }
-
-            if (name === 'isPopular') {
-              return (
-                <VirtualTableHeaderCell
-                  key={name}
-                  className={styles[name]}
-                  name={name}
-                  isSortable={true}
-                  {...otherProps}
-                >
-                  <Icon
-                    name={icons.POPULAR}
-                    size={12}
-                    title={translate('Popular')}
                   />
                 </VirtualTableHeaderCell>
               );

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css

@@ -76,12 +76,10 @@
   flex: 1 0 110px;
 }
 
-.isTrending,
-.isPopular,
 .isRecommendation {
   composes: cell;
 
-  flex: 0 0 30px;
+  flex: 0 0 50px;
 }
 
 .actions {
@@ -97,11 +95,6 @@
   margin-top: 0;
 }
 
-.statusIcon {
-  width: 20px !important;
-  text-align: center;
-}
-
 .externalLinks {
   margin-right: 0.5em;
 }

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css.d.ts

@@ -12,9 +12,7 @@ interface CssExports {
   'externalLinks': string;
   'genres': string;
   'inCinemas': string;
-  'isPopular': string;
   'isRecommendation': string;
-  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;
@@ -23,7 +21,6 @@ interface CssExports {
   'runtime': string;
   'sortTitle': string;
   'status': string;
-  'statusIcon': string;
   'studio': string;
 }
 export const cssExports: CssExports;

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -82,8 +82,6 @@ class DiscoverMovieRow extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
-      isTrending,
-      isPopular,
       isSelected,
       lists,
       onSelectedChange
@@ -307,7 +305,6 @@ class DiscoverMovieRow extends Component {
                   {
                     isRecommendation ?
                       <Icon
-                        className={styles.statusIcon}
                         name={icons.RECOMMENDED}
                         size={12}
                         title={translate('MovieIsRecommend')}
@@ -318,46 +315,6 @@ class DiscoverMovieRow extends Component {
               );
             }
 
-            if (name === 'isTrending') {
-              return (
-                <VirtualTableRowCell
-                  key={name}
-                  className={styles[name]}
-                >
-                  {
-                    isTrending ?
-                      <Icon
-                        className={styles.statusIcon}
-                        name={icons.TRENDING}
-                        size={12}
-                        title={translate('MovieIsTrending')}
-                      /> :
-                      null
-                  }
-                </VirtualTableRowCell>
-              );
-            }
-
-            if (name === 'isPopular') {
-              return (
-                <VirtualTableRowCell
-                  key={name}
-                  className={styles[name]}
-                >
-                  {
-                    isPopular ?
-                      <Icon
-                        className={styles.statusIcon}
-                        name={icons.POPULAR}
-                        size={12}
-                        title={translate('MovieIsPopular')}
-                      /> :
-                      null
-                  }
-                </VirtualTableRowCell>
-              );
-            }
-
             if (name === 'actions') {
               return (
                 <VirtualTableRowCell
@@ -447,8 +404,6 @@ DiscoverMovieRow.propTypes = {
   isExcluded: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   isRecommendation: PropTypes.bool.isRequired,
-  isPopular: PropTypes.bool.isRequired,
-  isTrending: PropTypes.bool.isRequired,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired
 };

frontend/src/DiscoverMovie/Table/DiscoverMovieTableOptions.js

@@ -15,29 +15,17 @@ class DiscoverMovieTableOptions extends Component {
     super(props, context);
 
     this.state = {
-      includeRecommendations: props.includeRecommendations,
-      includeTrending: props.includeTrending,
-      includePopular: props.includePopular
+      includeRecommendations: props.includeRecommendations
     };
   }
 
   componentDidUpdate(prevProps) {
-    const {
-      includeRecommendations,
-      includeTrending,
-      includePopular
-    } = this.props;
+    const { includeRecommendations } = this.props;
 
     if (includeRecommendations !== prevProps.includeRecommendations) {
-      this.setState({ includeRecommendations });
-    }
-
-    if (includeTrending !== prevProps.includeTrending) {
-      this.setState({ includeTrending });
-    }
-
-    if (includePopular !== prevProps.includePopular) {
-      this.setState({ includePopular });
+      this.setState({
+        includeRecommendations
+      });
     }
   }
 
@@ -59,57 +47,27 @@ class DiscoverMovieTableOptions extends Component {
 
   render() {
     const {
-      includeRecommendations,
-      includeTrending,
-      includePopular
+      includeRecommendations
     } = this.state;
 
     return (
-      <>
-        <FormGroup>
-          <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
+      <FormGroup>
+        <FormLabel>{translate('IncludeRadarrRecommendations')}</FormLabel>
 
-          <FormInputGroup
-            type={inputTypes.CHECK}
-            name="includeRecommendations"
-            value={includeRecommendations}
-            helpText={translate('IncludeRecommendationsHelpText')}
-            onChange={this.onChangeOption}
-          />
-        </FormGroup>
-
-        <FormGroup>
-          <FormLabel>{translate('IncludeTrending')}</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.CHECK}
-            name="includeTrending"
-            value={includeTrending}
-            helpText={translate('IncludeTrendingMoviesHelpText')}
-            onChange={this.onChangeOption}
-          />
-        </FormGroup>
-
-        <FormGroup>
-          <FormLabel>{translate('IncludePopular')}</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.CHECK}
-            name="includePopular"
-            value={includePopular}
-            helpText={translate('IncludePopularMoviesHelpText')}
-            onChange={this.onChangeOption}
-          />
-        </FormGroup>
-      </>
+        <FormInputGroup
+          type={inputTypes.CHECK}
+          name="includeRecommendations"
+          value={includeRecommendations}
+          helpText={translate('IncludeRecommendationsHelpText')}
+          onChange={this.onChangeOption}
+        />
+      </FormGroup>
     );
   }
 }
 
 DiscoverMovieTableOptions.propTypes = {
   includeRecommendations: PropTypes.bool.isRequired,
-  includeTrending: PropTypes.bool.isRequired,
-  includePopular: PropTypes.bool.isRequired,
   onChangeOption: PropTypes.func.isRequired
 };
 

frontend/src/DiscoverMovie/Table/ListMovieStatusCell.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell';
-import getMovieStatusDetails from 'Movie/getMovieStatusDetails';
+import { getMovieStatusDetails } from 'Movie/MovieStatus';
 import styles from './ListMovieStatusCell.css';
 
 function ListMovieStatusCell(props) {

frontend/src/Helpers/Hooks/useModalOpenState.ts

@@ -1,17 +0,0 @@
-import { useCallback, useState } from 'react';
-
-export default function useModalOpenState(
-  initialState: boolean
-): [boolean, () => void, () => void] {
-  const [isOpen, setOpen] = useState(initialState);
-
-  const setModalOpen = useCallback(() => {
-    setOpen(true);
-  }, [setOpen]);
-
-  const setModalClosed = useCallback(() => {
-    setOpen(false);
-  }, [setOpen]);
-
-  return [isOpen, setModalOpen, setModalClosed];
-}