](http://www.jetbrains.com/) for providing us with free licenses to their great tools.
+Thank you to [
JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools.
-* [
ReSharper](http://www.jetbrains.com/resharper/)
-* [
WebStorm](http://www.jetbrains.com/webstorm/)
-* [
Rider](http://www.jetbrains.com/rider/)
-* [
dotTrace](http://www.jetbrains.com/dottrace/)
+- [
ReSharper](http://www.jetbrains.com/resharper/)
+- [
WebStorm](http://www.jetbrains.com/webstorm/)
+- [
Rider](http://www.jetbrains.com/rider/)
+- [
dotTrace](http://www.jetbrains.com/dottrace/)
### License
- [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-- Copyright 2010-2024
+- Copyright 2010-2022
Icon Credit - [Box vector created by freepik - www.freepik.com](https://www.freepik.com/vectors/box)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dc667e803..6f778cb9c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,28 +9,24 @@ variables:
testsFolder: './_tests'
yarnCacheFolder: $(Pipeline.Workspace)/.yarn
nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
- majorVersion: '1.35.0'
+ majorVersion: '1.4.0'
minorVersion: $[counter('minorVersion', 1)]
prowlarrVersion: '$(majorVersion).$(minorVersion)'
buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
sentryOrg: 'servarr'
sentryUrl: 'https://sentry.servarr.com'
- dotnetVersion: '6.0.427'
- nodeVersion: '20.X'
- innoVersion: '6.2.2'
+ dotnetVersion: '6.0.408'
+ innoVersion: '6.2.0'
+ nodeVersion: '16.x'
windowsImage: 'windows-2022'
- linuxImage: 'ubuntu-22.04'
- macImage: 'macOS-13'
+ linuxImage: 'ubuntu-20.04'
+ macImage: 'macOS-11'
trigger:
branches:
include:
- develop
- master
- paths:
- exclude:
- - .github
- - src/Prowlarr.Api.*/openapi.json
pr:
branches:
@@ -38,9 +34,8 @@ pr:
- develop
paths:
exclude:
- - .github
- src/NzbDrone.Core/Localization/Core
- - src/Prowlarr.Api.*/openapi.json
+ - src/Prowlarr.API.*/openapi.json
stages:
- stage: Setup
@@ -166,10 +161,10 @@ stages:
pool:
vmImage: $(imageName)
steps:
- - task: UseNode@1
+ - task: NodeTool@0
displayName: Set Node.js version
inputs:
- version: $(nodeVersion)
+ versionSpec: $(nodeVersion)
- checkout: self
submodules: true
fetchDepth: 1
@@ -354,7 +349,7 @@ stages:
includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0
- task: ArchiveFiles@2
- displayName: Create freebsd-x64 tar
+ displayName: Create FreeBSD Core Core tar
inputs:
archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(buildName).freebsd-core-x64.tar.gz'
archiveType: 'tar'
@@ -367,7 +362,7 @@ stages:
- bash: |
echo "Uploading source maps to sentry"
curl -sL https://sentry.io/get-cli/ | bash
- RELEASENAME="Prowlarr@${PROWLARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
+ RELEASENAME="${PROWLARRVERSION}-${BUILD_SOURCEBRANCHNAME}"
sentry-cli releases new --finalize -p prowlarr -p prowlarr-ui -p prowlarr-update "${RELEASENAME}"
sentry-cli releases -p prowlarr-ui files "${RELEASENAME}" upload-sourcemaps _output/UI/ --rewrite
sentry-cli releases set-commits --auto "${RELEASENAME}"
@@ -533,8 +528,8 @@ stages:
testRunTitle: '$(testName) Unit Tests'
failTaskOnFailedTests: true
- - job: Unit_LinuxCore_Postgres14
- displayName: Unit Native LinuxCore with Postgres14 Database
+ - job: Unit_LinuxCore_Postgres
+ displayName: Unit Native LinuxCore with Postgres Database
dependsOn: Prepare
condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
variables:
@@ -570,7 +565,6 @@ 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: |
@@ -583,60 +577,7 @@ stages:
inputs:
testResultsFormat: 'NUnit'
testResultsFiles: '**/TestResult.xml'
- 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'
+ testRunTitle: 'LinuxCore Postgres Unit Tests'
failTaskOnFailedTests: true
- stage: Integration
@@ -722,8 +663,8 @@ stages:
failTaskOnFailedTests: true
displayName: Publish Test Results
- - job: Integration_LinuxCore_Postgres14
- displayName: Integration Native LinuxCore with Postgres14 Database
+ - job: Integration_LinuxCore_Postgres
+ displayName: Integration Native LinuxCore with Postgres Database
dependsOn: Prepare
condition: and(succeeded(), eq(dependencies.Prepare.outputs['setVar.backendNotUpdated'], '0'))
variables:
@@ -769,7 +710,6 @@ 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: |
@@ -780,70 +720,7 @@ stages:
inputs:
testResultsFormat: 'NUnit'
testResultsFiles: '**/TestResult.xml'
- 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'
+ testRunTitle: 'Integration LinuxCore Postgres Database Integration Tests'
failTaskOnFailedTests: true
displayName: Publish Test Results
@@ -1075,10 +952,10 @@ stages:
pool:
vmImage: $(imageName)
steps:
- - task: UseNode@1
+ - task: NodeTool@0
displayName: Set Node.js version
inputs:
- version: $(nodeVersion)
+ versionSpec: $(nodeVersion)
- checkout: self
submodules: true
fetchDepth: 1
@@ -1169,12 +1046,12 @@ stages:
submodules: true
- powershell: Set-Service SCardSvr -StartupType Manual
displayName: Enable Windows Test Service
- - task: SonarCloudPrepare@3
+ - task: SonarCloudPrepare@1
condition: eq(variables['System.PullRequest.IsFork'], 'False')
inputs:
SonarCloud: 'SonarCloud'
organization: 'prowlarr'
- scannerMode: 'dotnet'
+ scannerMode: 'MSBuild'
projectKey: 'Prowlarr_Prowlarr'
projectName: 'Prowlarr'
projectVersion: '$(prowlarrVersion)'
@@ -1187,21 +1064,25 @@ stages:
./build.sh --backend -f net6.0 -r win-x64
TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
displayName: Coverage Unit Tests
- - task: SonarCloudAnalyze@3
+ - task: SonarCloudAnalyze@1
condition: eq(variables['System.PullRequest.IsFork'], 'False')
displayName: Publish SonarCloud Results
- - task: reportgenerator@5.3.11
+ - task: reportgenerator@4
displayName: Generate Coverage Report
inputs:
reports: '$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml'
targetdir: '$(Build.SourcesDirectory)/CoverageResults/combined'
reporttypes: 'HtmlInline_AzurePipelines;Cobertura;Badges'
- publishCodeCoverageResults: true
+ - task: PublishCodeCoverageResults@1
+ displayName: Publish Coverage Report
+ inputs:
+ codeCoverageTool: 'cobertura'
+ summaryFileLocation: './CoverageResults/combined/Cobertura.xml'
+ reportDirectory: './CoverageResults/combined/'
- stage: Report_Out
dependsOn:
- Analyze
- - Installer
- Unit_Test
- Integration
- Automation
diff --git a/build.sh b/build.sh
index 5139dba52..9ce85b634 100755
--- a/build.sh
+++ b/build.sh
@@ -254,7 +254,7 @@ InstallInno()
ProgressStart "Installing portable Inno Setup"
rm -rf _inno
- curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.2}.exe"
+ curl -s --output innosetup.exe "https://files.jrsoftware.org/is/6/innosetup-${INNOVERSION:-6.2.0}.exe"
mkdir _inno
./innosetup.exe //portable=1 //silent //currentuser //dir=.\\_inno
rm innosetup.exe
@@ -392,21 +392,22 @@ then
fi
fi
-if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
+if [ "$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
diff --git a/docs.sh b/docs.sh
old mode 100755
new mode 100644
index 38b0e0fbc..ae11bc83f
--- a/docs.sh
+++ b/docs.sh
@@ -1,18 +1,13 @@
-#!/bin/bash
-set -e
-
-FRAMEWORK="net6.0"
PLATFORM=$1
-ARCHITECTURE="${2:-x64}"
if [ "$PLATFORM" = "Windows" ]; then
- RUNTIME="win-$ARCHITECTURE"
+ RUNTIME="win-x64"
elif [ "$PLATFORM" = "Linux" ]; then
- RUNTIME="linux-$ARCHITECTURE"
+ RUNTIME="linux-x64"
elif [ "$PLATFORM" = "Mac" ]; then
- RUNTIME="osx-$ARCHITECTURE"
+ RUNTIME="osx-x64"
else
- echo "Platform must be provided as first argument: Windows, Linux or Mac"
+ echo "Platform must be provided as first arguement: Windows, Linux or Mac"
exit 1
fi
@@ -26,23 +21,17 @@ slnFile=src/Prowlarr.sln
platform=Posix
- if [ "$PLATFORM" = "Windows" ]; then
- application=Prowlarr.Console.dll
-else
- application=Prowlarr.dll
-fi
-
dotnet clean $slnFile -c Debug
dotnet clean $slnFile -c Release
dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p:RuntimeIdentifiers=$RUNTIME -t:PublishAllRids
dotnet new tool-manifest
-dotnet tool install --version 7.3.2 Swashbuckle.AspNetCore.Cli
+dotnet tool install --version 6.5.0 Swashbuckle.AspNetCore.Cli
-dotnet tool run swagger tofile --output ./src/Prowlarr.Api.V1/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v1 &
+dotnet tool run swagger tofile --output ./src/Prowlarr.Api.V1/openapi.json "$outputFolder/net6.0/$RUNTIME/prowlarr.console.dll" v1 &
-sleep 45
+sleep 30
kill %1
diff --git a/frontend/.csscomb.json b/frontend/.csscomb.json
new file mode 100644
index 000000000..a82e49732
--- /dev/null
+++ b/frontend/.csscomb.json
@@ -0,0 +1,25 @@
+{
+ "remove-empty-rulesets": true,
+ "always-semicolon": true,
+ "color-case": "lower",
+ "block-indent": " ",
+ "color-shorthand": false,
+ "element-case": "lower",
+ "eof-newline": true,
+ "leading-zero": true,
+ "quotes": "double",
+ "sort-order-fallback": "abc",
+ "space-before-colon": "",
+ "space-after-colon": " ",
+ "space-before-combinator": " ",
+ "space-after-combinator": " ",
+ "space-between-declarations": "\n",
+ "space-before-opening-brace": " ",
+ "space-after-opening-brace": "\n",
+ "space-after-selector-delimiter": " ",
+ "space-before-selector-delimiter": "",
+ "space-before-closing-brace": "\n",
+ "strip-spaces": true,
+ "tab-size": true,
+ "unitless-zero": false
+}
diff --git a/frontend/.esformatter b/frontend/.esformatter
new file mode 100644
index 000000000..600bb0751
--- /dev/null
+++ b/frontend/.esformatter
@@ -0,0 +1,335 @@
+{
+ "indent": {
+ "value": " ",
+ "FunctionExpression": 1,
+ "ArrayExpression": 1,
+ "ObjectExpression": 1
+ },
+ "lineBreak": {
+ "value": "\n",
+
+ "before": {
+ "ArrayPatternClosing": 0,
+ "ArrayPatternComma": 0,
+ "ArrayPatternOpening": 0,
+ "ArrowFunctionExpressionArrow": 0,
+ "ArrowFunctionExpressionClosingBrace": ">=1",
+ "ArrowFunctionExpressionOpeningBrace": 0,
+ "AssignmentExpression": ">=1",
+ "AssignmentOperator": 0,
+ "BlockStatement": 0,
+ "BreakKeyword": ">=1",
+ "CallExpression": -1,
+ "CallExpressionClosingParentheses": -1,
+ "CallExpressionOpeningParentheses": 0,
+ "CatchClosingBrace": ">=1",
+ "CatchKeyword": 0,
+ "CatchOpeningBrace": 0,
+ "ClassDeclaration": ">=1",
+ "ClassDeclarationClosingBrace": ">=1",
+ "ClassDeclarationOpeningBrace": 0,
+ "ConditionalExpression": ">=1",
+ "DeleteOperator": ">=1",
+ "DoWhileStatement": ">=1",
+ "DoWhileStatementClosingBrace": ">=1",
+ "DoWhileStatementOpeningBrace": 0,
+ "ElseIfStatement": 0,
+ "ElseIfStatementClosingBrace": ">=1",
+ "ElseIfStatementOpeningBrace": 0,
+ "ElseStatement": 0,
+ "ElseStatementClosingBrace": ">=1",
+ "ElseStatementOpeningBrace": 0,
+ "EmptyStatement": -1,
+ "EndOfFile": -1,
+ "FinallyClosingBrace": ">=1",
+ "FinallyKeyword": -1,
+ "FinallyOpeningBrace": 0,
+ "ForInStatement": ">=1",
+ "ForInStatementClosingBrace": ">=1",
+ "ForInStatementExpressionClosing": 0,
+ "ForInStatementExpressionOpening": 0,
+ "ForInStatementOpeningBrace": 0,
+ "ForStatement": ">=1",
+ "ForStatementClosingBrace": ">=1",
+ "ForStatementExpressionClosing": "<2",
+ "ForStatementExpressionOpening": 0,
+ "ForStatementOpeningBrace": 0,
+ "FunctionDeclaration": ">=1",
+ "FunctionDeclarationClosingBrace": ">=1",
+ "FunctionDeclarationOpeningBrace": 0,
+ "FunctionExpression": 0,
+ "FunctionExpressionClosingBrace": 1,
+ "FunctionExpressionOpeningBrace":0,
+ "IIFEClosingParentheses": 0,
+ "IfStatement": ">=1",
+ "IfStatementClosingBrace": ">=1",
+ "IfStatementOpeningBrace": 0,
+ "LogicalExpression": -1,
+ "MemberExpressionClosing": 0,
+ "MemberExpressionOpening": 0,
+ "MemberExpressionPeriod": -1,
+ "MethodDefinition": ">=1",
+ "ObjectExpressionClosingBrace": "<=1",
+ "ObjectPatternClosingBrace": 0,
+ "ObjectPatternComma": 0,
+ "ObjectPatternOpeningBrace": 0,
+ "ParameterDefault": 0,
+ "Property": "<=2",
+ "PropertyValue": 0,
+ "ReturnStatement": -1,
+ "SwitchClosingBrace": ">=1",
+ "SwitchOpeningBrace": 0,
+ "ThisExpression": -1,
+ "ThrowStatement": ">=1",
+ "TryClosingBrace": ">=1",
+ "TryKeyword": -1,
+ "TryOpeningBrace": 0,
+ "VariableDeclaration": ">=1",
+ "VariableDeclarationSemiColon": 0,
+ "VariableDeclarationWithoutInit": ">=1",
+ "VariableName": ">=1",
+ "VariableValue": 0,
+ "WhileStatement": ">=1",
+ "WhileStatementClosingBrace": ">=1",
+ "WhileStatementOpeningBrace": 0
+ },
+
+ "after": {
+ "ArrayPatternClosing": 0,
+ "ArrayPatternComma": 0,
+ "ArrayPatternOpening": 0,
+ "ArrowFunctionExpressionArrow": 0,
+ "ArrowFunctionExpressionClosingBrace": -1,
+ "ArrowFunctionExpressionOpeningBrace": ">=1",
+ "AssignmentExpression": ">=1",
+ "AssignmentOperator": 0,
+ "BlockStatement": 0,
+ "BreakKeyword": -1,
+ "CallExpression": -1,
+ "CallExpressionClosingParentheses": -1,
+ "CallExpressionOpeningParentheses": -1,
+ "CatchClosingBrace": ">=0",
+ "CatchKeyword": 0,
+ "CatchOpeningBrace": ">=1",
+ "ClassDeclaration": ">=1",
+ "ClassDeclarationClosingBrace": ">=1",
+ "ClassDeclarationOpeningBrace": ">=1",
+ "ConditionalExpression": ">=1",
+ "DeleteOperator": ">=1",
+ "DoWhileStatement": ">=1",
+ "DoWhileStatementClosingBrace": 0,
+ "DoWhileStatementOpeningBrace": ">=1",
+ "ElseIfStatement": ">=1",
+ "ElseIfStatementClosingBrace": ">=1",
+ "ElseIfStatementOpeningBrace": ">=1",
+ "ElseStatement": ">=1",
+ "ElseStatementClosingBrace": ">=1",
+ "ElseStatementOpeningBrace": ">=1",
+ "EmptyStatement": -1,
+ "FinallyClosingBrace": ">=1",
+ "FinallyKeyword": -1,
+ "FinallyOpeningBrace": ">=1",
+ "ForInStatement": ">=1",
+ "ForInStatementClosingBrace": ">=1",
+ "ForInStatementExpressionClosing": -1,
+ "ForInStatementExpressionOpening": "<2",
+ "ForInStatementOpeningBrace": ">=1",
+ "ForStatement": ">=1",
+ "ForStatementClosingBrace": ">=1",
+ "ForStatementExpressionClosing": -1,
+ "ForStatementExpressionOpening": "<2",
+ "ForStatementOpeningBrace": ">=1",
+ "FunctionDeclaration": ">=1",
+ "FunctionDeclarationClosingBrace": ">=1",
+ "FunctionDeclarationOpeningBrace": ">=1",
+ "FunctionExpression": 0,
+ "FunctionExpressionClosingBrace": -1,
+ "FunctionExpressionOpeningBrace": 1,
+ "IIFEOpeningParentheses": 0,
+ "IfStatement": ">=1",
+ "IfStatementClosingBrace": ">=1",
+ "IfStatementOpeningBrace": ">=1",
+ "LogicalExpression": -1,
+ "MemberExpressionClosing": 0,
+ "MemberExpressionOpening": 0,
+ "MemberExpressionPeriod": 0,
+ "MethodDefinition": ">=1",
+ "ObjectExpressionOpeningBrace": "<=1",
+ "ObjectPatternClosingBrace": 0,
+ "ObjectPatternComma": 0,
+ "ObjectPatternOpeningBrace": 0,
+ "ParameterDefault": 0,
+ "Property": -1,
+ "PropertyName": 0,
+ "ReturnStatement": -1,
+ "SwitchCaseColon": ">=1",
+ "SwitchClosingBrace": ">=1",
+ "SwitchOpeningBrace": ">=1",
+ "ThisExpression": 0,
+ "ThrowStatement": ">=1",
+ "TryClosingBrace": 0,
+ "TryKeyword": -1,
+ "TryOpeningBrace": ">=1",
+ "VariableDeclaration": ">=1",
+ "VariableDeclarationSemiColon": ">=1",
+ "VariableValue": -1,
+ "WhileStatement": ">=1",
+ "WhileStatementClosingBrace": ">=1",
+ "WhileStatementOpeningBrace": ">=1"
+ }
+ },
+ "whiteSpace": {
+ "value": " ",
+ "removeTrailing": 1,
+ "before": {
+ "ArgumentComma": 0,
+ "ArgumentList": 0,
+ "ArgumentListArrayExpression": 0,
+ "ArgumentListFunctionExpression": 1,
+ "ArgumentListObjectExpression": 0,
+ "ArrayExpressionClosing": 0,
+ "ArrayExpressionComma": 0,
+ "ArrayExpressionOpening": 1,
+ "AssignmentOperator": 1,
+ "BinaryExpression": 0,
+ "BinaryExpressionOperator": 1,
+ "BlockComment": 1,
+ "CallExpression": 1,
+ "CatchClosingBrace": 1,
+ "CatchKeyword": 1,
+ "CatchOpeningBrace": 1,
+ "CatchParameterList": 0,
+ "CommaOperator": 0,
+ "ConditionalExpressionAlternate": 1,
+ "ConditionalExpressionConsequent": 1,
+ "DoWhileStatementClosingBrace": 1,
+ "DoWhileStatementConditional": 1,
+ "DoWhileStatementOpeningBrace": 1,
+ "ElseIfStatementClosingBrace": 1,
+ "ElseIfStatementOpeningBrace": 1,
+ "ElseStatementClosingBrace": 1,
+ "ElseStatementOpeningBrace": 1,
+ "EmptyStatement": 0,
+ "ExpressionClosingParentheses": 0,
+ "FinallyClosingBrace": 1,
+ "FinallyKeyword": -1,
+ "FinallyOpeningBrace": 1,
+ "ForInStatement": 1,
+ "ForInStatementClosingBrace": 1,
+ "ForInStatementExpressionClosing": 0,
+ "ForInStatementExpressionOpening": 1,
+ "ForInStatementOpeningBrace": 1,
+ "ForStatement": 1,
+ "ForStatementClosingBrace": 1,
+ "ForStatementExpressionClosing": 0,
+ "ForStatementExpressionOpening": 1,
+ "ForStatementOpeningBrace": 1,
+ "ForStatementSemicolon": 0,
+ "FunctionDeclarationClosingBrace": 1,
+ "FunctionDeclarationOpeningBrace": 1,
+ "FunctionExpressionClosingBrace": 1,
+ "FunctionExpressionOpeningBrace": 1,
+ "IfStatementClosingBrace": 1,
+ "IfStatementConditionalClosing": 0,
+ "IfStatementConditionalOpening": 1,
+ "IfStatementOpeningBrace": 1,
+ "LineComment": 1,
+ "LogicalExpressionOperator": 1,
+ "MemberExpressionClosing": 0,
+ "ObjectExpressionClosingBrace": 1,
+ "ParameterComma": 0,
+ "ParameterList": 0,
+ "Property": 1,
+ "PropertyName": 1,
+ "PropertyValue": 1,
+ "SwitchDiscriminantClosing": 0,
+ "SwitchDiscriminantOpening": 1,
+ "ThrowKeyword": 1,
+ "TryClosingBrace": 1,
+ "TryKeyword": -1,
+ "TryOpeningBrace": 1,
+ "UnaryExpressionOperator": 0,
+ "VariableName": 1,
+ "VariableValue": 1,
+ "WhileStatementClosingBrace": 1,
+ "WhileStatementConditionalClosing": 0,
+ "WhileStatementConditionalOpening": 1,
+ "WhileStatementOpeningBrace": 1
+ },
+ "after": {
+ "ArgumentComma": 1,
+ "ArgumentList": 0,
+ "ArgumentListArrayExpression": 1,
+ "ArgumentListFunctionExpression": 1,
+ "ArgumentListObjectExpression": 0,
+ "ArrayExpressionClosing": 0,
+ "ArrayExpressionComma": 1,
+ "ArrayExpressionOpening": 0,
+ "AssignmentOperator": 1,
+ "BinaryExpression": 0,
+ "BinaryExpressionOperator": 1,
+ "BlockComment": 1,
+ "CallExpression": 0,
+ "CatchClosingBrace": 1,
+ "CatchKeyword": 1,
+ "CatchOpeningBrace": 1,
+ "CatchParameterList": 0,
+ "CommaOperator": 1,
+ "ConditionalExpressionConsequent": 1,
+ "ConditionalExpressionTest": 1,
+ "DoWhileStatementBody": 1,
+ "DoWhileStatementClosingBrace": 1,
+ "DoWhileStatementOpeningBrace": 1,
+ "ElseIfStatementClosingBrace": 1,
+ "ElseIfStatementOpeningBrace": 1,
+ "ElseStatementClosingBrace": 1,
+ "ElseStatementOpeningBrace": 1,
+ "EmptyStatement": 0,
+ "ExpressionOpeningParentheses": 0,
+ "FinallyClosingBrace": 1,
+ "FinallyKeyword": -1,
+ "FinallyOpeningBrace": 1,
+ "ForInStatement": 1,
+ "ForInStatementClosingBrace": 1,
+ "ForInStatementExpressionClosing": 1,
+ "ForInStatementExpressionOpening": 0,
+ "ForInStatementOpeningBrace": 1,
+ "ForStatement": 1,
+ "ForStatementClosingBrace": 1,
+ "ForStatementExpressionClosing": 1,
+ "ForStatementExpressionOpening": 0,
+ "ForStatementOpeningBrace": 1,
+ "ForStatementSemicolon": 1,
+ "FunctionDeclarationClosingBrace": 0,
+ "FunctionDeclarationOpeningBrace": 0,
+ "FunctionExpressionClosingBrace": 0,
+ "FunctionExpressionOpeningBrace": 0,
+ "FunctionName": 0,
+ "FunctionReservedWord": 0,
+ "IfStatementClosingBrace": 1,
+ "IfStatementConditionalClosing": 0,
+ "IfStatementConditionalOpening": 0,
+ "IfStatementOpeningBrace": 1,
+ "LogicalExpressionOperator": 1,
+ "MemberExpressionOpening": 0,
+ "ObjectExpressionClosingBrace": 0,
+ "ObjectExpressionOpeningBrace": 1,
+ "ParameterComma": 1,
+ "ParameterList": 0,
+ "PropertyName": 0,
+ "PropertyValue": 0,
+ "SwitchDiscriminantClosing": 1,
+ "SwitchDiscriminantOpening": 0,
+ "ThrowKeyword": 1,
+ "TryClosingBrace": 1,
+ "TryKeyword": -1,
+ "TryOpeningBrace": 1,
+ "UnaryExpressionOperator": 0,
+ "VariableName": 1,
+ "WhileStatementClosingBrace": 1,
+ "WhileStatementConditionalClosing": 1,
+ "WhileStatementConditionalOpening": 0,
+ "WhileStatementOpeningBrace": 1
+ }
+ }
+}
diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 56eaaeaab..484650bb0 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -12,8 +12,6 @@ const dirs = fs
.join('|');
module.exports = {
- root: true,
-
parser: '@babel/eslint-parser',
env: {
@@ -26,8 +24,7 @@ module.exports = {
globals: {
expect: false,
chai: false,
- sinon: false,
- JSX: true
+ sinon: false
},
parserOptions: {
@@ -357,16 +354,11 @@ module.exports = {
],
rules: Object.assign(typescriptEslintRecommended.rules, {
- '@typescript-eslint/no-unused-vars': [
- 'error',
- {
- args: 'after-used',
- argsIgnorePattern: '^_',
- ignoreRestSiblings: true
- }
- ],
- '@typescript-eslint/explicit-function-return-type': 'off',
'no-shadow': 'off',
+ // These should be enabled after cleaning things up
+ '@typescript-eslint/no-unused-vars': 'warn',
+ '@typescript-eslint/explicit-function-return-type': 'off',
+ 'react/prop-types': 'off',
'prettier/prettier': 'error',
'simple-import-sort/imports': [
'error',
@@ -379,41 +371,7 @@ module.exports = {
['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
]
}
- ],
-
- // React Hooks
- 'react-hooks/rules-of-hooks': 'error',
- 'react-hooks/exhaustive-deps': 'error',
-
- // React
- 'react/function-component-definition': 'error',
- 'react/hook-use-state': 'error',
- 'react/jsx-boolean-value': ['error', 'always'],
- 'react/jsx-curly-brace-presence': [
- 'error',
- { props: 'never', children: 'never' }
- ],
- 'react/jsx-fragments': 'error',
- 'react/jsx-handler-names': [
- 'error',
- {
- eventHandlerPrefix: 'on',
- eventHandlerPropPrefix: 'on'
- }
- ],
- 'react/jsx-no-bind': ['error', { ignoreRefs: true }],
- 'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
- 'react/jsx-pascal-case': ['error', { allowAllCaps: true }],
- 'react/jsx-sort-props': [
- 'error',
- {
- callbacksLast: true,
- noSortAlphabetically: true,
- reservedFirst: true
- }
- ],
- 'react/prop-types': 'off',
- 'react/self-closing-comp': 'error'
+ ]
})
},
{
diff --git a/frontend/.jsbeautifyrc b/frontend/.jsbeautifyrc
new file mode 100644
index 000000000..50aa6aa29
--- /dev/null
+++ b/frontend/.jsbeautifyrc
@@ -0,0 +1,12 @@
+{
+ "js": {
+ "indent_size": 2,
+ "indent_char": " ",
+ "indent_level": 2,
+ "indent_with_tabs": false,
+ "preserve_newlines": true,
+ "brace_style": "collapse",
+ "max_preserve_newlines": 2,
+ "jslint_happy": true
+ }
+}
\ No newline at end of file
diff --git a/frontend/.stylelintrc b/frontend/.stylelintrc
index f19357a4c..fb0d550bf 100644
--- a/frontend/.stylelintrc
+++ b/frontend/.stylelintrc
@@ -1,12 +1,12 @@
{
- "plugins": [
- "stylelint-order"
- ],
- "ignoreFiles": [
- "frontend/src/Styles/scaffolding.css",
- "**/*.js"
- ],
- "rules": {
+"plugins": [
+ "stylelint-order"
+],
+"ignoreFiles": [
+ "frontend/src/Styles/scaffolding.css",
+ "**/*.js"
+],
+"rules": {
"at-rule-empty-line-before": [
"always",
{
@@ -15,6 +15,9 @@
]
}
],
+ "at-rule-name-case": "lower",
+ "at-rule-name-newline-after": "always-multi-line",
+ "at-rule-name-space-after": "always",
"at-rule-no-unknown": [
true,
{
@@ -25,36 +28,83 @@
}
],
"at-rule-no-vendor-prefix": true,
+ "at-rule-semicolon-newline-after": "always",
+ "at-rule-semicolon-space-before": "never",
+ "block-closing-brace-empty-line-before": "never",
+ "block-closing-brace-newline-after": "always",
+ "block-closing-brace-newline-before": "always",
+ "block-closing-brace-space-after": "always-single-line",
+ "block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
+ "block-opening-brace-newline-after": "always",
+ "block-opening-brace-newline-before": "never-single-line",
+ "block-opening-brace-space-after": "always-single-line",
+ "block-opening-brace-space-before": "always",
+ "color-hex-case": "lower",
"color-hex-length": "short",
"color-named": "never",
"color-no-invalid-hex": true,
"comment-whitespace-inside": "always",
+ "declaration-bang-space-after": "never",
+ "declaration-bang-space-before": "always",
"declaration-block-no-duplicate-properties": [
true,
{
"ignoreProperties": [
- "composes"
+ "composes"
]
}
],
"declaration-block-no-redundant-longhand-properties": true,
"declaration-block-no-shorthand-property-overrides": true,
+ "declaration-block-semicolon-newline-after": "always",
+ "declaration-block-semicolon-newline-before": "never-multi-line",
+ "declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
+ "declaration-block-trailing-semicolon": "always",
+ "declaration-colon-space-after": "always",
+ "declaration-colon-space-before": "never",
"font-family-name-quotes": "always-unless-keyword",
"function-calc-no-unspaced-operator": true,
+ "function-comma-newline-after": "never-multi-line",
+ "function-comma-newline-before": "never-multi-line",
+ "function-comma-space-after": "always",
+ "function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-name-case": "lower",
+ "function-parentheses-newline-inside": "never-multi-line",
+ "function-parentheses-space-inside": "never",
"function-url-quotes": "always",
"function-url-scheme-disallowed-list": [
"data"
],
+ "function-whitespace-after": "always",
+ "indentation": 2,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": true,
+ "max-empty-lines": 1,
+ "max-line-length": [
+ 100,
+ {
+ "ignore": [
+ "non-comments"
+ ]
+ }
+ ],
"max-nesting-depth": 2,
+ "media-feature-colon-space-after": "always",
+ "media-feature-colon-space-before": "never",
+ "media-feature-name-case": "lower",
"media-feature-name-no-vendor-prefix": true,
+ "media-feature-range-operator-space-after": "always",
+ "media-feature-range-operator-space-before": "always",
"no-empty-source": true,
+ "no-eol-whitespace": true,
+ "no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
+ "no-missing-end-of-source-newline": true,
+ "number-leading-zero": "always",
+ "number-no-trailing-zeros": true,
"order/order": [
"custom-properties",
"dollar-variables",
@@ -82,7 +132,6 @@
"right",
"bottom",
"left",
- "inset",
"z-index",
"display",
"visibility",
@@ -294,33 +343,54 @@
]
}
],
+ "property-case": "lower",
"property-no-vendor-prefix": true,
"rule-empty-line-before": [
"always",
{
"except": [
- "first-nested"
+ "first-nested"
],
"ignore": [
- "after-comment"
+ "after-comment"
]
}
],
+ "selector-attribute-brackets-space-inside": "never",
+ "selector-attribute-operator-space-after": "never",
+ "selector-attribute-operator-space-before": "never",
"selector-attribute-quotes": "never",
"selector-class-pattern": "^[A-Za-z0-9]+$",
+ "selector-combinator-space-after": "always",
+ "selector-combinator-space-before": "always",
+ "selector-descendant-combinator-no-non-space": true,
+ "selector-list-comma-newline-after": "always",
+ "selector-list-comma-newline-before": "never-multi-line",
+ "selector-list-comma-space-before": "never",
"selector-max-attribute": 0,
"selector-max-class": 3,
"selector-max-compound-selectors": 3,
+ "selector-max-empty-lines": 0,
"selector-max-id": 0,
"selector-max-universal": 0,
+ "selector-pseudo-class-case": "lower",
+ "selector-pseudo-class-parentheses-space-inside": "never",
+ "selector-pseudo-element-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"shorthand-property-no-redundant-values": true,
"string-no-newline": true,
+ "string-quotes": "single",
"time-min-milliseconds": 100,
+ "unit-case": "lower",
"unit-no-unknown": true,
+ "value-list-comma-newline-after": "never-multi-line",
+ "value-list-comma-newline-before": "never-multi-line",
+ "value-list-comma-space-after": "always",
+ "value-list-comma-space-before": "never",
+ "value-list-max-empty-lines": 0,
"value-no-vendor-prefix": true
}
-}
\ No newline at end of file
+}
diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.json
deleted file mode 100644
index 0e005a3cd..000000000
--- a/frontend/.vscode/extensions.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "recommendations": [
- "stylelint.vscode-stylelint",
- "dbaeumer.vscode-eslint",
- "esbenp.prettier-vscode"
- ]
-}
\ No newline at end of file
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
index ade9f24a2..4d60cc820 100644
--- a/frontend/babel.config.js
+++ b/frontend/babel.config.js
@@ -2,18 +2,16 @@ const loose = true;
module.exports = {
plugins: [
- '@babel/plugin-transform-logical-assignment-operators',
-
// Stage 1
'@babel/plugin-proposal-export-default-from',
- ['@babel/plugin-transform-optional-chaining', { loose }],
- ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
+ ['@babel/plugin-proposal-optional-chaining', { loose }],
+ ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
// Stage 2
- '@babel/plugin-transform-export-namespace-from',
+ '@babel/plugin-proposal-export-namespace-from',
// Stage 3
- ['@babel/plugin-transform-class-properties', { loose }],
+ ['@babel/plugin-proposal-class-properties', { loose }],
'@babel/plugin-syntax-dynamic-import'
],
env: {
diff --git a/frontend/build/webpack.config.js b/frontend/build/webpack.config.js
index ceacc4f04..385cd6481 100644
--- a/frontend/build/webpack.config.js
+++ b/frontend/build/webpack.config.js
@@ -25,7 +25,6 @@ module.exports = (env) => {
const config = {
mode: isProduction ? 'production' : 'development',
devtool: isProduction ? 'source-map' : 'eval-source-map',
- target: 'web',
stats: {
children: false
@@ -36,7 +35,7 @@ module.exports = (env) => {
},
entry: {
- index: 'index.ts'
+ index: 'index.js'
},
resolve: {
@@ -51,7 +50,7 @@ module.exports = (env) => {
'node_modules'
],
alias: {
- jquery: 'jquery/dist/jquery.min'
+ jquery: 'jquery/src/jquery'
},
fallback: {
buffer: false,
@@ -66,23 +65,23 @@ module.exports = (env) => {
output: {
path: distFolder,
publicPath: '/',
- filename: isProduction ? '[name]-[contenthash].js' : '[name].js',
+ filename: '[name].js',
sourceMapFilename: '[file].map'
},
optimization: {
moduleIds: 'deterministic',
- chunkIds: isProduction ? 'deterministic' : 'named'
+ chunkIds: 'named',
+ splitChunks: {
+ chunks: 'initial',
+ name: 'vendors'
+ }
},
performance: {
hints: false
},
- experiments: {
- topLevelAwait: true
- },
-
plugins: [
new webpack.DefinePlugin({
__DEV__: !isProduction,
@@ -90,15 +89,13 @@ module.exports = (env) => {
}),
new MiniCssExtractPlugin({
- filename: 'Content/styles.css',
- chunkFilename: isProduction ? 'Content/[id]-[chunkhash].css' : 'Content/[id].css'
+ filename: 'Content/styles.css'
}),
new HtmlWebpackPlugin({
template: 'frontend/src/index.ejs',
filename: 'index.html',
- publicPath: '/',
- inject: false
+ publicPath: '/'
}),
new FileManagerPlugin({
@@ -170,7 +167,7 @@ module.exports = (env) => {
loose: true,
debug: false,
useBuiltIns: 'entry',
- corejs: '3.39'
+ corejs: 3
}
]
]
@@ -191,7 +188,7 @@ module.exports = (env) => {
options: {
importLoaders: 1,
modules: {
- localIdentName: isProduction ? '[name]/[local]/[hash:base64:5]' : '[name]/[local]'
+ localIdentName: '[name]/[local]/[hash:base64:5]'
}
}
},
@@ -254,19 +251,18 @@ module.exports = (env) => {
config.resolve.alias['react-dom$'] = 'react-dom/profiling';
config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
- config.optimization = {
- minimize: true,
- minimizer: [
- new TerserPlugin({
- terserOptions: {
- sourceMap: true, // Must be set to true if using source-maps in production
- mangle: false,
- keep_classnames: true,
- keep_fnames: true
- }
- })
- ]
- };
+ config.optimization.minimizer = [
+ new TerserPlugin({
+ cache: true,
+ parallel: true,
+ sourceMap: true, // Must be set to true if using source-maps in production
+ terserOptions: {
+ mangle: false,
+ keep_classnames: true,
+ keep_fnames: true
+ }
+ })
+ ];
}
return config;
diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js
index 89db00f8c..f657adf28 100644
--- a/frontend/postcss.config.js
+++ b/frontend/postcss.config.js
@@ -16,7 +16,6 @@ const mixinsFiles = [
module.exports = {
plugins: [
- 'autoprefixer',
['postcss-mixins', {
mixinsFiles
}],
diff --git a/frontend/.vscode/settings.json b/frontend/src/.vscode/settings.json
similarity index 100%
rename from frontend/.vscode/settings.json
rename to frontend/src/.vscode/settings.json
diff --git a/frontend/src/App/App.tsx b/frontend/src/App/App.js
similarity index 57%
rename from frontend/src/App/App.tsx
rename to frontend/src/App/App.js
index dba90a697..1eea6e082 100644
--- a/frontend/src/App/App.tsx
+++ b/frontend/src/App/App.js
@@ -1,30 +1,31 @@
-import { ConnectedRouter, ConnectedRouterProps } from 'connected-react-router';
+import { ConnectedRouter } from 'connected-react-router';
+import PropTypes from 'prop-types';
import React from 'react';
import DocumentTitle from 'react-document-title';
import { Provider } from 'react-redux';
-import { Store } from 'redux';
import PageConnector from 'Components/Page/PageConnector';
import ApplyTheme from './ApplyTheme';
import AppRoutes from './AppRoutes';
-interface AppProps {
- store: Store;
- history: ConnectedRouterProps['history'];
-}
-
-function App({ store, history }: AppProps) {
+function App({ store, history }) {
return (
{translate('ConnectionLostToBackend')}
+
+ {translate('ConnectionLostMessage')}
+
- {translate('ConnectionLostReconnect')}
+ {translate('ConnectionLostAutomaticMessage')}
+
@@ -30,13 +29,12 @@ class DescriptionListItem extends Component {
>
{data}
-
+
);
}
}
DescriptionListItem.propTypes = {
- className: PropTypes.string,
titleClassName: PropTypes.string,
descriptionClassName: PropTypes.string,
title: PropTypes.string,
diff --git a/frontend/src/Components/Error/ErrorBoundaryError.tsx b/frontend/src/Components/Error/ErrorBoundaryError.tsx
index 51d286311..b3db237b1 100644
--- a/frontend/src/Components/Error/ErrorBoundaryError.tsx
+++ b/frontend/src/Components/Error/ErrorBoundaryError.tsx
@@ -23,9 +23,7 @@ function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
info,
} = props;
- const [detailedError, setDetailedError] = useState<
- StackTrace.StackFrame[] | null
- >(null);
+ const [detailedError, setDetailedError] = useState(null);
useEffect(() => {
if (error) {
@@ -63,7 +61,11 @@ function ErrorBoundaryError(props: ErrorBoundaryErrorProps) {
{info.componentStack}
)}
- Version: {window.Prowlarr.version}
+ {
+
+ Version: {window.Prowlarr.version}
+
+ }
);
diff --git a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
index dfb720003..3c8aa81a6 100644
--- a/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
+++ b/frontend/src/Components/FileBrowser/FileBrowserModalContent.js
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
import Alert from 'Components/Alert';
import PathInput from 'Components/Form/PathInput';
import Button from 'Components/Link/Button';
@@ -20,12 +21,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
}
];
@@ -38,7 +39,7 @@ class FileBrowserModalContent extends Component {
constructor(props, context) {
super(props, context);
- this._scrollerRef = React.createRef();
+ this._scrollerNode = null;
this.state = {
isFileBrowserModalOpen: false,
@@ -56,10 +57,21 @@ class FileBrowserModalContent extends Component {
currentPath !== prevState.currentPath
) {
this.setState({ currentPath });
- this._scrollerRef.current.scrollTop = 0;
+ this._scrollerNode.scrollTop = 0;
}
}
+ //
+ // Control
+
+ setScrollerRef = (ref) => {
+ if (ref) {
+ this._scrollerNode = ReactDOM.findDOMNode(ref);
+ } else {
+ this._scrollerNode = null;
+ }
+ };
+
//
// Listeners
@@ -133,7 +145,7 @@ class FileBrowserModalContent extends Component {
/>
- {translate('Label')}
+ Label
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
index b02844c61..ed375b745 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
@@ -3,13 +3,10 @@ import React, { Component } from 'react';
import SelectInput from 'Components/Form/SelectInput';
import IconButton from 'Components/Link/IconButton';
import { filterBuilderTypes, filterBuilderValueTypes, icons } from 'Helpers/Props';
-import sortByProp from 'Utilities/Array/sortByProp';
import AppProfileFilterBuilderRowValueConnector from './AppProfileFilterBuilderRowValueConnector';
import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
-import CategoryFilterBuilderRowValue from './CategoryFilterBuilderRowValue';
import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
-import HistoryEventTypeFilterBuilderRowValue from './HistoryEventTypeFilterBuilderRowValue';
import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
import PrivacyFilterBuilderRowValue from './PrivacyFilterBuilderRowValue';
import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
@@ -58,15 +55,9 @@ function getRowValueConnector(selectedFilterBuilderProp) {
case filterBuilderValueTypes.BOOL:
return BoolFilterBuilderRowValue;
- case filterBuilderValueTypes.CATEGORY:
- return CategoryFilterBuilderRowValue;
-
case filterBuilderValueTypes.DATE:
return DateFilterBuilderRowValue;
- case filterBuilderValueTypes.HISTORY_EVENT_TYPE:
- return HistoryEventTypeFilterBuilderRowValue;
-
case filterBuilderValueTypes.INDEXER:
return IndexerFilterBuilderRowValueConnector;
@@ -207,13 +198,11 @@ class FilterBuilderRow extends Component {
const selectedFilterBuilderProp = this.selectedFilterBuilderProp;
const keyOptions = filterBuilderProps.map((availablePropFilter) => {
- const { name, label } = availablePropFilter;
-
return {
- key: name,
- value: typeof label === 'function' ? label() : label
+ key: availablePropFilter.name,
+ value: availablePropFilter.label
};
- }).sort(sortByProp('value'));
+ });
const ValueComponent = getRowValueConnector(selectedFilterBuilderProp);
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js
index d1419327a..a7aed80b6 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueConnector.js
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { filterBuilderTypes } from 'Helpers/Props';
import * as filterTypes from 'Helpers/Props/filterTypes';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
import FilterBuilderRowValue from './FilterBuilderRowValue';
function createTagListSelector() {
@@ -38,7 +38,7 @@ function createTagListSelector() {
}
return acc;
- }, []).sort(sortByProp('name'));
+ }, []).sort(sortByName);
}
return _.uniqBy(items, 'id');
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueProps.ts b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueProps.ts
deleted file mode 100644
index 5bf9e5785..000000000
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueProps.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { FilterBuilderProp } from 'App/State/AppState';
-
-interface FilterBuilderRowOnChangeProps {
- name: string;
- value: unknown[];
-}
-
-interface FilterBuilderRowValueProps {
- filterType?: string;
- filterValue: string | number | object | string[] | number[] | object[];
- selectedFilterBuilderProp: FilterBuilderProp;
- sectionItem: unknown[];
- onChange: (payload: FilterBuilderRowOnChangeProps) => void;
-}
-
-export default FilterBuilderRowValueProps;
diff --git a/frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx b/frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx
deleted file mode 100644
index 03c5f7227..000000000
--- a/frontend/src/Components/Filter/Builder/HistoryEventTypeFilterBuilderRowValue.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import translate from 'Utilities/String/translate';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-import FilterBuilderRowValueProps from './FilterBuilderRowValueProps';
-
-const EVENT_TYPE_OPTIONS = [
- {
- id: 1,
- get name() {
- return translate('Grabbed');
- },
- },
- {
- id: 3,
- get name() {
- return translate('IndexerRss');
- },
- },
- {
- id: 2,
- get name() {
- return translate('IndexerQuery');
- },
- },
- {
- id: 4,
- get name() {
- return translate('IndexerAuth');
- },
- },
-];
-
-function HistoryEventTypeFilterBuilderRowValue(
- props: FilterBuilderRowValueProps
-) {
- return
{
- customFilters
- .sort((a, b) => sortByProp(a, b, 'label'))
- .map((customFilter) => {
- return (
-
diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js
new file mode 100644
index 000000000..a82c8889f
--- /dev/null
+++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.js
@@ -0,0 +1,89 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Icon from 'Components/Icon';
+import Menu from 'Components/Menu/Menu';
+import MenuButton from 'Components/Menu/MenuButton';
+import MenuContent from 'Components/Menu/MenuContent';
+import MenuItem from 'Components/Menu/MenuItem';
+import MenuItemSeparator from 'Components/Menu/MenuItemSeparator';
+import { align, icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './PageHeaderActionsMenu.css';
+
+function PageHeaderActionsMenu(props) {
+ const {
+ formsAuth,
+ onKeyboardShortcutsPress,
+ onRestartPress,
+ onShutdownPress
+ } = props;
+
+ return (
+
diff --git a/frontend/src/Components/Form/AppProfileSelectInputConnector.js b/frontend/src/Components/Form/AppProfileSelectInputConnector.js
index 0ab181e2f..fc40e9d3c 100644
--- a/frontend/src/Components/Form/AppProfileSelectInputConnector.js
+++ b/frontend/src/Components/Form/AppProfileSelectInputConnector.js
@@ -4,13 +4,12 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByProp from 'Utilities/Array/sortByProp';
-import translate from 'Utilities/String/translate';
+import sortByName from 'Utilities/Array/sortByName';
import SelectInput from './SelectInput';
function createMapStateToProps() {
return createSelector(
- createSortedSectionSelector('settings.appProfiles', sortByProp('name')),
+ createSortedSectionSelector('settings.appProfiles', sortByName),
(state, { includeNoChange }) => includeNoChange,
(state, { includeMixed }) => includeMixed,
(appProfiles, includeNoChange, includeMixed) => {
@@ -24,20 +23,16 @@ function createMapStateToProps() {
if (includeNoChange) {
values.unshift({
key: 'noChange',
- get value() {
- return translate('NoChange');
- },
- isDisabled: true
+ value: 'No Change',
+ disabled: true
});
}
if (includeMixed) {
values.unshift({
key: 'mixed',
- get value() {
- return `(${translate('Mixed')})`;
- },
- isDisabled: true
+ value: '(Mixed)',
+ disabled: true
});
}
diff --git a/frontend/src/Components/Form/AvailabilitySelectInput.js b/frontend/src/Components/Form/AvailabilitySelectInput.js
new file mode 100644
index 000000000..af9bdb2d6
--- /dev/null
+++ b/frontend/src/Components/Form/AvailabilitySelectInput.js
@@ -0,0 +1,54 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import SelectInput from './SelectInput';
+
+const availabilityOptions = [
+ { key: 'announced', value: 'Announced' },
+ { key: 'inCinemas', value: 'In Cinemas' },
+ { key: 'released', value: 'Released' },
+ { key: 'preDB', value: 'PreDB' }
+];
+
+function AvailabilitySelectInput(props) {
+ const values = [...availabilityOptions];
+
+ const {
+ includeNoChange,
+ includeMixed
+ } = props;
+
+ if (includeNoChange) {
+ values.unshift({
+ key: 'noChange',
+ value: 'No Change',
+ disabled: true
+ });
+ }
+
+ if (includeMixed) {
+ values.unshift({
+ key: 'mixed',
+ value: '(Mixed)',
+ disabled: true
+ });
+ }
+
+ return (
+
{error.errorMessage}
-
- {
- error.detailedDescription ?
-
-
-
+
);
}
}
diff --git a/frontend/src/Components/Form/NumberInput.js b/frontend/src/Components/Form/NumberInput.js
index cac274d95..8db1cd7b6 100644
--- a/frontend/src/Components/Form/NumberInput.js
+++ b/frontend/src/Components/Form/NumberInput.js
@@ -10,7 +10,7 @@ function parseValue(props, value) {
} = props;
if (value == null || value === '') {
- return null;
+ return min;
}
let newValue = isFloat ? parseFloat(value) : parseInt(value);
@@ -41,7 +41,7 @@ class NumberInput extends Component {
componentDidUpdate(prevProps, prevState) {
const { value } = this.props;
- if (!isNaN(value) && value !== prevProps.value && !this.state.isFocused) {
+ if (value !== prevProps.value && !this.state.isFocused) {
this.setState({
value: value == null ? '' : value.toString()
});
diff --git a/frontend/src/Components/Form/PasswordInput.css b/frontend/src/Components/Form/PasswordInput.css
new file mode 100644
index 000000000..6cb162784
--- /dev/null
+++ b/frontend/src/Components/Form/PasswordInput.css
@@ -0,0 +1,5 @@
+.input {
+ composes: input from '~Components/Form/TextInput.css';
+
+ font-family: $passwordFamily;
+}
diff --git a/frontend/src/Components/Table/Cells/TableRowCellButton.css.d.ts b/frontend/src/Components/Form/PasswordInput.css.d.ts
similarity index 89%
rename from frontend/src/Components/Table/Cells/TableRowCellButton.css.d.ts
rename to frontend/src/Components/Form/PasswordInput.css.d.ts
index c748f6f97..774807ef4 100644
--- a/frontend/src/Components/Table/Cells/TableRowCellButton.css.d.ts
+++ b/frontend/src/Components/Form/PasswordInput.css.d.ts
@@ -1,7 +1,7 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
- 'cell': string;
+ 'input': string;
}
export const cssExports: CssExports;
export default cssExports;
diff --git a/frontend/src/Components/Form/PasswordInput.js b/frontend/src/Components/Form/PasswordInput.js
index dbc4cfdb4..fef54fd5a 100644
--- a/frontend/src/Components/Form/PasswordInput.js
+++ b/frontend/src/Components/Form/PasswordInput.js
@@ -1,5 +1,7 @@
+import PropTypes from 'prop-types';
import React from 'react';
import TextInput from './TextInput';
+import styles from './PasswordInput.css';
// Prevent a user from copying (or cutting) the password from the input
function onCopy(e) {
@@ -11,14 +13,17 @@ function PasswordInput(props) {
return (
;
- size?: Extract;
- outline?: boolean;
- children: ReactNode;
-}
-
-export default function Label({
- className = styles.label,
- kind = kinds.DEFAULT,
- size = sizes.SMALL,
- outline = false,
- ...otherProps
-}: LabelProps) {
- return (
-
- );
-}
diff --git a/frontend/src/Components/Link/Button.js b/frontend/src/Components/Link/Button.js
new file mode 100644
index 000000000..cbe4691d4
--- /dev/null
+++ b/frontend/src/Components/Link/Button.js
@@ -0,0 +1,54 @@
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { align, kinds, sizes } from 'Helpers/Props';
+import Link from './Link';
+import styles from './Button.css';
+
+class Button extends Component {
+
+ //
+ // Render
+
+ render() {
+ const {
+ className,
+ buttonGroupPosition,
+ kind,
+ size,
+ children,
+ ...otherProps
+ } = this.props;
+
+ return (
+
+ {children}
+
+ );
+ }
+
+}
+
+Button.propTypes = {
+ className: PropTypes.string.isRequired,
+ buttonGroupPosition: PropTypes.oneOf(align.all),
+ kind: PropTypes.oneOf(kinds.all),
+ size: PropTypes.oneOf(sizes.all),
+ children: PropTypes.node
+};
+
+Button.defaultProps = {
+ className: styles.button,
+ kind: kinds.DEFAULT,
+ size: sizes.MEDIUM
+};
+
+export default Button;
diff --git a/frontend/src/Components/Link/Button.tsx b/frontend/src/Components/Link/Button.tsx
deleted file mode 100644
index cf2293f59..000000000
--- a/frontend/src/Components/Link/Button.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import classNames from 'classnames';
-import React from 'react';
-import { align, kinds, sizes } from 'Helpers/Props';
-import { Kind } from 'Helpers/Props/kinds';
-import { Size } from 'Helpers/Props/sizes';
-import Link, { LinkProps } from './Link';
-import styles from './Button.css';
-
-export interface ButtonProps extends Omit {
- buttonGroupPosition?: Extract<
- (typeof align.all)[number],
- keyof typeof styles
- >;
- kind?: Extract;
- size?: Extract;
- children: Required;
-}
-
-export default function Button({
- className = styles.button,
- buttonGroupPosition,
- kind = kinds.DEFAULT,
- size = sizes.MEDIUM,
- ...otherProps
-}: ButtonProps) {
- return (
-
- );
-}
diff --git a/frontend/src/Components/Link/ClipboardButton.js b/frontend/src/Components/Link/ClipboardButton.js
new file mode 100644
index 000000000..55843f05f
--- /dev/null
+++ b/frontend/src/Components/Link/ClipboardButton.js
@@ -0,0 +1,139 @@
+import Clipboard from 'clipboard';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormInputButton from 'Components/Form/FormInputButton';
+import Icon from 'Components/Icon';
+import { icons, kinds } from 'Helpers/Props';
+import getUniqueElememtId from 'Utilities/getUniqueElementId';
+import styles from './ClipboardButton.css';
+
+class ClipboardButton extends Component {
+
+ //
+ // Lifecycle
+
+ constructor(props, context) {
+ super(props, context);
+
+ this._id = getUniqueElememtId();
+ this._successTimeout = null;
+ this._testResultTimeout = null;
+
+ this.state = {
+ showSuccess: false,
+ showError: false
+ };
+ }
+
+ componentDidMount() {
+ this._clipboard = new Clipboard(`#${this._id}`, {
+ text: () => this.props.value,
+ container: document.getElementById(this._id)
+ });
+
+ this._clipboard.on('success', this.onSuccess);
+ }
+
+ componentDidUpdate() {
+ const {
+ showSuccess,
+ showError
+ } = this.state;
+
+ if (showSuccess || showError) {
+ this._testResultTimeout = setTimeout(this.resetState, 3000);
+ }
+ }
+
+ componentWillUnmount() {
+ if (this._clipboard) {
+ this._clipboard.destroy();
+ }
+
+ if (this._testResultTimeout) {
+ clearTimeout(this._testResultTimeout);
+ }
+ }
+
+ //
+ // Control
+
+ resetState = () => {
+ this.setState({
+ showSuccess: false,
+ showError: false
+ });
+ };
+
+ //
+ // Listeners
+
+ onSuccess = () => {
+ this.setState({
+ showSuccess: true
+ });
+ };
+
+ onError = () => {
+ this.setState({
+ showError: true
+ });
+ };
+
+ //
+ // Render
+
+ render() {
+ const {
+ value,
+ className,
+ ...otherProps
+ } = this.props;
+
+ const {
+ showSuccess,
+ showError
+ } = this.state;
+
+ const showStateIcon = showSuccess || showError;
+ const iconName = showError ? icons.DANGER : icons.CHECK;
+ const iconKind = showError ? kinds.DANGER : kinds.SUCCESS;
+
+ return (
+
+
+ {
+ showSuccess &&
+
+
+ );
+ }
+}
+
+ClipboardButton.propTypes = {
+ className: PropTypes.string.isRequired,
+ value: PropTypes.string.isRequired
+};
+
+ClipboardButton.defaultProps = {
+ className: styles.button
+};
+
+export default ClipboardButton;
diff --git a/frontend/src/Components/Link/ClipboardButton.tsx b/frontend/src/Components/Link/ClipboardButton.tsx
deleted file mode 100644
index dfce115ac..000000000
--- a/frontend/src/Components/Link/ClipboardButton.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import copy from 'copy-to-clipboard';
-import React, { useCallback, useEffect, useState } from 'react';
-import FormInputButton from 'Components/Form/FormInputButton';
-import Icon from 'Components/Icon';
-import { icons, kinds } from 'Helpers/Props';
-import { ButtonProps } from './Button';
-import styles from './ClipboardButton.css';
-
-export interface ClipboardButtonProps extends Omit {
- value: string;
-}
-
-export type ClipboardState = 'success' | 'error' | null;
-
-export default function ClipboardButton({
- id,
- value,
- className = styles.button,
- ...otherProps
-}: ClipboardButtonProps) {
- const [state, setState] = useState(null);
-
- useEffect(() => {
- if (!state) {
- return;
- }
-
- const timeoutId = setTimeout(() => {
- setState(null);
- }, 3000);
-
- return () => {
- if (timeoutId) {
- clearTimeout(timeoutId);
- }
- };
- }, [state]);
-
- const handleClick = useCallback(async () => {
- try {
- if ('clipboard' in navigator) {
- await navigator.clipboard.writeText(value);
- } else {
- copy(value);
- }
-
- setState('success');
- } catch (e) {
- setState('error');
- console.error(`Failed to copy to clipboard`, e);
- }
- }, [value]);
-
- return (
-
-
- {state ? (
-
-
- );
-}
diff --git a/frontend/src/Components/Link/IconButton.js b/frontend/src/Components/Link/IconButton.js
index 6f5e56d0e..3311c14d6 100644
--- a/frontend/src/Components/Link/IconButton.js
+++ b/frontend/src/Components/Link/IconButton.js
@@ -23,7 +23,6 @@ function IconButton(props) {
className,
isDisabled && styles.isDisabled
)}
- aria-label="Table Options Button"
isDisabled={isDisabled}
{...otherProps}
>
diff --git a/frontend/src/Components/Link/Link.js b/frontend/src/Components/Link/Link.js
new file mode 100644
index 000000000..6b5baca4e
--- /dev/null
+++ b/frontend/src/Components/Link/Link.js
@@ -0,0 +1,98 @@
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { Link as RouterLink } from 'react-router-dom';
+import styles from './Link.css';
+
+class Link extends Component {
+
+ //
+ // Listeners
+
+ onClick = (event) => {
+ const {
+ isDisabled,
+ onPress
+ } = this.props;
+
+ if (!isDisabled && onPress) {
+ onPress(event);
+ }
+ };
+
+ //
+ // Render
+
+ render() {
+ const {
+ className,
+ component,
+ to,
+ target,
+ isDisabled,
+ noRouter,
+ onPress,
+ ...otherProps
+ } = this.props;
+
+ const linkProps = { target };
+ let el = component;
+
+ if (to) {
+ if ((/\w+?:\/\//).test(to)) {
+ el = 'a';
+ linkProps.href = to;
+ linkProps.target = target || '_blank';
+ linkProps.rel = 'noreferrer';
+ } else if (noRouter) {
+ el = 'a';
+ linkProps.href = to;
+ linkProps.target = target || '_self';
+ } else {
+ el = RouterLink;
+ linkProps.to = `${window.Prowlarr.urlBase}/${to.replace(/^\//, '')}`;
+ linkProps.target = target;
+ }
+ }
+
+ if (el === 'button' || el === 'input') {
+ linkProps.type = otherProps.type || 'button';
+ linkProps.disabled = isDisabled;
+ }
+
+ linkProps.className = classNames(
+ className,
+ styles.link,
+ to && styles.to,
+ isDisabled && 'isDisabled'
+ );
+
+ const props = {
+ ...otherProps,
+ ...linkProps
+ };
+
+ props.onClick = this.onClick;
+
+ return (
+ React.createElement(el, props)
+ );
+ }
+}
+
+Link.propTypes = {
+ className: PropTypes.string,
+ component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+ to: PropTypes.string,
+ target: PropTypes.string,
+ isDisabled: PropTypes.bool,
+ noRouter: PropTypes.bool,
+ onPress: PropTypes.func
+};
+
+Link.defaultProps = {
+ component: 'button',
+ noRouter: false
+};
+
+export default Link;
diff --git a/frontend/src/Components/Link/Link.tsx b/frontend/src/Components/Link/Link.tsx
deleted file mode 100644
index 6f1fd1ff7..000000000
--- a/frontend/src/Components/Link/Link.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import classNames from 'classnames';
-import React, {
- ComponentPropsWithoutRef,
- ElementType,
- SyntheticEvent,
- useCallback,
-} from 'react';
-import { Link as RouterLink } from 'react-router-dom';
-import styles from './Link.css';
-
-export type LinkProps =
- ComponentPropsWithoutRef & {
- component?: C;
- to?: string;
- target?: string;
- isDisabled?: LinkProps['disabled'];
- noRouter?: boolean;
- onPress?(event: SyntheticEvent): void;
- };
-
-export default function Link({
- className,
- component,
- to,
- target,
- type,
- isDisabled,
- noRouter,
- onPress,
- ...otherProps
-}: LinkProps) {
- const Component = component || 'button';
-
- const onClick = useCallback(
- (event: SyntheticEvent) => {
- if (isDisabled) {
- return;
- }
-
- onPress?.(event);
- },
- [isDisabled, onPress]
- );
-
- const linkClass = classNames(
- className,
- styles.link,
- to && styles.to,
- isDisabled && 'isDisabled'
- );
-
- if (to) {
- const toLink = /\w+?:\/\//.test(to);
-
- if (toLink || noRouter) {
- return (
-
- );
- }
-
- return (
-
@@ -156,7 +154,6 @@ class SpinnerErrorButton extends Component {
}
SpinnerErrorButton.propTypes = {
- kind: PropTypes.oneOf(kinds.all),
isSpinning: PropTypes.bool.isRequired,
error: PropTypes.object,
children: PropTypes.node.isRequired
diff --git a/frontend/src/Components/Loading/LoadingMessage.js b/frontend/src/Components/Loading/LoadingMessage.js
index 406ecf030..1cb52b0aa 100644
--- a/frontend/src/Components/Loading/LoadingMessage.js
+++ b/frontend/src/Components/Loading/LoadingMessage.js
@@ -13,7 +13,7 @@ const messages = [
'Loading humorous message... Please Wait',
'I could\'ve been faster in Python',
'Don\'t forget to rewind your tracks',
- 'Congratulations! You are the 1000th visitor.',
+ 'Congratulations! you are the 1000th visitor.',
'HELP! I\'m being held hostage and forced to write these stupid lines!',
'RE-calibrating the internet...',
'I\'ll be here all week',
diff --git a/frontend/src/Components/Markdown/InlineMarkdown.js b/frontend/src/Components/Markdown/InlineMarkdown.js
index 993bb241e..dc9ea9bf3 100644
--- a/frontend/src/Components/Markdown/InlineMarkdown.js
+++ b/frontend/src/Components/Markdown/InlineMarkdown.js
@@ -10,55 +10,27 @@ class InlineMarkdown extends Component {
render() {
const {
className,
- data,
- blockClassName
+ data
} = this.props;
- // For now only replace links or code blocks (not both)
+ // For now only replace links
const markdownBlocks = [];
if (data) {
- const linkRegex = RegExp(/\[(.+?)\]\((.+?)\)/g);
+ const regex = RegExp(/\[(.+?)\]\((.+?)\)/g);
let endIndex = 0;
let match = null;
-
- while ((match = linkRegex.exec(data)) !== null) {
+ while ((match = regex.exec(data)) !== null) {
if (match.index > endIndex) {
markdownBlocks.push(data.substr(endIndex, match.index - endIndex));
}
-
markdownBlocks.push({match[1]});
endIndex = match.index + match[0].length;
}
- if (endIndex !== data.length && markdownBlocks.length > 0) {
+ if (endIndex !== data.length) {
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(
- {filter.label}
-
- );
- })
+ customFilters.map((filter) => {
+ return (
+
+ {filter.label}
+
+ );
+ })
}
{
diff --git a/frontend/src/Components/Modal/ModalContent.js b/frontend/src/Components/Modal/ModalContent.js
index 1d3862a13..8883bf2b9 100644
--- a/frontend/src/Components/Modal/ModalContent.js
+++ b/frontend/src/Components/Modal/ModalContent.js
@@ -3,7 +3,6 @@ import React from 'react';
import Icon from 'Components/Icon';
import Link from 'Components/Link/Link';
import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
import styles from './ModalContent.css';
function ModalContent(props) {
@@ -29,7 +28,6 @@ function ModalContent(props) {
@@ -75,10 +74,8 @@ class PageHeader extends Component {
{typeof value === 'function' ? value() : value}
+ {value}
{
hint != null &&
-
+
}
);
}
HintedSelectInputSelectedValue.propTypes = {
- value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
+ value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
values: PropTypes.arrayOf(PropTypes.object).isRequired,
hint: PropTypes.string,
isMultiSelect: PropTypes.bool.isRequired,
diff --git a/frontend/src/Components/Form/IndexersSelectInputConnector.js b/frontend/src/Components/Form/IndexersSelectInputConnector.js
index fade1e758..bc411d5cc 100644
--- a/frontend/src/Components/Form/IndexersSelectInputConnector.js
+++ b/frontend/src/Components/Form/IndexersSelectInputConnector.js
@@ -1,20 +1,18 @@
-import { groupBy, map } from 'lodash';
+import _ from 'lodash';
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 sortByProp from 'Utilities/Array/sortByProp';
import titleCase from 'Utilities/String/titleCase';
import EnhancedSelectInput from './EnhancedSelectInput';
function createMapStateToProps() {
return createSelector(
(state, { value }) => value,
- createSortedSectionSelector('indexers', sortByProp('name')),
+ (state) => state.indexers,
(value, indexers) => {
const values = [];
- const groupedIndexers = map(groupBy(indexers.items, 'protocol'), (val, key) => ({ protocol: key, indexers: val }));
+ const groupedIndexers = _(indexers.items).groupBy((x) => x.protocol).map((val, key) => ({ protocol: key, indexers: val })).value();
groupedIndexers.forEach((element) => {
values.push({
@@ -23,12 +21,10 @@ function createMapStateToProps() {
});
if (element.indexers && element.indexers.length > 0) {
- element.indexers.forEach((indexer) => {
+ element.indexers.forEach((subCat) => {
values.push({
- key: indexer.id,
- value: indexer.name,
- hint: `(${indexer.id})`,
- isDisabled: !indexer.enable,
+ key: subCat.id,
+ value: subCat.name,
parentKey: element.protocol === 'usenet' ? -1 : -2
});
});
@@ -53,6 +49,7 @@ class IndexersSelectInputConnector extends Component {
// Render
render() {
+
return (
{hint}
}
@@ -48,7 +48,7 @@ function HintedSelectInputOption(props) {
HintedSelectInputOption.propTypes = {
id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
- value: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
+ value: PropTypes.string.isRequired,
hint: PropTypes.node,
depth: PropTypes.number,
isSelected: PropTypes.bool.isRequired,
diff --git a/frontend/src/Components/Form/HintedSelectInputSelectedValue.js b/frontend/src/Components/Form/HintedSelectInputSelectedValue.js
index a3fecf324..07f6c9e25 100644
--- a/frontend/src/Components/Form/HintedSelectInputSelectedValue.js
+++ b/frontend/src/Components/Form/HintedSelectInputSelectedValue.js
@@ -24,7 +24,7 @@ function HintedSelectInputSelectedValue(props) {
>
{
- isMultiSelect ?
+ isMultiSelect &&
value.map((key, index) => {
const v = valuesMap[key];
return (
@@ -32,28 +32,26 @@ function HintedSelectInputSelectedValue(props) {
{v ? v.value : key}
);
- }) :
- null
+ })
}
{
- isMultiSelect ? null : value
+ !isMultiSelect && value
}
{
- hint != null && includeHint ?
+ hint != null && includeHint &&
{hint}
-
:
- null
+ {match[0].substring(1, match[0].length - 1)});
- 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 {markdownBlocks};
@@ -67,8 +39,7 @@ class InlineMarkdown extends Component {
InlineMarkdown.propTypes = {
className: PropTypes.string,
- data: PropTypes.string,
- blockClassName: PropTypes.string
+ data: PropTypes.string
};
export default InlineMarkdown;
diff --git a/frontend/src/Components/Menu/FilterMenuContent.js b/frontend/src/Components/Menu/FilterMenuContent.js
index 7bc23c066..1fdb2476f 100644
--- a/frontend/src/Components/Menu/FilterMenuContent.js
+++ b/frontend/src/Components/Menu/FilterMenuContent.js
@@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import sortByProp from 'Utilities/Array/sortByProp';
import translate from 'Utilities/String/translate';
import FilterMenuItem from './FilterMenuItem';
import MenuContent from './MenuContent';
@@ -34,33 +33,25 @@ class FilterMenuContent extends Component {
selectedFilterKey={selectedFilterKey}
onPress={onFilterSelect}
>
- {typeof filter.label === 'function' ? filter.label() : filter.label}
+ {filter.label}
);
})
}
{
- customFilters.length > 0 ?
-
+
+
+ );
+}
+
+PageHeaderActionsMenu.propTypes = {
+ formsAuth: PropTypes.bool.isRequired,
+ onKeyboardShortcutsPress: PropTypes.func.isRequired,
+ onRestartPress: PropTypes.func.isRequired,
+ onShutdownPress: PropTypes.func.isRequired
+};
+
+export default PageHeaderActionsMenu;
diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx b/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx
deleted file mode 100644
index 6b7da03eb..000000000
--- a/frontend/src/Components/Page/Header/PageHeaderActionsMenu.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React, { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import AppState from 'App/State/AppState';
-import Icon from 'Components/Icon';
-import Menu from 'Components/Menu/Menu';
-import MenuButton from 'Components/Menu/MenuButton';
-import MenuContent from 'Components/Menu/MenuContent';
-import MenuItem from 'Components/Menu/MenuItem';
-import MenuItemSeparator from 'Components/Menu/MenuItemSeparator';
-import { align, icons, kinds } from 'Helpers/Props';
-import { restart, shutdown } from 'Store/Actions/systemActions';
-import translate from 'Utilities/String/translate';
-import styles from './PageHeaderActionsMenu.css';
-
-interface PageHeaderActionsMenuProps {
- onKeyboardShortcutsPress(): void;
-}
-
-function PageHeaderActionsMenu(props: PageHeaderActionsMenuProps) {
- const { onKeyboardShortcutsPress } = props;
-
- const dispatch = useDispatch();
-
- const { authentication, isDocker } = useSelector(
- (state: AppState) => state.system.status.item
- );
-
- const formsAuth = authentication === 'forms';
-
- const handleRestartPress = useCallback(() => {
- dispatch(restart());
- }, [dispatch]);
-
- const handleShutdownPress = useCallback(() => {
- dispatch(shutdown());
- }, [dispatch]);
-
- return (
-
-
-
- );
-}
-
-export default PageHeaderActionsMenu;
diff --git a/frontend/src/Components/Page/Header/PageHeaderActionsMenuConnector.js b/frontend/src/Components/Page/Header/PageHeaderActionsMenuConnector.js
new file mode 100644
index 000000000..3aba95065
--- /dev/null
+++ b/frontend/src/Components/Page/Header/PageHeaderActionsMenuConnector.js
@@ -0,0 +1,56 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { restart, shutdown } from 'Store/Actions/systemActions';
+import PageHeaderActionsMenu from './PageHeaderActionsMenu';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state) => state.system.status,
+ (status) => {
+ return {
+ formsAuth: status.item.authentication === 'forms'
+ };
+ }
+ );
+}
+
+const mapDispatchToProps = {
+ restart,
+ shutdown
+};
+
+class PageHeaderActionsMenuConnector extends Component {
+
+ //
+ // Listeners
+
+ onRestartPress = () => {
+ this.props.restart();
+ };
+
+ onShutdownPress = () => {
+ this.props.shutdown();
+ };
+
+ //
+ // Render
+
+ render() {
+ return (
+ {errorMessage}
);
} else if (isPopulated && !error) {
return (
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js
index 6eef54eab..045789075 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -8,7 +8,7 @@ import Scroller from 'Components/Scroller/Scroller';
import { icons } from 'Helpers/Props';
import locationShape from 'Helpers/Props/Shapes/locationShape';
import dimensions from 'Styles/Variables/dimensions';
-import HealthStatus from 'System/Status/Health/HealthStatus';
+import HealthStatusConnector from 'System/Status/Health/HealthStatusConnector';
import translate from 'Utilities/String/translate';
import MessagesConnector from './Messages/MessagesConnector';
import PageSidebarItem from './PageSidebarItem';
@@ -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: HealthStatus
+ 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'
}
]
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarItem.css b/frontend/src/Components/Page/Sidebar/PageSidebarItem.css
index 409062f97..5e3e3b52c 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebarItem.css
+++ b/frontend/src/Components/Page/Sidebar/PageSidebarItem.css
@@ -24,7 +24,6 @@
composes: link;
padding: 10px 24px;
- padding-left: 35px;
}
.isActiveLink {
@@ -42,6 +41,10 @@
text-align: center;
}
+.noIcon {
+ margin-left: 25px;
+}
+
.status {
float: right;
}
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarItem.css.d.ts b/frontend/src/Components/Page/Sidebar/PageSidebarItem.css.d.ts
index 5bf0eb815..77e23c767 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebarItem.css.d.ts
+++ b/frontend/src/Components/Page/Sidebar/PageSidebarItem.css.d.ts
@@ -8,6 +8,7 @@ interface CssExports {
'isActiveParentLink': string;
'item': string;
'link': string;
+ 'noIcon': string;
'status': string;
}
export const cssExports: CssExports;
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebarItem.js b/frontend/src/Components/Page/Sidebar/PageSidebarItem.js
index 8d0e4e790..9ad78db6b 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebarItem.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebarItem.js
@@ -63,7 +63,9 @@ class PageSidebarItem extends Component {
}
- {typeof title === 'function' ? title() : title}
+
+ {title}
+
{
!!StatusComponent &&
@@ -86,7 +88,7 @@ class PageSidebarItem extends Component {
PageSidebarItem.propTypes = {
iconName: PropTypes.object,
- title: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
+ title: PropTypes.string.isRequired,
to: PropTypes.string.isRequired,
isActive: PropTypes.bool,
isActiveParent: PropTypes.bool,
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarButton.css b/frontend/src/Components/Page/Toolbar/PageToolbarButton.css
index e9a1b666d..0b6918296 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarButton.css
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarButton.css
@@ -22,14 +22,11 @@
display: flex;
align-items: center;
justify-content: center;
- overflow: hidden;
height: 24px;
}
.label {
padding: 0 3px;
- max-width: 100%;
- max-height: 100%;
color: var(--toolbarLabelColor);
font-size: $extraSmallFontSize;
line-height: calc($extraSmallFontSize + 1px);
diff --git a/frontend/src/Components/Page/Toolbar/PageToolbarButton.js b/frontend/src/Components/Page/Toolbar/PageToolbarButton.js
index 675bdfd02..c93603aa9 100644
--- a/frontend/src/Components/Page/Toolbar/PageToolbarButton.js
+++ b/frontend/src/Components/Page/Toolbar/PageToolbarButton.js
@@ -23,7 +23,6 @@ function PageToolbarButton(props) {
isDisabled && styles.isDisabled
)}
isDisabled={isDisabled || isSpinning}
- title={label}
{...otherProps}
>
@@ -56,9 +56,7 @@ function ProgressBar(props) {
styles[kind],
enableColorImpairedMode && 'colorImpaired'
)}
- role="meter"
- aria-label={`Progress Bar at ${progress.toFixed(0)}%`}
- aria-valuenow={progress.toFixed(0)}
+ aria-valuenow={progress}
aria-valuemin="0"
aria-valuemax="100"
style={{ width: progressPercent }}
@@ -67,7 +65,7 @@ function ProgressBar(props) {
{
showText ?
;
+ overflowComponent: React.FunctionComponent;
onPress: () => void;
}
@@ -20,7 +20,7 @@ function IndexerIndexSelectModeButton(
const onPressWrapper = useCallback(() => {
if (isSelectMode) {
selectDispatch({
- type: 'reset',
+ type: SelectActionType.Reset,
});
}
diff --git a/frontend/src/Indexer/Index/Select/IndexerIndexSelectModeMenuItem.tsx b/frontend/src/Indexer/Index/Select/IndexerIndexSelectModeMenuItem.tsx
index 8f1c0623f..f7d63950f 100644
--- a/frontend/src/Indexer/Index/Select/IndexerIndexSelectModeMenuItem.tsx
+++ b/frontend/src/Indexer/Index/Select/IndexerIndexSelectModeMenuItem.tsx
@@ -1,6 +1,6 @@
import { IconDefinition } from '@fortawesome/fontawesome-common-types';
import React, { useCallback } from 'react';
-import { useSelect } from 'App/SelectContext';
+import { SelectActionType, useSelect } from 'App/SelectContext';
import PageToolbarOverflowMenuItem from 'Components/Page/Toolbar/PageToolbarOverflowMenuItem';
interface IndexerIndexSelectModeMenuItemProps {
@@ -19,7 +19,7 @@ function IndexerIndexSelectModeMenuItem(
const onPressWrapper = useCallback(() => {
if (isSelectMode) {
selectDispatch({
- type: 'reset',
+ type: SelectActionType.Reset,
});
}
diff --git a/frontend/src/Indexer/Index/Select/Tags/TagsModalContent.tsx b/frontend/src/Indexer/Index/Select/Tags/TagsModalContent.tsx
index 1964d271c..a8bbd09f7 100644
--- a/frontend/src/Indexer/Index/Select/Tags/TagsModalContent.tsx
+++ b/frontend/src/Indexer/Index/Select/Tags/TagsModalContent.tsx
@@ -1,7 +1,6 @@
-import { uniq } from 'lodash';
+import { concat, uniq } from 'lodash';
import React, { useCallback, useMemo, useState } from 'react';
import { useSelector } from 'react-redux';
-import { Tag } from 'App/State/TagsAppState';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -13,10 +12,8 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import Indexer from 'Indexer/Indexer';
import createAllIndexersSelector from 'Store/Selectors/createAllIndexersSelector';
import createTagsSelector from 'Store/Selectors/createTagsSelector';
-import translate from 'Utilities/String/translate';
import styles from './TagsModalContent.css';
interface TagsModalContentProps {
@@ -28,35 +25,29 @@ interface TagsModalContentProps {
function TagsModalContent(props: TagsModalContentProps) {
const { indexerIds, onModalClose, onApplyTagsPress } = props;
- const allIndexers: Indexer[] = useSelector(createAllIndexersSelector());
- const tagList: Tag[] = useSelector(createTagsSelector());
+ const allIndexers = useSelector(createAllIndexersSelector());
+ const tagList = useSelector(createTagsSelector());
const [tags, setTags] = useState([]);
const [applyTags, setApplyTags] = useState('add');
const indexerTags = useMemo(() => {
- const tags = indexerIds.reduce((acc: number[], id) => {
- const s = allIndexers.find((s) => s.id === id);
+ const indexers = indexerIds.map((id) => {
+ return allIndexers.find((s) => s.id === id);
+ });
- if (s) {
- acc.push(...s.tags);
- }
-
- return acc;
- }, []);
-
- return uniq(tags);
+ return uniq(concat(...indexers.map((s) => s.tags)));
}, [indexerIds, allIndexers]);
const onTagsChange = useCallback(
- ({ value }: { value: number[] }) => {
+ ({ value }) => {
setTags(value);
},
[setTags]
);
const onApplyTagsChange = useCallback(
- ({ value }: { value: string }) => {
+ ({ value }) => {
setApplyTags(value);
},
[setApplyTags]
@@ -67,19 +58,19 @@ function TagsModalContent(props: TagsModalContentProps) {
}, [tags, applyTags, onApplyTagsPress]);
const applyTagsOptions = [
- { key: 'add', value: translate('Add') },
- { key: 'remove', value: translate('Remove') },
- { key: 'replace', value: translate('Replace') },
+ { key: 'add', value: 'Add' },
+ { key: 'remove', value: 'Remove' },
+ { key: 'replace', value: 'Replace' },
];
return (
- {translate('Tags')}
+ Tags
+
-
-
+
+
+
- {translate('AllIndexersHiddenDueToFilter')}
-
+
void;
+ onScroll?: (payload) => void;
}
const Scroller = forwardRef(
- (props: ScrollerProps, ref: ForwardedRef) => {
+ (props: ScrollerProps, ref: React.MutableRefObject) => {
const {
className,
autoFocus = false,
@@ -42,7 +30,7 @@ const Scroller = forwardRef(
} = props;
const internalRef = useRef();
- const currentRef = (ref as MutableRefObject) ?? internalRef;
+ const currentRef = ref ?? internalRef;
useEffect(
() => {
diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index d39c05e10..3c10c2754 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -54,7 +54,7 @@ function Logger(minimumLogLevel) {
}
Logger.prototype.cleanse = function(message) {
- const apikey = new RegExp(`access_token=${encodeURIComponent(window.Prowlarr.apiKey)}`, 'g');
+ const apikey = new RegExp(`access_token=${window.Prowlarr.apiKey}`, 'g');
return message.replace(apikey, 'access_token=(removed)');
};
@@ -98,7 +98,7 @@ class SignalRConnector extends Component {
this.connection = new signalR.HubConnectionBuilder()
.configureLogging(new Logger(signalR.LogLevel.Information))
- .withUrl(`${url}?access_token=${encodeURIComponent(window.Prowlarr.apiKey)}`)
+ .withUrl(`${url}?access_token=${window.Prowlarr.apiKey}`)
.withAutomaticReconnect({
nextRetryDelayInMilliseconds: (retryContext) => {
if (retryContext.elapsedMilliseconds > 180000) {
@@ -141,16 +141,6 @@ class SignalRConnector extends Component {
console.error(`signalR: Unable to find handler for ${name}`);
};
- handleApplications = ({ action, resource }) => {
- const section = 'settings.applications';
-
- if (action === 'created' || action === 'updated') {
- this.props.dispatchUpdateItem({ section, ...resource });
- } else if (action === 'deleted') {
- this.props.dispatchRemoveItem({ section, id: resource.id });
- }
- };
-
handleCommand = (body) => {
if (body.action === 'sync') {
this.props.dispatchFetchCommands();
@@ -160,8 +150,8 @@ class SignalRConnector extends Component {
const resource = body.resource;
const status = resource.status;
- // Both successful and failed commands need to be
- // completed, otherwise they spin until they time out.
+ // Both sucessful and failed commands need to be
+ // completed, otherwise they spin until they timeout.
if (status === 'completed' || status === 'failed') {
this.props.dispatchFinishCommand(resource);
@@ -170,16 +160,6 @@ class SignalRConnector extends Component {
}
};
- handleDownloadclient = ({ action, resource }) => {
- const section = 'settings.downloadClients';
-
- if (action === 'created' || action === 'updated') {
- this.props.dispatchUpdateItem({ section, ...resource });
- } else if (action === 'deleted') {
- this.props.dispatchRemoveItem({ section, id: resource.id });
- }
- };
-
handleHealth = () => {
this.props.dispatchFetchHealth();
};
@@ -188,33 +168,14 @@ class SignalRConnector extends Component {
this.props.dispatchFetchIndexerStatus();
};
- handleIndexer = ({ action, resource }) => {
+ handleIndexer = (body) => {
+ const action = body.action;
const section = 'indexers';
- if (action === 'created' || action === 'updated') {
- this.props.dispatchUpdateItem({ section, ...resource });
+ if (action === 'updated') {
+ this.props.dispatchUpdateItem({ section, ...body.resource });
} else if (action === 'deleted') {
- this.props.dispatchRemoveItem({ section, id: resource.id });
- }
- };
-
- handleIndexerproxy = ({ action, resource }) => {
- const section = 'settings.indexerProxies';
-
- if (action === 'created' || action === 'updated') {
- this.props.dispatchUpdateItem({ section, ...resource });
- } else if (action === 'deleted') {
- this.props.dispatchRemoveItem({ section, id: resource.id });
- }
- };
-
- handleNotification = ({ action, resource }) => {
- const section = 'settings.notifications';
-
- if (action === 'created' || action === 'updated') {
- this.props.dispatchUpdateItem({ section, ...resource });
- } else if (action === 'deleted') {
- this.props.dispatchRemoveItem({ section, id: resource.id });
+ this.props.dispatchRemoveItem({ section, id: body.resource.id });
}
};
diff --git a/frontend/src/Components/Table/Cells/RelativeDateCell.js b/frontend/src/Components/Table/Cells/RelativeDateCell.js
index 4bf94cf57..207b97752 100644
--- a/frontend/src/Components/Table/Cells/RelativeDateCell.js
+++ b/frontend/src/Components/Table/Cells/RelativeDateCell.js
@@ -1,66 +1,58 @@
import PropTypes from 'prop-types';
-import React from 'react';
-import { useSelector } from 'react-redux';
-import { createSelector } from 'reselect';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
+import React, { PureComponent } from 'react';
import formatDateTime from 'Utilities/Date/formatDateTime';
import getRelativeDate from 'Utilities/Date/getRelativeDate';
import TableRowCell from './TableRowCell';
import styles from './RelativeDateCell.css';
-function createRelativeDateCellSelector() {
- return createSelector(createUISettingsSelector(), (uiSettings) => {
- return {
- showRelativeDates: uiSettings.showRelativeDates,
- shortDateFormat: uiSettings.shortDateFormat,
- longDateFormat: uiSettings.longDateFormat,
- timeFormat: uiSettings.timeFormat
- };
- });
-}
+class RelativeDateCell extends PureComponent {
-function RelativeDateCell(props) {
//
// Render
- const {
- className,
- date,
- includeSeconds,
- component: Component,
- dispatch,
- ...otherProps
- } = props;
+ render() {
+ const {
+ className,
+ date,
+ includeSeconds,
+ showRelativeDates,
+ shortDateFormat,
+ longDateFormat,
+ timeFormat,
+ component: Component,
+ dispatch,
+ ...otherProps
+ } = this.props;
- const { showRelativeDates, shortDateFormat, longDateFormat, timeFormat } =
- useSelector(createRelativeDateCellSelector());
+ if (!date) {
+ return (
+
+ {getRelativeDate(date, shortDateFormat, showRelativeDates, { timeFormat, includeSeconds, timeForToday: true })}
+
+ );
}
-
- return (
-
- {getRelativeDate(date, shortDateFormat, showRelativeDates, {
- timeFormat,
- includeSeconds,
- timeForToday: true
- })}
-
- );
}
RelativeDateCell.propTypes = {
className: PropTypes.string.isRequired,
date: PropTypes.string,
includeSeconds: PropTypes.bool.isRequired,
+ showRelativeDates: PropTypes.bool.isRequired,
+ shortDateFormat: PropTypes.string.isRequired,
+ longDateFormat: PropTypes.string.isRequired,
+ timeFormat: PropTypes.string.isRequired,
component: PropTypes.elementType,
dispatch: PropTypes.func
};
diff --git a/frontend/src/Components/Table/Cells/TableRowCellButton.js b/frontend/src/Components/Table/Cells/TableRowCellButton.js
new file mode 100644
index 000000000..ff50d3bc9
--- /dev/null
+++ b/frontend/src/Components/Table/Cells/TableRowCellButton.js
@@ -0,0 +1,25 @@
+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 (
+
+ );
+}
+
+TableRowCellButton.propTypes = {
+ className: PropTypes.string.isRequired
+};
+
+TableRowCellButton.defaultProps = {
+ className: styles.cell
+};
+
+export default TableRowCellButton;
diff --git a/frontend/src/Components/Table/Cells/TableRowCellButton.tsx b/frontend/src/Components/Table/Cells/TableRowCellButton.tsx
deleted file mode 100644
index c80a3d626..000000000
--- a/frontend/src/Components/Table/Cells/TableRowCellButton.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-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 (
-
- );
-}
-
-export default TableRowCellButton;
diff --git a/frontend/src/Components/Table/Column.ts b/frontend/src/Components/Table/Column.ts
index 24674c3fc..f9ff7287c 100644
--- a/frontend/src/Components/Table/Column.ts
+++ b/frontend/src/Components/Table/Column.ts
@@ -1,14 +1,8 @@
-import React from 'react';
-
-type PropertyFunction = () => T;
-
-// TODO: Convert to generic so `name` can be a type
interface Column {
name: string;
- label: string | PropertyFunction | React.ReactNode;
- className?: string;
- columnLabel?: string;
- isSortable?: boolean;
+ label: string;
+ columnLabel: string;
+ isSortable: boolean;
isVisible: boolean;
isModifiable?: boolean;
}
diff --git a/frontend/src/Components/Table/Table.js b/frontend/src/Components/Table/Table.js
index 8afbf9ea0..c41fc982a 100644
--- a/frontend/src/Components/Table/Table.js
+++ b/frontend/src/Components/Table/Table.js
@@ -107,7 +107,7 @@ function Table(props) {
{...getTableHeaderCellProps(otherProps)}
{...column}
>
- {typeof column.label === 'function' ? column.label() : column.label}
+ {column.label}
);
})
@@ -121,7 +121,6 @@ function Table(props) {
}
Table.propTypes = {
- ...TableHeaderCell.props,
className: PropTypes.string,
horizontalScroll: PropTypes.bool.isRequired,
selectAll: PropTypes.bool.isRequired,
diff --git a/frontend/src/Components/Table/TableHeaderCell.js b/frontend/src/Components/Table/TableHeaderCell.js
index b0ed5c571..21766978b 100644
--- a/frontend/src/Components/Table/TableHeaderCell.js
+++ b/frontend/src/Components/Table/TableHeaderCell.js
@@ -30,7 +30,6 @@ class TableHeaderCell extends Component {
const {
className,
name,
- label,
columnLabel,
isSortable,
isVisible,
@@ -54,8 +53,7 @@ class TableHeaderCell extends Component {
{...otherProps}
component="th"
className={className}
- label={typeof label === 'function' ? label() : label}
- title={typeof columnLabel === 'function' ? columnLabel() : columnLabel}
+ title={columnLabel}
onPress={this.onPress}
>
{children}
@@ -79,8 +77,7 @@ class TableHeaderCell extends Component {
TableHeaderCell.propTypes = {
className: PropTypes.string,
name: PropTypes.string.isRequired,
- label: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.node]),
- columnLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+ columnLabel: PropTypes.string,
isSortable: PropTypes.bool,
isVisible: PropTypes.bool,
isModifiable: PropTypes.bool,
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js
index 402ef5ae1..2d91c7c63 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumn.js
@@ -35,7 +35,7 @@ function TableOptionsColumn(props) {
isDisabled={isModifiable === false}
onChange={onVisibleChange}
/>
- {typeof label === 'function' ? label() : label}
+ {label}
{
@@ -56,7 +56,7 @@ function TableOptionsColumn(props) {
TableOptionsColumn.propTypes = {
name: PropTypes.string.isRequired,
- label: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,
+ label: PropTypes.string.isRequired,
isVisible: PropTypes.bool.isRequired,
isModifiable: PropTypes.bool.isRequired,
index: PropTypes.number.isRequired,
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js
index 77d18463f..100559660 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsColumnDragSource.js
@@ -112,7 +112,7 @@ class TableOptionsColumnDragSource extends Component {
@@ -187,19 +180,16 @@ VirtualTable.propTypes = {
className: PropTypes.string.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
scrollIndex: PropTypes.number,
- scrollTop: PropTypes.number,
scroller: PropTypes.instanceOf(Element).isRequired,
focusScroller: PropTypes.bool.isRequired,
header: PropTypes.node.isRequired,
headerHeight: PropTypes.number.isRequired,
- rowRenderer: PropTypes.func.isRequired,
- rowHeight: PropTypes.number.isRequired
+ rowRenderer: PropTypes.func.isRequired
};
VirtualTable.defaultProps = {
className: styles.tableContainer,
headerHeight: 38,
- rowHeight: ROW_HEIGHT,
focusScroller: true
};
diff --git a/frontend/src/Components/Table/usePaging.ts b/frontend/src/Components/Table/usePaging.ts
deleted file mode 100644
index dfebb2355..000000000
--- a/frontend/src/Components/Table/usePaging.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useCallback, useMemo } from 'react';
-import { useDispatch } from 'react-redux';
-
-interface PagingOptions {
- page: number;
- totalPages: number;
- gotoPage: ({ page }: { page: number }) => void;
-}
-
-function usePaging(options: PagingOptions) {
- const { page, totalPages, gotoPage } = options;
- const dispatch = useDispatch();
-
- const handleFirstPagePress = useCallback(() => {
- dispatch(gotoPage({ page: 1 }));
- }, [dispatch, gotoPage]);
-
- const handlePreviousPagePress = useCallback(() => {
- dispatch(gotoPage({ page: Math.max(page - 1, 1) }));
- }, [page, dispatch, gotoPage]);
-
- const handleNextPagePress = useCallback(() => {
- dispatch(gotoPage({ page: Math.min(page + 1, totalPages) }));
- }, [page, totalPages, dispatch, gotoPage]);
-
- const handleLastPagePress = useCallback(() => {
- dispatch(gotoPage({ page: totalPages }));
- }, [totalPages, dispatch, gotoPage]);
-
- const handlePageSelect = useCallback(
- (page: number) => {
- dispatch(gotoPage({ page }));
- },
- [dispatch, gotoPage]
- );
-
- return useMemo(() => {
- return {
- handleFirstPagePress,
- handlePreviousPagePress,
- handleNextPagePress,
- handleLastPagePress,
- handlePageSelect,
- };
- }, [
- handleFirstPagePress,
- handlePreviousPagePress,
- handleNextPagePress,
- handleLastPagePress,
- handlePageSelect,
- ]);
-}
-
-export default usePaging;
diff --git a/frontend/src/Components/TagList.js b/frontend/src/Components/TagList.js
index fe700b8fe..f4d4e2af4 100644
--- a/frontend/src/Components/TagList.js
+++ b/frontend/src/Components/TagList.js
@@ -1,15 +1,14 @@
import PropTypes from 'prop-types';
import React from 'react';
import { kinds } from 'Helpers/Props';
-import sortByProp from 'Utilities/Array/sortByProp';
import Label from './Label';
import styles from './TagList.css';
function TagList({ tags, tagList }) {
const sortedTags = tags
.map((tagId) => tagList.find((tag) => tag.id === tagId))
- .filter((tag) => !!tag)
- .sort(sortByProp('label'));
+ .filter((t) => t !== undefined)
+ .sort((a, b) => a.label.localeCompare(b.label));
return (
diff --git a/frontend/src/Components/keyboardShortcuts.js b/frontend/src/Components/keyboardShortcuts.js
index 8513a65eb..713f2bff4 100644
--- a/frontend/src/Components/keyboardShortcuts.js
+++ b/frontend/src/Components/keyboardShortcuts.js
@@ -6,51 +6,37 @@ import translate from 'Utilities/String/translate';
export const shortcuts = {
OPEN_KEYBOARD_SHORTCUTS_MODAL: {
key: '?',
- get name() {
- return translate('OpenThisModal');
- }
+ name: translate('OpenThisModal')
},
CLOSE_MODAL: {
key: 'Esc',
- get name() {
- return translate('CloseCurrentModal');
- }
+ name: translate('CloseCurrentModal')
},
ACCEPT_CONFIRM_MODAL: {
key: 'Enter',
- get name() {
- return translate('AcceptConfirmationModal');
- }
+ name: translate('AcceptConfirmationModal')
},
MOVIE_SEARCH_INPUT: {
key: 's',
- get name() {
- return translate('FocusSearchBox');
- }
+ name: translate('FocusSearchBox')
},
SAVE_SETTINGS: {
key: 'mod+s',
- get name() {
- return translate('SaveSettings');
- }
+ name: translate('SaveSettings')
},
SCROLL_TOP: {
key: 'mod+home',
- get name() {
- return translate('MovieIndexScrollTop');
- }
+ name: translate('MovieIndexScrollTop')
},
SCROLL_BOTTOM: {
key: 'mod+end',
- get name() {
- return translate('MovieIndexScrollBottom');
- }
+ name: translate('MovieIndexScrollBottom')
}
};
@@ -81,10 +67,8 @@ function keyboardShortcuts(WrappedComponent) {
};
unbindShortcut = (key) => {
- if (this._mousetrap != null) {
- delete this._mousetrapBindings[key];
- this._mousetrap.unbind(key);
- }
+ delete this._mousetrapBindings[key];
+ this._mousetrap.unbind(key);
};
unbindAllShortcuts = () => {
diff --git a/frontend/src/Components/withScrollPosition.tsx b/frontend/src/Components/withScrollPosition.tsx
index f688a6253..ec13c6ab8 100644
--- a/frontend/src/Components/withScrollPosition.tsx
+++ b/frontend/src/Components/withScrollPosition.tsx
@@ -1,30 +1,24 @@
+import PropTypes from 'prop-types';
import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
import scrollPositions from 'Store/scrollPositions';
-interface WrappedComponentProps {
- initialScrollTop: number;
-}
-
-interface ScrollPositionProps {
- history: RouteComponentProps['history'];
- location: RouteComponentProps['location'];
- match: RouteComponentProps['match'];
-}
-
-function withScrollPosition(
- WrappedComponent: React.FC,
- scrollPositionKey: string
-) {
- function ScrollPosition(props: ScrollPositionProps) {
+function withScrollPosition(WrappedComponent, scrollPositionKey) {
+ function ScrollPosition(props) {
const { history } = props;
const initialScrollTop =
- history.action === 'POP' ? scrollPositions[scrollPositionKey] : 0;
+ history.action === 'POP' ||
+ (history.location.state && history.location.state.restoreScrollPosition)
+ ? scrollPositions[scrollPositionKey]
+ : 0;
return
- {translate('AuthenticationMethod')}
+ {translate('Authentication')}
-
- {translate('AuthenticationRequired')}
+ {
+ authenticationEnabled ?
+
+ {translate('AuthenticationRequired')}
-
+ :
+ null
+ }
-
- {translate('Username')}
+ {
+ authenticationEnabled ?
+
+ {translate('Username')}
-
+ :
+ null
+ }
-
- {translate('Password')}
+ {
+ authenticationEnabled ?
+
+ {translate('Password')}
-
-
-
- {translate('PasswordConfirmation')}
-
-
+ :
+ null
+ }
:
null
}
diff --git a/frontend/src/Helpers/Hooks/useCurrentPage.ts b/frontend/src/Helpers/Hooks/useCurrentPage.ts
deleted file mode 100644
index 3caf66df2..000000000
--- a/frontend/src/Helpers/Hooks/useCurrentPage.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useHistory } from 'react-router-dom';
-
-function useCurrentPage() {
- const history = useHistory();
-
- return history.action === 'POP';
-}
-
-export default useCurrentPage;
diff --git a/frontend/src/Helpers/Hooks/useModalOpenState.ts b/frontend/src/Helpers/Hooks/useModalOpenState.ts
deleted file mode 100644
index 24cffb2f1..000000000
--- a/frontend/src/Helpers/Hooks/useModalOpenState.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useCallback, useState } from 'react';
-
-export default function useModalOpenState(
- initialState: boolean
-): [boolean, () => void, () => void] {
- const [isOpen, setIsOpen] = useState(initialState);
-
- const setModalOpen = useCallback(() => {
- setIsOpen(true);
- }, [setIsOpen]);
-
- const setModalClosed = useCallback(() => {
- setIsOpen(false);
- }, [setIsOpen]);
-
- return [isOpen, setModalOpen, setModalClosed];
-}
diff --git a/frontend/src/Helpers/Hooks/usePrevious.tsx b/frontend/src/Helpers/Hooks/usePrevious.tsx
deleted file mode 100644
index b594e2632..000000000
--- a/frontend/src/Helpers/Hooks/usePrevious.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-export default function usePrevious(value: T): T | undefined {
- const ref = useRef();
-
- useEffect(() => {
- ref.current = value;
- }, [value]);
-
- return ref.current;
-}
diff --git a/frontend/src/Helpers/Hooks/useSelectState.tsx b/frontend/src/Helpers/Hooks/useSelectState.tsx
deleted file mode 100644
index 8fb96e42a..000000000
--- a/frontend/src/Helpers/Hooks/useSelectState.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { cloneDeep } from 'lodash';
-import { useReducer } from 'react';
-import ModelBase from 'App/ModelBase';
-import areAllSelected from 'Utilities/Table/areAllSelected';
-import selectAll from 'Utilities/Table/selectAll';
-import toggleSelected from 'Utilities/Table/toggleSelected';
-
-export type SelectedState = Record;
-
-export interface SelectState {
- selectedState: SelectedState;
- lastToggled: number | null;
- allSelected: boolean;
- allUnselected: boolean;
-}
-
-export type SelectAction =
- | { type: 'reset' }
- | { type: 'selectAll'; items: ModelBase[] }
- | { type: 'unselectAll'; items: ModelBase[] }
- | {
- type: 'toggleSelected';
- id: number;
- isSelected: boolean;
- shiftKey: boolean;
- items: ModelBase[];
- }
- | {
- type: 'removeItem';
- id: number;
- }
- | {
- type: 'updateItems';
- items: ModelBase[];
- };
-
-export type Dispatch = (action: SelectAction) => void;
-
-const initialState = {
- selectedState: {},
- lastToggled: null,
- allSelected: false,
- allUnselected: true,
- items: [],
-};
-
-function getSelectedState(items: ModelBase[], existingState: SelectedState) {
- return items.reduce((acc: SelectedState, item) => {
- const id = item.id;
-
- acc[id] = existingState[id] ?? false;
-
- return acc;
- }, {});
-}
-
-function selectReducer(state: SelectState, action: SelectAction): SelectState {
- const { selectedState } = state;
-
- switch (action.type) {
- case 'reset': {
- return cloneDeep(initialState);
- }
- case 'selectAll': {
- return {
- ...selectAll(selectedState, true),
- };
- }
- case 'unselectAll': {
- return {
- ...selectAll(selectedState, false),
- };
- }
- case 'toggleSelected': {
- const result = {
- ...toggleSelected(
- state,
- action.items,
- action.id,
- action.isSelected,
- action.shiftKey
- ),
- };
-
- return result;
- }
- case 'updateItems': {
- const nextSelectedState = getSelectedState(action.items, selectedState);
-
- return {
- ...state,
- ...areAllSelected(nextSelectedState),
- selectedState: nextSelectedState,
- };
- }
- default: {
- throw new Error(`Unhandled action type: ${action.type}`);
- }
- }
-}
-
-export default function useSelectState(): [SelectState, Dispatch] {
- const selectedState = getSelectedState([], {});
-
- const [state, dispatch] = useReducer(selectReducer, {
- selectedState,
- lastToggled: null,
- allSelected: false,
- allUnselected: true,
- });
-
- return [state, dispatch];
-}
diff --git a/frontend/src/Helpers/Props/TooltipPosition.ts b/frontend/src/Helpers/Props/TooltipPosition.ts
deleted file mode 100644
index 885c73470..000000000
--- a/frontend/src/Helpers/Props/TooltipPosition.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-type TooltipPosition = 'top' | 'right' | 'bottom' | 'left';
-
-export default TooltipPosition;
diff --git a/frontend/src/Helpers/Props/align.ts b/frontend/src/Helpers/Props/align.js
similarity index 100%
rename from frontend/src/Helpers/Props/align.ts
rename to frontend/src/Helpers/Props/align.js
diff --git a/frontend/src/Helpers/Props/filterBuilderTypes.js b/frontend/src/Helpers/Props/filterBuilderTypes.js
index c0806fabc..776ba2afc 100644
--- a/frontend/src/Helpers/Props/filterBuilderTypes.js
+++ b/frontend/src/Helpers/Props/filterBuilderTypes.js
@@ -1,18 +1,14 @@
import * as filterTypes from './filterTypes';
export const ARRAY = 'array';
-export const CONTAINS = 'contains';
export const DATE = 'date';
-export const EQUAL = 'equal';
export const EXACT = 'exact';
export const NUMBER = 'number';
export const STRING = 'string';
export const all = [
ARRAY,
- CONTAINS,
DATE,
- EQUAL,
EXACT,
NUMBER,
STRING
@@ -24,10 +20,6 @@ export const possibleFilterTypes = {
{ key: filterTypes.NOT_CONTAINS, value: 'does not contain' }
],
- [CONTAINS]: [
- { key: filterTypes.CONTAINS, value: 'contains' }
- ],
-
[DATE]: [
{ key: filterTypes.LESS_THAN, value: 'is before' },
{ key: filterTypes.GREATER_THAN, value: 'is after' },
@@ -37,10 +29,6 @@ export const possibleFilterTypes = {
{ key: filterTypes.NOT_IN_NEXT, value: 'not in the next' }
],
- [EQUAL]: [
- { key: filterTypes.EQUAL, value: 'is' }
- ],
-
[EXACT]: [
{ key: filterTypes.EQUAL, value: 'is' },
{ key: filterTypes.NOT_EQUAL, value: 'is not' }
@@ -59,10 +47,6 @@ export const possibleFilterTypes = {
{ key: filterTypes.CONTAINS, value: 'contains' },
{ key: filterTypes.NOT_CONTAINS, value: 'does not contain' },
{ key: filterTypes.EQUAL, value: 'equal' },
- { key: filterTypes.NOT_EQUAL, value: 'not equal' },
- { key: filterTypes.STARTS_WITH, value: 'starts with' },
- { key: filterTypes.NOT_STARTS_WITH, value: 'does not start with' },
- { key: filterTypes.ENDS_WITH, value: 'ends with' },
- { key: filterTypes.NOT_ENDS_WITH, value: 'does not end with' }
+ { key: filterTypes.NOT_EQUAL, value: 'not equal' }
]
};
diff --git a/frontend/src/Helpers/Props/filterBuilderValueTypes.js b/frontend/src/Helpers/Props/filterBuilderValueTypes.js
index 73ef41956..7fed535f2 100644
--- a/frontend/src/Helpers/Props/filterBuilderValueTypes.js
+++ b/frontend/src/Helpers/Props/filterBuilderValueTypes.js
@@ -2,10 +2,9 @@ export const BOOL = 'bool';
export const BYTES = 'bytes';
export const DATE = 'date';
export const DEFAULT = 'default';
-export const HISTORY_EVENT_TYPE = 'historyEventType';
export const INDEXER = 'indexer';
export const PROTOCOL = 'protocol';
export const PRIVACY = 'privacy';
export const APP_PROFILE = 'appProfile';
-export const CATEGORY = 'category';
+export const MOVIE_STATUS = 'movieStatus';
export const TAG = 'tag';
diff --git a/frontend/src/Helpers/Props/filterTypePredicates.js b/frontend/src/Helpers/Props/filterTypePredicates.js
index d07059c02..a3ea11956 100644
--- a/frontend/src/Helpers/Props/filterTypePredicates.js
+++ b/frontend/src/Helpers/Props/filterTypePredicates.js
@@ -39,22 +39,6 @@ const filterTypePredicates = {
[filterTypes.NOT_EQUAL]: function(itemValue, filterValue) {
return itemValue !== filterValue;
- },
-
- [filterTypes.STARTS_WITH]: function(itemValue, filterValue) {
- return itemValue.toLowerCase().startsWith(filterValue.toLowerCase());
- },
-
- [filterTypes.NOT_STARTS_WITH]: function(itemValue, filterValue) {
- return !itemValue.toLowerCase().startsWith(filterValue.toLowerCase());
- },
-
- [filterTypes.ENDS_WITH]: function(itemValue, filterValue) {
- return itemValue.toLowerCase().endsWith(filterValue.toLowerCase());
- },
-
- [filterTypes.NOT_ENDS_WITH]: function(itemValue, filterValue) {
- return !itemValue.toLowerCase().endsWith(filterValue.toLowerCase());
}
};
diff --git a/frontend/src/Helpers/Props/filterTypes.js b/frontend/src/Helpers/Props/filterTypes.js
index 239a4e7e9..993e8df57 100644
--- a/frontend/src/Helpers/Props/filterTypes.js
+++ b/frontend/src/Helpers/Props/filterTypes.js
@@ -10,10 +10,6 @@ export const LESS_THAN = 'lessThan';
export const LESS_THAN_OR_EQUAL = 'lessThanOrEqual';
export const NOT_CONTAINS = 'notContains';
export const NOT_EQUAL = 'notEqual';
-export const STARTS_WITH = 'startsWith';
-export const NOT_STARTS_WITH = 'notStartsWith';
-export const ENDS_WITH = 'endsWith';
-export const NOT_ENDS_WITH = 'notEndsWith';
export const all = [
CONTAINS,
@@ -27,9 +23,5 @@ export const all = [
IN_LAST,
NOT_IN_LAST,
IN_NEXT,
- NOT_IN_NEXT,
- STARTS_WITH,
- NOT_STARTS_WITH,
- ENDS_WITH,
- NOT_ENDS_WITH
+ NOT_IN_NEXT
];
diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js
index 773748996..00e2c1aa0 100644
--- a/frontend/src/Helpers/Props/icons.js
+++ b/frontend/src/Helpers/Props/icons.js
@@ -43,7 +43,6 @@ import {
faChevronCircleRight as fasChevronCircleRight,
faChevronCircleUp as fasChevronCircleUp,
faCircle as fasCircle,
- faCircleDown as fasCircleDown,
faCloud as fasCloud,
faCloudDownloadAlt as fasCloudDownloadAlt,
faCog as fasCog,
@@ -73,10 +72,8 @@ import {
faLanguage as fasLanguage,
faLaptop as fasLaptop,
faLevelUpAlt as fasLevelUpAlt,
- faListCheck as fasListCheck,
faLocationArrow as fasLocationArrow,
faLock as fasLock,
- faMagnet as fasMagnet,
faMedkit as fasMedkit,
faMinus as fasMinus,
faMusic as fasMusic,
@@ -142,7 +139,6 @@ export const CHECK_INDETERMINATE = fasMinus;
export const CHECK_CIRCLE = fasCheckCircle;
export const CHECK_SQUARE = fasSquareCheck;
export const CIRCLE = fasCircle;
-export const CIRCLE_DOWN = fasCircleDown;
export const CIRCLE_OUTLINE = farCircle;
export const CLEAR = fasTrashAlt;
export const CLIPBOARD = fasCopy;
@@ -184,8 +180,6 @@ 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;
export const MONITORED = fasBookmark;
diff --git a/frontend/src/Helpers/Props/inputTypes.js b/frontend/src/Helpers/Props/inputTypes.js
index f9cd58e6d..7a11bb0c7 100644
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -1,5 +1,6 @@
export const AUTO_COMPLETE = 'autoComplete';
export const APP_PROFILE_SELECT = 'appProfileSelect';
+export const AVAILABILITY_SELECT = 'availabilitySelect';
export const CAPTCHA = 'captcha';
export const CARDIGANNCAPTCHA = 'cardigannCaptcha';
export const CHECK = 'check';
@@ -8,8 +9,6 @@ export const KEY_VALUE_LIST = 'keyValueList';
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';
@@ -26,6 +25,7 @@ export const TAG_SELECT = 'tagSelect';
export const all = [
AUTO_COMPLETE,
APP_PROFILE_SELECT,
+ AVAILABILITY_SELECT,
CAPTCHA,
CARDIGANNCAPTCHA,
CHECK,
@@ -34,7 +34,6 @@ export const all = [
INFO,
MOVIE_MONITORED_SELECT,
CATEGORY_SELECT,
- FLOAT,
NUMBER,
OAUTH,
PASSWORD,
diff --git a/frontend/src/Helpers/Props/kinds.ts b/frontend/src/Helpers/Props/kinds.js
similarity index 72%
rename from frontend/src/Helpers/Props/kinds.ts
rename to frontend/src/Helpers/Props/kinds.js
index 7ce606716..b0f5ac87f 100644
--- a/frontend/src/Helpers/Props/kinds.ts
+++ b/frontend/src/Helpers/Props/kinds.js
@@ -7,6 +7,7 @@ export const PRIMARY = 'primary';
export const PURPLE = 'purple';
export const SUCCESS = 'success';
export const WARNING = 'warning';
+export const QUEUE = 'queue';
export const all = [
DANGER,
@@ -18,15 +19,5 @@ export const all = [
PURPLE,
SUCCESS,
WARNING,
-] as const;
-
-export type Kind =
- | 'danger'
- | 'default'
- | 'disabled'
- | 'info'
- | 'inverse'
- | 'primary'
- | 'purple'
- | 'success'
- | 'warning';
+ QUEUE
+];
diff --git a/frontend/src/Helpers/Props/sizes.ts b/frontend/src/Helpers/Props/sizes.js
similarity index 71%
rename from frontend/src/Helpers/Props/sizes.ts
rename to frontend/src/Helpers/Props/sizes.js
index ca7a50fbf..d7f85df5e 100644
--- a/frontend/src/Helpers/Props/sizes.ts
+++ b/frontend/src/Helpers/Props/sizes.js
@@ -4,6 +4,4 @@ export const MEDIUM = 'medium';
export const LARGE = 'large';
export const EXTRA_LARGE = 'extraLarge';
-export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE] as const;
-
-export type Size = 'extraSmall' | 'small' | 'medium' | 'large' | 'extraLarge';
+export const all = [EXTRA_SMALL, SMALL, MEDIUM, LARGE, EXTRA_LARGE];
diff --git a/frontend/src/History/Details/HistoryDetails.js b/frontend/src/History/Details/HistoryDetails.js
index 6d5ab260e..63543f040 100644
--- a/frontend/src/History/Details/HistoryDetails.js
+++ b/frontend/src/History/Details/HistoryDetails.js
@@ -3,7 +3,6 @@ import React from 'react';
import DescriptionList from 'Components/DescriptionList/DescriptionList';
import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
import Link from 'Components/Link/Link';
-import formatDateTime from 'Utilities/Date/formatDateTime';
import translate from 'Utilities/String/translate';
import styles from './HistoryDetails.css';
@@ -11,10 +10,7 @@ function HistoryDetails(props) {
const {
indexer,
eventType,
- date,
- data,
- shortDateFormat,
- timeFormat
+ data
} = props;
if (eventType === 'indexerQuery' || eventType === 'indexerRss') {
@@ -22,13 +18,8 @@ function HistoryDetails(props) {
query,
queryResults,
categories,
- limit,
- offset,
source,
- host,
- url,
- elapsedTime,
- cached
+ url
} = data;
return (
@@ -40,93 +31,43 @@ function HistoryDetails(props) {
/>
{
- indexer ?
+ !!indexer &&
{translate('Link')} : '-'}
- /> :
- null
- }
-
- {
- elapsedTime ?
-
{
- indexer ?
+ !!indexer &&
{infoUrl}}
- /> :
- null
- }
-
- {
- publishedDate ?
- {translate('Link')} : '-'}
- /> :
- null
- }
-
- {
- elapsedTime ?
-
);
}
if (eventType === 'indexerAuth') {
- const { elapsedTime } = data;
-
return (
{
- indexer ?
+ !!indexer &&
);
@@ -297,15 +141,6 @@ function HistoryDetails(props) {
title={translate('Name')}
data={data.query}
/>
-
- {
- date ?
-
+ {
+ eventType === 'grabbed' &&
+
+ Mark as Failed
+
+ }
+
- {translate('CountIndexersSelected', { count: selectedCount })}
+ {translate('{0} indexers selected', selectedCount.toString())}
-
-
-
-
-
-
-
+
+
);
}
@@ -28,7 +28,10 @@ function NoIndexer(props: NoIndexerProps) {
+ {translate('AllIndexersHiddenDueToFilter')}
+
+
-
@@ -36,4 +39,9 @@ function NoIndexer(props: NoIndexerProps) {
);
}
+NoIndexer.propTypes = {
+ totalItems: PropTypes.number.isRequired,
+ onAddIndexerPress: PropTypes.func.isRequired
+};
+
export default NoIndexer;
diff --git a/frontend/src/Indexer/Stats/IndexerStats.css b/frontend/src/Indexer/Stats/IndexerStats.css
deleted file mode 100644
index 975f5ddae..000000000
--- a/frontend/src/Indexer/Stats/IndexerStats.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.fullWidthChart {
- display: inline-block;
- width: 100%;
-}
-
-.halfWidthChart {
- display: inline-block;
- width: 50%;
-}
-
-.quarterWidthChart {
- display: inline-block;
- width: 25%;
-}
-
-.chartContainer {
- margin: 5px;
- padding: 15px 25px;
- height: 300px;
- border-radius: 10px;
- background-color: var(--chartBackgroundColor);
-}
-
-.statContainer {
- margin: 5px;
- padding: 15px 25px;
- height: 150px;
- border-radius: 10px;
- background-color: var(--chartBackgroundColor);
-}
-
-.statTitle {
- font-weight: bold;
- font-size: 14px;
-}
-
-.stat {
- font-weight: bold;
- font-size: 60px;
-}
-
-@media only screen and (max-width: $breakpointSmall) {
- .halfWidthChart {
- display: inline-block;
- width: 100%;
- }
-
- .quarterWidthChart {
- display: inline-block;
- width: 100%;
- }
-}
diff --git a/frontend/src/Indexer/Stats/IndexerStats.css.d.ts b/frontend/src/Indexer/Stats/IndexerStats.css.d.ts
deleted file mode 100644
index e2aae98c6..000000000
--- a/frontend/src/Indexer/Stats/IndexerStats.css.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'chartContainer': string;
- 'fullWidthChart': string;
- 'halfWidthChart': string;
- 'quarterWidthChart': string;
- 'stat': string;
- 'statContainer': string;
- 'statTitle': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Indexer/Stats/IndexerStats.tsx b/frontend/src/Indexer/Stats/IndexerStats.tsx
deleted file mode 100644
index bccd49cbe..000000000
--- a/frontend/src/Indexer/Stats/IndexerStats.tsx
+++ /dev/null
@@ -1,373 +0,0 @@
-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 FilterMenu from 'Components/Menu/FilterMenu';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import { align, icons, kinds } from 'Helpers/Props';
-import {
- fetchIndexerStats,
- setIndexerStatsFilter,
-} from 'Store/Actions/indexerStatsActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
-import {
- IndexerStatsHost,
- IndexerStatsIndexer,
- IndexerStatsUserAgent,
-} from 'typings/IndexerStats';
-import abbreviateNumber from 'Utilities/Number/abbreviateNumber';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import translate from 'Utilities/String/translate';
-import IndexerStatsFilterModal from './IndexerStatsFilterModal';
-import styles from './IndexerStats.css';
-
-function getAverageResponseTimeData(indexerStats: IndexerStatsIndexer[]) {
- const statistics = [...indexerStats].sort((a, b) =>
- a.averageResponseTime === b.averageResponseTime
- ? b.averageGrabResponseTime - a.averageGrabResponseTime
- : b.averageResponseTime - a.averageResponseTime
- );
-
- return {
- labels: statistics.map((indexer) => indexer.indexerName),
- datasets: [
- {
- label: translate('AverageQueries'),
- data: statistics.map((indexer) => indexer.averageResponseTime),
- },
- {
- label: translate('AverageGrabs'),
- data: statistics.map((indexer) => indexer.averageGrabResponseTime),
- },
- ],
- };
-}
-
-function getFailureRateData(indexerStats: IndexerStatsIndexer[]) {
- const data = [...indexerStats]
- .map((indexer) => ({
- label: indexer.indexerName,
- value:
- (indexer.numberOfFailedQueries +
- indexer.numberOfFailedRssQueries +
- indexer.numberOfFailedAuthQueries +
- indexer.numberOfFailedGrabs) /
- (indexer.numberOfQueries +
- indexer.numberOfRssQueries +
- indexer.numberOfAuthQueries +
- indexer.numberOfGrabs),
- }))
- .filter((s) => s.value > 0);
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-function getTotalRequestsData(indexerStats: IndexerStatsIndexer[]) {
- const statistics = [...indexerStats]
- .filter(
- (s) =>
- s.numberOfQueries > 0 ||
- s.numberOfRssQueries > 0 ||
- s.numberOfAuthQueries > 0
- )
- .sort(
- (a, b) =>
- b.numberOfQueries +
- b.numberOfRssQueries +
- b.numberOfAuthQueries -
- (a.numberOfQueries + a.numberOfRssQueries + a.numberOfAuthQueries)
- );
-
- return {
- labels: statistics.map((indexer) => indexer.indexerName),
- datasets: [
- {
- label: translate('SearchQueries'),
- data: statistics.map((indexer) => indexer.numberOfQueries),
- },
- {
- label: translate('RssQueries'),
- data: statistics.map((indexer) => indexer.numberOfRssQueries),
- },
- {
- label: translate('AuthQueries'),
- data: statistics.map((indexer) => indexer.numberOfAuthQueries),
- },
- ],
- };
-}
-
-function getNumberGrabsData(indexerStats: IndexerStatsIndexer[]) {
- const data = [...indexerStats]
- .map((indexer) => ({
- label: indexer.indexerName,
- value: indexer.numberOfGrabs - indexer.numberOfFailedGrabs,
- }))
- .filter((s) => s.value > 0);
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-function getUserAgentGrabsData(indexerStats: IndexerStatsUserAgent[]) {
- const data = indexerStats.map((indexer) => ({
- label: indexer.userAgent ? indexer.userAgent : 'Other',
- value: indexer.numberOfGrabs,
- }));
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-function getUserAgentQueryData(indexerStats: IndexerStatsUserAgent[]) {
- const data = indexerStats.map((indexer) => ({
- label: indexer.userAgent ? indexer.userAgent : 'Other',
- value: indexer.numberOfQueries,
- }));
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-function getHostGrabsData(indexerStats: IndexerStatsHost[]) {
- const data = indexerStats.map((indexer) => ({
- label: indexer.host ? indexer.host : 'Other',
- value: indexer.numberOfGrabs,
- }));
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-function getHostQueryData(indexerStats: IndexerStatsHost[]) {
- const data = indexerStats.map((indexer) => ({
- label: indexer.host ? indexer.host : 'Other',
- value: indexer.numberOfQueries,
- }));
-
- data.sort((a, b) => b.value - a.value);
-
- return data;
-}
-
-const indexerStatsSelector = () => {
- return createSelector(
- (state: AppState) => state.indexerStats,
- createCustomFiltersSelector('indexerStats'),
- (indexerStats: IndexerStatsAppState, customFilters) => {
- return {
- ...indexerStats,
- customFilters,
- };
- }
- );
-};
-
-function IndexerStats() {
- const {
- isFetching,
- isPopulated,
- item,
- error,
- filters,
- customFilters,
- selectedFilterKey,
- } = useSelector(indexerStatsSelector());
- const dispatch = useDispatch();
-
- useEffect(() => {
- dispatch(fetchIndexerStats());
- }, [dispatch]);
-
- const onRefreshPress = useCallback(() => {
- dispatch(fetchIndexerStats());
- }, [dispatch]);
-
- const onFilterSelect = useCallback(
- (value: string) => {
- dispatch(setIndexerStatsFilter({ selectedFilterKey: value }));
- },
- [dispatch]
- );
-
- const isLoaded = !error && isPopulated;
- const indexerCount = item.indexers?.length ?? 0;
- const userAgentCount = item.userAgents?.length ?? 0;
- const queryCount =
- item.indexers?.reduce((total, indexer) => {
- return (
- total +
- indexer.numberOfQueries +
- indexer.numberOfRssQueries +
- indexer.numberOfAuthQueries
- );
- }, 0) ?? 0;
- const grabCount =
- item.indexers?.reduce((total, indexer) => {
- return total + indexer.numberOfGrabs;
- }, 0) ?? 0;
-
- return (
-
-
- )}
-
-
-
-
-
- {translate('ActiveIndexers')}
-
- {indexerCount}
-
-
-
-
-
- {translate('TotalQueries')}
-
-
- {abbreviateNumber(queryCount)}
-
-
-
-
-
-
- {translate('TotalGrabs')}
-
- {abbreviateNumber(grabCount)}
-
-
-
-
-
- {translate('ActiveApps')}
-
- {userAgentCount}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {getErrorMessage(error, 'Failed to load indexer stats from API')}
+
+ }
+
+ {
+ isLoaded &&
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+SearchIndexOverview.propTypes = {
+ guid: PropTypes.string.isRequired,
+ categories: PropTypes.arrayOf(PropTypes.object).isRequired,
+ protocol: PropTypes.string.isRequired,
+ age: PropTypes.number.isRequired,
+ ageHours: PropTypes.number.isRequired,
+ ageMinutes: PropTypes.number.isRequired,
+ publishDate: PropTypes.string.isRequired,
+ title: PropTypes.string.isRequired,
+ infoUrl: PropTypes.string.isRequired,
+ downloadUrl: PropTypes.string.isRequired,
+ indexerId: PropTypes.number.isRequired,
+ indexer: PropTypes.string.isRequired,
+ size: PropTypes.number.isRequired,
+ files: PropTypes.number,
+ grabs: PropTypes.number,
+ seeders: PropTypes.number,
+ leechers: PropTypes.number,
+ indexerFlags: PropTypes.arrayOf(PropTypes.string).isRequired,
+ rowHeight: PropTypes.number.isRequired,
+ showRelativeDates: PropTypes.bool.isRequired,
+ shortDateFormat: PropTypes.string.isRequired,
+ longDateFormat: PropTypes.string.isRequired,
+ timeFormat: PropTypes.string.isRequired,
+ isSmallScreen: PropTypes.bool.isRequired,
+ onGrabPress: PropTypes.func.isRequired,
+ isGrabbing: PropTypes.bool.isRequired,
+ isGrabbed: PropTypes.bool.isRequired,
+ grabError: PropTypes.string
+};
+
+SearchIndexOverview.defaultProps = {
+ isGrabbing: false,
+ isGrabbed: false
+};
+
+export default SearchIndexOverview;
diff --git a/frontend/src/Search/Mobile/SearchIndexOverview.tsx b/frontend/src/Search/Mobile/SearchIndexOverview.tsx
deleted file mode 100644
index 21a42d70c..000000000
--- a/frontend/src/Search/Mobile/SearchIndexOverview.tsx
+++ /dev/null
@@ -1,264 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import { useSelector } from 'react-redux';
-import TextTruncate from 'react-text-truncate';
-import Icon from 'Components/Icon';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import Link from 'Components/Link/Link';
-import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
-import DownloadProtocol from 'DownloadClient/DownloadProtocol';
-import { icons, kinds } from 'Helpers/Props';
-import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
-import { IndexerCategory } from 'Indexer/Indexer';
-import OverrideMatchModal from 'Search/OverrideMatch/OverrideMatchModal';
-import CategoryLabel from 'Search/Table/CategoryLabel';
-import Peers from 'Search/Table/Peers';
-import createEnabledDownloadClientsSelector from 'Store/Selectors/createEnabledDownloadClientsSelector';
-import dimensions from 'Styles/Variables/dimensions';
-import formatDateTime from 'Utilities/Date/formatDateTime';
-import formatAge from 'Utilities/Number/formatAge';
-import formatBytes from 'Utilities/Number/formatBytes';
-import titleCase from 'Utilities/String/titleCase';
-import translate from 'Utilities/String/translate';
-import styles from './SearchIndexOverview.css';
-
-const columnPadding = parseInt(dimensions.movieIndexColumnPadding);
-const columnPaddingSmallScreen = parseInt(
- dimensions.movieIndexColumnPaddingSmallScreen
-);
-
-function getDownloadIcon(
- isGrabbing: boolean,
- isGrabbed: boolean,
- grabError?: string
-) {
- if (isGrabbing) {
- return icons.SPINNER;
- } else if (isGrabbed) {
- return icons.DOWNLOADING;
- } else if (grabError) {
- return icons.DOWNLOADING;
- }
-
- return icons.DOWNLOAD;
-}
-
-function getDownloadKind(isGrabbed: boolean, grabError?: string) {
- if (isGrabbed) {
- return kinds.SUCCESS;
- }
-
- if (grabError) {
- return kinds.DANGER;
- }
-
- return kinds.DEFAULT;
-}
-
-function getDownloadTooltip(
- isGrabbing: boolean,
- isGrabbed: boolean,
- grabError?: string
-) {
- if (isGrabbing) {
- return '';
- } else if (isGrabbed) {
- return translate('AddedToDownloadClient');
- } else if (grabError) {
- return grabError;
- }
-
- return translate('AddToDownloadClient');
-}
-
-interface SearchIndexOverviewProps {
- guid: string;
- protocol: DownloadProtocol;
- age: number;
- ageHours: number;
- ageMinutes: number;
- publishDate: string;
- title: string;
- infoUrl: string;
- downloadUrl?: string;
- magnetUrl?: string;
- indexerId: number;
- indexer: string;
- categories: IndexerCategory[];
- size: number;
- seeders?: number;
- leechers?: number;
- indexerFlags: string[];
- isGrabbing: boolean;
- isGrabbed: boolean;
- grabError?: string;
- longDateFormat: string;
- timeFormat: string;
- rowHeight: number;
- isSmallScreen: boolean;
- onGrabPress(...args: unknown[]): void;
-}
-
-function SearchIndexOverview(props: SearchIndexOverviewProps) {
- const {
- guid,
- indexerId,
- protocol,
- categories,
- age,
- ageHours,
- ageMinutes,
- publishDate,
- title,
- infoUrl,
- downloadUrl,
- magnetUrl,
- indexer,
- size,
- seeders,
- leechers,
- indexerFlags = [],
- isGrabbing = false,
- isGrabbed = false,
- grabError,
- longDateFormat,
- timeFormat,
- rowHeight,
- isSmallScreen,
- onGrabPress,
- } = props;
-
- const [isOverrideModalOpen, setIsOverrideModalOpen] = useState(false);
-
- const { items: downloadClients } = useSelector(
- createEnabledDownloadClientsSelector(protocol)
- );
-
- const onGrabPressWrapper = useCallback(() => {
- onGrabPress({
- guid,
- indexerId,
- });
- }, [guid, indexerId, onGrabPress]);
-
- const onOverridePress = useCallback(() => {
- setIsOverrideModalOpen(true);
- }, [setIsOverrideModalOpen]);
-
- const onOverrideModalClose = useCallback(() => {
- setIsOverrideModalOpen(false);
- }, [setIsOverrideModalOpen]);
-
- const contentHeight = useMemo(() => {
- const padding = isSmallScreen ? columnPaddingSmallScreen : columnPadding;
-
- return rowHeight - padding;
- }, [rowHeight, isSmallScreen]);
-
- return (
- <>
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {indexer}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ) : null}
-
- {downloadUrl || magnetUrl ? (
- {indexer}
-
-
-
+
+ );
+ }
+
+ return (
+
+ {translate('AllIndexersHiddenDueToFilter')}
+
+
+
+ );
+}
+
+NoSearchResults.propTypes = {
+ totalItems: PropTypes.number.isRequired
+};
+
+export default NoSearchResults;
diff --git a/frontend/src/Search/NoSearchResults.tsx b/frontend/src/Search/NoSearchResults.tsx
deleted file mode 100644
index 46fbc85e0..000000000
--- a/frontend/src/Search/NoSearchResults.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import Alert from 'Components/Alert';
-import { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './NoSearchResults.css';
-
-interface NoSearchResultsProps {
- totalItems: number;
-}
-
-function NoSearchResults(props: NoSearchResultsProps) {
- const { totalItems } = props;
-
- if (totalItems > 0) {
- return (
-
+ {translate('NoSearchResultsFound')}
+
+ {name}
- {translate('PrioritySettings', { priority })}
-
- );
-}
-
-export default SelectDownloadClientRow;
diff --git a/frontend/src/Search/OverrideMatch/OverrideMatchData.css b/frontend/src/Search/OverrideMatch/OverrideMatchData.css
deleted file mode 100644
index bd4d2f788..000000000
--- a/frontend/src/Search/OverrideMatch/OverrideMatchData.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.link {
- composes: link from '~Components/Link/Link.css';
-
- width: 100%;
-}
-
-.placeholder {
- display: inline-block;
- margin: -2px 0;
- width: 100%;
- outline: 2px dashed var(--dangerColor);
- outline-offset: -2px;
-}
-
-.optional {
- outline: 2px dashed var(--gray);
-}
diff --git a/frontend/src/Search/OverrideMatch/OverrideMatchData.css.d.ts b/frontend/src/Search/OverrideMatch/OverrideMatchData.css.d.ts
deleted file mode 100644
index dd3ac4575..000000000
--- a/frontend/src/Search/OverrideMatch/OverrideMatchData.css.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'link': string;
- 'optional': string;
- 'placeholder': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Search/OverrideMatch/OverrideMatchData.tsx b/frontend/src/Search/OverrideMatch/OverrideMatchData.tsx
deleted file mode 100644
index 82d6bd812..000000000
--- a/frontend/src/Search/OverrideMatch/OverrideMatchData.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import classNames from 'classnames';
-import React from 'react';
-import Link from 'Components/Link/Link';
-import styles from './OverrideMatchData.css';
-
-interface OverrideMatchDataProps {
- value?: string | number | JSX.Element | JSX.Element[];
- isDisabled?: boolean;
- isOptional?: boolean;
- onPress: () => void;
-}
-
-function OverrideMatchData(props: OverrideMatchDataProps) {
- const { value, isDisabled = false, isOptional, onPress } = props;
-
- return (
-
- {(value == null || (Array.isArray(value) && value.length === 0)) &&
- !isDisabled ? (
-
-
-
- ) : (
- value
- )}
-
- );
-}
-
-export default OverrideMatchData;
diff --git a/frontend/src/Search/OverrideMatch/OverrideMatchModal.tsx b/frontend/src/Search/OverrideMatch/OverrideMatchModal.tsx
deleted file mode 100644
index 16d62ea7c..000000000
--- a/frontend/src/Search/OverrideMatch/OverrideMatchModal.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import DownloadProtocol from 'DownloadClient/DownloadProtocol';
-import { sizes } from 'Helpers/Props';
-import OverrideMatchModalContent from './OverrideMatchModalContent';
-
-interface OverrideMatchModalProps {
- isOpen: boolean;
- title: string;
- indexerId: number;
- guid: string;
- protocol: DownloadProtocol;
- isGrabbing: boolean;
- grabError?: string;
- onModalClose(): void;
-}
-
-function OverrideMatchModal(props: OverrideMatchModalProps) {
- const {
- isOpen,
- title,
- indexerId,
- guid,
- protocol,
- isGrabbing,
- grabError,
- onModalClose,
- } = props;
-
- return (
- {grabError}
-
-
-
-
-
- {translate('GrabRelease')}
-
-
-
+
{
isPopulated &&
state.releases,
- (state) => state.router.location,
- (releases, location) => {
+ (releases) => {
const {
searchQuery: defaultSearchQuery,
searchIndexerIds: defaultIndexerIds,
searchCategories: defaultCategories,
- searchType: defaultSearchType,
- searchLimit: defaultSearchLimit,
- searchOffset: defaultSearchOffset
+ searchType: defaultSearchType
} = releases.defaults;
- const { params } = parseUrl(location.search);
- const defaultSearchQueryParams = {};
-
- if (params.query && !defaultSearchQuery) {
- defaultSearchQueryParams.searchQuery = params.query;
- }
-
- if (params.indexerIds && !defaultIndexerIds.length) {
- defaultSearchQueryParams.searchIndexerIds = params.indexerIds.split(',').map((id) => Number(id)).filter(Boolean);
- }
-
- if (params.categories && !defaultCategories.length) {
- defaultSearchQueryParams.searchCategories = params.categories.split(',').map((id) => Number(id)).filter(Boolean);
- }
-
- if (params.type && defaultSearchType === 'search') {
- defaultSearchQueryParams.searchType = params.type;
- }
-
- if (params.limit && defaultSearchLimit === 100 && !isNaN(params.limit)) {
- defaultSearchQueryParams.searchLimit = Number(params.limit);
- }
-
- if (params.offset && !defaultSearchOffset && !isNaN(params.offset)) {
- defaultSearchQueryParams.searchOffset = Number(params.offset);
- }
-
return {
- defaultSearchQueryParams,
defaultSearchQuery,
defaultIndexerIds,
defaultCategories,
- defaultSearchType,
- defaultSearchLimit,
- defaultSearchOffset
+ defaultSearchType
};
}
);
@@ -66,16 +32,6 @@ const mapDispatchToProps = {
class SearchFooterConnector extends Component {
- //
- // Lifecycle
-
- componentDidMount() {
- // Set defaults from query parameters
- Object.entries(this.props.defaultSearchQueryParams).forEach(([name, value]) => {
- this.onInputChange({ name, value });
- });
- }
-
//
// Listeners
@@ -97,7 +53,6 @@ class SearchFooterConnector extends Component {
}
SearchFooterConnector.propTypes = {
- defaultSearchQueryParams: PropTypes.object.isRequired,
setSearchDefault: PropTypes.func.isRequired
};
diff --git a/frontend/src/Search/SearchIndex.js b/frontend/src/Search/SearchIndex.js
index d12635070..012dc48da 100644
--- a/frontend/src/Search/SearchIndex.js
+++ b/frontend/src/Search/SearchIndex.js
@@ -1,7 +1,6 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import Alert from 'Components/Alert';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
@@ -11,9 +10,7 @@ import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
-import { align, icons, kinds, sortDirections } from 'Helpers/Props';
-import AddIndexerModal from 'Indexer/Add/AddIndexerModal';
-import EditIndexerModalConnector from 'Indexer/Edit/EditIndexerModalConnector';
+import { align, icons, sortDirections } from 'Helpers/Props';
import NoIndexer from 'Indexer/NoIndexer';
import * as keyCodes from 'Utilities/Constants/keyCodes';
import getErrorMessage from 'Utilities/Object/getErrorMessage';
@@ -30,7 +27,13 @@ import SearchFooterConnector from './SearchFooterConnector';
import SearchIndexTableConnector from './Table/SearchIndexTableConnector';
import styles from './SearchIndex.css';
-const getViewComponent = (isSmallScreen) => (isSmallScreen ? SearchIndexOverviewsConnector : SearchIndexTableConnector);
+function getViewComponent(isSmallScreen) {
+ if (isSmallScreen) {
+ return SearchIndexOverviewsConnector;
+ }
+
+ return SearchIndexTableConnector;
+}
class SearchIndex extends Component {
@@ -50,9 +53,7 @@ class SearchIndex extends Component {
lastToggled: null,
allSelected: false,
allUnselected: false,
- selectedState: {},
- isAddIndexerModalOpen: false,
- isEditIndexerModalOpen: false
+ selectedState: {}
};
}
@@ -72,7 +73,7 @@ class SearchIndex extends Component {
if (sortKey !== prevProps.sortKey ||
sortDirection !== prevProps.sortDirection ||
- hasDifferentItemsOrOrder(prevProps.items, items, 'guid')
+ hasDifferentItemsOrOrder(prevProps.items, items)
) {
this.setJumpBarItems();
this.setSelectedState();
@@ -94,14 +95,7 @@ class SearchIndex extends Component {
if (this.state.allUnselected) {
return [];
}
-
- return _.reduce(this.state.selectedState, (result, value, id) => {
- if (value) {
- result.push(id);
- }
-
- return result;
- }, []);
+ return getSelectedIds(this.state.selectedState, { parseIds: false });
};
setSelectedState() {
@@ -147,7 +141,7 @@ class SearchIndex extends Component {
} = this.props;
// Reset if not sorting by sortTitle
- if (sortKey !== 'sortTitle') {
+ if (sortKey !== 'title') {
this.setState({ jumpBarItems: { order: [] } });
return;
}
@@ -155,7 +149,7 @@ class SearchIndex extends Component {
const characters = _.reduce(items, (acc, item) => {
let char = item.sortTitle.charAt(0);
- if (!isNaN(Number(char))) {
+ if (!isNaN(char)) {
char = '#';
}
@@ -186,22 +180,6 @@ class SearchIndex extends Component {
//
// Listeners
- onAddIndexerPress = () => {
- this.setState({ isAddIndexerModalOpen: true });
- };
-
- onAddIndexerModalClose = () => {
- this.setState({ isAddIndexerModalOpen: false });
- };
-
- onAddIndexerSelectIndexer = () => {
- this.setState({ isEditIndexerModalOpen: true });
- };
-
- onEditIndexerModalClose = () => {
- this.setState({ isEditIndexerModalOpen: false });
- };
-
onJumpBarItemPress = (jumpToCharacter) => {
this.setState({ jumpToCharacter });
};
@@ -273,19 +251,17 @@ class SearchIndex extends Component {
jumpToCharacter,
selectedState,
allSelected,
- allUnselected,
- isAddIndexerModalOpen,
- isEditIndexerModalOpen
+ allUnselected
} = this.state;
const selectedIndexerIds = this.getSelectedIds();
const ViewComponent = getViewComponent(isSmallScreen);
const isLoaded = !!(!error && isPopulated && items.length && this.scrollerRef.current);
- const hasNoSearchResults = !totalItems;
+ const hasNoIndexer = !totalItems;
return (
-
+
+ !isFetching && !!error &&
+
diff --git a/frontend/src/Search/SearchIndexConnector.js b/frontend/src/Search/SearchIndexConnector.js
index 78a9866b2..e3302e73c 100644
--- a/frontend/src/Search/SearchIndexConnector.js
+++ b/frontend/src/Search/SearchIndexConnector.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import withScrollPosition from 'Components/withScrollPosition';
import { bulkGrabReleases, cancelFetchReleases, clearReleases, fetchReleases, setReleasesFilter, setReleasesSort, setReleasesTableOption } from 'Store/Actions/releaseActions';
-import { fetchDownloadClients } from 'Store/Actions/Settings/downloadClients';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import createReleaseClientSideCollectionItemsSelector from 'Store/Selectors/createReleaseClientSideCollectionItemsSelector';
import SearchIndex from './SearchIndex';
@@ -56,20 +55,12 @@ function createMapDispatchToProps(dispatch, props) {
dispatchClearReleases() {
dispatch(clearReleases());
- },
-
- dispatchFetchDownloadClients() {
- dispatch(fetchDownloadClients());
}
};
}
class SearchIndexConnector extends Component {
- componentDidMount() {
- this.props.dispatchFetchDownloadClients();
- }
-
componentWillUnmount() {
this.props.dispatchCancelFetchReleases();
this.props.dispatchClearReleases();
@@ -94,7 +85,6 @@ SearchIndexConnector.propTypes = {
onBulkGrabPress: PropTypes.func.isRequired,
dispatchCancelFetchReleases: PropTypes.func.isRequired,
dispatchClearReleases: PropTypes.func.isRequired,
- dispatchFetchDownloadClients: PropTypes.func.isRequired,
items: PropTypes.arrayOf(PropTypes.object)
};
diff --git a/frontend/src/Search/Table/CategoryLabel.js b/frontend/src/Search/Table/CategoryLabel.js
new file mode 100644
index 000000000..80ca3a61d
--- /dev/null
+++ b/frontend/src/Search/Table/CategoryLabel.js
@@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Label from 'Components/Label';
+import { kinds, tooltipPositions } from 'Helpers/Props';
+import Tooltip from '../../Components/Tooltip/Tooltip';
+
+function CategoryLabel({ categories }) {
+ const sortedCategories = categories.filter((cat) => cat.name !== undefined).sort((c) => c.id);
+
+ if (categories?.length === 0) {
+ return (
+
{getErrorMessage(error, 'Failed to load search results from API')}
- :
- null
+
}
{
@@ -362,39 +336,25 @@ class SearchIndex extends Component {
}
{
- !error && !isFetching && !hasIndexers ?
+ !error && !isFetching && !hasIndexers &&
- {imdbId ? (
-
-
-
- ) : null}
-
- {tmdbId ? (
-
-
-
- ) : null}
-
- {tvdbId ? (
-
-
-
- ) : null}
-
- {tvMazeId ? (
-
-
-
- ) : null}
-
- );
-}
-
-export default ReleaseLinks;
diff --git a/frontend/src/Search/Table/SearchIndexHeader.js b/frontend/src/Search/Table/SearchIndexHeader.js
index 17b79e2f7..6b91adb45 100644
--- a/frontend/src/Search/Table/SearchIndexHeader.js
+++ b/frontend/src/Search/Table/SearchIndexHeader.js
@@ -96,7 +96,7 @@ class SearchIndexHeader extends Component {
isSortable={isSortable}
{...otherProps}
>
- {typeof label === 'function' ? label() : label}
+ {label}
);
})
diff --git a/frontend/src/Search/Table/SearchIndexItemConnector.js b/frontend/src/Search/Table/SearchIndexItemConnector.js
index 4cc7fb20c..490214529 100644
--- a/frontend/src/Search/Table/SearchIndexItemConnector.js
+++ b/frontend/src/Search/Table/SearchIndexItemConnector.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
+import { executeCommand } from 'Store/Actions/commandActions';
function createReleaseSelector() {
return createSelector(
@@ -36,6 +37,10 @@ function createMapStateToProps() {
);
}
+const mapDispatchToProps = {
+ dispatchExecuteCommand: executeCommand
+};
+
class SearchIndexItemConnector extends Component {
//
@@ -66,4 +71,4 @@ SearchIndexItemConnector.propTypes = {
component: PropTypes.elementType.isRequired
};
-export default connect(createMapStateToProps, null)(SearchIndexItemConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(SearchIndexItemConnector);
diff --git a/frontend/src/Search/Table/SearchIndexRow.css b/frontend/src/Search/Table/SearchIndexRow.css
index b36ec4071..2e8282268 100644
--- a/frontend/src/Search/Table/SearchIndexRow.css
+++ b/frontend/src/Search/Table/SearchIndexRow.css
@@ -59,41 +59,10 @@
margin: 0 2px;
width: 22px;
color: var(--textColor);
- text-align: center;
}
.externalLinks {
- composes: button from '~Components/Link/IconButton.css';
-
- color: var(--textColor);
-}
-
-.manualDownloadContent {
- position: relative;
- display: inline-block;
margin: 0 2px;
width: 22px;
- height: 20.39px;
- vertical-align: middle;
- line-height: 20.39px;
-
- &:hover {
- color: var(--iconButtonHoverColor);
- }
-}
-
-.interactiveIcon {
- position: absolute;
- top: 4px;
- left: 0;
- /* width: 100%; */
- text-align: center;
-}
-
-.downloadIcon {
- position: absolute;
- top: 7px;
- left: 8px;
- /* width: 100%; */
text-align: center;
}
diff --git a/frontend/src/Search/Table/SearchIndexRow.css.d.ts b/frontend/src/Search/Table/SearchIndexRow.css.d.ts
index 7552b96f9..6d625f58a 100644
--- a/frontend/src/Search/Table/SearchIndexRow.css.d.ts
+++ b/frontend/src/Search/Table/SearchIndexRow.css.d.ts
@@ -6,15 +6,12 @@ interface CssExports {
'category': string;
'cell': string;
'checkInput': string;
- 'downloadIcon': string;
'downloadLink': string;
'externalLinks': string;
'files': string;
'grabs': string;
'indexer': string;
'indexerFlags': string;
- 'interactiveIcon': string;
- 'manualDownloadContent': string;
'peers': string;
'protocol': string;
'size': string;
diff --git a/frontend/src/Search/Table/SearchIndexRow.js b/frontend/src/Search/Table/SearchIndexRow.js
new file mode 100644
index 000000000..1b740b5da
--- /dev/null
+++ b/frontend/src/Search/Table/SearchIndexRow.js
@@ -0,0 +1,366 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Icon from 'Components/Icon';
+import IconButton from 'Components/Link/IconButton';
+import Link from 'Components/Link/Link';
+import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
+import VirtualTableRowCell from 'Components/Table/Cells/VirtualTableRowCell';
+import VirtualTableSelectCell from 'Components/Table/Cells/VirtualTableSelectCell';
+import Popover from 'Components/Tooltip/Popover';
+import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import ProtocolLabel from 'Indexer/Index/Table/ProtocolLabel';
+import formatDateTime from 'Utilities/Date/formatDateTime';
+import formatAge from 'Utilities/Number/formatAge';
+import formatBytes from 'Utilities/Number/formatBytes';
+import titleCase from 'Utilities/String/titleCase';
+import translate from 'Utilities/String/translate';
+import CategoryLabel from './CategoryLabel';
+import Peers from './Peers';
+import styles from './SearchIndexRow.css';
+
+function getDownloadIcon(isGrabbing, isGrabbed, grabError) {
+ if (isGrabbing) {
+ return icons.SPINNER;
+ } else if (isGrabbed) {
+ return icons.DOWNLOADING;
+ } else if (grabError) {
+ return icons.DOWNLOADING;
+ }
+
+ return icons.DOWNLOAD;
+}
+
+function getDownloadTooltip(isGrabbing, isGrabbed, grabError) {
+ if (isGrabbing) {
+ return '';
+ } else if (isGrabbed) {
+ return translate('AddedToDownloadClient');
+ } else if (grabError) {
+ return grabError;
+ }
+
+ return translate('AddToDownloadClient');
+}
+
+class SearchIndexRow extends Component {
+
+ //
+ // Lifecycle
+
+ constructor(props, context) {
+ super(props, context);
+
+ this.state = {
+ isConfirmGrabModalOpen: false
+ };
+ }
+
+ //
+ // Listeners
+
+ onGrabPress = () => {
+ const {
+ guid,
+ indexerId,
+ onGrabPress
+ } = this.props;
+
+ onGrabPress({
+ guid,
+ indexerId
+ });
+ };
+
+ onSavePress = () => {
+ const {
+ downloadUrl,
+ fileName,
+ onSavePress
+ } = this.props;
+
+ onSavePress({
+ downloadUrl,
+ fileName
+ });
+ };
+
+ //
+ // Render
+
+ render() {
+ const {
+ guid,
+ protocol,
+ categories,
+ age,
+ ageHours,
+ ageMinutes,
+ publishDate,
+ title,
+ infoUrl,
+ indexer,
+ size,
+ files,
+ grabs,
+ seeders,
+ leechers,
+ indexerFlags,
+ columns,
+ isGrabbing,
+ isGrabbed,
+ grabError,
+ longDateFormat,
+ timeFormat,
+ isSelected,
+ onSelectedChange
+ } = this.props;
+
+ return (
+ <>
+ {
+ columns.map((column) => {
+ const {
+ isVisible
+ } = column;
+
+ if (!isVisible) {
+ return null;
+ }
+
+ if (column.name === 'select') {
+ return (
+
+ {title}
+
+
+ -
+ {
+ indexerFlags.map((flag, index) => {
+ return (
+
- + {titleCase(flag)} + + ); + }) + } +
{title}
-
- -
- {indexerFlags.map((flag, index) => {
- return
- {titleCase(flag)} ; - })} -
-
-
- ) : null}
-
- {downloadUrl ? (
-
-
+
);
}
}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js
index 4f6833fcb..9cba9c1cc 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js
@@ -4,12 +4,12 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { deleteDownloadClient, fetchDownloadClients } from 'Store/Actions/settingsActions';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
import DownloadClients from './DownloadClients';
function createMapStateToProps() {
return createSelector(
- createSortedSectionSelector('settings.downloadClients', sortByProp('name')),
+ createSortedSectionSelector('settings.downloadClients', sortByName),
(downloadClients) => downloadClients
);
}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
index c57432710..28554a31c 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js
@@ -17,7 +17,6 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { icons, inputTypes, kinds } from 'Helpers/Props';
-import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
import translate from 'Utilities/String/translate';
import AddCategoryModalConnector from './Categories/AddCategoryModalConnector';
import Category from './Categories/Category';
@@ -62,7 +61,6 @@ class EditDownloadClientModalContent extends Component {
onModalClose,
onSavePress,
onTestPress,
- onAdvancedSettingsPress,
onDeleteDownloadClientPress,
onConfirmDeleteCategory,
...otherProps
@@ -86,7 +84,7 @@ class EditDownloadClientModalContent extends Component {
return (
- {id ? translate('EditDownloadClientImplementation', { implementationName }) : translate('AddDownloadClientImplementation', { implementationName })}
+ {`${id ? translate('Edit') : translate('Add')} ${translate('DownloadClient')} - ${implementationName}`}
@@ -161,7 +159,7 @@ class EditDownloadClientModalContent extends Component {
}
- {
- this.props.toggleAdvancedSettings();
- };
-
onConfirmDeleteCategory = (id) => {
this.props.deleteDownloadClientCategory({ id });
};
@@ -94,7 +81,6 @@ class EditDownloadClientModalContentConnector extends Component {
{...this.props}
onSavePress={this.onSavePress}
onTestPress={this.onTestPress}
- onAdvancedSettingsPress={this.onAdvancedSettingsPress}
onInputChange={this.onInputChange}
onFieldChange={this.onFieldChange}
onConfirmDeleteCategory={this.onConfirmDeleteCategory}
@@ -116,7 +102,6 @@ EditDownloadClientModalContentConnector.propTypes = {
setDownloadClientFieldValue: PropTypes.func.isRequired,
saveDownloadClient: PropTypes.func.isRequired,
testDownloadClient: PropTypes.func.isRequired,
- toggleAdvancedSettings: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModal.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModal.tsx
deleted file mode 100644
index 549a091ff..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModal.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import ManageDownloadClientsEditModalContent from './ManageDownloadClientsEditModalContent';
-
-interface ManageDownloadClientsEditModalProps {
- isOpen: boolean;
- downloadClientIds: number[];
- onSavePress(payload: object): void;
- onModalClose(): void;
-}
-
-function ManageDownloadClientsEditModal(
- props: ManageDownloadClientsEditModalProps
-) {
- const { isOpen, downloadClientIds, onSavePress, onModalClose } = props;
-
- return (
-
-
- );
-}
-
-export default ManageDownloadClientsEditModal;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css
deleted file mode 100644
index ea406894e..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.modalFooter {
- composes: modalFooter from '~Components/Modal/ModalFooter.css';
-
- justify-content: space-between;
-}
-
-.selected {
- font-weight: bold;
-}
-
-@media only screen and (max-width: $breakpointExtraSmall) {
- .modalFooter {
- flex-direction: column;
- gap: 10px;
- }
-}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css.d.ts b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css.d.ts
deleted file mode 100644
index cbf2d6328..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.css.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'modalFooter': string;
- 'selected': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx
deleted file mode 100644
index d18e694c9..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/Edit/ManageDownloadClientsEditModalContent.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './ManageDownloadClientsEditModalContent.css';
-
-interface SavePayload {
- enable?: boolean;
- priority?: number;
-}
-
-interface ManageDownloadClientsEditModalContentProps {
- downloadClientIds: number[];
- onSavePress(payload: object): void;
- onModalClose(): void;
-}
-
-const NO_CHANGE = 'noChange';
-
-const enableOptions = [
- {
- key: NO_CHANGE,
- get value() {
- return translate('NoChange');
- },
- isDisabled: true,
- },
- {
- key: 'enabled',
- get value() {
- return translate('Enabled');
- },
- },
- {
- key: 'disabled',
- get value() {
- return translate('Disabled');
- },
- },
-];
-
-function ManageDownloadClientsEditModalContent(
- props: ManageDownloadClientsEditModalContentProps
-) {
- const { downloadClientIds, onSavePress, onModalClose } = props;
-
- const [enable, setEnable] = useState(NO_CHANGE);
- const [priority, setPriority] = useState(null);
-
- const save = useCallback(() => {
- let hasChanges = false;
- const payload: SavePayload = {};
-
- if (enable !== NO_CHANGE) {
- hasChanges = true;
- payload.enable = enable === 'enabled';
- }
-
- if (priority !== null) {
- hasChanges = true;
- payload.priority = priority as number;
- }
-
- if (hasChanges) {
- onSavePress(payload);
- }
-
- onModalClose();
- }, [enable, priority, onSavePress, onModalClose]);
-
- const onInputChange = useCallback(
- ({ name, value }: { name: string; value: string }) => {
- switch (name) {
- case 'enable':
- setEnable(value);
- break;
- case 'priority':
- setPriority(value);
- break;
- default:
- console.warn(
- `EditDownloadClientsModalContent Unknown Input: '${name}'`
- );
- }
- },
- []
- );
-
- const selectedCount = downloadClientIds.length;
-
- return (
-
- {translate('EditSelectedDownloadClients')}
-
-
-
- {translate('Enabled')}
-
-
-
-
- {translate('ClientPriority')}
-
-
-
-
-
-
-
- );
-}
-
-export default ManageDownloadClientsEditModalContent;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx
deleted file mode 100644
index 0302f3544..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModal.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import ManageDownloadClientsModalContent from './ManageDownloadClientsModalContent';
-
-interface ManageDownloadClientsModalProps {
- isOpen: boolean;
- onModalClose(): void;
-}
-
-function ManageDownloadClientsModal(props: ManageDownloadClientsModalProps) {
- const { isOpen, onModalClose } = props;
-
- return (
-
-
- );
-}
-
-export default ManageDownloadClientsModal;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css
deleted file mode 100644
index c106388ab..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.leftButtons,
-.rightButtons {
- display: flex;
- flex: 1 0 50%;
- flex-wrap: wrap;
-}
-
-.rightButtons {
- justify-content: flex-end;
-}
-
-.deleteButton {
- composes: button from '~Components/Link/Button.css';
-
- margin-right: 10px;
-}
\ No newline at end of file
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css.d.ts b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css.d.ts
deleted file mode 100644
index 7b392fff9..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.css.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'deleteButton': string;
- 'leftButtons': string;
- 'rightButtons': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
deleted file mode 100644
index fa82d61b9..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalContent.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { DownloadClientAppState } from 'App/State/SettingsAppState';
-import Alert from 'Components/Alert';
-import Button from 'Components/Link/Button';
-import SpinnerButton from 'Components/Link/SpinnerButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-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 Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import useSelectState from 'Helpers/Hooks/useSelectState';
-import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
-import {
- bulkDeleteDownloadClients,
- bulkEditDownloadClients,
- setManageDownloadClientsSort,
-} from 'Store/Actions/settingsActions';
-import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
-import { SelectStateInputProps } from 'typings/props';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import translate from 'Utilities/String/translate';
-import getSelectedIds from 'Utilities/Table/getSelectedIds';
-import ManageDownloadClientsEditModal from './Edit/ManageDownloadClientsEditModal';
-import ManageDownloadClientsModalRow from './ManageDownloadClientsModalRow';
-import styles from './ManageDownloadClientsModalContent.css';
-
-// TODO: This feels janky to do, but not sure of a better way currently
-type OnSelectedChangeCallback = React.ComponentProps<
- typeof ManageDownloadClientsModalRow
->['onSelectedChange'];
-
-const COLUMNS = [
- {
- name: 'name',
- label: () => translate('Name'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'implementation',
- label: () => translate('Implementation'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'enable',
- label: () => translate('Enabled'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'priority',
- label: () => translate('ClientPriority'),
- isSortable: true,
- isVisible: true,
- },
-];
-
-interface ManageDownloadClientsModalContentProps {
- onModalClose(): void;
- sortKey?: string;
- sortDirection?: SortDirection;
-}
-
-function ManageDownloadClientsModalContent(
- props: ManageDownloadClientsModalContentProps
-) {
- const { onModalClose } = props;
-
- const {
- isFetching,
- isPopulated,
- isDeleting,
- isSaving,
- error,
- items,
- sortKey,
- sortDirection,
- }: DownloadClientAppState = useSelector(
- createClientSideCollectionSelector('settings.downloadClients')
- );
- const dispatch = useDispatch();
-
- const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
- const [isEditModalOpen, setIsEditModalOpen] = useState(false);
-
- const [selectState, setSelectState] = useSelectState();
-
- const { allSelected, allUnselected, selectedState } = selectState;
-
- const selectedIds: number[] = useMemo(() => {
- return getSelectedIds(selectedState);
- }, [selectedState]);
-
- const selectedCount = selectedIds.length;
-
- const onSortPress = useCallback(
- (value: string) => {
- dispatch(setManageDownloadClientsSort({ sortKey: value }));
- },
- [dispatch]
- );
-
- const onDeletePress = useCallback(() => {
- setIsDeleteModalOpen(true);
- }, [setIsDeleteModalOpen]);
-
- const onDeleteModalClose = useCallback(() => {
- setIsDeleteModalOpen(false);
- }, [setIsDeleteModalOpen]);
-
- const onEditPress = useCallback(() => {
- setIsEditModalOpen(true);
- }, [setIsEditModalOpen]);
-
- const onEditModalClose = useCallback(() => {
- setIsEditModalOpen(false);
- }, [setIsEditModalOpen]);
-
- const onConfirmDelete = useCallback(() => {
- dispatch(bulkDeleteDownloadClients({ ids: selectedIds }));
- setIsDeleteModalOpen(false);
- }, [selectedIds, dispatch]);
-
- const onSavePress = useCallback(
- (payload: object) => {
- setIsEditModalOpen(false);
-
- dispatch(
- bulkEditDownloadClients({
- ids: selectedIds,
- ...payload,
- })
- );
- },
- [selectedIds, dispatch]
- );
-
- const onSelectAllChange = useCallback(
- ({ value }: SelectStateInputProps) => {
- setSelectState({ type: value ? 'selectAll' : 'unselectAll', items });
- },
- [items, setSelectState]
- );
-
- const onSelectedChange = useCallback(
- ({ id, value, shiftKey = false }) => {
- setSelectState({
- type: 'toggleSelected',
- items,
- id,
- isSelected: value,
- shiftKey,
- });
- },
- [items, setSelectState]
- );
-
- const errorMessage = getErrorMessage(
- error,
- 'Unable to load download clients.'
- );
- const anySelected = selectedCount > 0;
-
- return (
-
- {translate('ManageDownloadClients')}
-
- {isFetching ? {translate('NoDownloadClientsFound')}
- )}
-
- {isPopulated && !!items.length && !isFetching && !isFetching ? (
-
-
- ) : null}
-
-
-
-
-
-
- );
-}
-
-export default ManageDownloadClientsModalContent;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css
deleted file mode 100644
index 444f376cc..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.name,
-.enable,
-.priority,
-.implementation {
- composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
- word-break: break-all;
-}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css.d.ts b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css.d.ts
deleted file mode 100644
index 6c8cd9c29..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.css.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'enable': string;
- 'implementation': string;
- 'name': string;
- 'priority': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.tsx b/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.tsx
deleted file mode 100644
index 001bced52..000000000
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Manage/ManageDownloadClientsModalRow.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { useCallback } from 'react';
-import Label from 'Components/Label';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
-import Column from 'Components/Table/Column';
-import TableRow from 'Components/Table/TableRow';
-import { kinds } from 'Helpers/Props';
-import { SelectStateInputProps } from 'typings/props';
-import translate from 'Utilities/String/translate';
-import styles from './ManageDownloadClientsModalRow.css';
-
-interface ManageDownloadClientsModalRowProps {
- id: number;
- name: string;
- enable: boolean;
- priority: number;
- implementation: string;
- columns: Column[];
- isSelected?: boolean;
- onSelectedChange(result: SelectStateInputProps): void;
-}
-
-function ManageDownloadClientsModalRow(
- props: ManageDownloadClientsModalRowProps
-) {
- const {
- id,
- isSelected,
- name,
- enable,
- priority,
- implementation,
- onSelectedChange,
- } = props;
-
- const onSelectedChangeWrapper = useCallback(
- (result: SelectStateInputProps) => {
- onSelectedChange({
- ...result,
- });
- },
- [onSelectedChange]
- );
-
- return (
-
- {name}
-
-
- {implementation}
-
-
-
-
-
-
- {priority}
-
- );
-}
-
-export default ManageDownloadClientsModalRow;
diff --git a/frontend/src/Settings/General/GeneralSettings.js b/frontend/src/Settings/General/GeneralSettings.js
index 7289ed1c7..38bb08f75 100644
--- a/frontend/src/Settings/General/GeneralSettings.js
+++ b/frontend/src/Settings/General/GeneralSettings.js
@@ -1,7 +1,6 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import Alert from 'Components/Alert';
import Form from 'Components/Form/Form';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import ConfirmModal from 'Components/Modal/ConfirmModal';
@@ -124,9 +123,9 @@ class GeneralSettings extends Component {
{
!isFetching && error &&
-
+
- {translate('ApplicationURL')}
-
-
-
- {translate('LogSizeLimit')}
-
-
);
}
LoggingSettings.propTypes = {
- advancedSettings: PropTypes.bool.isRequired,
settings: PropTypes.object.isRequired,
onInputChange: PropTypes.func.isRequired
};
diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js
index 8e2597741..4b382800c 100644
--- a/frontend/src/Settings/General/SecuritySettings.js
+++ b/frontend/src/Settings/General/SecuritySettings.js
@@ -11,69 +11,24 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
import { icons, inputTypes, kinds } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
+export const authenticationRequiredWarning = translate('AuthenticationRequiredWarning');
+
export const authenticationMethodOptions = [
- {
- key: 'none',
- get value() {
- return translate('None');
- },
- isDisabled: true
- },
- {
- key: 'external',
- get value() {
- return translate('External');
- },
- isHidden: true
- },
- {
- key: 'basic',
- get value() {
- return translate('AuthBasic');
- }
- },
- {
- key: 'forms',
- get value() {
- return translate('AuthForm');
- }
- }
+ { key: 'none', value: 'None', isDisabled: true },
+ { key: 'external', value: 'External', isHidden: true },
+ { key: 'basic', value: 'Basic (Browser Popup)' },
+ { key: 'forms', value: 'Forms (Login Page)' }
];
export const authenticationRequiredOptions = [
- {
- key: 'enabled',
- get value() {
- return translate('Enabled');
- }
- },
- {
- key: 'disabledForLocalAddresses',
- get value() {
- return translate('DisabledForLocalAddresses');
- }
- }
+ { key: 'enabled', value: 'Enabled' },
+ { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' }
];
const certificateValidationOptions = [
- {
- key: 'enabled',
- get value() {
- return translate('Enabled');
- }
- },
- {
- key: 'disabledForLocalAddresses',
- get value() {
- return translate('DisabledForLocalAddresses');
- }
- },
- {
- key: 'disabled',
- get value() {
- return translate('Disabled');
- }
- }
+ { key: 'enabled', value: 'Enabled' },
+ { key: 'disabledForLocalAddresses', value: 'Disabled for Local Addresses' },
+ { key: 'disabled', value: 'Disabled' }
];
class SecuritySettings extends Component {
@@ -124,7 +79,6 @@ class SecuritySettings extends Component {
authenticationRequired,
username,
password,
- passwordConfirmation,
apiKey,
certificateValidation
} = settings;
@@ -141,7 +95,7 @@ class SecuritySettings extends Component {
name="authenticationMethod"
values={authenticationMethodOptions}
helpText={translate('AuthenticationMethodHelpText')}
- helpTextWarning={translate('AuthenticationRequiredWarning')}
+ helpTextWarning={authenticationRequiredWarning}
onChange={onInputChange}
{...authenticationMethod}
/>
@@ -194,21 +148,6 @@ class SecuritySettings extends Component {
null
}
- {
- authenticationEnabled ?
-
- {translate('PasswordConfirmation')}
-
- :
- null
- }
-
{translate('ApiKey')}
@@ -216,7 +155,6 @@ class SecuritySettings extends Component {
type={inputTypes.TEXT}
name="apiKey"
readOnly={true}
- helpTextWarning={translate('RestartRequiredHelpTextWarning')}
buttons={[
@@ -61,58 +62,61 @@ function UpdateSettings(props) {
/>
-
- {id ? translate('EditIndexerProxyImplementation', { implementationName }) : translate('AddIndexerProxyImplementation', { implementationName })}
+ {`${id ? 'Edit' : 'Add'} Proxy - ${implementationName}`}
@@ -132,12 +130,6 @@ function EditIndexerProxyModalContent(props) {
}
- {
- this.props.toggleAdvancedSettings();
- };
-
//
// Render
@@ -76,7 +65,6 @@ class EditIndexerProxyModalContentConnector extends Component {
{...this.props}
onSavePress={this.onSavePress}
onTestPress={this.onTestPress}
- onAdvancedSettingsPress={this.onAdvancedSettingsPress}
onInputChange={this.onInputChange}
onFieldChange={this.onFieldChange}
/>
@@ -94,7 +82,6 @@ EditIndexerProxyModalContentConnector.propTypes = {
setIndexerProxyFieldValue: PropTypes.func.isRequired,
saveIndexerProxy: PropTypes.func.isRequired,
testIndexerProxy: PropTypes.func.isRequired,
- toggleAdvancedSettings: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
diff --git a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js
index 0d2acae87..9d2188a7c 100644
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxiesConnector.js
@@ -5,13 +5,13 @@ import { createSelector } from 'reselect';
import { deleteIndexerProxy, fetchIndexerProxies } from 'Store/Actions/settingsActions';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import createTagsSelector from 'Store/Selectors/createTagsSelector';
-import sortByProp from 'Utilities/Array/sortByProp';
+import sortByName from 'Utilities/Array/sortByName';
import IndexerProxies from './IndexerProxies';
function createMapStateToProps() {
return createSelector(
- createSortedSectionSelector('settings.indexerProxies', sortByProp('name')),
- createSortedSectionSelector('indexers', sortByProp('name')),
+ createSortedSectionSelector('settings.indexerProxies', sortByName),
+ createSortedSectionSelector('indexers', sortByName),
createTagsSelector(),
(indexerProxies, indexers, tagList) => {
return {
diff --git a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js b/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
index dcd7e1f35..84292ae65 100644
--- a/frontend/src/Settings/Indexers/IndexerProxies/IndexerProxy.js
+++ b/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}
diff --git a/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js
index a48a8f9d5..aaf784094 100644
--- a/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js
+++ b/frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js
@@ -28,7 +28,7 @@ class AddNotificationModalContent extends Component {
return (
- {translate('AddConnection')}
+ Add Notification
diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
index ed00d96e6..ec20ccff1 100644
--- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
+++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
@@ -14,7 +14,6 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { inputTypes, kinds } from 'Helpers/Props';
-import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
import translate from 'Utilities/String/translate';
import NotificationEventItems from './NotificationEventItems';
import styles from './EditNotificationModalContent.css';
@@ -33,7 +32,6 @@ function EditNotificationModalContent(props) {
onModalClose,
onSavePress,
onTestPress,
- onAdvancedSettingsPress,
onDeleteNotificationPress,
...otherProps
} = props;
@@ -50,7 +48,7 @@ function EditNotificationModalContent(props) {
return (
- {id ? translate('EditConnectionImplementation', { implementationName }) : translate('AddConnectionImplementation', { implementationName })}
+ {`${id ? 'Edit' : 'Add'} Connection - ${implementationName}`}
@@ -138,12 +136,6 @@ function EditNotificationModalContent(props) {
}
- {
- this.props.toggleAdvancedSettings();
- };
-
//
// Render
@@ -76,7 +65,6 @@ class EditNotificationModalContentConnector extends Component {
{...this.props}
onSavePress={this.onSavePress}
onTestPress={this.onTestPress}
- onAdvancedSettingsPress={this.onAdvancedSettingsPress}
onInputChange={this.onInputChange}
onFieldChange={this.onFieldChange}
/>
@@ -94,7 +82,6 @@ EditNotificationModalContentConnector.propTypes = {
setNotificationFieldValue: PropTypes.func.isRequired,
saveNotification: PropTypes.func.isRequired,
testNotification: PropTypes.func.isRequired,
- toggleAdvancedSettings: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js
index 4ecf33047..1331a7c8b 100644
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -3,7 +3,6 @@ import React, { Component } from 'react';
import Card from 'Components/Card';
import Label from 'Components/Label';
import ConfirmModal from 'Components/Modal/ConfirmModal';
-import TagList from 'Components/TagList';
import { kinds } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
import EditNotificationModalConnector from './EditNotificationModalConnector';
@@ -58,14 +57,10 @@ class Notification extends Component {
name,
onGrab,
onHealthIssue,
- onHealthRestored,
onApplicationUpdate,
supportsOnGrab,
supportsOnHealthIssue,
- supportsOnHealthRestored,
- supportsOnApplicationUpdate,
- tags,
- tagList
+ supportsOnApplicationUpdate
} = this.props;
return (
@@ -79,27 +74,17 @@ class Notification extends Component {
{
- supportsOnGrab && onGrab ?
+ supportsOnGrab && onGrab &&
:
- null
+
}
{
- supportsOnHealthIssue && onHealthIssue ?
+ supportsOnHealthIssue && onHealthIssue &&
:
- null
- }
-
- {
- supportsOnHealthRestored && onHealthRestored ?
- :
- null
+
}
{
@@ -111,7 +96,7 @@ class Notification extends Component {
}
{
- !onGrab && !onHealthIssue && !onHealthRestored && !onApplicationUpdate ?
+ !onGrab && !onHealthIssue && !onApplicationUpdate ?
-
- {name}
-
-
- {
- enable && applicationUrl ?
-
+ {name}
{
@@ -112,11 +92,6 @@ class Application extends Component {
}
-
@@ -72,7 +71,6 @@ class Applications extends Component {
- {id ? translate('EditApplicationImplementation', { implementationName }) : translate('AddApplicationImplementation', { implementationName })}
+ {`${id ? translate('Edit') : translate('Add')} ${translate('Application')}`}
@@ -118,10 +100,7 @@ function EditApplicationModalContent(props) {
type={inputTypes.SELECT}
values={syncLevelOptions}
name="syncLevel"
- helpTexts={[
- translate('SyncLevelAddRemove'),
- translate('SyncLevelFull')
- ]}
+ helpText={`${translate('SyncLevelAddRemove')}
${translate('SyncLevelFull')}`} {...syncLevel} onChange={onInputChange} /> @@ -133,8 +112,7 @@ function EditApplicationModalContent(props) { {
- this.props.toggleAdvancedSettings();
- };
-
//
// Render
@@ -78,7 +67,6 @@ class EditApplicationModalContentConnector extends Component {
onTestPress={this.onTestPress}
onInputChange={this.onInputChange}
onFieldChange={this.onFieldChange}
- onAdvancedSettingsPress={this.onAdvancedSettingsPress}
/>
);
}
@@ -94,8 +82,7 @@ EditApplicationModalContentConnector.propTypes = {
setApplicationFieldValue: PropTypes.func,
saveApplication: PropTypes.func,
testApplication: PropTypes.func,
- onModalClose: PropTypes.func.isRequired,
- toggleAdvancedSettings: PropTypes.func.isRequired
+ onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(EditApplicationModalContentConnector);
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModal.tsx b/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModal.tsx
deleted file mode 100644
index 1b99f543a..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModal.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import ManageApplicationsEditModalContent from './ManageApplicationsEditModalContent';
-
-interface ManageApplicationsEditModalProps {
- isOpen: boolean;
- applicationIds: number[];
- onSavePress(payload: object): void;
- onModalClose(): void;
-}
-
-function ManageApplicationsEditModal(props: ManageApplicationsEditModalProps) {
- const { isOpen, applicationIds, onSavePress, onModalClose } = props;
-
- return (
-
-
- );
-}
-
-export default ManageApplicationsEditModal;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css b/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css
deleted file mode 100644
index ea406894e..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.modalFooter {
- composes: modalFooter from '~Components/Modal/ModalFooter.css';
-
- justify-content: space-between;
-}
-
-.selected {
- font-weight: bold;
-}
-
-@media only screen and (max-width: $breakpointExtraSmall) {
- .modalFooter {
- flex-direction: column;
- gap: 10px;
- }
-}
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css.d.ts b/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css.d.ts
deleted file mode 100644
index cbf2d6328..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.css.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'modalFooter': string;
- 'selected': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.tsx b/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.tsx
deleted file mode 100644
index 57e88a4fe..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Edit/ManageApplicationsEditModalContent.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes } from 'Helpers/Props';
-import { ApplicationSyncLevel } from 'typings/Application';
-import translate from 'Utilities/String/translate';
-import styles from './ManageApplicationsEditModalContent.css';
-
-interface SavePayload {
- syncLevel?: ApplicationSyncLevel;
-}
-
-interface ManageApplicationsEditModalContentProps {
- applicationIds: number[];
- onSavePress(payload: object): void;
- onModalClose(): void;
-}
-
-const NO_CHANGE = 'noChange';
-
-const syncLevelOptions = [
- {
- key: NO_CHANGE,
- get value() {
- return translate('NoChange');
- },
- isDisabled: 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(
- props: ManageApplicationsEditModalContentProps
-) {
- const { applicationIds, onSavePress, onModalClose } = props;
-
- const [syncLevel, setSyncLevel] = useState(NO_CHANGE);
-
- const save = useCallback(() => {
- let hasChanges = false;
- const payload: SavePayload = {};
-
- if (syncLevel !== NO_CHANGE) {
- hasChanges = true;
- payload.syncLevel = syncLevel as ApplicationSyncLevel;
- }
-
- if (hasChanges) {
- onSavePress(payload);
- }
-
- onModalClose();
- }, [syncLevel, onSavePress, onModalClose]);
-
- const onInputChange = useCallback(
- ({ name, value }: { name: string; value: string }) => {
- switch (name) {
- case 'syncLevel':
- setSyncLevel(value);
- break;
- default:
- console.warn(`EditApplicationsModalContent Unknown Input: '${name}'`);
- }
- },
- []
- );
-
- const selectedCount = applicationIds.length;
-
- return (
-
- {translate('EditSelectedApplications')}
-
-
-
- {translate('SyncLevel')}
-
-
-
-
-
-
-
- );
-}
-
-export default ManageApplicationsEditModalContent;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModal.tsx b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModal.tsx
deleted file mode 100644
index e0bce2138..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModal.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import ManageApplicationsModalContent from './ManageApplicationsModalContent';
-
-interface ManageApplicationsModalProps {
- isOpen: boolean;
- onModalClose(): void;
-}
-
-function ManageApplicationsModal(props: ManageApplicationsModalProps) {
- const { isOpen, onModalClose } = props;
-
- return (
-
-
- );
-}
-
-export default ManageApplicationsModal;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css
deleted file mode 100644
index c106388ab..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.leftButtons,
-.rightButtons {
- display: flex;
- flex: 1 0 50%;
- flex-wrap: wrap;
-}
-
-.rightButtons {
- justify-content: flex-end;
-}
-
-.deleteButton {
- composes: button from '~Components/Link/Button.css';
-
- margin-right: 10px;
-}
\ No newline at end of file
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css.d.ts b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css.d.ts
deleted file mode 100644
index 7b392fff9..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.css.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'deleteButton': string;
- 'leftButtons': string;
- 'rightButtons': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.tsx b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.tsx
deleted file mode 100644
index bb81729f3..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalContent.tsx
+++ /dev/null
@@ -1,298 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { ApplicationAppState } from 'App/State/SettingsAppState';
-import Alert from 'Components/Alert';
-import Button from 'Components/Link/Button';
-import SpinnerButton from 'Components/Link/SpinnerButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-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 Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import useSelectState from 'Helpers/Hooks/useSelectState';
-import { kinds } from 'Helpers/Props';
-import SortDirection from 'Helpers/Props/SortDirection';
-import {
- bulkDeleteApplications,
- bulkEditApplications,
- setManageApplicationsSort,
-} from 'Store/Actions/settingsActions';
-import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
-import { SelectStateInputProps } from 'typings/props';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
-import translate from 'Utilities/String/translate';
-import getSelectedIds from 'Utilities/Table/getSelectedIds';
-import ManageApplicationsEditModal from './Edit/ManageApplicationsEditModal';
-import ManageApplicationsModalRow from './ManageApplicationsModalRow';
-import TagsModal from './Tags/TagsModal';
-import styles from './ManageApplicationsModalContent.css';
-
-// TODO: This feels janky to do, but not sure of a better way currently
-type OnSelectedChangeCallback = React.ComponentProps<
- typeof ManageApplicationsModalRow
->['onSelectedChange'];
-
-const COLUMNS = [
- {
- name: 'name',
- label: () => translate('Name'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'implementation',
- label: () => translate('Implementation'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'syncLevel',
- label: () => translate('SyncLevel'),
- isSortable: true,
- isVisible: true,
- },
- {
- name: 'tags',
- label: () => translate('Tags'),
- isSortable: true,
- isVisible: true,
- },
-];
-
-interface ManageApplicationsModalContentProps {
- onModalClose(): void;
- sortKey?: string;
- sortDirection?: SortDirection;
-}
-
-function ManageApplicationsModalContent(
- props: ManageApplicationsModalContentProps
-) {
- const { onModalClose } = props;
-
- const {
- isFetching,
- isPopulated,
- isDeleting,
- isSaving,
- error,
- items,
- sortKey,
- sortDirection,
- }: ApplicationAppState = useSelector(
- createClientSideCollectionSelector('settings.applications')
- );
- const dispatch = useDispatch();
-
- const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
- const [isEditModalOpen, setIsEditModalOpen] = useState(false);
- const [isTagsModalOpen, setIsTagsModalOpen] = useState(false);
- const [isSavingTags, setIsSavingTags] = useState(false);
-
- const [selectState, setSelectState] = useSelectState();
-
- const { allSelected, allUnselected, selectedState } = selectState;
-
- const selectedIds: number[] = useMemo(() => {
- return getSelectedIds(selectedState);
- }, [selectedState]);
-
- const selectedCount = selectedIds.length;
-
- const onSortPress = useCallback(
- (value: string) => {
- dispatch(setManageApplicationsSort({ sortKey: value }));
- },
- [dispatch]
- );
-
- const onDeletePress = useCallback(() => {
- setIsDeleteModalOpen(true);
- }, [setIsDeleteModalOpen]);
-
- const onDeleteModalClose = useCallback(() => {
- setIsDeleteModalOpen(false);
- }, [setIsDeleteModalOpen]);
-
- const onEditPress = useCallback(() => {
- setIsEditModalOpen(true);
- }, [setIsEditModalOpen]);
-
- const onEditModalClose = useCallback(() => {
- setIsEditModalOpen(false);
- }, [setIsEditModalOpen]);
-
- const onConfirmDelete = useCallback(() => {
- dispatch(bulkDeleteApplications({ ids: selectedIds }));
- setIsDeleteModalOpen(false);
- }, [selectedIds, dispatch]);
-
- const onSavePress = useCallback(
- (payload: object) => {
- setIsEditModalOpen(false);
-
- dispatch(
- bulkEditApplications({
- ids: selectedIds,
- ...payload,
- })
- );
- },
- [selectedIds, dispatch]
- );
-
- const onTagsPress = useCallback(() => {
- setIsTagsModalOpen(true);
- }, [setIsTagsModalOpen]);
-
- const onTagsModalClose = useCallback(() => {
- setIsTagsModalOpen(false);
- }, [setIsTagsModalOpen]);
-
- const onApplyTagsPress = useCallback(
- (tags: number[], applyTags: string) => {
- setIsSavingTags(true);
- setIsTagsModalOpen(false);
-
- dispatch(
- bulkEditApplications({
- ids: selectedIds,
- tags,
- applyTags,
- })
- );
- },
- [selectedIds, dispatch]
- );
-
- const onSelectAllChange = useCallback(
- ({ value }: SelectStateInputProps) => {
- setSelectState({ type: value ? 'selectAll' : 'unselectAll', items });
- },
- [items, setSelectState]
- );
-
- const onSelectedChange = useCallback(
- ({ id, value, shiftKey = false }) => {
- setSelectState({
- type: 'toggleSelected',
- items,
- id,
- isSelected: value,
- shiftKey,
- });
- },
- [items, setSelectState]
- );
-
- const errorMessage = getErrorMessage(
- error,
- 'Unable to load download clients.'
- );
- const anySelected = selectedCount > 0;
-
- return (
-
- {translate('ManageApplications')}
-
- {isFetching ? {translate('NoApplicationsFound')}
- )}
-
- {isPopulated && !!items.length && !isFetching && !isFetching ? (
-
-
- ) : null}
-
-
-
-
-
-
- );
-}
-
-export default ManageApplicationsModalContent;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css
deleted file mode 100644
index 8c126288c..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.name,
-.syncLevel,
-.tags,
-.implementation {
- composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
- word-break: break-all;
-}
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css.d.ts b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css.d.ts
deleted file mode 100644
index cd3e47aae..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.css.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'implementation': string;
- 'name': string;
- 'syncLevel': string;
- 'tags': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.tsx b/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.tsx
deleted file mode 100644
index f41997f54..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/ManageApplicationsModalRow.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { useCallback } from 'react';
-import Label from 'Components/Label';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
-import Column from 'Components/Table/Column';
-import TableRow from 'Components/Table/TableRow';
-import TagListConnector from 'Components/TagListConnector';
-import { kinds } from 'Helpers/Props';
-import { ApplicationSyncLevel } from 'typings/Application';
-import { SelectStateInputProps } from 'typings/props';
-import translate from 'Utilities/String/translate';
-import styles from './ManageApplicationsModalRow.css';
-
-interface ManageApplicationsModalRowProps {
- id: number;
- name: string;
- syncLevel: string;
- implementation: string;
- tags: number[];
- columns: Column[];
- isSelected?: boolean;
- onSelectedChange(result: SelectStateInputProps): void;
-}
-
-function ManageApplicationsModalRow(props: ManageApplicationsModalRowProps) {
- const {
- id,
- isSelected,
- name,
- syncLevel,
- implementation,
- tags,
- onSelectedChange,
- } = props;
-
- const onSelectedChangeWrapper = useCallback(
- (result: SelectStateInputProps) => {
- onSelectedChange({
- ...result,
- });
- },
- [onSelectedChange]
- );
-
- return (
-
- {name}
-
-
- {implementation}
-
-
-
- {syncLevel === ApplicationSyncLevel.AddOnly && (
-
- )}
-
- {syncLevel === ApplicationSyncLevel.FullSync && (
-
- )}
-
- {syncLevel === ApplicationSyncLevel.Disabled && (
-
- )}
-
-
-
-
-
- );
-}
-
-export default ManageApplicationsModalRow;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModal.tsx b/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModal.tsx
deleted file mode 100644
index 2e24d60e8..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModal.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import TagsModalContent from './TagsModalContent';
-
-interface TagsModalProps {
- isOpen: boolean;
- ids: number[];
- onApplyTagsPress: (tags: number[], applyTags: string) => void;
- onModalClose: () => void;
-}
-
-function TagsModal(props: TagsModalProps) {
- const { isOpen, onModalClose, ...otherProps } = props;
-
- return (
-
-
- );
-}
-
-export default TagsModal;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css b/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css
deleted file mode 100644
index 63be9aadd..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.renameIcon {
- margin-left: 5px;
-}
-
-.message {
- margin-top: 20px;
- margin-bottom: 10px;
-}
-
-.result {
- padding-top: 4px;
-}
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css.d.ts b/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css.d.ts
deleted file mode 100644
index 9b4321dcc..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.css.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
- 'message': string;
- 'renameIcon': string;
- 'result': string;
-}
-export const cssExports: CssExports;
-export default cssExports;
diff --git a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.tsx b/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.tsx
deleted file mode 100644
index 11900311e..000000000
--- a/frontend/src/Settings/Applications/Applications/Manage/Tags/TagsModalContent.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { uniq } from 'lodash';
-import React, { useCallback, useMemo, useState } from 'react';
-import { useSelector } from 'react-redux';
-import AppState from 'App/State/AppState';
-import { ApplicationAppState } from 'App/State/SettingsAppState';
-import { Tag } from 'App/State/TagsAppState';
-import Form from 'Components/Form/Form';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Label from 'Components/Label';
-import Button from 'Components/Link/Button';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import createTagsSelector from 'Store/Selectors/createTagsSelector';
-import Application from 'typings/Application';
-import translate from 'Utilities/String/translate';
-import styles from './TagsModalContent.css';
-
-interface TagsModalContentProps {
- ids: number[];
- onApplyTagsPress: (tags: number[], applyTags: string) => void;
- onModalClose: () => void;
-}
-
-function TagsModalContent(props: TagsModalContentProps) {
- const { ids, onModalClose, onApplyTagsPress } = props;
-
- const allApplications: ApplicationAppState = useSelector(
- (state: AppState) => state.settings.applications
- );
- const tagList: Tag[] = useSelector(createTagsSelector());
-
- const [tags, setTags] = useState([]);
- const [applyTags, setApplyTags] = useState('add');
-
- const applicationsTags = useMemo(() => {
- const tags = ids.reduce((acc: number[], id) => {
- const s = allApplications.items.find((s: Application) => s.id === id);
-
- if (s) {
- acc.push(...s.tags);
- }
-
- return acc;
- }, []);
-
- return uniq(tags);
- }, [ids, allApplications]);
-
- const onTagsChange = useCallback(
- ({ value }: { value: number[] }) => {
- setTags(value);
- },
- [setTags]
- );
-
- const onApplyTagsChange = useCallback(
- ({ value }: { value: string }) => {
- setApplyTags(value);
- },
- [setApplyTags]
- );
-
- const onApplyPress = useCallback(() => {
- onApplyTagsPress(tags, applyTags);
- }, [tags, applyTags, onApplyTagsPress]);
-
- const applyTagsOptions = [
- { key: 'add', value: translate('Add') },
- { key: 'remove', value: translate('Remove') },
- { key: 'replace', value: translate('Replace') },
- ];
-
- return (
-
- {translate('Tags')}
-
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-export default TagsModalContent;
diff --git a/frontend/src/Settings/Development/DevelopmentSettings.js b/frontend/src/Settings/Development/DevelopmentSettings.js
index 128055ba8..7c25e2c68 100644
--- a/frontend/src/Settings/Development/DevelopmentSettings.js
+++ b/frontend/src/Settings/Development/DevelopmentSettings.js
@@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import Alert from 'Components/Alert';
import FieldSet from 'Components/FieldSet';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
@@ -9,7 +8,7 @@ import FormLabel from 'Components/Form/FormLabel';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
-import { inputTypes, kinds } from 'Helpers/Props';
+import { inputTypes } from 'Helpers/Props';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import translate from 'Utilities/String/translate';
@@ -50,9 +49,9 @@ class DevelopmentSettings extends Component {
{
!isFetching && error &&
-
+
);
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js
index e79f615ea..71c51849c 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Categories/AddCategoryModalContent.js
@@ -35,7 +35,7 @@ function AddCategoryModalContent(props) {
return (
- {id ? translate('EditCategory') : translate('AddCategory')}
+ {`${id ? 'Edit' : 'Add'} Category`}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js b/frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js
index 1d1f61469..6e0a25a2d 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/Categories/Category.js
@@ -88,7 +88,7 @@ class Category extends Component {
message={
}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js
index 13b24343d..8cea557a9 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClient.js
@@ -89,7 +89,7 @@ class DownloadClient extends Component {
kind={kinds.DISABLED}
outline={true}
>
- {translate('Priority')}: {priority}
+ {translate('PrioritySettings', [priority])}
}
@@ -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}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js
index 51f390d4f..640d56a89 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js
@@ -1,11 +1,10 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import Alert from 'Components/Alert';
import Card from 'Components/Card';
import FieldSet from 'Components/FieldSet';
import Icon from 'Components/Icon';
import PageSectionContent from 'Components/Page/PageSectionContent';
-import { icons, kinds } from 'Helpers/Props';
+import { icons } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
import AddDownloadClientModal from './AddDownloadClientModal';
import DownloadClient from './DownloadClient';
@@ -60,59 +59,48 @@ class DownloadClients extends Component {
} = this.state;
return (
- ${translate('SyncLevelFull')}`} {...syncLevel} onChange={onInputChange} /> @@ -133,8 +112,7 @@ function EditApplicationModalContent(props) {
- {translate('CountApplicationsSelected', { count: selectedCount })}
-
-
-
-
-
-
-
- {errorMessage}
: null}
-
- {isPopulated && !error && !items.length && (
-
-
- {translate('Delete')}
-
-
-
- {translate('Edit')}
-
-
-
- {translate('SetTags')}
-
-
-
-
-
{translate('UnableToLoadDevelopmentSettings')}
-
+
}
{
diff --git a/frontend/src/Settings/DownloadClients/DownloadClientSettings.js b/frontend/src/Settings/DownloadClients/DownloadClientSettings.js
index 5bd284b45..3e060aa5d 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClientSettings.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClientSettings.js
@@ -8,7 +8,6 @@ import { icons } from 'Helpers/Props';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import translate from 'Utilities/String/translate';
import DownloadClientsConnector from './DownloadClients/DownloadClientsConnector';
-import ManageDownloadClientsModal from './DownloadClients/Manage/ManageDownloadClientsModal';
class DownloadClientSettings extends Component {
@@ -22,8 +21,7 @@ class DownloadClientSettings extends Component {
this.state = {
isSaving: false,
- hasPendingChanges: false,
- isManageDownloadClientsOpen: false
+ hasPendingChanges: false
};
}
@@ -38,14 +36,6 @@ class DownloadClientSettings extends Component {
this.setState(payload);
};
- onManageDownloadClientsPress = () => {
- this.setState({ isManageDownloadClientsOpen: true });
- };
-
- onManageDownloadClientsModalClose = () => {
- this.setState({ isManageDownloadClientsOpen: false });
- };
-
onSavePress = () => {
if (this._saveCallback) {
this._saveCallback();
@@ -63,8 +53,7 @@ class DownloadClientSettings extends Component {
const {
isSaving,
- hasPendingChanges,
- isManageDownloadClientsOpen
+ hasPendingChanges
} = this.state;
return (
@@ -82,12 +71,6 @@ class DownloadClientSettings extends Component {
isSpinning={isTestingAll}
onPress={dispatchTestAllDownloadClients}
/>
-
-
- {translate('AreYouSureYouWantToDeleteCategory')}
+ {translate('AreYouSureYouWantToDeleteCategory', [name])}
-
-
-
-
-
+
- {translate('ProwlarrDownloadClientsAlert')}
-
-
- {translate('ProwlarrDownloadClientsInAppOnlyAlert')}
-
-
- {translate('CountDownloadClientsSelected', { count: selectedCount })}
-
-
-
-
-
-
-
- {errorMessage}
: null}
-
- {isPopulated && !error && !items.length && (
-
-
- {translate('Delete')}
-
-
-
- {translate('Edit')}
-
-
-
-
-
{translate('UnableToLoadGeneralSettings')}
-
+
}
{
@@ -156,7 +155,6 @@ class GeneralSettings extends Component {
/>
-
- {translate('Automatic')}
+ {
+ !isWindows &&
+
+ {translate('ScriptPath')}
+
+
+ }
+
+ }
);
}
diff --git a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js
index 77e1e6a98..ff238c915 100644
--- a/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/AddIndexerProxyItem.js
@@ -16,11 +16,10 @@ class AddIndexerProxyItem extends Component {
onIndexerProxySelect = () => {
const {
- implementation,
- implementationName
+ implementation
} = this.props;
- this.props.onIndexerProxySelect({ implementation, implementationName });
+ this.props.onIndexerProxySelect({ implementation });
};
//
@@ -78,7 +77,6 @@ class AddIndexerProxyItem extends Component {
key={preset.name}
name={preset.name}
implementation={implementation}
- implementationName={implementationName}
onPress={onIndexerProxySelect}
/>
);
diff --git a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js
index 59e10422b..59ce4e820 100644
--- a/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js
+++ b/frontend/src/Settings/Indexers/IndexerProxies/EditIndexerProxyModalContent.js
@@ -14,7 +14,6 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { inputTypes, kinds } from 'Helpers/Props';
-import AdvancedSettingsButton from 'Settings/AdvancedSettingsButton';
import translate from 'Utilities/String/translate';
import styles from './EditIndexerProxyModalContent.css';
@@ -32,7 +31,6 @@ function EditIndexerProxyModalContent(props) {
onModalClose,
onSavePress,
onTestPress,
- onAdvancedSettingsPress,
onDeleteIndexerProxyPress,
...otherProps
} = props;
@@ -49,7 +47,7 @@ function EditIndexerProxyModalContent(props) {
return (
+
+ {translate('Automatic')}
-
+
- {translate('Mechanism')}
-
-
-
- {
- updateMechanism.value === 'script' &&
- {translate('ScriptPath')}
+ {translate('Mechanism')}
- }
-
+
+ {
+ updateMechanism.value === 'script' &&
+
-
-
{
- (onHealthIssue.value || onHealthRestored.value) &&
+ onHealthIssue.value &&
{translate('UnableToLoadUISettings')}
-
+
}
{
@@ -147,7 +146,7 @@ class UISettings extends Component {
+ {translate('UnableToLoadBackups')}
+
}
{
noBackups &&
-
{translate('NoBackupsAreAvailable')}
-
+
}
{
diff --git a/frontend/src/System/Backup/RestoreBackupModalContent.js b/frontend/src/System/Backup/RestoreBackupModalContent.js
index 9b5daa9f4..150c46ad6 100644
--- a/frontend/src/System/Backup/RestoreBackupModalContent.js
+++ b/frontend/src/System/Backup/RestoreBackupModalContent.js
@@ -14,7 +14,7 @@ import styles from './RestoreBackupModalContent.css';
function getErrorMessage(error) {
if (!error || !error.responseJSON || !error.responseJSON.message) {
- return translate('ErrorRestoringBackup');
+ return 'Error restoring backup';
}
return error.responseJSON.message;
@@ -146,9 +146,7 @@ class RestoreBackupModalContent extends Component {
- {translate('RestartReloadNote')}
+ Note: Prowlarr will automatically restart and reload the UI during the restore process.
+ No events found
+
}
{
diff --git a/frontend/src/System/Events/LogsTableConnector.js b/frontend/src/System/Events/LogsTableConnector.js
index a717cba15..20e6eafbf 100644
--- a/frontend/src/System/Events/LogsTableConnector.js
+++ b/frontend/src/System/Events/LogsTableConnector.js
@@ -96,14 +96,7 @@ class LogsTableConnector extends Component {
};
onClearLogsPress = () => {
- this.props.executeCommand({
- name: commandNames.CLEAR_LOGS,
- commandFinished: this.onCommandFinished
- });
- };
-
- onCommandFinished = () => {
- this.props.gotoLogsFirstPage();
+ this.props.executeCommand({ name: commandNames.CLEAR_LOGS });
};
//
diff --git a/frontend/src/System/Events/LogsTableDetailsModal.js b/frontend/src/System/Events/LogsTableDetailsModal.js
index 13329f17b..afbb1c2fa 100644
--- a/frontend/src/System/Events/LogsTableDetailsModal.js
+++ b/frontend/src/System/Events/LogsTableDetailsModal.js
@@ -28,7 +28,7 @@ function LogsTableDetailsModal(props) {
onModalClose={onModalClose}
>
- {translate('LogFilesLocation', {
- location
- })}
+ Log files are located in: {location}
{
currentLogView === 'Log Files' &&
-
}
{translate('NoLogFiles')}
-
+
}
+ {translate('HealthNoIssues')}
+
+ }
+
+ {
+ healthIssues &&
+
+
+ );
+ }
+
+}
+
+UpdateChanges.propTypes = {
+ title: PropTypes.string.isRequired,
+ changes: PropTypes.arrayOf(PropTypes.string)
+};
+
+export default UpdateChanges;
diff --git a/frontend/src/System/Updates/UpdateChanges.tsx b/frontend/src/System/Updates/UpdateChanges.tsx
deleted file mode 100644
index 460814cbe..000000000
--- a/frontend/src/System/Updates/UpdateChanges.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
-import styles from './UpdateChanges.css';
-
-interface UpdateChangesProps {
- title: string;
- changes: string[];
-}
-
-function UpdateChanges(props: UpdateChangesProps) {
- const { title, changes } = props;
-
- if (changes.length === 0) {
- return null;
- }
-
- const uniqueChanges = [...new Set(changes)];
-
- return (
- {title}
+ -
+ {
+ changes.map((change, index) => {
+ const checkChange = change.replace(/#\d{3,5}\b/g, (match, contents) => {
+ return `[${match}](https://github.com/Prowlarr/Prowlarr/issues/${match.substring(1)})`;
+ });
+
+ return (
+
-
+
+
+ );
+ })
+ }
+
-
- );
-}
-
-export default UpdateChanges;
diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js
new file mode 100644
index 000000000..c17ec1e6c
--- /dev/null
+++ b/frontend/src/System/Updates/Updates.js
@@ -0,0 +1,251 @@
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import React, { Component, Fragment } from 'react';
+import Icon from 'Components/Icon';
+import Label from 'Components/Label';
+import SpinnerButton from 'Components/Link/SpinnerButton';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import { icons, kinds } from 'Helpers/Props';
+import formatDate from 'Utilities/Date/formatDate';
+import formatDateTime from 'Utilities/Date/formatDateTime';
+import translate from 'Utilities/String/translate';
+import UpdateChanges from './UpdateChanges';
+import styles from './Updates.css';
+
+class Updates extends Component {
+
+ //
+ // Render
+
+ render() {
+ const {
+ currentVersion,
+ isFetching,
+ isPopulated,
+ updatesError,
+ generalSettingsError,
+ items,
+ isInstallingUpdate,
+ updateMechanism,
+ isDocker,
+ updateMechanismMessage,
+ shortDateFormat,
+ longDateFormat,
+ timeFormat,
+ onInstallLatestPress
+ } = this.props;
+
+ const hasError = !!(updatesError || generalSettingsError);
+ const hasUpdates = isPopulated && !hasError && items.length > 0;
+ const noUpdates = isPopulated && !hasError && !items.length;
+ const hasUpdateToInstall = hasUpdates && _.some(items, { installable: true, latest: true });
+ const noUpdateToInstall = hasUpdates && !hasUpdateToInstall;
+
+ const externalUpdaterPrefix = 'Unable to update Prowlarr directly,';
+ const externalUpdaterMessages = {
+ external: 'Prowlarr is configured to use an external update mechanism',
+ apt: 'use apt to install the update',
+ docker: 'update the docker container to receive the update'
+ };
+
+ return (
+ {title}
- -
- {uniqueChanges.map((change, index) => {
- const checkChange = change.replace(
- /#\d{3,5}\b/g,
- (match) =>
- `[${match}](https://github.com/Prowlarr/Prowlarr/issues/${match.substring(
- 1
- )})`
- );
-
- return (
-
-
-
-
- );
- })}
-
+ {translate('NoUpdatesAreAvailable')}
+
+ }
+
+ {
+ hasUpdateToInstall &&
+
+ {
+ (updateMechanism === 'builtIn' || updateMechanism === 'script') && !isDocker ?
+
+ Install Latest
+ :
+
+
+
+ }
+
+ {
+ isFetching &&
+
+ }
+
+ {
+ noUpdateToInstall &&
+
+ {externalUpdaterPrefix}
+
+
+ }
+
+ {
+ hasUpdates &&
+
+ {translate('TheLatestVersionIsAlreadyInstalled', ['Prowlarr'])}
+
+
+ {
+ isFetching &&
+
+ {
+ items.map((update) => {
+ const hasChanges = !!update.changes;
+
+ return (
+
+ }
+
+ {
+ !!updatesError &&
+
+
+ );
+ })
+ }
+
+
+
+ {
+ !hasChanges &&
+ {update.version}
+ —
+
+ {formatDate(update.releaseDate, shortDateFormat)}
+
+
+ {
+ update.branch === 'master' ?
+ null:
+
+ }
+
+ {
+ update.version === currentVersion ?
+ :
+ null
+ }
+
+ {
+ update.version !== currentVersion && update.installedOn ?
+ :
+ null
+ }
+
+ {translate('MaintenanceRelease')}
+
+ }
+
+ {
+ hasChanges &&
+
+
+ }
+
+ Failed to fetch updates
+
+ }
+
+ {
+ !!generalSettingsError &&
+
+ Failed to update settings
+
+ }
+
- {updateMechanism === 'builtIn' || updateMechanism === 'script' ? (
-
- {translate('InstallLatest')}
-
- ) : (
- <>
-
- ) : null}
-
- {noUpdateToInstall && (
-
- {externalUpdaterPrefix}{' '}
-
-
- )}
-
- {isFetching ? (
-
-
- )}
-
- {hasUpdates && (
- {translate('OnLatestVersion')}
-
- {isFetching && (
-
- {items.map((update) => {
- return (
-
- )}
-
- {updatesError ? (
-
-
- );
- })}
-
-
-
- {update.changes ? (
- {update.version}
- —
-
- {formatDate(update.releaseDate, shortDateFormat)}
-
-
- {update.branch === 'master' ? null : (
-
- )}
-
- {update.version === currentVersion ? (
-
- ) : null}
-
- {update.version !== currentVersion && update.installedOn ? (
-
- ) : null}
-
-
- ) : (
- {translate('MaintenanceRelease')}
- )}
- {translate('InstallMajorVersionUpdateMessage')}
-
-
-
- }
- confirmLabel={translate('Install')}
- onConfirm={handleInstallLatestMajorVersionPress}
- onCancel={handleCancelMajorVersionPress}
- />
-