fixup! Remove db calls from list threads

README.md

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

azure-pipelines.yml

@@ -9,15 +9,15 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.4.2'
+  majorVersion: '5.1.2'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.417'
-  nodeVersion: '20.X'
-  innoVersion: '6.2.2'
+  dotnetVersion: '6.0.413'
+  nodeVersion: '16.X'
+  innoVersion: '6.2.0'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
   macImage: 'macOS-11'
@@ -1242,7 +1242,6 @@ stages:
   - stage: Report_Out
     dependsOn:
     - Analyze
-    - Installer
     - Unit_Test
     - Integration
     - Automation

build.sh

@@ -254,7 +254,7 @@ InstallInno()
     ProgressStart "Installing portable Inno Setup"
     
     rm -rf _inno
-    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.2}.exe"
+    curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
     mkdir _inno
     ./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
     rm innosetup.exe

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

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

frontend/src/Activity/History/HistoryEventTypeCell.js

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

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 {
 
@@ -307,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);
@@ -324,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/QueueDetails.js

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

frontend/src/Activity/Queue/QueueRow.js

@@ -4,7 +4,7 @@ import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import IconButton from 'Components/Link/IconButton';
 import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
 import ProgressBar from 'Components/ProgressBar';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+// import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
@@ -96,9 +96,7 @@ class QueueRow extends Component {
       indexer,
       outputPath,
       downloadClient,
-      downloadClientHasPostImportCategory,
       estimatedCompletionTime,
-      added,
       timeleft,
       size,
       sizeleft,
@@ -317,15 +315,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'added') {
-              return (
-                <RelativeDateCellConnector
-                  key={name}
-                  date={added}
-                />
-              );
-            }
-
             if (name === 'actions') {
               return (
                 <TableRowCell
@@ -374,7 +363,6 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
-          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!movie}
           isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
@@ -404,9 +392,7 @@ QueueRow.propTypes = {
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
-  downloadClientHasPostImportCategory: PropTypes.bool,
   estimatedCompletionTime: PropTypes.string,
-  added: PropTypes.string,
   timeleft: PropTypes.string,
   size: PropTypes.number,
   year: PropTypes.number,

frontend/src/Activity/Queue/QueueStatusCell.js

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

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,230 +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'),
-        hint: multipleSelected
-          ? translate('BlocklistAndSearchMultipleHint')
-          : translate('BlocklistAndSearchHint'),
-      },
-      {
-        key: 'blocklistOnly',
-        value: translate('BlocklistOnly'),
-        hint: multipleSelected
-          ? translate('BlocklistMultipleOnlyHint')
-          : translate('BlocklistOnlyHint'),
-      },
-    ];
-  }, [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/Activity/Queue/TimeleftCell.js

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

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js

@@ -3,13 +3,10 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions';
-import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
 import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import { fetchImportExclusions } from 'Store/Actions/Settings/importExclusions';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import parseUrl from 'Utilities/String/parseUrl';
 import AddNewMovie from './AddNewMovie';
 
@@ -38,9 +35,7 @@ const mapDispatchToProps = {
   fetchRootFolders,
   fetchImportExclusions,
   fetchQueueDetails,
-  clearQueueDetails,
-  fetchMovieFiles,
-  clearMovieFiles
+  clearQueueDetails
 };
 
 class AddNewMovieConnector extends Component {
@@ -60,20 +55,6 @@ class AddNewMovieConnector extends Component {
     this.props.fetchQueueDetails();
   }
 
-  componentDidUpdate(prevProps) {
-    const {
-      items
-    } = this.props;
-
-    if (hasDifferentItems(prevProps.items, items)) {
-      const movieIds = selectUniqueIds(items, 'internalId');
-
-      if (movieIds.length) {
-        this.props.fetchMovieFiles({ movieId: movieIds });
-      }
-    }
-  }
-
   componentWillUnmount() {
     if (this._movieLookupTimeout) {
       clearTimeout(this._movieLookupTimeout);
@@ -81,7 +62,6 @@ class AddNewMovieConnector extends Component {
 
     this.props.clearAddMovie();
     this.props.clearQueueDetails();
-    this.props.clearMovieFiles();
   }
 
   //
@@ -127,15 +107,12 @@ class AddNewMovieConnector extends Component {
 
 AddNewMovieConnector.propTypes = {
   term: PropTypes.string,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
   lookupMovie: PropTypes.func.isRequired,
   clearAddMovie: PropTypes.func.isRequired,
   fetchRootFolders: PropTypes.func.isRequired,
   fetchImportExclusions: PropTypes.func.isRequired,
   fetchQueueDetails: PropTypes.func.isRequired,
-  clearQueueDetails: PropTypes.func.isRequired,
-  fetchMovieFiles: PropTypes.func.isRequired,
-  clearMovieFiles: PropTypes.func.isRequired
+  clearQueueDetails: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(AddNewMovieConnector);

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css

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

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

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

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

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/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.css

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

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

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

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

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

frontend/src/App/AppUpdatedModalContent.js

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

frontend/src/App/ConnectionLostModal.js

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

frontend/src/App/State/AppState.ts

@@ -44,16 +44,7 @@ export interface CustomFilter {
   filers: PropertyFilter[];
 }
 
-export interface AppSectionState {
-  dimensions: {
-    isSmallScreen: boolean;
-    width: number;
-    height: number;
-  };
-}
-
 interface AppState {
-  app: AppSectionState;
   calendar: CalendarAppState;
   commands: CommandAppState;
   history: HistoryAppState;

frontend/src/App/State/QueueAppState.ts

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

frontend/src/Calendar/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/CalendarConnector.js

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

frontend/src/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/CollectionConnector.js

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

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');
-    },
-    disabled: 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');
-    },
-    disabled: 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.js

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

frontend/src/Collection/Overview/CollectionMovieLabel.js

@@ -74,7 +74,11 @@ CollectionMovieLabel.propTypes = {
 
 CollectionMovieLabel.defaultProps = {
   isSaving: false,
-  statistics: {}
+  statistics: {
+    episodeFileCount: 0,
+    totalEpisodeCount: 0,
+    percentOfEpisodes: 0
+  }
 };
 
 export default CollectionMovieLabel;

frontend/src/Components/DescriptionList/DescriptionListItemDescription.css

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

frontend/src/Components/Filter/Builder/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/HistoryEventTypeFilterBuilderRowValue.tsx

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

frontend/src/Components/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

@@ -30,24 +30,22 @@ function CustomFiltersModalContent(props) {
 
       <ModalBody>
         {
-          customFilters
-            .sort((a, b) => a.label.localeCompare(b.label))
-            .map((customFilter) => {
-              return (
-                <CustomFilter
-                  key={customFilter.id}
-                  id={customFilter.id}
-                  label={customFilter.label}
-                  filters={customFilter.filters}
-                  selectedFilterKey={selectedFilterKey}
-                  isDeleting={isDeleting}
-                  deleteError={deleteError}
-                  dispatchSetFilter={dispatchSetFilter}
-                  dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
-                  onEditPress={onEditCustomFilter}
-                />
-              );
-            })
+          customFilters.map((customFilter) => {
+            return (
+              <CustomFilter
+                key={customFilter.id}
+                id={customFilter.id}
+                label={customFilter.label}
+                filters={customFilter.filters}
+                selectedFilterKey={selectedFilterKey}
+                isDeleting={isDeleting}
+                deleteError={deleteError}
+                dispatchSetFilter={dispatchSetFilter}
+                dispatchDeleteCustomFilter={dispatchDeleteCustomFilter}
+                onEditPress={onEditCustomFilter}
+              />
+            );
+          })
         }
 
         <div className={styles.addButtonContainer}>

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

@@ -25,8 +25,7 @@ function createMapStateToProps() {
       const values = _.map(filteredItems.sort(sortByName), (downloadClient) => {
         return {
           key: downloadClient.id,
-          value: downloadClient.name,
-          hint: `(${downloadClient.id})`
+          value: downloadClient.name
         };
       });
 

frontend/src/Components/Form/FormInputGroup.js

@@ -267,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,
@@ -282,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/RootFolderSelectInputConnector.js

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

frontend/src/Components/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

@@ -40,26 +40,18 @@ class FilterMenuContent extends Component {
         }
 
         {
-          customFilters.length > 0 ?
-            <MenuItemSeparator /> :
-            null
-        }
-
-        {
-          customFilters
-            .sort((a, b) => a.label.localeCompare(b.label))
-            .map((filter) => {
-              return (
-                <FilterMenuItem
-                  key={filter.id}
-                  filterKey={filter.id}
-                  selectedFilterKey={selectedFilterKey}
-                  onPress={onFilterSelect}
-                >
-                  {filter.label}
-                </FilterMenuItem>
-              );
-            })
+          customFilters.map((filter) => {
+            return (
+              <FilterMenuItem
+                key={filter.id}
+                filterKey={filter.id}
+                selectedFilterKey={selectedFilterKey}
+                onPress={onFilterSelect}
+              >
+                {filter.label}
+              </FilterMenuItem>
+            );
+          })
         }
 
         {

frontend/src/Components/Modal/Modal.css

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

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

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

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

@@ -101,7 +101,7 @@ const links = [
         to: '/settings/downloadclients'
       },
       {
-        title: () => translate('ImportLists'),
+        title: () => translate('Lists'),
         to: '/settings/importlists'
       },
       {
@@ -121,7 +121,7 @@ const links = [
         to: '/settings/general'
       },
       {
-        title: () => translate('Ui'),
+        title: () => translate('UI'),
         to: '/settings/ui'
       }
     ]

frontend/src/Components/SignalRConnector.js

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

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

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

frontend/src/Diag/ConsoleApi.js

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

frontend/src/DiscoverMovie/DiscoverMovie.js

@@ -329,7 +329,10 @@ class DiscoverMovie extends Component {
                 null
             }
 
-            <PageToolbarSeparator />
+            {
+              (view === 'posters' || view === 'overview') &&
+                <PageToolbarSeparator />
+            }
 
             <DiscoverMovieViewMenu
               view={view}

frontend/src/DiscoverMovie/DiscoverMovieConnector.js

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

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/Posters/DiscoverMoviePoster.css

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

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

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePoster.js

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterConnector.js

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.css

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

frontend/src/DiscoverMovie/Posters/DiscoverMoviePosterInfo.js

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

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

@@ -76,14 +76,11 @@ class DiscoverMovieRow extends Component {
       ratings,
       popularity,
       certification,
-      movieRuntimeFormat,
       collection,
       columns,
       isExisting,
       isExcluded,
       isRecommendation,
-      isTrending,
-      isPopular,
       isSelected,
       lists,
       onSelectedChange
@@ -233,7 +230,7 @@ class DiscoverMovieRow extends Component {
                   key={name}
                   className={styles[name]}
                 >
-                  {formatRuntime(runtime, movieRuntimeFormat)}
+                  {formatRuntime(runtime)}
                 </VirtualTableRowCell>
               );
             }
@@ -307,7 +304,6 @@ class DiscoverMovieRow extends Component {
                   {
                     isRecommendation ?
                       <Icon
-                        className={styles.statusIcon}
                         name={icons.RECOMMENDED}
                         size={12}
                         title={translate('MovieIsRecommend')}
@@ -318,46 +314,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
@@ -441,14 +397,11 @@ DiscoverMovieRow.propTypes = {
   popularity: PropTypes.number.isRequired,
   certification: PropTypes.string,
   collection: PropTypes.object,
-  movieRuntimeFormat: PropTypes.string.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,
   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/DiscoverMovieRowConnector.js

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

frontend/src/FirstRun/AuthenticationRequiredModalContent.js

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

frontend/src/Helpers/Props/icons.js

@@ -23,7 +23,6 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
-  faArrowTrendUp as fasArrowTrendUp,
   faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
@@ -60,7 +59,6 @@ import {
   faEye as fasEye,
   faFastBackward as fasFastBackward,
   faFastForward as fasFastForward,
-  faFileCircleQuestion as fasFileCircleQuestion,
   faFileExport as fasFileExport,
   faFileInvoice as farFileInvoice,
   faFilm as fasFilm,
@@ -161,7 +159,6 @@ export const EXPORT = fasFileExport;
 export const EXTERNAL_LINK = fasExternalLinkAlt;
 export const FATAL = fasTimesCircle;
 export const FILE = farFile;
-export const FILE_MISSING = fasFileCircleQuestion;
 export const FILM = fasFilm;
 export const FILTER = fasFilter;
 export const FLAG = fasFlag;
@@ -234,7 +231,6 @@ export const TAGS = fasTags;
 export const TBA = fasQuestionCircle;
 export const TEST = fasVial;
 export const TRANSLATE = fasLanguage;
-export const TRENDING = fasArrowTrendUp;
 export const UNGROUP = farObjectUngroup;
 export const UNKNOWN = fasQuestion;
 export const UNMONITORED = farBookmark;

frontend/src/Helpers/Props/sizes.js

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

frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx

@@ -1,34 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import SelectIndexerFlagsModalContent from './SelectIndexerFlagsModalContent';
-
-interface SelectIndexerFlagsModalProps {
-  isOpen: boolean;
-  indexerFlags: number;
-  modalTitle: string;
-  onIndexerFlagsSelect(indexerFlags: number): void;
-  onModalClose(): void;
-}
-
-function SelectIndexerFlagsModal(props: SelectIndexerFlagsModalProps) {
-  const {
-    isOpen,
-    indexerFlags,
-    modalTitle,
-    onIndexerFlagsSelect,
-    onModalClose,
-  } = props;
-
-  return (
-    <Modal isOpen={isOpen} onModalClose={onModalClose}>
-      <SelectIndexerFlagsModalContent
-        indexerFlags={indexerFlags}
-        modalTitle={modalTitle}
-        onIndexerFlagsSelect={onIndexerFlagsSelect}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-export default SelectIndexerFlagsModal;

frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModalContent.css

@@ -1,7 +0,0 @@
-.modalBody {
-  composes: modalBody from '~Components/Modal/ModalBody.css';
-
-  display: flex;
-  flex: 1 1 auto;
-  flex-direction: column;
-}

frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModalContent.css.d.ts

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

frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModalContent.tsx

@@ -1,75 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import Form from 'Components/Form/Form';
-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 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, scrollDirections } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './SelectIndexerFlagsModalContent.css';
-
-interface SelectIndexerFlagsModalContentProps {
-  indexerFlags: number;
-  modalTitle: string;
-  onIndexerFlagsSelect(indexerFlags: number): void;
-  onModalClose(): void;
-}
-
-function SelectIndexerFlagsModalContent(
-  props: SelectIndexerFlagsModalContentProps
-) {
-  const { modalTitle, onIndexerFlagsSelect, onModalClose } = props;
-  const [indexerFlags, setIndexerFlags] = useState(props.indexerFlags);
-
-  const onIndexerFlagsChange = useCallback(
-    ({ value }: { value: number }) => {
-      setIndexerFlags(value);
-    },
-    [setIndexerFlags]
-  );
-
-  const onIndexerFlagsSelectWrapper = useCallback(() => {
-    onIndexerFlagsSelect(indexerFlags);
-  }, [indexerFlags, onIndexerFlagsSelect]);
-
-  return (
-    <ModalContent onModalClose={onModalClose}>
-      <ModalHeader>
-        {translate('SetIndexerFlagsModalTitle', { modalTitle })}
-      </ModalHeader>
-
-      <ModalBody
-        className={styles.modalBody}
-        scrollDirection={scrollDirections.NONE}
-      >
-        <Form>
-          <FormGroup>
-            <FormLabel>{translate('IndexerFlags')}</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.INDEXER_FLAGS_SELECT}
-              name="indexerFlags"
-              indexerFlags={indexerFlags}
-              autoFocus={true}
-              onChange={onIndexerFlagsChange}
-            />
-          </FormGroup>
-        </Form>
-      </ModalBody>
-
-      <ModalFooter>
-        <Button onPress={onModalClose}>{translate('Cancel')}</Button>
-
-        <Button kind={kinds.SUCCESS} onPress={onIndexerFlagsSelectWrapper}>
-          {translate('SetIndexerFlags')}
-        </Button>
-      </ModalFooter>
-    </ModalContent>
-  );
-}
-
-export default SelectIndexerFlagsModalContent;

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx

@@ -26,7 +26,6 @@ import usePrevious from 'Helpers/Hooks/usePrevious';
 import useSelectState from 'Helpers/Hooks/useSelectState';
 import { align, icons, kinds, scrollDirections } from 'Helpers/Props';
 import ImportMode from 'InteractiveImport/ImportMode';
-import SelectIndexerFlagsModal from 'InteractiveImport/IndexerFlags/SelectIndexerFlagsModal';
 import InteractiveImport, {
   InteractiveImportCommandOptions,
 } from 'InteractiveImport/InteractiveImport';
@@ -60,13 +59,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import InteractiveImportRow from './InteractiveImportRow';
 import styles from './InteractiveImportModalContent.css';
 
-type SelectType =
-  | 'select'
-  | 'movie'
-  | 'releaseGroup'
-  | 'quality'
-  | 'language'
-  | 'indexerFlags';
+type SelectType = 'select' | 'movie' | 'releaseGroup' | 'quality' | 'language';
 
 type FilterExistingFiles = 'all' | 'new';
 
@@ -120,15 +113,6 @@ const COLUMNS = [
     isSortable: true,
     isVisible: true,
   },
-  {
-    name: 'indexerFlags',
-    label: React.createElement(Icon, {
-      name: icons.FLAG,
-      title: () => translate('IndexerFlags'),
-    }),
-    isSortable: true,
-    isVisible: true,
-  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {
@@ -258,6 +242,25 @@ function InteractiveImportModalContent(
   const [interactiveImportErrorMessage, setInteractiveImportErrorMessage] =
     useState<string | null>(null);
   const [selectState, setSelectState] = useSelectState();
+  const [bulkSelectOptions, setBulkSelectOptions] = useState([
+    {
+      key: 'select',
+      value: translate('SelectDropdown'),
+      disabled: true,
+    },
+    {
+      key: 'quality',
+      value: translate('SelectQuality'),
+    },
+    {
+      key: 'releaseGroup',
+      value: translate('SelectReleaseGroup'),
+    },
+    {
+      key: 'language',
+      value: translate('SelectLanguage'),
+    },
+  ]);
   const { allSelected, allUnselected, selectedState } = selectState;
   const previousIsDeleting = usePrevious(isDeleting);
   const dispatch = useDispatch();
@@ -273,60 +276,26 @@ function InteractiveImportModalContent(
       }
     }
 
-    const showIndexerFlags = items.some((item) => item.indexerFlags);
-
-    if (!showIndexerFlags) {
-      const indexerFlagsColumn = result.find((c) => c.name === 'indexerFlags');
-
-      if (indexerFlagsColumn) {
-        indexerFlagsColumn.isVisible = false;
-      }
-    }
-
     return result;
-  }, [showMovie, items]);
+  }, [showMovie]);
 
   const selectedIds: number[] = useMemo(() => {
     return getSelectedIds(selectedState);
   }, [selectedState]);
 
-  const bulkSelectOptions = useMemo(() => {
-    const options = [
-      {
-        key: 'select',
-        value: translate('SelectDropdown'),
-        disabled: true,
-      },
-      {
-        key: 'quality',
-        value: translate('SelectQuality'),
-      },
-      {
-        key: 'releaseGroup',
-        value: translate('SelectReleaseGroup'),
-      },
-      {
-        key: 'language',
-        value: translate('SelectLanguage'),
-      },
-      {
-        key: 'indexerFlags',
-        value: translate('SelectIndexerFlags'),
-      },
-    ];
-
-    if (allowMovieChange) {
-      options.splice(1, 0, {
-        key: 'movie',
-        value: translate('SelectMovie'),
-      });
-    }
-
-    return options;
-  }, [allowMovieChange]);
-
   useEffect(
     () => {
+      if (allowMovieChange) {
+        const newBulkSelectOptions = [...bulkSelectOptions];
+
+        newBulkSelectOptions.splice(1, 0, {
+          key: 'movie',
+          value: translate('SelectMovie'),
+        });
+
+        setBulkSelectOptions(newBulkSelectOptions);
+      }
+
       if (initialSortKey) {
         const sortProps: { sortKey: string; sortDirection?: string } = {
           sortKey: initialSortKey,
@@ -446,14 +415,7 @@ function InteractiveImportModalContent(
       const isSelected = selectedIds.indexOf(item.id) > -1;
 
       if (isSelected) {
-        const {
-          movie,
-          releaseGroup,
-          quality,
-          languages,
-          indexerFlags,
-          movieFileId,
-        } = item;
+        const { movie, releaseGroup, quality, languages, movieFileId } = item;
 
         if (!movie) {
           setInteractiveImportErrorMessage(
@@ -487,7 +449,6 @@ function InteractiveImportModalContent(
               releaseGroup,
               quality,
               languages,
-              indexerFlags,
             });
 
             return;
@@ -501,7 +462,6 @@ function InteractiveImportModalContent(
           releaseGroup,
           quality,
           languages,
-          indexerFlags,
           downloadId,
           movieFileId,
         });
@@ -659,22 +619,6 @@ function InteractiveImportModalContent(
     [selectedIds, dispatch]
   );
 
-  const onIndexerFlagsSelect = useCallback(
-    (indexerFlags: number) => {
-      dispatch(
-        updateInteractiveImportItems({
-          ids: selectedIds,
-          indexerFlags,
-        })
-      );
-
-      dispatch(reprocessInteractiveImportItems({ ids: selectedIds }));
-
-      setSelectModalOpen(null);
-    },
-    [selectedIds, dispatch]
-  );
-
   const errorMessage = getErrorMessage(
     error,
     translate('InteractiveImportLoadError')
@@ -849,14 +793,6 @@ function InteractiveImportModalContent(
         onModalClose={onSelectModalClose}
       />
 
-      <SelectIndexerFlagsModal
-        isOpen={selectModalOpen === 'indexerFlags'}
-        indexerFlags={0}
-        modalTitle={modalTitle}
-        onIndexerFlagsSelect={onIndexerFlagsSelect}
-        onModalClose={onSelectModalClose}
-      />
-
       <ConfirmModal
         isOpen={isConfirmDeleteModalOpen}
         kind={kinds.DANGER}

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.tsx

@@ -8,13 +8,11 @@ import Column from 'Components/Table/Column';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
-import SelectIndexerFlagsModal from 'InteractiveImport/IndexerFlags/SelectIndexerFlagsModal';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectMovieModal from 'InteractiveImport/Movie/SelectMovieModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
 import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
 import Language from 'Language/Language';
-import IndexerFlags from 'Movie/IndexerFlags';
 import Movie from 'Movie/Movie';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
@@ -32,12 +30,7 @@ import translate from 'Utilities/String/translate';
 import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder';
 import styles from './InteractiveImportRow.css';
 
-type SelectType =
-  | 'movie'
-  | 'releaseGroup'
-  | 'quality'
-  | 'language'
-  | 'indexerFlags';
+type SelectType = 'movie' | 'releaseGroup' | 'quality' | 'language';
 
 type SelectedChangeProps = SelectStateInputProps & {
   hasMovieFileId: boolean;
@@ -54,7 +47,6 @@ interface InteractiveImportRowProps {
   size: number;
   customFormats?: object[];
   customFormatScore?: number;
-  indexerFlags: number;
   rejections: Rejection[];
   columns: Column[];
   movieFileId?: number;
@@ -77,7 +69,6 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     size,
     customFormats,
     customFormatScore,
-    indexerFlags,
     rejections,
     isSelected,
     modalTitle,
@@ -93,10 +84,6 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     () => columns.find((c) => c.name === 'movie')?.isVisible ?? false,
     [columns]
   );
-  const isIndexerFlagsColumnVisible = useMemo(
-    () => columns.find((c) => c.name === 'indexerFlags')?.isVisible ?? false,
-    [columns]
-  );
 
   const [selectModalOpen, setSelectModalOpen] = useState<SelectType | null>(
     null
@@ -236,34 +223,12 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     [id, dispatch, setSelectModalOpen, selectRowAfterChange]
   );
 
-  const onSelectIndexerFlagsPress = useCallback(() => {
-    setSelectModalOpen('indexerFlags');
-  }, [setSelectModalOpen]);
-
-  const onIndexerFlagsSelect = useCallback(
-    (indexerFlags: number) => {
-      dispatch(
-        updateInteractiveImportItem({
-          id,
-          indexerFlags,
-        })
-      );
-
-      dispatch(reprocessInteractiveImportItems({ ids: [id] }));
-
-      setSelectModalOpen(null);
-      selectRowAfterChange();
-    },
-    [id, dispatch, setSelectModalOpen, selectRowAfterChange]
-  );
-
   const movieTitle = movie ? movie.title : '';
 
   const showMoviePlaceholder = isSelected && !movie;
   const showReleaseGroupPlaceholder = isSelected && !releaseGroup;
   const showQualityPlaceholder = isSelected && !quality;
   const showLanguagePlaceholder = isSelected && !languages;
-  const showIndexerFlagsPlaceholder = isSelected && !indexerFlags;
 
   return (
     <TableRow>
@@ -346,28 +311,6 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
         ) : null}
       </TableRowCell>
 
-      {isIndexerFlagsColumnVisible ? (
-        <TableRowCellButton
-          title={translate('ClickToChangeIndexerFlags')}
-          onPress={onSelectIndexerFlagsPress}
-        >
-          {showIndexerFlagsPlaceholder ? (
-            <InteractiveImportRowCellPlaceholder isOptional={true} />
-          ) : (
-            <>
-              {indexerFlags ? (
-                <Popover
-                  anchor={<Icon name={icons.FLAG} kind={kinds.PRIMARY} />}
-                  title={translate('IndexerFlags')}
-                  body={<IndexerFlags indexerFlags={indexerFlags} />}
-                  position={tooltipPositions.LEFT}
-                />
-              ) : null}
-            </>
-          )}
-        </TableRowCellButton>
-      ) : null}
-
       <TableRowCell>
         {rejections.length ? (
           <Popover
@@ -418,14 +361,6 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
         onLanguagesSelect={onLanguagesSelect}
         onModalClose={onSelectModalClose}
       />
-
-      <SelectIndexerFlagsModal
-        isOpen={selectModalOpen === 'indexerFlags'}
-        indexerFlags={indexerFlags ?? 0}
-        modalTitle={modalTitle}
-        onIndexerFlagsSelect={onIndexerFlagsSelect}
-        onModalClose={onSelectModalClose}
-      />
     </TableRow>
   );
 }

frontend/src/InteractiveImport/InteractiveImport.ts

@@ -11,7 +11,6 @@ export interface InteractiveImportCommandOptions {
   releaseGroup?: string;
   quality: QualityModel;
   languages: Language[];
-  indexerFlags: number;
   downloadId?: string;
   movieFileId?: number;
 }
@@ -28,7 +27,6 @@ interface InteractiveImport extends ModelBase {
   movie?: Movie;
   qualityWeight: number;
   customFormats: object[];
-  indexerFlags: number;
   rejections: Rejection[];
   movieFileId?: number;
 }

frontend/src/InteractiveSearch/InteractiveSearchContent.js

@@ -3,16 +3,13 @@ import React, { Fragment } from 'react';
 import Alert from 'Components/Alert';
 import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import PageMenuButton from 'Components/Menu/PageMenuButton';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
-import { align, icons, kinds, sortDirections } from 'Helpers/Props';
+import { icons, kinds, sortDirections } from 'Helpers/Props';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
-import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector';
 import InteractiveSearchRowConnector from './InteractiveSearchRowConnector';
-import styles from './InteractiveSearch.css';
+import styles from './InteractiveSearchContent.css';
 
 const columns = [
   {
@@ -27,6 +24,23 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
+  },
+  {
+    name: 'rejections',
+    label: React.createElement(Icon, {
+      name: icons.DANGER,
+      title: () => translate('Rejections')
+    }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
+  },
   {
     name: 'title',
     label: () => translate('Title'),
@@ -70,6 +84,12 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
+  {
+    name: 'customFormat',
+    label: () => translate('Formats'),
+    isSortable: true,
+    isVisible: true
+  },
   {
     name: 'customFormatScore',
     label: React.createElement(Icon, {
@@ -87,27 +107,10 @@ const columns = [
     }),
     isSortable: true,
     isVisible: true
-  },
-  {
-    name: 'rejections',
-    label: React.createElement(Icon, {
-      name: icons.DANGER,
-      title: () => translate('Rejections')
-    }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
   }
 ];
 
-function InteractiveSearch(props) {
+function InteractiveSearchContent(props) {
   const {
     searchPayload,
     isFetching,
@@ -115,36 +118,18 @@ function InteractiveSearch(props) {
     error,
     totalReleasesCount,
     items,
-    selectedFilterKey,
-    filters,
-    customFilters,
     sortKey,
     sortDirection,
     longDateFormat,
     timeFormat,
     onSortPress,
-    onFilterSelect,
     onGrabPress
   } = props;
 
   const errorMessage = getErrorMessage(error);
-  const type = 'movies';
 
   return (
     <div>
-      <div className={styles.filterMenuContainer}>
-        <FilterMenu
-          alignMenu={align.RIGHT}
-          selectedFilterKey={selectedFilterKey}
-          filters={filters}
-          customFilters={customFilters}
-          buttonComponent={PageMenuButton}
-          filterModalConnectorComponent={InteractiveSearchFilterModalConnector}
-          filterModalConnectorComponentProps={{ type }}
-          onFilterSelect={onFilterSelect}
-        />
-      </div>
-
       {
         isFetching ? <LoadingIndicator /> : null
       }
@@ -218,23 +203,19 @@ function InteractiveSearch(props) {
   );
 }
 
-InteractiveSearch.propTypes = {
+InteractiveSearchContent.propTypes = {
   searchPayload: PropTypes.object.isRequired,
   isFetching: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   totalReleasesCount: PropTypes.number.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   sortKey: PropTypes.string,
   sortDirection: PropTypes.string,
   longDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
   onSortPress: PropTypes.func.isRequired,
-  onFilterSelect: PropTypes.func.isRequired,
   onGrabPress: PropTypes.func.isRequired
 };
 
-export default InteractiveSearch;
+export default InteractiveSearchContent;

frontend/src/InteractiveSearch/InteractiveSearchContentConnector.js

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

frontend/src/InteractiveSearch/InteractiveSearchFilterMenu.js

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

frontend/src/InteractiveSearch/InteractiveSearchRow.css

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