Fixed: SABnzbd history retention to allow at least 14 days

(cherry picked from commit a3938d8e0264b48b35f4715cbc15329fb489218a)

Closes #9217

.editorconfig

@@ -270,7 +270,7 @@ dotnet_diagnostic.CA5397.severity = suggestion
 
 dotnet_diagnostic.SYSLIB0006.severity = none
 
-[*.{js,html,js,hbs,less,css}]
+[*.{js,html,hbs,less,css,ts,tsx}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Reddit or Discord first'
+description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
 labels: ['Type: Bug', 'Status: Needs Triage']
 body:
 - type: checkboxes
@@ -65,18 +65,18 @@ body:
     required: true
 - type: textarea
   attributes:
-    label: Trace Logs?
+    label: Trace Logs? **Not Optional**
     description: |
       Trace Logs (https://wiki.servarr.com/radarr/troubleshooting#logging-and-log-files) 
-      ***Generally speaking, all bug reports must have trace logs provided.***
+      ***Generally speaking, all bug reports MUST have trace logs provided.***
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
       Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
   validations:
     required: true
 - type: checkboxes
   attributes:
-    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
+    label: Trace Logs have been provided as applicable. Reports will be closed if the required logs are not provided.
-    description: Trace logs are generally required for all bug reports
+    description: Trace logs are **generally required** and are not optional for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
     options:
-    - label: I have followed the steps in the wiki link above and provided the required trace logs that are relevant and show this issue.
+    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,3 @@ contact_links:
   - name: Support via Discord
     url: https://radarr.video/discord
     about: Chat with users and devs on support and setup related topics.
-  - name: Support via Reddit
-    url: https://reddit.com/r/radarr
-    about: Discuss and search thru support topics.

.github/label-actions.yml

@@ -0,0 +1,16 @@
+# Configuration for Label Actions - https://github.com/dessant/label-actions
+
+'Type: Support':
+  comment: >
+    :wave: @{issue-author}, we use the issue tracker exclusively
+    for bug reports and feature requests. However, this issue appears
+    to be a support request. Please hop over onto our [Discord](https://radarr.video/discord).
+  close: true
+  close-reason: 'not planned'
+
+'Status: Logs Needed':
+  comment: >
+    :wave: @{issue-author}, In order to help you further we'll need to see logs. 
+    You'll need to enable trace logging and replicate the problem that you encountered. 
+    Guidance on how to enable trace logging can be found in 
+    our [troubleshooting guide](https://wiki.servarr.com/radarr/troubleshooting#logging-and-log-files).

.github/workflows/label-actions.yml

@@ -0,0 +1,17 @@
+name: 'Label Actions'
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/label-actions@v3
+        with:
+          process-only: 'issues'

.github/workflows/support.yml

@@ -1,36 +0,0 @@
-name: 'Support requests'
-
-on:
-  issues:
-    types: [labeled, unlabeled, reopened]
-
-permissions: {}
-jobs:
-  support:
-    permissions:
-      issues: write # to modify issues
-
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/support-requests@v3
-        with:
-          github-token: ${{ github.token }}
-          support-label: 'Type: Support'
-          issue-comment: >
-            :wave: @{issue-author}, we use the issue tracker exclusively
-            for bug reports and feature requests. However, this issue appears
-            to be a support request. Please hop over onto our [Discord](https://radarr.video/discord) 
-            or [Subreddit](https://reddit.com/r/radarr)
-          close-issue: true
-          lock-issue: false
-      - uses: dessant/support-requests@v3
-        with:
-          github-token: ${{ github.token }}
-          support-label: 'Status: Logs Needed'
-          issue-comment: >
-            :wave: @{issue-author}, In order to help you further we'll need to see logs. 
-            You'll need to enable trace logging and replicate the problem that you encountered. 
-            Guidance on how to enable trace logging can be found in 
-            our [troubleshooting guide](https://wiki.servarr.com/radarr/troubleshooting#logging-and-log-files).
-          close-issue: false
-          lock-issue: false

README.md

@@ -35,7 +35,6 @@ Note that only one type of a given movie is supported. If you want both an 4k ve
 
 [![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/radarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://radarr.video/discord)
-[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Radarr)
 
 Note: GitHub Issues are for Bugs and Feature Requests Only
 

azure-pipelines.yml

@@ -9,13 +9,13 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '4.6.2'
+  majorVersion: '5.0.3'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
-  dotnetVersion: '6.0.408'
+  dotnetVersion: '6.0.413'
   nodeVersion: '16.X'
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'
@@ -27,6 +27,10 @@ trigger:
     include:
     - develop
     - master
+  paths:
+    exclude:
+      - .github
+      - src/Radarr.Api.*/openapi.json
 
 pr:
   branches:
@@ -34,6 +38,7 @@ pr:
     - develop
   paths:
     exclude:
+    - .github
     - src/NzbDrone.Core/Localization/Core
     - src/Radarr.Api.*/openapi.json
 
@@ -363,7 +368,7 @@ stages:
       - bash: |
           echo "Uploading source maps to sentry"
           curl -sL https://sentry.io/get-cli/ | bash
-          RELEASENAME="${RADARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
+          RELEASENAME="Radarr@${RADARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
           sentry-cli releases new --finalize -p radarr -p radarr-ui -p radarr-update "${RELEASENAME}"
           sentry-cli releases -p radarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
           sentry-cli releases set-commits --auto "${RELEASENAME}"
@@ -536,8 +541,8 @@ stages:
           testRunTitle: '$(testName) Unit Tests'
           failTaskOnFailedTests: true
           
-    - job: Unit_LinuxCore_Postgres
+    - job: Unit_LinuxCore_Postgres14
-      displayName: Unit Native LinuxCore with Postgres Database
+      displayName: Unit Native LinuxCore with Postgres14 Database
       dependsOn: Prepare
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
@@ -589,7 +594,63 @@ stages:
         inputs:
           testResultsFormat: 'NUnit'
           testResultsFiles: '**/TestResult.xml'
-          testRunTitle: 'LinuxCore Postgres Unit Tests'
+          testRunTitle: 'LinuxCore Postgres14 Unit Tests'
+          failTaskOnFailedTests: true
+
+    - job: Unit_LinuxCore_Postgres15
+      displayName: Unit Native LinuxCore with Postgres15 Database
+      dependsOn: Prepare
+      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
+      variables:
+        pattern: 'Radarr.*.linux-core-x64.tar.gz'
+        artifactName: linux-x64-tests
+        Radarr__Postgres__Host: 'localhost'
+        Radarr__Postgres__Port: '5432'
+        Radarr__Postgres__User: 'radarr'
+        Radarr__Postgres__Password: 'radarr'
+  
+      pool:
+        vmImage: ${{ variables.linuxImage }}
+
+      timeoutInMinutes: 10
+        
+      steps:
+      - task: UseDotNet@2
+        displayName: 'Install .net core'
+        inputs:
+          version: $(dotnetVersion)
+      - checkout: none
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Test Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: $(artifactName)
+          targetPath: $(testsFolder)
+      - bash: |
+          chmod a+x _tests/ffprobe
+        displayName: Make ffprobe Executable
+      - bash: find ${TESTSFOLDER} -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
+        displayName: Make Test Dummy Executable
+        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
+      - bash: |
+          docker run -d --name=postgres15 \
+          -e POSTGRES_PASSWORD=radarr \
+          -e POSTGRES_USER=radarr \
+          -p 5432:5432/tcp \
+          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
+          postgres:15
+        displayName: Start postgres
+      - bash: |
+          chmod a+x ${TESTSFOLDER}/test.sh
+          ls -lR ${TESTSFOLDER}
+          ${TESTSFOLDER}/test.sh Linux Unit Test
+        displayName: Run Tests
+      - task: PublishTestResults@2
+        displayName: Publish Test Results
+        inputs:
+          testResultsFormat: 'NUnit'
+          testResultsFiles: '**/TestResult.xml'
+          testRunTitle: 'LinuxCore Postgres15 Unit Tests'
           failTaskOnFailedTests: true
 
   - stage: Integration
@@ -675,8 +736,8 @@ stages:
           failTaskOnFailedTests: true
         displayName: Publish Test Results
 
-    - job: Integration_LinuxCore_Postgres
+    - job: Integration_LinuxCore_Postgres14
-      displayName: Integration Native LinuxCore with Postgres Database
+      displayName: Integration Native LinuxCore with Postgres14 Database
       dependsOn: Prepare
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
@@ -733,7 +794,70 @@ stages:
           inputs:
             testResultsFormat: 'NUnit'
             testResultsFiles: '**/TestResult.xml'
-            testRunTitle: 'Integration LinuxCore Postgres Database Integration Tests'
+            testRunTitle: 'Integration LinuxCore Postgres14 Database Integration Tests'
+            failTaskOnFailedTests: true
+          displayName: Publish Test Results
+
+
+    - job: Integration_LinuxCore_Postgres15
+      displayName: Integration Native LinuxCore with Postgres Database
+      dependsOn: Prepare
+      condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
+      variables:
+        pattern: 'Radarr.*.linux-core-x64.tar.gz'
+        Radarr__Postgres__Host: 'localhost'
+        Radarr__Postgres__Port: '5432'
+        Radarr__Postgres__User: 'radarr'
+        Radarr__Postgres__Password: 'radarr'
+
+      pool:
+        vmImage: ${{ variables.linuxImage }}
+
+      steps:
+        - task: UseDotNet@2
+          displayName: 'Install .net core'
+          inputs:
+            version: $(dotnetVersion)
+        - checkout: none
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Test Artifact
+          inputs:
+            buildType: 'current'
+            artifactName: 'linux-x64-tests'
+            targetPath: $(testsFolder)
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Build Artifact
+          inputs:
+            buildType: 'current'
+            artifactName: Packages
+            itemPattern: '**/$(pattern)'
+            targetPath: $(Build.ArtifactStagingDirectory)
+        - task: ExtractFiles@1
+          inputs:
+            archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
+            destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
+          displayName: Extract Package
+        - bash: |
+            mkdir -p ./bin/
+            cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
+          displayName: Move Package Contents
+        - bash: |
+            docker run -d --name=postgres15 \
+            -e POSTGRES_PASSWORD=radarr \
+            -e POSTGRES_USER=radarr \
+            -p 5432:5432/tcp \
+            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
+            postgres:15
+          displayName: Start postgres
+        - bash: |
+            chmod a+x ${TESTSFOLDER}/test.sh
+            ${TESTSFOLDER}/test.sh Linux Integration Test
+          displayName: Run Integration Tests
+        - task: PublishTestResults@2
+          inputs:
+            testResultsFormat: 'NUnit'
+            testResultsFiles: '**/TestResult.xml'
+            testRunTitle: 'Integration LinuxCore Postgres15 Database Integration Tests'
             failTaskOnFailedTests: true
           displayName: Publish Test Results
 

build.sh

@@ -392,22 +392,21 @@ then
     fi
 fi
 
-if [ "$FRONTEND" = "YES" ];
+if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
 then
     YarnInstall
-    RunWebpack
 fi
 
 if [ "$LINT" = "YES" ];
 then
-    if [ -z "$FRONTEND" ];
-    then
-        YarnInstall
-    fi
-    
     LintUI
 fi
 
+if [ "$FRONTEND" = "YES" ];
+then
+    RunWebpack
+fi
+
 if [ "$PACKAGES" = "YES" ];
 then
     UpdateVersionNumber

frontend/babel.config.js

@@ -4,14 +4,14 @@ module.exports = {
   plugins: [
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-proposal-optional-chaining', { loose }],
+    ['@babel/plugin-transform-optional-chaining', { loose }],
-    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
 
     // Stage 2
-    '@babel/plugin-proposal-export-namespace-from',
+    '@babel/plugin-transform-export-namespace-from',
 
     // Stage 3
-    ['@babel/plugin-proposal-class-properties', { loose }],
+    ['@babel/plugin-transform-class-properties', { loose }],
     '@babel/plugin-syntax-dynamic-import'
   ],
   env: {

frontend/build/webpack.config.js

@@ -36,7 +36,7 @@ module.exports = (env) => {
     },
 
     entry: {
-      index: 'index.js'
+      index: 'index.ts'
     },
 
     resolve: {
@@ -66,23 +66,23 @@ module.exports = (env) => {
     output: {
       path: distFolder,
       publicPath: '/',
-      filename: '[name].js',
+      filename: '[name]-[contenthash].js',
       sourceMapFilename: '[file].map'
     },
 
     optimization: {
       moduleIds: 'deterministic',
-      chunkIds: 'named',
+      chunkIds: isProduction ? 'deterministic' : 'named'
-      splitChunks: {
-        chunks: 'initial',
-        name: 'vendors'
-      }
     },
 
     performance: {
       hints: false
     },
 
+    experiments: {
+      topLevelAwait: true
+    },
+
     plugins: [
       new webpack.DefinePlugin({
         __DEV__: !isProduction,
@@ -90,13 +90,15 @@ module.exports = (env) => {
       }),
 
       new MiniCssExtractPlugin({
-        filename: 'Content/styles.css'
+        filename: 'Content/styles.css',
+        chunkFilename: 'Content/[id]-[chunkhash].css'
       }),
 
       new HtmlWebpackPlugin({
         template: 'frontend/src/index.ejs',
         filename: 'index.html',
-        publicPath: '/'
+        publicPath: '/',
+        inject: false
       }),
 
       new FileManagerPlugin({
@@ -233,6 +235,7 @@ module.exports = (env) => {
             {
               loader: 'url-loader',
               options: {
+                limit: 10240,
                 mimetype: 'application/font-woff',
                 emitFile: false,
                 name: 'Content/Fonts/[name].[ext]'

frontend/src/Activity/Blocklist/Blocklist.js

@@ -158,7 +158,7 @@ class Blocklist extends Component {
           {
             !isFetching && !!error &&
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadBlocklist')}
+                {translate('BlocklistLoadError')}
               </Alert>
           }
 
@@ -210,7 +210,7 @@ class Blocklist extends Component {
           isOpen={isConfirmRemoveModalOpen}
           kind={kinds.DANGER}
           title={translate('RemoveSelected')}
-          message={translate('RemoveSelectedItemBlocklistMessageText')}
+          message={translate('RemoveSelectedBlocklistMessageText')}
           confirmLabel={translate('RemoveSelected')}
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}

frontend/src/Activity/History/Details/HistoryDetails.js

@@ -7,6 +7,7 @@ import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionList
 import Link from 'Components/Link/Link';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
@@ -15,6 +16,7 @@ function HistoryDetails(props) {
     eventType,
     sourceTitle,
     data,
+    downloadId,
     shortDateFormat,
     timeFormat
   } = props;
@@ -23,11 +25,11 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
+      movieMatchType,
+      customFormatScore,
       nzbInfoUrl,
       downloadClient,
       downloadClientName,
-      downloadId,
-      movieMatchType,
       age,
       ageHours,
       ageMinutes,
@@ -45,33 +47,31 @@ function HistoryDetails(props) {
         />
 
         {
-          !!indexer &&
+          indexer ?
             <DescriptionListItem
               title={translate('Indexer')}
               data={indexer}
-            />
+            /> :
+            null
         }
 
         {
-          !!releaseGroup &&
+          releaseGroup ?
             <DescriptionListItem
               descriptionClassName={styles.description}
               title={translate('ReleaseGroup')}
               data={releaseGroup}
-            />
+            /> :
+            null
         }
 
         {
-          !!nzbInfoUrl &&
+          customFormatScore && customFormatScore !== '0' ?
-            <span>
+            <DescriptionListItem
-              <DescriptionListItemTitle>
+              title={translate('CustomFormatScore')}
-                Info URL
+              data={formatCustomFormatScore(customFormatScore)}
-              </DescriptionListItemTitle>
+            /> :
-
+            null
-              <DescriptionListItemDescription>
-                <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
-              </DescriptionListItemDescription>
-            </span>
         }
 
         {
@@ -84,6 +84,20 @@ function HistoryDetails(props) {
             null
         }
 
+        {
+          nzbInfoUrl ?
+            <span>
+              <DescriptionListItemTitle>
+                {translate('InfoUrl')}
+              </DescriptionListItemTitle>
+
+              <DescriptionListItemDescription>
+                <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
+              </DescriptionListItemDescription>
+            </span> :
+            null
+        }
+
         {
           downloadClientNameInfo ?
             <DescriptionListItem
@@ -94,27 +108,30 @@ function HistoryDetails(props) {
         }
 
         {
-          !!downloadId &&
+          downloadId ?
             <DescriptionListItem
-              title={translate('GrabID')}
+              title={translate('GrabId')}
               data={downloadId}
-            />
+            /> :
+            null
         }
 
         {
-          !!indexer &&
+          indexer ?
             <DescriptionListItem
               title={translate('AgeWhenGrabbed')}
               data={formatAge(age, ageHours, ageMinutes)}
-            />
+            /> :
+            null
         }
 
         {
-          !!publishedDate &&
+          publishedDate ?
             <DescriptionListItem
               title={translate('PublishedDate')}
               data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
-            />
+            /> :
+            null
         }
       </DescriptionList>
     );
@@ -134,11 +151,21 @@ function HistoryDetails(props) {
         />
 
         {
-          !!message &&
+          downloadId ?
+            <DescriptionListItem
+              title={translate('GrabId')}
+              data={downloadId}
+            /> :
+            null
+        }
+
+        {
+          message ?
             <DescriptionListItem
               title={translate('Message')}
               data={message}
-            />
+            /> :
+            null
         }
       </DescriptionList>
     );
@@ -146,6 +173,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'downloadFolderImported') {
     const {
+      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -159,21 +187,32 @@ function HistoryDetails(props) {
         />
 
         {
-          !!droppedPath &&
+          droppedPath ?
             <DescriptionListItem
               descriptionClassName={styles.description}
               title={translate('Source')}
               data={droppedPath}
-            />
+            /> :
+            null
         }
 
         {
-          !!importedPath &&
+          importedPath ?
             <DescriptionListItem
               descriptionClassName={styles.description}
               title={translate('ImportedTo')}
               data={importedPath}
-            />
+            /> :
+            null
+        }
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
         }
       </DescriptionList>
     );
@@ -181,20 +220,21 @@ function HistoryDetails(props) {
 
   if (eventType === 'movieFileDeleted') {
     const {
-      reason
+      reason,
+      customFormatScore
     } = data;
 
     let reasonMessage = '';
 
     switch (reason) {
       case 'Manual':
-        reasonMessage = translate('FileWasDeletedByViaUI');
+        reasonMessage = translate('DeletedReasonManual');
         break;
       case 'MissingFromDisk':
-        reasonMessage = translate('MissingFromDisk');
+        reasonMessage = translate('DeletedReasonMissingFromDisk');
         break;
       case 'Upgrade':
-        reasonMessage = translate('FileWasDeletedByUpgrade');
+        reasonMessage = translate('DeletedReasonUpgrade');
         break;
       default:
         reasonMessage = '';
@@ -211,6 +251,15 @@ function HistoryDetails(props) {
           title={translate('Reason')}
           data={reasonMessage}
         />
+
+        {
+          customFormatScore && customFormatScore !== '0' ?
+            <DescriptionListItem
+              title={translate('CustomFormatScore')}
+              data={formatCustomFormatScore(customFormatScore)}
+            /> :
+            null
+        }
       </DescriptionList>
     );
   }
@@ -262,11 +311,21 @@ function HistoryDetails(props) {
         />
 
         {
-          !!message &&
+          downloadId ?
+            <DescriptionListItem
+              title={translate('GrabId')}
+              data={downloadId}
+            /> :
+            null
+        }
+
+        {
+          message ?
             <DescriptionListItem
               title={translate('Message')}
               data={message}
-            />
+            /> :
+            null
         }
       </DescriptionList>
     );
@@ -287,6 +346,7 @@ HistoryDetails.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired
 };

frontend/src/Activity/History/Details/HistoryDetailsModal.js

@@ -15,19 +15,19 @@ import styles from './HistoryDetailsModal.css';
 function getHeaderTitle(eventType) {
   switch (eventType) {
     case 'grabbed':
-      return 'Grabbed';
+      return translate('Grabbed');
     case 'downloadFailed':
-      return 'Download Failed';
+      return translate('DownloadFailed');
     case 'downloadFolderImported':
-      return 'Movie Imported';
+      return translate('MovieImported');
     case 'movieFileDeleted':
-      return 'Movie File Deleted';
+      return translate('MovieFileDeleted');
     case 'movieFileRenamed':
-      return 'Movie File Renamed';
+      return translate('MovieFileRenamed');
     case 'downloadIgnored':
-      return 'Download Ignored';
+      return translate('DownloadIgnored');
     default:
-      return 'Unknown';
+      return translate('Unknown');
   }
 }
 
@@ -37,6 +37,7 @@ function HistoryDetailsModal(props) {
     eventType,
     sourceTitle,
     data,
+    downloadId,
     isMarkingAsFailed,
     shortDateFormat,
     timeFormat,
@@ -59,6 +60,7 @@ function HistoryDetailsModal(props) {
             eventType={eventType}
             sourceTitle={sourceTitle}
             data={data}
+            downloadId={downloadId}
             shortDateFormat={shortDateFormat}
             timeFormat={timeFormat}
           />
@@ -73,7 +75,7 @@ function HistoryDetailsModal(props) {
                 isSpinning={isMarkingAsFailed}
                 onPress={onMarkAsFailedPress}
               >
-                Mark as Failed
+                {translate('MarkAsFailed')}
               </SpinnerButton>
           }
 
@@ -93,6 +95,7 @@ HistoryDetailsModal.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,

frontend/src/Activity/History/History.js

@@ -85,7 +85,7 @@ class History extends Component {
           {
             !isFetchingAny && hasError &&
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadHistory')}
+                {translate('HistoryLoadError')}
               </Alert>
           }
 
@@ -95,7 +95,7 @@ class History extends Component {
 
             isPopulated && !hasError && !items.length &&
               <Alert kind={kinds.INFO}>
-                {translate('NoHistory')}
+                {translate('NoHistoryFound')}
               </Alert>
           }
 

frontend/src/Activity/History/HistoryEventTypeCell.js

@@ -3,6 +3,7 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import { icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './HistoryEventTypeCell.css';
 
 function getIconName(eventType) {
@@ -38,21 +39,21 @@ function getIconKind(eventType) {
 function getTooltip(eventType, data) {
   switch (eventType) {
     case 'grabbed':
-      return `Movie grabbed from ${data.indexer} and sent to ${data.downloadClient}`;
+      return translate('MovieGrabbedHistoryTooltip', { indexer: data.indexer, downloadClient: data.downloadClient });
     case 'movieFolderImported':
-      return 'Movie imported from movie folder';
+      return translate('MovieFolderImportedTooltip');
     case 'downloadFolderImported':
-      return 'Movie downloaded successfully and picked up from download client';
+      return translate('MovieImportedTooltip');
     case 'downloadFailed':
-      return 'Movie download failed';
+      return translate('MovieDownloadFailedTooltip');
     case 'movieFileDeleted':
-      return 'Movie file deleted';
+      return translate('MovieFileDeletedTooltip');
     case 'movieFileRenamed':
-      return 'Movie file renamed';
+      return translate('MovieFileRenamedTooltip');
     case 'downloadIgnored':
-      return 'Movie Download Ignored';
+      return translate('MovieDownloadIgnoredTooltip');
     default:
-      return 'Unknown event';
+      return translate('UnknownEventTooltip');
   }
 }
 

frontend/src/Activity/History/HistoryRow.js

@@ -4,7 +4,8 @@ import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import { icons } from 'Helpers/Props';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, tooltipPositions } from 'Helpers/Props';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
@@ -63,6 +64,7 @@ class HistoryRow extends Component {
       sourceTitle,
       date,
       data,
+      downloadId,
       isMarkingAsFailed,
       columns,
       shortDateFormat,
@@ -176,7 +178,14 @@ class HistoryRow extends Component {
                   key={name}
                   className={styles.customFormatScore}
                 >
-                  {formatCustomFormatScore(customFormatScore)}
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<MovieFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
                 </TableRowCell>
               );
             }
@@ -225,6 +234,7 @@ class HistoryRow extends Component {
           eventType={eventType}
           sourceTitle={sourceTitle}
           data={data}
+          downloadId={downloadId}
           isMarkingAsFailed={isMarkingAsFailed}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
@@ -249,6 +259,7 @@ HistoryRow.propTypes = {
   sourceTitle: PropTypes.string.isRequired,
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
+  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool,
   markAsFailedError: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -257,4 +268,8 @@ HistoryRow.propTypes = {
   onMarkAsFailedPress: PropTypes.func.isRequired
 };
 
+HistoryRow.defaultProps = {
+  customFormats: []
+};
+
 export default HistoryRow;

frontend/src/Activity/Queue/Queue.js

@@ -233,7 +233,7 @@ class Queue extends Component {
           {
             !isRefreshing && hasError ?
               <Alert kind={kinds.DANGER}>
-                {translate('FailedToLoadQueue')}
+                {translate('QueueLoadError')}
               </Alert> :
               null
           }

frontend/src/Activity/Queue/QueueDetails.css

@@ -0,0 +1,5 @@
+.progressBarContainer {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}

frontend/src/Activity/Queue/QueueDetails.css.d.ts

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

frontend/src/Activity/Queue/QueueDetails.js

@@ -1,116 +1,71 @@
-import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
-import { icons, kinds } from 'Helpers/Props';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, tooltipPositions } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import QueueStatus from './QueueStatus';
+import styles from './QueueDetails.css';
 
 function QueueDetails(props) {
   const {
     title,
     size,
     sizeleft,
-    estimatedCompletionTime,
     status,
     trackedDownloadState,
     trackedDownloadStatus,
+    statusMessages,
     errorMessage,
     progressBar
   } = props;
 
   const progress = size ? (100 - sizeleft / size * 100) : 0;
+  const isDownloading = status === 'downloading';
+  const isPaused = status === 'paused';
+  const hasWarning = trackedDownloadStatus === 'warning';
+  const hasError = trackedDownloadStatus === 'error';
 
-  if (status === 'pending') {
+  if (
-    return (
+    (isDownloading || isPaused) &&
-      <Icon
+    !hasWarning &&
-        name={icons.PENDING}
+    !hasError
-        title={translate('ReleaseWillBeProcessedInterp', [moment(estimatedCompletionTime).fromNow()])}
+  ) {
-      />
+    const state = isPaused ? translate('Paused') : translate('Downloading');
-    );
-  }
 
-  if (status === 'completed') {
+    if (progress < 5) {
-    if (errorMessage) {
       return (
         <Icon
-          name={icons.DOWNLOAD}
+          name={icons.DOWNLOADING}
-          kind={kinds.DANGER}
+          title={`${state} - ${progress.toFixed(1)}% ${title}`}
-          title={translate('ImportFailedInterp', [errorMessage])}
         />
       );
     }
 
-    if (trackedDownloadStatus === 'warning') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.WARNING}
-          title={translate('UnableToImportCheckLogs')}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('WaitingToImport')}`}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importing') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={`${translate('Downloaded')} - ${translate('Importing')}`}
-        />
-      );
-    }
-  }
-
-  if (errorMessage) {
     return (
-      <Icon
+      <Popover
-        name={icons.DOWNLOADING}
+        className={styles.progressBarContainer}
-        kind={kinds.DANGER}
+        anchor={progressBar}
-        title={translate('DownloadFailedInterp', [errorMessage])}
+        title={`${state} - ${progress.toFixed(1)}%`}
+        body={
+          <div>{title}</div>
+        }
+        position={tooltipPositions.LEFT}
       />
     );
   }
 
-  if (status === 'failed') {
+  return (
-    return (
+    <QueueStatus
-      <Icon
+      sourceTitle={title}
-        name={icons.DOWNLOADING}
+      status={status}
-        kind={kinds.DANGER}
+      trackedDownloadStatus={trackedDownloadStatus}
-        title={translate('DownloadFailedCheckDownloadClientForMoreDetails')}
+      trackedDownloadState={trackedDownloadState}
-      />
+      statusMessages={statusMessages}
-    );
+      errorMessage={errorMessage}
-  }
+      position={tooltipPositions.LEFT}
-
+    />
-  if (status === 'warning') {
+  );
-    return (
-      <Icon
-        name={icons.DOWNLOADING}
-        kind={kinds.WARNING}
-        title={translate('DownloadWarningCheckDownloadClientForMoreDetails')}
-      />
-    );
-  }
-
-  if (progress < 5) {
-    return (
-      <Icon
-        name={icons.DOWNLOADING}
-        title={translate('MovieIsDownloadingInterp', [progress.toFixed(1), title])}
-      />
-    );
-  }
-
-  return progressBar;
 }
 
 QueueDetails.propTypes = {
@@ -121,6 +76,7 @@ QueueDetails.propTypes = {
   status: PropTypes.string.isRequired,
   trackedDownloadState: PropTypes.string.isRequired,
   trackedDownloadStatus: PropTypes.string.isRequired,
+  statusMessages: PropTypes.arrayOf(PropTypes.object),
   errorMessage: PropTypes.string,
   progressBar: PropTypes.node.isRequired
 };

frontend/src/Activity/Queue/QueueOptions.js

@@ -61,7 +61,7 @@ class QueueOptions extends Component {
             type={inputTypes.CHECK}
             name="includeUnknownMovieItems"
             value={includeUnknownMovieItems}
-            helpText={translate('IncludeUnknownMovieItemsHelpText')}
+            helpText={translate('ShowUnknownMovieItemsHelpText')}
             onChange={this.onOptionChange}
           />
         </FormGroup>

frontend/src/Activity/Queue/QueueRow.css

@@ -16,6 +16,12 @@
   width: 150px;
 }
 
+.customFormatScore {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 55px;
+}
+
 .actions {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 

frontend/src/Activity/Queue/QueueRow.css.d.ts

@@ -2,6 +2,7 @@
 // Please do not change this file!
 interface CssExports {
   'actions': string;
+  'customFormatScore': string;
   'progress': string;
   'protocol': string;
   'quality': string;

frontend/src/Activity/Queue/QueueRow.js

@@ -8,13 +8,15 @@ import ProgressBar from 'Components/ProgressBar';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
-import { icons, kinds } from 'Helpers/Props';
+import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
 import MovieTitleLink from 'Movie/MovieTitleLink';
 import formatBytes from 'Utilities/Number/formatBytes';
+import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import translate from 'Utilities/String/translate';
 import QueueStatusCell from './QueueStatusCell';
 import RemoveQueueItemModal from './RemoveQueueItemModal';
@@ -42,14 +44,14 @@ class QueueRow extends Component {
     this.setState({ isRemoveQueueItemModalOpen: true });
   };
 
-  onRemoveQueueItemModalConfirmed = (blocklist) => {
+  onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => {
     const {
       onRemoveQueueItemPress,
       onQueueRowModalOpenOrClose
     } = this.props;
 
     onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blocklist);
+    onRemoveQueueItemPress(blocklist, skipRedownload);
 
     this.setState({ isRemoveQueueItemModalOpen: false });
   };
@@ -88,6 +90,7 @@ class QueueRow extends Component {
       movie,
       quality,
       customFormats,
+      customFormatScore,
       languages,
       protocol,
       indexer,
@@ -201,6 +204,24 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'customFormatScore') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.customFormatScore}
+                >
+                  <Tooltip
+                    anchor={formatCustomFormatScore(
+                      customFormatScore,
+                      customFormats.length
+                    )}
+                    tooltip={<MovieFormats formats={customFormats} />}
+                    position={tooltipPositions.BOTTOM}
+                  />
+                </TableRowCell>
+              );
+            }
+
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -365,6 +386,7 @@ QueueRow.propTypes = {
   movie: PropTypes.object,
   quality: PropTypes.object.isRequired,
   customFormats: PropTypes.arrayOf(PropTypes.object),
+  customFormatScore: PropTypes.number.isRequired,
   languages: PropTypes.arrayOf(PropTypes.object).isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
@@ -390,6 +412,7 @@ QueueRow.propTypes = {
 };
 
 QueueRow.defaultProps = {
+  customFormats: [],
   isGrabbing: false,
   isRemoving: false
 };

frontend/src/Activity/Queue/QueueStatus.css

@@ -0,0 +1,3 @@
+.noMessages {
+  margin-bottom: 10px;
+}

frontend/src/Activity/Queue/QueueStatus.css.d.ts

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

frontend/src/Activity/Queue/QueueStatus.js

@@ -0,0 +1,162 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Icon from 'Components/Icon';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './QueueStatus.css';
+
+function getDetailedPopoverBody(statusMessages) {
+  return (
+    <div>
+      {
+        statusMessages.map(({ title, messages }) => {
+          return (
+            <div
+              key={title}
+              className={messages.length ? undefined: styles.noMessages}
+            >
+              {title}
+              <ul>
+                {
+                  messages.map((message) => {
+                    return (
+                      <li key={message}>
+                        {message}
+                      </li>
+                    );
+                  })
+                }
+              </ul>
+            </div>
+          );
+        })
+      }
+    </div>
+  );
+}
+
+function QueueStatus(props) {
+  const {
+    sourceTitle,
+    status,
+    trackedDownloadStatus,
+    trackedDownloadState,
+    statusMessages,
+    errorMessage,
+    position,
+    canFlip
+  } = props;
+
+  const hasWarning = trackedDownloadStatus === 'warning';
+  const hasError = trackedDownloadStatus === 'error';
+
+  // status === 'downloading'
+  let iconName = icons.DOWNLOADING;
+  let iconKind = kinds.DEFAULT;
+  let title = translate('Downloading');
+
+  if (status === 'paused') {
+    iconName = icons.PAUSED;
+    title = translate('Paused');
+  }
+
+  if (status === 'queued') {
+    iconName = icons.QUEUED;
+    title = translate('Queued');
+  }
+
+  if (status === 'completed') {
+    iconName = icons.DOWNLOADED;
+    title = translate('Downloaded');
+
+    if (trackedDownloadState === 'importPending') {
+      title += ` - ${translate('WaitingToImport')}`;
+      iconKind = kinds.PURPLE;
+    }
+
+    if (trackedDownloadState === 'importing') {
+      title += ` - ${translate('Importing')}`;
+      iconKind = kinds.PURPLE;
+    }
+
+    if (trackedDownloadState === 'failedPending') {
+      title += ` - ${translate('WaitingToProcess')}`;
+      iconKind = kinds.DANGER;
+    }
+  }
+
+  if (hasWarning) {
+    iconKind = kinds.WARNING;
+  }
+
+  if (status === 'delay') {
+    iconName = icons.PENDING;
+    title = translate('Pending');
+  }
+
+  if (status === 'downloadClientUnavailable') {
+    iconName = icons.PENDING;
+    iconKind = kinds.WARNING;
+    title = translate('PendingDownloadClientUnavailable');
+  }
+
+  if (status === 'failed') {
+    iconName = icons.DOWNLOADING;
+    iconKind = kinds.DANGER;
+    title = translate('DownloadFailed');
+  }
+
+  if (status === 'warning') {
+    iconName = icons.DOWNLOADING;
+    iconKind = kinds.WARNING;
+    const warningMessage = errorMessage || translate('CheckDownloadClientForDetails');
+    title = translate('DownloadWarning', { warningMessage });
+  }
+
+  if (hasError) {
+    if (status === 'completed') {
+      iconName = icons.DOWNLOAD;
+      iconKind = kinds.DANGER;
+      title = translate('ImportFailed', { sourceTitle });
+    } else {
+      iconName = icons.DOWNLOADING;
+      iconKind = kinds.DANGER;
+      title = translate('DownloadFailed');
+    }
+  }
+
+  return (
+    <Popover
+      anchor={
+        <Icon
+          name={iconName}
+          kind={iconKind}
+        />
+      }
+      title={title}
+      body={hasWarning || hasError ? getDetailedPopoverBody(statusMessages) : sourceTitle}
+      position={position}
+      canFlip={canFlip}
+    />
+  );
+}
+
+QueueStatus.propTypes = {
+  sourceTitle: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  trackedDownloadStatus: PropTypes.string.isRequired,
+  trackedDownloadState: PropTypes.string.isRequired,
+  statusMessages: PropTypes.arrayOf(PropTypes.object),
+  errorMessage: PropTypes.string,
+  position: PropTypes.oneOf(tooltipPositions.all).isRequired,
+  canFlip: PropTypes.bool.isRequired
+};
+
+QueueStatus.defaultProps = {
+  trackedDownloadStatus: 'ok',
+  trackedDownloadState: 'downloading',
+  canFlip: false
+};
+
+export default QueueStatus;

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -1,39 +1,11 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import Popover from 'Components/Tooltip/Popover';
+import { tooltipPositions } from 'Helpers/Props';
-import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
+import QueueStatus from './QueueStatus';
 import styles from './QueueStatusCell.css';
 
-function getDetailedPopoverBody(statusMessages) {
-  return (
-    <div>
-      {
-        statusMessages.map(({ title, messages }) => {
-          return (
-            <div key={title}>
-              {title}
-              <ul>
-                {
-                  messages.map((message) => {
-                    return (
-                      <li key={message}>
-                        {message}
-                      </li>
-                    );
-                  })
-                }
-              </ul>
-            </div>
-          );
-        })
-      }
-    </div>
-  );
-}
-
 function QueueStatusCell(props) {
   const {
     sourceTitle,
@@ -44,97 +16,16 @@ function QueueStatusCell(props) {
     errorMessage
   } = props;
 
-  const hasWarning = trackedDownloadStatus === 'warning';
-  const hasError = trackedDownloadStatus === 'error';
-
-  // status === 'downloading'
-  let iconName = icons.DOWNLOADING;
-  let iconKind = kinds.DEFAULT;
-  let title = translate('Downloading');
-
-  if (status === 'paused') {
-    iconName = icons.PAUSED;
-    title = translate('Paused');
-  }
-
-  if (status === 'queued') {
-    iconName = icons.QUEUED;
-    title = translate('Queued');
-  }
-
-  if (status === 'completed') {
-    iconName = icons.DOWNLOADED;
-    title = translate('Downloaded');
-
-    if (trackedDownloadState === 'importPending') {
-      title += ` - ${translate('WaitingToImport')}`;
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'importing') {
-      title += ` - ${translate('Importing')}`;
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'failedPending') {
-      title += ` - ${translate('WaitingToProcess')}`;
-      iconKind = kinds.DANGER;
-    }
-  }
-
-  if (hasWarning) {
-    iconKind = kinds.WARNING;
-  }
-
-  if (status === 'delay') {
-    iconName = icons.PENDING;
-    title = translate('Pending');
-  }
-
-  if (status === 'DownloadClientUnavailable') {
-    iconName = icons.PENDING;
-    iconKind = kinds.WARNING;
-    title = `${translate('Pending')} - ${translate('DownloadClientUnavailable')}`;
-  }
-
-  if (status === 'failed') {
-    iconName = icons.DOWNLOADING;
-    iconKind = kinds.DANGER;
-    title = translate('DownloadFailed');
-  }
-
-  if (status === 'warning') {
-    iconName = icons.DOWNLOADING;
-    iconKind = kinds.WARNING;
-    const warningMessage = errorMessage || translate('CheckDownloadClientForDetails');
-    title = translate('DownloadWarning', [warningMessage]);
-  }
-
-  if (hasError) {
-    if (status === 'completed') {
-      iconName = icons.DOWNLOAD;
-      iconKind = kinds.DANGER;
-      title = translate('ImportFailed', [sourceTitle]);
-    } else {
-      iconName = icons.DOWNLOADING;
-      iconKind = kinds.DANGER;
-      title = translate('DownloadFailed');
-    }
-  }
-
   return (
     <TableRowCell className={styles.status}>
-      <Popover
+      <QueueStatus
-        anchor={
+        sourceTitle={sourceTitle}
-          <Icon
+        status={status}
-            name={iconName}
+        trackedDownloadStatus={trackedDownloadStatus}
-            kind={iconKind}
+        trackedDownloadState={trackedDownloadState}
-          />
+        statusMessages={statusMessages}
-        }
+        errorMessage={errorMessage}
-        title={title}
-        body={hasWarning || hasError ? getDetailedPopoverBody(statusMessages) : sourceTitle}
         position={tooltipPositions.RIGHT}
-        canFlip={false}
       />
     </TableRowCell>
   );

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -22,7 +22,8 @@ class RemoveQueueItemModal extends Component {
 
     this.state = {
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     };
   }
 
@@ -32,7 +33,8 @@ class RemoveQueueItemModal extends Component {
   resetState = function() {
     this.setState({
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     });
   };
 
@@ -47,6 +49,10 @@ class RemoveQueueItemModal extends Component {
     this.setState({ blocklist: value });
   };
 
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
+
   onRemoveConfirmed = () => {
     const state = this.state;
 
@@ -70,7 +76,7 @@ class RemoveQueueItemModal extends Component {
       isPending
     } = this.props;
 
-    const { remove, blocklist } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;
 
     return (
       <Modal
@@ -82,12 +88,12 @@ class RemoveQueueItemModal extends Component {
           onModalClose={this.onModalClose}
         >
           <ModalHeader>
-            {translate('Remove')} - {sourceTitle}
+            {translate('RemoveQueueItem', { sourceTitle })}
           </ModalHeader>
 
           <ModalBody>
             <div>
-              {translate('RemoveFromQueueText', [sourceTitle])}
+              {translate('RemoveQueueItemConfirmation', { sourceTitle })}
             </div>
 
             {
@@ -100,7 +106,7 @@ class RemoveQueueItemModal extends Component {
                     type={inputTypes.CHECK}
                     name="remove"
                     value={remove}
-                    helpTextWarning={translate('RemoveHelpTextWarning')}
+                    helpTextWarning={translate('RemoveFromDownloadClientHelpTextWarning')}
                     isDisabled={!canIgnore}
                     onChange={this.onRemoveChange}
                   />
@@ -109,15 +115,30 @@ class RemoveQueueItemModal extends Component {
 
             <FormGroup>
               <FormLabel>{translate('BlocklistRelease')}</FormLabel>
+
               <FormInputGroup
                 type={inputTypes.CHECK}
                 name="blocklist"
                 value={blocklist}
-                helpText={translate('BlocklistHelpText')}
+                helpText={translate('BlocklistReleaseHelpText')}
                 onChange={this.onBlocklistChange}
               />
             </FormGroup>
 
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
           </ModalBody>
 
           <ModalFooter>
@@ -129,7 +150,7 @@ class RemoveQueueItemModal extends Component {
               kind={kinds.DANGER}
               onPress={this.onRemoveConfirmed}
             >
-              Remove
+              {translate('Remove')}
             </Button>
           </ModalFooter>
         </ModalContent>

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -23,7 +23,8 @@ class RemoveQueueItemsModal extends Component {
 
     this.state = {
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     };
   }
 
@@ -33,7 +34,8 @@ class RemoveQueueItemsModal extends Component {
   resetState = function() {
     this.setState({
       remove: true,
-      blocklist: false
+      blocklist: false,
+      skipRedownload: false
     });
   };
 
@@ -48,6 +50,10 @@ class RemoveQueueItemsModal extends Component {
     this.setState({ blocklist: value });
   };
 
+  onSkipRedownloadChange = ({ value }) => {
+    this.setState({ skipRedownload: value });
+  };
+
   onRemoveConfirmed = () => {
     const state = this.state;
 
@@ -71,7 +77,7 @@ class RemoveQueueItemsModal extends Component {
       allPending
     } = this.props;
 
-    const { remove, blocklist } = this.state;
+    const { remove, blocklist, skipRedownload } = this.state;
 
     return (
       <Modal
@@ -88,7 +94,7 @@ class RemoveQueueItemsModal extends Component {
 
           <ModalBody>
             <div className={styles.message}>
-              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', selectedCount) : translate('RemoveSelectedItemQueueMessageText')}
+              {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', { selectedCount }) : translate('RemoveSelectedItemQueueMessageText')}
             </div>
 
             {
@@ -117,11 +123,25 @@ class RemoveQueueItemsModal extends Component {
                 type={inputTypes.CHECK}
                 name="blocklist"
                 value={blocklist}
-                helpText={translate('BlocklistHelpText')}
+                helpText={translate('BlocklistReleaseHelpText')}
                 onChange={this.onBlocklistChange}
               />
             </FormGroup>
 
+            {
+              blocklist ?
+                <FormGroup>
+                  <FormLabel>{translate('SkipRedownload')}</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipRedownload"
+                    value={skipRedownload}
+                    helpText={translate('SkipRedownloadHelpText')}
+                    onChange={this.onSkipRedownloadChange}
+                  />
+                </FormGroup> :
+                null
+            }
           </ModalBody>
 
           <ModalFooter>

frontend/src/Activity/Queue/TimeleftCell.js

@@ -27,7 +27,7 @@ function TimeleftCell(props) {
     return (
       <TableRowCell
         className={styles.timeleft}
-        title={translate('DelayingDownloadUntilInterp', [date, time])}
+        title={translate('DelayingDownloadUntil', { date, time })}
       >
         -
       </TableRowCell>
@@ -41,7 +41,7 @@ function TimeleftCell(props) {
     return (
       <TableRowCell
         className={styles.timeleft}
-        title={translate('RetryingDownloadInterp', [date, time])}
+        title={translate('RetryingDownloadOn', { date, time })}
       >
         -
       </TableRowCell>

frontend/src/AddMovie/AddNewMovie/AddNewMovie.js

@@ -155,7 +155,7 @@ class AddNewMovie extends Component {
             !isFetching && !error && !items.length && !!term &&
               <div className={styles.message}>
                 <div className={styles.noResults}>
-                  {translate('CouldNotFindResults', [term])}
+                  {translate('CouldNotFindResults', { term })}
                 </div>
                 <div>
                   {translate('YouCanAlsoSearch')}

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

@@ -119,7 +119,7 @@ class ImportMovie extends Component {
             rootFoldersPopulated &&
             !unmappedFolders.length ?
               <Alert kind={kinds.INFO}>
-                {translate('AllMoviesInPathHaveBeenImported', [path])}
+                {translate('AllMoviesInPathHaveBeenImported', { path })}
               </Alert> :
               null
           }

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

@@ -18,17 +18,17 @@ import styles from './ImportMovieSelectFolder.css';
 const rootFolderColumns = [
   {
     name: 'path',
-    label: translate('Path'),
+    label: () => translate('Path'),
     isVisible: true
   },
   {
     name: 'freeSpace',
-    label: translate('FreeSpace'),
+    label: () => translate('FreeSpace'),
     isVisible: true
   },
   {
     name: 'unmappedFolders',
-    label: translate('UnmappedFolders'),
+    label: () => translate('UnmappedFolders'),
     isVisible: true
   },
   {

frontend/src/App/AppRoutes.js

@@ -13,7 +13,7 @@ import Switch from 'Components/Router/Switch';
 import DiscoverMovieConnector from 'DiscoverMovie/DiscoverMovieConnector';
 import MovieDetailsPageConnector from 'Movie/Details/MovieDetailsPageConnector';
 import MovieIndex from 'Movie/Index/MovieIndex';
-import CustomFormatSettingsConnector from 'Settings/CustomFormats/CustomFormatSettingsConnector';
+import CustomFormatSettingsPage from 'Settings/CustomFormats/CustomFormatSettingsPage';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
 import ImportListSettingsConnector from 'Settings/ImportLists/ImportListSettingsConnector';
@@ -148,7 +148,7 @@ function AppRoutes(props) {
 
       <Route
         path="/settings/customformats"
-        component={CustomFormatSettingsConnector}
+        component={CustomFormatSettingsPage}
       />
 
       <Route

frontend/src/App/AppUpdatedModalContent.css

@@ -1,6 +1,7 @@
 .version {
   margin: 0 3px;
   font-weight: bold;
+  font-family: var(--defaultFontFamily);
 }
 
 .maintenance {

frontend/src/App/AppUpdatedModalContent.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -64,20 +65,20 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {translate('RadarrUpdated')}
+        {translate('AppUpdated', { appName: 'Radarr' })}
       </ModalHeader>
 
       <ModalBody>
-        <div dangerouslySetInnerHTML={{ __html: translate('VersionUpdateText', [`<span className=${styles.version}>${version}</span>`]) }} />
+        <div>
+          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Radarr', version })} blockClassName={styles.version} />
+        </div>
 
         {
           isPopulated && !error && !!update &&
             <div>
               {
                 !update.changes &&
-                  <div className={styles.maintenance}>
+                  <div className={styles.maintenance}>{translate('MaintenanceRelease')}</div>
-                    {translate('MaintenanceRelease')}
-                  </div>
               }
 
               {

frontend/src/App/ConnectionLostModal.js

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

frontend/src/App/State/AppState.ts

@@ -1,8 +1,14 @@
 import InteractiveImportAppState from 'App/State/InteractiveImportAppState';
+import CalendarAppState from './CalendarAppState';
+import CommandAppState from './CommandAppState';
+import MovieCollectionAppState from './MovieCollectionAppState';
 import MovieFilesAppState from './MovieFilesAppState';
 import MoviesAppState, { MovieIndexAppState } from './MoviesAppState';
+import ParseAppState from './ParseAppState';
 import QueueAppState from './QueueAppState';
+import RootFolderAppState from './RootFolderAppState';
 import SettingsAppState from './SettingsAppState';
+import SystemAppState from './SystemAppState';
 import TagsAppState from './TagsAppState';
 
 interface FilterBuilderPropOption {
@@ -38,13 +44,19 @@ export interface CustomFilter {
 }
 
 interface AppState {
-  movieFiles: MovieFilesAppState;
+  calendar: CalendarAppState;
+  commands: CommandAppState;
   interactiveImport: InteractiveImportAppState;
+  movieCollections: MovieCollectionAppState;
+  movieFiles: MovieFilesAppState;
   movieIndex: MovieIndexAppState;
-  settings: SettingsAppState;
   movies: MoviesAppState;
-  tags: TagsAppState;
+  parse: ParseAppState;
   queue: QueueAppState;
+  rootFolders: RootFolderAppState;
+  settings: SettingsAppState;
+  system: SystemAppState;
+  tags: TagsAppState;
 }
 
 export default AppState;

frontend/src/App/State/CalendarAppState.ts

@@ -0,0 +1,9 @@
+import AppSectionState from 'App/State/AppSectionState';
+import Movie from 'Movie/Movie';
+import { FilterBuilderProp } from './AppState';
+
+interface CalendarAppState extends AppSectionState<Movie> {
+  filterBuilderProps: FilterBuilderProp<Movie>[];
+}
+
+export default CalendarAppState;

frontend/src/App/State/CommandAppState.ts

@@ -0,0 +1,6 @@
+import AppSectionState from 'App/State/AppSectionState';
+import Command from 'Commands/Command';
+
+export type CommandAppState = AppSectionState<Command>;
+
+export default CommandAppState;

frontend/src/App/State/InteractiveImportAppState.ts

@@ -1,7 +1,7 @@
 import AppSectionState from 'App/State/AppSectionState';
 import RecentFolder from 'InteractiveImport/Folder/RecentFolder';
-import ImportMode from '../../InteractiveImport/ImportMode';
+import ImportMode from 'InteractiveImport/ImportMode';
-import InteractiveImport from '../../InteractiveImport/InteractiveImport';
+import InteractiveImport from 'InteractiveImport/InteractiveImport';
 
 interface InteractiveImportAppState extends AppSectionState<InteractiveImport> {
   originalItems: InteractiveImport[];

frontend/src/App/State/MovieCollectionAppState.ts

@@ -0,0 +1,6 @@
+import AppSectionState from 'App/State/AppSectionState';
+import MovieCollection from 'typings/MovieCollection';
+
+type MovieCollectionAppState = AppSectionState<MovieCollection>;
+
+export default MovieCollectionAppState;

frontend/src/App/State/MoviesAppState.ts

@@ -22,6 +22,9 @@ export interface MovieIndexAppState {
     showQualityProfile: boolean;
     showReleaseDate: boolean;
     showCinemaRelease: boolean;
+    showTmdbRating: boolean;
+    showImdbRating: boolean;
+    showRottenTomatoesRating: boolean;
     showSearchAction: boolean;
   };
 

frontend/src/App/State/ParseAppState.ts

@@ -0,0 +1,34 @@
+import ModelBase from 'App/ModelBase';
+import { AppSectionItemState } from 'App/State/AppSectionState';
+import Language from 'Language/Language';
+import Movie from 'Movie/Movie';
+import { QualityModel } from 'Quality/Quality';
+import CustomFormat from 'typings/CustomFormat';
+
+export interface ParsedMovieInfo {
+  releaseTitle: string;
+  originalTitle: string;
+  movieTitle: string;
+  movieTitles: string[];
+  year: number;
+  quality: QualityModel;
+  languages: Language[];
+  releaseHash: string;
+  releaseGroup?: string;
+  edition?: string;
+  tmdbId?: number;
+  imdbId?: string;
+}
+
+export interface ParseModel extends ModelBase {
+  title: string;
+  parsedMovieInfo: ParsedMovieInfo;
+  movie?: Movie;
+  languages?: Language[];
+  customFormats?: CustomFormat[];
+  customFormatScore?: number;
+}
+
+type ParseAppState = AppSectionItemState<ParseModel>;
+
+export default ParseAppState;

frontend/src/App/State/RootFolderAppState.ts

@@ -0,0 +1,12 @@
+import AppSectionState, {
+  AppSectionDeleteState,
+  AppSectionSaveState,
+} from 'App/State/AppSectionState';
+import RootFolder from 'typings/RootFolder';
+
+interface RootFolderAppState
+  extends AppSectionState<RootFolder>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+export default RootFolderAppState;

frontend/src/App/State/SettingsAppState.ts

@@ -1,5 +1,6 @@
 import AppSectionState, {
   AppSectionDeleteState,
+  AppSectionItemState,
   AppSectionSaveState,
   AppSectionSchemaState,
 } from 'App/State/AppSectionState';
@@ -7,6 +8,7 @@ import Language from 'Language/Language';
 import DownloadClient from 'typings/DownloadClient';
 import ImportList from 'typings/ImportList';
 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';
@@ -34,17 +36,19 @@ export interface QualityProfilesAppState
   extends AppSectionState<QualityProfile>,
     AppSectionSchemaState<QualityProfile> {}
 
+export type IndexerFlagSettingsAppState = AppSectionState<IndexerFlag>;
 export type LanguageSettingsAppState = AppSectionState<Language>;
-export type UiSettingsAppState = AppSectionState<UiSettings>;
+export type UiSettingsAppState = AppSectionItemState<UiSettings>;
 
 interface SettingsAppState {
   downloadClients: DownloadClientAppState;
   importLists: ImportListAppState;
+  indexerFlags: IndexerFlagSettingsAppState;
   indexers: IndexerAppState;
+  languages: LanguageSettingsAppState;
   notifications: NotificationAppState;
-  language: LanguageSettingsAppState;
-  uiSettings: UiSettingsAppState;
   qualityProfiles: QualityProfilesAppState;
+  ui: UiSettingsAppState;
 }
 
 export default SettingsAppState;

frontend/src/App/State/SystemAppState.ts

@@ -0,0 +1,10 @@
+import SystemStatus from 'typings/SystemStatus';
+import { AppSectionItemState } from './AppSectionState';
+
+export type SystemStatusAppState = AppSectionItemState<SystemStatus>;
+
+interface SystemAppState {
+  status: SystemStatusAppState;
+}
+
+export default SystemAppState;

frontend/src/App/State/TagsAppState.ts

@@ -1,12 +1,32 @@
 import ModelBase from 'App/ModelBase';
 import AppSectionState, {
   AppSectionDeleteState,
+  AppSectionSaveState,
 } from 'App/State/AppSectionState';
 
 export interface Tag extends ModelBase {
   label: string;
 }
 
-interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {}
+export interface TagDetail extends ModelBase {
+  label: string;
+  autoTagIds: number[];
+  delayProfileIds: number[];
+  downloadClientIds: number[];
+  importListIds: number[];
+  indexerIds: number[];
+  movieIds: number[];
+  notificationIds: number[];
+  restrictionIds: number[];
+}
+
+export interface TagDetailAppState
+  extends AppSectionState<TagDetail>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {
+  details: TagDetailAppState;
+}
 
 export default TagsAppState;

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -1,17 +1,28 @@
 .event {
-  display: flex;
+  position: relative;
-  overflow-x: hidden;
   padding: 5px;
   border-bottom: 1px solid var(--borderColor);
-  font-size: $defaultFontSize;
+}
+
+.underlay {
+  @add-mixin cover;
 
   &:hover {
     background-color: var(--tableRowHoverBackgroundColor);
   }
 }
 
-.link {
+.overlay {
-  composes: link from '~Calendar/Events/CalendarEvent.css';
+  @add-mixin linkOverlay;
+
+  position: relative;
+  display: flex;
+  overflow-x: hidden;
+  font-size: $defaultFontSize;
+
+  &:global(.colorImpaired) {
+    border-left-width: 5px;
+  }
 }
 
 .eventWrapper {
@@ -44,6 +55,8 @@
 
 .statusIcon {
   margin-left: 3px;
+  cursor: default;
+  pointer-events: all;
 }
 
 /*
@@ -95,6 +108,8 @@
   }
 }
 
-.dateIcon {
+.releaseIcon {
+  margin-right: 20px;
   width: 25px;
+  text-align: right;
 }

frontend/src/Calendar/Agenda/AgendaEvent.css.d.ts

@@ -3,18 +3,19 @@
 interface CssExports {
   'continuing': string;
   'date': string;
-  'dateIcon': string;
   'downloaded': string;
   'event': string;
   'eventWrapper': string;
   'genres': string;
-  'link': string;
   'missingMonitored': string;
   'missingUnmonitored': string;
   'movieTitle': string;
+  'overlay': string;
   'queue': string;
+  'releaseIcon': string;
   'statusIcon': string;
   'time': string;
+  'underlay': string;
   'unmonitored': string;
 }
 export const cssExports: CssExports;

frontend/src/Calendar/Agenda/AgendaEvent.js

@@ -87,25 +87,24 @@ class AgendaEvent extends Component {
     const link = `/movie/${titleSlug}`;
 
     return (
-      <div>
+      <div className={styles.event}>
         <Link
-          className={classNames(
+          className={styles.underlay}
-            styles.event,
-            styles.link
-          )}
           to={link}
-        >
+        />
-          <div className={styles.dateIcon}>
+
+        <div className={styles.overlay}>
+          <div className={styles.date}>
+            {(showDate) ? startTime.format(longDateFormat) : null}
+          </div>
+
+          <div className={styles.releaseIcon}>
             <Icon
               name={releaseIcon}
               kind={kinds.DEFAULT}
             />
           </div>
 
-          <div className={styles.date}>
-            {(showDate) ? startTime.format(longDateFormat) : null}
-          </div>
-
           <div
             className={classNames(
               styles.eventWrapper,
@@ -143,9 +142,7 @@ class AgendaEvent extends Component {
             }
 
             {
-              showCutoffUnmetIcon &&
+              showCutoffUnmetIcon && !!movieFile && movieFile.qualityCutoffNotMet &&
-              !!movieFile &&
-              movieFile.qualityCutoffNotMet &&
                 <Icon
                   className={styles.statusIcon}
                   name={icons.MOVIE_FILE}
@@ -154,7 +151,7 @@ class AgendaEvent extends Component {
                 />
             }
           </div>
-        </Link>
+        </div>
       </div>
     );
   }

frontend/src/Calendar/CalendarFilterModal.tsx

@@ -0,0 +1,56 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import FilterModal from 'Components/Filter/FilterModal';
+import { setCalendarFilter } from 'Store/Actions/calendarActions';
+
+function createCalendarSelector() {
+  return createSelector(
+    (state: AppState) => state.calendar.items,
+    (calendar) => {
+      return calendar;
+    }
+  );
+}
+
+function createFilterBuilderPropsSelector() {
+  return createSelector(
+    (state: AppState) => state.calendar.filterBuilderProps,
+    (filterBuilderProps) => {
+      return filterBuilderProps;
+    }
+  );
+}
+
+interface SeriesIndexFilterModalProps {
+  isOpen: boolean;
+}
+
+export default function CalendarFilterModal(
+  props: SeriesIndexFilterModalProps
+) {
+  const sectionItems = useSelector(createCalendarSelector());
+  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
+  const customFilterType = 'calendar';
+
+  const dispatch = useDispatch();
+
+  const dispatchSetFilter = useCallback(
+    (payload: unknown) => {
+      dispatch(setCalendarFilter(payload));
+    },
+    [dispatch]
+  );
+
+  return (
+    <FilterModal
+      // TODO: Don't spread all the props
+      {...props}
+      sectionItems={sectionItems}
+      filterBuilderProps={filterBuilderProps}
+      customFilterType={customFilterType}
+      dispatchSetFilter={dispatchSetFilter}
+    />
+  );
+}

frontend/src/Calendar/CalendarPage.js

@@ -14,6 +14,7 @@ import NoMovie from 'Movie/NoMovie';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
 import CalendarConnector from './CalendarConnector';
+import CalendarFilterModal from './CalendarFilterModal';
 import CalendarLinkModal from './iCal/CalendarLinkModal';
 import LegendConnector from './Legend/LegendConnector';
 import CalendarOptionsModal from './Options/CalendarOptionsModal';
@@ -83,6 +84,7 @@ class CalendarPage extends Component {
       movieIsFetching,
       movieIsPopulated,
       missingMovieIds,
+      customFilters,
       isRssSyncExecuting,
       isSearchingForMissing,
       useCurrentPage,
@@ -137,7 +139,8 @@ class CalendarPage extends Component {
               isDisabled={!hasMovie}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={[]}
+              customFilters={customFilters}
+              filterModalConnectorComponent={CalendarFilterModal}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -208,6 +211,7 @@ CalendarPage.propTypes = {
   movieIsFetching: PropTypes.bool.isRequired,
   movieIsPopulated: PropTypes.bool.isRequired,
   missingMovieIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   isRssSyncExecuting: PropTypes.bool.isRequired,
   isSearchingForMissing: PropTypes.bool.isRequired,
   useCurrentPage: PropTypes.bool.isRequired,

frontend/src/Calendar/CalendarPageConnector.js

@@ -5,6 +5,7 @@ import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
 import { searchMissing, setCalendarDaysCount, setCalendarFilter } from 'Store/Actions/calendarActions';
 import { executeCommand } from 'Store/Actions/commandActions';
+import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createCommandsSelector from 'Store/Selectors/createCommandsSelector';
 import createMovieCountSelector from 'Store/Selectors/createMovieCountSelector';
@@ -59,6 +60,7 @@ function createMapStateToProps() {
   return createSelector(
     (state) => state.calendar.selectedFilterKey,
     (state) => state.calendar.filters,
+    createCustomFiltersSelector('calendar'),
     createMovieCountSelector(),
     createUISettingsSelector(),
     createMissingMovieIdsSelector(),
@@ -67,6 +69,7 @@ function createMapStateToProps() {
     (
       selectedFilterKey,
       filters,
+      customFilters,
       movieCount,
       uiSettings,
       missingMovieIds,
@@ -76,6 +79,7 @@ function createMapStateToProps() {
       return {
         selectedFilterKey,
         filters,
+        customFilters,
         colorImpairedMode: uiSettings.enableColorImpairedMode,
         hasMovie: !!movieCount.count,
         movieError: movieCount.error,

frontend/src/Calendar/Events/CalendarEvent.css

@@ -1,9 +1,22 @@
+$fullColorGradient: rgba(244, 245, 246, 0.2);
+
 .event {
-  overflow-x: hidden;
+  position: relative;
   margin: 4px 2px;
   padding: 5px;
   border-bottom: 1px solid var(--calendarBorderColor);
   border-left: 4px solid var(--calendarBorderColor);
+}
+
+.underlay {
+  @add-mixin cover;
+}
+
+.overlay {
+  @add-mixin linkOverlay;
+
+  position: relative;
+  overflow-x: hidden;
   font-size: 12px;
 
   &:global(.colorImpaired) {
@@ -11,18 +24,6 @@
   }
 }
 
-.link {
-  composes: link from '~Components/Link/Link.css';
-
-  display: block;
-  color: var(--defaultColor);
-
-  &:hover {
-    color: var(--defaultColor);
-    text-decoration: none;
-  }
-}
-
 .info,
 .movieInfo {
   display: flex;
@@ -44,8 +45,15 @@
   font-size: $defaultFontSize;
 }
 
+.statusContainer {
+  display: flex;
+  align-items: center;
+}
+
 .statusIcon {
   margin-left: 3px;
+  cursor: default;
+  pointer-events: all;
 }
 
 /*
@@ -55,35 +63,84 @@
 .downloaded {
   border-left-color: var(--successColor) !important;
 
+  &:global(.fullColor) {
+    background-color: rgba(39, 194, 76, 0.4) !important;
+  }
+
   &:global(.colorImpaired) {
-    border-left-color: color(var(--successColor), saturation(+15%)) !important;
+    border-left-color: color(#27c24c saturation(+15%)) !important;
   }
 }
 
 .queue {
   border-left-color: var(--purple) !important;
+
+  &:global(.fullColor) {
+    background-color: rgba(122, 67, 182, 0.4) !important;
+  }
 }
 
 .unmonitored {
   border-left-color: var(--gray) !important;
+
+  &:global(.fullColor) {
+    background-color: rgba(173, 173, 173, 0.5) !important;
+  }
+
+  &:global(.colorImpaired) {
+    background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  }
+
+  &:global(.fullColor.colorImpaired) {
+    background: repeating-linear-gradient(45deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
+  }
 }
 
 .missingUnmonitored {
   border-left-color: var(--warningColor) !important;
 
+  &:global(.fullColor) {
+    background-color: rgba(255, 165, 0, 0.6) !important;
+  }
+
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+    background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  }
+
+  &:global(.fullColor.colorImpaired) {
+    background: repeating-linear-gradient(90deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
   }
 }
 
 .missingMonitored {
   border-left-color: var(--dangerColor) !important;
 
+  &:global(.fullColor) {
+    background-color: rgba(240, 80, 80, 0.6) !important;
+  }
+
   &:global(.colorImpaired) {
+    border-left-color: color(#f05050 saturation(+15%)) !important;
     background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
   }
+
+  &:global(.fullColor.colorImpaired) {
+    background: repeating-linear-gradient(90deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
+  }
 }
 
 .continuing {
   border-left-color: var(--primaryColor) !important;
+
+  &:global(.fullColor) {
+    background-color: rgba(93, 156, 236, 0.4) !important;
+  }
+
+  &:global(.colorImpaired) {
+    background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  }
+
+  &:global(.fullColor.colorImpaired) {
+    background: repeating-linear-gradient(90deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
+  }
 }

frontend/src/Calendar/Events/CalendarEvent.css.d.ts

@@ -6,13 +6,15 @@ interface CssExports {
   'event': string;
   'genres': string;
   'info': string;
-  'link': string;
   'missingMonitored': string;
   'missingUnmonitored': string;
   'movieInfo': string;
   'movieTitle': string;
+  'overlay': string;
   'queue': string;
+  'statusContainer': string;
   'statusIcon': string;
+  'underlay': string;
   'unmonitored': string;
 }
 export const cssExports: CssExports;

frontend/src/Calendar/Events/CalendarEvent.js

@@ -32,6 +32,7 @@ class CalendarEvent extends Component {
       queueItem,
       showMovieInformation,
       showCutoffUnmetIcon,
+      fullColorEvents,
       colorImpairedMode,
       date
     } = this.props;
@@ -56,64 +57,71 @@ class CalendarEvent extends Component {
     }
 
     return (
-      <div>
+      <div
+        className={classNames(
+          styles.event,
+          styles[statusStyle],
+          colorImpairedMode && 'colorImpaired',
+          fullColorEvents && 'fullColor'
+        )}
+      >
         <Link
-          className={classNames(
+          className={styles.underlay}
-            styles.event,
-            styles.link,
-            styles[statusStyle],
-            colorImpairedMode && 'colorImpaired'
-          )}
-          // component="div"
           to={link}
-        >
+        />
+
+        <div className={styles.overlay} >
           <div className={styles.info}>
             <div className={styles.movieTitle}>
               {title}
             </div>
 
-            {
+            <div className={styles.statusContainer}>
-              !!queueItem &&
+              {
-                <span className={styles.statusIcon}>
+                queueItem ?
-                  <CalendarEventQueueDetails
+                  <span className={styles.statusIcon}>
-                    {...queueItem}
+                    <CalendarEventQueueDetails
-                  />
+                      {...queueItem}
-                </span>
+                    />
-            }
+                  </span> :
+                  null
+              }
 
-            {
+              {
-              !queueItem && grabbed &&
+                !queueItem && grabbed ?
-                <Icon
+                  <Icon
-                  className={styles.statusIcon}
+                    className={styles.statusIcon}
-                  name={icons.DOWNLOADING}
+                    name={icons.DOWNLOADING}
-                  title={translate('MovieIsDownloading')}
+                    title={translate('MovieIsDownloading')}
-                />
+                  /> :
-            }
+                  null
+              }
 
-            {
+              {
-              showCutoffUnmetIcon &&
+                showCutoffUnmetIcon && !!movieFile && movieFile.qualityCutoffNotMet ?
-              !!movieFile &&
+                  <Icon
-              movieFile.qualityCutoffNotMet &&
+                    className={styles.statusIcon}
-                <Icon
+                    name={icons.MOVIE_FILE}
-                  className={styles.statusIcon}
+                    kind={kinds.WARNING}
-                  name={icons.MOVIE_FILE}
+                    title={translate('QualityCutoffHasNotBeenMet')}
-                  kind={kinds.WARNING}
+                  /> :
-                  title={translate('QualityCutoffHasNotBeenMet')}
+                  null
-                />
+              }
-            }
+            </div>
           </div>
 
           {
-            showMovieInformation &&
+            showMovieInformation ?
               <div className={styles.movieInfo}>
                 <div className={styles.genres}>
                   {joinedGenres}
                 </div>
-              </div>
+              </div> :
+              null
           }
 
           {
-            showMovieInformation &&
+            showMovieInformation ?
               <div className={styles.movieInfo}>
                 <div className={styles.genres}>
                   {eventType.join(', ')}
@@ -121,10 +129,10 @@ class CalendarEvent extends Component {
                 <div>
                   {certification}
                 </div>
-              </div>
+              </div> :
+              null
           }
-        </Link>
+        </div>
-
       </div>
     );
   }
@@ -147,6 +155,7 @@ CalendarEvent.propTypes = {
   queueItem: PropTypes.object,
   showMovieInformation: PropTypes.bool.isRequired,
   showCutoffUnmetIcon: PropTypes.bool.isRequired,
+  fullColorEvents: PropTypes.bool.isRequired,
   timeFormat: PropTypes.string.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired,
   date: PropTypes.string.isRequired

frontend/src/Calendar/Events/CalendarEventQueueDetails.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import QueueDetails from 'Activity/Queue/QueueDetails';
 import CircularProgressBar from 'Components/CircularProgressBar';
-import translate from 'Utilities/String/translate';
 
 function CalendarEventQueueDetails(props) {
   const {
@@ -13,6 +12,7 @@ function CalendarEventQueueDetails(props) {
     status,
     trackedDownloadState,
     trackedDownloadStatus,
+    statusMessages,
     errorMessage
   } = props;
 
@@ -27,16 +27,15 @@ function CalendarEventQueueDetails(props) {
       status={status}
       trackedDownloadState={trackedDownloadState}
       trackedDownloadStatus={trackedDownloadStatus}
+      statusMessages={statusMessages}
       errorMessage={errorMessage}
       progressBar={
-        <div title={translate('MovieIsDownloadingInterp', [progress.toFixed(1), title])}>
+        <CircularProgressBar
-          <CircularProgressBar
+          progress={progress}
-            progress={progress}
+          size={20}
-            size={20}
+          strokeWidth={2}
-            strokeWidth={2}
+          strokeColor={'#7a43b6'}
-            strokeColor={'#7a43b6'}
+        />
-          />
-        </div>
       }
     />
   );
@@ -50,6 +49,7 @@ CalendarEventQueueDetails.propTypes = {
   status: PropTypes.string.isRequired,
   trackedDownloadState: PropTypes.string.isRequired,
   trackedDownloadStatus: PropTypes.string.isRequired,
+  statusMessages: PropTypes.arrayOf(PropTypes.object),
   errorMessage: PropTypes.string
 };
 

frontend/src/Calendar/Legend/Legend.js

@@ -8,18 +8,21 @@ import styles from './Legend.css';
 
 function Legend(props) {
   const {
+    view,
     showCutoffUnmetIcon,
+    fullColorEvents,
     colorImpairedMode
   } = props;
 
   const iconsToShow = [];
+  const isAgendaView = view === 'agenda';
 
   if (showCutoffUnmetIcon) {
     iconsToShow.push(
       <LegendIconItem
         name={translate('CutoffUnmet')}
         icon={icons.MOVIE_FILE}
-        kind={kinds.WARNING}
+        kind={fullColorEvents ? kinds.DEFAULT : kinds.WARNING}
         tooltip={translate('QualityOrLangCutoffHasNotBeenMet')}
       />
     );
@@ -29,45 +32,58 @@ function Legend(props) {
     <div className={styles.legend}>
       <div>
         <LegendItem
-          style='ended'
+          status="downloaded"
           name={translate('DownloadedAndMonitored')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
-          style='availNotMonitored'
+          status="unmonitored"
           name={translate('DownloadedButNotMonitored')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
 
       <div>
         <LegendItem
-          style='missingMonitored'
+          status="missingMonitored"
           name={translate('MissingMonitoredAndConsideredAvailable')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
-          style='missingUnmonitored'
+          status="missingUnmonitored"
           name={translate('MissingNotMonitored')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
 
       <div>
         <LegendItem
-          style='queue'
+          status="queue"
           name={translate('Queued')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
-          style='continuing'
+          status="continuing"
           name={translate('Unreleased')}
+          isAgendaView={isAgendaView}
+          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
+
       {
         iconsToShow.length > 0 &&
           <div>
@@ -79,7 +95,9 @@ function Legend(props) {
 }
 
 Legend.propTypes = {
+  view: PropTypes.string.isRequired,
   showCutoffUnmetIcon: PropTypes.bool.isRequired,
+  fullColorEvents: PropTypes.bool.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired
 };
 

frontend/src/Calendar/Legend/LegendConnector.js

@@ -6,10 +6,12 @@ import Legend from './Legend';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.calendar.options,
+    (state) => state.calendar.view,
     createUISettingsSelector(),
-    (calendarOptions, uiSettings) => {
+    (calendarOptions, view, uiSettings) => {
       return {
         ...calendarOptions,
+        view,
         colorImpairedMode: uiSettings.enableColorImpairedMode
       };
     }

frontend/src/Calendar/Legend/LegendIconItem.js

@@ -8,6 +8,7 @@ function LegendIconItem(props) {
     name,
     icon,
     kind,
+    darken,
     tooltip
   } = props;
 
@@ -19,6 +20,7 @@ function LegendIconItem(props) {
       <Icon
         className={styles.icon}
         name={icon}
+        darken={darken}
         kind={kind}
       />
 
@@ -31,7 +33,12 @@ LegendIconItem.propTypes = {
   name: PropTypes.string.isRequired,
   icon: PropTypes.object.isRequired,
   kind: PropTypes.string.isRequired,
+  darken: PropTypes.bool.isRequired,
   tooltip: PropTypes.string.isRequired
 };
 
+LegendIconItem.defaultProps = {
+  darken: false
+};
+
 export default LegendIconItem;

frontend/src/Calendar/Legend/LegendItem.css

@@ -1,74 +1,37 @@
-.legendItemContainer {
-  margin-right: 5px;
-  width: 220px;
-}
-
 .legendItem {
-  display: inline-flex;
+  margin: 3px 0;
-  margin-top: -1px;
+  margin-right: 6px;
-  vertical-align: middle;
+  padding-left: 5px;
-  line-height: 16px;
+  width: 220px;
+  border-left-width: 4px;
+  border-left-style: solid;
+  cursor: default;
 }
 
-.legendItemColor {
+/*
-  margin-right: 8px;
+ * Status
-  width: 30px;
+ */
-  height: 16px;
+
-  border-radius: 4px;
+.downloaded {
+  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
 }
 
 .queue {
-  composes: legendItemColor;
+  composes: queue from '~Calendar/Events/CalendarEvent.css';
-
-  background-color: var(--queueColor);
 }
 
-.continuing {
+.unmonitored {
-  composes: legendItemColor;
+  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
-
-  background-color: var(--primaryColor);
-}
-
-.availNotMonitored {
-  composes: legendItemColor;
-
-  background-color: var(--darkGray);
-}
-
-.ended {
-  composes: legendItemColor;
-
-  background-color: var(--successColor);
-}
-
-.missingMonitored {
-  composes: legendItemColor;
-
-  background-color: var(--dangerColor);
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color(var(--dangerColor) shade(5%)), color(var(--dangerColor) shade(5%)) 5px, color(var(--dangerColor) shade(15%)) 5px, color(var(--dangerColor) shade(15%)) 10px);
-  }
 }
 
 .missingUnmonitored {
-  composes: legendItemColor;
+  composes: missingUnmonitored from '~Calendar/Events/CalendarEvent.css';
-
-  background-color: var(--warningColor);
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, color(var(--warningColor) tint(15%)) 5px, color(var(--warningColor) tint(15%)) 10px);
-  }
 }
 
-.missingMonitoredColorImpaired {
+.missingMonitored {
-  background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  composes: missingMonitored from '~Calendar/Events/CalendarEvent.css';
 }
 
-.missingUnmonitoredColorImpaired {
+.continuing {
-  background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  composes: continuing from '~Calendar/Events/CalendarEvent.css';
-}
-
-.legendItemText {
-  display: inline-block;
 }

frontend/src/Calendar/Legend/LegendItem.css.d.ts

@@ -1,18 +1,13 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'availNotMonitored': string;
   'continuing': string;
-  'ended': string;
+  'downloaded': string;
   'legendItem': string;
-  'legendItemColor': string;
-  'legendItemContainer': string;
-  'legendItemText': string;
   'missingMonitored': string;
-  'missingMonitoredColorImpaired': string;
   'missingUnmonitored': string;
-  'missingUnmonitoredColorImpaired': string;
   'queue': string;
+  'unmonitored': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/Calendar/Legend/LegendItem.js

@@ -6,29 +6,31 @@ import styles from './LegendItem.css';
 function LegendItem(props) {
   const {
     name,
-    style,
+    status,
+    isAgendaView,
+    fullColorEvents,
     colorImpairedMode
   } = props;
 
   return (
-    <div className={styles.legendItemContainer}>
+    <div
-      <div
+      className={classNames(
-        className={classNames(
+        styles.legendItem,
-          styles.legendItem,
+        styles[status],
-          styles[style],
+        colorImpairedMode && 'colorImpaired',
-          colorImpairedMode && 'colorImpaired'
+        fullColorEvents && !isAgendaView && 'fullColor'
-        )}
+      )}
-      />
+    >
-      <div className={classNames(styles.legendItemText, colorImpairedMode && styles[`${style}ColorImpaired`])}>
+      {name}
-        {name}
-      </div>
     </div>
   );
 }
 
 LegendItem.propTypes = {
   name: PropTypes.string.isRequired,
-  style: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  isAgendaView: PropTypes.bool.isRequired,
+  fullColorEvents: PropTypes.bool.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired
 };
 

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

@@ -26,14 +26,16 @@ class CalendarOptionsModalContent extends Component {
       firstDayOfWeek,
       calendarWeekColumnHeader,
       timeFormat,
-      enableColorImpairedMode
+      enableColorImpairedMode,
+      fullColorEvents
     } = props;
 
     this.state = {
       firstDayOfWeek,
       calendarWeekColumnHeader,
       timeFormat,
-      enableColorImpairedMode
+      enableColorImpairedMode,
+      fullColorEvents
     };
   }
 
@@ -94,6 +96,7 @@ class CalendarOptionsModalContent extends Component {
     const {
       showMovieInformation,
       showCutoffUnmetIcon,
+      fullColorEvents,
       onModalClose
     } = this.props;
 
@@ -136,6 +139,18 @@ class CalendarOptionsModalContent extends Component {
                   onChange={this.onOptionInputChange}
                 />
               </FormGroup>
+
+              <FormGroup>
+                <FormLabel>{translate('FullColorEvents')}</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.CHECK}
+                  name="fullColorEvents"
+                  value={fullColorEvents}
+                  helpText={translate('FullColorEventsHelpText')}
+                  onChange={this.onOptionInputChange}
+                />
+              </FormGroup>
             </Form>
           </FieldSet>
 
@@ -176,7 +191,9 @@ class CalendarOptionsModalContent extends Component {
                   value={timeFormat}
                   onChange={this.onGlobalInputChange}
                 />
-              </FormGroup><FormGroup>
+              </FormGroup>
+
+              <FormGroup>
                 <FormLabel>{translate('EnableColorImpairedMode')}</FormLabel>
 
                 <FormInputGroup
@@ -187,7 +204,6 @@ class CalendarOptionsModalContent extends Component {
                   onChange={this.onGlobalInputChange}
                 />
               </FormGroup>
-
             </Form>
           </FieldSet>
         </ModalBody>
@@ -209,6 +225,7 @@ CalendarOptionsModalContent.propTypes = {
   calendarWeekColumnHeader: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
   enableColorImpairedMode: PropTypes.bool.isRequired,
+  fullColorEvents: PropTypes.bool.isRequired,
   dispatchSetCalendarOption: PropTypes.func.isRequired,
   dispatchSaveUISettings: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired

frontend/src/Collection/AddNewCollectionMovieModalContentConnector.js

@@ -28,7 +28,7 @@ function createMapStateToProps() {
         qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         searchForMovie: collection.searchOnAdd,
-        tags: []
+        tags: collection.tags || []
       };
 
       const {

frontend/src/Collection/CollectionItemConnector.js

@@ -2,17 +2,12 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector';
 import createCollectionSelector from 'Store/Selectors/createCollectionSelector';
 
 function createMapStateToProps() {
   return createSelector(
     createCollectionSelector(),
-    createAllMoviesSelector(),
+    (collection) => {
-    (
-      collection,
-      allMovies
-    ) => {
       // If a movie is deleted this selector may fire before the parent
       // selecors, which will result in an undefined movie, if that happens
       // we want to return early here and again in the render function to avoid
@@ -22,21 +17,11 @@ function createMapStateToProps() {
         return {};
       }
 
-      let allGenres = [];
+      const allGenres = collection.movies.flatMap((movie) => movie.genres);
-      let libraryMovies = 0;
-
-      collection.movies.forEach((movie) => {
-        allGenres = allGenres.concat(movie.genres);
-
-        if (allMovies.find((libraryMovie) => libraryMovie.tmdbId === movie.tmdbId)) {
-          libraryMovies++;
-        }
-      });
 
       return {
         ...collection,
-        genres: Array.from(new Set(allGenres)).slice(0, 3),
+        genres: Array.from(new Set(allGenres)).slice(0, 3)
-        missingMovies: collection.movies.length - libraryMovies
       };
     }
   );

frontend/src/Collection/Edit/EditCollectionModalContent.js

@@ -50,6 +50,7 @@ class EditCollectionModalContent extends Component {
       minimumAvailability,
       // Id,
       rootFolderPath,
+      tags,
       searchOnAdd
     } = item;
 
@@ -126,6 +127,17 @@ class EditCollectionModalContent extends Component {
                   />
                 </FormGroup>
 
+                <FormGroup>
+                  <FormLabel>{translate('Tags')}</FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.TAG}
+                    name="tags"
+                    onChange={onInputChange}
+                    {...tags}
+                  />
+                </FormGroup>
+
                 <FormGroup>
                   <FormLabel>{translate('SearchOnAdd')}</FormLabel>
 

frontend/src/Collection/Edit/EditCollectionModalContentConnector.js

@@ -42,6 +42,7 @@ function createMapStateToProps() {
         qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         rootFolderPath: collection.rootFolderPath,
+        tags: collection.tags,
         searchOnAdd: collection.searchOnAdd
       };
 

frontend/src/Collection/Menus/CollectionSortMenu.js

@@ -28,6 +28,14 @@ function CollectionSortMenu(props) {
         >
           {translate('Title')}
         </SortMenuItem>
+        <SortMenuItem
+          name="missingMovies"
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onPress={onSortSelect}
+        >
+          {translate('Missing')}
+        </SortMenuItem>
       </MenuContent>
     </SortMenu>
   );

frontend/src/Collection/Overview/CollectionMovie.css

@@ -102,7 +102,7 @@ $hoverScale: 1.05;
 
   position: relative;
   display: block;
-  background-color: var(--defaultColor);
+  background-color: var(--black);
 }
 
 .monitorToggleButton {

frontend/src/Collection/Overview/CollectionOverviews.js

@@ -258,7 +258,7 @@ CollectionOverviews.propTypes = {
   sortKey: PropTypes.string,
   overviewOptions: PropTypes.object.isRequired,
   jumpToCharacter: PropTypes.string,
-  scrollTop: PropTypes.number.isRequired,
+  scrollTop: PropTypes.number,
   scroller: PropTypes.instanceOf(Element).isRequired,
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,

frontend/src/Collection/Overview/Options/CollectionOverviewOptionsModalContent.js

@@ -14,9 +14,24 @@ import { inputTypes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 
 const posterSizeOptions = [
-  { key: 'small', value: translate('Small') },
+  {
-  { key: 'medium', value: translate('Medium') },
+    key: 'small',
-  { key: 'large', value: translate('Large') }
+    get value() {
+      return translate('Small');
+    }
+  },
+  {
+    key: 'medium',
+    get value() {
+      return translate('Medium');
+    }
+  },
+  {
+    key: 'large',
+    get value() {
+      return translate('Large');
+    }
+  }
 ];
 
 class CollectionOverviewOptionsModalContent extends Component {

frontend/src/Components/DescriptionList/DescriptionListItem.js

@@ -10,6 +10,7 @@ class DescriptionListItem extends Component {
 
   render() {
     const {
+      className,
       titleClassName,
       descriptionClassName,
       title,
@@ -17,7 +18,7 @@ class DescriptionListItem extends Component {
     } = this.props;
 
     return (
-      <div>
+      <div className={className}>
         <DescriptionListItemTitle
           className={titleClassName}
         >
@@ -35,6 +36,7 @@ class DescriptionListItem extends Component {
 }
 
 DescriptionListItem.propTypes = {
+  className: PropTypes.string,
   titleClassName: PropTypes.string,
   descriptionClassName: PropTypes.string,
   title: PropTypes.string,

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -20,12 +20,12 @@ import styles from './FileBrowserModalContent.css';
 const columns = [
   {
     name: 'type',
-    label: translate('Type'),
+    label: () => translate('Type'),
     isVisible: true
   },
   {
     name: 'name',
-    label: translate('Name'),
+    label: () => translate('Name'),
     isVisible: true
   }
 ];

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

@@ -10,12 +10,42 @@ import { NAME } from './FilterBuilderRowValue';
 import styles from './DateFilterBuilderRowValue.css';
 
 const timeOptions = [
-  { key: 'seconds', value: translate('Seconds') },
+  {
-  { key: 'minutes', value: translate('Minutes') },
+    key: 'seconds',
-  { key: 'hours', value: translate('Hours') },
+    get value() {
-  { key: 'days', value: translate('Days') },
+      return translate('Seconds');
-  { key: 'weeks', value: translate('Weeks') },
+    }
-  { key: 'months', value: translate('Months') }
+  },
+  {
+    key: 'minutes',
+    get value() {
+      return translate('Minutes');
+    }
+  },
+  {
+    key: 'hours',
+    get value() {
+      return translate('Hours');
+    }
+  },
+  {
+    key: 'days',
+    get value() {
+      return translate('Days');
+    }
+  },
+  {
+    key: 'weeks',
+    get value() {
+      return translate('Weeks');
+    }
+  },
+  {
+    key: 'months',
+    get value() {
+      return translate('Months');
+    }
+  }
 ];
 
 function isInFilter(filterType) {

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

@@ -210,11 +210,13 @@ class FilterBuilderRow extends Component {
     const selectedFilterBuilderProp = this.selectedFilterBuilderProp;
 
     const keyOptions = filterBuilderProps.map((availablePropFilter) => {
+      const { name, label } = availablePropFilter;
+
       return {
-        key: availablePropFilter.name,
+        key: name,
-        value: availablePropFilter.label
+        value: typeof label === 'function' ? label() : label
       };
-    });
+    }).sort((a, b) => a.value.localeCompare(b.value));
 
     const ValueComponent = getRowValueConnector(selectedFilterBuilderProp);
 

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

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import TagInputTag from 'Components/Form/TagInputTag';
 import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './FilterBuilderRowValueTag.css';
 
 function FilterBuilderRowValueTag(props) {
@@ -15,10 +16,11 @@ function FilterBuilderRowValueTag(props) {
       />
 
       {
-        !props.isLastTag &&
+        props.isLastTag ?
-          <span className={styles.or}>
+          null :
-            or
+          <div className={styles.or}>
-          </span>
+            {translate('Or')}
+          </div>
       }
     </span>
   );

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

@@ -3,9 +3,24 @@ import translate from 'Utilities/String/translate';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 const protocols = [
-  { id: 'announced', name: translate('Announced') },
+  {
-  { id: 'inCinemas', name: translate('InCinemas') },
+    id: 'announced',
-  { id: 'released', name: translate('Released') }
+    get name() {
+      return translate('Announced');
+    }
+  },
+  {
+    id: 'inCinemas',
+    get name() {
+      return translate('InCinemas');
+    }
+  },
+  {
+    id: 'released',
+    get name() {
+      return translate('Released');
+    }
+  }
 ];
 
 function MinimumAvailabilityFilterBuilderRowValue(props) {

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

@@ -4,10 +4,30 @@ import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 const protocols = [
   { id: 'tba', name: 'TBA' },
-  { id: 'announced', name: translate('Announced') },
+  {
-  { id: 'inCinemas', name: translate('InCinemas') },
+    id: 'announced',
-  { id: 'released', name: translate('Released') },
+    get name() {
-  { id: 'deleted', name: translate('Deleted') }
+      return translate('Announced');
+    }
+  },
+  {
+    id: 'inCinemas',
+    get name() {
+      return translate('InCinemas');
+    }
+  },
+  {
+    id: 'released',
+    get name() {
+      return translate('Released');
+    }
+  },
+  {
+    id: 'deleted',
+    get name() {
+      return translate('Deleted');
+    }
+  }
 ];
 
 function ReleaseStatusFilterBuilderRowValue(props) {

frontend/src/Components/Form/AvailabilitySelectInput.js

@@ -4,9 +4,24 @@ import translate from 'Utilities/String/translate';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 const availabilityOptions = [
-  { key: 'announced', value: translate('Announced') },
+  {
-  { key: 'inCinemas', value: translate('InCinemas') },
+    key: 'announced',
-  { key: 'released', value: translate('Released') }
+    get value() {
+      return translate('Announced');
+    }
+  },
+  {
+    key: 'inCinemas',
+    get value() {
+      return translate('InCinemas');
+    }
+  },
+  {
+    key: 'released',
+    get value() {
+      return translate('Released');
+    }
+  }
 ];
 
 function AvailabilitySelectInput(props) {
@@ -20,7 +35,7 @@ function AvailabilitySelectInput(props) {
   if (includeNoChange) {
     values.unshift({
       key: 'noChange',
-      value: 'No Change',
+      value: translate('NoChange'),
       disabled: true
     });
   }

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -580,7 +580,7 @@ EnhancedSelectInput.propTypes = {
   className: PropTypes.string,
   disabledClassName: PropTypes.string,
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.number)]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.string), PropTypes.arrayOf(PropTypes.number)]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   isDisabled: PropTypes.bool.isRequired,
   isFetching: PropTypes.bool.isRequired,

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -9,6 +9,10 @@
   &:hover {
     background-color: var(--inputHoverBackgroundColor);
   }
+
+  &.isDisabled {
+    cursor: not-allowed;
+  }
 }
 
 .optionCheck {

frontend/src/Components/Form/FormInputGroup.js

@@ -12,7 +12,8 @@ import DownloadClientSelectInputConnector from './DownloadClientSelectInputConne
 import EnhancedSelectInput from './EnhancedSelectInput';
 import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
 import FormInputHelpText from './FormInputHelpText';
-import IndexerFlagsSelectInputConnector from './IndexerFlagsSelectInputConnector';
+import IndexerFlagsSelectInput from './IndexerFlagsSelectInput';
+import IndexerSelectInputConnector from './IndexerSelectInputConnector';
 import KeyValueListInput from './KeyValueListInput';
 import LanguageSelectInputConnector from './LanguageSelectInputConnector';
 import MovieMonitoredSelectInput from './MovieMonitoredSelectInput';
@@ -65,6 +66,9 @@ function getComponent(type) {
     case inputTypes.QUALITY_PROFILE_SELECT:
       return QualityProfileSelectInputConnector;
 
+    case inputTypes.INDEXER_SELECT:
+      return IndexerSelectInputConnector;
+
     case inputTypes.MOVIE_MONITORED_SELECT:
       return MovieMonitoredSelectInput;
 
@@ -72,7 +76,7 @@ function getComponent(type) {
       return RootFolderSelectInputConnector;
 
     case inputTypes.INDEXER_FLAGS_SELECT:
-      return IndexerFlagsSelectInputConnector;
+      return IndexerFlagsSelectInput;
 
     case inputTypes.DOWNLOAD_CLIENT_SELECT:
       return DownloadClientSelectInputConnector;

frontend/src/Components/Form/IndexerFlagsSelectInput.tsx

@@ -0,0 +1,60 @@
+import React, { useCallback } from 'react';
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+interface IndexerFlagsSelectInputProps {
+  name: string;
+  indexerFlags: number;
+  onChange(payload: object): void;
+}
+
+const selectIndexerFlagsValues = (selectedFlags: number) =>
+  createSelector(
+    (state: AppState) => state.settings.indexerFlags,
+    (indexerFlags) => {
+      const value = indexerFlags.items
+        .filter(
+          // eslint-disable-next-line no-bitwise
+          (item) => (selectedFlags & item.id) === item.id
+        )
+        .map(({ id }) => id);
+
+      const values = indexerFlags.items.map(({ id, name }) => ({
+        key: id,
+        value: name,
+      }));
+
+      return {
+        value,
+        values,
+      };
+    }
+  );
+
+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/IndexerFlagsSelectInputConnector.js

@@ -1,70 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import EnhancedSelectInput from './EnhancedSelectInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { indexerFlags }) => indexerFlags,
-    (state) => state.settings.indexerFlags,
-    (selectedFlags, indexerFlags) => {
-      const value = [];
-
-      indexerFlags.items.forEach((item) => {
-        // eslint-disable-next-line no-bitwise
-        if ((selectedFlags & item.id) === item.id) {
-          value.push(item.id);
-        }
-      });
-
-      const values = indexerFlags.items.map(({ id, name }) => {
-        return {
-          key: id,
-          value: name
-        };
-      });
-
-      return {
-        value,
-        values
-      };
-    }
-  );
-}
-
-class IndexerFlagsSelectInputConnector extends Component {
-
-  onChange = ({ name, value }) => {
-    let indexerFlags = 0;
-
-    value.forEach((flagId) => {
-      indexerFlags += flagId;
-    });
-
-    this.props.onChange({ name, value: indexerFlags });
-  };
-
-  //
-  // Render
-
-  render() {
-
-    return (
-      <EnhancedSelectInput
-        {...this.props}
-        onChange={this.onChange}
-      />
-    );
-  }
-}
-
-IndexerFlagsSelectInputConnector.propTypes = {
-  name: PropTypes.string.isRequired,
-  indexerFlags: PropTypes.number.isRequired,
-  value: PropTypes.arrayOf(PropTypes.number).isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps)(IndexerFlagsSelectInputConnector);

frontend/src/Components/Form/IndexerSelectInputConnector.js

@@ -0,0 +1,93 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { fetchIndexers } from 'Store/Actions/settingsActions';
+import sortByName from 'Utilities/Array/sortByName';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.indexers,
+    (state, { includeAny }) => includeAny,
+    (indexers, includeAny) => {
+      const {
+        isFetching,
+        isPopulated,
+        error,
+        items
+      } = indexers;
+
+      const values = items.sort(sortByName).map((indexer) => ({
+        key: indexer.id,
+        value: indexer.name
+      }));
+
+      if (includeAny) {
+        values.unshift({
+          key: 0,
+          value: '(Any)'
+        });
+      }
+
+      return {
+        isFetching,
+        isPopulated,
+        error,
+        values
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchIndexers: fetchIndexers
+};
+
+class IndexerSelectInputConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    if (!this.props.isPopulated) {
+      this.props.dispatchFetchIndexers();
+    }
+  }
+
+  //
+  // Listeners
+
+  onChange = ({ name, value }) => {
+    this.props.onChange({ name, value: parseInt(value) });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EnhancedSelectInput
+        {...this.props}
+        onChange={this.onChange}
+      />
+    );
+  }
+}
+
+IndexerSelectInputConnector.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  name: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+  values: PropTypes.arrayOf(PropTypes.object).isRequired,
+  includeAny: PropTypes.bool.isRequired,
+  onChange: PropTypes.func.isRequired,
+  dispatchFetchIndexers: PropTypes.func.isRequired
+};
+
+IndexerSelectInputConnector.defaultProps = {
+  includeAny: false
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(IndexerSelectInputConnector);