Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: 闫锦彪 <yanjinbiaohere@163.com>
Translate-URL: https://translate.servarr.com/projects/servarr/sonarr/zh_CN/
Translation: Servarr/Sonarr

.github/actions/test/action.yml

@@ -27,7 +27,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
 
     - name: Setup Postgres
       if: ${{ inputs.use_postgres }}
@@ -77,7 +77,7 @@ runs:
 
     - name: Run tests
       shell: bash
-      run: dotnet test ./_tests/Sonarr.*.Test.dll --filter "${{ inputs.filter }}" --logger "trx;LogFileName=${{ env.RESULTS_NAME }}.trx"
+      run: dotnet test ./_tests/Sonarr.*.Test.dll --filter "${{ inputs.filter }}" --logger "trx;LogFileName=${{ env.RESULTS_NAME }}.trx" --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
 
     - name: Upload Test Results
       if: ${{ !cancelled() }}
@@ -85,12 +85,3 @@ runs:
       with:
         name: results-${{ env.RESULTS_NAME }}
         path: TestResults/*.trx
-
-    - name: Publish Test Results
-      uses: phoenix-actions/test-reporting@v12
-      with:
-        name: Test Results
-        output-to: step-summary
-        path: '*.trx'
-        reporter: dotnet-trx
-        working-directory: TestResults

.github/workflows/api_docs.yml

@@ -26,10 +26,10 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         id: setup-dotnet
 
       - name: Create openapi.json

.github/workflows/build.yml

@@ -5,9 +5,14 @@ on:
     branches:
       - develop
       - main
+    paths-ignore:
+      - 'src/Sonarr.Api.*/openapi.json'
   pull_request:
     branches:
       - develop
+    paths-ignore:
+      - 'src/NzbDrone.Core/Localization/Core/**'
+      - 'src/Sonarr.Api.*/openapi.json'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -28,10 +33,10 @@ jobs:
       version: ${{ steps.variables.outputs.version }}
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
 
     - name: Setup Environment Variables
       id: variables
@@ -102,12 +107,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Volta
       uses: volta-cli/action@v4
 
-    - name: Yarn Intsall
+    - name: Yarn Install
       run: yarn install
 
     - name: Lint
@@ -144,7 +149,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Test
       uses: ./.github/actions/test
@@ -159,7 +164,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Test
       uses: ./.github/actions/test
@@ -173,6 +178,7 @@ jobs:
   integration_test:
     needs: backend
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         include:
@@ -194,7 +200,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Test
       uses: ./.github/actions/test

.github/workflows/deploy.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Package
       uses: ./.github/actions/package
@@ -60,7 +60,7 @@ jobs:
       contents: write
     steps:
     - name: Check out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Download release artifacts
       uses: actions/download-artifact@v4

.github/workflows/publish-test-results.yml

@@ -1,41 +0,0 @@
-name: Publish Test Results
-
-on:
-  workflow_run:
-    workflows: ['Build']
-    types:
-      - completed
-
-permissions:
-  contents: read
-  actions: read
-  checks: write
-
-jobs:
-  report:
-    if: ${{ github.event.workflow_run.conclusion != 'skipped' && github.event.workflow_run.conclusion != 'cancelled' }}
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out
-      uses: actions/checkout@v3
-
-    - name: Download Test Reports
-      uses: actions/download-artifact@v4
-      with:
-        path: test-results
-        pattern: results-*
-        merge-multiple: true
-        repository: ${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}
-        run-id:  ${{ github.event.workflow_run.id }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Publish Test Results
-      uses: phoenix-actions/test-reporting@v12
-      with:
-        list-suites: failed
-        list-tests: failed
-        name: Test Results
-        only-summary: true
-        path: '*.trx'
-        reporter: dotnet-trx
-        working-directory: test-results

frontend/babel.config.js

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

frontend/src/Activity/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 {
 
@@ -305,9 +305,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);
@@ -315,7 +322,7 @@ class Queue extends Component {
               return !!(item && item.seriesId && item.episodeId);
             })
           )}
-          allPending={isConfirmRemoveModalOpen && (
+          pending={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
 

frontend/src/Activity/Queue/QueueRow.js

@@ -99,6 +99,7 @@ class QueueRow extends Component {
       indexer,
       outputPath,
       downloadClient,
+      downloadClientHasPostImportCategory,
       estimatedCompletionTime,
       added,
       timeleft,
@@ -420,6 +421,7 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
+          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!series}
           isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
@@ -450,6 +452,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('BlocklistReleaseSearchEpisodeAgainHelpText')}
-                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('RemoveFromDownloadClientHelpTextWarning')}
-                    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('BlocklistReleaseSearchEpisodeAgainHelpText')}
-                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/App/State/SettingsAppState.ts

@@ -7,7 +7,9 @@ import AppSectionState, {
 import Language from 'Language/Language';
 import DownloadClient from 'typings/DownloadClient';
 import ImportList from 'typings/ImportList';
+import ImportListOptionsSettings from 'typings/ImportListOptionsSettings';
 import Indexer from 'typings/Indexer';
+import IndexerFlag from 'typings/IndexerFlag';
 import Notification from 'typings/Notification';
 import QualityProfile from 'typings/QualityProfile';
 import { UiSettings } from 'typings/UiSettings';
@@ -35,12 +37,20 @@ export interface QualityProfilesAppState
   extends AppSectionState<QualityProfile>,
     AppSectionSchemaState<QualityProfile> {}
 
+export interface ImportListOptionsSettingsAppState
+  extends AppSectionItemState<ImportListOptionsSettings>,
+    AppSectionSaveState {}
+
+export type IndexerFlagSettingsAppState = AppSectionState<IndexerFlag>;
 export type LanguageSettingsAppState = AppSectionState<Language>;
 export type UiSettingsAppState = AppSectionItemState<UiSettings>;
 
 interface SettingsAppState {
+  advancedSettings: boolean;
   downloadClients: DownloadClientAppState;
+  importListOptions: ImportListOptionsSettingsAppState;
   importLists: ImportListAppState;
+  indexerFlags: IndexerFlagSettingsAppState;
   indexers: IndexerAppState;
   languages: LanguageSettingsAppState;
   notifications: NotificationAppState;

frontend/src/Calendar/Events/CalendarEventGroup.css

@@ -43,6 +43,7 @@
 .expandContainer,
 .collapseContainer {
   display: flex;
+  align-items: center;
   justify-content: center;
 }
 

frontend/src/Calendar/Events/CalendarEventGroup.js

@@ -224,16 +224,19 @@ class CalendarEventGroup extends Component {
         </div>
 
         {
-          showEpisodeInformation &&
+          showEpisodeInformation ?
             <Link
               className={styles.expandContainer}
               component="div"
               onPress={this.onExpandPress}
             >
+              &nbsp;
               <Icon
                 name={icons.EXPAND}
               />
-            </Link>
+              &nbsp;
+            </Link> :
+            null
         }
       </div>
     );

frontend/src/Calendar/Events/CalendarEventGroupConnector.js

@@ -10,7 +10,7 @@ function createIsDownloadingSelector() {
     (state) => state.queue.details,
     (episodeIds, details) => {
       return details.items.some((item) => {
-        return item.episode && episodeIds.includes(item.episode.id);
+        return !!(item.episodeId && episodeIds.includes(item.episodeId));
       });
     }
   );

frontend/src/Commands/commandNames.js

@@ -6,7 +6,7 @@ export const CLEAR_LOGS = 'ClearLog';
 export const CUTOFF_UNMET_EPISODE_SEARCH = 'CutoffUnmetEpisodeSearch';
 export const DELETE_LOG_FILES = 'DeleteLogFiles';
 export const DELETE_UPDATE_LOG_FILES = 'DeleteUpdateLogFiles';
-export const DOWNLOADED_EPSIODES_SCAN = 'DownloadedEpisodesScan';
+export const DOWNLOADED_EPISODES_SCAN = 'DownloadedEpisodesScan';
 export const EPISODE_SEARCH = 'EpisodeSearch';
 export const INTERACTIVE_IMPORT = 'ManualImport';
 export const MISSING_EPISODE_SEARCH = 'MissingEpisodeSearch';

frontend/src/Components/Form/DownloadClientSelectInputConnector.js

@@ -26,7 +26,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/FormInputGroup.js

@@ -11,6 +11,7 @@ import DownloadClientSelectInputConnector from './DownloadClientSelectInputConne
 import EnhancedSelectInput from './EnhancedSelectInput';
 import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
+import IndexerFlagsSelectInput from './IndexerFlagsSelectInput';
 import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import MonitorEpisodesSelectInput from './MonitorEpisodesSelectInput';
@@ -71,6 +72,9 @@ function getComponent(type) {
     case inputTypes.INDEXER_SELECT:
       return IndexerSelectInputConnector;
 
+    case inputTypes.INDEXER_FLAGS_SELECT:
+      return IndexerFlagsSelectInput;
+
     case inputTypes.DOWNLOAD_CLIENT_SELECT:
       return DownloadClientSelectInputConnector;
 
@@ -264,6 +268,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,
@@ -278,6 +283,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

@@ -0,0 +1,62 @@
+import React, { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+const selectIndexerFlagsValues = (selectedFlags: number) =>
+  createSelector(
+    (state: AppState) => state.settings.indexerFlags,
+    (indexerFlags) => {
+      const value = indexerFlags.items.reduce((acc: number[], { id }) => {
+        // eslint-disable-next-line no-bitwise
+        if ((selectedFlags & id) === id) {
+          acc.push(id);
+        }
+
+        return acc;
+      }, []);
+
+      const values = indexerFlags.items.map(({ id, name }) => ({
+        key: id,
+        value: name,
+      }));
+
+      return {
+        value,
+        values,
+      };
+    }
+  );
+
+interface IndexerFlagsSelectInputProps {
+  name: string;
+  indexerFlags: number;
+  onChange(payload: object): void;
+}
+
+function IndexerFlagsSelectInput(props: IndexerFlagsSelectInputProps) {
+  const { indexerFlags, onChange } = props;
+
+  const { value, values } = useSelector(selectIndexerFlagsValues(indexerFlags));
+
+  const onChangeWrapper = useCallback(
+    ({ name, value }: { name: string; value: number[] }) => {
+      const indexerFlags = value.reduce((acc, flagId) => acc + flagId, 0);
+
+      onChange({ name, value: indexerFlags });
+    },
+    [onChange]
+  );
+
+  return (
+    <EnhancedSelectInput
+      {...props}
+      value={value}
+      values={values}
+      onChange={onChangeWrapper}
+    />
+  );
+}
+
+export default IndexerFlagsSelectInput;

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/Page/PageConnector.js

@@ -6,7 +6,13 @@ import { createSelector } from 'reselect';
 import { fetchTranslations, saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
 import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
 import { fetchSeries } from 'Store/Actions/seriesActions';
-import { fetchImportLists, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
+import {
+  fetchImportLists,
+  fetchIndexerFlags,
+  fetchLanguages,
+  fetchQualityProfiles,
+  fetchUISettings
+} from 'Store/Actions/settingsActions';
 import { fetchStatus } from 'Store/Actions/systemActions';
 import { fetchTags } from 'Store/Actions/tagActions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
@@ -51,6 +57,7 @@ const selectIsPopulated = createSelector(
   (state) => state.settings.qualityProfiles.isPopulated,
   (state) => state.settings.languages.isPopulated,
   (state) => state.settings.importLists.isPopulated,
+  (state) => state.settings.indexerFlags.isPopulated,
   (state) => state.system.status.isPopulated,
   (state) => state.app.translations.isPopulated,
   (
@@ -61,6 +68,7 @@ const selectIsPopulated = createSelector(
     qualityProfilesIsPopulated,
     languagesIsPopulated,
     importListsIsPopulated,
+    indexerFlagsIsPopulated,
     systemStatusIsPopulated,
     translationsIsPopulated
   ) => {
@@ -72,6 +80,7 @@ const selectIsPopulated = createSelector(
       qualityProfilesIsPopulated &&
       languagesIsPopulated &&
       importListsIsPopulated &&
+      indexerFlagsIsPopulated &&
       systemStatusIsPopulated &&
       translationsIsPopulated
     );
@@ -86,6 +95,7 @@ const selectErrors = createSelector(
   (state) => state.settings.qualityProfiles.error,
   (state) => state.settings.languages.error,
   (state) => state.settings.importLists.error,
+  (state) => state.settings.indexerFlags.error,
   (state) => state.system.status.error,
   (state) => state.app.translations.error,
   (
@@ -96,6 +106,7 @@ const selectErrors = createSelector(
     qualityProfilesError,
     languagesError,
     importListsError,
+    indexerFlagsError,
     systemStatusError,
     translationsError
   ) => {
@@ -107,6 +118,7 @@ const selectErrors = createSelector(
       qualityProfilesError ||
       languagesError ||
       importListsError ||
+      indexerFlagsError ||
       systemStatusError ||
       translationsError
     );
@@ -120,6 +132,7 @@ const selectErrors = createSelector(
       qualityProfilesError,
       languagesError,
       importListsError,
+      indexerFlagsError,
       systemStatusError,
       translationsError
     };
@@ -174,6 +187,9 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchFetchImportLists() {
       dispatch(fetchImportLists());
     },
+    dispatchFetchIndexerFlags() {
+      dispatch(fetchIndexerFlags());
+    },
     dispatchFetchUISettings() {
       dispatch(fetchUISettings());
     },
@@ -213,6 +229,7 @@ class PageConnector extends Component {
       this.props.dispatchFetchQualityProfiles();
       this.props.dispatchFetchLanguages();
       this.props.dispatchFetchImportLists();
+      this.props.dispatchFetchIndexerFlags();
       this.props.dispatchFetchUISettings();
       this.props.dispatchFetchStatus();
       this.props.dispatchFetchTranslations();
@@ -238,6 +255,7 @@ class PageConnector extends Component {
       dispatchFetchQualityProfiles,
       dispatchFetchLanguages,
       dispatchFetchImportLists,
+      dispatchFetchIndexerFlags,
       dispatchFetchUISettings,
       dispatchFetchStatus,
       dispatchFetchTranslations,
@@ -278,6 +296,7 @@ PageConnector.propTypes = {
   dispatchFetchQualityProfiles: PropTypes.func.isRequired,
   dispatchFetchLanguages: PropTypes.func.isRequired,
   dispatchFetchImportLists: PropTypes.func.isRequired,
+  dispatchFetchIndexerFlags: PropTypes.func.isRequired,
   dispatchFetchUISettings: PropTypes.func.isRequired,
   dispatchFetchStatus: PropTypes.func.isRequired,
   dispatchFetchTranslations: PropTypes.func.isRequired,

frontend/src/Episode/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/EpisodeFile/EpisodeFile.ts

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

frontend/src/Helpers/Props/icons.js

@@ -62,6 +62,7 @@ import {
   faFileExport as fasFileExport,
   faFileInvoice as farFileInvoice,
   faFilter as fasFilter,
+  faFlag as fasFlag,
   faFolderOpen as fasFolderOpen,
   faForward as fasForward,
   faHeart as fasHeart,
@@ -154,6 +155,7 @@ export const FILE_MISSING = fasFileCircleQuestion;
 export const FILTER = fasFilter;
 export const FINALE_SEASON = fasCirclePause;
 export const FINALE_SERIES = fasCircleStop;
+export const FLAG = fasFlag;
 export const FOOTNOTE = fasAsterisk;
 export const FOLDER = farFolder;
 export const FOLDER_OPEN = fasFolderOpen;

frontend/src/Helpers/Props/inputTypes.js

@@ -12,6 +12,7 @@ export const PASSWORD = 'password';
 export const PATH = 'path';
 export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
 export const INDEXER_SELECT = 'indexerSelect';
+export const INDEXER_FLAGS_SELECT = 'indexerFlagsSelect';
 export const LANGUAGE_SELECT = 'languageSelect';
 export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
 export const ROOT_FOLDER_SELECT = 'rootFolderSelect';

frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx

@@ -77,7 +77,7 @@ function InteractiveImportSelectFolderModalContent(
 
     dispatch(
       executeCommand({
-        name: commandNames.DOWNLOADED_EPSIODES_SCAN,
+        name: commandNames.DOWNLOADED_EPISODES_SCAN,
         path: folder,
       })
     );

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

@@ -29,6 +29,7 @@ import { align, icons, kinds, scrollDirections } from 'Helpers/Props';
 import SelectEpisodeModal from 'InteractiveImport/Episode/SelectEpisodeModal';
 import { SelectedEpisode } from 'InteractiveImport/Episode/SelectEpisodeModalContent';
 import ImportMode from 'InteractiveImport/ImportMode';
+import SelectIndexerFlagsModal from 'InteractiveImport/IndexerFlags/SelectIndexerFlagsModal';
 import InteractiveImport, {
   InteractiveImportCommandOptions,
 } from 'InteractiveImport/InteractiveImport';
@@ -71,7 +72,8 @@ type SelectType =
   | 'episode'
   | 'releaseGroup'
   | 'quality'
-  | 'language';
+  | 'language'
+  | 'indexerFlags';
 
 type FilterExistingFiles = 'all' | 'new';
 
@@ -135,11 +137,21 @@ 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, {
       name: icons.DANGER,
       kind: kinds.DANGER,
+      title: () => translate('Rejections'),
     }),
     isSortable: true,
     isVisible: true,
@@ -284,8 +296,18 @@ 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;
-  }, [showSeries]);
+  }, [showSeries, items]);
 
   const selectedIds: number[] = useMemo(() => {
     return getSelectedIds(selectedState);
@@ -298,14 +320,20 @@ function InteractiveImportModalContent(
           return acc;
         }
 
+        const lastSelectedSeason = acc.lastSelectedSeason;
+
         acc.seasonSelectDisabled ||= !item.series;
-        acc.episodeSelectDisabled ||= !item.seasonNumber;
+        acc.episodeSelectDisabled ||=
+          item.seasonNumber === undefined ||
+          (lastSelectedSeason >= 0 && item.seasonNumber !== lastSelectedSeason);
+        acc.lastSelectedSeason = item.seasonNumber ?? -1;
 
         return acc;
       },
       {
         seasonSelectDisabled: false,
         episodeSelectDisabled: false,
+        lastSelectedSeason: -1,
       }
     );
 
@@ -337,6 +365,10 @@ function InteractiveImportModalContent(
         key: 'language',
         value: translate('SelectLanguage'),
       },
+      {
+        key: 'indexerFlags',
+        value: translate('SelectIndexerFlags'),
+      },
     ];
 
     if (allowSeriesChange) {
@@ -477,6 +509,7 @@ function InteractiveImportModalContent(
           releaseGroup,
           quality,
           languages,
+          indexerFlags,
           episodeFileId,
         } = item;
 
@@ -526,6 +559,7 @@ function InteractiveImportModalContent(
               releaseGroup,
               quality,
               languages,
+              indexerFlags,
             });
 
             return;
@@ -540,6 +574,7 @@ function InteractiveImportModalContent(
           releaseGroup,
           quality,
           languages,
+          indexerFlags,
           downloadId,
           episodeFileId,
         });
@@ -736,6 +771,22 @@ function InteractiveImportModalContent(
     [selectedIds, dispatch]
   );
 
+  const onIndexerFlagsSelect = useCallback(
+    (indexerFlags: number) => {
+      dispatch(
+        updateInteractiveImportItems({
+          ids: selectedIds,
+          indexerFlags,
+        })
+      );
+
+      dispatch(reprocessInteractiveImportItems({ ids: selectedIds }));
+
+      setSelectModalOpen(null);
+    },
+    [selectedIds, dispatch]
+  );
+
   const orderedSelectedIds = items.reduce((acc: number[], file) => {
     if (selectedIds.includes(file.id)) {
       acc.push(file.id);
@@ -941,6 +992,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

@@ -12,9 +12,11 @@ import Episode from 'Episode/Episode';
 import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import IndexerFlags from 'Episode/IndexerFlags';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import SelectEpisodeModal from 'InteractiveImport/Episode/SelectEpisodeModal';
 import { SelectedEpisode } from 'InteractiveImport/Episode/SelectEpisodeModalContent';
+import SelectIndexerFlagsModal from 'InteractiveImport/IndexerFlags/SelectIndexerFlagsModal';
 import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
 import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
 import SelectReleaseGroupModal from 'InteractiveImport/ReleaseGroup/SelectReleaseGroupModal';
@@ -41,7 +43,8 @@ type SelectType =
   | 'episode'
   | 'releaseGroup'
   | 'quality'
-  | 'language';
+  | 'language'
+  | 'indexerFlags';
 
 type SelectedChangeProps = SelectStateInputProps & {
   hasEpisodeFileId: boolean;
@@ -60,6 +63,7 @@ interface InteractiveImportRowProps {
   size: number;
   customFormats?: object[];
   customFormatScore?: number;
+  indexerFlags: number;
   rejections: Rejection[];
   columns: Column[];
   episodeFileId?: number;
@@ -84,6 +88,7 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     size,
     customFormats,
     customFormatScore,
+    indexerFlags,
     rejections,
     isReprocessing,
     isSelected,
@@ -100,6 +105,10 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
     () => columns.find((c) => c.name === 'series')?.isVisible ?? false,
     [columns]
   );
+  const isIndexerFlagsColumnVisible = useMemo(
+    () => columns.find((c) => c.name === 'indexerFlags')?.isVisible ?? false,
+    [columns]
+  );
 
   const [selectModalOpen, setSelectModalOpen] = useState<SelectType | null>(
     null
@@ -306,6 +315,27 @@ 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 seriesTitle = series ? series.title : '';
   const isAnime = series?.seriesType === 'anime';
 
@@ -332,6 +362,7 @@ function InteractiveImportRow(props: InteractiveImportRowProps) {
   const showReleaseGroupPlaceholder = isSelected && !releaseGroup;
   const showQualityPlaceholder = isSelected && !quality;
   const showLanguagePlaceholder = isSelected && !languages;
+  const showIndexerFlagsPlaceholder = isSelected && !indexerFlags;
 
   return (
     <TableRow>
@@ -448,6 +479,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
@@ -518,6 +571,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

@@ -13,6 +13,7 @@ export interface InteractiveImportCommandOptions {
   releaseGroup?: string;
   quality: QualityModel;
   languages: Language[];
+  indexerFlags: number;
   downloadId?: string;
   episodeFileId?: number;
 }
@@ -31,6 +32,7 @@ interface InteractiveImport extends ModelBase {
   episodes: Episode[];
   qualityWeight: number;
   customFormats: object[];
+  indexerFlags: number;
   rejections: Rejection[];
   episodeFileId?: number;
 }

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -72,6 +72,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, {

frontend/src/InteractiveSearch/InteractiveSearchRow.css

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

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

@@ -6,6 +6,7 @@ interface CssExports {
   'download': string;
   'downloadIcon': string;
   'indexer': string;
+  'indexerFlags': string;
   'interactiveIcon': string;
   'languages': string;
   'manualDownloadContent': string;

frontend/src/InteractiveSearch/InteractiveSearchRow.tsx

@@ -12,6 +12,7 @@ import type DownloadProtocol from 'DownloadClient/DownloadProtocol';
 import EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeLanguages from 'Episode/EpisodeLanguages';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import IndexerFlags from 'Episode/IndexerFlags';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import Language from 'Language/Language';
 import { QualityModel } from 'Quality/Quality';
@@ -98,6 +99,7 @@ interface InteractiveSearchRowProps {
   mappedEpisodeNumbers?: number[];
   mappedAbsoluteEpisodeNumbers?: number[];
   mappedEpisodeInfo: ReleaseEpisode[];
+  indexerFlags: number;
   rejections: string[];
   episodeRequested: boolean;
   downloadAllowed: boolean;
@@ -139,6 +141,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
     mappedEpisodeNumbers,
     mappedAbsoluteEpisodeNumbers,
     mappedEpisodeInfo,
+    indexerFlags = 0,
     rejections = [],
     episodeRequested,
     downloadAllowed,
@@ -254,10 +257,21 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
             customFormats.length
           )}
           tooltip={<EpisodeFormats formats={customFormats} />}
-          position={tooltipPositions.BOTTOM}
+          position={tooltipPositions.LEFT}
         />
       </TableRowCell>
 
+      <TableRowCell 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>
+
       <TableRowCell className={styles.rejected}>
         {rejections.length ? (
           <Popover

frontend/src/Organize/OrganizePreviewModalContent.js

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

frontend/src/Series/Details/EpisodeRow.css

@@ -62,3 +62,9 @@
 
   width: 55px;
 }
+
+.indexerFlags {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 50px;
+}

frontend/src/Series/Details/EpisodeRow.css.d.ts

@@ -6,6 +6,7 @@ interface CssExports {
   'customFormatScore': string;
   'episodeNumber': string;
   'episodeNumberAnime': string;
+  'indexerFlags': string;
   'languages': string;
   'monitored': string;
   'releaseGroup': string;

frontend/src/Series/Details/EpisodeRow.js

@@ -1,22 +1,26 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Icon from 'Components/Icon';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 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 EpisodeFormats from 'Episode/EpisodeFormats';
 import EpisodeNumber from 'Episode/EpisodeNumber';
 import EpisodeSearchCellConnector from 'Episode/EpisodeSearchCellConnector';
 import EpisodeStatusConnector from 'Episode/EpisodeStatusConnector';
 import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
+import IndexerFlags from 'Episode/IndexerFlags';
 import EpisodeFileLanguageConnector from 'EpisodeFile/EpisodeFileLanguageConnector';
 import MediaInfoConnector from 'EpisodeFile/MediaInfoConnector';
 import * as mediaInfoTypes from 'EpisodeFile/mediaInfoTypes';
-import { tooltipPositions } from 'Helpers/Props';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import formatBytes from 'Utilities/Number/formatBytes';
 import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import formatRuntime from 'Utilities/Number/formatRuntime';
+import translate from 'Utilities/String/translate';
 import styles from './EpisodeRow.css';
 
 class EpisodeRow extends Component {
@@ -77,6 +81,7 @@ class EpisodeRow extends Component {
       releaseGroup,
       customFormats,
       customFormatScore,
+      indexerFlags,
       alternateTitles,
       columns
     } = this.props;
@@ -211,7 +216,7 @@ class EpisodeRow extends Component {
                       customFormats.length
                     )}
                     tooltip={<EpisodeFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
+                    position={tooltipPositions.LEFT}
                   />
                 </TableRowCell>
               );
@@ -322,6 +327,24 @@ class EpisodeRow extends Component {
               );
             }
 
+            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 === 'status') {
               return (
                 <TableRowCell
@@ -381,6 +404,7 @@ EpisodeRow.propTypes = {
   releaseGroup: PropTypes.string,
   customFormats: PropTypes.arrayOf(PropTypes.object),
   customFormatScore: PropTypes.number.isRequired,
+  indexerFlags: PropTypes.number.isRequired,
   mediaInfo: PropTypes.object,
   alternateTitles: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -389,7 +413,8 @@ EpisodeRow.propTypes = {
 
 EpisodeRow.defaultProps = {
   alternateTitles: [],
-  customFormats: []
+  customFormats: [],
+  indexerFlags: 0
 };
 
 export default EpisodeRow;

frontend/src/Series/Details/EpisodeRowConnector.js

@@ -1,4 +1,3 @@
-/* eslint max-params: 0 */
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createEpisodeFileSelector from 'Store/Selectors/createEpisodeFileSelector';
@@ -20,6 +19,7 @@ function createMapStateToProps() {
         releaseGroup: episodeFile ? episodeFile.releaseGroup : null,
         customFormats: episodeFile ? episodeFile.customFormats : [],
         customFormatScore: episodeFile ? episodeFile.customFormatScore : 0,
+        indexerFlags: episodeFile ? episodeFile.indexerFlags : 0,
         alternateTitles: series.alternateTitles
       };
     }

frontend/src/Series/Details/SeriesDetails.js

@@ -428,14 +428,16 @@ class SeriesDetails extends Component {
                     className={styles.detailsLabel}
                     size={sizes.LARGE}
                   >
-                    <Icon
-                      name={icons.FOLDER}
-                      size={17}
-                    />
 
-                    <span className={styles.path}>
-                      {path}
-                    </span>
+                    <div>
+                      <Icon
+                        name={icons.FOLDER}
+                        size={17}
+                      />
+                      <span className={styles.path}>
+                        {path}
+                      </span>
+                    </div>
                   </Label>
 
                   <Tooltip
@@ -444,16 +446,18 @@ class SeriesDetails extends Component {
                         className={styles.detailsLabel}
                         size={sizes.LARGE}
                       >
-                        <Icon
-                          name={icons.DRIVE}
-                          size={17}
-                        />
 
-                        <span className={styles.sizeOnDisk}>
-                          {
-                            formatBytes(sizeOnDisk || 0)
-                          }
-                        </span>
+                        <div>
+                          <Icon
+                            name={icons.DRIVE}
+                            size={17}
+                          />
+                          <span className={styles.sizeOnDisk}>
+                            {
+                              formatBytes(sizeOnDisk || 0)
+                            }
+                          </span>
+                        </div>
                       </Label>
                     }
                     tooltip={
@@ -470,32 +474,36 @@ class SeriesDetails extends Component {
                     title={translate('QualityProfile')}
                     size={sizes.LARGE}
                   >
-                    <Icon
-                      name={icons.PROFILE}
-                      size={17}
-                    />
 
-                    <span className={styles.qualityProfileName}>
-                      {
-                        <QualityProfileNameConnector
-                          qualityProfileId={qualityProfileId}
-                        />
-                      }
-                    </span>
+                    <div>
+                      <Icon
+                        name={icons.PROFILE}
+                        size={17}
+                      />
+                      <span className={styles.qualityProfileName}>
+                        {
+                          <QualityProfileNameConnector
+                            qualityProfileId={qualityProfileId}
+                          />
+                        }
+                      </span>
+                    </div>
                   </Label>
 
                   <Label
                     className={styles.detailsLabel}
                     size={sizes.LARGE}
                   >
-                    <Icon
-                      name={monitored ? icons.MONITORED : icons.UNMONITORED}
-                      size={17}
-                    />
 
-                    <span className={styles.qualityProfileName}>
-                      {monitored ? translate('Monitored') : translate('Unmonitored')}
-                    </span>
+                    <div>
+                      <Icon
+                        name={monitored ? icons.MONITORED : icons.UNMONITORED}
+                        size={17}
+                      />
+                      <span className={styles.qualityProfileName}>
+                        {monitored ? translate('Monitored') : translate('Unmonitored')}
+                      </span>
+                    </div>
                   </Label>
 
                   <Label
@@ -503,14 +511,16 @@ class SeriesDetails extends Component {
                     title={statusDetails.message}
                     size={sizes.LARGE}
                   >
-                    <Icon
-                      name={statusDetails.icon}
-                      size={17}
-                    />
 
-                    <span className={styles.qualityProfileName}>
-                      {statusDetails.title}
-                    </span>
+                    <div>
+                      <Icon
+                        name={statusDetails.icon}
+                        size={17}
+                      />
+                      <span className={styles.qualityProfileName}>
+                        {statusDetails.title}
+                      </span>
+                    </div>
                   </Label>
 
                   {
@@ -520,14 +530,16 @@ class SeriesDetails extends Component {
                         title={translate('Network')}
                         size={sizes.LARGE}
                       >
-                        <Icon
-                          name={icons.NETWORK}
-                          size={17}
-                        />
 
-                        <span className={styles.qualityProfileName}>
-                          {network}
-                        </span>
+                        <div>
+                          <Icon
+                            name={icons.NETWORK}
+                            size={17}
+                          />
+                          <span className={styles.qualityProfileName}>
+                            {network}
+                          </span>
+                        </div>
                       </Label>
                   }
 
@@ -537,14 +549,16 @@ class SeriesDetails extends Component {
                         className={styles.detailsLabel}
                         size={sizes.LARGE}
                       >
-                        <Icon
-                          name={icons.EXTERNAL_LINK}
-                          size={17}
-                        />
 
-                        <span className={styles.links}>
-                          {translate('Links')}
-                        </span>
+                        <div>
+                          <Icon
+                            name={icons.EXTERNAL_LINK}
+                            size={17}
+                          />
+                          <span className={styles.links}>
+                            {translate('Links')}
+                          </span>
+                        </div>
                       </Label>
                     }
                     tooltip={

frontend/src/Series/Details/SeriesDetailsSeason.js

@@ -129,10 +129,8 @@ class SeriesDetailsSeason extends Component {
       items
     } = this.props;
 
-    const expand = _.some(items, (item) => {
-      return isAfter(item.airDateUtc) ||
-             isAfter(item.airDateUtc, { days: -30 });
-    });
+    const expand = _.some(items, (item) => isAfter(item.airDateUtc) || isAfter(item.airDateUtc, { days: -30 })) ||
+      items.every((item) => !item.airDateUtc);
 
     onExpandPress(seasonNumber, expand && seasonNumber > 0);
   }

frontend/src/Series/Index/Posters/SeriesIndexPosters.tsx

@@ -190,11 +190,15 @@ export default function SeriesIndexPosters(props: SeriesIndexPostersProps) {
 
     if (isSmallScreen) {
       const padding = bodyPaddingSmallScreen - 5;
+      const width = window.innerWidth - padding * 2;
+      const height = window.innerHeight;
 
-      setSize({
-        width: window.innerWidth - padding * 2,
-        height: window.innerHeight,
-      });
+      if (width !== size.width || height !== size.height) {
+        setSize({
+          width,
+          height,
+        });
+      }
 
       return;
     }

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

@@ -62,7 +62,7 @@ class CustomFormats extends Component {
       <FieldSet legend={translate('CustomFormats')}>
         <PageSectionContent
           errorMessage={translate('CustomFormatsLoadError')}
-          {...otherProps}c={true}
+          {...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>
+                <Alert kind={kinds.DANGER}>
                   {translate('AddCustomFormatError')}
-                </div>
+                </Alert>
             }
 
             {

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Button from 'Components/Link/Button';
 import ClipboardButton from 'Components/Link/ClipboardButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -41,9 +42,9 @@ class ExportCustomFormatModalContent extends Component {
 
             {
               !isFetching && !!error &&
-                <div>
+                <Alert kind={kinds.DANGER}>
                   {translate('CustomFormatsLoadError')}
-                </div>
+                </Alert>
             }
 
             {

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

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -11,7 +12,7 @@ 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, sizes } from 'Helpers/Props';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './ImportCustomFormatModalContent.css';
 
@@ -95,9 +96,9 @@ class ImportCustomFormatModalContent extends Component {
 
             {
               !isFetching && !!error &&
-                <div>
+                <Alert kind={kinds.DANGER}>
                   {translate('CustomFormatsLoadError')}
-                </div>
+                </Alert>
             }
 
             {

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

@@ -42,9 +42,9 @@ class AddSpecificationModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddConditionError')}
-              </div>
+              </Alert>
           }
 
           {

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

@@ -49,7 +49,7 @@ function EditSpecificationModalContent(props) {
           {...otherProps}
         >
           {
-            fields && fields.some((x) => x.label === translate('RegularExpression')) &&
+            fields && fields.some((x) => x.label === translate('CustomFormatsSpecificationRegularExpression')) &&
               <Alert kind={kinds.INFO}>
                 <div>
                   <InlineMarkdown data={translate('ConditionUsingRegularExpressions')} />

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

@@ -43,9 +43,9 @@ class AddDownloadClientModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddDownloadClientError')}
-              </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

@@ -69,9 +69,9 @@ class EditDownloadClientModalContent extends Component {
 
           {
             !isFetching && !!error &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddDownloadClientError')}
-              </div>
+              </Alert>
           }
 
           {

frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx

@@ -277,7 +277,7 @@ function ManageDownloadClientsModalContent(
             isDisabled={!anySelected}
             onPress={onTagsPress}
           >
-            Set Tags
+            {translate('SetTags')}
           </SpinnerButton>
         </div>
 

frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -52,9 +53,9 @@ function EditRemotePathMappingModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddRemotePathMappingError')}
-            </div>
+            </Alert>
         }
 
         {

frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContentConnector.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -55,7 +54,7 @@ function createRemotePathMappingSelector() {
         items
       } = remotePathMappings;
 
-      const mapping = id ? _.find(items, { id }) : newRemotePathMapping;
+      const mapping = id ? items.find((i) => i.id === id) : newRemotePathMapping;
       const settings = selectSettings(mapping, pendingChanges, saveError);
 
       return {

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js

@@ -47,7 +47,7 @@ class RemotePathMappings extends Component {
     } = this.props;
 
     return (
-      <FieldSet legend={translate('RemotePathMappings')} >
+      <FieldSet legend={translate('RemotePathMappings')}>
         <PageSectionContent
           errorMessage={translate('RemotePathMappingsLoadError')}
           {...otherProps}

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -50,9 +51,9 @@ function EditImportListExclusionModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddImportListExclusionError')}
-            </div>
+            </Alert>
         }
 
         {

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -26,7 +25,7 @@ function createImportListExclusionSelector() {
         items
       } = importListExclusions;
 
-      const mapping = id ? _.find(items, { id }) : newImportListExclusion;
+      const mapping = id ? items.find((i) => i.id === id) : newImportListExclusion;
       const settings = selectSettings(mapping, pendingChanges, saveError);
 
       return {

frontend/src/Settings/ImportLists/ImportListSettings.js

@@ -10,6 +10,7 @@ import translate from 'Utilities/String/translate';
 import ImportListsExclusionsConnector from './ImportListExclusions/ImportListExclusionsConnector';
 import ImportListsConnector from './ImportLists/ImportListsConnector';
 import ManageImportListsModal from './ImportLists/Manage/ManageImportListsModal';
+import ImportListOptions from './Options/ImportListOptions';
 
 class ImportListSettings extends Component {
 
@@ -19,7 +20,10 @@ class ImportListSettings extends Component {
   constructor(props, context) {
     super(props, context);
 
+    this._saveCallback = null;
+
     this.state = {
+      isSaving: false,
       hasPendingChanges: false,
       isManageImportListsOpen: false
     };
@@ -28,6 +32,14 @@ class ImportListSettings extends Component {
   //
   // Listeners
 
+  setChildSave = (saveCallback) => {
+    this._saveCallback = saveCallback;
+  };
+
+  onChildStateChange = (payload) => {
+    this.setState(payload);
+  };
+
   setListOptionsRef = (ref) => {
     this._listOptions = ref;
   };
@@ -47,7 +59,9 @@ class ImportListSettings extends Component {
   };
 
   onSavePress = () => {
-    this._listOptions.getWrappedInstance().save();
+    if (this._saveCallback) {
+      this._saveCallback();
+    }
   };
 
   //
@@ -93,6 +107,12 @@ class ImportListSettings extends Component {
 
         <PageContentBody>
           <ImportListsConnector />
+
+          <ImportListOptions
+            setChildSave={this.setChildSave}
+            onChildStateChange={this.onChildStateChange}
+          />
+
           <ImportListsExclusionsConnector />
           <ManageImportListsModal
             isOpen={isManageImportListsOpen}

frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.js

@@ -44,9 +44,9 @@ class AddImportListModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError ?
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddListError')}
-              </div> :
+              </Alert> :
               null
           }
 

frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js

@@ -74,9 +74,9 @@ function EditImportListModalContent(props) {
 
         {
           !isFetching && !!error ?
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddListError')}
-            </div> :
+            </Alert> :
             null
         }
 

frontend/src/Settings/ImportLists/ImportLists/ImportList.js

@@ -41,7 +41,7 @@ class ImportList extends Component {
     });
   };
 
-  onDeleteImportListModalClose= () => {
+  onDeleteImportListModalClose = () => {
     this.setState({ isDeleteImportListModalOpen: false });
   };
 

frontend/src/Settings/ImportLists/ImportLists/ImportLists.js

@@ -5,7 +5,6 @@ import FieldSet from 'Components/FieldSet';
 import Icon from 'Components/Icon';
 import PageSectionContent from 'Components/Page/PageSectionContent';
 import { icons } from 'Helpers/Props';
-import sortByName from 'Utilities/Array/sortByName';
 import translate from 'Utilities/String/translate';
 import AddImportListModal from './AddImportListModal';
 import EditImportListModalConnector from './EditImportListModalConnector';
@@ -67,7 +66,7 @@ class ImportLists extends Component {
         >
           <div className={styles.lists}>
             {
-              items.sort(sortByName).map((item) => {
+              items.map((item) => {
                 return (
                   <ImportList
                     key={item.id}

frontend/src/Settings/ImportLists/ImportLists/ImportListsConnector.js

@@ -4,16 +4,14 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import { deleteImportList, fetchImportLists } from 'Store/Actions/settingsActions';
+import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
+import sortByName from 'Utilities/Array/sortByName';
 import ImportLists from './ImportLists';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.settings.importLists,
-    (importLists) => {
-      return {
-        ...importLists
-      };
-    }
+    createSortedSectionSelector('settings.importLists', sortByName),
+    (importLists) => importLists
   );
 }
 

frontend/src/Settings/ImportLists/ImportLists/Manage/ManageImportListsModal.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
 import ManageImportListsModalContent from './ManageImportListsModalContent';
 
 interface ManageImportListsModalProps {
@@ -11,7 +12,7 @@ function ManageImportListsModal(props: ManageImportListsModalProps) {
   const { isOpen, onModalClose } = props;
 
   return (
-    <Modal isOpen={isOpen} onModalClose={onModalClose}>
+    <Modal isOpen={isOpen} size={sizes.EXTRA_LARGE} onModalClose={onModalClose}>
       <ManageImportListsModalContent onModalClose={onModalClose} />
     </Modal>
   );

frontend/src/Settings/ImportLists/Options/ImportListOptions.tsx

@@ -0,0 +1,149 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import Alert from 'Components/Alert';
+import FieldSet from 'Components/FieldSet';
+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 LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import { inputTypes, kinds } from 'Helpers/Props';
+import { clearPendingChanges } from 'Store/Actions/baseActions';
+import {
+  fetchImportListOptions,
+  saveImportListOptions,
+  setImportListOptionsValue,
+} from 'Store/Actions/settingsActions';
+import createSettingsSectionSelector from 'Store/Selectors/createSettingsSectionSelector';
+import translate from 'Utilities/String/translate';
+
+const SECTION = 'importListOptions';
+const cleanLibraryLevelOptions = [
+  { key: 'disabled', value: () => translate('Disabled') },
+  { key: 'logOnly', value: () => translate('LogOnly') },
+  { key: 'keepAndUnmonitor', value: () => translate('KeepAndUnmonitorSeries') },
+  { key: 'keepAndTag', value: () => translate('KeepAndTagSeries') },
+];
+
+function createImportListOptionsSelector() {
+  return createSelector(
+    (state: AppState) => state.settings.advancedSettings,
+    createSettingsSectionSelector(SECTION),
+    (advancedSettings, sectionSettings) => {
+      return {
+        advancedSettings,
+        save: sectionSettings.isSaving,
+        ...sectionSettings,
+      };
+    }
+  );
+}
+
+interface ImportListOptionsPageProps {
+  setChildSave(saveCallback: () => void): void;
+  onChildStateChange(payload: unknown): void;
+}
+
+function ImportListOptions(props: ImportListOptionsPageProps) {
+  const { setChildSave, onChildStateChange } = props;
+  const selected = useSelector(createImportListOptionsSelector());
+
+  const {
+    isSaving,
+    hasPendingChanges,
+    advancedSettings,
+    isFetching,
+    error,
+    settings,
+    hasSettings,
+  } = selected;
+
+  const { listSyncLevel, listSyncTag } = settings;
+
+  const dispatch = useDispatch();
+
+  const onInputChange = useCallback(
+    ({ name, value }: { name: string; value: unknown }) => {
+      // @ts-expect-error 'setImportListOptionsValue' isn't typed yet
+      dispatch(setImportListOptionsValue({ name, value }));
+    },
+    [dispatch]
+  );
+
+  const onTagChange = useCallback(
+    ({ name, value }: { name: string; value: number[] }) => {
+      const id = value.length === 0 ? 0 : value.pop();
+      // @ts-expect-error 'setImportListOptionsValue' isn't typed yet
+      dispatch(setImportListOptionsValue({ name, value: id }));
+    },
+    [dispatch]
+  );
+
+  useEffect(() => {
+    dispatch(fetchImportListOptions());
+    setChildSave(() => dispatch(saveImportListOptions()));
+
+    return () => {
+      dispatch(clearPendingChanges({ section: SECTION }));
+    };
+  }, [dispatch, setChildSave]);
+
+  useEffect(() => {
+    onChildStateChange({
+      isSaving,
+      hasPendingChanges,
+    });
+  }, [onChildStateChange, isSaving, hasPendingChanges]);
+
+  const translatedLevelOptions = cleanLibraryLevelOptions.map(
+    ({ key, value }) => {
+      return {
+        key,
+        value: value(),
+      };
+    }
+  );
+
+  return advancedSettings ? (
+    <FieldSet legend={translate('Options')}>
+      {isFetching ? <LoadingIndicator /> : null}
+
+      {!isFetching && error ? (
+        <Alert kind={kinds.DANGER}>{translate('ListOptionsLoadError')}</Alert>
+      ) : null}
+
+      {hasSettings && !isFetching && !error ? (
+        <Form>
+          <FormGroup advancedSettings={advancedSettings} isAdvanced={true}>
+            <FormLabel>{translate('CleanLibraryLevel')}</FormLabel>
+            <FormInputGroup
+              type={inputTypes.SELECT}
+              name="listSyncLevel"
+              values={translatedLevelOptions}
+              helpText={translate('ListSyncLevelHelpText')}
+              onChange={onInputChange}
+              {...listSyncLevel}
+            />
+          </FormGroup>
+          {listSyncLevel.value === 'keepAndTag' ? (
+            <FormGroup advancedSettings={advancedSettings} isAdvanced={true}>
+              <FormLabel>{translate('ListSyncTag')}</FormLabel>
+              <FormInputGroup
+                {...listSyncTag}
+                type={inputTypes.TAG}
+                name="listSyncTag"
+                value={listSyncTag.value === 0 ? [] : [listSyncTag.value]}
+                helpText={translate('ListSyncTagHelpText')}
+                onChange={onTagChange}
+              />
+            </FormGroup>
+          ) : null}
+        </Form>
+      ) : null}
+    </FieldSet>
+  ) : null;
+}
+
+export default ImportListOptions;

frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js

@@ -43,9 +43,9 @@ class AddIndexerModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddIndexerError')}
-              </div>
+              </Alert>
           }
 
           {

frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -67,9 +68,9 @@ function EditIndexerModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddIndexerError')}
-            </div>
+            </Alert>
         }
 
         {

frontend/src/Settings/Indexers/Indexers/Indexer.js

@@ -42,7 +42,7 @@ class Indexer extends Component {
     });
   };
 
-  onDeleteIndexerModalClose= () => {
+  onDeleteIndexerModalClose = () => {
     this.setState({ isDeleteIndexerModalOpen: false });
   };
 

frontend/src/Settings/MediaManagement/Naming/NamingOption.css

@@ -17,7 +17,7 @@
 }
 
 .small {
-  width: 480px;
+  width: 490px;
 }
 
 .large {
@@ -26,7 +26,7 @@
 
 .token {
   flex: 0 0 50%;
-  padding: 6px 16px;
+  padding: 6px 6px;
   background-color: var(--popoverTitleBackgroundColor);
   font-family: $monoSpaceFontFamily;
 }
@@ -36,7 +36,7 @@
   align-items: center;
   justify-content: space-between;
   flex: 0 0 50%;
-  padding: 6px 16px;
+  padding: 6px 6px;
   background-color: var(--popoverBodyBackgroundColor);
 
   .footNote {

frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js

@@ -1,11 +1,13 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
+import { kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AddNotificationItem from './AddNotificationItem';
 import styles from './AddNotificationModalContent.css';
@@ -39,9 +41,9 @@ class AddNotificationModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddNotificationError')}
-              </div>
+              </Alert>
           }
 
           {

frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js

@@ -59,9 +59,9 @@ function EditNotificationModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddNotificationError')}
-            </div>
+            </Alert>
         }
 
         {

frontend/src/Settings/Notifications/Notifications/Notification.js

@@ -191,7 +191,7 @@ class Notification extends Component {
         }
 
         {
-          !onGrab && !onDownload && !onRename && !onHealthIssue && !onHealthRestored && !onApplicationUpdate && !onSeriesDelete && !onEpisodeFileDelete && !onManualInteractionRequired ?
+          !onGrab && !onDownload && !onRename && !onHealthIssue && !onHealthRestored && !onApplicationUpdate && !onSeriesAdd && !onSeriesDelete && !onEpisodeFileDelete && !onManualInteractionRequired ?
             <Label
               kind={kinds.DISABLED}
               outline={true}

frontend/src/Settings/PendingChangesModal.js

@@ -15,12 +15,17 @@ function PendingChangesModal(props) {
     isOpen,
     onConfirm,
     onCancel,
-    bindShortcut
+    bindShortcut,
+    unbindShortcut
   } = props;
 
   useEffect(() => {
-    bindShortcut('enter', onConfirm);
-  }, [bindShortcut, onConfirm]);
+    if (isOpen) {
+      bindShortcut('enter', onConfirm);
+
+      return () => unbindShortcut('enter', onConfirm);
+    }
+  }, [bindShortcut, unbindShortcut, isOpen, onConfirm]);
 
   return (
     <Modal
@@ -61,7 +66,8 @@ PendingChangesModal.propTypes = {
   kind: PropTypes.oneOf(kinds.all),
   onConfirm: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
-  bindShortcut: PropTypes.func.isRequired
+  bindShortcut: PropTypes.func.isRequired,
+  unbindShortcut: PropTypes.func.isRequired
 };
 
 PendingChangesModal.defaultProps = {

frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js

@@ -87,9 +87,9 @@ function EditDelayProfileModalContent(props) {
 
         {
           !isFetching && !!error ?
-            <div>
-              {translate('AddQualityProfileError')}
-            </div> :
+            <Alert kind={kinds.DANGER}>
+              {translate('AddDelayProfileError')}
+            </Alert> :
             null
         }
 

frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -33,7 +32,7 @@ function createDelayProfileSelector() {
         items
       } = delayProfiles;
 
-      const profile = id ? _.find(items, { id }) : newDelayProfile;
+      const profile = id ? items.find((i) => i.id === id) : newDelayProfile;
       const settings = selectSettings(profile, pendingChanges, saveError);
 
       return {

frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -152,9 +153,9 @@ class EditQualityProfileModalContent extends Component {
 
               {
                 !isFetching && !!error &&
-                  <div>
+                  <Alert kind={kinds.DANGER}>
                     {translate('AddQualityProfileError')}
-                  </div>
+                  </Alert>
               }
 
               {

frontend/src/Settings/Profiles/Quality/QualityProfiles.js

@@ -55,7 +55,7 @@ class QualityProfiles extends Component {
       <FieldSet legend={translate('QualityProfiles')}>
         <PageSectionContent
           errorMessage={translate('QualityProfilesLoadError')}
-          {...otherProps}c={true}
+          {...otherProps}
         >
           <div className={styles.qualityProfiles}>
             {

frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js

@@ -48,7 +48,7 @@ function EditReleaseProfileModalContent(props) {
         <Form {...otherProps}>
 
           <FormGroup>
-            <FormLabel>Name</FormLabel>
+            <FormLabel>{translate('Name')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.TEXT}

frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContentConnector.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -11,7 +10,6 @@ const newReleaseProfile = {
   enabled: true,
   required: [],
   ignored: [],
-  includePreferredWhenRenaming: false,
   tags: [],
   indexerId: 0
 };
@@ -30,7 +28,7 @@ function createMapStateToProps() {
         items
       } = releaseProfiles;
 
-      const profile = id ? _.find(items, { id }) : newReleaseProfile;
+      const profile = id ? items.find((i) => i.id === id) : newReleaseProfile;
       const settings = selectSettings(profile, pendingChanges, saveError);
 
       return {

frontend/src/Settings/Profiles/Release/ReleaseProfile.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import MiddleTruncate from 'react-middle-truncate';
@@ -43,7 +42,7 @@ class ReleaseProfile extends Component {
     });
   };
 
-  onDeleteReleaseProfileModalClose= () => {
+  onDeleteReleaseProfileModalClose = () => {
     this.setState({ isDeleteReleaseProfileModalOpen: false });
   };
 
@@ -72,7 +71,7 @@ class ReleaseProfile extends Component {
       isDeleteReleaseProfileModalOpen
     } = this.state;
 
-    const indexer = indexerId !== 0 && _.find(indexerList, { id: indexerId });
+    const indexer = indexerId !== 0 && indexerList.find((i) => i.id === indexerId);
 
     return (
       <Card

frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import Alert from 'Components/Alert';
 import Card from 'Components/Card';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
@@ -122,9 +123,9 @@ export default function EditAutoTaggingModalContent(props) {
 
           {
             !isFetching && !!error ?
-              <div>
+              <Alert kind={kinds.DANGER}>
                 {translate('AddAutoTagError')}
-              </div> :
+              </Alert> :
               null
           }
 

frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.js

@@ -55,9 +55,9 @@ export default function AddSpecificationModalContent(props) {
 
         {
           !isSchemaFetching && !!schemaError ?
-            <div>
+            <Alert kind={kinds.DANGER}>
               {translate('AddConditionError')}
-            </div> :
+            </Alert> :
             null
         }
 

frontend/src/Settings/Tags/Tag.js

@@ -40,7 +40,7 @@ class Tag extends Component {
     });
   };
 
-  onDeleteTagModalClose= () => {
+  onDeleteTagModalClose = () => {
     this.setState({ isDeleteTagModalOpen: false });
   };
 

frontend/src/Settings/Tags/TagsConnector.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchDelayProfiles, fetchDownloadClients, fetchImportLists, fetchIndexers, fetchNotifications, fetchReleaseProfiles } from 'Store/Actions/settingsActions';
-import { fetchTagDetails } from 'Store/Actions/tagActions';
+import { fetchTagDetails, fetchTags } from 'Store/Actions/tagActions';
 import Tags from './Tags';
 
 function createMapStateToProps() {
@@ -25,6 +25,7 @@ function createMapStateToProps() {
 }
 
 const mapDispatchToProps = {
+  dispatchFetchTags: fetchTags,
   dispatchFetchTagDetails: fetchTagDetails,
   dispatchFetchDelayProfiles: fetchDelayProfiles,
   dispatchFetchImportLists: fetchImportLists,
@@ -41,6 +42,7 @@ class MetadatasConnector extends Component {
 
   componentDidMount() {
     const {
+      dispatchFetchTags,
       dispatchFetchTagDetails,
       dispatchFetchDelayProfiles,
       dispatchFetchImportLists,
@@ -50,6 +52,7 @@ class MetadatasConnector extends Component {
       dispatchFetchDownloadClients
     } = this.props;
 
+    dispatchFetchTags();
     dispatchFetchTagDetails();
     dispatchFetchDelayProfiles();
     dispatchFetchImportLists();
@@ -72,6 +75,7 @@ class MetadatasConnector extends Component {
 }
 
 MetadatasConnector.propTypes = {
+  dispatchFetchTags: PropTypes.func.isRequired,
   dispatchFetchTagDetails: PropTypes.func.isRequired,
   dispatchFetchDelayProfiles: PropTypes.func.isRequired,
   dispatchFetchImportLists: PropTypes.func.isRequired,

frontend/src/Settings/UI/UISettings.js

@@ -31,19 +31,19 @@ export const firstDayOfWeekOptions = [
 ];
 
 export const weekColumnOptions = [
-  { key: 'ddd M/D', value: 'Tue 3/25' },
-  { key: 'ddd MM/DD', value: 'Tue 03/25' },
-  { key: 'ddd D/M', value: 'Tue 25/3' },
-  { key: 'ddd DD/MM', value: 'Tue 25/03' }
+  { key: 'ddd M/D', value: 'Tue 3/25', hint: 'ddd M/D' },
+  { key: 'ddd MM/DD', value: 'Tue 03/25', hint: 'ddd MM/DD' },
+  { key: 'ddd D/M', value: 'Tue 25/3', hint: 'ddd D/M' },
+  { key: 'ddd DD/MM', value: 'Tue 25/03', hint: 'ddd DD/MM' }
 ];
 
 const shortDateFormatOptions = [
-  { key: 'MMM D YYYY', value: 'Mar 25 2014' },
-  { key: 'DD MMM YYYY', value: '25 Mar 2014' },
-  { key: 'MM/D/YYYY', value: '03/25/2014' },
-  { key: 'MM/DD/YYYY', value: '03/25/2014' },
-  { key: 'DD/MM/YYYY', value: '25/03/2014' },
-  { key: 'YYYY-MM-DD', value: '2014-03-25' }
+  { key: 'MMM D YYYY', value: 'Mar 25 2014', hint: 'MMM D YYYY' },
+  { key: 'DD MMM YYYY', value: '25 Mar 2014', hint: 'DD MMM YYYY' },
+  { key: 'MM/D/YYYY', value: '03/25/2014', hint: 'MM/D/YYYY' },
+  { key: 'MM/DD/YYYY', value: '03/25/2014', hint: 'MM/DD/YYYY' },
+  { key: 'DD/MM/YYYY', value: '25/03/2014', hint: 'DD/MM/YYYY' },
+  { key: 'YYYY-MM-DD', value: '2014-03-25', hint: 'YYYY-MM-DD' }
 ];
 
 const longDateFormatOptions = [

frontend/src/Store/Actions/Settings/downloadClients.js

@@ -94,7 +94,12 @@ export default {
     items: [],
     pendingChanges: {},
     sortKey: 'name',
-    sortDirection: sortDirections.DESCENDING
+    sortDirection: sortDirections.ASCENDING,
+    sortPredicates: {
+      name: function(item) {
+        return item.name.toLowerCase();
+      }
+    }
   },
 
   //

frontend/src/Store/Actions/Settings/importListOptions.js

@@ -0,0 +1,64 @@
+import { createAction } from 'redux-actions';
+import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
+import createSaveHandler from 'Store/Actions/Creators/createSaveHandler';
+import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import { createThunk } from 'Store/thunks';
+
+//
+// Variables
+
+const section = 'settings.importListOptions';
+
+//
+// Actions Types
+
+export const FETCH_IMPORT_LIST_OPTIONS = 'settings/importListOptions/fetchImportListOptions';
+export const SAVE_IMPORT_LIST_OPTIONS = 'settings/importListOptions/saveImportListOptions';
+export const SET_IMPORT_LIST_OPTIONS_VALUE = 'settings/importListOptions/setImportListOptionsValue';
+
+//
+// Action Creators
+
+export const fetchImportListOptions = createThunk(FETCH_IMPORT_LIST_OPTIONS);
+export const saveImportListOptions = createThunk(SAVE_IMPORT_LIST_OPTIONS);
+export const setImportListOptionsValue = createAction(SET_IMPORT_LIST_OPTIONS_VALUE, (payload) => {
+  return {
+    section,
+    ...payload
+  };
+});
+
+//
+// Details
+
+export default {
+
+  //
+  // State
+
+  defaultState: {
+    isFetching: false,
+    isPopulated: false,
+    error: null,
+    pendingChanges: {},
+    isSaving: false,
+    saveError: null,
+    item: {}
+  },
+
+  //
+  // Action Handlers
+
+  actionHandlers: {
+    [FETCH_IMPORT_LIST_OPTIONS]: createFetchHandler(section, '/config/importlist'),
+    [SAVE_IMPORT_LIST_OPTIONS]: createSaveHandler(section, '/config/importlist')
+  },
+
+  //
+  // Reducers
+
+  reducers: {
+    [SET_IMPORT_LIST_OPTIONS_VALUE]: createSetSettingValueReducer(section)
+  }
+
+};

frontend/src/Store/Actions/Settings/indexerFlags.js

@@ -0,0 +1,48 @@
+import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
+import { createThunk } from 'Store/thunks';
+
+//
+// Variables
+
+const section = 'settings.indexerFlags';
+
+//
+// Actions Types
+
+export const FETCH_INDEXER_FLAGS = 'settings/indexerFlags/fetchIndexerFlags';
+
+//
+// Action Creators
+
+export const fetchIndexerFlags = createThunk(FETCH_INDEXER_FLAGS);
+
+//
+// Details
+
+export default {
+
+  //
+  // State
+
+  defaultState: {
+    isFetching: false,
+    isPopulated: false,
+    error: null,
+    items: []
+  },
+
+  //
+  // Action Handlers
+
+  actionHandlers: {
+    [FETCH_INDEXER_FLAGS]: createFetchHandler(section, '/indexerFlag')
+  },
+
+  //
+  // Reducers
+
+  reducers: {
+
+  }
+
+};

frontend/src/Store/Actions/Settings/indexers.js

@@ -99,7 +99,12 @@ export default {
     items: [],
     pendingChanges: {},
     sortKey: 'name',
-    sortDirection: sortDirections.DESCENDING
+    sortDirection: sortDirections.ASCENDING,
+    sortPredicates: {
+      name: function(item) {
+        return item.name.toLowerCase();
+      }
+    }
   },
 
   //
@@ -149,7 +154,13 @@ export default {
       delete selectedSchema.name;
 
       selectedSchema.fields = selectedSchema.fields.map((field) => {
-        return { ...field };
+        const newField = { ...field };
+
+        if (newField.privacy === 'apiKey' || newField.privacy === 'password') {
+          newField.value = '';
+        }
+
+        return newField;
       });
 
       newState.selectedSchema = selectedSchema;

frontend/src/Store/Actions/calendarActions.js

@@ -97,7 +97,7 @@ export const persistState = [
   'calendar.view',
   'calendar.selectedFilterKey',
   'calendar.options',
-  'seriesIndex.customFilters'
+  'calendar.customFilters'
 ];
 
 //

frontend/src/Store/Actions/episodeActions.js

@@ -129,6 +129,15 @@ export const defaultState = {
       isVisible: false,
       isSortable: true
     },
+    {
+      name: 'indexerFlags',
+      columnLabel: () => translate('IndexerFlags'),
+      label: React.createElement(Icon, {
+        name: icons.FLAG,
+        title: () => translate('IndexerFlags')
+      }),
+      isVisible: false
+    },
     {
       name: 'status',
       label: () => translate('Status'),

frontend/src/Store/Actions/episodeFileActions.js

@@ -161,9 +161,12 @@ export const actionHandlers = handleThunks({
           const episodeFile = data.find((f) => f.id === id);
 
           props.qualityCutoffNotMet = episodeFile.qualityCutoffNotMet;
+          props.customFormats = episodeFile.customFormats;
+          props.customFormatScore = episodeFile.customFormatScore;
           props.languages = file.languages;
           props.quality = file.quality;
           props.releaseGroup = file.releaseGroup;
+          props.indexerFlags = file.indexerFlags;
 
           return updateItem({
             section,

frontend/src/Store/Actions/interactiveImportActions.js

@@ -162,6 +162,7 @@ export const actionHandlers = handleThunks({
         quality: item.quality,
         languages: item.languages,
         releaseGroup: item.releaseGroup,
+        indexerFlags: item.indexerFlags,
         downloadId: item.downloadId
       };
     });

frontend/src/Store/Actions/queueActions.js

@@ -430,13 +430,14 @@ export const actionHandlers = handleThunks({
       id,
       remove,
       blocklist,
-      skipRedownload
+      skipRedownload,
+      changeCategory
     } = payload;
 
     dispatch(updateItem({ section: paged, id, isRemoving: true }));
 
     const promise = createAjaxRequest({
-      url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`,
+      url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}&changeCategory=${changeCategory}`,
       method: 'DELETE'
     }).request;
 
@@ -454,7 +455,8 @@ export const actionHandlers = handleThunks({
       ids,
       remove,
       blocklist,
-      skipRedownload
+      skipRedownload,
+      changeCategory
     } = payload;
 
     dispatch(batchActions([
@@ -470,7 +472,7 @@ export const actionHandlers = handleThunks({
     ]));
 
     const promise = createAjaxRequest({
-      url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`,
+      url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}&changeCategory=${changeCategory}`,
       method: 'DELETE',
       dataType: 'json',
       contentType: 'application/json',