Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Fixer <ygj59783@zslsz.com>
Co-authored-by: Havok Dan <havokdan@yahoo.com.br>
Co-authored-by: Robert A. Viana <robert.abreu@outlook.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: w2861 <hfagfc@163.com>
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ar/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/bg/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ca/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/cs/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/da/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/de/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/el/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/es/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/fi/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/fr/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/he/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/hi/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/hr/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/hu/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/id/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/is/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/it/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ja/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ko/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/nb_NO/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/nl/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pl/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pt/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/pt_BR/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ro/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/ru/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/sk/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/sv/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/th/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/tr/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/uk/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/vi/
Translate-URL: https://translate.servarr.com/projects/servarr/prowlarr/zh_CN/
Translation: Servarr/Prowlarr

README.md

@@ -29,7 +29,6 @@ Prowlarr is an indexer manager/proxy built on the popular \*arr .net/reactjs bas
 
 [![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/prowlarr)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://prowlarr.com/discord)
-[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/Prowlarr)
 
 Note: GitHub Issues are for Bugs and Feature Requests Only
 

azure-pipelines.yml

@@ -9,15 +9,15 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.7.4'
+  majorVersion: '1.8.3'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
   sentryOrg: 'servarr'
   sentryUrl: 'https://sentry.servarr.com'
   dotnetVersion: '6.0.408'
+  nodeVersion: '16.X'
   innoVersion: '6.2.0'
-  nodeVersion: '16.x'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
   macImage: 'macOS-11'
@@ -27,6 +27,10 @@ trigger:
     include:
     - develop
     - master
+  paths:
+    exclude:
+      - .github
+      - src/Prowlarr.Api.*/openapi.json
 
 pr:
   branches:
@@ -34,8 +38,9 @@ pr:
     - develop
   paths:
     exclude:
+    - .github
     - src/NzbDrone.Core/Localization/Core
-    - src/Prowlarr.API.*/openapi.json
+    - src/Prowlarr.Api.*/openapi.json
 
 stages:
   - stage: Setup
@@ -349,7 +354,7 @@ stages:
           includeRootFolder: false
           rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
       - task: ArchiveFiles@2
-        displayName: Create FreeBSD Core Core tar
+        displayName: Create freebsd-x64 tar
         inputs:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).freebsd-core-x64.tar.gz'
           archiveType: 'tar'
@@ -528,8 +533,8 @@ stages:
           testRunTitle: '$(testName) Unit Tests'
           failTaskOnFailedTests: true
           
-    - job: Unit_LinuxCore_Postgres
-      displayName: Unit Native LinuxCore with Postgres Database
+    - job: Unit_LinuxCore_Postgres14
+      displayName: Unit Native LinuxCore with Postgres14 Database
       dependsOn: Prepare
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
@@ -565,6 +570,7 @@ stages:
           -e POSTGRES_PASSWORD=prowlarr \
           -e POSTGRES_USER=prowlarr \
           -p 5432:5432/tcp \
+          -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
           postgres:14
         displayName: Start postgres
       - bash: |
@@ -577,7 +583,60 @@ 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: 'Prowlarr.*.linux-core-x64.tar.gz'
+        artifactName: linux-x64-tests
+        Prowlarr__Postgres__Host: 'localhost'
+        Prowlarr__Postgres__Port: '5432'
+        Prowlarr__Postgres__User: 'prowlarr'
+        Prowlarr__Postgres__Password: 'prowlarr'
+  
+      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: find ${TESTSFOLDER} -name "Prowlarr.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=prowlarr \
+          -e POSTGRES_USER=prowlarr \
+          -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
@@ -663,8 +722,8 @@ stages:
           failTaskOnFailedTests: true
         displayName: Publish Test Results
 
-    - job: Integration_LinuxCore_Postgres
-      displayName: Integration Native LinuxCore with Postgres Database
+    - job: Integration_LinuxCore_Postgres14
+      displayName: Integration Native LinuxCore with Postgres14 Database
       dependsOn: Prepare
       condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
       variables:
@@ -710,6 +769,7 @@ stages:
             -e POSTGRES_PASSWORD=prowlarr \
             -e POSTGRES_USER=prowlarr \
             -p 5432:5432/tcp \
+            -v /usr/share/zoneinfo/America/Chicago:/etc/localtime:ro \
             postgres:14
           displayName: Start postgres
         - bash: |
@@ -720,7 +780,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: 'Prowlarr.*.linux-core-x64.tar.gz'
+        Prowlarr__Postgres__Host: 'localhost'
+        Prowlarr__Postgres__Port: '5432'
+        Prowlarr__Postgres__User: 'prowlarr'
+        Prowlarr__Postgres__Password: 'prowlarr'
+
+      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/Prowlarr/. ./bin/
+          displayName: Move Package Contents
+        - bash: |
+            docker run -d --name=postgres15 \
+            -e POSTGRES_PASSWORD=prowlarr \
+            -e POSTGRES_USER=prowlarr \
+            -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
 
@@ -1003,7 +1126,7 @@ stages:
           git add .
           if git status | grep -q modified
           then
-            git commit -am 'Automated API Docs update [skip ci]'
+            git commit -am 'Automated API Docs update'
             git push -f --set-upstream origin api-docs
             curl -X POST -H "Authorization: token ${GITHUBTOKEN}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/prowlarr/prowlarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
           else

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

@@ -26,7 +26,8 @@ module.exports = {
   globals: {
     expect: false,
     chai: false,
-    sinon: false
+    sinon: false,
+    JSX: true
   },
 
   parserOptions: {

frontend/build/webpack.config.js

@@ -35,7 +35,7 @@ module.exports = (env) => {
     },
 
     entry: {
-      index: 'index.js'
+      index: 'index.ts'
     },
 
     resolve: {
@@ -96,7 +96,8 @@ module.exports = (env) => {
       new HtmlWebpackPlugin({
         template: 'frontend/src/index.ejs',
         filename: 'index.html',
-        publicPath: '/'
+        publicPath: '/',
+        inject: false
       }),
 
       new FileManagerPlugin({

frontend/src/App/App.js

@@ -7,13 +7,13 @@ import PageConnector from 'Components/Page/PageConnector';
 import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';
 
-function App({ store, history, hasTranslationsError }) {
+function App({ store, history }) {
   return (
     <DocumentTitle title={window.Prowlarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
           <ApplyTheme>
-            <PageConnector hasTranslationsError={hasTranslationsError}>
+            <PageConnector>
               <AppRoutes app={App} />
             </PageConnector>
           </ApplyTheme>
@@ -25,8 +25,7 @@ function App({ store, history, hasTranslationsError }) {
 
 App.propTypes = {
   store: PropTypes.object.isRequired,
-  history: PropTypes.object.isRequired,
-  hasTranslationsError: PropTypes.bool.isRequired
+  history: PropTypes.object.isRequired
 };
 
 export default App;

frontend/src/App/AppRoutes.js

@@ -5,9 +5,9 @@ import NotFound from 'Components/NotFound';
 import Switch from 'Components/Router/Switch';
 import HistoryConnector from 'History/HistoryConnector';
 import IndexerIndex from 'Indexer/Index/IndexerIndex';
-import StatsConnector from 'Indexer/Stats/StatsConnector';
+import IndexerStats from 'Indexer/Stats/IndexerStats';
 import SearchIndexConnector from 'Search/SearchIndexConnector';
-import ApplicationSettingsConnector from 'Settings/Applications/ApplicationSettingsConnector';
+import ApplicationSettings from 'Settings/Applications/ApplicationSettings';
 import DevelopmentSettingsConnector from 'Settings/Development/DevelopmentSettingsConnector';
 import DownloadClientSettingsConnector from 'Settings/DownloadClients/DownloadClientSettingsConnector';
 import GeneralSettingsConnector from 'Settings/General/GeneralSettingsConnector';
@@ -60,7 +60,7 @@ function AppRoutes(props) {
 
       <Route
         path="/indexers/stats"
-        component={StatsConnector}
+        component={IndexerStats}
       />
 
       {/*
@@ -98,7 +98,7 @@ function AppRoutes(props) {
 
       <Route
         path="/settings/applications"
-        component={ApplicationSettingsConnector}
+        component={ApplicationSettings}
       />
 
       <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,12 +65,12 @@ function AppUpdatedModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        Prowlarr Updated
+        {translate('AppUpdated', { appName: 'Prowlarr' })}
       </ModalHeader>
 
       <ModalBody>
         <div>
-          Version <span className={styles.version}>{version}</span> of Prowlarr has been installed, in order to get the latest changes you'll need to reload Prowlarr.
+          <InlineMarkdown data={translate('AppUpdatedVersion', { appName: 'Prowlarr', version })} blockClassName={styles.version} />
         </div>
 
         {
@@ -77,16 +78,14 @@ function AppUpdatedModalContent(props) {
             <div>
               {
                 !update.changes &&
-                  <div className={styles.maintenance}>
-                    {translate('MaintenanceRelease')}
-                  </div>
+                  <div className={styles.maintenance}>{translate('MaintenanceRelease')}</div>
               }
 
               {
                 !!update.changes &&
                   <div>
                     <div className={styles.changes}>
-                      What's new?
+                      {translate('WhatsNew')}
                     </div>
 
                     <UpdateChanges
@@ -113,14 +112,14 @@ function AppUpdatedModalContent(props) {
         <Button
           onPress={onSeeChangesPress}
         >
-          Recent Changes
+          {translate('RecentChanges')}
         </Button>
 
         <Button
           kind={kinds.PRIMARY}
           onPress={onModalClose}
         >
-          Reload
+          {translate('Reload')}
         </Button>
       </ModalFooter>
     </ModalContent>

frontend/src/App/ConnectionLostModal.js

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

frontend/src/App/State/AppState.ts

@@ -1,5 +1,11 @@
-import IndexerAppState, { IndexerIndexAppState } from './IndexerAppState';
+import CommandAppState from './CommandAppState';
+import IndexerAppState, {
+  IndexerIndexAppState,
+  IndexerStatusAppState,
+} from './IndexerAppState';
+import IndexerStatsAppState from './IndexerStatsAppState';
 import SettingsAppState from './SettingsAppState';
+import SystemAppState from './SystemAppState';
 import TagsAppState from './TagsAppState';
 
 interface FilterBuilderPropOption {
@@ -35,9 +41,13 @@ export interface CustomFilter {
 }
 
 interface AppState {
+  commands: CommandAppState;
   indexerIndex: IndexerIndexAppState;
+  indexerStats: IndexerStatsAppState;
+  indexerStatus: IndexerStatusAppState;
   indexers: IndexerAppState;
   settings: SettingsAppState;
+  system: SystemAppState;
   tags: TagsAppState;
 }
 

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/IndexerAppState.ts

@@ -1,6 +1,6 @@
 import Column from 'Components/Table/Column';
 import SortDirection from 'Helpers/Props/SortDirection';
-import Indexer from 'Indexer/Indexer';
+import Indexer, { IndexerStatus } from 'Indexer/Indexer';
 import AppSectionState, {
   AppSectionDeleteState,
   AppSectionSaveState,
@@ -28,6 +28,10 @@ export interface IndexerIndexAppState {
 interface IndexerAppState
   extends AppSectionState<Indexer>,
     AppSectionDeleteState,
-    AppSectionSaveState {}
+    AppSectionSaveState {
+  itemMap: Record<number, number>;
+}
+
+export type IndexerStatusAppState = AppSectionState<IndexerStatus>;
 
 export default IndexerAppState;

frontend/src/App/State/IndexerStatsAppState.ts

@@ -0,0 +1,11 @@
+import { AppSectionItemState } from 'App/State/AppSectionState';
+import { Filter } from 'App/State/AppState';
+import { IndexerStats } from 'typings/IndexerStats';
+
+export interface IndexerStatsAppState
+  extends AppSectionItemState<IndexerStats> {
+  selectedFilterKey: string;
+  filters: Filter[];
+}
+
+export default IndexerStatsAppState;

frontend/src/App/State/ReleaseAppState.ts

@@ -0,0 +1,10 @@
+import AppSectionState, {
+  AppSectionDeleteState,
+} from 'App/State/AppSectionState';
+import Release from 'typings/Release';
+
+interface ReleaseAppState
+  extends AppSectionState<Release>,
+    AppSectionDeleteState {}
+
+export default ReleaseAppState;

frontend/src/App/State/SettingsAppState.ts

@@ -1,5 +1,6 @@
 import AppSectionState, {
   AppSectionDeleteState,
+  AppSectionItemState,
   AppSectionSaveState,
 } from 'App/State/AppSectionState';
 import Application from 'typings/Application';
@@ -7,11 +8,18 @@ import DownloadClient from 'typings/DownloadClient';
 import Notification from 'typings/Notification';
 import { UiSettings } from 'typings/UiSettings';
 
-export interface ApplicationAppState
+export interface AppProfileAppState
   extends AppSectionState<Application>,
     AppSectionDeleteState,
     AppSectionSaveState {}
 
+export interface ApplicationAppState
+  extends AppSectionState<Application>,
+    AppSectionDeleteState,
+    AppSectionSaveState {
+  isTestingAll: boolean;
+}
+
 export interface DownloadClientAppState
   extends AppSectionState<DownloadClient>,
     AppSectionDeleteState,
@@ -21,13 +29,14 @@ export interface NotificationAppState
   extends AppSectionState<Notification>,
     AppSectionDeleteState {}
 
-export type UiSettingsAppState = AppSectionState<UiSettings>;
+export type UiSettingsAppState = AppSectionItemState<UiSettings>;
 
 interface SettingsAppState {
+  appProfiles: AppProfileAppState;
   applications: ApplicationAppState;
   downloadClients: DownloadClientAppState;
   notifications: NotificationAppState;
-  uiSettings: UiSettingsAppState;
+  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,28 @@
 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;
+  applicationIds: number[];
+  indexerIds: number[];
+  indexerProxyIds: number[];
+  notificationIds: number[];
+}
+
+export interface TagDetailAppState
+  extends AppSectionState<TagDetail>,
+    AppSectionDeleteState,
+    AppSectionSaveState {}
+
+interface TagsAppState extends AppSectionState<Tag>, AppSectionDeleteState {
+  details: TagDetailAppState;
+}
 
 export default TagsAppState;

frontend/src/Commands/Command.ts

@@ -0,0 +1,37 @@
+import ModelBase from 'App/ModelBase';
+
+export interface CommandBody {
+  sendUpdatesToClient: boolean;
+  updateScheduledTask: boolean;
+  completionMessage: string;
+  requiresDiskAccess: boolean;
+  isExclusive: boolean;
+  isLongRunning: boolean;
+  name: string;
+  lastExecutionTime: string;
+  lastStartTime: string;
+  trigger: string;
+  suppressMessages: boolean;
+  seriesId?: number;
+}
+
+interface Command extends ModelBase {
+  name: string;
+  commandName: string;
+  message: string;
+  body: CommandBody;
+  priority: string;
+  status: string;
+  result: string;
+  queued: string;
+  started: string;
+  ended: string;
+  duration: string;
+  trigger: string;
+  stateChangeTime: string;
+  sendUpdatesToClient: boolean;
+  updateScheduledTask: boolean;
+  lastExecutionTime: string;
+}
+
+export default Command;

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

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

frontend/src/Components/Form/FormInputGroup.js

@@ -270,6 +270,7 @@ FormInputGroup.propTypes = {
   helpTexts: PropTypes.arrayOf(PropTypes.string),
   helpTextWarning: PropTypes.string,
   helpLink: PropTypes.string,
+  autoFocus: PropTypes.bool,
   includeNoChange: PropTypes.bool,
   includeNoChangeDisabled: PropTypes.bool,
   selectedValueOptions: PropTypes.object,

frontend/src/Components/Form/HintedSelectInputOption.js

@@ -33,7 +33,7 @@ function HintedSelectInputOption(props) {
         isMobile && styles.isMobile
       )}
       >
-        <div>{value}</div>
+        <div>{typeof value === 'function' ? value() : value}</div>
 
         {
           hint != null &&
@@ -48,7 +48,7 @@ function HintedSelectInputOption(props) {
 
 HintedSelectInputOption.propTypes = {
   id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  value: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   hint: PropTypes.node,
   depth: PropTypes.number,
   isSelected: PropTypes.bool.isRequired,

frontend/src/Components/Form/IndexersSelectInputConnector.js

@@ -3,13 +3,15 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
+import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
+import sortByName from 'Utilities/Array/sortByName';
 import titleCase from 'Utilities/String/titleCase';
 import EnhancedSelectInput from './EnhancedSelectInput';
 
 function createMapStateToProps() {
   return createSelector(
     (state, { value }) => value,
-    (state) => state.indexers,
+    createSortedSectionSelector('indexers', sortByName),
     (value, indexers) => {
       const values = [];
       const groupedIndexers = map(groupBy(indexers.items, 'protocol'), (val, key) => ({ protocol: key, indexers: val }));

frontend/src/Components/Form/NumberInput.js

@@ -41,7 +41,7 @@ class NumberInput extends Component {
   componentDidUpdate(prevProps, prevState) {
     const { value } = this.props;
 
-    if (value !== prevProps.value && !this.state.isFocused) {
+    if (!isNaN(value) && value !== prevProps.value && !this.state.isFocused) {
       this.setState({
         value: value == null ? '' : value.toString()
       });

frontend/src/Components/Form/PathInputConnector.js

@@ -68,6 +68,7 @@ class PathInputConnector extends Component {
 }
 
 PathInputConnector.propTypes = {
+  ...PathInput.props,
   includeFiles: PropTypes.bool.isRequired,
   dispatchFetchPaths: PropTypes.func.isRequired,
   dispatchClearPaths: PropTypes.func.isRequired

frontend/src/Components/Form/SelectInput.js

@@ -61,7 +61,7 @@ class SelectInput extends Component {
                 value={key}
                 {...otherOptionProps}
               >
-                {optionValue}
+                {typeof optionValue === 'function' ? optionValue() : optionValue}
               </option>
             );
           })
@@ -75,7 +75,7 @@ SelectInput.propTypes = {
   className: PropTypes.string,
   disabledClassName: PropTypes.string,
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.func]).isRequired,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   isDisabled: PropTypes.bool,
   hasError: PropTypes.bool,

frontend/src/Components/Icon.js

@@ -41,7 +41,7 @@ class Icon extends PureComponent {
       return (
         <span
           className={containerClassName}
-          title={title}
+          title={typeof title === 'function' ? title() : title}
         >
           {icon}
         </span>
@@ -58,7 +58,7 @@ Icon.propTypes = {
   name: PropTypes.object.isRequired,
   kind: PropTypes.string.isRequired,
   size: PropTypes.number.isRequired,
-  title: PropTypes.string,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   isSpinning: PropTypes.bool.isRequired,
   fixedWidth: PropTypes.bool.isRequired
 };

frontend/src/Components/Link/SpinnerErrorButton.js

@@ -97,6 +97,7 @@ class SpinnerErrorButton extends Component {
 
   render() {
     const {
+      kind,
       isSpinning,
       error,
       children,
@@ -112,7 +113,7 @@ class SpinnerErrorButton extends Component {
     const showIcon = wasSuccessful || hasWarning || hasError;
 
     let iconName = icons.CHECK;
-    let iconKind = kinds.SUCCESS;
+    let iconKind = kind === kinds.PRIMARY ? kinds.DEFAULT : kinds.SUCCESS;
 
     if (hasWarning) {
       iconName = icons.WARNING;
@@ -126,6 +127,7 @@ class SpinnerErrorButton extends Component {
 
     return (
       <SpinnerButton
+        kind={kind}
         isSpinning={isSpinning}
         {...otherProps}
       >
@@ -154,6 +156,7 @@ class SpinnerErrorButton extends Component {
 }
 
 SpinnerErrorButton.propTypes = {
+  kind: PropTypes.oneOf(kinds.all),
   isSpinning: PropTypes.bool.isRequired,
   error: PropTypes.object,
   children: PropTypes.node.isRequired

frontend/src/Components/Markdown/InlineMarkdown.js

@@ -10,27 +10,55 @@ class InlineMarkdown extends Component {
   render() {
     const {
       className,
-      data
+      data,
+      blockClassName
     } = this.props;
 
-    // For now only replace links
+    // For now only replace links or code blocks (not both)
     const markdownBlocks = [];
     if (data) {
-      const regex = RegExp(/\[(.+?)\]\((.+?)\)/g);
+      const linkRegex = RegExp(/\[(.+?)\]\((.+?)\)/g);
 
       let endIndex = 0;
       let match = null;
-      while ((match = regex.exec(data)) !== null) {
+
+      while ((match = linkRegex.exec(data)) !== null) {
         if (match.index > endIndex) {
           markdownBlocks.push(data.substr(endIndex, match.index - endIndex));
         }
+
         markdownBlocks.push(<Link key={match.index} to={match[2]}>{match[1]}</Link>);
         endIndex = match.index + match[0].length;
       }
 
-      if (endIndex !== data.length) {
+      if (endIndex !== data.length && markdownBlocks.length > 0) {
         markdownBlocks.push(data.substr(endIndex, data.length - endIndex));
       }
+
+      const codeRegex = RegExp(/(?=`)`(?!`)[^`]*(?=`)`(?!`)/g);
+
+      endIndex = 0;
+      match = null;
+      let matchedCode = false;
+
+      while ((match = codeRegex.exec(data)) !== null) {
+        matchedCode = true;
+
+        if (match.index > endIndex) {
+          markdownBlocks.push(data.substr(endIndex, match.index - endIndex));
+        }
+
+        markdownBlocks.push(<code key={`code-${match.index}`} className={blockClassName ?? null}>{match[0].substring(1, match[0].length - 1)}</code>);
+        endIndex = match.index + match[0].length;
+      }
+
+      if (endIndex !== data.length && markdownBlocks.length > 0 && matchedCode) {
+        markdownBlocks.push(data.substr(endIndex, data.length - endIndex));
+      }
+
+      if (markdownBlocks.length === 0) {
+        markdownBlocks.push(data);
+      }
     }
 
     return <span className={className}>{markdownBlocks}</span>;
@@ -39,7 +67,8 @@ class InlineMarkdown extends Component {
 
 InlineMarkdown.propTypes = {
   className: PropTypes.string,
-  data: PropTypes.string
+  data: PropTypes.string,
+  blockClassName: PropTypes.string
 };
 
 export default InlineMarkdown;

frontend/src/Components/Menu/FilterMenuContent.js

@@ -33,7 +33,7 @@ class FilterMenuContent extends Component {
                 selectedFilterKey={selectedFilterKey}
                 onPress={onFilterSelect}
               >
-                {filter.label}
+                {typeof filter.label === 'function' ? filter.label() : filter.label}
               </FilterMenuItem>
             );
           })

frontend/src/Components/Page/ErrorPage.js

@@ -7,7 +7,7 @@ function ErrorPage(props) {
   const {
     version,
     isLocalStorageSupported,
-    hasTranslationsError,
+    translationsError,
     indexersError,
     indexerStatusError,
     indexerCategoriesError,
@@ -22,8 +22,8 @@ function ErrorPage(props) {
 
   if (!isLocalStorageSupported) {
     errorMessage = 'Local Storage is not supported or disabled. A plugin or private browsing may have disabled it.';
-  } else if (hasTranslationsError) {
-    errorMessage = 'Failed to load translations from API';
+  } else if (translationsError) {
+    errorMessage = getErrorMessage(translationsError, 'Failed to load translations from API');
   } else if (indexersError) {
     errorMessage = getErrorMessage(indexersError, 'Failed to load indexers from API');
   } else if (indexerStatusError) {
@@ -58,7 +58,7 @@ function ErrorPage(props) {
 ErrorPage.propTypes = {
   version: PropTypes.string.isRequired,
   isLocalStorageSupported: PropTypes.bool.isRequired,
-  hasTranslationsError: PropTypes.bool.isRequired,
+  translationsError: PropTypes.object,
   indexersError: PropTypes.object,
   indexerStatusError: PropTypes.object,
   indexerCategoriesError: PropTypes.object,

frontend/src/Components/Page/PageConnector.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import { createSelector } from 'reselect';
-import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
+import { fetchTranslations, saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
 import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
 import { fetchIndexers } from 'Store/Actions/indexerActions';
 import { fetchIndexerStatus } from 'Store/Actions/indexerStatusActions';
@@ -54,6 +54,7 @@ const selectIsPopulated = createSelector(
   (state) => state.indexerStatus.isPopulated,
   (state) => state.settings.indexerCategories.isPopulated,
   (state) => state.system.status.isPopulated,
+  (state) => state.app.translations.isPopulated,
   (
     customFiltersIsPopulated,
     tagsIsPopulated,
@@ -63,7 +64,8 @@ const selectIsPopulated = createSelector(
     indexersIsPopulated,
     indexerStatusIsPopulated,
     indexerCategoriesIsPopulated,
-    systemStatusIsPopulated
+    systemStatusIsPopulated,
+    translationsIsPopulated
   ) => {
     return (
       customFiltersIsPopulated &&
@@ -74,7 +76,8 @@ const selectIsPopulated = createSelector(
       indexersIsPopulated &&
       indexerStatusIsPopulated &&
       indexerCategoriesIsPopulated &&
-      systemStatusIsPopulated
+      systemStatusIsPopulated &&
+      translationsIsPopulated
     );
   }
 );
@@ -89,6 +92,7 @@ const selectErrors = createSelector(
   (state) => state.indexerStatus.error,
   (state) => state.settings.indexerCategories.error,
   (state) => state.system.status.error,
+  (state) => state.app.translations.error,
   (
     customFiltersError,
     tagsError,
@@ -98,7 +102,8 @@ const selectErrors = createSelector(
     indexersError,
     indexerStatusError,
     indexerCategoriesError,
-    systemStatusError
+    systemStatusError,
+    translationsError
   ) => {
     const hasError = !!(
       customFiltersError ||
@@ -109,7 +114,8 @@ const selectErrors = createSelector(
       indexersError ||
       indexerStatusError ||
       indexerCategoriesError ||
-      systemStatusError
+      systemStatusError ||
+      translationsError
     );
 
     return {
@@ -122,7 +128,8 @@ const selectErrors = createSelector(
       indexersError,
       indexerStatusError,
       indexerCategoriesError,
-      systemStatusError
+      systemStatusError,
+      translationsError
     };
   }
 );
@@ -184,6 +191,9 @@ function createMapDispatchToProps(dispatch, props) {
     dispatchFetchStatus() {
       dispatch(fetchStatus());
     },
+    dispatchFetchTranslations() {
+      dispatch(fetchTranslations());
+    },
     onResize(dimensions) {
       dispatch(saveDimensions(dimensions));
     },
@@ -217,6 +227,7 @@ class PageConnector extends Component {
       this.props.dispatchFetchUISettings();
       this.props.dispatchFetchGeneralSettings();
       this.props.dispatchFetchStatus();
+      this.props.dispatchFetchTranslations();
     }
   }
 
@@ -232,7 +243,6 @@ class PageConnector extends Component {
 
   render() {
     const {
-      hasTranslationsError,
       isPopulated,
       hasError,
       dispatchFetchTags,
@@ -243,15 +253,15 @@ class PageConnector extends Component {
       dispatchFetchUISettings,
       dispatchFetchGeneralSettings,
       dispatchFetchStatus,
+      dispatchFetchTranslations,
       ...otherProps
     } = this.props;
 
-    if (hasTranslationsError || hasError || !this.state.isLocalStorageSupported) {
+    if (hasError || !this.state.isLocalStorageSupported) {
       return (
         <ErrorPage
           {...this.state}
           {...otherProps}
-          hasTranslationsError={hasTranslationsError}
         />
       );
     }
@@ -272,7 +282,6 @@ class PageConnector extends Component {
 }
 
 PageConnector.propTypes = {
-  hasTranslationsError: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   hasError: PropTypes.bool.isRequired,
   isSidebarVisible: PropTypes.bool.isRequired,
@@ -285,6 +294,7 @@ PageConnector.propTypes = {
   dispatchFetchUISettings: PropTypes.func.isRequired,
   dispatchFetchGeneralSettings: PropTypes.func.isRequired,
   dispatchFetchStatus: PropTypes.func.isRequired,
+  dispatchFetchTranslations: PropTypes.func.isRequired,
   onSidebarVisibleChange: PropTypes.func.isRequired
 };
 

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

@@ -20,12 +20,12 @@ const SIDEBAR_WIDTH = parseInt(dimensions.sidebarWidth);
 const links = [
   {
     iconName: icons.MOVIE_CONTINUING,
-    title: translate('Indexers'),
+    title: () => translate('Indexers'),
     to: '/',
     alias: '/indexers',
     children: [
       {
-        title: translate('Stats'),
+        title: () => translate('Stats'),
         to: '/indexers/stats'
       }
     ]
@@ -33,47 +33,47 @@ const links = [
 
   {
     iconName: icons.SEARCH,
-    title: translate('Search'),
+    title: () => translate('Search'),
     to: '/search'
   },
 
   {
     iconName: icons.ACTIVITY,
-    title: translate('History'),
+    title: () => translate('History'),
     to: '/history'
   },
 
   {
     iconName: icons.SETTINGS,
-    title: translate('Settings'),
+    title: () => translate('Settings'),
     to: '/settings',
     children: [
       {
-        title: translate('Indexers'),
+        title: () => translate('Indexers'),
         to: '/settings/indexers'
       },
       {
-        title: translate('Apps'),
+        title: () => translate('Apps'),
         to: '/settings/applications'
       },
       {
-        title: translate('DownloadClients'),
+        title: () => translate('DownloadClients'),
         to: '/settings/downloadclients'
       },
       {
-        title: translate('Connect'),
+        title: () => translate('Connect'),
         to: '/settings/connect'
       },
       {
-        title: translate('Tags'),
+        title: () => translate('Tags'),
         to: '/settings/tags'
       },
       {
-        title: translate('General'),
+        title: () => translate('General'),
         to: '/settings/general'
       },
       {
-        title: translate('UI'),
+        title: () => translate('UI'),
         to: '/settings/ui'
       }
     ]
@@ -81,32 +81,32 @@ const links = [
 
   {
     iconName: icons.SYSTEM,
-    title: translate('System'),
+    title: () => translate('System'),
     to: '/system/status',
     children: [
       {
-        title: translate('Status'),
+        title: () => translate('Status'),
         to: '/system/status',
         statusComponent: HealthStatusConnector
       },
       {
-        title: translate('Tasks'),
+        title: () => translate('Tasks'),
         to: '/system/tasks'
       },
       {
-        title: translate('Backup'),
+        title: () => translate('Backup'),
         to: '/system/backup'
       },
       {
-        title: translate('Updates'),
+        title: () => translate('Updates'),
         to: '/system/updates'
       },
       {
-        title: translate('Events'),
+        title: () => translate('Events'),
         to: '/system/events'
       },
       {
-        title: translate('LogFiles'),
+        title: () => translate('LogFiles'),
         to: '/system/logs/files'
       }
     ]

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

@@ -64,7 +64,7 @@ class PageSidebarItem extends Component {
           }
 
           <span className={isChildItem ? styles.noIcon : null}>
-            {title}
+            {typeof title === 'function' ? title() : title}
           </span>
 
           {
@@ -88,7 +88,7 @@ class PageSidebarItem extends Component {
 
 PageSidebarItem.propTypes = {
   iconName: PropTypes.object,
-  title: PropTypes.string.isRequired,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   to: PropTypes.string.isRequired,
   isActive: PropTypes.bool,
   isActiveParent: PropTypes.bool,

frontend/src/Components/Table/Cells/TableRowCellButton.css.d.ts

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

frontend/src/Components/Table/Cells/TableRowCellButton.js

@@ -1,25 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Link from 'Components/Link/Link';
-import TableRowCell from './TableRowCell';
-import styles from './TableRowCellButton.css';
-
-function TableRowCellButton({ className, ...otherProps }) {
-  return (
-    <Link
-      className={className}
-      component={TableRowCell}
-      {...otherProps}
-    />
-  );
-}
-
-TableRowCellButton.propTypes = {
-  className: PropTypes.string.isRequired
-};
-
-TableRowCellButton.defaultProps = {
-  className: styles.cell
-};
-
-export default TableRowCellButton;

frontend/src/Components/Table/Cells/TableRowCellButton.tsx

@@ -0,0 +1,19 @@
+import React, { ReactNode } from 'react';
+import Link, { LinkProps } from 'Components/Link/Link';
+import TableRowCell from './TableRowCell';
+import styles from './TableRowCellButton.css';
+
+interface TableRowCellButtonProps extends LinkProps {
+  className?: string;
+  children: ReactNode;
+}
+
+function TableRowCellButton(props: TableRowCellButtonProps) {
+  const { className = styles.cell, ...otherProps } = props;
+
+  return (
+    <Link className={className} component={TableRowCell} {...otherProps} />
+  );
+}
+
+export default TableRowCellButton;

frontend/src/Components/Table/Column.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 
+type PropertyFunction<T> = () => T;
+
 interface Column {
   name: string;
-  label: string | React.ReactNode;
+  label: string | PropertyFunction<string> | React.ReactNode;
   columnLabel?: string;
   isSortable?: boolean;
   isVisible: boolean;

frontend/src/Components/Table/Table.js

@@ -107,7 +107,7 @@ function Table(props) {
                   {...getTableHeaderCellProps(otherProps)}
                   {...column}
                 >
-                  {column.label}
+                  {typeof column.label === 'function' ? column.label() : column.label}
                 </TableHeaderCell>
               );
             })

frontend/src/Components/Table/TableHeaderCell.js

@@ -30,6 +30,7 @@ class TableHeaderCell extends Component {
     const {
       className,
       name,
+      label,
       columnLabel,
       isSortable,
       isVisible,
@@ -53,7 +54,8 @@ class TableHeaderCell extends Component {
           {...otherProps}
           component="th"
           className={className}
-          title={columnLabel}
+          label={typeof label === 'function' ? label() : label}
+          title={typeof columnLabel === 'function' ? columnLabel() : columnLabel}
           onPress={this.onPress}
         >
           {children}
@@ -77,7 +79,8 @@ class TableHeaderCell extends Component {
 TableHeaderCell.propTypes = {
   className: PropTypes.string,
   name: PropTypes.string.isRequired,
-  columnLabel: PropTypes.string,
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.node]),
+  columnLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   isSortable: PropTypes.bool,
   isVisible: PropTypes.bool,
   isModifiable: PropTypes.bool,

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

@@ -35,7 +35,7 @@ function TableOptionsColumn(props) {
             isDisabled={isModifiable === false}
             onChange={onVisibleChange}
           />
-          {label}
+          {typeof label === 'function' ? label() : label}
         </label>
 
         {
@@ -56,7 +56,7 @@ function TableOptionsColumn(props) {
 
 TableOptionsColumn.propTypes = {
   name: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   isVisible: PropTypes.bool.isRequired,
   isModifiable: PropTypes.bool.isRequired,
   index: PropTypes.number.isRequired,

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

@@ -112,7 +112,7 @@ class TableOptionsColumnDragSource extends Component {
 
         <TableOptionsColumn
           name={name}
-          label={label}
+          label={typeof label === 'function' ? label() : label}
           isVisible={isVisible}
           isModifiable={isModifiable}
           index={index}
@@ -138,7 +138,7 @@ class TableOptionsColumnDragSource extends Component {
 
 TableOptionsColumnDragSource.propTypes = {
   name: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
   isVisible: PropTypes.bool.isRequired,
   isModifiable: PropTypes.bool.isRequired,
   index: PropTypes.number.isRequired,

frontend/src/Helpers/Props/icons.js

@@ -75,6 +75,7 @@ import {
   faListCheck as fasListCheck,
   faLocationArrow as fasLocationArrow,
   faLock as fasLock,
+  faMagnet as fasMagnet,
   faMedkit as fasMedkit,
   faMinus as fasMinus,
   faMusic as fasMusic,
@@ -181,6 +182,7 @@ export const INTERACTIVE = fasUser;
 export const KEYBOARD = farKeyboard;
 export const LOCK = fasLock;
 export const LOGOUT = fasSignOutAlt;
+export const MAGNET = fasMagnet;
 export const MANAGE = fasListCheck;
 export const MEDIA_INFO = farFileInvoice;
 export const MISSING = fasExclamationTriangle;

frontend/src/Helpers/Props/inputTypes.js

@@ -10,6 +10,7 @@ export const INFO = 'info';
 export const MOVIE_MONITORED_SELECT = 'movieMonitoredSelect';
 export const CATEGORY_SELECT = 'newznabCategorySelect';
 export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
+export const FLOAT = 'float';
 export const NUMBER = 'number';
 export const OAUTH = 'oauth';
 export const PASSWORD = 'password';
@@ -35,6 +36,7 @@ export const all = [
   INFO,
   MOVIE_MONITORED_SELECT,
   CATEGORY_SELECT,
+  FLOAT,
   NUMBER,
   OAUTH,
   PASSWORD,

frontend/src/History/HistoryOptions.js

@@ -62,6 +62,7 @@ class HistoryOptions extends Component {
           <FormInputGroup
             type={inputTypes.NUMBER}
             name="historyCleanupDays"
+            unit={translate('days')}
             value={historyCleanupDays}
             helpText={translate('HistoryCleanupDaysHelpText')}
             helpTextWarning={translate('HistoryCleanupDaysHelpTextWarning')}

frontend/src/Indexer/Add/AddIndexerModalContent.js

@@ -22,31 +22,31 @@ import styles from './AddIndexerModalContent.css';
 const columns = [
   {
     name: 'protocol',
-    label: translate('Protocol'),
+    label: () => translate('Protocol'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'sortName',
-    label: translate('Name'),
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'language',
-    label: translate('Language'),
+    label: () => translate('Language'),
     isSortable: true,
     isVisible: true
   },
   {
     name: 'description',
-    label: translate('Description'),
+    label: () => translate('Description'),
     isSortable: false,
     isVisible: true
   },
   {
     name: 'privacy',
-    label: translate('Privacy'),
+    label: () => translate('Privacy'),
     isSortable: true,
     isVisible: true
   }
@@ -66,15 +66,21 @@ const protocols = [
 const privacyLevels = [
   {
     key: 'private',
-    value: translate('Private')
+    get value() {
+      return translate('Private');
+    }
   },
   {
     key: 'semiPrivate',
-    value: translate('SemiPrivate')
+    get value() {
+      return translate('SemiPrivate');
+    }
   },
   {
     key: 'public',
-    value: translate('Public')
+    get value() {
+      return translate('Public');
+    }
   }
 ];
 
@@ -257,6 +263,7 @@ class AddIndexerModalContent extends Component {
                         <SelectIndexerRowConnector
                           key={`${indexer.implementation}-${indexer.name}`}
                           implementation={indexer.implementation}
+                          implementationName={indexer.implementationName}
                           {...indexer}
                           onIndexerSelect={onIndexerSelect}
                         />
@@ -282,7 +289,7 @@ class AddIndexerModalContent extends Component {
           <div className={styles.available}>
             {
               isPopulated ?
-                translate('CountIndexersAvailable', [filteredIndexers.length]) :
+                translate('CountIndexersAvailable', { count: filteredIndexers.length }) :
                 null
             }
           </div>

frontend/src/Indexer/Add/AddIndexerModalContentConnector.js

@@ -49,8 +49,8 @@ class AddIndexerModalContentConnector extends Component {
   //
   // Listeners
 
-  onIndexerSelect = ({ implementation, name }) => {
-    this.props.selectIndexerSchema({ implementation, name });
+  onIndexerSelect = ({ implementation, implementationName, name }) => {
+    this.props.selectIndexerSchema({ implementation, implementationName, name });
     this.props.onSelectIndexer();
   };
 

frontend/src/Indexer/Add/AddIndexerPresetMenuItem.js

@@ -10,12 +10,14 @@ class AddIndexerPresetMenuItem extends Component {
   onPress = () => {
     const {
       name,
-      implementation
+      implementation,
+      implementationName
     } = this.props;
 
     this.props.onPress({
       name,
-      implementation
+      implementation,
+      implementationName
     });
   };
 
@@ -26,6 +28,7 @@ class AddIndexerPresetMenuItem extends Component {
     const {
       name,
       implementation,
+      implementationName,
       ...otherProps
     } = this.props;
 
@@ -43,6 +46,7 @@ class AddIndexerPresetMenuItem extends Component {
 AddIndexerPresetMenuItem.propTypes = {
   name: PropTypes.string.isRequired,
   implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
   onPress: PropTypes.func.isRequired
 };
 

frontend/src/Indexer/Add/SelectIndexerRow.js

@@ -17,10 +17,11 @@ class SelectIndexerRow extends Component {
   onPress = () => {
     const {
       implementation,
+      implementationName,
       name
     } = this.props;
 
-    this.props.onIndexerSelect({ implementation, name });
+    this.props.onIndexerSelect({ implementation, implementationName, name });
   };
 
   //
@@ -81,6 +82,7 @@ SelectIndexerRow.propTypes = {
   language: PropTypes.string.isRequired,
   description: PropTypes.string.isRequired,
   implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
   onIndexerSelect: PropTypes.func.isRequired,
   isExistingIndexer: PropTypes.bool.isRequired
 };

frontend/src/Indexer/Delete/DeleteIndexerModal.js

@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import DeleteIndexerModalContentConnector from './DeleteIndexerModalContentConnector';
-
-function DeleteIndexerModal(props) {
-  const {
-    isOpen,
-    onModalClose,
-    ...otherProps
-  } = props;
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      size={sizes.MEDIUM}
-      onModalClose={onModalClose}
-    >
-      <DeleteIndexerModalContentConnector
-        {...otherProps}
-        onModalClose={onModalClose}
-      />
-    </Modal>
-  );
-}
-
-DeleteIndexerModal.propTypes = {
-  ...DeleteIndexerModalContentConnector.propTypes,
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default DeleteIndexerModal;

frontend/src/Indexer/Delete/DeleteIndexerModal.tsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import { sizes } from 'Helpers/Props';
+import DeleteIndexerModalContent from './DeleteIndexerModalContent';
+
+interface DeleteIndexerModalProps {
+  isOpen: boolean;
+  indexerId: number;
+  onModalClose(): void;
+}
+
+function DeleteIndexerModal(props: DeleteIndexerModalProps) {
+  const { isOpen, indexerId, onModalClose } = props;
+
+  return (
+    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={onModalClose}>
+      <DeleteIndexerModalContent
+        indexerId={indexerId}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+export default DeleteIndexerModal;

frontend/src/Indexer/Delete/DeleteIndexerModalContent.js

@@ -1,88 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Button from 'Components/Link/Button';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-
-class DeleteIndexerModalContent extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      deleteFiles: false,
-      addImportExclusion: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onDeleteFilesChange = ({ value }) => {
-    this.setState({ deleteFiles: value });
-  };
-
-  onAddImportExclusionChange = ({ value }) => {
-    this.setState({ addImportExclusion: value });
-  };
-
-  onDeleteMovieConfirmed = () => {
-    const deleteFiles = this.state.deleteFiles;
-    const addImportExclusion = this.state.addImportExclusion;
-
-    this.setState({ deleteFiles: false, addImportExclusion: false });
-    this.props.onDeletePress(deleteFiles, addImportExclusion);
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      name,
-      onModalClose
-    } = this.props;
-
-    return (
-      <ModalContent
-        onModalClose={onModalClose}
-      >
-        <ModalHeader>
-          Delete - {name}
-        </ModalHeader>
-
-        <ModalBody>
-          {`Are you sure you want to delete ${name} from Prowlarr`}
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={onModalClose}>
-            {translate('Close')}
-          </Button>
-
-          <Button
-            kind={kinds.DANGER}
-            onPress={this.onDeleteMovieConfirmed}
-          >
-            {translate('Delete')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    );
-  }
-}
-
-DeleteIndexerModalContent.propTypes = {
-  name: PropTypes.string.isRequired,
-  onDeletePress: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default DeleteIndexerModalContent;

frontend/src/Indexer/Delete/DeleteIndexerModalContent.tsx

@@ -0,0 +1,54 @@
+import React, { useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import Button from 'Components/Link/Button';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { kinds } from 'Helpers/Props';
+import Indexer from 'Indexer/Indexer';
+import { deleteIndexer } from 'Store/Actions/indexerActions';
+import { createIndexerSelectorForHook } from 'Store/Selectors/createIndexerSelector';
+import translate from 'Utilities/String/translate';
+
+interface DeleteIndexerModalContentProps {
+  indexerId: number;
+  onModalClose(): void;
+}
+
+function DeleteIndexerModalContent(props: DeleteIndexerModalContentProps) {
+  const { indexerId, onModalClose } = props;
+
+  const { name } = useSelector(
+    createIndexerSelectorForHook(indexerId)
+  ) as Indexer;
+  const dispatch = useDispatch();
+
+  const onConfirmDelete = useCallback(() => {
+    dispatch(deleteIndexer({ id: indexerId }));
+
+    onModalClose();
+  }, [indexerId, dispatch, onModalClose]);
+
+  return (
+    <ModalContent onModalClose={onModalClose}>
+      <ModalHeader>
+        {translate('Delete')} - {name}
+      </ModalHeader>
+
+      <ModalBody>
+        {translate('AreYouSureYouWantToDeleteIndexer', { name })}
+      </ModalBody>
+
+      <ModalFooter>
+        <Button onPress={onModalClose}>{translate('Close')}</Button>
+
+        <Button kind={kinds.DANGER} onPress={onConfirmDelete}>
+          {translate('Delete')}
+        </Button>
+      </ModalFooter>
+    </ModalContent>
+  );
+}
+
+export default DeleteIndexerModalContent;

frontend/src/Indexer/Delete/DeleteIndexerModalContentConnector.js

@@ -1,57 +0,0 @@
-import { push } from 'connected-react-router';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { deleteIndexer } from 'Store/Actions/indexerActions';
-import createIndexerSelector from 'Store/Selectors/createIndexerSelector';
-import DeleteIndexerModalContent from './DeleteIndexerModalContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    createIndexerSelector(),
-    (indexer) => {
-      return indexer;
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  deleteIndexer,
-  push
-};
-
-class DeleteIndexerModalContentConnector extends Component {
-
-  //
-  // Listeners
-
-  onDeletePress = () => {
-    this.props.deleteIndexer({
-      id: this.props.indexerId
-    });
-
-    this.props.onModalClose(true);
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <DeleteIndexerModalContent
-        {...this.props}
-        onDeletePress={this.onDeletePress}
-      />
-    );
-  }
-}
-
-DeleteIndexerModalContentConnector.propTypes = {
-  indexerId: PropTypes.number.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  deleteIndexer: PropTypes.func.isRequired,
-  push: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(DeleteIndexerModalContentConnector);

frontend/src/Indexer/Edit/EditIndexerModalContent.js

@@ -61,7 +61,7 @@ function EditIndexerModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {`${id ? translate('EditIndexer') : translate('AddIndexer')} - ${indexerDisplayName}`}
+        {id ? translate('EditIndexerImplementation', { implementationName: indexerDisplayName }) : translate('AddIndexerImplementation', { implementationName: indexerDisplayName })}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Indexer/Index/IndexerIndex.tsx

@@ -45,9 +45,7 @@ import IndexerIndexTable from './Table/IndexerIndexTable';
 import IndexerIndexTableOptions from './Table/IndexerIndexTableOptions';
 import styles from './IndexerIndex.css';
 
-function getViewComponent() {
-  return IndexerIndexTable;
-}
+const getViewComponent = () => IndexerIndexTable;
 
 interface IndexerIndexProps {
   initialScrollTop?: number;
@@ -84,14 +82,6 @@ const IndexerIndex = withScrollPosition((props: IndexerIndexProps) => {
   );
   const [isSelectMode, setIsSelectMode] = useState(false);
 
-  const onAppIndexerSyncPress = useCallback(() => {
-    dispatch(
-      executeCommand({
-        name: APP_INDEXER_SYNC,
-      })
-    );
-  }, [dispatch]);
-
   const onAddIndexerPress = useCallback(() => {
     setIsAddIndexerModalOpen(true);
   }, [setIsAddIndexerModalOpen]);
@@ -108,6 +98,15 @@ const IndexerIndex = withScrollPosition((props: IndexerIndexProps) => {
     setIsEditIndexerModalOpen(false);
   }, [setIsEditIndexerModalOpen]);
 
+  const onAppIndexerSyncPress = useCallback(() => {
+    dispatch(
+      executeCommand({
+        name: APP_INDEXER_SYNC,
+        forceSync: true,
+      })
+    );
+  }, [dispatch]);
+
   const onTestAllPress = useCallback(() => {
     dispatch(testAllIndexers());
   }, [dispatch]);

frontend/src/Indexer/Index/Select/Delete/DeleteIndexerModalContent.tsx

@@ -48,7 +48,9 @@ function DeleteIndexerModalContent(props: DeleteIndexerModalContentProps) {
 
       <ModalBody>
         <div className={styles.message}>
-          {translate('DeleteSelectedIndexersMessageText', [indexers.length])}
+          {translate('DeleteSelectedIndexersMessageText', {
+            count: indexers.length,
+          })}
         </div>
 
         <ul>

frontend/src/Indexer/Index/Select/Edit/EditIndexerModalContent.tsx

@@ -30,9 +30,25 @@ interface EditIndexerModalContentProps {
 const NO_CHANGE = 'noChange';
 
 const enableOptions = [
-  { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
-  { key: 'true', value: translate('Enabled') },
-  { key: 'false', value: translate('Disabled') },
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true,
+  },
+  {
+    key: 'true',
+    get value() {
+      return translate('Enabled');
+    },
+  },
+  {
+    key: 'false',
+    get value() {
+      return translate('Disabled');
+    },
+  },
 ];
 
 function EditIndexerModalContent(props: EditIndexerModalContentProps) {
@@ -241,7 +257,7 @@ function EditIndexerModalContent(props: EditIndexerModalContentProps) {
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountIndexersSelected', [selectedCount])}
+          {translate('CountIndexersSelected', { count: selectedCount })}
         </div>
 
         <div>

frontend/src/Indexer/Index/Select/IndexerIndexSelectFooter.tsx

@@ -165,7 +165,7 @@ function IndexerIndexSelectFooter() {
       </div>
 
       <div className={styles.selected}>
-        {translate('CountIndexersSelected', [selectedCount])}
+        {translate('CountIndexersSelected', { count: selectedCount })}
       </div>
 
       <EditIndexerModal

frontend/src/Indexer/Index/Table/IndexerIndexRow.tsx

@@ -12,6 +12,7 @@ import { icons } from 'Helpers/Props';
 import DeleteIndexerModal from 'Indexer/Delete/DeleteIndexerModal';
 import EditIndexerModalConnector from 'Indexer/Edit/EditIndexerModalConnector';
 import createIndexerIndexItemSelector from 'Indexer/Index/createIndexerIndexItemSelector';
+import Indexer from 'Indexer/Indexer';
 import IndexerTitleLink from 'Indexer/IndexerTitleLink';
 import { SelectStateInputProps } from 'typings/props';
 import firstCharToUpper from 'Utilities/String/firstCharToUpper';
@@ -47,7 +48,7 @@ function IndexerIndexRow(props: IndexerIndexRowProps) {
     fields,
     added,
     capabilities,
-  } = indexer;
+  } = indexer as Indexer;
 
   const baseUrl =
     fields.find((field) => field.name === 'baseUrl')?.value ??

frontend/src/Indexer/Index/Table/IndexerIndexTableHeader.tsx

@@ -103,7 +103,7 @@ function IndexerIndexTableHeader(props: IndexerIndexTableHeaderProps) {
             isSortable={isSortable}
             onSortPress={onSortPress}
           >
-            {label}
+            {typeof label === 'function' ? label() : label}
           </VirtualTableHeaderCell>
         );
       })}

frontend/src/Indexer/Index/Table/IndexerStatusCell.tsx

@@ -12,7 +12,7 @@ interface IndexerStatusCellProps {
   className: string;
   enabled: boolean;
   redirect: boolean;
-  status: IndexerStatus;
+  status?: IndexerStatus;
   longDateFormat: string;
   timeFormat: string;
   component?: React.ElementType;

frontend/src/Indexer/Index/createIndexerIndexItemSelector.ts

@@ -1,5 +1,4 @@
 import { createSelector } from 'reselect';
-import Indexer from 'Indexer/Indexer';
 import createIndexerAppProfileSelector from 'Store/Selectors/createIndexerAppProfileSelector';
 import { createIndexerSelectorForHook } from 'Store/Selectors/createIndexerSelector';
 import createIndexerStatusSelector from 'Store/Selectors/createIndexerStatusSelector';
@@ -11,7 +10,7 @@ function createIndexerIndexItemSelector(indexerId: number) {
     createIndexerAppProfileSelector(indexerId),
     createIndexerStatusSelector(indexerId),
     createUISettingsSelector(),
-    (indexer: Indexer, appProfile, status, uiSettings) => {
+    (indexer, appProfile, status, uiSettings) => {
       return {
         indexer,
         appProfile,

frontend/src/Indexer/Indexer.ts

@@ -25,11 +25,13 @@ export interface IndexerCapabilities extends ModelBase {
 }
 
 export interface IndexerField extends ModelBase {
+  order: number;
   name: string;
   label: string;
   advanced: boolean;
   type: string;
   value: string;
+  privacy: string;
 }
 
 interface Indexer extends ModelBase {
@@ -40,6 +42,10 @@ interface Indexer extends ModelBase {
   added: Date;
   enable: boolean;
   redirect: boolean;
+  supportsRss: boolean;
+  supportsSearch: boolean;
+  supportsRedirect: boolean;
+  supportsPagination: boolean;
   protocol: string;
   privacy: string;
   priority: number;
@@ -49,6 +55,12 @@ interface Indexer extends ModelBase {
   status: IndexerStatus;
   capabilities: IndexerCapabilities;
   indexerUrls: string[];
+  legacyUrls: string[];
+  appProfileId: number;
+  implementationName: string;
+  implementation: string;
+  configContract: string;
+  infoLink: string;
 }
 
 export default Indexer;

frontend/src/Indexer/Info/IndexerInfoModalContent.tsx

@@ -29,7 +29,7 @@ import styles from './IndexerInfoModalContent.css';
 function createIndexerInfoItemSelector(indexerId: number) {
   return createSelector(
     createIndexerSelectorForHook(indexerId),
-    (indexer: Indexer) => {
+    (indexer?: Indexer) => {
       return {
         indexer,
       };
@@ -58,7 +58,7 @@ function IndexerInfoModalContent(props: IndexerInfoModalContentProps) {
     tags,
     protocol,
     capabilities,
-  } = indexer;
+  } = indexer as Indexer;
 
   const { onModalClose } = props;
 

frontend/src/Indexer/NoIndexer.tsx

@@ -1,15 +1,16 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
 import { kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import styles from './NoIndexer.css';
 
-function NoIndexer(props) {
-  const {
-    totalItems,
-    onAddIndexerPress
-  } = props;
+interface NoIndexerProps {
+  totalItems: number;
+  onAddIndexerPress(): void;
+}
+
+function NoIndexer(props: NoIndexerProps) {
+  const { totalItems, onAddIndexerPress } = props;
 
   if (totalItems > 0) {
     return (
@@ -28,10 +29,7 @@ function NoIndexer(props) {
       </div>
 
       <div className={styles.buttonContainer}>
-        <Button
-          onPress={onAddIndexerPress}
-          kind={kinds.PRIMARY}
-        >
+        <Button onPress={onAddIndexerPress} kind={kinds.PRIMARY}>
           {translate('AddNewIndexer')}
         </Button>
       </div>
@@ -39,9 +37,4 @@ function NoIndexer(props) {
   );
 }
 
-NoIndexer.propTypes = {
-  totalItems: PropTypes.number.isRequired,
-  onAddIndexerPress: PropTypes.func.isRequired
-};
-
 export default NoIndexer;

frontend/src/Indexer/Stats/IndexerStats.tsx

@@ -0,0 +1,275 @@
+import React, { useCallback, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+import AppState from 'App/State/AppState';
+import IndexerStatsAppState from 'App/State/IndexerStatsAppState';
+import Alert from 'Components/Alert';
+import BarChart from 'Components/Chart/BarChart';
+import DoughnutChart from 'Components/Chart/DoughnutChart';
+import StackedBarChart from 'Components/Chart/StackedBarChart';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import { align, kinds } from 'Helpers/Props';
+import {
+  fetchIndexerStats,
+  setIndexerStatsFilter,
+} from 'Store/Actions/indexerStatsActions';
+import {
+  IndexerStatsHost,
+  IndexerStatsIndexer,
+  IndexerStatsUserAgent,
+} from 'typings/IndexerStats';
+import getErrorMessage from 'Utilities/Object/getErrorMessage';
+import translate from 'Utilities/String/translate';
+import IndexerStatsFilterMenu from './IndexerStatsFilterMenu';
+import styles from './IndexerStats.css';
+
+function getAverageResponseTimeData(indexerStats: IndexerStatsIndexer[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.indexerName,
+      value: indexer.averageResponseTime,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getFailureRateData(indexerStats: IndexerStatsIndexer[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.indexerName,
+      value:
+        (indexer.numberOfFailedQueries +
+          indexer.numberOfFailedRssQueries +
+          indexer.numberOfFailedAuthQueries +
+          indexer.numberOfFailedGrabs) /
+        (indexer.numberOfQueries +
+          indexer.numberOfRssQueries +
+          indexer.numberOfAuthQueries +
+          indexer.numberOfGrabs),
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getTotalRequestsData(indexerStats: IndexerStatsIndexer[]) {
+  const data = {
+    labels: indexerStats.map((indexer) => indexer.indexerName),
+    datasets: [
+      {
+        label: translate('SearchQueries'),
+        data: indexerStats.map((indexer) => indexer.numberOfQueries),
+      },
+      {
+        label: translate('RssQueries'),
+        data: indexerStats.map((indexer) => indexer.numberOfRssQueries),
+      },
+      {
+        label: translate('AuthQueries'),
+        data: indexerStats.map((indexer) => indexer.numberOfAuthQueries),
+      },
+    ],
+  };
+
+  return data;
+}
+
+function getNumberGrabsData(indexerStats: IndexerStatsIndexer[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.indexerName,
+      value: indexer.numberOfGrabs - indexer.numberOfFailedGrabs,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getUserAgentGrabsData(indexerStats: IndexerStatsUserAgent[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.userAgent ? indexer.userAgent : 'Other',
+      value: indexer.numberOfGrabs,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getUserAgentQueryData(indexerStats: IndexerStatsUserAgent[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.userAgent ? indexer.userAgent : 'Other',
+      value: indexer.numberOfQueries,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getHostGrabsData(indexerStats: IndexerStatsHost[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.host ? indexer.host : 'Other',
+      value: indexer.numberOfGrabs,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+function getHostQueryData(indexerStats: IndexerStatsHost[]) {
+  const data = indexerStats.map((indexer) => {
+    return {
+      label: indexer.host ? indexer.host : 'Other',
+      value: indexer.numberOfQueries,
+    };
+  });
+
+  data.sort((a, b) => {
+    return b.value - a.value;
+  });
+
+  return data;
+}
+
+const indexerStatsSelector = () => {
+  return createSelector(
+    (state: AppState) => state.indexerStats,
+    (indexerStats: IndexerStatsAppState) => {
+      return indexerStats;
+    }
+  );
+};
+
+function IndexerStats() {
+  const { isFetching, isPopulated, item, error, filters, selectedFilterKey } =
+    useSelector(indexerStatsSelector());
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchIndexerStats());
+  }, [dispatch]);
+
+  const onFilterSelect = useCallback(
+    (value: string) => {
+      dispatch(setIndexerStatsFilter({ selectedFilterKey: value }));
+    },
+    [dispatch]
+  );
+
+  const isLoaded = !error && isPopulated;
+
+  return (
+    <PageContent>
+      <PageToolbar>
+        <PageToolbarSection alignContent={align.RIGHT} collapseButtons={false}>
+          <IndexerStatsFilterMenu
+            selectedFilterKey={selectedFilterKey}
+            filters={filters}
+            onFilterSelect={onFilterSelect}
+            isDisabled={false}
+          />
+        </PageToolbarSection>
+      </PageToolbar>
+      <PageContentBody>
+        {isFetching && !isPopulated && <LoadingIndicator />}
+
+        {!isFetching && !!error && (
+          <Alert kind={kinds.DANGER}>
+            {getErrorMessage(error, 'Failed to load indexer stats from API')}
+          </Alert>
+        )}
+
+        {isLoaded && (
+          <div>
+            <div className={styles.fullWidthChart}>
+              <BarChart
+                data={getAverageResponseTimeData(item.indexers)}
+                title={translate('AverageResponseTimesMs')}
+              />
+            </div>
+            <div className={styles.fullWidthChart}>
+              <BarChart
+                data={getFailureRateData(item.indexers)}
+                title={translate('IndexerFailureRate')}
+                kind={kinds.WARNING}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <StackedBarChart
+                data={getTotalRequestsData(item.indexers)}
+                title={translate('TotalIndexerQueries')}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <BarChart
+                data={getNumberGrabsData(item.indexers)}
+                title={translate('TotalIndexerSuccessfulGrabs')}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <BarChart
+                data={getUserAgentQueryData(item.userAgents)}
+                title={translate('TotalUserAgentQueries')}
+                horizontal={true}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <BarChart
+                data={getUserAgentGrabsData(item.userAgents)}
+                title={translate('TotalUserAgentGrabs')}
+                horizontal={true}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <DoughnutChart
+                data={getHostQueryData(item.hosts)}
+                title={translate('TotalHostQueries')}
+                horizontal={true}
+              />
+            </div>
+            <div className={styles.halfWidthChart}>
+              <DoughnutChart
+                data={getHostGrabsData(item.hosts)}
+                title={translate('TotalHostGrabs')}
+                horizontal={true}
+              />
+            </div>
+          </div>
+        )}
+      </PageContentBody>
+    </PageContent>
+  );
+}
+
+export default IndexerStats;

frontend/src/Indexer/Stats/IndexerStatsFilterMenu.tsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import FilterMenu from 'Components/Menu/FilterMenu';
+import { align } from 'Helpers/Props';
+
+interface IndexerStatsFilterMenuProps {
+  selectedFilterKey: string | number;
+  filters: object[];
+  isDisabled: boolean;
+  onFilterSelect(filterName: string): unknown;
+}
+
+function IndexerStatsFilterMenu(props: IndexerStatsFilterMenuProps) {
+  const { selectedFilterKey, filters, isDisabled, onFilterSelect } = props;
+
+  return (
+    <FilterMenu
+      alignMenu={align.RIGHT}
+      isDisabled={isDisabled}
+      selectedFilterKey={selectedFilterKey}
+      filters={filters}
+      customFilters={[]}
+      onFilterSelect={onFilterSelect}
+    />
+  );
+}
+
+export default IndexerStatsFilterMenu;

frontend/src/Indexer/Stats/Stats.js

@@ -1,261 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Alert from 'Components/Alert';
-import BarChart from 'Components/Chart/BarChart';
-import DoughnutChart from 'Components/Chart/DoughnutChart';
-import StackedBarChart from 'Components/Chart/StackedBarChart';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import { align, kinds } from 'Helpers/Props';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import translate from 'Utilities/String/translate';
-import StatsFilterMenu from './StatsFilterMenu';
-import styles from './Stats.css';
-
-function getAverageResponseTimeData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value: indexer.averageResponseTime
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getFailureRateData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value: (indexer.numberOfFailedQueries + indexer.numberOfFailedRssQueries + indexer.numberOfFailedAuthQueries + indexer.numberOfFailedGrabs) /
-        (indexer.numberOfQueries + indexer.numberOfRssQueries + indexer.numberOfAuthQueries + indexer.numberOfGrabs)
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getTotalRequestsData(indexerStats) {
-  const data = {
-    labels: indexerStats.map((indexer) => indexer.indexerName),
-    datasets: [
-      {
-        label: 'Search Queries',
-        data: indexerStats.map((indexer) => indexer.numberOfQueries)
-      },
-      {
-        label: 'Rss Queries',
-        data: indexerStats.map((indexer) => indexer.numberOfRssQueries)
-      },
-      {
-        label: 'Auth Queries',
-        data: indexerStats.map((indexer) => indexer.numberOfAuthQueries)
-      }
-    ]
-  };
-
-  return data;
-}
-
-function getNumberGrabsData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.indexerName,
-      value: indexer.numberOfGrabs - indexer.numberOfFailedGrabs
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getUserAgentGrabsData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.userAgent ? indexer.userAgent : 'Other',
-      value: indexer.numberOfGrabs
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getUserAgentQueryData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.userAgent ? indexer.userAgent : 'Other',
-      value: indexer.numberOfQueries
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getHostGrabsData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.host ? indexer.host : 'Other',
-      value: indexer.numberOfGrabs
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function getHostQueryData(indexerStats) {
-  const data = indexerStats.map((indexer) => {
-    return {
-      label: indexer.host ? indexer.host : 'Other',
-      value: indexer.numberOfQueries
-    };
-  });
-
-  data.sort((a, b) => {
-    return b.value - a.value;
-  });
-
-  return data;
-}
-
-function Stats(props) {
-  const {
-    item,
-    isFetching,
-    isPopulated,
-    error,
-    filters,
-    selectedFilterKey,
-    onFilterSelect
-  } = props;
-
-  const isLoaded = !!(!error && isPopulated);
-
-  return (
-    <PageContent>
-      <PageToolbar>
-        <PageToolbarSection
-          alignContent={align.RIGHT}
-          collapseButtons={false}
-        >
-          <StatsFilterMenu
-            selectedFilterKey={selectedFilterKey}
-            filters={filters}
-            onFilterSelect={onFilterSelect}
-            isDisabled={false}
-          />
-        </PageToolbarSection>
-      </PageToolbar>
-      <PageContentBody>
-        {
-          isFetching && !isPopulated &&
-            <LoadingIndicator />
-        }
-
-        {
-          !isFetching && !!error &&
-            <Alert kind={kinds.DANGER}>
-              {getErrorMessage(error, 'Failed to load indexer stats from API')}
-            </Alert>
-        }
-
-        {
-          isLoaded &&
-            <div>
-              <div className={styles.fullWidthChart}>
-                <BarChart
-                  data={getAverageResponseTimeData(item.indexers)}
-                  title={translate('AverageResponseTimesMs')}
-                />
-              </div>
-              <div className={styles.fullWidthChart}>
-                <BarChart
-                  data={getFailureRateData(item.indexers)}
-                  title={translate('IndexerFailureRate')}
-                  kind={kinds.WARNING}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <StackedBarChart
-                  data={getTotalRequestsData(item.indexers)}
-                  title={translate('TotalIndexerQueries')}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <BarChart
-                  data={getNumberGrabsData(item.indexers)}
-                  title={translate('TotalIndexerSuccessfulGrabs')}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <BarChart
-                  data={getUserAgentQueryData(item.userAgents)}
-                  title={translate('TotalUserAgentQueries')}
-                  horizontal={true}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <BarChart
-                  data={getUserAgentGrabsData(item.userAgents)}
-                  title={translate('TotalUserAgentGrabs')}
-                  horizontal={true}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <DoughnutChart
-                  data={getHostQueryData(item.hosts)}
-                  title={translate('TotalHostQueries')}
-                  horizontal={true}
-                />
-              </div>
-              <div className={styles.halfWidthChart}>
-                <DoughnutChart
-                  data={getHostGrabsData(item.hosts)}
-                  title={translate('TotalHostGrabs')}
-                  horizontal={true}
-                />
-              </div>
-            </div>
-        }
-      </PageContentBody>
-    </PageContent>
-  );
-}
-
-Stats.propTypes = {
-  item: PropTypes.object.isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.string.isRequired,
-  onFilterSelect: PropTypes.func.isRequired,
-  error: PropTypes.object,
-  data: PropTypes.object
-};
-
-export default Stats;

frontend/src/Indexer/Stats/StatsConnector.js

@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchIndexerStats, setIndexerStatsFilter } from 'Store/Actions/indexerStatsActions';
-import Stats from './Stats';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.indexerStats,
-    (indexerStats) => indexerStats
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    onFilterSelect(selectedFilterKey) {
-      dispatch(setIndexerStatsFilter({ selectedFilterKey }));
-    },
-    dispatchFetchIndexerStats() {
-      dispatch(fetchIndexerStats());
-    }
-  };
-}
-
-class StatsConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    this.props.dispatchFetchIndexerStats();
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <Stats
-        {...this.props}
-      />
-    );
-  }
-}
-
-StatsConnector.propTypes = {
-  dispatchFetchIndexerStats: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(StatsConnector);

frontend/src/Indexer/Stats/StatsFilterMenu.js

@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import { align } from 'Helpers/Props';
-
-function StatsFilterMenu(props) {
-  const {
-    selectedFilterKey,
-    filters,
-    isDisabled,
-    onFilterSelect
-  } = props;
-
-  return (
-    <FilterMenu
-      alignMenu={align.RIGHT}
-      isDisabled={isDisabled}
-      selectedFilterKey={selectedFilterKey}
-      filters={filters}
-      customFilters={[]}
-      onFilterSelect={onFilterSelect}
-    />
-  );
-}
-
-StatsFilterMenu.propTypes = {
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  onFilterSelect: PropTypes.func.isRequired
-};
-
-StatsFilterMenu.defaultProps = {
-  showCustomFilters: false
-};
-
-export default StatsFilterMenu;

frontend/src/Indexer/Stats/StatsFilterModalConnector.js

@@ -1,24 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import FilterModal from 'Components/Filter/FilterModal';
-import { setIndexerStatsFilter } from 'Store/Actions/indexerStatsActions';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.indexerStats.items,
-    (state) => state.indexerStats.filterBuilderProps,
-    (sectionItems, filterBuilderProps) => {
-      return {
-        sectionItems,
-        filterBuilderProps,
-        customFilterType: 'indexerStats'
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchSetFilter: setIndexerStatsFilter
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(FilterModal);

frontend/src/Search/Mobile/SearchIndexOverview.js

@@ -37,6 +37,18 @@ function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
   return icons.DOWNLOAD;
 }
 
+function getDownloadKind(isGrabbed, grabError) {
+  if (isGrabbed) {
+    return kinds.SUCCESS;
+  }
+
+  if (grabError) {
+    return kinds.DANGER;
+  }
+
+  return kinds.DEFAULT;
+}
+
 function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
   if (isGrabbing) {
     return '';
@@ -76,6 +88,7 @@ class SearchIndexOverview extends Component {
       infoUrl,
       protocol,
       downloadUrl,
+      magnetUrl,
       categories,
       seeders,
       leechers,
@@ -114,19 +127,22 @@ class SearchIndexOverview extends Component {
               <div className={styles.actions}>
                 <SpinnerIconButton
                   name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-                  kind={grabError ? kinds.DANGER : kinds.DEFAULT}
+                  kind={getDownloadKind(isGrabbed, grabError)}
                   title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
                   isDisabled={isGrabbed}
                   isSpinning={isGrabbing}
                   onPress={this.onGrabPress}
                 />
 
-                <IconButton
-                  className={styles.downloadLink}
-                  name={icons.SAVE}
-                  title={translate('Save')}
-                  to={downloadUrl}
-                />
+                {
+                  downloadUrl || magnetUrl ?
+                    <IconButton
+                      name={icons.SAVE}
+                      title={translate('Save')}
+                      to={downloadUrl ?? magnetUrl}
+                    /> :
+                    null
+                }
               </div>
             </div>
             <div className={styles.indexerRow}>
@@ -188,7 +204,8 @@ SearchIndexOverview.propTypes = {
   publishDate: PropTypes.string.isRequired,
   title: PropTypes.string.isRequired,
   infoUrl: PropTypes.string.isRequired,
-  downloadUrl: PropTypes.string.isRequired,
+  downloadUrl: PropTypes.string,
+  magnetUrl: PropTypes.string,
   indexerId: PropTypes.number.isRequired,
   indexer: PropTypes.string.isRequired,
   size: PropTypes.number.isRequired,

frontend/src/Search/Mobile/SearchIndexOverviews.js

@@ -195,7 +195,7 @@ class SearchIndexOverviews extends Component {
 SearchIndexOverviews.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   sortKey: PropTypes.string,
-  scrollTop: PropTypes.number.isRequired,
+  scrollTop: PropTypes.number,
   jumpToCharacter: PropTypes.string,
   scroller: PropTypes.instanceOf(Element).isRequired,
   showRelativeDates: PropTypes.bool.isRequired,

frontend/src/Search/QueryParameterModal.js

@@ -14,11 +14,11 @@ import QueryParameterOption from './QueryParameterOption';
 import styles from './QueryParameterModal.css';
 
 const searchOptions = [
-  { key: 'search', value: translate('BasicSearch') },
-  { key: 'tvsearch', value: translate('TvSearch') },
-  { key: 'movie', value: translate('MovieSearch') },
-  { key: 'music', value: translate( 'AudioSearch') },
-  { key: 'book', value: translate('BookSearch') }
+  { key: 'search', value: () => translate('BasicSearch') },
+  { key: 'tvsearch', value: () => translate('TvSearch') },
+  { key: 'movie', value: () => translate('MovieSearch') },
+  { key: 'music', value: () => translate( 'AudioSearch') },
+  { key: 'book', value: () => translate('BookSearch') }
 ];
 
 const seriesTokens = [

frontend/src/Search/SearchFooter.js

@@ -191,10 +191,10 @@ class SearchFooter extends Component {
         icon = icons.SEARCH;
     }
 
-    let footerLabel = searchIndexerIds.length === 0 ? translate('SearchAllIndexers') : translate('SearchCountIndexers', [searchIndexerIds.length]);
+    let footerLabel = searchIndexerIds.length === 0 ? translate('SearchAllIndexers') : translate('SearchCountIndexers', { count: searchIndexerIds.length });
 
     if (isPopulated) {
-      footerLabel = selectedCount === 0 ? translate('FoundCountReleases', [itemCount]) : translate('SelectedCountOfCountReleases', [selectedCount, itemCount]);
+      footerLabel = selectedCount === 0 ? translate('FoundCountReleases', { itemCount }) : translate('SelectedCountOfCountReleases', { selectedCount, itemCount });
     }
 
     return (

frontend/src/Search/Table/SearchIndexHeader.js

@@ -96,7 +96,7 @@ class SearchIndexHeader extends Component {
                 isSortable={isSortable}
                 {...otherProps}
               >
-                {label}
+                {typeof label === 'function' ? label() : label}
               </VirtualTableHeaderCell>
             );
           })

frontend/src/Search/Table/SearchIndexRow.css

@@ -59,6 +59,7 @@
   margin: 0 2px;
   width: 22px;
   color: var(--textColor);
+  text-align: center;
 }
 
 .externalLinks {

frontend/src/Search/Table/SearchIndexRow.js

@@ -30,6 +30,18 @@ function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
   return icons.DOWNLOAD;
 }
 
+function getDownloadKind(isGrabbed, grabError) {
+  if (isGrabbed) {
+    return kinds.SUCCESS;
+  }
+
+  if (grabError) {
+    return kinds.DANGER;
+  }
+
+  return kinds.DEFAULT;
+}
+
 function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
   if (isGrabbing) {
     return '';
@@ -91,6 +103,8 @@ class SearchIndexRow extends Component {
     const {
       guid,
       protocol,
+      downloadUrl,
+      magnetUrl,
       categories,
       age,
       ageHours,
@@ -301,19 +315,34 @@ class SearchIndexRow extends Component {
                 >
                   <SpinnerIconButton
                     name={getDownloadIcon(isGrabbing, isGrabbed, grabError)}
-                    kind={grabError ? kinds.DANGER : kinds.DEFAULT}
+                    kind={getDownloadKind(isGrabbed, grabError)}
                     title={getDownloadTooltip(isGrabbing, isGrabbed, grabError)}
                     isDisabled={isGrabbed}
                     isSpinning={isGrabbing}
                     onPress={this.onGrabPress}
                   />
 
-                  <IconButton
-                    className={styles.downloadLink}
-                    name={icons.SAVE}
-                    title={translate('Save')}
-                    onPress={this.onSavePress}
-                  />
+                  {
+                    downloadUrl ?
+                      <IconButton
+                        className={styles.downloadLink}
+                        name={icons.SAVE}
+                        title={translate('Save')}
+                        onPress={this.onSavePress}
+                      /> :
+                      null
+                  }
+
+                  {
+                    magnetUrl ?
+                      <IconButton
+                        className={styles.downloadLink}
+                        name={icons.MAGNET}
+                        title={translate('Open')}
+                        to={magnetUrl}
+                      /> :
+                      null
+                  }
                 </VirtualTableRowCell>
               );
             }

frontend/src/Settings/Applications/ApplicationSettings.js

@@ -1,103 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component, Fragment } from 'react';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
-import { icons } from 'Helpers/Props';
-import AppProfilesConnector from 'Settings/Profiles/App/AppProfilesConnector';
-import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
-import translate from 'Utilities/String/translate';
-import ApplicationsConnector from './Applications/ApplicationsConnector';
-import ManageApplicationsModal from './Applications/Manage/ManageApplicationsModal';
-
-class ApplicationSettings extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isManageApplicationsOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onManageApplicationsPress = () => {
-    this.setState({ isManageApplicationsOpen: true });
-  };
-
-  onManageApplicationsModalClose = () => {
-    this.setState({ isManageApplicationsOpen: false });
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      isTestingAll,
-      isSyncingIndexers,
-      onTestAllPress,
-      onAppIndexerSyncPress
-    } = this.props;
-
-    const { isManageApplicationsOpen } = this.state;
-
-    return (
-      <PageContent title={translate('Applications')}>
-        <SettingsToolbarConnector
-          showSave={false}
-          additionalButtons={
-            <Fragment>
-              <PageToolbarSeparator />
-
-              <PageToolbarButton
-                label={translate('SyncAppIndexers')}
-                iconName={icons.REFRESH}
-                isSpinning={isSyncingIndexers}
-                onPress={onAppIndexerSyncPress}
-              />
-
-              <PageToolbarButton
-                label={translate('TestAllApps')}
-                iconName={icons.TEST}
-                isSpinning={isTestingAll}
-                onPress={onTestAllPress}
-              />
-
-              <PageToolbarButton
-                label={translate('ManageApplications')}
-                iconName={icons.MANAGE}
-                onPress={this.onManageApplicationsPress}
-              />
-            </Fragment>
-          }
-        />
-
-        <PageContentBody>
-          <ApplicationsConnector />
-          <AppProfilesConnector />
-
-          <ManageApplicationsModal
-            isOpen={isManageApplicationsOpen}
-            onModalClose={this.onManageApplicationsModalClose}
-          />
-        </PageContentBody>
-      </PageContent>
-    );
-  }
-}
-
-ApplicationSettings.propTypes = {
-  isTestingAll: PropTypes.bool.isRequired,
-  isSyncingIndexers: PropTypes.bool.isRequired,
-  onTestAllPress: PropTypes.func.isRequired,
-  onAppIndexerSyncPress: PropTypes.func.isRequired
-};
-
-export default ApplicationSettings;

frontend/src/Settings/Applications/ApplicationSettings.tsx

@@ -0,0 +1,102 @@
+import React, { Fragment, useCallback, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import AppState from 'App/State/AppState';
+import { APP_INDEXER_SYNC } from 'Commands/commandNames';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
+import { icons } from 'Helpers/Props';
+import AppProfilesConnector from 'Settings/Profiles/App/AppProfilesConnector';
+import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import { executeCommand } from 'Store/Actions/commandActions';
+import { testAllApplications } from 'Store/Actions/Settings/applications';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import translate from 'Utilities/String/translate';
+import ApplicationsConnector from './Applications/ApplicationsConnector';
+import ManageApplicationsModal from './Applications/Manage/ManageApplicationsModal';
+
+function ApplicationSettings() {
+  const isSyncingIndexers = useSelector(
+    createCommandExecutingSelector(APP_INDEXER_SYNC)
+  );
+  const isTestingAll = useSelector(
+    (state: AppState) => state.settings.applications.isTestingAll
+  );
+  const dispatch = useDispatch();
+
+  const [isManageApplicationsOpen, setIsManageApplicationsOpen] =
+    useState(false);
+
+  const onManageApplicationsPress = useCallback(() => {
+    setIsManageApplicationsOpen(true);
+  }, [setIsManageApplicationsOpen]);
+
+  const onManageApplicationsModalClose = useCallback(() => {
+    setIsManageApplicationsOpen(false);
+  }, [setIsManageApplicationsOpen]);
+
+  const onAppIndexerSyncPress = useCallback(() => {
+    dispatch(
+      executeCommand({
+        name: APP_INDEXER_SYNC,
+        forceSync: true,
+      })
+    );
+  }, [dispatch]);
+
+  const onTestAllPress = useCallback(() => {
+    dispatch(testAllApplications());
+  }, [dispatch]);
+
+  return (
+    <PageContent title={translate('Applications')}>
+      <SettingsToolbarConnector
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        showSave={false}
+        additionalButtons={
+          <Fragment>
+            <PageToolbarSeparator />
+
+            <PageToolbarButton
+              label={translate('SyncAppIndexers')}
+              iconName={icons.REFRESH}
+              isSpinning={isSyncingIndexers}
+              onPress={onAppIndexerSyncPress}
+            />
+
+            <PageToolbarButton
+              label={translate('TestAllApps')}
+              iconName={icons.TEST}
+              isSpinning={isTestingAll}
+              onPress={onTestAllPress}
+            />
+
+            <PageToolbarButton
+              label={translate('ManageApplications')}
+              iconName={icons.MANAGE}
+              onPress={onManageApplicationsPress}
+            />
+          </Fragment>
+        }
+      />
+
+      <PageContentBody>
+        {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+        {/* @ts-ignore */}
+        <ApplicationsConnector />
+        {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+        {/* @ts-ignore */}
+        <AppProfilesConnector />
+
+        <ManageApplicationsModal
+          isOpen={isManageApplicationsOpen}
+          onModalClose={onManageApplicationsModalClose}
+        />
+      </PageContentBody>
+    </PageContent>
+  );
+}
+
+export default ApplicationSettings;

frontend/src/Settings/Applications/ApplicationSettingsConnector.js

@@ -1,35 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import * as commandNames from 'Commands/commandNames';
-import { executeCommand } from 'Store/Actions/commandActions';
-import { testAllApplications } from 'Store/Actions/settingsActions';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
-import ApplicationSettings from './ApplicationSettings';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.applications.isTestingAll,
-    createCommandExecutingSelector(commandNames.APP_INDEXER_SYNC),
-    (isTestingAll, isSyncingIndexers) => {
-      return {
-        isTestingAll,
-        isSyncingIndexers
-      };
-    }
-  );
-}
-
-function mapDispatchToProps(dispatch, props) {
-  return {
-    onTestAllPress() {
-      dispatch(testAllApplications());
-    },
-    onAppIndexerSyncPress() {
-      dispatch(executeCommand({
-        name: commandNames.APP_INDEXER_SYNC
-      }));
-    }
-  };
-}
-
-export default connect(createMapStateToProps, mapDispatchToProps)(ApplicationSettings);

frontend/src/Settings/Applications/Applications/AddApplicationItem.js

@@ -16,10 +16,11 @@ class AddApplicationItem extends Component {
 
   onApplicationSelect = () => {
     const {
-      implementation
+      implementation,
+      implementationName
     } = this.props;
 
-    this.props.onApplicationSelect({ implementation });
+    this.props.onApplicationSelect({ implementation, implementationName });
   };
 
   //
@@ -77,6 +78,7 @@ class AddApplicationItem extends Component {
                               key={preset.name}
                               name={preset.name}
                               implementation={implementation}
+                              implementationName={implementationName}
                               onPress={onApplicationSelect}
                             />
                           );

frontend/src/Settings/Applications/Applications/AddApplicationPresetMenuItem.js

@@ -10,12 +10,14 @@ class AddApplicationPresetMenuItem extends Component {
   onPress = () => {
     const {
       name,
-      implementation
+      implementation,
+      implementationName
     } = this.props;
 
     this.props.onPress({
       name,
-      implementation
+      implementation,
+      implementationName
     });
   };
 
@@ -26,6 +28,7 @@ class AddApplicationPresetMenuItem extends Component {
     const {
       name,
       implementation,
+      implementationName,
       ...otherProps
     } = this.props;
 
@@ -43,6 +46,7 @@ class AddApplicationPresetMenuItem extends Component {
 AddApplicationPresetMenuItem.propTypes = {
   name: PropTypes.string.isRequired,
   implementation: PropTypes.string.isRequired,
+  implementationName: PropTypes.string.isRequired,
   onPress: PropTypes.func.isRequired
 };
 

frontend/src/Settings/Applications/Applications/Application.js

@@ -127,7 +127,7 @@ class Application extends Component {
           isOpen={this.state.isDeleteApplicationModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteApplication')}
-          message={translate('DeleteApplicationMessageText', [name])}
+          message={translate('DeleteApplicationMessageText', { name })}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteApplication}
           onCancel={this.onDeleteApplicationModalClose}

frontend/src/Settings/Applications/Applications/EditApplicationModalContent.js

@@ -19,9 +19,24 @@ import translate from 'Utilities/String/translate';
 import styles from './EditApplicationModalContent.css';
 
 const syncLevelOptions = [
-  { key: 'disabled', value: translate('Disabled') },
-  { key: 'addOnly', value: translate('AddRemoveOnly') },
-  { key: 'fullSync', value: translate('FullSync') }
+  {
+    key: 'disabled',
+    get value() {
+      return translate('Disabled');
+    }
+  },
+  {
+    key: 'addOnly',
+    get value() {
+      return translate('AddRemoveOnly');
+    }
+  },
+  {
+    key: 'fullSync',
+    get value() {
+      return translate('FullSync');
+    }
+  }
 ];
 
 function EditApplicationModalContent(props) {
@@ -56,7 +71,7 @@ function EditApplicationModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {`${id ? translate('Edit') : translate('Add')} ${translate('Application')} - ${implementationName}`}
+        {id ? translate('EditApplicationImplementation', { implementationName }) : translate('AddApplicationImplementation', { implementationName })}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.tsx

@@ -25,10 +25,31 @@ interface ManageApplicationsEditModalContentProps {
 const NO_CHANGE = 'noChange';
 
 const syncLevelOptions = [
-  { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
-  { key: ApplicationSyncLevel.Disabled, value: translate('Disabled') },
-  { key: ApplicationSyncLevel.AddOnly, value: translate('AddOnly') },
-  { key: ApplicationSyncLevel.FullSync, value: translate('FullSync') },
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true,
+  },
+  {
+    key: ApplicationSyncLevel.Disabled,
+    get value() {
+      return translate('Disabled');
+    },
+  },
+  {
+    key: ApplicationSyncLevel.AddOnly,
+    get value() {
+      return translate('AddRemoveOnly');
+    },
+  },
+  {
+    key: ApplicationSyncLevel.FullSync,
+    get value() {
+      return translate('FullSync');
+    },
+  },
 ];
 
 function ManageApplicationsEditModalContent(
@@ -93,7 +114,7 @@ function ManageApplicationsEditModalContent(
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountApplicationsSelected', [selectedCount])}
+          {translate('CountApplicationsSelected', { count: selectedCount })}
         </div>
 
         <div>

frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.tsx

@@ -36,25 +36,25 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    label: translate('Name'),
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    label: translate('Implementation'),
+    label: () => translate('Implementation'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'syncLevel',
-    label: translate('SyncLevel'),
+    label: () => translate('SyncLevel'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'tags',
-    label: translate('Tags'),
+    label: () => translate('Tags'),
     isSortable: true,
     isVisible: true,
   },
@@ -268,9 +268,9 @@ function ManageApplicationsModalContent(
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('DeleteSelectedApplications')}
-        message={translate('DeleteSelectedApplicationsMessageText', [
-          selectedIds.length,
-        ])}
+        message={translate('DeleteSelectedApplicationsMessageText', {
+          count: selectedIds.length,
+        })}
         confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js

@@ -35,7 +35,7 @@ function AddCategoryModalContent(props) {
   return (
     <ModalContent onModalClose={onCancelPress}>
       <ModalHeader>
-        {`${id ? 'Edit' : 'Add'} Category`}
+        {id ? translate('EditCategory') : translate('AddCategory')}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js

@@ -88,7 +88,7 @@ class Category extends Component {
           message={
             <div>
               <div>
-                {translate('AreYouSureYouWantToDeleteCategory', [name])}
+                {translate('AreYouSureYouWantToDeleteCategory')}
               </div>
             </div>
           }

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

@@ -105,7 +105,7 @@ class DownloadClient extends Component {
           isOpen={this.state.isDeleteDownloadClientModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteDownloadClient')}
-          message={translate('DeleteDownloadClientMessageText', [name])}
+          message={translate('DeleteDownloadClientMessageText', { name })}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteDownloadClient}
           onCancel={this.onDeleteDownloadClientModalClose}

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

@@ -84,7 +84,7 @@ class EditDownloadClientModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          {`${id ? translate('Edit') : translate('Add')} ${translate('DownloadClient')} - ${implementationName}`}
+          {id ? translate('EditDownloadClientImplementation', { implementationName }) : translate('AddDownloadClientImplementation', { implementationName })}
         </ModalHeader>
 
         <ModalBody>

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

@@ -25,9 +25,25 @@ interface ManageDownloadClientsEditModalContentProps {
 const NO_CHANGE = 'noChange';
 
 const enableOptions = [
-  { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
-  { key: 'enabled', value: translate('Enabled') },
-  { key: 'disabled', value: translate('Disabled') },
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true,
+  },
+  {
+    key: 'enabled',
+    get value() {
+      return translate('Enabled');
+    },
+  },
+  {
+    key: 'disabled',
+    get value() {
+      return translate('Disabled');
+    },
+  },
 ];
 
 function ManageDownloadClientsEditModalContent(
@@ -113,7 +129,7 @@ function ManageDownloadClientsEditModalContent(
 
       <ModalFooter className={styles.modalFooter}>
         <div className={styles.selected}>
-          {translate('CountDownloadClientsSelected', [selectedCount])}
+          {translate('CountDownloadClientsSelected', { count: selectedCount })}
         </div>
 
         <div>

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

@@ -35,25 +35,25 @@ type OnSelectedChangeCallback = React.ComponentProps<
 const COLUMNS = [
   {
     name: 'name',
-    label: translate('Name'),
+    label: () => translate('Name'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'implementation',
-    label: translate('Implementation'),
+    label: () => translate('Implementation'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'enable',
-    label: translate('Enabled'),
+    label: () => translate('Enabled'),
     isSortable: true,
     isVisible: true,
   },
   {
     name: 'priority',
-    label: translate('ClientPriority'),
+    label: () => translate('ClientPriority'),
     isSortable: true,
     isVisible: true,
   },
@@ -226,9 +226,9 @@ function ManageDownloadClientsModalContent(
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('DeleteSelectedDownloadClients')}
-        message={translate('DeleteSelectedDownloadClientsMessageText', [
-          selectedIds.length,
-        ])}
+        message={translate('DeleteSelectedDownloadClientsMessageText', {
+          count: selectedIds.length,
+        })}
         confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js

@@ -16,10 +16,11 @@ class AddIndexerProxyItem extends Component {
 
   onIndexerProxySelect = () => {
     const {
-      implementation
+      implementation,
+      implementationName
     } = this.props;
 
-    this.props.onIndexerProxySelect({ implementation });
+    this.props.onIndexerProxySelect({ implementation, implementationName });
   };
 
   //
@@ -77,6 +78,7 @@ class AddIndexerProxyItem extends Component {
                               key={preset.name}
                               name={preset.name}
                               implementation={implementation}
+                              implementationName={implementationName}
                               onPress={onIndexerProxySelect}
                             />
                           );

frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js

@@ -47,7 +47,7 @@ function EditIndexerProxyModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {`${id ? 'Edit' : 'Add'} Proxy - ${implementationName}`}
+        {id ? translate('EditIndexerProxyImplementation', { implementationName }) : translate('AddIndexerProxyImplementation', { implementationName })}
       </ModalHeader>
 
       <ModalBody>

frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js

@@ -122,7 +122,7 @@ class IndexerProxy extends Component {
           isOpen={this.state.isDeleteIndexerProxyModalOpen}
           kind={kinds.DANGER}
           title={translate('DeleteIndexerProxy')}
-          message={translate('DeleteIndexerProxyMessageText', [name])}
+          message={translate('DeleteIndexerProxyMessageText', { name })}
           confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteIndexerProxy}
           onCancel={this.onDeleteIndexerProxyModalClose}