.devcontainer/Lidarr.code-workspace

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

.devcontainer/devcontainer.json

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

.editorconfig

@@ -5,7 +5,7 @@ root = true
 # NOTE: Requires **VS2019 16.3** or later
 
 # Stylecop.ruleset
-# Description: Rules for Lidarr
+# Description: Rules for Radarr
 
 # Code files
 [*.cs]
@@ -19,10 +19,10 @@ indent_size = 4
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_field = false:refactoring
-dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_property = false:refactoring
-dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_method = false:refactoring
-dotnet_style_qualification_for_event = false:warning
+dotnet_style_qualification_for_event = false:refactoring
 
 # Indentation preferences
 csharp_indent_block_contents = true
@@ -40,21 +40,13 @@ dotnet_naming_style.instance_field_style.capitalization = camel_case
 dotnet_naming_style.instance_field_style.required_prefix = _
 
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true
+csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true
+csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true
+csharp_style_var_elsewhere = true:suggestion
-# Prefer "out" variables to be declared inline
-csharp_style_inlined_variable_declaration = true
-
-# Using directive is unnecessary.
-dotnet_diagnostic.IDE0005.severity = error
-# Use var instead of explicit type
-dotnet_diagnostic.IDE0007.severity = error
-# Inline variable declaration
-dotnet_diagnostic.IDE0018.severity = error
 
 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
+dotnet_diagnostic.SA1005.severity = none
 dotnet_diagnostic.SA1025.severity = none
 dotnet_diagnostic.SA1101.severity = none
 dotnet_diagnostic.SA1116.severity = none
@@ -77,7 +69,6 @@ dotnet_diagnostic.SA1406.severity = suggestion
 dotnet_diagnostic.SA1410.severity = suggestion
 dotnet_diagnostic.SA1411.severity = suggestion
 dotnet_diagnostic.SA1413.severity = none
-dotnet_diagnostic.SA1512.severity = none
 dotnet_diagnostic.SA1516.severity = none
 dotnet_diagnostic.SA1600.severity = none
 dotnet_diagnostic.SA1601.severity = none
@@ -119,13 +110,13 @@ dotnet_diagnostic.SA1643.severity = none
 dotnet_diagnostic.SA1648.severity = none
 dotnet_diagnostic.SA1649.severity = none
 dotnet_diagnostic.SA1651.severity = none
+dotnet_diagnostic.SX1101.severity = warning
 dotnet_diagnostic.SX1309.severity = warning
 
 # Microsoft Analyzers that fail and need to be sorted thru
 dotnet_diagnostic.ASP0000.severity = suggestion
 dotnet_diagnostic.CA1000.severity = suggestion
 dotnet_diagnostic.CA1001.severity = suggestion
-dotnet_diagnostic.CA1002.severity = suggestion
 dotnet_diagnostic.CA1003.severity = suggestion
 dotnet_diagnostic.CA1008.severity = suggestion
 dotnet_diagnostic.CA1010.severity = suggestion
@@ -172,17 +163,10 @@ dotnet_diagnostic.CA1304.severity = suggestion
 dotnet_diagnostic.CA1305.severity = suggestion
 dotnet_diagnostic.CA1307.severity = suggestion
 dotnet_diagnostic.CA1308.severity = suggestion
-dotnet_diagnostic.CA1309.severity = suggestion
-dotnet_diagnostic.CA1310.severity = suggestion
 dotnet_diagnostic.CA1401.severity = suggestion
-dotnet_diagnostic.CA1416.severity = suggestion
-dotnet_diagnostic.CA1419.severity = suggestion
 dotnet_diagnostic.CA1507.severity = suggestion
-dotnet_diagnostic.CA1508.severity = suggestion
 dotnet_diagnostic.CA1707.severity = suggestion
-dotnet_diagnostic.CA1708.severity = suggestion
 dotnet_diagnostic.CA1710.severity = suggestion
-dotnet_diagnostic.CA1711.severity = suggestion
 dotnet_diagnostic.CA1712.severity = suggestion
 dotnet_diagnostic.CA1714.severity = suggestion
 dotnet_diagnostic.CA1715.severity = suggestion
@@ -191,23 +175,34 @@ dotnet_diagnostic.CA1717.severity = suggestion
 dotnet_diagnostic.CA1720.severity = suggestion
 dotnet_diagnostic.CA1721.severity = suggestion
 dotnet_diagnostic.CA1724.severity = suggestion
-dotnet_diagnostic.CA1725.severity = suggestion
+dotnet_diagnostic.CA1801.severity = suggestion
+dotnet_diagnostic.CA1802.severity = suggestion
+dotnet_diagnostic.CA1805.severity = suggestion
 dotnet_diagnostic.CA1806.severity = suggestion
 dotnet_diagnostic.CA1810.severity = suggestion
 dotnet_diagnostic.CA1812.severity = suggestion
-dotnet_diagnostic.CA1813.severity = suggestion
 dotnet_diagnostic.CA1814.severity = suggestion
 dotnet_diagnostic.CA1815.severity = suggestion
 dotnet_diagnostic.CA1816.severity = suggestion
 dotnet_diagnostic.CA1819.severity = suggestion
+dotnet_diagnostic.CA1820.severity = suggestion
+dotnet_diagnostic.CA1821.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1823.severity = suggestion
 dotnet_diagnostic.CA1824.severity = suggestion
-dotnet_diagnostic.CA1848.severity = suggestion
+dotnet_diagnostic.CA1825.severity = suggestion
+dotnet_diagnostic.CA1826.severity = suggestion
+dotnet_diagnostic.CA1827.severity = suggestion
+dotnet_diagnostic.CA1828.severity = suggestion
+dotnet_diagnostic.CA1829.severity = suggestion
+dotnet_diagnostic.CA1834.severity = suggestion
 dotnet_diagnostic.CA2000.severity = suggestion
 dotnet_diagnostic.CA2002.severity = suggestion
 dotnet_diagnostic.CA2007.severity = suggestion
 dotnet_diagnostic.CA2008.severity = suggestion
+dotnet_diagnostic.CA2009.severity = suggestion
+dotnet_diagnostic.CA2010.severity = suggestion
+dotnet_diagnostic.CA2011.severity = suggestion
 dotnet_diagnostic.CA2012.severity = suggestion
 dotnet_diagnostic.CA2013.severity = suggestion
 dotnet_diagnostic.CA2100.severity = suggestion
@@ -215,7 +210,6 @@ dotnet_diagnostic.CA2101.severity = suggestion
 dotnet_diagnostic.CA2119.severity = suggestion
 dotnet_diagnostic.CA2153.severity = suggestion
 dotnet_diagnostic.CA2200.severity = suggestion
-dotnet_diagnostic.CA2201.severity = suggestion
 dotnet_diagnostic.CA2207.severity = suggestion
 dotnet_diagnostic.CA2208.severity = suggestion
 dotnet_diagnostic.CA2211.severity = suggestion
@@ -238,9 +232,6 @@ dotnet_diagnostic.CA2243.severity = suggestion
 dotnet_diagnostic.CA2244.severity = suggestion
 dotnet_diagnostic.CA2245.severity = suggestion
 dotnet_diagnostic.CA2246.severity = suggestion
-dotnet_diagnostic.CA2249.severity = suggestion
-dotnet_diagnostic.CA2251.severity = suggestion
-dotnet_diagnostic.CA2254.severity = suggestion
 dotnet_diagnostic.CA3061.severity = suggestion
 dotnet_diagnostic.CA3075.severity = suggestion
 dotnet_diagnostic.CA3076.severity = suggestion
@@ -264,13 +255,11 @@ dotnet_diagnostic.CA5374.severity = suggestion
 dotnet_diagnostic.CA5379.severity = suggestion
 dotnet_diagnostic.CA5384.severity = suggestion
 dotnet_diagnostic.CA5385.severity = suggestion
-dotnet_diagnostic.CA5392.severity = suggestion
-dotnet_diagnostic.CA5394.severity = suggestion
 dotnet_diagnostic.CA5397.severity = suggestion
 
-dotnet_diagnostic.SYSLIB0006.severity = none
 
-[*.{js,html,hbs,less,css,ts,tsx}]
+
+[*.{js,html,js,hbs,less,css}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.esprintrc

@@ -0,0 +1,9 @@
+{
+  "paths": [
+    "frontend/src/**/*.js"
+  ],
+  "ignored": [
+    "**/node_modules/**/*"
+  ],
+  "port": 5004
+}

.gitattributes

@@ -3,7 +3,8 @@
 
 # Explicitly set bash scripts to have unix endings
 *.sh text eol=lf
-distribution/osx/Lidarr text eol=lf
+distribution/debian/* text eol=lf
+macOS/Lidarr text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: lidarr # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: lidarr
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,37 @@
+---
+name: Bug Report
+about: Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit or Discord first. Exceptions do not mean you found a bug!
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+<!-- Support Requests will be closed immediately, if you are unsure go to our Reddit or Discord first. Exceptions do not mean you found a bug! -->
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen.-->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem.-->
+
+**Platform Information (please complete the following information):**
+ - OS: <!-- [e.g. Windows 10 2004 / Ubuntu 20.04] -->
+ - Docker: <!-- [Yes/No] -->
+ - Mono or .NET Version (System -> Status): <!--[e.g. Mono 5.8 or .Net Core 3.1.10 or .NET 5.0.1] -->
+ - Browser and Version (Only needed for UI issues): <!--[e.g. chrome 86.0.4240.198] -->
+ - Lidarr Version: <!--[e.g. 0.7.2.1854 , 0.8.0.2023]-->
+ - Lidarr Branch: <!--[e.g. develop, nightly]-->
+
+**Trace Logs**
+Turn on Trace logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**
+Turn on Trace logs under Settings -> General and wait for the bug to occur again. 
+**Upload the full log file here (or another site (e.g. pastebin) and link it). Issues will be closed, if they do not include this!**

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,83 +0,0 @@
-name: Bug Report
-description: 'Report a new bug, if you are not 100% certain this is a bug please go to our Discord first'
-labels: ['Type: Bug', 'Status: Needs Triage']
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch. 
-    options:
-    - label: I have searched the existing open and closed issues
-      required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. In this environment...
-      2. With this config...
-      3. Run '...'
-      4. See error...
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **OS**: Ubuntu 20.04
-        - **Lidarr**: Lidarr 0.8.1.2135
-        - **Docker Install**: Yes
-        - **Using Reverse Proxy**: No
-        - **Browser**: Firefox 90 (If UI related)
-        - **Database**: Sqlite 3.36.0
-    value: |
-        - OS: 
-        - Lidarr:
-        - Docker Install:
-        - Using Reverse Proxy:
-        - Browser:
-        - Database:
-    render: markdown
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What branch are you running?
-    options:
-      - Master
-      - Develop
-      - Nightly
-      - Plugins (experimental)
-      - Other (This issue will be closed)
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Trace Logs?
-    description: |
-      Trace Logs (https://wiki.servarr.com/lidarr/troubleshooting#logging-and-log-files) 
-      ***Generally speaking, all bug reports must have trace logs provided.***
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-      Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
-  validations:
-    required: true
-- type: checkboxes
-  attributes:
-    label: Trace Logs have been provided as applicable. Reports may be closed if the required logs are not provided.
-    description: Trace logs are generally required for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
-    options:
-    - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Support via Discord
-    url: https://lidarr.audio/discord
+    url: https://discord.gg/5WQc3S8
-    about: Chat with users and devs on support and setup related topics.
+    about: Chat with users and devs on support and setup related topics.
+  - name: Support via Reddit
+    url: https://reddit.com/r/lidarr
+    about: Discuss and search thru support topics.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'Type: Enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,38 +0,0 @@
-name: Feature Request
-description: 'Suggest an idea for Lidarr'
-labels: ['Type: Feature Request', 'Status: Needs Triage']
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
-    options:
-    - label: I have searched the existing open and closed issues
-      required: true
-- type: textarea
-  attributes:
-    label: Is your feature request related to a problem? Please describe
-    description: A clear and concise description of what the problem is.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
-      
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,13 @@
 #### Database Migration
-YES - XXXX | NO
+YES | NO
 
 #### Description
 A few sentences describing the overall goals of the pull request's commits.
 
-#### Screenshot (if UI related)
-
 #### Todos
 - [ ] Tests
-- [ ] Translation Keys (./src/NzbDrone.Core/Localization/Core/en.json)
+- [ ] Wiki Updates
-- [ ] [Wiki Updates](https://wiki.servarr.com)
 
 #### Issues Fixed or Closed by this PR
 
-* Fixes #XXXX
+* 

.github/dependabot.yml

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

.github/label-actions.yml

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

.github/labeler.yml

@@ -1,28 +0,0 @@
-'Area: API':
-  - src/Lidarr.Api.V1/**/*
-
-'Area: Db-migration':
-  - src/NzbDrone.Core/Datastore/Migration/*
-
-'Area: Download Clients':
-  - src/NzbDrone.Core/Download/Clients/**/*
-
-'Area: Import Lists':
-  - src/NzbDrone.Core/ImportLists/**/*
-
-'Area: Indexer':
-  - src/NzbDrone.Core/Indexers/**/*
-
-'Area: Notifications':
-  - src/NzbDrone.Core/Notifications/**/*
-
-'Area: Organizer':
-  - src/NzbDrone.Core/Organizer/**/*
-
-'Area: Parser':
-  - src/NzbDrone.Core/Parser/**/*
-
-'Area: UI':
-  - frontend/**/*
-  - package.json
-  - yarn.lock

.github/workflows/label-actions.yml

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

.github/workflows/labeler.yml

@@ -1,12 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  - pull_request_target
-
-jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v4

.github/workflows/lock.yml

@@ -1,21 +0,0 @@
-name: 'Lock threads'
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: '90'
-          exclude-issue-created-before: ''
-          exclude-any-issue-labels: ''
-          add-issue-labels: ''
-          issue-comment: ''
-          issue-lock-reason: 'resolved'
-          process-only: ''

.gitignore

@@ -11,7 +11,6 @@ src/**/[Oo]bj/
 *.user
 *.sln.docstates
 .vs/
-.vscode/
 
 # Build results
 *_i.c
@@ -121,18 +120,11 @@ _artifacts
 _rawPackage/
 _dotTrace*
 _tests/
-_temp*
 *.Result.xml
 coverage*.xml
 coverage*.json
 setup/Output/
 *.~is
-.mono
-
-# VS outout folders
-bin
-obj
-output/*
 
 # .NET Core
 project.lock.json
@@ -140,30 +132,19 @@ project.fragment.lock.json
 artifacts/
 **/Properties/launchSettings.json
 
-# macOS metadata files
+#VS outout folders
+bin
+obj
+output/*
+
+
+#OS X metadata files
 ._*
 .DS_Store
 
 _start
 _temp_*/**/*
 
-# Windows thumbnail cache files
+## Merge any idea folder
-Thumbs.db
+*/**/.idea
-
+*.iml
-# AppVeyor
-/tools/cake/
-/_artifacts/
-
-# Cake
-/tools/Addins/*
-packages.config.md5sum
-
-# ignore node_modules symlink
-node_modules
-node_modules.nosync
-
-# API doc generation
-.config/
-
-# Ignore Jetbrains IntelliJ Workspace Directories
-.idea/

.vscode/extensions.json

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

.vscode/launch.json

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

.vscode/tasks.json

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

CODE_OF_CONDUCT.md

@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-<development@lidarr.audio>.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -1,13 +1,52 @@
-# How to Contribute
+# How to Contribute #
 
 We're always looking for people to help make Lidarr even better, there are a number of ways to contribute.
 
-This file has been moved to the wiki for the latest details please see the [contributing wiki page](https://wiki.servarr.com/lidarr/contributing).
+## Documentation ##
+Setup guides, FAQ, the more information we have on the [wiki](https://wiki.servarr.com/Lidarr) the better.
 
-## Documentation
+## Development ##
 
-Setup guides, [FAQ](https://wiki.servarr.com/lidarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/lidarr) the better.
+### Tools required ###
+- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works fine. [Download it here](https://www.visualstudio.com/downloads/).
+- HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc)
+- [Git](https://git-scm.com/downloads)
+- [NodeJS](https://nodejs.org/en/download/) (Node 10.X.X or higher)
+- [Yarn](https://yarnpkg.com/)
+- .NET Core 3.1. 
 
-## Development
+### Getting started ###
 
-See the [Wiki Page](https://wiki.servarr.com/lidarr/contributing)
+1. Fork Lidarr
+2. Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
+3. Install the required Node Packages `yarn install`
+4. Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
+5. Build the project in Visual Studio, Setting startup project to `Lidarr.Console` and framework to `netcoreapp31`
+6. Debug the project in Visual Studio
+7. Open http://localhost:8686
+
+Be sure to run lint `yarn lint --fix` on your code for any front end changes before comitting.
+For css changes `yarn stylelint-windows --fix`
+
+### Contributing Code ###
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/lidarr/Lidarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
+- Rebase from Lidarr's develop branch, don't merge
+- Make meaningful commits, or squash them
+- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
+- Reach out to us on the discord if you have any questions
+- Add tests (unit/integration)
+- Commit with *nix line endings for consistency (We checkout Windows and commit *nix)
+- One feature/bug fix per pull request to keep things clean and easy to understand
+- Use 4 spaces instead of tabs, this is the default for VS 2019 and WebStorm (to my knowledge)
+
+### Pull Requesting ###
+- Only make pull requests to develop, never master, if you make a PR to master we'll comment on it and close it
+- You're probably going to get some comments or questions from us, they will be to ensure consistency and maintainability
+- We'll try to respond to pull requests as soon as possible, if its been a day or two, please reach out to us, we may have missed it
+- Each PR should come from its own [feature branch](http://martinfowler.com/bliki/FeatureBranch.html) not develop in your fork, it should have a meaningful branch name (what is being added/fixed)
+  - new-feature (Good)
+  - fix-bug (Good)
+  - patch (Bad)
+  - develop (Bad)
+
+If you have any questions about any of this, please let us know.

README.md

@@ -1,17 +1,13 @@
 # Lidarr
 
 [![Build Status](https://dev.azure.com/Lidarr/Lidarr/_apis/build/status/lidarr.Lidarr?branchName=develop)](https://dev.azure.com/Lidarr/Lidarr/_build/latest?definitionId=1&branchName=develop)
-[![Translation status](https://translate.servarr.com/widget/servarr/lidarr/svg-badge.svg)](https://translate.servarr.com/engage/servarr/?utm_source=widget)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/lidarr.svg)](https://wiki.servarr.com/Lidarr_Installation#Docker)
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/lidarr.svg)](https://wiki.servarr.com/lidarr/installation#docker)
 ![Github Downloads](https://img.shields.io/github/downloads/lidarr/lidarr/total.svg)
 [![Backers on Open Collective](https://opencollective.com/lidarr/backers/badge.svg)](#backers) 
 [![Sponsors on Open Collective](https://opencollective.com/lidarr/sponsors/badge.svg)](#sponsors)
 
 Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
-> [!WARNING]
-> NOTICE - The Lidarr Metadata Server is recovering and rebuilding the cache which is impacting adding artists, library imports, etc. Please follow [GHI 5498](https://github.com/Lidarr/Lidarr/issues/5498) or see Discord for details.
-
 ## Major Features Include:
 
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
@@ -30,9 +26,15 @@ Lidarr is a music collection manager for Usenet and BitTorrent users. It can mon
 
 Note: GitHub Issues are for Bugs and Feature Requests Only
 
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://lidarr.audio/discord)
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/5WQc3S8)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/lidarr)
 [![GitHub - Bugs and Feature Requests Only](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Lidarr/Lidarr/issues)
-[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/lidarr)
+[![Wiki](https://img.shields.io/badge/servarr-wiki-181717.svg?maxAge=60)](https://wiki.servarr.com/Lidarr)
+
+## Feature Requests
+
+[Feature Requests](https://github.com/lidarr/Lidarr/issues/new?assignees=&labels=Type%3A+Enhancement&template=feature_request.md&title=)
 
 ## Contributors
 
@@ -60,17 +62,10 @@ Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrai
 * [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
 * [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
 * [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)	
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)	
 * [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
 
-## DigitalOcean
-
-This project is also supported by DigitalOcean
-<p>
-  <a href="https://www.digitalocean.com/">
-    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
-  </a>
-</p>
-
 ### License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)

SECURITY.md

@@ -1,8 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report (suspected) security vulnerabilities on Discord (preferred) to
-any of the Servarr Dev role holders (red names) or via email: development@servarr.com. You will receive a response from
-us within 72 hours. If the issue is confirmed, we will release a patch as soon
-as possible depending on complexity/severity.

build.sh

@@ -1,8 +1,10 @@
-#! /usr/bin/env bash
+#! /bin/bash
 set -e
 
 outputFolder='_output'
 testPackageFolder='_tests'
+
+#Artifact variables
 artifactsFolder="_artifacts";
 
 ProgressStart()
@@ -21,26 +23,7 @@ UpdateVersionNumber()
         echo "Updating Version Info"
         sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$LIDARRVERSION<\/AssemblyVersion>/g" src/Directory.Build.props
         sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" src/Directory.Build.props
-        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$LIDARRVERSION<\/string>/g" distribution/osx/Lidarr.app/Contents/Info.plist
+        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$LIDARRVERSION<\/string>/g" macOS/Lidarr.app/Contents/Info.plist
-    fi
-}
-
-EnableExtraPlatformsInSDK()
-{
-    SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | head -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
-    BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
-    if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
-        echo "Extra platforms already enabled"
-    else
-        echo "Enabling extra platform support"
-        sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
-    fi
-}
-
-EnableExtraPlatforms()
-{
-    if grep -qv freebsd-x64 src/Directory.Build.props; then
-        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64;linux-x86</RuntimeIdentifiers>^g" src/Directory.Build.props
     fi
 }
 
@@ -94,11 +77,11 @@ YarnInstall()
     ProgressEnd 'yarn install'
 }
 
-RunWebpack()
+RunGulp()
 {
-    ProgressStart 'Running webpack'
+    ProgressStart 'Running gulp'
-    yarn run build --env production
+    yarn run build --production
-    ProgressEnd 'Running webpack'
+    ProgressEnd 'Running gulp'
 }
 
 PackageFiles()
@@ -137,7 +120,7 @@ PackageLinux()
 
     echo "Adding Lidarr.Mono to UpdatePackage"
     cp $folder/Lidarr.Mono.* $folder/Lidarr.Update
-    if [ "$framework" = "net6.0" ]; then
+    if [ "$framework" = "netcoreapp3.1" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Lidarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Lidarr.Update
     fi
@@ -148,13 +131,17 @@ PackageLinux()
 PackageMacOS()
 {
     local framework="$1"
-    local runtime="$2"
     
-    ProgressStart "Creating $runtime Package for $framework"
+    ProgressStart "Creating MacOS Package for $framework"
 
-    local folder=$artifactsFolder/$runtime/$framework/Lidarr
+    local folder=$artifactsFolder/macos/$framework/Lidarr
 
-    PackageFiles "$folder" "$framework" "$runtime"
+    PackageFiles "$folder" "$framework" "osx-x64"
+
+    if [ "$framework" = "net462" ]; then
+        echo "Adding Startup script"
+        cp macOS/Lidarr $folder
+    fi
 
     echo "Removing Service helpers"
     rm -f $folder/ServiceUninstall.*
@@ -165,7 +152,7 @@ PackageMacOS()
 
     echo "Adding Lidarr.Mono to UpdatePackage"
     cp $folder/Lidarr.Mono.* $folder/Lidarr.Update
-    if [ "$framework" = "net6.0" ]; then
+    if [ "$framework" = "netcoreapp3.1" ]; then
         cp $folder/Mono.Posix.NETStandard.* $folder/Lidarr.Update
         cp $folder/libMonoPosixHelper.* $folder/Lidarr.Update
     fi
@@ -176,19 +163,18 @@ PackageMacOS()
 PackageMacOSApp()
 {
     local framework="$1"
-    local runtime="$2"
     
-    ProgressStart "Creating $runtime App Package for $framework"
+    ProgressStart "Creating macOS App Package for $framework"
 
-    local folder=$artifactsFolder/$runtime-app/$framework
+    local folder=$artifactsFolder/macos-app/$framework
 
     rm -rf $folder
     mkdir -p $folder
-    cp -r distribution/osx/Lidarr.app $folder
+    cp -r macOS/Lidarr.app $folder
     mkdir -p $folder/Lidarr.app/Contents/MacOS
 
     echo "Copying Binaries"
-    cp -r $artifactsFolder/$runtime/$framework/Lidarr/* $folder/Lidarr.app/Contents/MacOS
+    cp -r $artifactsFolder/macos/$framework/Lidarr/* $folder/Lidarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
     rm -r $folder/Lidarr.app/Contents/MacOS/Lidarr.Update
@@ -206,7 +192,6 @@ PackageWindows()
     local folder=$artifactsFolder/$runtime/$framework/Lidarr
     
     PackageFiles "$folder" "$framework" "$runtime"
-    cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder
 
     echo "Removing Lidarr.Mono"
     rm -f $folder/Lidarr.Mono.*
@@ -216,7 +201,7 @@ PackageWindows()
     echo "Adding Lidarr.Windows to UpdatePackage"
     cp $folder/Lidarr.Windows.* $folder/Lidarr.Update
 
-    ProgressEnd "Creating $runtime Package for $framework"
+    ProgressEnd 'Creating Windows Package'
 }
 
 Package()
@@ -228,45 +213,19 @@ Package()
     IFS='-' read -ra SPLIT <<< "$runtime"
 
     case "${SPLIT[0]}" in
-        linux|freebsd*)
+        linux)
             PackageLinux "$framework" "$runtime"
             ;;
         win)
             PackageWindows "$framework" "$runtime"
             ;;
         osx)
-            PackageMacOS "$framework" "$runtime"
+            PackageMacOS "$framework"
-            PackageMacOSApp "$framework" "$runtime"
+            PackageMacOSApp "$framework"
             ;;
     esac
 }
 
-BuildInstaller()
-{
-    local framework="$1"
-    local runtime="$2"
-    
-    ./_inno/ISCC.exe distribution/windows/setup/lidarr.iss "//DFramework=$framework" "//DRuntime=$runtime"
-}
-
-InstallInno()
-{
-    ProgressStart "Installing portable Inno Setup"
-    
-    rm -rf _inno
-    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
-    
-    ProgressEnd "Installed portable Inno Setup"
-}
-
-RemoveInno()
-{
-    rm -rf _inno
-}
-
 PackageTests()
 {
     local framework="$1"
@@ -298,10 +257,7 @@ if [ $# -eq 0 ]; then
     BACKEND=YES
     FRONTEND=YES
     PACKAGES=YES
-    INSTALLER=NO
     LINT=YES
-    ENABLE_EXTRA_PLATFORMS=NO
-    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
 fi
 
 while [[ $# -gt 0 ]]
@@ -313,14 +269,6 @@ case $key in
         BACKEND=YES
         shift # past argument
         ;;
-    --enable-bsd|--enable-extra-platforms)
-        ENABLE_EXTRA_PLATFORMS=YES
-        shift # past argument
-        ;;
-    --enable-extra-platforms-in-sdk)
-        ENABLE_EXTRA_PLATFORMS_IN_SDK=YES
-        shift # past argument
-        ;;
     -r|--runtime)
         RID="$2"
         shift # past argument
@@ -339,10 +287,6 @@ case $key in
         PACKAGES=YES
         shift # past argument
         ;;
-    --installer)
-        INSTALLER=YES
-        shift # past argument
-        ;;
     --lint)
         LINT=YES
         shift # past argument
@@ -362,81 +306,55 @@ esac
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-if [ "$ENABLE_EXTRA_PLATFORMS_IN_SDK" = "YES" ];
-then
-    EnableExtraPlatformsInSDK
-fi
-
 if [ "$BACKEND" = "YES" ];
 then
     UpdateVersionNumber
-    if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
-    then
-        EnableExtraPlatforms
-    fi
     Build
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        PackageTests "net6.0" "win-x64"
+        PackageTests "netcoreapp3.1" "win-x64"
-        PackageTests "net6.0" "win-x86"
+        PackageTests "netcoreapp3.1" "win-x86"
-        PackageTests "net6.0" "linux-x64"
+        PackageTests "netcoreapp3.1" "linux-x64"
-        PackageTests "net6.0" "linux-musl-x64"
+        PackageTests "netcoreapp3.1" "linux-musl-x64"
-        PackageTests "net6.0" "osx-x64"
+        PackageTests "netcoreapp3.1" "osx-x64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
+        PackageTests "net462" "linux-x64"
-        then
-            PackageTests "net6.0" "freebsd-x64"
-            PackageTests "net6.0" "linux-x86"
-        fi
     else
         PackageTests "$FRAMEWORK" "$RID"
     fi
 fi
 
-if [[ "$LINT" = "YES" || "$FRONTEND" = "YES" ]];
+if [ "$FRONTEND" = "YES" ];
 then
     YarnInstall
+    RunGulp
 fi
 
 if [ "$LINT" = "YES" ];
 then
+    if [ -z "$FRONTEND" ];
+    then
+        YarnInstall
+    fi
+    
     LintUI
 fi
 
-if [ "$FRONTEND" = "YES" ];
-then
-    RunWebpack
-fi
-
 if [ "$PACKAGES" = "YES" ];
 then
     UpdateVersionNumber
 
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
-        Package "net6.0" "win-x64"
+        Package "netcoreapp3.1" "win-x64"
-        Package "net6.0" "win-x86"
+        Package "netcoreapp3.1" "win-x86"
-        Package "net6.0" "linux-x64"
+        Package "netcoreapp3.1" "linux-x64"
-        Package "net6.0" "linux-musl-x64"
+        Package "netcoreapp3.1" "linux-musl-x64"
-        Package "net6.0" "linux-arm64"
+        Package "netcoreapp3.1" "linux-arm64"
-        Package "net6.0" "linux-musl-arm64"
+        Package "netcoreapp3.1" "linux-musl-arm64"
-        Package "net6.0" "linux-arm"
+        Package "netcoreapp3.1" "linux-arm"
-        Package "net6.0" "linux-musl-arm"
+        Package "netcoreapp3.1" "osx-x64"
-        Package "net6.0" "osx-x64"
+        Package "net462" "linux-x64"
-        Package "net6.0" "osx-arm64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
-        then
-            Package "net6.0" "freebsd-x64"
-            Package "net6.0" "linux-x86"
-        fi
     else
         Package "$FRAMEWORK" "$RID"
     fi
 fi
-
-if [ "$INSTALLER" = "YES" ];
-then
-    InstallInno
-    BuildInstaller "net6.0" "win-x64"
-    BuildInstaller "net6.0" "win-x86"
-    RemoveInno
-fi

debian/changelog

@@ -0,0 +1,5 @@
+nzbdrone {version} {branch}; urgency=low
+
+  * Automatic Release.
+
+ -- NzbDrone <contact@nzbdrone.com>  Mon, 26 Aug 2013 00:00:00 -0700

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -0,0 +1,12 @@
+Section: web
+Priority: optional
+Maintainer: Sonarr <contact@nzbdrone.com>
+Source: nzbdrone
+Homepage: https://lidarr.audio
+Vcs-Git: git@github.com:lidarr/Lidarr.git
+Vcs-Browser: https://github.com/lidarr/Lidarr
+
+Package: nzbdrone
+Architecture: all
+Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
+Description: Lidarr is a music collection manager

debian/copyright

@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nzbdrone
+Source: https://github.com/lidarr/Lidarr
+
+Files: *
+Copyright: 2010-2016 Lidarr <hello@lidarr.audio>
+
+License: GPL-3.0+
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian/install

@@ -0,0 +1 @@
+nzbdrone_bin/* opt/NzbDrone

debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

distribution/debian/install.sh

@@ -1,182 +0,0 @@
-#!/bin/bash
-### Description: Lidarr .NET Debian install
-### Originally written for Radarr by: DoctorArr - doctorarr@the-rowlands.co.uk on 2021-10-01 v1.0
-### Updates for servarr suite made by Bakerboy448, DoctorArr, brightghost, aeramor and VP-EN
-### Version v1.0.0 2023-12-29 - StevieTV - adapted from servarr script for Lidarr installs
-### Version V1.0.1 2024-01-02 - StevieTV - remove UTF8-BOM
-### Version V1.0.2 2024-01-03 - markus101 - Get user input from /dev/tty
-### Version V1.0.3 2024-01-06 - StevieTV - exit script when it is ran from install directory
-
-### Boilerplate Warning
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-scriptversion="1.0.3"
-scriptdate="2024-01-06"
-
-set -euo pipefail
-
-echo "Running Lidarr Install Script - Version [$scriptversion] as of [$scriptdate]"
-
-# Am I root?, need root!
-
-if [ "$EUID" -ne 0 ]; then
-    echo "Please run as root."
-    exit
-fi
-
-app="lidarr"
-app_port="8686"
-app_prereq="curl sqlite3 wget"
-app_umask="0002"
-branch="main"
-
-# Constants
-### Update these variables as required for your specific instance
-installdir="/opt"              # {Update me if needed} Install Location
-bindir="${installdir}/${app^}" # Full Path to Install Location
-datadir="/var/lib/$app/"       # {Update me if needed} AppData directory to use
-app_bin=${app^}                # Binary Name of the app
-
-# This script should not be ran from installdir, otherwise later in the script the extracted files will be removed before they can be moved to installdir.
-if [ "$installdir" == "$(dirname -- "$( readlink -f -- "$0"; )")" ] || [ "$bindir" == "$(dirname -- "$( readlink -f -- "$0"; )")" ]; then
-    echo "You should not run this script from the intended install directory. The script will exit. Please re-run it from another directory"
-    exit
-fi
-
-# Prompt User
-read -r -p "What user should ${app^} run as? (Default: $app): " app_uid < /dev/tty
-app_uid=$(echo "$app_uid" | tr -d ' ')
-app_uid=${app_uid:-$app}
-# Prompt Group
-read -r -p "What group should ${app^} run as? (Default: media): " app_guid < /dev/tty
-app_guid=$(echo "$app_guid" | tr -d ' ')
-app_guid=${app_guid:-media}
-
-echo "This will install [${app^}] to [$bindir] and use [$datadir] for the AppData Directory"
-echo "${app^} will run as the user [$app_uid] and group [$app_guid]. By continuing, you've confirmed that the selected user and group will have READ and WRITE access to your Media Library and Download Client Completed Download directories"
-read -n 1 -r -s -p $'Press enter to continue or ctrl+c to exit...\n' < /dev/tty
-
-# Create User / Group as needed
-if [ "$app_guid" != "$app_uid" ]; then
-    if ! getent group "$app_guid" >/dev/null; then
-        groupadd "$app_guid"
-    fi
-fi
-if ! getent passwd "$app_uid" >/dev/null; then
-    adduser --system --no-create-home --ingroup "$app_guid" "$app_uid"
-    echo "Created and added User [$app_uid] to Group [$app_guid]"
-fi
-if ! getent group "$app_guid" | grep -qw "$app_uid"; then
-    echo "User [$app_uid] did not exist in Group [$app_guid]"
-    usermod -a -G "$app_guid" "$app_uid"
-    echo "Added User [$app_uid] to Group [$app_guid]"
-fi
-
-# Stop the App if running
-if service --status-all | grep -Fq "$app"; then
-    systemctl stop "$app"
-    systemctl disable "$app".service
-    echo "Stopped existing $app"
-fi
-
-# Create Appdata Directory
-
-# AppData
-mkdir -p "$datadir"
-chown -R "$app_uid":"$app_guid" "$datadir"
-chmod 775 "$datadir"
-echo "Directories created"
-# Download and install the App
-
-# prerequisite packages
-echo ""
-echo "Installing pre-requisite Packages"
-# shellcheck disable=SC2086
-apt update && apt install -y $app_prereq
-echo ""
-ARCH=$(dpkg --print-architecture)
-# get arch
-dlbase="https://lidarr.servarr.com/v1/update/$branch/updatefile?os=linux&runtime=netcore"
-case "$ARCH" in
-"amd64") DLURL="${dlbase}&arch=x64" ;;
-"armhf") DLURL="${dlbase}&arch=arm" ;;
-"arm64") DLURL="${dlbase}&arch=arm64" ;;
-*)
-    echo "Arch not supported"
-    exit 1
-    ;;
-esac
-echo ""
-echo "Removing previous tarballs"
-# -f to Force so we fail if it doesn't exist
-rm -f "${app^}".*.tar.gz
-echo ""
-echo "Downloading..."
-wget --content-disposition "$DLURL"
-tar -xvzf "${app^}".*.tar.gz
-echo ""
-echo "Installation files downloaded and extracted"
-
-# remove existing installs
-echo "Removing existing installation"
-rm -rf "$bindir"
-echo "Installing..."
-mv "${app^}" $installdir
-chown "$app_uid":"$app_guid" -R "$bindir"
-chmod 775 "$bindir"
-rm -rf "${app^}.*.tar.gz"
-# Ensure we check for an update in case user installs older version or different branch
-touch "$datadir"/update_required
-chown "$app_uid":"$app_guid" "$datadir"/update_required
-echo "App Installed"
-# Configure Autostart
-
-# Remove any previous app .service
-echo "Removing old service file"
-rm -rf /etc/systemd/system/"$app".service
-
-# Create app .service with correct user startup
-echo "Creating service file"
-cat <<EOF | tee /etc/systemd/system/"$app".service >/dev/null
-[Unit]
-Description=${app^} Daemon
-After=syslog.target network.target
-[Service]
-User=$app_uid
-Group=$app_guid
-UMask=$app_umask
-Type=simple
-ExecStart=$bindir/$app_bin -nobrowser -data=$datadir
-TimeoutStopSec=20
-KillMode=process
-Restart=on-failure
-[Install]
-WantedBy=multi-user.target
-EOF
-
-# Start the App
-echo "Service file created. Attempting to start the app"
-systemctl -q daemon-reload
-systemctl enable --now -q "$app"
-
-# Finish Update/Installation
-host=$(hostname -I)
-ip_local=$(grep -oP '^\S*' <<<"$host")
-echo ""
-echo "Install complete"
-sleep 10
-STATUS="$(systemctl is-active "$app")"
-if [ "${STATUS}" = "active" ]; then
-    echo "Browse to http://$ip_local:$app_port for the ${app^} GUI"
-else
-    echo "${app^} failed to start"
-fi
-
-# Exit
-exit 0

distribution/debian/lidarr.service

@@ -1,20 +0,0 @@
-# This file is owned by the lidarr package, DO NOT MODIFY MANUALLY
-# Instead use 'dpkg-reconfigure -plow lidarr' to modify User/Group/UMask/-data
-# Or use systemd built-in override functionality using 'systemctl edit lidarr'
-[Unit]
-Description=Lidarr Daemon
-After=network.target
-
-[Service]
-User=lidarr
-Group=lidarr
-UMask=002
-
-Type=simple
-ExecStart=/opt/Lidarr/Lidarr -nobrowser -data=/var/lib/lidarr
-TimeoutStopSec=20
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

distribution/windows/setup/lidarr.iss

@@ -1,84 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define AppName "Lidarr"
-#define AppPublisher "Team Lidarr"
-#define AppURL "https://lidarr.audio/"
-#define ForumsURL "https://lidarr.audio/discord"
-#define AppExeName "Lidarr.exe"
-#define BaseVersion GetEnv('MAJORVERSION')
-#define BuildNumber GetEnv('MINORVERSION')
-#define BuildVersion GetEnv('LIDARRVERSION')
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{56C1065D-3523-4025-B76D-6F73F67F7F93}
-AppName={#AppName}
-AppVersion={#BaseVersion}
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#ForumsURL}
-AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\Lidarr
-DisableDirPage=yes
-DefaultGroupName={#AppName}
-DisableProgramGroupPage=yes
-OutputBaseFilename=Lidarr.{#BuildVersion}.{#Runtime}
-SolidCompression=yes
-AppCopyright=Creative Commons 3.0 License
-AllowUNCPath=False
-UninstallDisplayIcon={app}\bin\Lidarr.exe
-DisableReadyPage=True
-CompressionThreads=2
-Compression=lzma2/normal
-AppContact={#ForumsURL}
-VersionInfoVersion={#BaseVersion}.{#BuildNumber}
-SetupLogging=yes
-OutputDir=output
-WizardStyle=modern
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopIcon"; Description: "{cm:CreateDesktopIcon}"
-Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts as the LocalService user, you will need to change the user to access network shares)"; GroupDescription: "Start automatically"; Flags: exclusive
-Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
-Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
-
-[Dirs]
-Name: "{app}"; Permissions: users-modify
-
-[Files]
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\bin\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\bin\Lidarr.exe"; WorkingDir: "{app}\bin"; Tasks: startupShortcut
-
-[InstallDelete]
-Name: "{app}\bin"; Type: filesandordirs
-
-[Run]
-Filename: "{app}\bin\Lidarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\bin\Lidarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl /exitimmediately"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
-Filename: "{app}\bin\Lidarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\bin\Lidarr.exe"; Description: "Open Lidarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\bin\Lidarr.exe"; Description: "Start Lidarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
-
-[UninstallRun]
-Filename: "{app}\bin\lidarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
-
-[Code]
-function PrepareToInstall(var NeedsRestart: Boolean): String;
-var
-  ResultCode: Integer;
-begin
-  Exec('net', 'stop lidarr', '', 0, ewWaitUntilTerminated, ResultCode)
-  Exec('sc', 'delete lidarr', '', 0, ewWaitUntilTerminated, ResultCode)
-end;

docs.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-
-FRAMEWORK="net6.0"
-PLATFORM=$1
-ARCHITECTURE="${2:-x64}"
-
-if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-$ARCHITECTURE"
-elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-$ARCHITECTURE"
-elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-$ARCHITECTURE"
-else
-  echo "Platform must be provided as first argument: Windows, Linux or Mac"
-  exit 1
-fi
-
-outputFolder='_output'
-testPackageFolder='_tests'
-
-rm -rf $outputFolder
-rm -rf $testPackageFolder
-
-slnFile=src/Lidarr.sln
-
-platform=Posix
-
-if [ "$PLATFORM" = "Windows" ]; then
-  application=Lidarr.Console.dll
-else
-  application=Lidarr.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 6.6.2 Swashbuckle.AspNetCore.Cli
-
-dotnet tool run swagger tofile --output ./src/Lidarr.Api.V1/openapi.json "$outputFolder/$FRAMEWORK/$RUNTIME/$application" v1 &
-
-sleep 45
-
-kill %1
-
-exit 0

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
+}

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
+    }
+  }
+}

frontend/.eslintignore

@@ -1,2 +1 @@
 **/JsLibraries/**
-**/*.css.d.ts

frontend/.eslintrc.js

@@ -1,22 +1,13 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require('fs');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin').configs.recommended;
-
-const frontendFolder = __dirname;
 
 const dirs = fs
-  .readdirSync(path.join(frontendFolder, 'src'), { withFileTypes: true })
+  .readdirSync('frontend/src', { withFileTypes: true })
   .filter((dirent) => dirent.isDirectory())
   .map((dirent) => dirent.name)
   .join('|');
 
 module.exports = {
-  root: true,
+  parser: 'babel-eslint',
-
-  parser: '@babel/eslint-parser',
 
   env: {
     browser: true,
@@ -28,16 +19,12 @@ module.exports = {
   globals: {
     expect: false,
     chai: false,
-    sinon: false,
+    sinon: false
-    JSX: true
   },
 
   parserOptions: {
     ecmaVersion: 6,
     sourceType: 'module',
-    babelOptions: {
-      configFile: `${frontendFolder}/babel.config.js`
-    },
     ecmaFeatures: {
       modules: true,
       impliedStrict: true
@@ -47,11 +34,8 @@ module.exports = {
   plugins: [
     'filenames',
     'react',
-    'react-hooks',
     'simple-import-sort',
-    'import',
+    'import'
-    '@typescript-eslint',
-    'prettier'
   ],
 
   settings: {
@@ -234,7 +218,7 @@ module.exports = {
     'consistent-this': ['error', 'self'],
     'eol-last': 'error',
     'func-names': 'off',
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+    'func-style': ['error', 'declaration'],
     indent: ['error', 2, { SwitchCase: 1 }],
     'key-spacing': ['error', { beforeColon: false, afterColon: true }],
     'keyword-spacing': ['error', { before: true, after: true }],
@@ -287,7 +271,7 @@ module.exports = {
 
     // ImportSort
 
-    'simple-import-sort/imports': 'error',
+    'simple-import-sort/sort': 'error',
     'import/newline-after-import': 'error',
 
     // React
@@ -319,17 +303,13 @@ module.exports = {
     'react/react-in-jsx-scope': 2,
     'react/self-closing-comp': 2,
     'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2,
+    'react/jsx-wrap-multilines': 2
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'error'
   },
   overrides: [
     {
-      files: [
+      files: ['*.js'],
-        '*.js'
-      ],
       rules: {
-        'simple-import-sort/imports': [
+        'simple-import-sort/sort': [
           'error',
           {
             groups: [
@@ -342,52 +322,6 @@ module.exports = {
           }
         ]
       }
-    },
-    {
-      files: [
-        '*.ts',
-        '*.tsx'
-      ],
-
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        project: './tsconfig.json'
-      },
-
-      extends: [
-        'prettier'
-      ],
-
-      rules: Object.assign(typescriptEslintRecommended.rules, {
-        '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',
-          {
-            groups: [
-              // Packages
-              // Absolute Paths
-              // Relative Paths
-              // Css
-              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
-            ]
-          }
-        ]
-      })
-    },
-    {
-      files: [
-        '*.css.d.ts'
-      ],
-      rules: {
-        'filenames/match-exported': 'off',
-        'init-declarations': 'off',
-        'prettier/prettier': 'off'
-      }
     }
   ]
 };

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
+  }
+}

frontend/.prettierignore

@@ -1,10 +0,0 @@
-# Ignore everything recursively
-*
-
-# But not the .ts files
-!*.ts*
-
-*css.d.ts
-
-# Check subdirectories too
-!*/

frontend/.prettierrc.json

@@ -1,6 +0,0 @@
-{
-  "arrowParens": "always",
-  "endOfLine": "auto",
-  "singleQuote": true,
-  "trailingComma": "es5"
-}

frontend/.stylelintrc

@@ -1,12 +1,12 @@
 {
-  "plugins": [
+"plugins": [
-    "stylelint-order"
+  "stylelint-order"
-  ],
+],
-  "ignoreFiles": [
+"ignoreFiles": [
-    "frontend/src/Styles/scaffolding.css",
+  "frontend/src/Styles/scaffolding.css",
-    "**/*.js"
+  "**/*.js"
-  ],
+],
-  "rules": {
+"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
   }
-}
+}

frontend/.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-    "recommendations": [
-        "stylelint.vscode-stylelint",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
-    ]
-}

frontend/.vscode/settings.json

@@ -1,23 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-  "files.insertFinalNewline": true,
-
-  "files.exclude": {
-    "**/node_modules": true,
-    "**/*.d.css": true
-  },
-
-  "editor.formatOnSave": false,
-  "editor.codeActionsOnSave": {
-    "source.fixAll": "explicit"
-  },
-
-  "typescript.preferences.quoteStyle": "single",
-
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
-}

frontend/babel.config.js

@@ -2,25 +2,22 @@ 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-proposal-optional-chaining', { loose }],
-    ['@babel/plugin-transform-nullish-coalescing-operator', { 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: {
     development: {
       presets: [
-        ['@babel/preset-react', { development: true }],
+        ['@babel/preset-react', { development: true }]
-        '@babel/preset-typescript'
       ],
       plugins: [
         'babel-plugin-inline-classnames'
@@ -28,8 +25,7 @@ module.exports = {
     },
     production: {
       presets: [
-        '@babel/preset-react',
+        '@babel/preset-react'
-        '@babel/preset-typescript'
       ],
       plugins: [
         'babel-plugin-transform-react-remove-prop-types'

frontend/build/webpack.config.js

@@ -1,291 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const path = require('path');
-const webpack = require('webpack');
-const FileManagerPlugin = require('filemanager-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const LiveReloadPlugin = require('webpack-livereload-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-
-module.exports = (env) => {
-  const uiFolder = 'UI';
-  const frontendFolder = path.join(__dirname, '..');
-  const srcFolder = path.join(frontendFolder, 'src');
-  const isProduction = !!env.production;
-  const isProfiling = isProduction && !!env.profile;
-  const inlineWebWorkers = 'no-fallback';
-
-  const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
-
-  console.log('Source Folder:', srcFolder);
-  console.log('Output Folder:', distFolder);
-  console.log('isProduction:', isProduction);
-  console.log('isProfiling:', isProfiling);
-
-  const config = {
-    mode: isProduction ? 'production' : 'development',
-    devtool: isProduction ? 'source-map' : 'eval-source-map',
-    target: 'web',
-
-    stats: {
-      children: false
-    },
-
-    watchOptions: {
-      ignored: /node_modules/
-    },
-
-    entry: {
-      index: 'index.ts'
-    },
-
-    resolve: {
-      extensions: [
-        '.ts',
-        '.tsx',
-        '.js'
-      ],
-      modules: [
-        srcFolder,
-        path.join(srcFolder, 'Shims'),
-        'node_modules'
-      ],
-      alias: {
-        jquery: 'jquery/dist/jquery.min',
-        'react-middle-truncate': 'react-middle-truncate/lib/react-middle-truncate'
-      },
-      fallback: {
-        buffer: false,
-        http: false,
-        https: false,
-        url: false,
-        util: false,
-        net: false
-      }
-    },
-
-    output: {
-      path: distFolder,
-      publicPath: '/',
-      filename: isProduction ? '[name]-[contenthash].js' : '[name].js',
-      sourceMapFilename: '[file].map'
-    },
-
-    optimization: {
-      moduleIds: 'deterministic',
-      chunkIds: isProduction ? 'deterministic' : 'named'
-    },
-
-    performance: {
-      hints: false
-    },
-
-    experiments: {
-      topLevelAwait: true
-    },
-
-    plugins: [
-      new webpack.DefinePlugin({
-        __DEV__: !isProduction,
-        'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
-      }),
-
-      new MiniCssExtractPlugin({
-        filename: 'Content/styles.css',
-        chunkFilename: isProduction ? 'Content/[id]-[chunkhash].css' : 'Content/[id].css'
-      }),
-
-      new HtmlWebpackPlugin({
-        template: 'frontend/src/index.ejs',
-        filename: 'index.html',
-        publicPath: '/',
-        inject: false
-      }),
-
-      new FileManagerPlugin({
-        events: {
-          onEnd: {
-            copy: [
-              // HTML
-              {
-                source: 'frontend/src/*.html',
-                destination: distFolder
-              },
-
-              // Fonts
-              {
-                source: 'frontend/src/Content/Fonts/*.*',
-                destination: path.join(distFolder, 'Content/Fonts')
-              },
-
-              // Icon Images
-              {
-                source: 'frontend/src/Content/Images/Icons/*.*',
-                destination: path.join(distFolder, 'Content/Images/Icons')
-              },
-
-              // Images
-              {
-                source: 'frontend/src/Content/Images/*.*',
-                destination: path.join(distFolder, 'Content/Images')
-              },
-
-              // Robots
-              {
-                source: 'frontend/src/Content/robots.txt',
-                destination: path.join(distFolder, 'Content/robots.txt')
-              },
-
-              // manifest.json and browserconfig.xml
-              {
-                source: 'frontend/src/Content/*.(json|xml)',
-                destination: path.join(distFolder, 'Content')
-              }
-            ]
-          }
-        }
-      }),
-
-      new ForkTsCheckerWebpackPlugin(),
-
-      new LiveReloadPlugin()
-    ],
-
-    resolveLoader: {
-      modules: [
-        'node_modules',
-        'frontend/build/webpack/'
-      ]
-    },
-
-    module: {
-      rules: [
-        {
-          test: /\.worker\.js$/,
-          use: {
-            loader: 'worker-loader',
-            options: {
-              filename: '[name].js',
-              inline: inlineWebWorkers
-            }
-          }
-        },
-        {
-          test: [/\.jsx?$/, /\.tsx?$/],
-          exclude: /(node_modules|JsLibraries)/,
-          use: [
-            {
-              loader: 'babel-loader',
-              options: {
-                configFile: `${frontendFolder}/babel.config.js`,
-                envName: isProduction ? 'production' : 'development',
-                presets: [
-                  [
-                    '@babel/preset-env',
-                    {
-                      modules: false,
-                      loose: true,
-                      debug: false,
-                      useBuiltIns: 'entry',
-                      corejs: '3.41'
-                    }
-                  ]
-                ]
-              }
-            }
-          ]
-        },
-
-        // CSS Modules
-        {
-          test: /\.css$/,
-          exclude: /(node_modules|globals.css)/,
-          use: [
-            { loader: MiniCssExtractPlugin.loader },
-            { loader: 'css-modules-typescript-loader' },
-            {
-              loader: 'css-loader',
-              options: {
-                importLoaders: 1,
-                modules: {
-                  localIdentName: isProduction ? '[name]/[local]/[hash:base64:5]' : '[name]/[local]'
-                }
-              }
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  config: 'frontend/postcss.config.js'
-                }
-              }
-            }
-          ]
-        },
-
-        // Global styles
-        {
-          test: /\.css$/,
-          include: /(node_modules|globals.css)/,
-          use: [
-            'style-loader',
-            {
-              loader: 'css-loader'
-            }
-          ]
-        },
-
-        // Fonts
-        {
-          test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          use: [
-            {
-              loader: 'url-loader',
-              options: {
-                limit: 10240,
-                mimetype: 'application/font-woff',
-                emitFile: false,
-                name: 'Content/Fonts/[name].[ext]'
-              }
-            }
-          ]
-        },
-
-        {
-          test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          use: [
-            {
-              loader: 'file-loader',
-              options: {
-                emitFile: false,
-                name: 'Content/Fonts/[name].[ext]'
-              }
-            }
-          ]
-        }
-      ]
-    }
-  };
-
-  if (isProfiling) {
-    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
-          }
-        })
-      ]
-    };
-  }
-
-  return config;
-};

frontend/gulp/build.js

@@ -0,0 +1,18 @@
+const gulp = require('gulp');
+
+require('./clean');
+require('./copy');
+require('./webpack');
+
+gulp.task('build',
+  gulp.series('clean',
+    gulp.parallel(
+      'webpack',
+      'copyHtml',
+      'copyFonts',
+      'copyImages',
+      'copyRobots'
+    )
+  )
+);
+

frontend/gulp/clean.js

@@ -0,0 +1,8 @@
+const gulp = require('gulp');
+const del = require('del');
+
+const paths = require('./helpers/paths');
+
+gulp.task('clean', () => {
+  return del([paths.dest.root]);
+});

frontend/gulp/copy.js

@@ -0,0 +1,42 @@
+const path = require('path');
+const gulp = require('gulp');
+const print = require('gulp-print').default;
+const cache = require('gulp-cached');
+const livereload = require('gulp-livereload');
+const paths = require('./helpers/paths.js');
+
+gulp.task('copyHtml', () => {
+  return gulp.src(paths.src.html, { base: paths.src.root })
+    .pipe(cache('copyHtml'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyFonts', () => {
+  return gulp.src(
+    path.join(paths.src.fonts, '**', '*.*'), { base: paths.src.root }
+  )
+    .pipe(cache('copyFonts'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyImages', () => {
+  return gulp.src(
+    path.join(paths.src.images, '**', '*.*'), { base: paths.src.root }
+  )
+    .pipe(cache('copyImages'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});
+
+gulp.task('copyRobots', () => {
+  return gulp.src(paths.src.robots, { base: paths.src.root })
+    .pipe(cache('copyRobots'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
+});

frontend/gulp/gulpFile.js

@@ -0,0 +1,5 @@
+require('./build.js');
+require('./clean.js');
+require('./copy.js');
+require('./watch.js');
+require('./webpack.js');

frontend/gulp/helpers/errorHandler.js

@@ -0,0 +1,6 @@
+const colors = require('ansi-colors');
+
+module.exports = function errorHandler(error) {
+  console.log(colors.red(`Error (${error.plugin}): ${error.message}`));
+  this.emit('end');
+};

frontend/gulp/helpers/paths.js

@@ -0,0 +1,24 @@
+const root = './frontend/src';
+
+const paths = {
+  src: {
+    root,
+    html: `${root}/*.html`,
+    scripts: `${root}/**/*.js`,
+    content: `${root}/Content/`,
+    fonts: `${root}/Content/Fonts/`,
+    images: `${root}/Content/Images/`,
+    robots: `${root}/Content/robots.txt`,
+    exclude: {
+      libs: `!${root}/JsLibraries/**`
+    }
+  },
+  dest: {
+    root: './_output/UI/',
+    content: './_output/UI/Content/',
+    fonts: './_output/UI/Content/Fonts/',
+    images: './_output/UI/Content/Images/'
+  }
+};
+
+module.exports = paths;

frontend/gulp/watch.js

@@ -0,0 +1,19 @@
+const gulp = require('gulp');
+const livereload = require('gulp-livereload');
+const gulpWatch = require('gulp-watch');
+const paths = require('./helpers/paths.js');
+
+require('./copy.js');
+require('./webpack.js');
+
+function watch() {
+  livereload.listen({ start: true });
+
+  gulp.task('webpackWatch')();
+  gulpWatch(paths.src.html, gulp.series('copyHtml'));
+  gulpWatch(`${paths.src.fonts}**/*.*`, gulp.series('copyFonts'));
+  gulpWatch(`${paths.src.images}**/*.*`, gulp.series('copyImages'));
+  gulpWatch(paths.src.robots, gulp.series('copyRobots'));
+}
+
+gulp.task('watch', gulp.series('build', watch));

frontend/gulp/webpack.js

@@ -0,0 +1,271 @@
+const gulp = require('gulp');
+const webpackStream = require('webpack-stream');
+const livereload = require('gulp-livereload');
+const path = require('path');
+const webpack = require('webpack');
+const errorHandler = require('./helpers/errorHandler');
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlWebpackPluginHtmlTags = require('html-webpack-plugin/lib/html-tags');
+const TerserPlugin = require('terser-webpack-plugin');
+
+const uiFolder = 'UI';
+const frontendFolder = path.join(__dirname, '..');
+const srcFolder = path.join(frontendFolder, 'src');
+const isProduction = process.argv.indexOf('--production') > -1;
+const isProfiling = isProduction && process.argv.indexOf('--profile') > -1;
+const inlineWebWorkers = 'no-fallback';
+
+const distFolder = path.resolve(frontendFolder, '..', '_output', uiFolder);
+
+console.log('Source Folder:', srcFolder);
+console.log('Output Folder:', distFolder);
+console.log('isProduction:', isProduction);
+console.log('isProfiling:', isProfiling);
+
+const cssVarsFiles = [
+  '../src/Styles/Variables/colors',
+  '../src/Styles/Variables/dimensions',
+  '../src/Styles/Variables/fonts',
+  '../src/Styles/Variables/animations',
+  '../src/Styles/Variables/zIndexes'
+].map(require.resolve);
+
+// Override the way HtmlWebpackPlugin injects the scripts
+// TODO: Find a better way to get these paths without
+HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets, assetTags) {
+  const head = assetTags.headTags.map((v) => {
+    const href = v.attributes.href
+      .replace('\\', '/')
+      .replace('%5C', '/');
+
+    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${href}` };
+    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+  });
+  const body = assetTags.bodyTags.map((v) => {
+    v.attributes = { src: `/${v.attributes.src}` };
+    return HtmlWebpackPluginHtmlTags.htmlTagObjectToString(v, this.options.xhtml);
+  });
+
+  return html
+    .replace('<!-- webpack bundles head -->', head.join('\r\n  '))
+    .replace('<!-- webpack bundles body -->', body.join('\r\n  '));
+};
+
+const plugins = [
+  new OptimizeCssAssetsPlugin({}),
+
+  new webpack.DefinePlugin({
+    __DEV__: !isProduction,
+    'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
+  }),
+
+  new MiniCssExtractPlugin({
+    filename: path.join('Content', 'styles.css')
+  }),
+
+  new HtmlWebpackPlugin({
+    template: 'frontend/src/index.html',
+    filename: 'index.html'
+  })
+];
+
+const config = {
+  mode: isProduction ? 'production' : 'development',
+  devtool: '#source-map',
+
+  stats: {
+    children: false
+  },
+
+  watchOptions: {
+    ignored: /node_modules/
+  },
+
+  entry: {
+    index: 'index.js'
+  },
+
+  resolve: {
+    modules: [
+      srcFolder,
+      path.join(srcFolder, 'Shims'),
+      'node_modules'
+    ],
+    alias: {
+      jquery: 'jquery/src/jquery'
+    }
+  },
+
+  output: {
+    path: distFolder,
+    filename: '[name].js',
+    sourceMapFilename: '[file].map'
+  },
+
+  optimization: {
+    chunkIds: 'named',
+    splitChunks: {
+      chunks: 'initial'
+    }
+  },
+
+  performance: {
+    hints: false
+  },
+
+  plugins,
+
+  resolveLoader: {
+    modules: [
+      'node_modules',
+      'frontend/gulp/webpack/'
+    ]
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.worker\.js$/,
+        use: {
+          loader: 'worker-loader',
+          options: {
+            filename: '[name].js',
+            inline: inlineWebWorkers
+          }
+        }
+      },
+      {
+        test: /\.js?$/,
+        exclude: /(node_modules|JsLibraries)/,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              configFile: `${frontendFolder}/babel.config.js`,
+              envName: isProduction ? 'production' : 'development',
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    modules: false,
+                    loose: true,
+                    debug: false,
+                    useBuiltIns: 'entry',
+                    corejs: 3
+                  }
+                ]
+              ]
+            }
+          }
+        ]
+      },
+
+      // CSS Modules
+      {
+        test: /\.css$/,
+        exclude: /(node_modules|globals.css)/,
+        use: [
+          { loader: MiniCssExtractPlugin.loader },
+          {
+            loader: 'css-loader',
+            options: {
+              importLoaders: 1,
+              modules: {
+                localIdentName: '[name]/[local]/[hash:base64:5]'
+              }
+            }
+          },
+          {
+            loader: 'postcss-loader',
+            options: {
+              ident: 'postcss',
+              config: {
+                ctx: {
+                  cssVarsFiles
+                },
+                path: 'frontend/postcss.config.js'
+              }
+            }
+          }
+        ]
+      },
+
+      // Global styles
+      {
+        test: /\.css$/,
+        include: /(node_modules|globals.css)/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader'
+          }
+        ]
+      },
+
+      // Fonts
+      {
+        test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10240,
+              mimetype: 'application/font-woff',
+              emitFile: false,
+              name: 'Content/Fonts/[name].[ext]'
+            }
+          }
+        ]
+      },
+
+      {
+        test: /\.(ttf|eot|eot?#iefix|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              emitFile: false,
+              name: 'Content/Fonts/[name].[ext]'
+            }
+          }
+        ]
+      }
+    ]
+  }
+};
+
+if (isProfiling) {
+  config.resolve.alias['react-dom$'] = 'react-dom/profiling';
+  config.resolve.alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
+
+  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
+      }
+    })
+  ];
+}
+
+gulp.task('webpack', () => {
+  return webpackStream(config)
+    .pipe(gulp.dest('_output/UI'));
+});
+
+gulp.task('webpackWatch', () => {
+  config.watch = true;
+
+  return webpackStream(config, webpack)
+    .on('error', errorHandler)
+    .pipe(gulp.dest('_output/UI'))
+    .on('error', errorHandler)
+    .pipe(livereload())
+    .on('error', errorHandler);
+});

frontend/gulp/webpack/css-variables-loader.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line filenames/match-exported
 const loaderUtils = require('loader-utils');
 
 module.exports = function cssVariablesLoader(source) {

frontend/postcss.config.js

@@ -1,32 +1,23 @@
 const reload = require('require-nocache')(module);
 
-const cssVarsFiles = [
+module.exports = (ctx, configPath, options) => {
-  './src/Styles/Variables/dimensions',
+  const config = {
-  './src/Styles/Variables/fonts',
+    plugins: {
-  './src/Styles/Variables/animations',
+      'postcss-mixins': {
-  './src/Styles/Variables/zIndexes'
+        mixinsDir: [
-].map(require.resolve);
+          'frontend/src/Styles/Mixins'
+        ]
+      },
+      'postcss-simple-vars': {
+        variables: () =>
+          ctx.options.cssVarsFiles.reduce((acc, vars) => {
+            return Object.assign(acc, reload(vars));
+          }, {})
+      },
+      'postcss-color-function': {},
+      'postcss-nested': {}
+    }
+  };
 
-const mixinsFiles = [
+  return config;
-  'frontend/src/Styles/Mixins/cover.css',
-  'frontend/src/Styles/Mixins/linkOverlay.css',
-  'frontend/src/Styles/Mixins/scroller.css',
-  'frontend/src/Styles/Mixins/truncate.css'
-];
-
-module.exports = {
-  plugins: [
-    'autoprefixer',
-    ['postcss-mixins', {
-      mixinsFiles
-    }],
-    ['postcss-simple-vars', {
-      variables: () =>
-        cssVarsFiles.reduce((acc, vars) => {
-          return Object.assign(acc, reload(vars));
-        }, {})
-    }],
-    'postcss-color-function',
-    'postcss-nested'
-  ]
 };

frontend/src/.vscode/settings.json

@@ -0,0 +1,4 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+  "files.insertFinalNewline": true
+}

frontend/src/Activity/Blacklist/Blacklist.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
@@ -15,14 +14,13 @@ import TablePager from 'Components/Table/TablePager';
 import { align, icons, kinds } from 'Helpers/Props';
 import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
-import BlocklistRowConnector from './BlocklistRowConnector';
+import BlacklistRowConnector from './BlacklistRowConnector';
 
-class Blocklist extends Component {
+class Blacklist extends Component {
 
   //
   // Lifecycle
@@ -36,7 +34,6 @@ class Blocklist extends Component {
       lastToggled: null,
       selectedState: {},
       isConfirmRemoveModalOpen: false,
-      isConfirmClearModalOpen: false,
       items: props.items
     };
   }
@@ -63,46 +60,33 @@ class Blocklist extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  };
+  }
 
   //
   // Listeners
 
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  };
+  }
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  };
+  }
 
   onRemoveSelectedPress = () => {
     this.setState({ isConfirmRemoveModalOpen: true });
-  };
+  }
 
   onRemoveSelectedConfirmed = () => {
     this.props.onRemoveSelected(this.getSelectedIds());
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   onConfirmRemoveModalClose = () => {
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
-
-  onClearBlocklistPress = () => {
-    this.setState({ isConfirmClearModalOpen: true });
-  };
-
-  onClearBlocklistConfirmed = () => {
-    this.props.onClearBlocklistPress();
-    this.setState({ isConfirmClearModalOpen: false });
-  };
-
-  onConfirmClearModalClose = () => {
-    this.setState({ isConfirmClearModalOpen: false });
-  };
 
   //
   // Render
@@ -118,7 +102,8 @@ class Blocklist extends Component {
       columns,
       totalRecords,
       isRemoving,
-      isClearingBlocklistExecuting,
+      isClearingBlacklistExecuting,
+      onClearBlacklistPress,
       ...otherProps
     } = this.props;
 
@@ -129,18 +114,17 @@ class Blocklist extends Component {
       allSelected,
       allUnselected,
       selectedState,
-      isConfirmRemoveModalOpen,
+      isConfirmRemoveModalOpen
-      isConfirmClearModalOpen
     } = this.state;
 
     const selectedIds = this.getSelectedIds();
 
     return (
-      <PageContent title={translate('Blocklist')}>
+      <PageContent title="Blacklist">
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('RemoveSelected')}
+              label="Remove Selected"
               iconName={icons.REMOVE}
               isDisabled={!selectedIds.length}
               isSpinning={isRemoving}
@@ -148,11 +132,10 @@ class Blocklist extends Component {
             />
 
             <PageToolbarButton
-              label={translate('Clear')}
+              label="Clear"
               iconName={icons.CLEAR}
-              isDisabled={!items.length}
+              isSpinning={isClearingBlacklistExecuting}
-              isSpinning={isClearingBlocklistExecuting}
+              onPress={onClearBlacklistPress}
-              onPress={this.onClearBlocklistPress}
             />
           </PageToolbarSection>
 
@@ -162,7 +145,7 @@ class Blocklist extends Component {
               columns={columns}
             >
               <PageToolbarButton
-                label={translate('Options')}
+                label="Options"
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
@@ -177,16 +160,14 @@ class Blocklist extends Component {
 
           {
             !isAnyFetching && !!error &&
-              <Alert kind={kinds.DANGER}>
+              <div>Unable to load blacklist</div>
-                {translate('UnableToLoadBlocklist')}
-              </Alert>
           }
 
           {
             isAllPopulated && !error && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
-                {translate('NoHistoryBlocklist')}
+                No history blacklist
-              </Alert>
+              </div>
           }
 
           {
@@ -204,7 +185,7 @@ class Blocklist extends Component {
                     {
                       items.map((item) => {
                         return (
-                          <BlocklistRowConnector
+                          <BlacklistRowConnector
                             key={item.id}
                             isSelected={selectedState[item.id] || false}
                             columns={columns}
@@ -229,28 +210,18 @@ class Blocklist extends Component {
         <ConfirmModal
           isOpen={isConfirmRemoveModalOpen}
           kind={kinds.DANGER}
-          title={translate('RemoveSelected')}
+          title="Remove Selected"
-          message={translate('RemoveSelectedItemBlocklistMessageText')}
+          message={'Are you sure you want to remove the selected items from the blacklist?'}
-          confirmLabel={translate('RemoveSelected')}
+          confirmLabel="Remove Selected"
           onConfirm={this.onRemoveSelectedConfirmed}
           onCancel={this.onConfirmRemoveModalClose}
         />
-
-        <ConfirmModal
-          isOpen={isConfirmClearModalOpen}
-          kind={kinds.DANGER}
-          title={translate('ClearBlocklist')}
-          message={translate('ClearBlocklistMessageText')}
-          confirmLabel={translate('Clear')}
-          onConfirm={this.onClearBlocklistConfirmed}
-          onCancel={this.onConfirmClearModalClose}
-        />
       </PageContent>
     );
   }
 }
 
-Blocklist.propTypes = {
+Blacklist.propTypes = {
   isArtistFetching: PropTypes.bool.isRequired,
   isArtistPopulated: PropTypes.bool.isRequired,
   isFetching: PropTypes.bool.isRequired,
@@ -260,9 +231,9 @@ Blocklist.propTypes = {
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   isRemoving: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
   onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired
+  onClearBlacklistPress: PropTypes.func.isRequired
 };
 
-export default Blocklist;
+export default Blacklist;

frontend/src/Activity/Blacklist/BlacklistConnector.js

@@ -4,34 +4,34 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as commandNames from 'Commands/commandNames';
 import withCurrentPage from 'Components/withCurrentPage';
-import * as blocklistActions from 'Store/Actions/blocklistActions';
+import * as blacklistActions from 'Store/Actions/blacklistActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
-import Blocklist from './Blocklist';
+import Blacklist from './Blacklist';
 
 function createMapStateToProps() {
   return createSelector(
-    (state) => state.blocklist,
+    (state) => state.blacklist,
     (state) => state.artist,
-    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
+    createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST),
-    (blocklist, artist, isClearingBlocklistExecuting) => {
+    (blacklist, artist, isClearingBlacklistExecuting) => {
       return {
         isArtistFetching: artist.isFetching,
         isArtistPopulated: artist.isPopulated,
-        isClearingBlocklistExecuting,
+        isClearingBlacklistExecuting,
-        ...blocklist
+        ...blacklist
       };
     }
   );
 }
 
 const mapDispatchToProps = {
-  ...blocklistActions,
+  ...blacklistActions,
   executeCommand
 };
 
-class BlocklistConnector extends Component {
+class BlacklistConnector extends Component {
 
   //
   // Lifecycle
@@ -39,27 +39,27 @@ class BlocklistConnector extends Component {
   componentDidMount() {
     const {
       useCurrentPage,
-      fetchBlocklist,
+      fetchBlacklist,
-      gotoBlocklistFirstPage
+      gotoBlacklistFirstPage
     } = this.props;
 
     registerPagePopulator(this.repopulate);
 
     if (useCurrentPage) {
-      fetchBlocklist();
+      fetchBlacklist();
     } else {
-      gotoBlocklistFirstPage();
+      gotoBlacklistFirstPage();
     }
   }
 
   componentDidUpdate(prevProps) {
-    if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
+    if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) {
-      this.props.gotoBlocklistFirstPage();
+      this.props.gotoBlacklistFirstPage();
     }
   }
 
   componentWillUnmount() {
-    this.props.clearBlocklist();
+    this.props.clearBlacklist();
     unregisterPagePopulator(this.repopulate);
   }
 
@@ -67,57 +67,57 @@ class BlocklistConnector extends Component {
   // Control
 
   repopulate = () => {
-    this.props.fetchBlocklist();
+    this.props.fetchBlacklist();
-  };
+  }
   //
   // Listeners
 
   onFirstPagePress = () => {
-    this.props.gotoBlocklistFirstPage();
+    this.props.gotoBlacklistFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
-    this.props.gotoBlocklistPreviousPage();
+    this.props.gotoBlacklistPreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
-    this.props.gotoBlocklistNextPage();
+    this.props.gotoBlacklistNextPage();
-  };
+  }
 
   onLastPagePress = () => {
-    this.props.gotoBlocklistLastPage();
+    this.props.gotoBlacklistLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
-    this.props.gotoBlocklistPage({ page });
+    this.props.gotoBlacklistPage({ page });
-  };
+  }
 
   onRemoveSelected = (ids) => {
-    this.props.removeBlocklistItems({ ids });
+    this.props.removeBlacklistItems({ ids });
-  };
+  }
 
   onSortPress = (sortKey) => {
-    this.props.setBlocklistSort({ sortKey });
+    this.props.setBlacklistSort({ sortKey });
-  };
+  }
 
   onTableOptionChange = (payload) => {
-    this.props.setBlocklistTableOption(payload);
+    this.props.setBlacklistTableOption(payload);
 
     if (payload.pageSize) {
-      this.props.gotoBlocklistFirstPage();
+      this.props.gotoBlacklistFirstPage();
     }
-  };
+  }
 
-  onClearBlocklistPress = () => {
+  onClearBlacklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
+    this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
-  };
+  }
 
   //
   // Render
 
   render() {
     return (
-      <Blocklist
+      <Blacklist
         onFirstPagePress={this.onFirstPagePress}
         onPreviousPagePress={this.onPreviousPagePress}
         onNextPagePress={this.onNextPagePress}
@@ -126,30 +126,30 @@ class BlocklistConnector extends Component {
         onRemoveSelected={this.onRemoveSelected}
         onSortPress={this.onSortPress}
         onTableOptionChange={this.onTableOptionChange}
-        onClearBlocklistPress={this.onClearBlocklistPress}
+        onClearBlacklistPress={this.onClearBlacklistPress}
         {...this.props}
       />
     );
   }
 }
 
-BlocklistConnector.propTypes = {
+BlacklistConnector.propTypes = {
   useCurrentPage: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchBlocklist: PropTypes.func.isRequired,
+  fetchBlacklist: PropTypes.func.isRequired,
-  gotoBlocklistFirstPage: PropTypes.func.isRequired,
+  gotoBlacklistFirstPage: PropTypes.func.isRequired,
-  gotoBlocklistPreviousPage: PropTypes.func.isRequired,
+  gotoBlacklistPreviousPage: PropTypes.func.isRequired,
-  gotoBlocklistNextPage: PropTypes.func.isRequired,
+  gotoBlacklistNextPage: PropTypes.func.isRequired,
-  gotoBlocklistLastPage: PropTypes.func.isRequired,
+  gotoBlacklistLastPage: PropTypes.func.isRequired,
-  gotoBlocklistPage: PropTypes.func.isRequired,
+  gotoBlacklistPage: PropTypes.func.isRequired,
-  removeBlocklistItems: PropTypes.func.isRequired,
+  removeBlacklistItems: PropTypes.func.isRequired,
-  setBlocklistSort: PropTypes.func.isRequired,
+  setBlacklistSort: PropTypes.func.isRequired,
-  setBlocklistTableOption: PropTypes.func.isRequired,
+  setBlacklistTableOption: PropTypes.func.isRequired,
-  clearBlocklist: PropTypes.func.isRequired,
+  clearBlacklist: PropTypes.func.isRequired,
   executeCommand: PropTypes.func.isRequired
 };
 
 export default withCurrentPage(
-  connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
+  connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector)
 );

frontend/src/Activity/Blacklist/BlacklistDetailsModal.js

@@ -8,9 +8,8 @@ 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 translate from 'Utilities/String/translate';
 
-class BlocklistDetailsModal extends Component {
+class BlacklistDetailsModal extends Component {
 
   //
   // Render
@@ -40,19 +39,19 @@ class BlocklistDetailsModal extends Component {
           <ModalBody>
             <DescriptionList>
               <DescriptionListItem
-                title={translate('Name')}
+                title="Name"
                 data={sourceTitle}
               />
 
               <DescriptionListItem
-                title={translate('Protocol')}
+                title="Protocol"
                 data={protocol}
               />
 
               {
                 !!message &&
                   <DescriptionListItem
-                    title={translate('Indexer')}
+                    title="Indexer"
                     data={indexer}
                   />
               }
@@ -60,7 +59,7 @@ class BlocklistDetailsModal extends Component {
               {
                 !!message &&
                   <DescriptionListItem
-                    title={translate('Message')}
+                    title="Message"
                     data={message}
                   />
               }
@@ -78,7 +77,7 @@ class BlocklistDetailsModal extends Component {
   }
 }
 
-BlocklistDetailsModal.propTypes = {
+BlacklistDetailsModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
@@ -87,4 +86,4 @@ BlocklistDetailsModal.propTypes = {
   onModalClose: PropTypes.func.isRequired
 };
 
-export default BlocklistDetailsModal;
+export default BlacklistDetailsModal;

frontend/src/Activity/Blacklist/BlacklistRow.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import AlbumFormats from 'Album/AlbumFormats';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
 import IconButton from 'Components/Link/IconButton';
@@ -9,11 +8,10 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import { icons, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
+import BlacklistDetailsModal from './BlacklistDetailsModal';
-import BlocklistDetailsModal from './BlocklistDetailsModal';
+import styles from './BlacklistRow.css';
-import styles from './BlocklistRow.css';
 
-class BlocklistRow extends Component {
+class BlacklistRow extends Component {
 
   //
   // Lifecycle
@@ -31,11 +29,11 @@ class BlocklistRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  };
+  }
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -46,7 +44,6 @@ class BlocklistRow extends Component {
       artist,
       sourceTitle,
       quality,
-      customFormats,
       date,
       protocol,
       indexer,
@@ -112,16 +109,6 @@ class BlocklistRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <AlbumFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -154,7 +141,7 @@ class BlocklistRow extends Component {
                   />
 
                   <IconButton
-                    title={translate('RemoveFromBlocklist')}
+                    title="Remove from blacklist"
                     name={icons.REMOVE}
                     kind={kinds.DANGER}
                     onPress={onRemovePress}
@@ -167,7 +154,7 @@ class BlocklistRow extends Component {
           })
         }
 
-        <BlocklistDetailsModal
+        <BlacklistDetailsModal
           isOpen={this.state.isDetailsModalOpen}
           sourceTitle={sourceTitle}
           protocol={protocol}
@@ -181,12 +168,11 @@ class BlocklistRow extends Component {
 
 }
 
-BlocklistRow.propTypes = {
+BlacklistRow.propTypes = {
   id: PropTypes.number.isRequired,
   artist: PropTypes.object.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
   date: PropTypes.string.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
@@ -197,4 +183,4 @@ BlocklistRow.propTypes = {
   onRemovePress: PropTypes.func.isRequired
 };
 
-export default BlocklistRow;
+export default BlacklistRow;

frontend/src/Activity/Blacklist/BlacklistRowConnector.js

@@ -1,8 +1,8 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { removeBlocklistItem } from 'Store/Actions/blocklistActions';
+import { removeBlacklistItem } from 'Store/Actions/blacklistActions';
 import createArtistSelector from 'Store/Selectors/createArtistSelector';
-import BlocklistRow from './BlocklistRow';
+import BlacklistRow from './BlacklistRow';
 
 function createMapStateToProps() {
   return createSelector(
@@ -18,9 +18,9 @@ function createMapStateToProps() {
 function createMapDispatchToProps(dispatch, props) {
   return {
     onRemovePress() {
-      dispatch(removeBlocklistItem({ id: props.id }));
+      dispatch(removeBlacklistItem({ id: props.id }));
     }
   };
 }
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);
+export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow);

frontend/src/Activity/Blocklist/BlocklistRow.css.d.ts

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

frontend/src/Activity/History/Details/HistoryDetails.css.d.ts

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

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

@@ -9,8 +9,6 @@ import Link from 'Components/Link/Link';
 import { icons } from 'Helpers/Props';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
-import translate from 'Utilities/String/translate';
 import styles from './HistoryDetails.css';
 
 function getDetailedList(statusMessages) {
@@ -49,9 +47,7 @@ function formatMissing(value) {
 
 function formatChange(oldValue, newValue) {
   return (
-    <div>
+    <div> {formatMissing(oldValue)} <Icon name={icons.ARROW_RIGHT_NO_CIRCLE} size={12} /> {formatMissing(newValue)} </div>
-      {formatMissing(oldValue)} <Icon name={icons.ARROW_RIGHT_NO_CIRCLE} size={12} /> {formatMissing(newValue)}
-    </div>
   );
 }
 
@@ -60,7 +56,6 @@ function HistoryDetails(props) {
     eventType,
     sourceTitle,
     data,
-    downloadId,
     shortDateFormat,
     timeFormat
   } = props;
@@ -69,102 +64,83 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      customFormatScore,
       nzbInfoUrl,
       downloadClient,
-      downloadClientName,
+      downloadId,
       age,
       ageHours,
       ageMinutes,
       publishedDate
     } = data;
 
-    const downloadClientNameInfo = downloadClientName ?? downloadClient;
-
     return (
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          indexer ?
+          !!indexer &&
             <DescriptionListItem
-              title={translate('Indexer')}
+              title="Indexer"
               data={indexer}
-            /> :
+            />
-            null
         }
 
         {
-          releaseGroup ?
+          !!releaseGroup &&
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title={translate('ReleaseGroup')}
+              title="Release Group"
               data={releaseGroup}
-            /> :
+            />
-            null
         }
 
         {
-          customFormatScore && customFormatScore !== '0' ?
+          !!nzbInfoUrl &&
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
-
-        {
-          nzbInfoUrl ?
             <span>
               <DescriptionListItemTitle>
-                {translate('InfoUrl')}
+                Info URL
               </DescriptionListItemTitle>
 
               <DescriptionListItemDescription>
                 <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
               </DescriptionListItemDescription>
-            </span> :
+            </span>
-            null
         }
 
         {
-          downloadClientNameInfo ?
+          !!downloadClient &&
             <DescriptionListItem
-              title={translate('DownloadClient')}
+              title="Download Client"
-              data={downloadClientNameInfo}
+              data={downloadClient}
-            /> :
+            />
-            null
         }
 
         {
-          downloadId ?
+          !!downloadId &&
             <DescriptionListItem
-              title={translate('GrabId')}
+              title="Grab ID"
               data={downloadId}
-            /> :
+            />
-            null
         }
 
         {
-          age || ageHours || ageMinutes ?
+          !!indexer &&
             <DescriptionListItem
-              title={translate('AgeWhenGrabbed')}
+              title="Age (when grabbed)"
               data={formatAge(age, ageHours, ageMinutes)}
-            /> :
+            />
-            null
         }
 
         {
-          publishedDate ?
+          !!publishedDate &&
             <DescriptionListItem
-              title={translate('PublishedDate')}
+              title="Published Date"
               data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
-            /> :
+            />
-            null
         }
       </DescriptionList>
     );
@@ -172,42 +148,23 @@ function HistoryDetails(props) {
 
   if (eventType === 'downloadFailed') {
     const {
-      message,
+      message
-      indexer
     } = data;
 
     return (
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          downloadId ?
+          !!message &&
             <DescriptionListItem
-              title={translate('GrabId')}
+              title="Message"
-              data={downloadId}
-            /> :
-            null
-        }
-
-        {
-          indexer ? (
-            <DescriptionListItem
-              title={translate('Indexer')}
-              data={indexer}
-            />
-          ) : null}
-
-        {
-          message ?
-            <DescriptionListItem
-              title={translate('Message')}
               data={message}
-            /> :
+            />
-            null
         }
       </DescriptionList>
     );
@@ -215,7 +172,6 @@ function HistoryDetails(props) {
 
   if (eventType === 'trackFileImported') {
     const {
-      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -224,37 +180,26 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          droppedPath ?
+          !!droppedPath &&
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title={translate('Source')}
+              title="Source"
               data={droppedPath}
-            /> :
+            />
-            null
         }
 
         {
-          importedPath ?
+          !!importedPath &&
             <DescriptionListItem
               descriptionClassName={styles.description}
-              title={translate('ImportedTo')}
+              title="Imported To"
               data={importedPath}
-            /> :
+            />
-            null
-        }
-
-        {
-          customFormatScore && customFormatScore !== '0' ?
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
         }
       </DescriptionList>
     );
@@ -262,8 +207,7 @@ function HistoryDetails(props) {
 
   if (eventType === 'trackFileDeleted') {
     const {
-      reason,
+      reason
-      customFormatScore
     } = data;
 
     let reasonMessage = '';
@@ -273,7 +217,7 @@ function HistoryDetails(props) {
         reasonMessage = 'File was deleted by via UI';
         break;
       case 'MissingFromDisk':
-        reasonMessage = 'Lidarr was unable to find the file on disk so the file was unlinked from the album/track in the database';
+        reasonMessage = 'Lidarr was unable to find the file on disk so it was removed';
         break;
       case 'Upgrade':
         reasonMessage = 'File was deleted to import an upgrade';
@@ -285,23 +229,14 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         <DescriptionListItem
-          title={translate('Reason')}
+          title="Reason"
           data={reasonMessage}
         />
-
-        {
-          customFormatScore && customFormatScore !== '0' ?
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
       </DescriptionList>
     );
   }
@@ -315,12 +250,12 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('SourcePath')}
+          title="Source Path"
           data={sourcePath}
         />
 
         <DescriptionListItem
-          title={translate('DestinationPath')}
+          title="Destination Path"
           data={path}
         />
       </DescriptionList>
@@ -336,7 +271,7 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('Path')}
+          title="Path"
           data={sourceTitle}
         />
         {
@@ -351,7 +286,7 @@ function HistoryDetails(props) {
           })
         }
         <DescriptionListItem
-          title={translate('ExistingTagsScrubbed')}
+          title="Existing tags scrubbed"
           data={tagsScrubbed === 'True' ? <Icon name={icons.CHECK} /> : <Icon name={icons.REMOVE} />}
         />
       </DescriptionList>
@@ -366,14 +301,14 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
           !!statusMessages &&
             <DescriptionListItem
-              title={translate('ImportFailures')}
+              title="Import failures"
               data={getDetailedList(JSON.parse(statusMessages))}
             />
         }
@@ -385,9 +320,9 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      customFormatScore,
       nzbInfoUrl,
       downloadClient,
+      downloadId,
       age,
       ageHours,
       ageMinutes,
@@ -397,85 +332,69 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          indexer ?
+          !!indexer &&
             <DescriptionListItem
-              title={translate('Indexer')}
+              title="Indexer"
               data={indexer}
-            /> :
+            />
-            null
         }
 
         {
-          releaseGroup ?
+          !!releaseGroup &&
             <DescriptionListItem
-              title={translate('ReleaseGroup')}
+              title="Release Group"
               data={releaseGroup}
-            /> :
+            />
-            null
         }
 
         {
-          customFormatScore && customFormatScore !== '0' ?
+          !!nzbInfoUrl &&
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
-
-        {
-          nzbInfoUrl ?
             <span>
               <DescriptionListItemTitle>
-                {translate('InfoUrl')}
+                Info URL
               </DescriptionListItemTitle>
 
               <DescriptionListItemDescription>
                 <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
               </DescriptionListItemDescription>
-            </span> :
+            </span>
-            null
         }
 
         {
-          downloadClient ?
+          !!downloadClient &&
             <DescriptionListItem
-              title={translate('DownloadClient')}
+              title="Download Client"
               data={downloadClient}
-            /> :
+            />
-            null
         }
 
         {
-          downloadId ?
+          !!downloadId &&
             <DescriptionListItem
-              title={translate('GrabId')}
+              title="Grab ID"
               data={downloadId}
-            /> :
+            />
-            null
         }
 
         {
-          age || ageHours || ageMinutes ?
+          !!indexer &&
             <DescriptionListItem
-              title={translate('AgeWhenGrabbed')}
+              title="Age (when grabbed)"
               data={formatAge(age, ageHours, ageMinutes)}
-            /> :
+            />
-            null
         }
 
         {
-          publishedDate ?
+          !!publishedDate &&
             <DescriptionListItem
-              title={translate('PublishedDate')}
+              title="Published Date"
               data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
-            /> :
+            />
-            null
         }
       </DescriptionList>
     );
@@ -490,26 +409,16 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          downloadId ?
+          !!message &&
             <DescriptionListItem
-              title={translate('GrabId')}
+              title="Message"
-              data={downloadId}
-            /> :
-            null
-        }
-
-        {
-          message ?
-            <DescriptionListItem
-              title={translate('Message')}
               data={message}
-            /> :
+            />
-            null
         }
       </DescriptionList>
     );
@@ -519,7 +428,7 @@ function HistoryDetails(props) {
     <DescriptionList>
       <DescriptionListItem
         descriptionClassName={styles.description}
-        title={translate('Name')}
+        title="Name"
         data={sourceTitle}
       />
     </DescriptionList>
@@ -530,7 +439,6 @@ HistoryDetails.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
-  downloadId: PropTypes.string,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired
 };

frontend/src/Activity/History/Details/HistoryDetailsModal.css.d.ts

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

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

@@ -42,7 +42,6 @@ function HistoryDetailsModal(props) {
     eventType,
     sourceTitle,
     data,
-    downloadId,
     isMarkingAsFailed,
     shortDateFormat,
     timeFormat,
@@ -65,7 +64,6 @@ function HistoryDetailsModal(props) {
             eventType={eventType}
             sourceTitle={sourceTitle}
             data={data}
-            downloadId={downloadId}
             shortDateFormat={shortDateFormat}
             timeFormat={timeFormat}
           />
@@ -100,7 +98,6 @@ HistoryDetailsModal.propTypes = {
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
-  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,

frontend/src/Activity/History/History.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
@@ -12,10 +11,8 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
+import { align, icons } from 'Helpers/Props';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import translate from 'Utilities/String/translate';
-import HistoryFilterModal from './HistoryFilterModal';
 import HistoryRowConnector from './HistoryRowConnector';
 
 class History extends Component {
@@ -53,7 +50,6 @@ class History extends Component {
       columns,
       selectedFilterKey,
       filters,
-      customFilters,
       totalRecords,
       isArtistFetching,
       isArtistPopulated,
@@ -70,11 +66,11 @@ class History extends Component {
     const hasError = error || albumsError;
 
     return (
-      <PageContent title={translate('History')}>
+      <PageContent title="History">
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('Refresh')}
+              label="Refresh"
               iconName={icons.REFRESH}
               isSpinning={isFetching}
               onPress={onFirstPagePress}
@@ -87,7 +83,7 @@ class History extends Component {
               columns={columns}
             >
               <PageToolbarButton
-                label={translate('Options')}
+                label="Options"
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
@@ -96,8 +92,7 @@ class History extends Component {
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={customFilters}
+              customFilters={[]}
-              filterModalConnectorComponent={HistoryFilterModal}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -111,9 +106,7 @@ class History extends Component {
 
           {
             !isFetchingAny && hasError &&
-              <Alert kind={kinds.DANGER}>
+              <div>Unable to load history</div>
-                {translate('UnableToLoadHistory')}
-              </Alert>
           }
 
           {
@@ -121,9 +114,9 @@ class History extends Component {
             // wait for the albums to populate because they are never coming.
 
             isPopulated && !hasError && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
-                {translate('NoHistory')}
+                No history found
-              </Alert>
+              </div>
           }
 
           {
@@ -168,9 +161,8 @@ History.propTypes = {
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  selectedFilterKey: PropTypes.string.isRequired,
   filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   isArtistFetching: PropTypes.bool.isRequired,
   isArtistPopulated: PropTypes.bool.isRequired,

frontend/src/Activity/History/HistoryConnector.js

@@ -6,7 +6,6 @@ import withCurrentPage from 'Components/withCurrentPage';
 import { clearAlbums, fetchAlbums } from 'Store/Actions/albumActions';
 import * as historyActions from 'Store/Actions/historyActions';
 import { clearTracks, fetchTracks } from 'Store/Actions/trackActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
@@ -18,8 +17,7 @@ function createMapStateToProps() {
     (state) => state.artist,
     (state) => state.albums,
     (state) => state.tracks,
-    createCustomFiltersSelector('history'),
+    (history, artist, albums, tracks) => {
-    (history, artist, albums, tracks, customFilters) => {
       return {
         isArtistFetching: artist.isFetching,
         isArtistPopulated: artist.isPopulated,
@@ -29,7 +27,6 @@ function createMapStateToProps() {
         isTracksFetching: tracks.isFetching,
         isTracksPopulated: tracks.isPopulated,
         tracksError: tracks.error,
-        customFilters,
         ...history
       };
     }
@@ -94,38 +91,38 @@ class HistoryConnector extends Component {
 
   repopulate = () => {
     this.props.fetchHistory();
-  };
+  }
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoHistoryFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
     this.props.gotoHistoryPreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
     this.props.gotoHistoryNextPage();
-  };
+  }
 
   onLastPagePress = () => {
     this.props.gotoHistoryLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
     this.props.gotoHistoryPage({ page });
-  };
+  }
 
   onSortPress = (sortKey) => {
     this.props.setHistorySort({ sortKey });
-  };
+  }
 
   onFilterSelect = (selectedFilterKey) => {
     this.props.setHistoryFilter({ selectedFilterKey });
-  };
+  }
 
   onTableOptionChange = (payload) => {
     this.props.setHistoryTableOption(payload);
@@ -133,7 +130,7 @@ class HistoryConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoHistoryFirstPage();
     }
-  };
+  }
 
   //
   // Render

frontend/src/Activity/History/HistoryEventTypeCell.css.d.ts

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

frontend/src/Activity/History/HistoryEventTypeCell.js

@@ -3,10 +3,9 @@ import React from 'react';
 import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import { icons, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './HistoryEventTypeCell.css';
 
-function getIconName(eventType, data) {
+function getIconName(eventType) {
   switch (eventType) {
     case 'grabbed':
       return icons.DOWNLOADING;
@@ -17,7 +16,7 @@ function getIconName(eventType, data) {
     case 'downloadFailed':
       return icons.DOWNLOADING;
     case 'trackFileDeleted':
-      return data.reason === 'MissingFromDisk' ? icons.FILE_MISSING : icons.DELETE;
+      return icons.DELETE;
     case 'trackFileRenamed':
       return icons.ORGANIZE;
     case 'trackFileRetagged':
@@ -55,11 +54,11 @@ function getTooltip(eventType, data) {
     case 'downloadFailed':
       return 'Album download failed';
     case 'trackFileDeleted':
-      return data.reason === 'MissingFromDisk' ? translate('TrackFileMissingTooltip') : translate('TrackFileDeletedTooltip');
+      return 'Track file deleted';
     case 'trackFileRenamed':
-      return translate('TrackFileRenamedTooltip');
+      return 'Track file renamed';
     case 'trackFileRetagged':
-      return translate('TrackFileTagsUpdatedTooltip');
+      return 'Track file tags updated';
     case 'albumImportIncomplete':
       return 'Files downloaded but not all could be imported';
     case 'downloadImported':
@@ -72,7 +71,7 @@ function getTooltip(eventType, data) {
 }
 
 function HistoryEventTypeCell({ eventType, data }) {
-  const iconName = getIconName(eventType, data);
+  const iconName = getIconName(eventType);
   const iconKind = getIconKind(eventType);
   const tooltip = getTooltip(eventType, data);
 

frontend/src/Activity/History/HistoryFilterModal.tsx

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

frontend/src/Activity/History/HistoryRow.css

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

frontend/src/Activity/History/HistoryRow.css.d.ts

@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'customFormatScore': string;
-  'details': string;
-  'downloadClient': string;
-  'indexer': string;
-  'releaseGroup': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/History/HistoryRow.js

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import AlbumFormats from 'Album/AlbumFormats';
 import AlbumTitleLink from 'Album/AlbumTitleLink';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
@@ -8,9 +7,7 @@ import IconButton from 'Components/Link/IconButton';
 import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableRow from 'Components/Table/TableRow';
-import Tooltip from 'Components/Tooltip/Tooltip';
+import { icons } from 'Helpers/Props';
-import { icons, tooltipPositions } from 'Helpers/Props';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
 import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
 import styles from './HistoryRow.css';
@@ -43,11 +40,11 @@ class HistoryRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  };
+  }
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -58,14 +55,11 @@ class HistoryRow extends Component {
       album,
       track,
       quality,
-      customFormats,
-      customFormatScore,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
       date,
       data,
-      downloadId,
       isMarkingAsFailed,
       columns,
       shortDateFormat,
@@ -142,16 +136,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <AlbumFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -183,24 +167,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  <Tooltip
-                    anchor={formatCustomFormatScore(
-                      customFormatScore,
-                      customFormats.length
-                    )}
-                    tooltip={<AlbumFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell
@@ -212,16 +178,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'sourceTitle') {
-              return (
-                <TableRowCell
-                  key={name}
-                >
-                  {sourceTitle}
-                </TableRowCell>
-              );
-            }
-
             if (name === 'details') {
               return (
                 <TableRowCell
@@ -245,7 +201,6 @@ class HistoryRow extends Component {
           eventType={eventType}
           sourceTitle={sourceTitle}
           data={data}
-          downloadId={downloadId}
           isMarkingAsFailed={isMarkingAsFailed}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
@@ -264,14 +219,11 @@ HistoryRow.propTypes = {
   album: PropTypes.object,
   track: PropTypes.object,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   qualityCutoffNotMet: PropTypes.bool.isRequired,
   eventType: PropTypes.string.isRequired,
   sourceTitle: PropTypes.string.isRequired,
   date: PropTypes.string.isRequired,
   data: PropTypes.object.isRequired,
-  downloadId: PropTypes.string,
   isMarkingAsFailed: PropTypes.bool,
   markAsFailedError: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
@@ -283,8 +235,7 @@ HistoryRow.propTypes = {
 HistoryRow.defaultProps = {
   track: {
     title: ''
-  },
+  }
-  customFormats: []
 };
 
 export default HistoryRow;

frontend/src/Activity/History/HistoryRowConnector.js

@@ -52,7 +52,7 @@ class HistoryRowConnector extends Component {
 
   onMarkAsFailedPress = () => {
     this.props.markAsFailed({ id: this.props.id });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/ProtocolLabel.css

@@ -1,13 +1,13 @@
 .torrent {
   composes: label from '~Components/Label.css';
 
-  border-color: var(--torrentColor);
+  border-color: $torrentColor;
-  background-color: var(--torrentColor);
+  background-color: $torrentColor;
 }
 
 .usenet {
   composes: label from '~Components/Label.css';
 
-  border-color: var(--usenetColor);
+  border-color: $usenetColor;
-  background-color: var(--usenetColor);
+  background-color: $usenetColor;
 }

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

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

frontend/src/Activity/Queue/Queue.js

@@ -1,9 +1,7 @@
 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 FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
@@ -14,18 +12,16 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
 import TablePager from 'Components/Table/TablePager';
-import { align, icons, kinds } from 'Helpers/Props';
+import { align, icons } from 'Helpers/Props';
 import getRemovedItems from 'Utilities/Object/getRemovedItems';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import translate from 'Utilities/String/translate';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
-import QueueFilterModal from './QueueFilterModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
-import RemoveQueueItemModal from './RemoveQueueItemModal';
+import RemoveQueueItemsModal from './RemoveQueueItemsModal';
 
 class Queue extends Component {
 
@@ -35,8 +31,6 @@ class Queue extends Component {
   constructor(props, context) {
     super(props, context);
 
-    this._shouldBlockRefresh = false;
-
     this.state = {
       allSelected: false,
       allUnselected: false,
@@ -48,14 +42,6 @@ class Queue extends Component {
     };
   }
 
-  shouldComponentUpdate() {
-    if (this._shouldBlockRefresh) {
-      return false;
-    }
-
-    return true;
-  }
-
   componentDidUpdate(prevProps) {
     const {
       items,
@@ -78,23 +64,13 @@ class Queue extends Component {
       return;
     }
 
-    const nextState = {};
-
-    if (prevProps.items !== items) {
-      nextState.items = items;
-    }
-
     const selectedIds = this.getSelectedIds();
     const isPendingSelected = _.some(this.props.items, (item) => {
       return selectedIds.indexOf(item.id) > -1 && item.status === 'delay';
     });
 
     if (isPendingSelected !== this.state.isPendingSelected) {
-      nextState.isPendingSelected = isPendingSelected;
+      this.setState({ isPendingSelected });
-    }
-
-    if (!_.isEmpty(nextState)) {
-      this.setState(nextState);
     }
   }
 
@@ -103,45 +79,37 @@ class Queue extends Component {
 
   getSelectedIds = () => {
     return getSelectedIds(this.state.selectedState);
-  };
+  }
 
   //
   // Listeners
 
-  onQueueRowModalOpenOrClose = (isOpen) => {
-    this._shouldBlockRefresh = isOpen;
-  };
-
   onSelectAllChange = ({ value }) => {
     this.setState(selectAll(this.state.selectedState, value));
-  };
+  }
 
   onSelectedChange = ({ id, value, shiftKey = false }) => {
     this.setState((state) => {
       return toggleSelected(state, this.props.items, id, value, shiftKey);
     });
-  };
+  }
 
   onGrabSelectedPress = () => {
     this.props.onGrabSelectedPress(this.getSelectedIds());
-  };
+  }
 
   onRemoveSelectedPress = () => {
-    this.setState({ isConfirmRemoveModalOpen: true }, () => {
+    this.setState({ isConfirmRemoveModalOpen: true });
-      this._shouldBlockRefresh = true;
+  }
-    });
-  };
 
   onRemoveSelectedConfirmed = (payload) => {
-    this._shouldBlockRefresh = false;
     this.props.onRemoveSelectedPress({ ids: this.getSelectedIds(), ...payload });
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   onConfirmRemoveModalClose = () => {
-    this._shouldBlockRefresh = false;
     this.setState({ isConfirmRemoveModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -157,16 +125,11 @@ class Queue extends Component {
       isAlbumsPopulated,
       albumsError,
       columns,
-      selectedFilterKey,
-      filters,
-      customFilters,
-      count,
       totalRecords,
       isGrabbing,
       isRemoving,
       isRefreshMonitoredDownloadsExecuting,
       onRefreshPress,
-      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -187,11 +150,11 @@ class Queue extends Component {
     const disableSelectedActions = selectedCount === 0;
 
     return (
-      <PageContent title={translate('Queue')}>
+      <PageContent title="Queue">
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('Refresh')}
+              label="Refresh"
               iconName={icons.REFRESH}
               isSpinning={isRefreshing}
               onPress={onRefreshPress}
@@ -200,7 +163,7 @@ class Queue extends Component {
             <PageToolbarSeparator />
 
             <PageToolbarButton
-              label={translate('GrabSelected')}
+              label="Grab Selected"
               iconName={icons.DOWNLOAD}
               isDisabled={disableSelectedActions || !isPendingSelected}
               isSpinning={isGrabbing}
@@ -208,7 +171,7 @@ class Queue extends Component {
             />
 
             <PageToolbarButton
-              label={translate('RemoveSelected')}
+              label="Remove Selected"
               iconName={icons.REMOVE}
               isDisabled={disableSelectedActions}
               isSpinning={isRemoving}
@@ -225,51 +188,35 @@ class Queue extends Component {
               optionsComponent={QueueOptionsConnector}
             >
               <PageToolbarButton
-                label={translate('Options')}
+                label="Options"
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
-
-            <FilterMenu
-              alignMenu={align.RIGHT}
-              selectedFilterKey={selectedFilterKey}
-              filters={filters}
-              customFilters={customFilters}
-              filterModalConnectorComponent={QueueFilterModal}
-              onFilterSelect={onFilterSelect}
-            />
           </PageToolbarSection>
         </PageToolbar>
 
         <PageContentBody>
           {
-            isRefreshing && !isAllPopulated ?
+            isRefreshing && !isAllPopulated &&
-              <LoadingIndicator /> :
+              <LoadingIndicator />
-              null
           }
 
           {
-            !isRefreshing && hasError ?
+            !isRefreshing && hasError &&
-              <Alert kind={kinds.DANGER}>
+              <div>
-                {translate('FailedToLoadQueue')}
+                Failed to load Queue
-              </Alert> :
+              </div>
-              null
           }
 
           {
-            isAllPopulated && !hasError && !items.length ?
+            isPopulated && !hasError && !items.length &&
-              <Alert kind={kinds.INFO}>
+              <div>
-                {
+                Queue is empty
-                  selectedFilterKey !== 'all' && count > 0 ?
+              </div>
-                    translate('QueueFilterHasNoItems') :
-                    translate('QueueIsEmpty')
-                }
-              </Alert> :
-              null
           }
 
           {
-            isAllPopulated && !hasError && !!items.length ?
+            isAllPopulated && !hasError && !!items.length &&
               <div>
                 <Table
                   columns={columns}
@@ -291,7 +238,6 @@ class Queue extends Component {
                             columns={columns}
                             {...item}
                             onSelectedChange={this.onSelectedChange}
-                            onQueueRowModalOpenOrClose={this.onQueueRowModalOpenOrClose}
                           />
                         );
                       })
@@ -304,21 +250,13 @@ class Queue extends Component {
                   isFetching={isRefreshing}
                   {...otherProps}
                 />
-              </div> :
+              </div>
-              null
           }
         </PageContentBody>
 
-        <RemoveQueueItemModal
+        <RemoveQueueItemsModal
           isOpen={isConfirmRemoveModalOpen}
           selectedCount={selectedCount}
-          canChangeCategory={isConfirmRemoveModalOpen && (
-            selectedIds.every((id) => {
-              const item = items.find((i) => i.id === id);
-
-              return !!(item && item.downloadClientHasPostImportCategory);
-            })
-          )}
           canIgnore={isConfirmRemoveModalOpen && (
             selectedIds.every((id) => {
               const item = items.find((i) => i.id === id);
@@ -326,17 +264,6 @@ class Queue extends Component {
               return !!(item && item.artistId && item.albumId);
             })
           )}
-          pending={isConfirmRemoveModalOpen && (
-            selectedIds.every((id) => {
-              const item = items.find((i) => i.id === id);
-
-              if (!item) {
-                return false;
-              }
-
-              return item.status === 'delay' || item.status === 'downloadClientUnavailable';
-            })
-          )}
           onRemovePress={this.onRemoveSelectedConfirmed}
           onModalClose={this.onConfirmRemoveModalClose}
         />
@@ -356,22 +283,13 @@ Queue.propTypes = {
   isAlbumsPopulated: PropTypes.bool.isRequired,
   albumsError: PropTypes.object,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  count: PropTypes.number.isRequired,
   totalRecords: PropTypes.number,
   isGrabbing: PropTypes.bool.isRequired,
   isRemoving: PropTypes.bool.isRequired,
   isRefreshMonitoredDownloadsExecuting: PropTypes.bool.isRequired,
   onRefreshPress: PropTypes.func.isRequired,
   onGrabSelectedPress: PropTypes.func.isRequired,
-  onRemoveSelectedPress: PropTypes.func.isRequired,
+  onRemoveSelectedPress: PropTypes.func.isRequired
-  onFilterSelect: PropTypes.func.isRequired
-};
-
-Queue.defaultProps = {
-  count: 0
 };
 
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -7,7 +7,6 @@ import withCurrentPage from 'Components/withCurrentPage';
 import { clearAlbums, fetchAlbums } from 'Store/Actions/albumActions';
 import { executeCommand } from 'Store/Actions/commandActions';
 import * as queueActions from 'Store/Actions/queueActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
@@ -20,18 +19,14 @@ function createMapStateToProps() {
     (state) => state.albums,
     (state) => state.queue.options,
     (state) => state.queue.paged,
-    (state) => state.queue.status.item,
-    createCustomFiltersSelector('queue'),
     createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
-    (artist, albums, options, queue, status, customFilters, isRefreshMonitoredDownloadsExecuting) => {
+    (artist, albums, options, queue, isRefreshMonitoredDownloadsExecuting) => {
       return {
-        count: options.includeUnknownArtistItems ? status.totalCount : status.count,
         isArtistFetching: artist.isFetching,
         isArtistPopulated: artist.isPopulated,
         isAlbumsFetching: albums.isFetching,
         isAlbumsPopulated: albums.isPopulated,
         albumsError: albums.error,
-        customFilters,
         isRefreshMonitoredDownloadsExecuting,
         ...options,
         ...queue
@@ -56,7 +51,6 @@ class QueueConnector extends Component {
     const {
       useCurrentPage,
       fetchQueue,
-      fetchQueueStatus,
       gotoQueueFirstPage
     } = this.props;
 
@@ -67,8 +61,6 @@ class QueueConnector extends Component {
     } else {
       gotoQueueFirstPage();
     }
-
-    fetchQueueStatus();
   }
 
   componentDidUpdate(prevProps) {
@@ -101,38 +93,34 @@ class QueueConnector extends Component {
 
   repopulate = () => {
     this.props.fetchQueue();
-  };
+  }
 
   //
   // Listeners
 
   onFirstPagePress = () => {
     this.props.gotoQueueFirstPage();
-  };
+  }
 
   onPreviousPagePress = () => {
     this.props.gotoQueuePreviousPage();
-  };
+  }
 
   onNextPagePress = () => {
     this.props.gotoQueueNextPage();
-  };
+  }
 
   onLastPagePress = () => {
     this.props.gotoQueueLastPage();
-  };
+  }
 
   onPageSelect = (page) => {
     this.props.gotoQueuePage({ page });
-  };
+  }
 
   onSortPress = (sortKey) => {
     this.props.setQueueSort({ sortKey });
-  };
+  }
-
-  onFilterSelect = (selectedFilterKey) => {
-    this.props.setQueueFilter({ selectedFilterKey });
-  };
 
   onTableOptionChange = (payload) => {
     this.props.setQueueTableOption(payload);
@@ -140,21 +128,21 @@ class QueueConnector extends Component {
     if (payload.pageSize) {
       this.props.gotoQueueFirstPage();
     }
-  };
+  }
 
   onRefreshPress = () => {
     this.props.executeCommand({
       name: commandNames.REFRESH_MONITORED_DOWNLOADS
     });
-  };
+  }
 
   onGrabSelectedPress = (ids) => {
     this.props.grabQueueItems({ ids });
-  };
+  }
 
   onRemoveSelectedPress = (payload) => {
     this.props.removeQueueItems(payload);
-  };
+  }
 
   //
   // Render
@@ -168,7 +156,6 @@ class QueueConnector extends Component {
         onLastPagePress={this.onLastPagePress}
         onPageSelect={this.onPageSelect}
         onSortPress={this.onSortPress}
-        onFilterSelect={this.onFilterSelect}
         onTableOptionChange={this.onTableOptionChange}
         onRefreshPress={this.onRefreshPress}
         onGrabSelectedPress={this.onGrabSelectedPress}
@@ -184,14 +171,12 @@ QueueConnector.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   includeUnknownArtistItems: PropTypes.bool.isRequired,
   fetchQueue: PropTypes.func.isRequired,
-  fetchQueueStatus: PropTypes.func.isRequired,
   gotoQueueFirstPage: PropTypes.func.isRequired,
   gotoQueuePreviousPage: PropTypes.func.isRequired,
   gotoQueueNextPage: PropTypes.func.isRequired,
   gotoQueueLastPage: PropTypes.func.isRequired,
   gotoQueuePage: PropTypes.func.isRequired,
   setQueueSort: PropTypes.func.isRequired,
-  setQueueFilter: PropTypes.func.isRequired,
   setQueueTableOption: PropTypes.func.isRequired,
   clearQueue: PropTypes.func.isRequired,
   grabQueueItems: PropTypes.func.isRequired,

frontend/src/Activity/Queue/QueueDetails.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import { icons, kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 
 function QueueDetails(props) {
   const {
@@ -11,20 +10,20 @@ function QueueDetails(props) {
     size,
     sizeleft,
     estimatedCompletionTime,
-    status,
+    status: queueStatus,
-    trackedDownloadState,
-    trackedDownloadStatus,
     errorMessage,
     progressBar
   } = props;
 
+  const status = queueStatus.toLowerCase();
+
   const progress = (100 - sizeleft / size * 100);
 
   if (status === 'pending') {
     return (
       <Icon
         name={icons.PENDING}
-        title={translate('ReleaseWillBeProcessedInterp', [moment(estimatedCompletionTime).fromNow()])}
+        title={`Release will be processed ${moment(estimatedCompletionTime).fromNow()}`}
       />
     );
   }
@@ -35,40 +34,12 @@ function QueueDetails(props) {
         <Icon
           name={icons.DOWNLOAD}
           kind={kinds.DANGER}
-          title={translate('ImportFailedInterp', [errorMessage])}
+          title={`Import failed: ${errorMessage}`}
         />
       );
     }
 
-    if (trackedDownloadStatus === 'warning') {
+    // TODO: show an icon when download is complete, but not imported yet?
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.WARNING}
-          title={translate('DownloadedUnableToImportCheckLogsForDetails')}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={translate('DownloadedWaitingToImport')}
-        />
-      );
-    }
-
-    if (trackedDownloadState === 'importing') {
-      return (
-        <Icon
-          name={icons.DOWNLOAD}
-          kind={kinds.PURPLE}
-          title={translate('DownloadedImporting')}
-        />
-      );
-    }
   }
 
   if (errorMessage) {
@@ -76,7 +47,7 @@ function QueueDetails(props) {
       <Icon
         name={icons.DOWNLOADING}
         kind={kinds.DANGER}
-        title={translate('DownloadFailedInterp', [errorMessage])}
+        title={`Download failed: ${errorMessage}`}
       />
     );
   }
@@ -86,7 +57,7 @@ function QueueDetails(props) {
       <Icon
         name={icons.DOWNLOADING}
         kind={kinds.DANGER}
-        title={translate('DownloadFailedCheckDownloadClientForMoreDetails')}
+        title="Download failed: check download client for more details"
       />
     );
   }
@@ -96,7 +67,7 @@ function QueueDetails(props) {
       <Icon
         name={icons.DOWNLOADING}
         kind={kinds.WARNING}
-        title={translate('DownloadWarningCheckDownloadClientForMoreDetails')}
+        title="Download warning: check download client for more details"
       />
     );
   }
@@ -105,7 +76,7 @@ function QueueDetails(props) {
     return (
       <Icon
         name={icons.DOWNLOADING}
-        title={translate('AlbumIsDownloadingInterp', [progress.toFixed(1), title])}
+        title={`Album is downloading - ${progress.toFixed(1)}% ${title}`}
       />
     );
   }
@@ -119,8 +90,6 @@ QueueDetails.propTypes = {
   sizeleft: PropTypes.number.isRequired,
   estimatedCompletionTime: PropTypes.string,
   status: PropTypes.string.isRequired,
-  trackedDownloadState: PropTypes.string.isRequired,
-  trackedDownloadStatus: PropTypes.string.isRequired,
   errorMessage: PropTypes.string,
   progressBar: PropTypes.node.isRequired
 };

frontend/src/Activity/Queue/QueueFilterModal.tsx

@@ -1,54 +0,0 @@
-import React, { useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { createSelector } from 'reselect';
-import AppState from 'App/State/AppState';
-import FilterModal from 'Components/Filter/FilterModal';
-import { setQueueFilter } from 'Store/Actions/queueActions';
-
-function createQueueSelector() {
-  return createSelector(
-    (state: AppState) => state.queue.paged.items,
-    (queueItems) => {
-      return queueItems;
-    }
-  );
-}
-
-function createFilterBuilderPropsSelector() {
-  return createSelector(
-    (state: AppState) => state.queue.paged.filterBuilderProps,
-    (filterBuilderProps) => {
-      return filterBuilderProps;
-    }
-  );
-}
-
-interface QueueFilterModalProps {
-  isOpen: boolean;
-}
-
-export default function QueueFilterModal(props: QueueFilterModalProps) {
-  const sectionItems = useSelector(createQueueSelector());
-  const filterBuilderProps = useSelector(createFilterBuilderPropsSelector());
-  const customFilterType = 'queue';
-
-  const dispatch = useDispatch();
-
-  const dispatchSetFilter = useCallback(
-    (payload: unknown) => {
-      dispatch(setQueueFilter(payload));
-    },
-    [dispatch]
-  );
-
-  return (
-    <FilterModal
-      // TODO: Don't spread all the props
-      {...props}
-      sectionItems={sectionItems}
-      filterBuilderProps={filterBuilderProps}
-      customFilterType={customFilterType}
-      dispatchSetFilter={dispatchSetFilter}
-    />
-  );
-}

frontend/src/Activity/Queue/QueueOptions.js

@@ -4,7 +4,6 @@ import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 
 class QueueOptions extends Component {
 
@@ -42,7 +41,7 @@ class QueueOptions extends Component {
         [name]: value
       });
     });
-  };
+  }
 
   //
   // Render
@@ -55,15 +54,13 @@ class QueueOptions extends Component {
     return (
       <Fragment>
         <FormGroup>
-          <FormLabel>
+          <FormLabel>Show Unknown Artist Items</FormLabel>
-            {translate('ShowUnknownArtistItems')}
-          </FormLabel>
 
           <FormInputGroup
             type={inputTypes.CHECK}
             name="includeUnknownArtistItems"
             value={includeUnknownArtistItems}
-            helpText={translate('IncludeUnknownArtistItemsHelpText')}
+            helpText="Show items without a artist in the queue, this could include removed artists, movies or anything else in Lidarr's category"
             onChange={this.onOptionChange}
           />
         </FormGroup>

frontend/src/Activity/Queue/QueueRow.css

@@ -16,15 +16,8 @@
   width: 150px;
 }
 
-.customFormatScore {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 55px;
-}
-
 .actions {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
   width: 90px;
-  text-align: right;
 }

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

@@ -1,11 +0,0 @@
-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'actions': string;
-  'customFormatScore': string;
-  'progress': string;
-  'protocol': string;
-  'quality': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

frontend/src/Activity/Queue/QueueRow.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
-import AlbumFormats from 'Album/AlbumFormats';
 import AlbumTitleLink from 'Album/AlbumTitleLink';
 import TrackQuality from 'Album/TrackQuality';
 import ArtistNameLink from 'Artist/ArtistNameLink';
@@ -14,12 +13,8 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import TableRow from 'Components/Table/TableRow';
 import Popover from 'Components/Tooltip/Popover';
-import Tooltip from 'Components/Tooltip/Tooltip';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
-import formatBytes from 'Utilities/Number/formatBytes';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
-import translate from 'Utilities/String/translate';
 import QueueStatusCell from './QueueStatusCell';
 import RemoveQueueItemModal from './RemoveQueueItemModal';
 import TimeleftCell from './TimeleftCell';
@@ -44,37 +39,24 @@ class QueueRow extends Component {
 
   onRemoveQueueItemPress = () => {
     this.setState({ isRemoveQueueItemModalOpen: true });
-  };
+  }
-
-  onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => {
-    const {
-      onRemoveQueueItemPress,
-      onQueueRowModalOpenOrClose
-    } = this.props;
-
-    onQueueRowModalOpenOrClose(false);
-    onRemoveQueueItemPress(blocklist, skipRedownload);
 
+  onRemoveQueueItemModalConfirmed = (blacklist, skipredownload) => {
+    this.props.onRemoveQueueItemPress(blacklist, skipredownload);
     this.setState({ isRemoveQueueItemModalOpen: false });
-  };
+  }
 
   onRemoveQueueItemModalClose = () => {
-    this.props.onQueueRowModalOpenOrClose(false);
-
     this.setState({ isRemoveQueueItemModalOpen: false });
-  };
+  }
 
   onInteractiveImportPress = () => {
-    this.props.onQueueRowModalOpenOrClose(true);
-
     this.setState({ isInteractiveImportModalOpen: true });
-  };
+  }
 
   onInteractiveImportModalClose = () => {
-    this.props.onQueueRowModalOpenOrClose(false);
-
     this.setState({ isInteractiveImportModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -92,16 +74,12 @@ class QueueRow extends Component {
       artist,
       album,
       quality,
-      customFormats,
-      customFormatScore,
       protocol,
       indexer,
       outputPath,
       downloadClient,
-      downloadClientHasPostImportCategory,
       downloadForced,
       estimatedCompletionTime,
-      added,
       timeleft,
       size,
       sizeleft,
@@ -190,7 +168,7 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'albums.releaseDate') {
+            if (name === 'album.releaseDate') {
               if (album) {
                 return (
                   <RelativeDateCellConnector
@@ -221,34 +199,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <AlbumFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  <Tooltip
-                    anchor={formatCustomFormatScore(
-                      customFormatScore,
-                      customFormats.length
-                    )}
-                    tooltip={<AlbumFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'protocol') {
               return (
                 <TableRowCell key={name}>
@@ -283,12 +233,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'size') {
-              return (
-                <TableRowCell key={name}>{formatBytes(size)}</TableRowCell>
-              );
-            }
-
             if (name === 'outputPath') {
               return (
                 <TableRowCell key={name}>
@@ -330,15 +274,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'added') {
-              return (
-                <RelativeDateCellConnector
-                  key={name}
-                  date={added}
-                />
-              );
-            }
-
             if (name === 'actions') {
               return (
                 <TableRowCell
@@ -354,7 +289,7 @@ class QueueRow extends Component {
                             kind={kinds.DANGER}
                           />
                         }
-                        title={translate('ManualDownload')}
+                        title="Manual Download"
                         body="This release failed parsing checks and was manually downloaded from an interactive search.  Import is likely to fail."
                         position={tooltipPositions.LEFT}
                       />
@@ -379,7 +314,7 @@ class QueueRow extends Component {
                   }
 
                   <SpinnerIconButton
-                    title={translate('RemoveFromQueue')}
+                    title="Remove from queue"
                     name={icons.REMOVE}
                     isSpinning={isRemoving}
                     onPress={this.onRemoveQueueItemPress}
@@ -404,9 +339,7 @@ class QueueRow extends Component {
         <RemoveQueueItemModal
           isOpen={isRemoveQueueItemModalOpen}
           sourceTitle={title}
-          canChangeCategory={!!downloadClientHasPostImportCategory}
           canIgnore={!!artist}
-          isPending={isPending}
           onRemovePress={this.onRemoveQueueItemModalConfirmed}
           onModalClose={this.onRemoveQueueItemModalClose}
         />
@@ -428,16 +361,12 @@ QueueRow.propTypes = {
   artist: PropTypes.object,
   album: PropTypes.object,
   quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object),
-  customFormatScore: PropTypes.number.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
-  downloadClientHasPostImportCategory: PropTypes.bool,
   downloadForced: PropTypes.bool.isRequired,
   estimatedCompletionTime: PropTypes.string,
-  added: PropTypes.string,
   timeleft: PropTypes.string,
   size: PropTypes.number,
   sizeleft: PropTypes.number,
@@ -451,12 +380,10 @@ QueueRow.propTypes = {
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   onSelectedChange: PropTypes.func.isRequired,
   onGrabPress: PropTypes.func.isRequired,
-  onRemoveQueueItemPress: PropTypes.func.isRequired,
+  onRemoveQueueItemPress: PropTypes.func.isRequired
-  onQueueRowModalOpenOrClose: PropTypes.func.isRequired
 };
 
 QueueRow.defaultProps = {
-  customFormats: [],
   isGrabbing: false,
   isRemoving: false
 };

frontend/src/Activity/Queue/QueueRowConnector.js

@@ -40,11 +40,11 @@ class QueueRowConnector extends Component {
 
   onGrabPress = () => {
     this.props.grabQueueItem({ id: this.props.id });
-  };
+  }
 
   onRemoveQueueItemPress = (payload) => {
     this.props.removeQueueItem({ id: this.props.id, ...payload });
-  };
+  }
 
   //
   // Render

frontend/src/Activity/Queue/QueueStatusCell.css

@@ -3,7 +3,3 @@
 
   width: 30px;
 }
-
-.noMessages {
-  margin-bottom: 10px;
-}

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

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

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -4,7 +4,6 @@ import Icon from 'Components/Icon';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import Popover from 'Components/Tooltip/Popover';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
 import styles from './QueueStatusCell.css';
 
 function getDetailedPopoverBody(statusMessages) {
@@ -13,10 +12,7 @@ function getDetailedPopoverBody(statusMessages) {
       {
         statusMessages.map(({ title, messages }) => {
           return (
-            <div
+            <div key={title}>
-              key={title}
-              className={messages.length ? undefined: styles.noMessages}
-            >
               {title}
               <ul>
                 {
@@ -53,86 +49,71 @@ function QueueStatusCell(props) {
   // status === 'downloading'
   let iconName = icons.DOWNLOADING;
   let iconKind = kinds.DEFAULT;
-  let title = translate('Downloading');
+  let title = 'Downloading';
-
-  if (status === 'paused') {
-    iconName = icons.PAUSED;
-    title = translate('Paused');
-  }
-
-  if (status === 'queued') {
-    iconName = icons.QUEUED;
-    title = translate('Queued');
-  }
-
-  if (status === 'completed') {
-    iconName = icons.DOWNLOADED;
-    title = translate('Downloaded');
-
-    if (trackedDownloadState === 'importBlocked') {
-      title += ` - ${translate('UnableToImportAutomatically')}`;
-      iconKind = kinds.WARNING;
-    }
-
-    if (trackedDownloadState === 'importFailed') {
-      title += ` - ${translate('ImportFailed', { sourceTitle })}`;
-      iconKind = kinds.WARNING;
-    }
-
-    if (trackedDownloadState === 'importPending') {
-      title += ` - ${translate('WaitingToImport')}`;
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'importing') {
-      title += ` - ${translate('Importing')}`;
-      iconKind = kinds.PURPLE;
-    }
-
-    if (trackedDownloadState === 'failedPending') {
-      title += ` - ${translate('WaitingToProcess')}`;
-      iconKind = kinds.DANGER;
-    }
-  }
 
   if (hasWarning) {
     iconKind = kinds.WARNING;
   }
 
+  if (status === 'paused') {
+    iconName = icons.PAUSED;
+    title = 'Paused';
+  }
+
+  if (status === 'queued') {
+    iconName = icons.QUEUED;
+    title = 'Queued';
+  }
+
+  if (status === 'completed') {
+    iconName = icons.DOWNLOADED;
+    title = 'Downloaded';
+
+    if (trackedDownloadState === 'importPending') {
+      title += ' - Waiting to Import';
+    }
+
+    if (trackedDownloadState === 'importing') {
+      title += ' - Importing';
+    }
+
+    if (trackedDownloadState === 'failedPending') {
+      title += ' - Waiting to Process';
+    }
+  }
+
   if (status === 'delay') {
     iconName = icons.PENDING;
-    title = translate('Pending');
+    title = 'Pending';
   }
 
   if (status === 'downloadClientUnavailable') {
     iconName = icons.PENDING;
     iconKind = kinds.WARNING;
-    title = translate('PendingDownloadClientUnavailable');
+    title = 'Pending - Download client is unavailable';
   }
 
   if (status === 'failed') {
     iconName = icons.DOWNLOADING;
     iconKind = kinds.DANGER;
-    title = translate('DownloadFailed');
+    title = 'Download failed';
   }
 
   if (status === 'warning') {
     iconName = icons.DOWNLOADING;
     iconKind = kinds.WARNING;
-    const warningMessage =
+    title = `Download warning: ${errorMessage || 'check download client for more details'}`;
-      errorMessage || translate('CheckDownloadClientForDetails');
-    title = translate('DownloadWarning', { warningMessage });
   }
 
   if (hasError) {
     if (status === 'completed') {
       iconName = icons.DOWNLOAD;
       iconKind = kinds.DANGER;
-      title = translate('ImportFailed', { sourceTitle });
+      title = `Import failed: ${sourceTitle}`;
     } else {
       iconName = icons.DOWNLOADING;
       iconKind = kinds.DANGER;
-      title = translate('DownloadFailed');
+      title = 'Download failed';
     }
   }
 
@@ -164,8 +145,8 @@ QueueStatusCell.propTypes = {
 };
 
 QueueStatusCell.defaultProps = {
-  trackedDownloadStatus: 'Ok',
+  trackedDownloadStatus: 'ok',
-  trackedDownloadState: 'Downloading'
+  trackedDownloadState: 'downloading'
 };
 
 export default QueueStatusCell;

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

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

frontend/src/Activity/Queue/RemoveQueueItemModal.js

@@ -0,0 +1,164 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+
+class RemoveQueueItemModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blacklist: false,
+      skipredownload: false
+    };
+  }
+
+  //
+  // Control
+
+  resetState = function() {
+    this.setState({
+      remove: true,
+      blacklist: false,
+      skipredownload: false
+    });
+  }
+
+  //
+  // Listeners
+
+  onRemoveChange = ({ value }) => {
+    this.setState({ remove: value });
+  }
+
+  onBlacklistChange = ({ value }) => {
+    this.setState({ blacklist: value });
+  }
+
+  onSkipReDownloadChange = ({ value }) => {
+    this.setState({ skipredownload: value });
+  }
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  }
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      sourceTitle,
+      canIgnore
+    } = this.props;
+
+    const { remove, blacklist, skipredownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            Remove - {sourceTitle}
+          </ModalHeader>
+
+          <ModalBody>
+            <div>
+              Are you sure you want to remove '{sourceTitle}' from the queue?
+            </div>
+
+            <FormGroup>
+              <FormLabel>Remove From Download Client</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="remove"
+                value={remove}
+                helpTextWarning="Removing will remove the download and the file(s) from the download client."
+                isDisabled={!canIgnore}
+                onChange={this.onRemoveChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Blacklist Release</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blacklist"
+                value={blacklist}
+                helpText="Prevents Lidarr from automatically grabbing this release again"
+                onChange={this.onBlacklistChange}
+              />
+            </FormGroup>
+
+            {
+              blacklist &&
+                <FormGroup>
+                  <FormLabel>Skip Redownload</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipredownload"
+                    value={skipredownload}
+                    helpText="Prevents Lidarr from trying download an alternative release for this item"
+                    onChange={this.onSkipReDownloadChange}
+                  />
+                </FormGroup>
+            }
+
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              Close
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              Remove
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  sourceTitle: PropTypes.string.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemModal.tsx

@@ -1,231 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './RemoveQueueItemModal.css';
-
-interface RemovePressProps {
-  removeFromClient: boolean;
-  changeCategory: boolean;
-  blocklist: boolean;
-  skipRedownload: boolean;
-}
-
-interface RemoveQueueItemModalProps {
-  isOpen: boolean;
-  sourceTitle: string;
-  canChangeCategory: boolean;
-  canIgnore: boolean;
-  isPending: boolean;
-  selectedCount?: number;
-  onRemovePress(props: RemovePressProps): void;
-  onModalClose: () => void;
-}
-
-type RemovalMethod = 'removeFromClient' | 'changeCategory' | 'ignore';
-type BlocklistMethod =
-  | 'doNotBlocklist'
-  | 'blocklistAndSearch'
-  | 'blocklistOnly';
-
-function RemoveQueueItemModal(props: RemoveQueueItemModalProps) {
-  const {
-    isOpen,
-    sourceTitle,
-    canIgnore,
-    canChangeCategory,
-    isPending,
-    selectedCount,
-    onRemovePress,
-    onModalClose,
-  } = props;
-
-  const multipleSelected = selectedCount && selectedCount > 1;
-
-  const [removalMethod, setRemovalMethod] =
-    useState<RemovalMethod>('removeFromClient');
-  const [blocklistMethod, setBlocklistMethod] =
-    useState<BlocklistMethod>('doNotBlocklist');
-
-  const { title, message } = useMemo(() => {
-    if (!selectedCount) {
-      return {
-        title: translate('RemoveQueueItem', { sourceTitle }),
-        message: translate('RemoveQueueItemConfirmation', { sourceTitle }),
-      };
-    }
-
-    if (selectedCount === 1) {
-      return {
-        title: translate('RemoveSelectedItem'),
-        message: translate('RemoveSelectedItemQueueMessageText'),
-      };
-    }
-
-    return {
-      title: translate('RemoveSelectedItems'),
-      message: translate('RemoveSelectedItemsQueueMessageText', {
-        selectedCount,
-      }),
-    };
-  }, [sourceTitle, selectedCount]);
-
-  const removalMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'removeFromClient',
-        value: translate('RemoveFromDownloadClient'),
-        hint: multipleSelected
-          ? translate('RemoveMultipleFromDownloadClientHint')
-          : translate('RemoveFromDownloadClientHint'),
-      },
-      {
-        key: 'changeCategory',
-        value: translate('ChangeCategory'),
-        isDisabled: !canChangeCategory,
-        hint: multipleSelected
-          ? translate('ChangeCategoryMultipleHint')
-          : translate('ChangeCategoryHint'),
-      },
-      {
-        key: 'ignore',
-        value: multipleSelected
-          ? translate('IgnoreDownloads')
-          : translate('IgnoreDownload'),
-        isDisabled: !canIgnore,
-        hint: multipleSelected
-          ? translate('IgnoreDownloadsHint')
-          : translate('IgnoreDownloadHint'),
-      },
-    ];
-  }, [canChangeCategory, canIgnore, multipleSelected]);
-
-  const blocklistMethodOptions = useMemo(() => {
-    return [
-      {
-        key: 'doNotBlocklist',
-        value: translate('DoNotBlocklist'),
-        hint: translate('DoNotBlocklistHint'),
-      },
-      {
-        key: 'blocklistAndSearch',
-        value: translate('BlocklistAndSearch'),
-        isDisabled: isPending,
-        hint: multipleSelected
-          ? translate('BlocklistAndSearchMultipleHint')
-          : translate('BlocklistAndSearchHint'),
-      },
-      {
-        key: 'blocklistOnly',
-        value: translate('BlocklistOnly'),
-        hint: multipleSelected
-          ? translate('BlocklistMultipleOnlyHint')
-          : translate('BlocklistOnlyHint'),
-      },
-    ];
-  }, [isPending, multipleSelected]);
-
-  const handleRemovalMethodChange = useCallback(
-    ({ value }: { value: RemovalMethod }) => {
-      setRemovalMethod(value);
-    },
-    [setRemovalMethod]
-  );
-
-  const handleBlocklistMethodChange = useCallback(
-    ({ value }: { value: BlocklistMethod }) => {
-      setBlocklistMethod(value);
-    },
-    [setBlocklistMethod]
-  );
-
-  const handleConfirmRemove = useCallback(() => {
-    onRemovePress({
-      removeFromClient: removalMethod === 'removeFromClient',
-      changeCategory: removalMethod === 'changeCategory',
-      blocklist: blocklistMethod !== 'doNotBlocklist',
-      skipRedownload: blocklistMethod === 'blocklistOnly',
-    });
-
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-  }, [
-    removalMethod,
-    blocklistMethod,
-    setRemovalMethod,
-    setBlocklistMethod,
-    onRemovePress,
-  ]);
-
-  const handleModalClose = useCallback(() => {
-    setRemovalMethod('removeFromClient');
-    setBlocklistMethod('doNotBlocklist');
-
-    onModalClose();
-  }, [setRemovalMethod, setBlocklistMethod, onModalClose]);
-
-  return (
-    <Modal isOpen={isOpen} size={sizes.MEDIUM} onModalClose={handleModalClose}>
-      <ModalContent onModalClose={handleModalClose}>
-        <ModalHeader>{title}</ModalHeader>
-
-        <ModalBody>
-          <div className={styles.message}>{message}</div>
-
-          {isPending ? null : (
-            <FormGroup>
-              <FormLabel>{translate('RemoveQueueItemRemovalMethod')}</FormLabel>
-
-              <FormInputGroup
-                type={inputTypes.SELECT}
-                name="removalMethod"
-                value={removalMethod}
-                values={removalMethodOptions}
-                isDisabled={!canChangeCategory && !canIgnore}
-                helpTextWarning={translate(
-                  'RemoveQueueItemRemovalMethodHelpTextWarning'
-                )}
-                onChange={handleRemovalMethodChange}
-              />
-            </FormGroup>
-          )}
-
-          <FormGroup>
-            <FormLabel>
-              {multipleSelected
-                ? translate('BlocklistReleases')
-                : translate('BlocklistRelease')}
-            </FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.SELECT}
-              name="blocklistMethod"
-              value={blocklistMethod}
-              values={blocklistMethodOptions}
-              helpText={translate('BlocklistReleaseHelpText')}
-              onChange={handleBlocklistMethodChange}
-            />
-          </FormGroup>
-        </ModalBody>
-
-        <ModalFooter>
-          <Button onPress={handleModalClose}>{translate('Close')}</Button>
-
-          <Button kind={kinds.DANGER} onPress={handleConfirmRemove}>
-            {translate('Remove')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
-
-export default RemoveQueueItemModal;

frontend/src/Activity/Queue/RemoveQueueItemsModal.js

@@ -0,0 +1,167 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalFooter from 'Components/Modal/ModalFooter';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import styles from './RemoveQueueItemsModal.css';
+
+class RemoveQueueItemsModal extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      remove: true,
+      blacklist: false,
+      skipredownload: false
+    };
+  }
+
+  //
+  // Control
+
+   resetState = function() {
+     this.setState({
+       remove: true,
+       blacklist: false,
+       skipredownload: false
+     });
+   }
+
+   //
+   // Listeners
+
+   onRemoveChange = ({ value }) => {
+     this.setState({ remove: value });
+   }
+
+  onBlacklistChange = ({ value }) => {
+    this.setState({ blacklist: value });
+  }
+
+  onSkipReDownloadChange = ({ value }) => {
+    this.setState({ skipredownload: value });
+  }
+
+  onRemoveConfirmed = () => {
+    const state = this.state;
+
+    this.resetState();
+    this.props.onRemovePress(state);
+  }
+
+  onModalClose = () => {
+    this.resetState();
+    this.props.onModalClose();
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      selectedCount,
+      canIgnore
+    } = this.props;
+
+    const { remove, blacklist, skipredownload } = this.state;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        size={sizes.MEDIUM}
+        onModalClose={this.onModalClose}
+      >
+        <ModalContent
+          onModalClose={this.onModalClose}
+        >
+          <ModalHeader>
+            Remove Selected Item{selectedCount > 1 ? 's' : ''}
+          </ModalHeader>
+
+          <ModalBody>
+            <div className={styles.message}>
+              Are you sure you want to remove {selectedCount} item{selectedCount > 1 ? 's' : ''} from the queue?
+            </div>
+
+            <FormGroup>
+              <FormLabel>Remove From Download Client</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="remove"
+                value={remove}
+                helpTextWarning="Removing will remove the download and the file(s) from the download client."
+                isDisabled={!canIgnore}
+                onChange={this.onRemoveChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>
+                Blacklist Release{selectedCount > 1 ? 's' : ''}
+              </FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="blacklist"
+                value={blacklist}
+                helpText="Prevents Lidarr from automatically grabbing these files again"
+                onChange={this.onBlacklistChange}
+              />
+            </FormGroup>
+
+            {
+              blacklist &&
+                <FormGroup>
+                  <FormLabel>Skip Redownload</FormLabel>
+                  <FormInputGroup
+                    type={inputTypes.CHECK}
+                    name="skipredownload"
+                    value={skipredownload}
+                    helpText="Prevents Lidarr from trying download alternative releases for the removed items"
+                    onChange={this.onSkipReDownloadChange}
+                  />
+                </FormGroup>
+            }
+
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={this.onModalClose}>
+              Close
+            </Button>
+
+            <Button
+              kind={kinds.DANGER}
+              onPress={this.onRemoveConfirmed}
+            >
+              Remove
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+RemoveQueueItemsModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  selectedCount: PropTypes.number.isRequired,
+  canIgnore: PropTypes.bool.isRequired,
+  onRemovePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default RemoveQueueItemsModal;