Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: Altair <villagermd@outlook.com>
Co-authored-by: Ano10 <arnaudthommeray+github@ik.me>
Co-authored-by: Fonkio <maxime.fabre10@gmail.com>
Co-authored-by: GkhnGRBZ <gkhn.gurbuz@hotmail.com>
Co-authored-by: Havok Dan <havokdan@yahoo.com.br>
Co-authored-by: Jacopo Luca Maria Latrofa <jacopo.latrofa@gmail.com>
Co-authored-by: Mailme Dashite <mailmedashite@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: YSLG <1451164040@qq.com>
Co-authored-by: fordas <fordas15@gmail.com>
Co-authored-by: myrad2267 <myrad2267@gmail.com>
Co-authored-by: toeiazarothis <patrickdealmeida89000@gmail.com>
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/de/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/es/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/fr/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/it/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/pt_BR/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/tr/
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/zh_CN/
Translation: Servarr/Radarr

.devcontainer/Radarr.code-workspace

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

.devcontainer/devcontainer.json

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

.github/dependabot.yml

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

.gitignore

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

.vscode/extensions.json

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

.vscode/launch.json

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

.vscode/tasks.json

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

azure-pipelines.yml

@@ -9,14 +9,14 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.3.2'
+  majorVersion: '5.5.0'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
   dotnetVersion: '6.0.417'
-  nodeVersion: '16.X'
+  nodeVersion: '20.X'
   innoVersion: '6.2.2'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'

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 RemoveQueueItemsModal from './RemoveQueueItemsModal';
+import RemoveQueueItemModal from './RemoveQueueItemModal';
 
 class Queue extends Component {
 
@@ -307,9 +307,16 @@ class Queue extends Component {
           }
         </PageContentBody>
 
-        <RemoveQueueItemsModal
+        <RemoveQueueItemModal
           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);
@@ -317,7 +324,7 @@ class Queue extends Component {
               return !!(item && item.movieId);
             })
           )}
-          allPending={isConfirmRemoveModalOpen && (
+          pending={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
 

frontend/src/Activity/Queue/QueueRow.js

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

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -1,171 +0,0 @@
-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

@@ -0,0 +1,230 @@
+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

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

frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js

@@ -3,10 +3,13 @@ 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';
 
@@ -35,7 +38,9 @@ const mapDispatchToProps = {
   fetchRootFolders,
   fetchImportExclusions,
   fetchQueueDetails,
-  clearQueueDetails
+  clearQueueDetails,
+  fetchMovieFiles,
+  clearMovieFiles
 };
 
 class AddNewMovieConnector extends Component {
@@ -55,6 +60,20 @@ 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);
@@ -62,6 +81,7 @@ class AddNewMovieConnector extends Component {
 
     this.props.clearAddMovie();
     this.props.clearQueueDetails();
+    this.props.clearMovieFiles();
   }
 
   //
@@ -107,12 +127,15 @@ 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
+  clearQueueDetails: PropTypes.func.isRequired,
+  fetchMovieFiles: PropTypes.func.isRequired,
+  clearMovieFiles: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(AddNewMovieConnector);

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -75,7 +75,6 @@ class AddNewMovieSearchResult extends Component {
       colorImpairedMode,
       id,
       monitored,
-      hasFile,
       isAvailable,
       movieFile,
       queueItem,
@@ -88,6 +87,8 @@ 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;
@@ -126,7 +127,7 @@ class AddNewMovieSearchResult extends Component {
                       movieId={existingMovieId}
                       movieFile={movieFile}
                       monitored={monitored}
-                      hasFile={hasFile}
+                      hasFile={hasMovieFile}
                       status={status}
                       width={posterWidth}
                       detailedProgressBar={true}
@@ -270,7 +271,7 @@ class AddNewMovieSearchResult extends Component {
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    hasMovieFiles={hasFile}
+                    hasMovieFiles={hasMovieFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
                     queueItem={queueItem}
@@ -322,7 +323,6 @@ AddNewMovieSearchResult.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   id: PropTypes.number,
   monitored: PropTypes.bool.isRequired,
-  hasFile: PropTypes.bool.isRequired,
   isAvailable: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
   queueItem: PropTypes.object,

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js

@@ -11,10 +11,12 @@ 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, internalId, 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);
 
       return {
         existingMovieId: internalId,
@@ -22,6 +24,7 @@ function createMapStateToProps() {
         isExclusionMovie,
         isSmallScreen: dimensions.isSmallScreen,
         queueItem,
+        movieFile,
         movieRuntimeFormat
       };
     }

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

@@ -10,6 +10,7 @@ import styles from './ImportMovieRow.css';
 function ImportMovieRow(props) {
   const {
     id,
+    relativePath,
     monitor,
     qualityProfileId,
     minimumAvailability,
@@ -31,7 +32,7 @@ function ImportMovieRow(props) {
       />
 
       <VirtualTableRowCell className={styles.folder}>
-        {id}
+        {relativePath}
       </VirtualTableRowCell>
 
       <VirtualTableRowCell className={styles.movie}>
@@ -73,6 +74,7 @@ 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);
+      onMovieLookup(id, unmappedFolder.path, unmappedFolder.relativePath);
 
       onSetImportMovieValue({
         id,

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

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

frontend/src/Calendar/Calendar.js

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

frontend/src/Calendar/CalendarPage.js

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

frontend/src/Calendar/Header/CalendarHeader.js

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

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

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

frontend/src/Calendar/iCal/CalendarLinkModalContent.js

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

frontend/src/Collection/CollectionFooter.js

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

frontend/src/Commands/Command.ts

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

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

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

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

frontend/src/Components/Form/AvailabilitySelectInput.js

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

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

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

frontend/src/Components/Form/EnhancedSelectInput.css

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

frontend/src/Components/Form/FormInputGroup.js

@@ -17,6 +17,7 @@ import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import LanguageSelectInputConnector from './LanguageSelectInputConnector';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
+import MovieTagInput from './MovieTagInput';
 import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
@@ -89,6 +90,10 @@ function getComponent(type) {
 
     case inputTypes.DYNAMIC_SELECT:
       return EnhancedSelectInputConnector;
+
+    case inputTypes.MOVIE_TAG:
+      return MovieTagInput;
+
     case inputTypes.TAG:
       return TagInputConnector;
 
@@ -267,6 +272,7 @@ 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,
@@ -281,6 +287,7 @@ 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,22 +4,18 @@ 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
-        .filter(
-          // eslint-disable-next-line no-bitwise
-          (item) => (selectedFlags & item.id) === item.id
-        )
-        .map(({ id }) => id);
+      const value = indexerFlags.items.reduce((acc: number[], { id }) => {
+        // eslint-disable-next-line no-bitwise
+        if ((selectedFlags & id) === id) {
+          acc.push(id);
+        }
+
+        return acc;
+      }, []);
 
       const values = indexerFlags.items.map(({ id, name }) => ({
         key: id,
@@ -33,6 +29,12 @@ 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/MovieMonitoredSelectInput.js

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

frontend/src/Components/Form/MovieTagInput.tsx

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

frontend/src/Components/Form/ProviderFieldFormGroup.js

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

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -26,7 +26,7 @@ function createMapStateToProps() {
         values.unshift({
           key: 'noChange',
           value: translate('NoChange'),
-          disabled: includeNoChangeDisabled
+          isDisabled: includeNoChangeDisabled
         });
       }
 
@@ -34,7 +34,7 @@ function createMapStateToProps() {
         values.unshift({
           key: 'mixed',
           value: '(Mixed)',
-          disabled: true
+          isDisabled: true
         });
       }
 

frontend/src/Components/Form/TextTagInputConnector.js

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

frontend/src/Components/ImportListList.js

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

frontend/src/Components/Page/PageConnector.js

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

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

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

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

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

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js

@@ -97,6 +97,8 @@ class DiscoverMovieOverview extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isPopular,
+      isTrending,
       isSelected,
       overviewOptions,
       ...otherProps
@@ -214,6 +216,26 @@ 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}
               />
@@ -283,6 +305,8 @@ 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/Table/DiscoverMovieHeader.css

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

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

@@ -7,7 +7,9 @@ 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,6 +7,7 @@ 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';
 
@@ -98,6 +99,43 @@ 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,10 +76,12 @@
   flex: 1 0 110px;
 }
 
+.isTrending,
+.isPopular,
 .isRecommendation {
   composes: cell;
 
-  flex: 0 0 50px;
+  flex: 0 0 30px;
 }
 
 .actions {
@@ -95,6 +97,11 @@
   margin-top: 0;
 }
 
+.statusIcon {
+  width: 20px !important;
+  text-align: center;
+}
+
 .externalLinks {
   margin-right: 0.5em;
 }

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

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

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -82,6 +82,8 @@ class DiscoverMovieRow extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isTrending,
+      isPopular,
       isSelected,
       lists,
       onSelectedChange
@@ -305,6 +307,7 @@ class DiscoverMovieRow extends Component {
                   {
                     isRecommendation ?
                       <Icon
+                        className={styles.statusIcon}
                         name={icons.RECOMMENDED}
                         size={12}
                         title={translate('MovieIsRecommend')}
@@ -315,6 +318,46 @@ 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
@@ -404,6 +447,8 @@ DiscoverMovieRow.propTypes = {
   isExcluded: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   isRecommendation: PropTypes.bool.isRequired,
+  isPopular: PropTypes.bool.isRequired,
+  isTrending: PropTypes.bool.isRequired,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired
 };

frontend/src/Helpers/Hooks/useModalOpenState.ts

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

frontend/src/Helpers/Props/icons.js

@@ -23,6 +23,7 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
+  faArrowTrendUp as fasArrowTrendUp,
   faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
@@ -233,6 +234,7 @@ 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/inputTypes.js

@@ -17,6 +17,7 @@ export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
 export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const SELECT = 'select';
+export const MOVIE_TAG = 'movieTag';
 export const DYNAMIC_SELECT = 'dynamicSelect';
 export const TAG = 'tag';
 export const TEXT = 'text';
@@ -45,6 +46,7 @@ export const all = [
   INDEXER_FLAGS_SELECT,
   LANGUAGE_SELECT,
   SELECT,
+  MOVIE_TAG,
   DYNAMIC_SELECT,
   TAG,
   TEXT,

frontend/src/InteractiveImport/IndexerFlags/SelectIndexerFlagsModal.tsx

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,7 @@
+.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

@@ -0,0 +1,7 @@
+// 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

@@ -0,0 +1,75 @@
+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,6 +26,7 @@ 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';
@@ -59,7 +60,13 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import InteractiveImportRow from './InteractiveImportRow';
 import styles from './InteractiveImportModalContent.css';
 
-type SelectType = 'select' | 'movie' | 'releaseGroup' | 'quality' | 'language';
+type SelectType =
+  | 'select'
+  | 'movie'
+  | 'releaseGroup'
+  | 'quality'
+  | 'language'
+  | 'indexerFlags';
 
 type FilterExistingFiles = 'all' | 'new';
 
@@ -113,6 +120,15 @@ 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, {
@@ -242,25 +258,6 @@ 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();
@@ -276,26 +273,60 @@ 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]);
+  }, [showMovie, items]);
 
   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,
@@ -415,7 +446,14 @@ function InteractiveImportModalContent(
       const isSelected = selectedIds.indexOf(item.id) > -1;
 
       if (isSelected) {
-        const { movie, releaseGroup, quality, languages, movieFileId } = item;
+        const {
+          movie,
+          releaseGroup,
+          quality,
+          languages,
+          indexerFlags,
+          movieFileId,
+        } = item;
 
         if (!movie) {
           setInteractiveImportErrorMessage(
@@ -449,6 +487,7 @@ function InteractiveImportModalContent(
               releaseGroup,
               quality,
               languages,
+              indexerFlags,
             });
 
             return;
@@ -462,6 +501,7 @@ function InteractiveImportModalContent(
           releaseGroup,
           quality,
           languages,
+          indexerFlags,
           downloadId,
           movieFileId,
         });
@@ -619,6 +659,22 @@ 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')
@@ -793,6 +849,14 @@ 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,11 +8,13 @@ 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';
@@ -30,7 +32,12 @@ import translate from 'Utilities/String/translate';
 import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder';
 import styles from './InteractiveImportRow.css';
 
-type SelectType = 'movie' | 'releaseGroup' | 'quality' | 'language';
+type SelectType =
+  | 'movie'
+  | 'releaseGroup'
+  | 'quality'
+  | 'language'
+  | 'indexerFlags';
 
 type SelectedChangeProps = SelectStateInputProps & {
   hasMovieFileId: boolean;
@@ -47,6 +54,7 @@ interface InteractiveImportRowProps {
   size: number;
   customFormats?: object[];
   customFormatScore?: number;
+  indexerFlags: number;
   rejections: Rejection[];
   columns: Column[];
   movieFileId?: number;
@@ -69,6 +77,7 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     size,
     customFormats,
     customFormatScore,
+    indexerFlags,
     rejections,
     isSelected,
     modalTitle,
@@ -84,6 +93,10 @@ 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
@@ -223,12 +236,34 @@ 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>
@@ -311,6 +346,28 @@ 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
@@ -361,6 +418,14 @@ 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,6 +11,7 @@ export interface InteractiveImportCommandOptions {
   releaseGroup?: string;
   quality: QualityModel;
   languages: Language[];
+  indexerFlags: number;
   downloadId?: string;
   movieFileId?: number;
 }
@@ -27,6 +28,7 @@ interface InteractiveImport extends ModelBase {
   movie?: Movie;
   qualityWeight: number;
   customFormats: object[];
+  indexerFlags: number;
   rejections: Rejection[];
   movieFileId?: number;
 }

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -88,13 +88,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {
@@ -104,6 +97,13 @@ const columns = [
     isSortable: true,
     fixedSortDirection: sortDirections.ASCENDING,
     isVisible: true
+  },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
   }
 ];
 

frontend/src/InteractiveSearch/InteractiveSearchRow.css

@@ -39,8 +39,7 @@
 }
 
 .rejected,
-.indexerFlags,
-.download {
+.indexerFlags {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 50px;

frontend/src/InteractiveSearch/InteractiveSearchRow.tsx

@@ -90,8 +90,8 @@ interface InteractiveSearchRowProps {
   customFormats: CustomFormat[];
   customFormatScore: number;
   mappedMovieId?: number;
-  rejections: string[];
   indexerFlags: string[];
+  rejections: string[];
   downloadAllowed: boolean;
   isGrabbing: boolean;
   isGrabbed: boolean;
@@ -125,8 +125,8 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
     customFormatScore,
     customFormats,
     mappedMovieId,
-    rejections = [],
     indexerFlags = [],
+    rejections = [],
     downloadAllowed,
     isGrabbing = false,
     isGrabbed = false,
@@ -276,7 +276,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
             customFormats.length
           )}
           tooltip={<MovieFormats formats={customFormats} />}
-          position={tooltipPositions.TOP}
+          position={tooltipPositions.LEFT}
         />
       </TableRowCell>
 

frontend/src/Movie/Delete/DeleteMovieModalContent.js

@@ -98,7 +98,7 @@ class DeleteMovieModalContent extends Component {
               type={inputTypes.CHECK}
               name="addImportExclusion"
               value={addImportExclusion}
-              helpText={translate('AddImportExclusionHelpText')}
+              helpText={translate('AddListExclusionMovieHelpText')}
               kind={kinds.DANGER}
               onChange={onDeleteOptionChange}
             />

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

@@ -1,8 +1,15 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import Link from 'Components/Link/Link';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCastPoster extends Component {
@@ -52,6 +59,7 @@ class MovieCastPoster extends Component {
 
   render() {
     const {
+      tmdbId,
       personName,
       character,
       images,
@@ -83,15 +91,35 @@ class MovieCastPoster extends Component {
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <div className={styles.toggleMonitoredContainer}>
             <MonitorToggleButton
-              className={styles.action}
+              className={styles.monitorToggleButton}
               monitored={monitored}
               size={20}
               onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
             />
           </div>
 
+          <Label className={styles.controls}>
+            <span className={styles.externalLinks}>
+              <Popover
+                anchor={<Icon name={icons.EXTERNAL_LINK} size={12} />}
+                title={translate('Links')}
+                body={
+                  <Link to={`https://www.themoviedb.org/person/${tmdbId}`}>
+                    <Label
+                      className={styles.externalLinkLabel}
+                      kind={kinds.INFO}
+                      size={sizes.LARGE}
+                    >
+                      {translate('TMDb')}
+                    </Label>
+                  </Link>
+                }
+              />
+            </span>
+          </Label>
+
           <div
             style={elementStyle}
           >
@@ -115,10 +143,10 @@ class MovieCastPoster extends Component {
           </div>
         </div>
 
-        <div className={styles.title}>
+        <div className={classNames(styles.title, 'swiper-no-swiping')}>
           {personName}
         </div>
-        <div className={styles.title}>
+        <div className={classNames(styles.title, 'swiper-no-swiping')}>
           {character}
         </div>
 

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

@@ -1,8 +1,15 @@
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import Link from 'Components/Link/Link';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, sizes } from 'Helpers/Props';
 import MovieHeadshot from 'Movie/MovieHeadshot';
 import EditImportListModalConnector from 'Settings/ImportLists/ImportLists/EditImportListModalConnector';
+import translate from 'Utilities/String/translate';
 import styles from '../MovieCreditPoster.css';
 
 class MovieCrewPoster extends Component {
@@ -52,6 +59,7 @@ class MovieCrewPoster extends Component {
 
   render() {
     const {
+      tmdbId,
       personName,
       job,
       images,
@@ -83,15 +91,35 @@ class MovieCrewPoster extends Component {
         style={contentStyle}
       >
         <div className={styles.posterContainer}>
-          <div className={styles.controls}>
+          <div className={styles.toggleMonitoredContainer}>
             <MonitorToggleButton
-              className={styles.action}
+              className={styles.monitorToggleButton}
               monitored={monitored}
               size={20}
               onPress={importListId > 0 ? this.onEditImportListPress : this.onAddImportListPress}
             />
           </div>
 
+          <Label className={styles.controls}>
+            <span className={styles.externalLinks}>
+              <Popover
+                anchor={<Icon name={icons.EXTERNAL_LINK} size={12} />}
+                title={translate('Links')}
+                body={
+                  <Link to={`https://www.themoviedb.org/person/${tmdbId}`}>
+                    <Label
+                      className={styles.externalLinkLabel}
+                      kind={kinds.INFO}
+                      size={sizes.LARGE}
+                    >
+                      {translate('TMDb')}
+                    </Label>
+                  </Link>
+                }
+              />
+            </span>
+          </Label>
+
           <div
             style={elementStyle}
           >
@@ -115,10 +143,10 @@ class MovieCrewPoster extends Component {
           </div>
         </div>
 
-        <div className={styles.title}>
+        <div className={classNames(styles.title, 'swiper-no-swiping')}>
           {personName}
         </div>
-        <div className={styles.title}>
+        <div className={classNames(styles.title, 'swiper-no-swiping')}>
           {job}
         </div>
 

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

@@ -1,13 +1,17 @@
 $hoverScale: 1.05;
 
 .content {
-  border-radius: '5px';
   transition: all 200ms ease-in;
 
   &:hover {
     z-index: 2;
     box-shadow: 0 0 12px var(--black);
     transition: all 200ms ease-in;
+
+    .controls {
+      opacity: 0.9;
+      transition: opacity 200ms linear 150ms;
+    }
   }
 }
 
@@ -44,13 +48,13 @@ $hoverScale: 1.05;
   font-size: $smallFontSize;
 }
 
-.controls {
+.toggleMonitoredContainer {
   position: absolute;
   top: 10px;
   z-index: 3;
 }
 
-.action {
+.monitorToggleButton {
   composes: toggleButton from '~Components/MonitorToggleButton.css';
 
   width: 25px;
@@ -61,8 +65,39 @@ $hoverScale: 1.05;
   }
 }
 
+.controls {
+  position: absolute;
+  bottom: 10px;
+  left: 10px;
+  z-index: 3;
+  border-radius: 4px;
+  background-color: #707070;
+  color: var(--white);
+  font-size: $smallFontSize;
+  opacity: 0;
+  transition: opacity 0;
+}
+
+.action {
+  composes: button from '~Components/Link/IconButton.css';
+
+  &:hover {
+    color: var(--iconButtonHoverLightColor);
+  }
+}
+
 @media only screen and (max-width: $breakpointSmall) {
   .container {
     padding: 5px;
   }
 }
+
+.externalLinks {
+  margin: 0 2px;
+}
+
+.externalLinkLabel {
+  composes: label from '~Components/Label.css';
+
+  cursor: pointer;
+}

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

@@ -5,10 +5,14 @@ interface CssExports {
   'container': string;
   'content': string;
   'controls': string;
+  'externalLinkLabel': string;
+  'externalLinks': string;
+  'monitorToggleButton': string;
   'overlayTitle': string;
   'poster': string;
   'posterContainer': string;
   'title': string;
+  'toggleMonitoredContainer': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Movie/Details/MovieDetailsLinks.css

@@ -1,4 +1,6 @@
 .links {
+  display: flex;
+  flex-wrap: wrap;
   margin: 0;
 }
 

frontend/src/Movie/Index/MovieIndex.tsx

@@ -44,6 +44,7 @@ import MovieIndexViewMenu from './Menus/MovieIndexViewMenu';
 import MovieIndexFooter from './MovieIndexFooter';
 import MovieIndexRefreshMovieButton from './MovieIndexRefreshMovieButton';
 import MovieIndexSearchButton from './MovieIndexSearchButton';
+import MovieIndexSearchMenuItem from './MovieIndexSearchMenuItem';
 import MovieIndexOverviews from './Overview/MovieIndexOverviews';
 import MovieIndexOverviewOptionsModal from './Overview/Options/MovieIndexOverviewOptionsModal';
 import MovieIndexPosters from './Posters/MovieIndexPosters';
@@ -235,7 +236,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
             />
 
             <PageToolbarButton
-              label={translate('RSSSync')}
+              label={translate('RssSync')}
               iconName={icons.RSS}
               isSpinning={isRssSyncExecuting}
               isDisabled={hasNoMovie}
@@ -247,6 +248,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
             <MovieIndexSearchButton
               isSelectMode={isSelectMode}
               selectedFilterKey={selectedFilterKey}
+              overflowComponent={MovieIndexSearchMenuItem}
             />
 
             <PageToolbarButton

frontend/src/Movie/Index/MovieIndexSearchButton.tsx

@@ -16,6 +16,7 @@ import getSelectedIds from 'Utilities/Table/getSelectedIds';
 interface MovieIndexSearchButtonProps {
   isSelectMode: boolean;
   selectedFilterKey: string;
+  overflowComponent: React.FunctionComponent<never>;
 }
 
 function MovieIndexSearchButton(props: MovieIndexSearchButtonProps) {

frontend/src/Movie/Index/MovieIndexSearchMenuItem.tsx

@@ -0,0 +1,72 @@
+import React, { useCallback, useMemo } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useSelect } from 'App/SelectContext';
+import ClientSideCollectionAppState from 'App/State/ClientSideCollectionAppState';
+import MoviesAppState, { MovieIndexAppState } from 'App/State/MoviesAppState';
+import { MOVIE_SEARCH } from 'Commands/commandNames';
+import PageToolbarOverflowMenuItem from 'Components/Page/Toolbar/PageToolbarOverflowMenuItem';
+import { icons } from 'Helpers/Props';
+import { executeCommand } from 'Store/Actions/commandActions';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/createMovieClientSideCollectionItemsSelector';
+import translate from 'Utilities/String/translate';
+import getSelectedIds from 'Utilities/Table/getSelectedIds';
+
+interface MovieIndexSearchMenuItemProps {
+  isSelectMode: boolean;
+  selectedFilterKey: string;
+}
+
+function MovieIndexSearchMenuItem(props: MovieIndexSearchMenuItemProps) {
+  const isSearching = useSelector(createCommandExecutingSelector(MOVIE_SEARCH));
+  const {
+    items,
+  }: MoviesAppState & MovieIndexAppState & ClientSideCollectionAppState =
+    useSelector(createMovieClientSideCollectionItemsSelector('movieIndex'));
+
+  const dispatch = useDispatch();
+
+  const { isSelectMode, selectedFilterKey } = props;
+  const [selectState] = useSelect();
+  const { selectedState } = selectState;
+
+  const selectedMovieIds = useMemo(() => {
+    return getSelectedIds(selectedState);
+  }, [selectedState]);
+
+  const moviesToSearch =
+    isSelectMode && selectedMovieIds.length > 0
+      ? selectedMovieIds
+      : items.map((m) => m.id);
+
+  const searchIndexLabel =
+    selectedFilterKey === 'all'
+      ? translate('SearchAll')
+      : translate('SearchFiltered');
+
+  const searchSelectLabel =
+    selectedMovieIds.length > 0
+      ? translate('SearchSelected')
+      : translate('SearchAll');
+
+  const onPress = useCallback(() => {
+    dispatch(
+      executeCommand({
+        name: MOVIE_SEARCH,
+        movieIds: moviesToSearch,
+      })
+    );
+  }, [dispatch, moviesToSearch]);
+
+  return (
+    <PageToolbarOverflowMenuItem
+      label={isSelectMode ? searchSelectLabel : searchIndexLabel}
+      isSpinning={isSearching}
+      isDisabled={!items.length}
+      iconName={icons.SEARCH}
+      onPress={onPress}
+    />
+  );
+}
+
+export default MovieIndexSearchMenuItem;

frontend/src/Movie/Index/Select/Delete/DeleteMovieModalContent.tsx

@@ -98,7 +98,7 @@ function DeleteMovieModalContent(props: DeleteMovieModalContentProps) {
               type={inputTypes.CHECK}
               name="addImportExclusion"
               value={addImportExclusion}
-              helpText={translate('AddImportExclusionHelpText')}
+              helpText={translate('AddListExclusionMovieHelpText')}
               onChange={onDeleteOptionChange}
             />
           </FormGroup>

frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx

@@ -34,7 +34,7 @@ const monitoredOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'monitored',

frontend/src/Movie/IndexerFlags.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import createIndexerFlagsSelector from 'Store/Selectors/createIndexerFlagsSelector';
+
+interface IndexerFlagsProps {
+  indexerFlags: number;
+}
+
+function IndexerFlags({ indexerFlags = 0 }: IndexerFlagsProps) {
+  const allIndexerFlags = useSelector(createIndexerFlagsSelector);
+
+  const flags = allIndexerFlags.items.filter(
+    // eslint-disable-next-line no-bitwise
+    (item) => (indexerFlags & item.id) === item.id
+  );
+
+  return flags.length ? (
+    <ul>
+      {flags.map((flag, index) => {
+        return <li key={index}>{flag.name}</li>;
+      })}
+    </ul>
+  ) : null;
+}
+
+export default IndexerFlags;

frontend/src/MovieFile/Editor/MovieFileEditorRow.css

@@ -45,7 +45,8 @@
   width: 165px;
 }
 
-.releaseGroup {
+.releaseGroup,
+.dateAdded {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 120px;
@@ -56,3 +57,9 @@
 
   width: 55px;
 }
+
+.indexerFlags {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 50px;
+}

frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts

@@ -6,8 +6,10 @@ interface CssExports {
   'audio': string;
   'audioLanguages': string;
   'customFormatScore': string;
+  'dateAdded': string;
   'download': string;
   'formats': string;
+  'indexerFlags': string;
   'language': string;
   'languages': string;
   'quality': string;

frontend/src/MovieFile/Editor/MovieFileEditorRow.js

@@ -1,11 +1,15 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import IconButton from 'Components/Link/IconButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
+import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
+import Popover from 'Components/Tooltip/Popover';
 import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import IndexerFlags from 'Movie/IndexerFlags';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
@@ -81,7 +85,9 @@ class MovieFileEditorRow extends Component {
       qualityCutoffNotMet,
       customFormats,
       customFormatScore,
+      indexerFlags,
       languages,
+      dateAdded,
       columns
     } = this.props;
 
@@ -141,12 +147,30 @@ class MovieFileEditorRow extends Component {
                       customFormats.length
                     )}
                     tooltip={<MovieFormats formats={customFormats} />}
-                    position={tooltipPositions.TOP}
+                    position={tooltipPositions.LEFT}
                   />
                 </TableRowCell>
               );
             }
 
+            if (name === 'indexerFlags') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.indexerFlags}
+                >
+                  {indexerFlags ? (
+                    <Popover
+                      anchor={<Icon name={icons.FLAG} kind={kinds.PRIMARY} />}
+                      title={translate('IndexerFlags')}
+                      body={<IndexerFlags indexerFlags={indexerFlags} />}
+                      position={tooltipPositions.LEFT}
+                    />
+                  ) : null}
+                </TableRowCell>
+              );
+            }
+
             if (name === 'languages') {
               return (
                 <TableRowCell
@@ -287,6 +311,16 @@ class MovieFileEditorRow extends Component {
               );
             }
 
+            if (name === 'dateAdded') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  className={styles.dateAdded}
+                  date={dateAdded}
+                />
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <TableRowCell key={name} className={styles.actions}>
@@ -351,15 +385,18 @@ MovieFileEditorRow.propTypes = {
   releaseGroup: PropTypes.string,
   customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   customFormatScore: PropTypes.number.isRequired,
+  indexerFlags: PropTypes.number.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   mediaInfo: PropTypes.object,
+  dateAdded: PropTypes.string,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   onDeletePress: PropTypes.func.isRequired
 };
 
 MovieFileEditorRow.defaultProps = {
-  customFormats: []
+  customFormats: [],
+  indexerFlags: 0
 };
 
 export default MovieFileEditorRow;

frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js

@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
+import { sortDirections } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import MovieFileEditorRow from './MovieFileEditorRow';
 import styles from './MovieFileEditorTableContent.css';
 
@@ -14,6 +16,9 @@ class MovieFileEditorTableContent extends Component {
     const {
       items,
       columns,
+      sortKey,
+      sortDirection,
+      onSortPress,
       onTableOptionChange
     } = this.props;
 
@@ -22,7 +27,7 @@ class MovieFileEditorTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No movie files to manage.
+              {translate('NoMovieFilesToManage')}
             </div>
         }
 
@@ -30,6 +35,9 @@ class MovieFileEditorTableContent extends Component {
           !!items.length &&
             <Table
               columns={columns}
+              sortKey={sortKey}
+              sortDirection={sortDirection}
+              onSortPress={onSortPress}
               onTableOptionChange={onTableOptionChange}
             >
               <TableBody>
@@ -59,7 +67,10 @@ MovieFileEditorTableContent.propTypes = {
   isDeleting: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  sortKey: PropTypes.string.isRequired,
+  sortDirection: PropTypes.oneOf(sortDirections.all),
   onTableOptionChange: PropTypes.func.isRequired,
+  onSortPress: PropTypes.func.isRequired,
   onDeletePress: PropTypes.func.isRequired
 };
 

frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js

@@ -2,8 +2,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { deleteMovieFile, setMovieFilesTableOption, updateMovieFiles } from 'Store/Actions/movieFileActions';
+import { deleteMovieFile, setMovieFilesSort, setMovieFilesTableOption } from 'Store/Actions/movieFileActions';
 import { fetchLanguages, fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
+import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import createMovieSelector from 'Store/Selectors/createMovieSelector';
 import getQualities from 'Utilities/Quality/getQualities';
 import MovieFileEditorTableContent from './MovieFileEditorTableContent';
@@ -11,7 +12,7 @@ import MovieFileEditorTableContent from './MovieFileEditorTableContent';
 function createMapStateToProps() {
   return createSelector(
     (state, { movieId }) => movieId,
-    (state) => state.movieFiles,
+    createClientSideCollectionSelector('movieFiles'),
     (state) => state.settings.languages,
     (state) => state.settings.qualityProfiles,
     createMovieSelector(),
@@ -23,13 +24,13 @@ function createMapStateToProps() {
     ) => {
       const languages = languageProfiles.items;
       const qualities = getQualities(qualityProfiles.schema.items);
-      const filesForMovie = movieFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = movieFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
         columns: movieFiles.columns,
+        sortKey: movieFiles.sortKey,
+        sortDirection: movieFiles.sortDirection,
         isDeleting: movieFiles.isDeleting,
         isSaving: movieFiles.isSaving,
         error: null,
@@ -40,31 +41,13 @@ function createMapStateToProps() {
   );
 }
 
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    dispatchFetchQualityProfileSchema(name, path) {
-      dispatch(fetchQualityProfileSchema());
-    },
-
-    dispatchFetchLanguages(name, path) {
-      dispatch(fetchLanguages());
-    },
-
-    dispatchUpdateMovieFiles(updateProps) {
-      dispatch(updateMovieFiles(updateProps));
-    },
-
-    onTableOptionChange(payload) {
-      dispatch(setMovieFilesTableOption(payload));
-    },
-
-    onDeletePress(movieFileId) {
-      dispatch(deleteMovieFile({
-        id: movieFileId
-      }));
-    }
-  };
-}
+const mapDispatchToProps = {
+  fetchQualityProfileSchema,
+  fetchLanguages,
+  deleteMovieFile,
+  setMovieFilesTableOption,
+  setMovieFilesSort
+};
 
 class MovieFileEditorTableContentConnector extends Component {
 
@@ -72,24 +55,40 @@ class MovieFileEditorTableContentConnector extends Component {
   // Lifecycle
 
   componentDidMount() {
-    this.props.dispatchFetchLanguages();
-    this.props.dispatchFetchQualityProfileSchema();
+    this.props.fetchLanguages();
+    this.props.fetchQualityProfileSchema();
   }
 
+  //
+  // Listeners
+
+  onDeletePress = (movieFileId) => {
+    this.props.deleteMovieFile({
+      id: movieFileId
+    });
+  };
+
+  onTableOptionChange = (payload) => {
+    this.props.setMovieFilesTableOption(payload);
+  };
+
+  onSortPress = (sortKey, sortDirection) => {
+    this.props.setMovieFilesSort({
+      sortKey,
+      sortDirection
+    });
+  };
+
   //
   // Render
 
   render() {
-    const {
-      dispatchFetchLanguages,
-      dispatchFetchQualityProfileSchema,
-      dispatchUpdateMovieFiles,
-      ...otherProps
-    } = this.props;
-
     return (
       <MovieFileEditorTableContent
-        {...otherProps}
+        {...this.props}
+        onDeletePress={this.onDeletePress}
+        onTableOptionChange={this.onTableOptionChange}
+        onSortPress={this.onSortPress}
       />
     );
   }
@@ -99,9 +98,11 @@ MovieFileEditorTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
-  dispatchFetchLanguages: PropTypes.func.isRequired,
-  dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
-  dispatchUpdateMovieFiles: PropTypes.func.isRequired
+  fetchLanguages: PropTypes.func.isRequired,
+  fetchQualityProfileSchema: PropTypes.func.isRequired,
+  deleteMovieFile: PropTypes.func.isRequired,
+  setMovieFilesTableOption: PropTypes.func.isRequired,
+  setMovieFilesSort: PropTypes.func.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(MovieFileEditorTableContentConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(MovieFileEditorTableContentConnector);

frontend/src/MovieFile/Extras/ExtraFileTableContent.js

@@ -46,7 +46,7 @@ class ExtraFileTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No extra files to manage.
+              {translate('NoExtraFilesToManage')}
             </div>
         }
 

frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js

@@ -14,9 +14,7 @@ function createMapStateToProps() {
       movieId,
       extraFiles
     ) => {
-      const filesForMovie = extraFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = extraFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
@@ -26,11 +24,6 @@ function createMapStateToProps() {
   );
 }
 
-function createMapDispatchToProps(dispatch, props) {
-  return {
-  };
-}
-
 class ExtraFileTableContentConnector extends Component {
 
   //
@@ -53,4 +46,4 @@ ExtraFileTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(ExtraFileTableContentConnector);
+export default connect(createMapStateToProps, null)(ExtraFileTableContentConnector);

frontend/src/MovieFile/MovieFile.ts

@@ -15,6 +15,7 @@ export interface MovieFile extends ModelBase {
   languages: Language[];
   quality: QualityModel;
   customFormats: CustomFormat[];
+  indexerFlags: number;
   mediaInfo: MediaInfo;
   qualityCutoffNotMet: boolean;
 }

frontend/src/Organize/OrganizePreviewModalContent.js

@@ -104,7 +104,7 @@ class OrganizePreviewModalContent extends Component {
 
           {
             !isFetching && error &&
-              <div>{translate('OrganizeLoadError')}</div>
+              <Alert kind={kinds.DANGER}>{translate('OrganizeLoadError')}</Alert>
           }
 
           {

frontend/src/Settings/CustomFormats/CustomFormatSettingsPage.tsx

@@ -6,11 +6,12 @@ import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import ParseToolbarButton from 'Parse/ParseToolbarButton';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import translate from 'Utilities/String/translate';
 import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector';
 
 function CustomFormatSettingsPage() {
   return (
-    <PageContent title="Custom Format Settings">
+    <PageContent title={translate('CustomFormatsSettings')}>
       <SettingsToolbarConnector
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore

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

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

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

@@ -61,8 +61,8 @@ class CustomFormats extends Component {
     return (
       <FieldSet legend={translate('CustomFormats')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadCustomFormats')}
-          {...otherProps}c={true}
+          errorMessage={translate('CustomFormatsLoadError')}
+          {...otherProps}
         >
           <div className={styles.customFormats}>
             {

frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Card from 'Components/Card';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
@@ -112,9 +113,9 @@ class EditCustomFormatModalContent extends Component {
 
             {
               !isFetching && !!error &&
-                <div>
-                  {translate('UnableToAddANewCustomFormatPleaseTryAgain')}
-                </div>
+                <Alert kind={kinds.DANGER}>
+                  {translate('AddCustomFormatError')}
+                </Alert>
             }
 
             {
@@ -150,6 +151,11 @@ class EditCustomFormatModalContent extends Component {
                   </Form>
 
                   <FieldSet legend={translate('Conditions')}>
+                    <Alert kind={kinds.INFO}>
+                      <div>
+                        {translate('CustomFormatsSettingsTriggerInfo')}
+                      </div>
+                    </Alert>
                     <div className={styles.customFormats}>
                       {
                         specifications.map((tag) => {

frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js

@@ -43,7 +43,7 @@ class ExportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js

@@ -97,7 +97,7 @@ class ImportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js

@@ -89,7 +89,9 @@ class ImportCustomFormatModalContentConnector extends Component {
     const selectedImplementation = _.find(this.props.specificationSchema, { implementation: spec.implementation });
 
     if (!selectedImplementation) {
-      throw new Error(translate('CustomFormatUnknownCondition', [spec.implementation]));
+      throw new Error(translate('CustomFormatUnknownCondition', {
+        implementation: spec.implementation
+      }));
     }
 
     this.props.selectCustomFormatSpecificationSchema({ implementation: spec.implementation });
@@ -109,7 +111,10 @@ class ImportCustomFormatModalContentConnector extends Component {
     for (const [key, value] of Object.entries(fields)) {
       const field = _.find(schema.fields, { name: key });
       if (!field) {
-        throw new Error(translate('CustomFormatUnknownConditionOption', [key, schema.implementationName]));
+        throw new Error(translate('CustomFormatUnknownConditionOption', {
+          key,
+          implementation: schema.implementationName
+        }));
       }
 
       this.props.setCustomFormatSpecificationFieldValue({ name: key, value });

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js

@@ -42,9 +42,9 @@ class AddSpecificationModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewConditionPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddConditionError')}
+              </Alert>
           }
 
           {
@@ -53,10 +53,10 @@ class AddSpecificationModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsCustomConditionsAgainstTheReleasePropertiesBelow')}
+                    {translate('SupportedCustomConditions')}
                   </div>
                   <div>
-                    {translate('VisitGithubCustomFormatsAphrodite')}
+                    {translate('VisitTheWikiForMoreDetails')}
                     <Link to="https://wiki.servarr.com/radarr/settings#custom-formats-2">{translate('Wiki')}</Link>
                   </div>
                 </Alert>

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js

@@ -7,8 +7,8 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
 import Button from 'Components/Link/Button';
-import Link from 'Components/Link/Link';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -49,15 +49,16 @@ function EditSpecificationModalContent(props) {
           {...otherProps}
         >
           {
-            fields && fields.some((x) => x.label === 'Regular Expression') &&
+            fields && fields.some((x) => x.label === translate('CustomFormatsSpecificationRegularExpression')) &&
               <Alert kind={kinds.INFO}>
                 <div>
-                  <div dangerouslySetInnerHTML={{ __html: translate('ThisConditionMatchesUsingRegularExpressions', ['<code>\\^$.|?*+()[{</code>', '<code>\\</code>']) }} />
-                  {translate('MoreDetails')} <Link to="https://www.regular-expressions.info/tutorial.html">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('ConditionUsingRegularExpressions')} />
                 </div>
                 <div>
-                  {translate('RegularExpressionsCanBeTested')}
-                  <Link to="http://regexstorm.net/tester">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('RegularExpressionsTutorialLink')} />
+                </div>
+                <div>
+                  <InlineMarkdown data={translate('RegularExpressionsCanBeTested')} />
                 </div>
               </Alert>
           }
@@ -99,7 +100,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="negate"
               {...negate}
-              helpText={translate('NegateHelpText', [implementationName])}
+              helpText={translate('NegateHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>
@@ -113,7 +114,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="required"
               {...required}
-              helpText={translate('RequiredHelpText', [implementationName, implementationName])}
+              helpText={translate('RequiredHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>

frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js

@@ -43,9 +43,9 @@ class AddDownloadClientModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -54,10 +54,10 @@ class AddDownloadClientModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyDownloadClient')}
+                    {translate('SupportedDownloadClients')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualDownloadClients')}
+                    {translate('SupportedDownloadClientsMoreInfo')}
                   </div>
                 </Alert>
 

frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js

@@ -41,7 +41,7 @@ class DownloadClient extends Component {
     });
   };
 
-  onDeleteDownloadClientModalClose= () => {
+  onDeleteDownloadClientModalClose = () => {
     this.setState({ isDeleteDownloadClientModalOpen: false });
   };
 

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js

@@ -15,6 +15,7 @@ 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 AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
 import translate from 'Utilities/String/translate';
 import styles from './EditDownloadClientModalContent.css';
 
@@ -37,6 +38,7 @@ class EditDownloadClientModalContent extends Component {
       onModalClose,
       onSavePress,
       onTestPress,
+      onAdvancedSettingsPress,
       onDeleteDownloadClientPress,
       ...otherProps
     } = this.props;
@@ -69,9 +71,9 @@ class EditDownloadClientModalContent extends Component {
 
           {
             !isFetching && !!error &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -147,7 +149,7 @@ class EditDownloadClientModalContent extends Component {
                   <FormInputGroup
                     type={inputTypes.TAG}
                     name="tags"
-                    helpText={translate('DownloadClientTagHelpText')}
+                    helpText={translate('DownloadClientMovieTagHelpText')}
                     {...tags}
                     onChange={onInputChange}
                   />
@@ -184,7 +186,6 @@ class EditDownloadClientModalContent extends Component {
                       </FormGroup>
                   }
                 </FieldSet>
-
               </Form>
           }
         </ModalBody>
@@ -200,6 +201,12 @@ class EditDownloadClientModalContent extends Component {
               </Button>
           }
 
+          <AdvancedSettingsButton
+            advancedSettings={advancedSettings}
+            onAdvancedSettingsPress={onAdvancedSettingsPress}
+            showLabel={false}
+          />
+
           <SpinnerErrorButton
             isSpinning={isTesting}
             error={saveError}
@@ -240,6 +247,7 @@ EditDownloadClientModalContent.propTypes = {
   onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onTestPress: PropTypes.func.isRequired,
+  onAdvancedSettingsPress: PropTypes.func.isRequired,
   onDeleteDownloadClientPress: PropTypes.func
 };
 

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContentConnector.js

@@ -2,7 +2,13 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { saveDownloadClient, setDownloadClientFieldValue, setDownloadClientValue, testDownloadClient } from 'Store/Actions/settingsActions';
+import {
+  saveDownloadClient,
+  setDownloadClientFieldValue,
+  setDownloadClientValue,
+  testDownloadClient,
+  toggleAdvancedSettings
+} from 'Store/Actions/settingsActions';
 import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditDownloadClientModalContent from './EditDownloadClientModalContent';
 
@@ -23,7 +29,8 @@ const mapDispatchToProps = {
   setDownloadClientValue,
   setDownloadClientFieldValue,
   saveDownloadClient,
-  testDownloadClient
+  testDownloadClient,
+  toggleAdvancedSettings
 };
 
 class EditDownloadClientModalContentConnector extends Component {
@@ -56,6 +63,10 @@ class EditDownloadClientModalContentConnector extends Component {
     this.props.testDownloadClient({ id: this.props.id });
   };
 
+  onAdvancedSettingsPress = () => {
+    this.props.toggleAdvancedSettings();
+  };
+
   //
   // Render
 
@@ -65,6 +76,7 @@ class EditDownloadClientModalContentConnector extends Component {
         {...this.props}
         onSavePress={this.onSavePress}
         onTestPress={this.onTestPress}
+        onAdvancedSettingsPress={this.onAdvancedSettingsPress}
         onInputChange={this.onInputChange}
         onFieldChange={this.onFieldChange}
       />
@@ -82,6 +94,7 @@ EditDownloadClientModalContentConnector.propTypes = {
   setDownloadClientFieldValue: PropTypes.func.isRequired,
   saveDownloadClient: PropTypes.func.isRequired,
   testDownloadClient: PropTypes.func.isRequired,
+  toggleAdvancedSettings: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 

frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx

@@ -32,7 +32,7 @@ const enableOptions = [
     get value() {
       return translate('NoChange');
     },
-    disabled: true,
+    isDisabled: true,
   },
   {
     key: 'enabled',