Implemented experimental Script Console for debugging with editor in the diag ui.

.editorconfig

@@ -2,273 +2,14 @@
 # editorconfig.org
 root = true
 
-# NOTE: Requires **VS2019 16.3** or later
-
-# Stylecop.ruleset
-# Description: Rules for Sonarr
-
-# Code files
-[*.cs]
+[*.{cs}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-# Sort using and Import directives with System.* appearing first
-dotnet_sort_system_directives_first = true
-
-# Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:refactoring
-dotnet_style_qualification_for_property = false:refactoring
-dotnet_style_qualification_for_method = false:refactoring
-dotnet_style_qualification_for_event = false:refactoring
-
-# Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_switch_labels = true
-csharp_indent_labels = flush_left
-
-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
-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_when_type_is_apparent = true
-csharp_style_var_elsewhere = true
-# 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.SA1025.severity = none
-dotnet_diagnostic.SA1101.severity = none
-dotnet_diagnostic.SA1116.severity = none
-dotnet_diagnostic.SA1118.severity = none
-dotnet_diagnostic.SA1122.severity = none
-dotnet_diagnostic.SA1201.severity = suggestion
-dotnet_diagnostic.SA1202.severity = suggestion
-dotnet_diagnostic.SA1204.severity = suggestion
-dotnet_diagnostic.SA1300.severity = none
-dotnet_diagnostic.SA1303.severity = none
-dotnet_diagnostic.SA1304.severity = none
-dotnet_diagnostic.SA1306.severity = none
-dotnet_diagnostic.SA1309.severity = none
-dotnet_diagnostic.SA1310.severity = none
-dotnet_diagnostic.SA1401.severity = none
-dotnet_diagnostic.SA1402.severity = none
-dotnet_diagnostic.SA1404.severity = suggestion
-dotnet_diagnostic.SA1405.severity = suggestion
-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
-dotnet_diagnostic.SA1602.severity = none
-dotnet_diagnostic.SA1604.severity = none
-dotnet_diagnostic.SA1605.severity = none
-dotnet_diagnostic.SA1606.severity = none
-dotnet_diagnostic.SA1607.severity = none
-dotnet_diagnostic.SA1608.severity = none
-dotnet_diagnostic.SA1610.severity = none
-dotnet_diagnostic.SA1611.severity = none
-dotnet_diagnostic.SA1612.severity = none
-dotnet_diagnostic.SA1613.severity = none
-dotnet_diagnostic.SA1614.severity = none
-dotnet_diagnostic.SA1615.severity = none
-dotnet_diagnostic.SA1616.severity = none
-dotnet_diagnostic.SA1617.severity = none
-dotnet_diagnostic.SA1618.severity = none
-dotnet_diagnostic.SA1619.severity = none
-dotnet_diagnostic.SA1620.severity = none
-dotnet_diagnostic.SA1621.severity = none
-dotnet_diagnostic.SA1622.severity = none
-dotnet_diagnostic.SA1623.severity = none
-dotnet_diagnostic.SA1624.severity = none
-dotnet_diagnostic.SA1625.severity = none
-dotnet_diagnostic.SA1626.severity = none
-dotnet_diagnostic.SA1627.severity = none
-dotnet_diagnostic.SA1629.severity = none
-dotnet_diagnostic.SA1633.severity = none
-dotnet_diagnostic.SA1634.severity = none
-dotnet_diagnostic.SA1635.severity = none
-dotnet_diagnostic.SA1636.severity = none
-dotnet_diagnostic.SA1637.severity = none
-dotnet_diagnostic.SA1638.severity = none
-dotnet_diagnostic.SA1640.severity = none
-dotnet_diagnostic.SA1641.severity = none
-dotnet_diagnostic.SA1642.severity = none
-dotnet_diagnostic.SA1643.severity = none
-dotnet_diagnostic.SA1648.severity = none
-dotnet_diagnostic.SA1649.severity = none
-dotnet_diagnostic.SA1651.severity = none
-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
-dotnet_diagnostic.CA1012.severity = suggestion
-dotnet_diagnostic.CA1014.severity = suggestion
-dotnet_diagnostic.CA1016.severity = suggestion
-dotnet_diagnostic.CA1017.severity = suggestion
-dotnet_diagnostic.CA1018.severity = suggestion
-dotnet_diagnostic.CA1019.severity = suggestion
-dotnet_diagnostic.CA1021.severity = suggestion
-dotnet_diagnostic.CA1024.severity = suggestion
-dotnet_diagnostic.CA1027.severity = suggestion
-dotnet_diagnostic.CA1028.severity = suggestion
-dotnet_diagnostic.CA1030.severity = suggestion
-dotnet_diagnostic.CA1031.severity = suggestion
-dotnet_diagnostic.CA1032.severity = suggestion
-dotnet_diagnostic.CA1033.severity = suggestion
-dotnet_diagnostic.CA1034.severity = suggestion
-dotnet_diagnostic.CA1036.severity = suggestion
-dotnet_diagnostic.CA1040.severity = suggestion
-dotnet_diagnostic.CA1041.severity = suggestion
-dotnet_diagnostic.CA1043.severity = suggestion
-dotnet_diagnostic.CA1044.severity = suggestion
-dotnet_diagnostic.CA1050.severity = suggestion
-dotnet_diagnostic.CA1051.severity = suggestion
-dotnet_diagnostic.CA1052.severity = suggestion
-dotnet_diagnostic.CA1054.severity = suggestion
-dotnet_diagnostic.CA1055.severity = suggestion
-dotnet_diagnostic.CA1056.severity = suggestion
-dotnet_diagnostic.CA1058.severity = suggestion
-dotnet_diagnostic.CA1060.severity = suggestion
-dotnet_diagnostic.CA1061.severity = suggestion
-dotnet_diagnostic.CA1062.severity = suggestion
-dotnet_diagnostic.CA1063.severity = suggestion
-dotnet_diagnostic.CA1064.severity = suggestion
-dotnet_diagnostic.CA1065.severity = suggestion
-dotnet_diagnostic.CA1066.severity = suggestion
-dotnet_diagnostic.CA1067.severity = suggestion
-dotnet_diagnostic.CA1068.severity = suggestion
-dotnet_diagnostic.CA1069.severity = suggestion
-dotnet_diagnostic.CA1200.severity = suggestion
-dotnet_diagnostic.CA1303.severity = suggestion
-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
-dotnet_diagnostic.CA1716.severity = suggestion
-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.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.CA1822.severity = suggestion
-dotnet_diagnostic.CA1823.severity = suggestion
-dotnet_diagnostic.CA1824.severity = suggestion
-dotnet_diagnostic.CA2000.severity = suggestion
-dotnet_diagnostic.CA2002.severity = suggestion
-dotnet_diagnostic.CA2007.severity = suggestion
-dotnet_diagnostic.CA2008.severity = suggestion
-dotnet_diagnostic.CA2012.severity = suggestion
-dotnet_diagnostic.CA2013.severity = suggestion
-dotnet_diagnostic.CA2100.severity = suggestion
-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
-dotnet_diagnostic.CA2213.severity = suggestion
-dotnet_diagnostic.CA2214.severity = suggestion
-dotnet_diagnostic.CA2215.severity = suggestion
-dotnet_diagnostic.CA2216.severity = suggestion
-dotnet_diagnostic.CA2219.severity = suggestion
-dotnet_diagnostic.CA2225.severity = suggestion
-dotnet_diagnostic.CA2226.severity = suggestion
-dotnet_diagnostic.CA2227.severity = suggestion
-dotnet_diagnostic.CA2229.severity = suggestion
-dotnet_diagnostic.CA2231.severity = suggestion
-dotnet_diagnostic.CA2234.severity = suggestion
-dotnet_diagnostic.CA2235.severity = suggestion
-dotnet_diagnostic.CA2237.severity = suggestion
-dotnet_diagnostic.CA2241.severity = suggestion
-dotnet_diagnostic.CA2242.severity = suggestion
-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.CA3061.severity = suggestion
-dotnet_diagnostic.CA3075.severity = suggestion
-dotnet_diagnostic.CA3076.severity = suggestion
-dotnet_diagnostic.CA3077.severity = suggestion
-dotnet_diagnostic.CA3147.severity = suggestion
-dotnet_diagnostic.CA5350.severity = suggestion
-dotnet_diagnostic.CA5351.severity = suggestion
-dotnet_diagnostic.CA5359.severity = suggestion
-dotnet_diagnostic.CA5360.severity = suggestion
-dotnet_diagnostic.CA5363.severity = suggestion
-dotnet_diagnostic.CA5364.severity = suggestion
-dotnet_diagnostic.CA5365.severity = suggestion
-dotnet_diagnostic.CA5366.severity = suggestion
-dotnet_diagnostic.CA5368.severity = suggestion
-dotnet_diagnostic.CA5369.severity = suggestion
-dotnet_diagnostic.CA5370.severity = suggestion
-dotnet_diagnostic.CA5371.severity = suggestion
-dotnet_diagnostic.CA5372.severity = suggestion
-dotnet_diagnostic.CA5373.severity = suggestion
-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

@@ -5,7 +5,7 @@
 # when checked out on windows
 *.sh text eol=lf
 distribution/debian/* text eol=lf
-distribution/osx/Sonarr text eol=lf
+macOS/Sonarr text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+<!--
+Before opening a new issue, please ensure:
+- You use the forums for support/questions
+- You search for existing bugs/feature requests
+- Remove extraneous template details
+- Do not prefix title with type of issue (Feature Request, Bug, etc.) The appropriate labels will be added during triage.
+-->
+
+## Support / Questions
+
+Please use https://forums.sonarr.tv/ for support. Support requests or questions will be redirected to the forums and the issue will be closed.
+
+<!--
+Remove if not opening a bug report
+-->
+
+## Bug Report
+
+### System Information/Logs
+
+**Sonarr Version:**
+
+**Operating System:**
+
+**.net Framework (Windows) or mono (macOS/Linux) Version:**
+
+**Link to Log Files (debug or trace):**
+
+**Browser (for UI bugs):**
+
+### Additional Information
+
+<!--
+Remove if not opening a feature request
+-->
+
+## Feature Request
+
+### What problem are you looking to solve?
+
+### Other Information

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve Sonarr
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs**
+Link to debug or trace log files.
+
+**System Information**
+
+ - Sonarr Version: [e.g. 2.0.0.1]
+ - Operating System: [e.g. Windows 10]
+ - .net Framework (Windows) or mono (macOS/Linux) Version: [e.g. 4.5 or 5.12]
+
+**UI Bugs:**
+ - OS: [e.g. Windows]
+ - Browser: [e.g. chrome, firefox]
+ - Version: [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,81 +0,0 @@
-name: Bug Report
-description: 'Support Requests will be closed immediately, if you are not 100% certain this is a bug please go to our Reddit, Discord, Forums, or IRC first. Sonarr v2 is EOL & unsupported.'
-labels: ['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 it is closed as complete it may not yet be in a stable release.
-    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
-        - **Sonarr**: Sonarr 3.0.6.1265
-        - **Docker Install**: Yes
-        - **Using Reverse Proxy**: No
-        - **Browser**: Firefox 90 (If UI related)
-        - **Database**: Sqlite 3.41.2
-    value: |
-        - OS: 
-        - Sonarr: 
-        - Docker Install: 
-        - Using Reverse Proxy: 
-        - Browser: 
-        - Database: 
-    render: markdown
-  validations:
-    required: true
-- type: dropdown
-  attributes:
-    label: What branch are you running?
-    options:
-      - Main
-      - Develop
-      - Other (This issue will be closed)
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Trace Logs?
-    description: |
-      Trace Logs (https://wiki.servarr.com/sonarr/troubleshooting#logging-and-log-files) 
-      ***Generally speaking, all bug reports must have trace logs provided.***
-      *** Info Logs are not trace logs. If the logs do not say trace and are not from a file like `*.trace.*.txt` they are not trace logs.***
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? Screenshots? References? Anything that will give us more context about the issue 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: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Support via Discord
-    url: https://discord.gg/M6BvZn5
-    about: Chat with users and devs on support and setup related topics.
-  - name: Support via Reddit
-    url: https://reddit.com/r/Sonarr
-    about: Discuss and search through support topics.
-  - name: Support via Forums
-    url: https://forums.sonarr.tv/
-    about: Discuss and search through support topics.
-  - name: Support via IRC
-    url: https://web.libera.chat/?channels=#sonarr
-    about: Chat with users and devs on support and setup related topics.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for Sonarr
+
+---
+
+**Describe the problem**
+A clear and concise description of the problem you're looking to solve.
+
+**Describe any solutions you think might work**
+A clear and concise description of any 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,37 +0,0 @@
-name: Feature Request
-description: 'Suggest an idea for Sonarr'
-labels: ['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 feature request exists and it is closed as complete it may not yet be in a stable release.
-    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: false

.github/ISSUE_TEMPLATE/other-issues.md

@@ -0,0 +1,7 @@
+---
+name: Other issues
+about: How to get support or ask questions
+
+---
+
+Please use https://forums.sonarr.tv/ for support. Support requests or questions will be redirected to the forums and the issue will be closed.

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ A few sentences describing the overall goals of the pull request's commits.
 
 #### Todos
 - [ ] Tests
-- [ ] Wiki Updates
+- [ ] Documentation
 
 
 #### Issues Fixed or Closed by this PR

.github/SUPPORT.md

@@ -0,0 +1,7 @@
+## Support
+
+There are a number of frequently asked questions that have been answered in our [FAQ](https://github.com/Sonarr/Sonarr/wiki/FAQ)
+
+The [wiki](https://github.com/Sonarr/Sonarr/wiki) contains other information and guides
+
+If you have a support question, please use the [support forums](https://forums.sonarr.tv/).

.github/labeler.yml

@@ -1,17 +0,0 @@
-'connection':
-  - src/NzbDrone.Core/Notifications/**/*
-
-'db-migration':
-  - src/NzbDrone.Core/Datastore/Migration/*
-
-'download-client':
-  - src/NzbDrone.Core/Download/Clients/**/*
-
-'indexer':
-  - src/NzbDrone.Core/Indexers/**/*
-
-'parsing':
-  - src/NzbDrone.Core/Parser/**/*
-
-'ui-only':
-  - all: ['frontend/**/*']

.github/workflows/api_docs.yml

@@ -1,58 +0,0 @@
-name: 'API Docs'
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * 1'
-  push:
-    branches:
-      - develop
-    paths:
-      - ".github/workflows/api_docs.yml"
-      - "docs.sh"
-      - "src/Sonarr.Api.*/**"
-      - "src/Sonarr.Http/**"
-      - "src/**/*.csproj"
-      - "src/*"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  api_docs:
-    runs-on: ubuntu-latest
-    if: github.repository == 'Sonarr/Sonarr'
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
-        id: setup-dotnet
-        with:
-          dotnet-version: '6.0.x'
-
-      - name: Create temporary global.json
-        run: |
-          echo '{"sdk":{"version": "${{ steps.setup-dotnet.outputs.dotnet-version }}" } }' > ./global.json
-
-      - name: Create openapi.json
-        run: ./docs.sh Linux
-
-      - name: Commit API Docs Change
-        continue-on-error: true
-        run: |
-          git config --global user.email "development@sonarr.tv"
-          git config --global user.name "Sonarr"
-          git checkout -b api-docs
-          git add src
-          if git status | grep -q modified
-          then
-            git commit -am 'Automated API Docs update' -m "ignore-downstream"
-            git push -f --set-upstream origin api-docs
-            curl -X POST -H "Authorization: Bearer ${{ secrets.OPENAPI_PAT }}" -H "Accept: application/vnd.github+json" https://api.github.com/repos/sonarr/sonarr/pulls -d '{"head":"api-docs","base":"develop","title":"Update API docs"}'
-          else
-            echo "No changes since last run"
-          fi

.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@v2
-        with:
-          github-token: ${{ github.token }}
-          issue-lock-inactive-days: '90'
-          issue-exclude-created-before: ''
-          issue-exclude-labels: 'one-day-maybe'
-          issue-lock-labels: ''
-          issue-lock-comment: ''
-          issue-lock-reason: 'resolved'
-          process-only: ''

.gitignore

@@ -84,6 +84,7 @@ TestResults
 [Tt]est[Rr]esult*
 *.Cache
 ClientBin
+[Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
@@ -116,48 +117,27 @@ src/UI/.idea/*
 *log.txt
 node_modules/
 _output*
-_artifacts
 _rawPackage/
 _dotTrace*
 _tests*
 _publish*
 _temp*
 *.Result.xml
-coverage*.xml
-coverage*.json
 setup/Output/
 *.~is
 
+UI/
+
 #VS outout folders
 bin
 obj
 output/*
 
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-**/Properties/launchSettings.json
-
-# Packages
-Sonarr_*/
-Sonarr_*.zip
-Sonarr_*.gz
-gecko.zip
-geckodriver.exe
 
 #OS X metadata files
 ._*
 .DS_Store
 
 _start
-_temp_*/**/*
-
-# Windows thumbnail cache files
-Thumbs.db
 
 src/.idea/
-/distribution/windows/setup/output/*
-
-# API doc generation
-.config/

CONTRIBUTING.md

@@ -3,40 +3,25 @@
 We're always looking for people to help make Sonarr even better, there are a number of ways to contribute.
 
 ## Documentation ##
-Setup guides, [FAQ](https://wiki.servarr.com/sonarr/faq), the more information we have on the [wiki](https://wiki.servarr.com/sonarr) the better.
+Setup guides, FAQ, the more information we have on the wiki the better.
 
 ## Development ##
 
-### Tools required ###
-- Visual Studio 2019 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (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/)
-
-### Getting started ###
-
-1. Fork Sonarr
-2. Clone the repository into your development machine. [*info*](https://docs.github.com/en/get-started/quickstart/fork-a-repo)
-3. Install the required Node Packages `yarn install`
-4. Start webpack to monitor your dev environment for any frontend changes that need post processing using `yarn start` command.
-5. Build the project in Visual Studio, Setting startup project to `Sonarr.Console` and framework to `x86`
-6. Debug the project in Visual Studio
-7. Open http://localhost:8989
+See the readme for information on setting up your development environment.
 
 ### Contributing Code ###
 - If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Sonarr/Sonarr/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 Sonarr's `develop` branch, don't merge
+- Rebase from Sonarr'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 our [forums](https://forums.sonarr.tv/), [subreddit](https://www.reddit.com/r/sonarr/), [discord](https://discord.gg/Ex7FmFK), or [IRC](https://web.libera.chat/?channels=#sonarr) if you have any questions
+- Reach out to us on the forums or on IRC 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 should be the default for VS 2019 and WebStorm
+- Use 4 spaces instead of tabs, this is the default for VS 2012 and WebStorm (to my knowledge)
 
 ### Pull Requesting ###
-- Only make pull requests to develop (currently `develop`), never `main`, if you make a PR to master we'll comment on it and close it
+- 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)

FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: sonarr
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

Logo/Jetbrains/dottrace.svg

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-<g>
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1.3318" y1="43.7371" x2="67.0419" y2="26.0967">
-			<stop  offset="0.1237" style="stop-color:#7866FF"/>
-			<stop  offset="0.5376" style="stop-color:#FE2EB6"/>
-			<stop  offset="0.8548" style="stop-color:#FD0486"/>
-		</linearGradient>
-		<polygon style="fill:url(#SVGID_1_);" points="67.3,16 43.7,0 0,31.1 11.1,70 58.9,60.3 		"/>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="45.9148" y1="38.9098" x2="67.6577" y2="9.0989">
-			<stop  offset="0.1237" style="stop-color:#FF0080"/>
-			<stop  offset="0.2587" style="stop-color:#FE0385"/>
-			<stop  offset="0.4109" style="stop-color:#FA0C92"/>
-			<stop  offset="0.5713" style="stop-color:#F41BA9"/>
-			<stop  offset="0.7363" style="stop-color:#EB2FC8"/>
-			<stop  offset="0.8656" style="stop-color:#E343E6"/>
-		</linearGradient>
-		<polygon style="fill:url(#SVGID_2_);" points="67.3,16 43.7,0 38,15.7 38,47.8 70,47.8 		"/>
-	</g>
-	<g>
-		<rect x="13.4" y="13.4" style="fill:#000000;" width="43.2" height="43.2"/>
-		<rect x="17.4" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
-		<g>
-			<path style="fill:#FFFFFF;" d="M17.4,19.1h6.9c5.6,0,9.5,3.8,9.5,8.9V28c0,5-3.9,8.9-9.5,8.9h-6.9V19.1z M21.4,22.7v10.7h3
-				c3.2,0,5.4-2.2,5.4-5.3V28c0-3.2-2.2-5.4-5.4-5.4H21.4z"/>
-			<polygon style="fill:#FFFFFF;" points="40.3,22.7 34.9,22.7 34.9,19.1 49.6,19.1 49.6,22.7 44.2,22.7 44.2,37 40.3,37 			"/>
-		</g>
-	</g>
-</g>
-</svg>

Logo/Jetbrains/jetbrains.svg

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
-	>
-<g>
-	<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
-		<stop  offset="0" style="stop-color:#FCEE39"/>
-		<stop  offset="1" style="stop-color:#F37B3D"/>
-	</linearGradient>
-	<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
-		c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
-		c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
-	<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
-		<stop  offset="0" style="stop-color:#EF5A6B"/>
-		<stop  offset="0.57" style="stop-color:#F26F4E"/>
-		<stop  offset="1" style="stop-color:#F37B3D"/>
-	</linearGradient>
-	<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
-		c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
-		c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
-	<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
-		<stop  offset="0" style="stop-color:#7C59A4"/>
-		<stop  offset="0.3852" style="stop-color:#AF4C92"/>
-		<stop  offset="0.7654" style="stop-color:#DC4183"/>
-		<stop  offset="0.957" style="stop-color:#ED3D7D"/>
-	</linearGradient>
-	<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
-		c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
-		c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
-	<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
-		<stop  offset="0" style="stop-color:#EF5A6B"/>
-		<stop  offset="0.364" style="stop-color:#EE4E72"/>
-		<stop  offset="1" style="stop-color:#ED3D7D"/>
-	</linearGradient>
-	<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
-		l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
-		c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
-	<g id="XMLID_3008_">
-		<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
-		<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
-		<g id="XMLID_3009_">
-			<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
-				l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
-			<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
-				L45.3,43.8z"/>
-			<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
-			<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
-				c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
-				l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
-			<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
-				c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
-				l-1.5,0v2H50.6z"/>
-			<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
-				 M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
-			<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
-			<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
-				/>
-			<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
-				c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
-				c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
-				C76.1,62.5,74.7,62,73.7,61.1z"/>
-		</g>
-	</g>
-</g>
-</svg>

Logo/Jetbrains/resharper.svg

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9451" y1="75.7869" x2="74.7868" y2="20.6415">
-				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
-				<stop  offset="0.4044" style="stop-color:#C41E57"/>
-				<stop  offset="0.4677" style="stop-color:#C41E57"/>
-				<stop  offset="0.6505" style="stop-color:#EB8523"/>
-				<stop  offset="0.9516" style="stop-color:#FEBD11"/>
-			</linearGradient>
-			<polygon style="fill:url(#SVGID_1_);" points="49.8,15.2 36,36.7 58.4,70 70,23.1 			"/>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.7187" y1="73.2922" x2="69.5556" y2="18.1519">
-				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
-				<stop  offset="0.4044" style="stop-color:#C41E57"/>
-				<stop  offset="0.4677" style="stop-color:#C41E57"/>
-				<stop  offset="0.7043" style="stop-color:#EB8523"/>
-			</linearGradient>
-			<polygon style="fill:url(#SVGID_2_);" points="51.1,15.7 49,0 18.8,33.6 27.6,42.3 20.8,70 58.4,70 			"/>
-		</g>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1.8281" y1="53.4275" x2="48.8245" y2="9.2255">
-			<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
-			<stop  offset="0.6613" style="stop-color:#C41E57"/>
-		</linearGradient>
-		<polygon style="fill:url(#SVGID_3_);" points="49,0 11.6,0 0,47.1 55.6,47.1 		"/>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="49.8935" y1="-11.5569" x2="48.8588" y2="24.0352">
-			<stop  offset="0.5" style="stop-color:#C41E57"/>
-			<stop  offset="0.6668" style="stop-color:#D13F48"/>
-			<stop  offset="0.7952" style="stop-color:#D94F39"/>
-			<stop  offset="0.8656" style="stop-color:#DD5433"/>
-		</linearGradient>
-		<polygon style="fill:url(#SVGID_4_);" points="55.3,47.1 51.1,15.7 49,0 41.7,23 		"/>
-	</g>
-	<g>
-		
-			<rect x="13.4" y="13.5" transform="matrix(-1 2.577289e-003 -2.577289e-003 -1 70.0288 70.081)" style="fill:#000000;" width="43.2" height="43.2"/>
-		
-			<rect x="17.6" y="48.6" transform="matrix(1 -2.577289e-003 2.577289e-003 1 -0.1287 6.634109e-002)" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
-		<path style="fill:#FFFFFF;" d="M17.4,19.1l8.2,0c2.3,0,4,0.6,5.2,1.8c1,1,1.5,2.4,1.5,4.1l0,0.1c0,1.5-0.3,2.6-1.1,3.5
-			c-0.7,0.9-1.6,1.6-2.8,2l4.4,6.4l-4.6,0l-3.7-5.5l-3.3,0l0,5.5l-3.9,0L17.4,19.1z M25.3,27.8c1,0,1.7-0.2,2.2-0.7
-			c0.5-0.5,0.8-1.1,0.8-1.8l0-0.1c0-0.9-0.3-1.5-0.8-1.9c-0.5-0.4-1.3-0.6-2.3-0.6l-3.9,0l0,5.1L25.3,27.8z"/>
-		<path style="fill:#FFFFFF;" d="M36,33.2l-1.9,0l0-3.3l2.5,0l0.6-3.8l-2.3,0l0-3.3l2.8,0l0.6-3.7l3.4,0l-0.6,3.7l3.7,0l0.6-3.7
-			l3.4,0l-0.6,3.7l1.9,0l0,3.3l-2.5,0L47,29.9l2.3,0l0,3.3l-2.8,0L45.8,37l-3.4,0l0.7-3.8l-3.7,0L38.7,37l-3.4,0L36,33.2z
-			 M43.7,29.9l0.6-3.8l-3.7,0L40,29.9L43.7,29.9z"/>
-	</g>
-</g>
-</svg>

Logo/Jetbrains/teamcity.svg

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-<g>
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1.7738" y1="31.2729" x2="40.1662" y2="31.2729">
-			<stop  offset="0" style="stop-color:#905CFB"/>
-			<stop  offset="6.772543e-002" style="stop-color:#776CF9"/>
-			<stop  offset="0.1729" style="stop-color:#5681F7"/>
-			<stop  offset="0.2865" style="stop-color:#3B92F5"/>
-			<stop  offset="0.4097" style="stop-color:#269FF4"/>
-			<stop  offset="0.5474" style="stop-color:#17A9F3"/>
-			<stop  offset="0.7111" style="stop-color:#0FAEF2"/>
-			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
-		</linearGradient>
-		<path style="fill:url(#SVGID_1_);" d="M39.7,47.9l-6.1-34c-0.4-2.4-1.2-4.8-2.7-7.1c-2-3.2-5.2-5.4-8.8-6.3
-			C7.9-2.9-2.6,11.3,3.6,23.9c0,0,0,0,0,0l14.8,31.7c0.4,1,1,2,1.7,2.9c1.2,1.6,2.8,2.8,4.7,3.4C34.4,64.9,42.1,56.4,39.7,47.9z"/>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5.3113" y1="9.6691" x2="69.2278" y2="43.8664">
-			<stop  offset="0" style="stop-color:#905CFB"/>
-			<stop  offset="6.772543e-002" style="stop-color:#776CF9"/>
-			<stop  offset="0.1729" style="stop-color:#5681F7"/>
-			<stop  offset="0.2865" style="stop-color:#3B92F5"/>
-			<stop  offset="0.4097" style="stop-color:#269FF4"/>
-			<stop  offset="0.5474" style="stop-color:#17A9F3"/>
-			<stop  offset="0.7111" style="stop-color:#0FAEF2"/>
-			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
-		</linearGradient>
-		<path style="fill:url(#SVGID_2_);" d="M67.4,26.5c-1.4-2.2-3.4-3.9-5.7-4.9L25.5,1.7l0,0c-1-0.5-2.1-1-3.3-1.3
-			C6.7-3.2-4.4,13.8,5.5,27c1.5,2,3.6,3.6,6,4.5L48,47.9c0.8,0.5,1.6,0.8,2.5,1.1C64.5,53.4,75.1,38.6,67.4,26.5z"/>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-19.2836" y1="70.8198" x2="55.9833" y2="33.1863">
-			<stop  offset="0" style="stop-color:#3BEA62"/>
-			<stop  offset="0.117" style="stop-color:#31DE80"/>
-			<stop  offset="0.3025" style="stop-color:#24CEA8"/>
-			<stop  offset="0.4844" style="stop-color:#1AC1C9"/>
-			<stop  offset="0.6592" style="stop-color:#12B7DF"/>
-			<stop  offset="0.8238" style="stop-color:#0EB2ED"/>
-			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
-		</linearGradient>
-		<path style="fill:url(#SVGID_3_);" d="M67.4,26.5c-1.8-2.8-4.6-4.8-7.9-5.6c-3.5-0.8-6.8-0.5-9.6,0.7L11.4,36.1
-			c0,0-0.2,0.1-0.6,0.4C0.9,40.4-4,53.3,4,64c1.8,2.4,4.3,4.2,7.1,5c5.3,1.6,10.1,1,14-1.1c0,0,0.1,0,0.1,0l37.6-20.1
-			c0,0,0,0,0.1-0.1C69.5,43.9,72.6,34.6,67.4,26.5z"/>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="38.9439" y1="5.8503" x2="5.4232" y2="77.5093">
-			<stop  offset="0" style="stop-color:#3BEA62"/>
-			<stop  offset="9.397750e-002" style="stop-color:#2FDB87"/>
-			<stop  offset="0.196" style="stop-color:#24CEA8"/>
-			<stop  offset="0.3063" style="stop-color:#1BC3C3"/>
-			<stop  offset="0.4259" style="stop-color:#14BAD8"/>
-			<stop  offset="0.5596" style="stop-color:#10B5E7"/>
-			<stop  offset="0.7185" style="stop-color:#0DB1EF"/>
-			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
-		</linearGradient>
-		<path style="fill:url(#SVGID_4_);" d="M50.3,12.8c1.2-2.7,1.1-6-0.9-9c-1.1-1.8-2.9-3-4.9-3.5c-4.5-1.1-8.3,1-10.1,4.2L3.5,42
-			c0,0,0,0,0,0.1C-0.9,47.9-1.6,56.5,4,64c1.8,2.4,4.3,4.2,7.1,5c10.5,3.3,19.3-2.5,22.1-10.8L50.3,12.8z"/>
-	</g>
-	<g>
-		<rect x="13.4" y="13.4" style="fill:#000000;" width="43.2" height="43.2"/>
-		<rect x="17.5" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
-		<polygon style="fill:#FFFFFF;" points="22.9,22.7 17.5,22.7 17.5,19.1 32.3,19.1 32.3,22.7 26.8,22.7 26.8,37 22.9,37 		"/>
-		<path style="fill:#FFFFFF;" d="M32.5,28.1L32.5,28.1c0-5.1,3.8-9.3,9.3-9.3c3.4,0,5.4,1.1,7.1,2.8l-2.5,2.9c-1.4-1.3-2.8-2-4.6-2
-			c-3,0-5.2,2.5-5.2,5.6V28c0,3.1,2.1,5.6,5.2,5.6c2,0,3.3-0.8,4.7-2.1l2.5,2.5c-1.8,2-3.9,3.2-7.3,3.2
-			C36.4,37.3,32.5,33.2,32.5,28.1"/>
-	</g>
-</g>
-</svg>

README.md

@@ -1,30 +1,20 @@
 # <img width="24px" src="./Logo/256.png" alt="Sonarr"></img> Sonarr 
 
-[![Translated](https://translate.servarr.com/widgets/servarr/-/sonarr/svg-badge.svg)](https://translate.servarr.com/engage/servarr/)
-[![Backers on Open Collective](https://opencollective.com/Sonarr/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/Sonarr/sponsors/badge.svg)](#sponsors)
-[![Mega Sponsors on Open Collective](https://opencollective.com/Sonarr/megasponsors/badge.svg)](#mega-sponsors)
-
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows 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.
 
 ## Getting Started
 
-- [Download/Installation](https://sonarr.tv/#downloads-v3)
-- [FAQ](https://wiki.servarr.com/sonarr/faq)
-- [Wiki](https://wiki.servarr.com/Sonarr)
-- [v4 Beta API Documentation](https://sonarr.tv/docs/api)
-- [Donate](https://sonarr.tv/donate)
+- [Download](https://sonarr.tv/#download) (Linux, MacOS, Windows, Docker, etc.)
+- [Installation](https://github.com/Sonarr/Sonarr/wiki/Installation)
+- [FAQ](https://github.com/Sonarr/Sonarr/wiki/FAQ)
+- [Wiki](https://github.com/Sonarr/Sonarr/wiki)
+- [API Documentation](https://github.com/Sonarr/Sonarr/wiki/API)
 
 ## Support
 
-Note: GitHub Issues are for Bugs and Feature Requests Only
-
-- [Forums](https://forums.sonarr.tv/)
+- [Donate](https://sonarr.tv/donate)
 - [Discord](https://discord.gg/M6BvZn5)
-- [GitHub - Bugs and Feature Requests Only](https://github.com/Sonarr/Sonarr/issues)
-- [IRC](https://web.libera.chat/?channels=#sonarr)
 - [Reddit](https://www.reddit.com/r/sonarr)
-- [Wiki](https://wiki.servarr.com/sonarr)
 
 ## Features
 
@@ -42,40 +32,42 @@ Note: GitHub Issues are for Bugs and Feature Requests Only
 - Full support for specials and multi-episode releases
 - And a beautiful UI
 
-## Contributing
+## Configuring Development Environment:
 
-### Development
+### Requirements
 
-This project exists thanks to all the people who contribute. [Contribute](CONTRIBUTING.md).
+- [Visual Studio 2017](https://www.visualstudio.com/vs)
+- [Git](https://git-scm.com/downloads)
+- [NodeJS](https://nodejs.org/en/download)
+- [Yarn](https://yarnpkg.com)
 
-<a href="https://github.com/Sonarr/Sonarr/graphs/contributors"><img src="https://opencollective.com/Sonarr/contributors.svg?width=890&button=false" /></a>
+### Setup
 
-### Supporters
+- Make sure all the required software mentioned above are installed
+- Clone the repository recursively to get Sonarr and it's submodules
+    - You can do this by running `git clone --recursive https://github.com/Sonarr/Sonarr.git`
+- Install the required Node Packages using `yarn`
 
-This project would not be possible without the support of our users and software providers. 
-[**Become a sponsor or backer**](https://opencollective.com/sonarr) to help us out!
+### Backend Development
 
-#### Mega Sponsors
+- Run `yarn build` to build the UI
+- Open `Sonarr.sln` in Visual Studio
+- Make sure `Sonarr.Console` is set as the startup project
+- Build `Sonarr.Windows` and `Sonarr.Mono` projects
+- Build Solution
 
-[![Sponsors](https://opencollective.com/sonarr/tiers/mega-sponsor.svg?width=890)](https://opencollective.com/sonarr/contribute/mega-sponsor-21443/checkout)
+### UI Development
 
-#### Sponsors
-
-[![Flexible Sponsors](https://opencollective.com/sonarr/sponsors.svg?width=890)](https://opencollective.com/sonarr/contribute/sponsor-21457/checkout)
-
-#### Backers
-
-[![Backers](https://opencollective.com/sonarr/backers.svg?width=890)](https://opencollective.com/sonarr/contribute/backer-21442/checkout)
-
-#### JetBrains
-
-Thank you to [<img src="/Logo/Jetbrains/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
-
-* [<img src="/Logo/Jetbrains/teamcity.svg" alt="TeamCity" width="32"> TeamCity](http://www.jetbrains.com/teamcity/)
-* [<img src="/Logo/Jetbrains/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
-* [<img src="/Logo/Jetbrains/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
+- Run `yarn watch` to build UI and rebuild automatically when changes are detected
+- Run Sonarr.Console.exe (or debug in Visual Studio)
 
 ### Licenses
 
 - [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)	
-- Copyright 2010-2023
+- Copyright 2010-2020
+
+### Sponsors
+
+- [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
+    - [ReSharper](http://www.jetbrains.com/resharper/)
+    - [TeamCity](http://www.jetbrains.com/teamcity/)

SECURITY.md

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report (suspected) security vulnerabilities on Discord (preferred) to
-either markus101
-#2148 or Taloth#7357 or via email: security@sonarr.tv. 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,60 +1,122 @@
-#! /usr/bin/env bash
-set -e
+#! /bin/bash
+msBuildVersion='15.0'
+outputFolder='./_output'
+outputFolderWindows='./_output_windows'
+outputFolderLinux='./_output_linux'
+outputFolderMacOS='./_output_macos'
+outputFolderMacOSApp='./_output_macos_app'
+testPackageFolder='./_tests'
+testPackageFolderWindows='./_tests_windows'
+testPackageFolderLinux='./_tests_linux'
+sourceFolder='./src'
+slnFile=$sourceFolder/Sonarr.sln
+updateSubFolder=Sonarr.Update
 
-outputFolder='_output'
-testPackageFolder='_tests'
-artifactsFolder="_artifacts";
+nuget='tools/nuget/nuget.exe';
+vswhere='tools/vswhere/vswhere.exe';
+
+. ./version.sh
+
+CheckExitCode()
+{
+    "$@"
+    local status=$?
+    if [ $status -ne 0 ]; then
+        echo "error with $1" >&2
+        exit 1
+    fi
+    return $status
+}
 
 ProgressStart()
 {
     echo "##teamcity[blockOpened name='$1']"
     echo "##teamcity[progressStart '$1']"
-    echo "Start '$1'"
 }
 
 ProgressEnd()
 {
-    echo "Finish '$1'"
     echo "##teamcity[progressFinish '$1']"
     echo "##teamcity[blockClosed name='$1']"
 }
 
 UpdateVersionNumber()
 {
-    if [ "$SONARR_VERSION" != "" ]; then
-        echo "Updating version info to: $SONARR_VERSION"
-        sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$SONARR_VERSION<\/AssemblyVersion>/g" src/Directory.Build.props
-        sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BRANCH}<\/AssemblyConfiguration>/g" src/Directory.Build.props
-        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$SONARR_VERSION<\/string>/g" distribution/macOS/Sonarr.app/Contents/Info.plist
+    if [ "$BUILD_NUMBER" != "" ]; then
+        echo "Updating Version Info"
+        verMajorMinorRevision=`echo "$buildVersion" | cut -d. -f1,2,3`
+        verBuild=`echo "${BUILD_NUMBER}" | cut -d. -f4`
+        BUILD_NUMBER=$verMajorMinorRevision.$verBuild
+        echo "##teamcity[buildNumber '$BUILD_NUMBER']"
+        sed -i "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$BUILD_NUMBER<\/AssemblyVersion>/g" ./src/Directory.Build.props
+        sed -i "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BRANCH:-dev}<\/AssemblyConfiguration>/g" ./src/Directory.Build.props
     fi
 }
 
-EnableExtraPlatformsInSDK()
+CreateReleaseInfo()
 {
-    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/' "$BUNDLEDVERSIONS"
+    if [ "$BUILD_NUMBER" != "" ]; then
+        echo "Create Release Info"
+        echo -e "# Do Not Edit\nReleaseVersion=$BUILD_NUMBER\nBranch=${BRANCH:-dev}" > $outputFolder/release_info
     fi
 }
 
-EnableExtraPlatforms()
+CleanFolder()
 {
-    if grep -qv freebsd-x64 src/Directory.Build.props; then
-        sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64</RuntimeIdentifiers>^g" src/Directory.Build.props
+    local path=$1
+    local keepConfigFiles=$2
+
+    find $path -name "*.transform" -exec rm "{}" \;
+
+    if [ $keepConfigFiles != true ] ; then
+        find $path -name "*.dll.config" -exec rm "{}" \;
     fi
+
+    echo "Removing FluentValidation.Resources files"
+    find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
+    find $path -name "App.config" -exec rm "{}" \;
+
+    echo "Removing vshost files"
+    find $path -name "*.vshost.exe" -exec rm "{}" \;
+
+    echo "Removing dylib files"
+    find $path -name "*.dylib" -exec rm "{}" \;
+
+    echo "Removing Empty folders"
+    find $path -depth -empty -type d -exec rm -r "{}" \;
+}
+
+BuildWithMSBuild()
+{
+    msBuildPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -find MSBuild\\\\\*\*\\\\Bin\\\\MSBuild.exe`
+    msBuildPath=${msBuildPath/C:\\/\/c\/}
+    msBuildPath=${msBuildPath//\\/\/}
+    msBuildDir=$(dirname "$msBuildPath")
+
+    echo $msBuildDir
+
+    export PATH=$msBuildDir:$PATH
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m
+    $nuget restore $slnFile
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
+}
+
+BuildWithXbuild()
+{
+    export MONO_IOMAP=case
+    CheckExitCode msbuild /t:Clean $slnFile
+    mono $nuget restore $slnFile
+    CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
 }
 
 LintUI()
 {
     ProgressStart 'ESLint'
-    yarn lint
+    CheckExitCode yarn lint
     ProgressEnd 'ESLint'
 
     ProgressStart 'Stylelint'
-    yarn stylelint
+    CheckExitCode yarn stylelint
     ProgressEnd 'Stylelint'
 }
 
@@ -65,392 +127,318 @@ Build()
     rm -rf $outputFolder
     rm -rf $testPackageFolder
 
-    slnFile=src/Sonarr.sln
-
-    if [ $os = "windows" ]; then
-        platform=Windows
+    if [ $runtime = "dotnet" ] ; then
+        BuildWithMSBuild
     else
-        platform=Posix
+        BuildWithXbuild
     fi
 
-    dotnet clean $slnFile -c Debug
-    dotnet clean $slnFile -c Release
+    CleanFolder $outputFolder false
 
-    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
-    then
-        dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -t:PublishAllRids
-    else
-        dotnet msbuild -restore $slnFile -p:Configuration=Release -p:Platform=$platform -p:RuntimeIdentifiers=$RID -t:PublishAllRids
-    fi
+    echo "Removing Mono.Posix.dll"
+    rm $outputFolder/Mono.Posix.dll
 
     ProgressEnd 'Build'
 }
 
-YarnInstall()
+RunGulp()
 {
     ProgressStart 'yarn install'
-    yarn install --frozen-lockfile --network-timeout 120000
+    yarn install
     ProgressEnd 'yarn install'
+
+    LintUI
+
+    ProgressStart 'Running gulp'
+    CheckExitCode yarn run build --production
+    ProgressEnd 'Running gulp'
 }
 
-RunWebpack()
+CreateMdbs()
 {
-    ProgressStart 'Running webpack'
-    yarn run build --env production
-    ProgressEnd 'Running webpack'
-}
-
-PackageFiles()
-{
-    local folder="$1"
-    local framework="$2"
-    local runtime="$3"
-
-    rm -rf $folder
-    mkdir -p $folder
-    cp -r $outputFolder/$framework/$runtime/publish/* $folder
-    cp -r $outputFolder/Sonarr.Update/$framework/$runtime/publish $folder/Sonarr.Update
-    
-    if [ "$FRONTEND" = "YES" ];
-    then
-        cp -r $outputFolder/UI $folder
+    local path=$1
+    if [ $runtime = "dotnet" ] ; then
+        local pdbFiles=( $(find $path -name "*.pdb") )
+        for filename in "${pdbFiles[@]}"
+        do
+          if [ -e ${filename%.pdb}.dll ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
+          fi
+          if [ -e ${filename%.pdb}.exe ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
+          fi
+        done
     fi
-
-    echo "Adding LICENSE"
-    cp LICENSE.md $folder
 }
 
-PackageLinux()
+PatchMono()
 {
-    local framework="$1"
-    local runtime="$2"
+    local path=$1
 
-    ProgressStart "Creating $runtime Package for $framework"
+    # Below we deal with some mono incompatibilities with windows-only dotnet core/standard libs    
+    # See: https://github.com/mono/mono/blob/master/tools/nuget-hash-extractor/download.sh
+    # That list defines assemblies that are prohibited from being loaded from the appdir, instead loading from mono GAC.
 
-    local folder=$artifactsFolder/$runtime/$framework/Sonarr
+    # We have debian dependencies to get these installed or facades from mono 5.10+
+    for assembly in System.IO.Compression System.Runtime.InteropServices.RuntimeInformation System.Net.Http System.Globalization.Extensions System.Text.Encoding.CodePages System.Threading.Overlapped
+    do
+        if [ -e $path/$assembly.dll ]; then
+            if [ -e $sourceFolder/Libraries/Mono/$assembly.dll ]; then
+                echo "Copy Mono-specific facade $assembly.dll (uses win32 interop)"
+                cp $sourceFolder/Libraries/Mono/$assembly.dll $path/$assembly.dll
+            else
+                echo "Remove $assembly.dll (uses win32 interop)"
+                rm $path/$assembly.dll
+            fi
+            
+        fi
+    done
 
-    PackageFiles "$folder" "$framework" "$runtime"
+    # Copy more stable version of Vectors for mono <5.12
+    if [ -e $path/System.Numerics.Vectors.dll ]; then
+        packageDir="$HOME/.nuget/packages/system.numerics.vectors/4.5.0"
+
+        if [ ! -d "$HOME/.nuget/packages/system.numerics.vectors/4.5.0" ]; then
+            # May reside in the NuGetFallback folder, which is harder to find
+            # Download somewhere to get the real cache populated
+            if [ $runtime = "dotnet" ] ; then
+                $nuget install System.Numerics.Vectors -Version 4.5.0 -Output ./_temp/System.Numerics.Vectors
+            else
+                mono $nuget install System.Numerics.Vectors -Version 4.5.0 -Output ./_temp/System.Numerics.Vectors
+            fi
+            rm -rf ./_temp/System.Numerics.Vectors
+        fi
+        # Copy the netstandard2.0 version rather than net46
+        cp "$packageDir/lib/netstandard2.0/System.Numerics.Vectors.dll" $path/
+    fi
+}
+
+PackageMono()
+{
+    ProgressStart 'Creating Mono Package'
+
+    rm -rf $outputFolderLinux
+
+    echo "Copying Binaries"
+    cp -r $outputFolder $outputFolderLinux
+
+    echo "Creating MDBs"
+    CreateMdbs $outputFolderLinux
+
+    echo "Removing PDBs"
+    find $outputFolderLinux -name "*.pdb" -exec rm "{}" \;
 
     echo "Removing Service helpers"
-    rm -f $folder/ServiceUninstall.*
-    rm -f $folder/ServiceInstall.*
+    rm -f $outputFolderLinux/ServiceUninstall.*
+    rm -f $outputFolderLinux/ServiceInstall.*
+
+    echo "Removing native windows binaries Sqlite, MediaInfo"
+    rm -f $outputFolderLinux/sqlite3.*
+    rm -f $outputFolderLinux/MediaInfo.*
+
+    PatchMono $outputFolderLinux
+
+    echo "Adding Sonarr.Core.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $outputFolderLinux
+
+    # Remove Http binding redirect by renaming it
+    # We don't need this anymore once our minimum mono version is 5.10
+    sed -i "s/System.Net.Http/System.Net.Http.Mono/g" $outputFolderLinux/Sonarr.Console.exe.config
+
+    echo "Renaming Sonarr.Console.exe to Sonarr.exe"
+    rm $outputFolderLinux/Sonarr.exe*
+    for file in $outputFolderLinux/Sonarr.Console.exe*; do
+        mv "$file" "${file//.Console/}"
+    done
 
     echo "Removing Sonarr.Windows"
-    rm $folder/Sonarr.Windows.*
+    rm $outputFolderLinux/Sonarr.Windows.*
 
     echo "Adding Sonarr.Mono to UpdatePackage"
-    cp $folder/Sonarr.Mono.* $folder/Sonarr.Update
-    if [ "$framework" = "net6.0" ]; then
-        cp $folder/Mono.Posix.NETStandard.* $folder/Sonarr.Update
-        cp $folder/libMonoPosixHelper.* $folder/Sonarr.Update
-    fi
+    cp $outputFolderLinux/Sonarr.Mono.* $outputFolderLinux/$updateSubFolder/
 
-    ProgressEnd "Creating $runtime Package for $framework"
+    ProgressEnd 'Creating Mono Package'
 }
 
 PackageMacOS()
 {
-    local framework="$1"
-    local runtime="$2"
+    ProgressStart 'Creating MacOS Package'
 
-    ProgressStart "Creating $runtime Package for $framework"
+    rm -rf $outputFolderMacOS
+    mkdir $outputFolderMacOS
 
-    local folder=$artifactsFolder/$runtime/$framework/Sonarr
+    echo "Adding Startup script"
+    cp ./macOS/Sonarr $outputFolderMacOS
+    dos2unix $outputFolderMacOS/Sonarr
 
-    PackageFiles "$folder" "$framework" "$runtime"
+    echo "Copying Binaries"
+    cp -r $outputFolderLinux/* $outputFolderMacOS
 
-    echo "Removing Service helpers"
-    rm -f $folder/ServiceUninstall.*
-    rm -f $folder/ServiceInstall.*
+    echo "Adding sqlite dylibs"
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOS
 
-    echo "Removing Sonarr.Windows"
-    rm $folder/Sonarr.Windows.*
+    echo "Adding MediaInfo dylib"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOS
 
-    echo "Adding Sonarr.Mono to UpdatePackage"
-    cp $folder/Sonarr.Mono.* $folder/Sonarr.Update
-    if [ "$framework" = "net6.0" ]; then
-        cp $folder/Mono.Posix.NETStandard.* $folder/Sonarr.Update
-        cp $folder/libMonoPosixHelper.* $folder/Sonarr.Update
-    fi
-
-    ProgressEnd "Creating $runtime Package for $framework"
+    ProgressEnd 'Creating MacOS Package'
 }
 
 PackageMacOSApp()
 {
-    local framework="$1"
-    local runtime="$2"
+    ProgressStart 'Creating macOS App Package'
 
-    ProgressStart "Creating $runtime App Package for $framework"
+    rm -rf $outputFolderMacOSApp
+    mkdir $outputFolderMacOSApp
+    cp -r ./macOS/Sonarr.app $outputFolderMacOSApp
+    mkdir -p $outputFolderMacOSApp/Sonarr.app/Contents/MacOS
 
-    local folder=$artifactsFolder/$runtime-app/$framework
-
-    rm -rf $folder
-    mkdir -p $folder
-    cp -r distribution/macOS/Sonarr.app $folder
-    mkdir -p $folder/Sonarr.app/Contents/MacOS
+    echo "Adding Startup script"
+    cp ./macOS/Sonarr $outputFolderMacOSApp/Sonarr.app/Contents/MacOS
+    dos2unix $outputFolderMacOSApp/Sonarr.app/Contents/MacOS/Sonarr
 
     echo "Copying Binaries"
-    cp -r $artifactsFolder/$runtime/$framework/Sonarr/* $folder/Sonarr.app/Contents/MacOS
+    cp -r $outputFolderLinux/* $outputFolderMacOSApp/Sonarr.app/Contents/MacOS
+
+    echo "Adding sqlite dylibs"
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOSApp/Sonarr.app/Contents/MacOS
+
+    echo "Adding MediaInfo dylib"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOSApp/Sonarr.app/Contents/MacOS
 
     echo "Removing Update Folder"
-    rm -r $folder/Sonarr.app/Contents/MacOS/Sonarr.Update
+    rm -r $outputFolderMacOSApp/Sonarr.app/Contents/MacOS/Sonarr.Update
 
-    ProgressEnd "Creating $runtime App Package for $framework"
+    ProgressEnd 'Creating macOS App Package'
+}
+
+PackageTestsMono()
+{
+    ProgressStart 'Creating Mono Test Package'
+
+    rm -rf $testPackageFolderLinux
+
+    echo "Copying Binaries"
+    cp -r $testPackageFolder $testPackageFolderLinux
+
+    if [ $runtime = "dotnet" ] ; then
+        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderLinux
+    else
+        mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderLinux
+    fi
+
+    echo "Creating MDBs"
+    CreateMdbs $testPackageFolderLinux
+
+    echo "Removing PDBs"
+    find $testPackageFolderLinux -name "*.pdb" -exec rm "{}" \;
+
+    PatchMono $testPackageFolderLinux
+
+    echo "Adding Sonarr.Core.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $testPackageFolderLinux
+
+    # Remove Http binding redirect by renaming it
+    # We don't need this anymore once our minimum mono version is 5.10
+    sed -i "s/System.Net.Http/System.Net.Http.Mono/g" $testPackageFolderLinux/Sonarr.Common.Test.dll.config
+
+    cp ./test.sh $testPackageFolderLinux/
+    dos2unix $testPackageFolderLinux/test.sh
+
+    echo "Removing Sonarr.Windows"
+    rm $testPackageFolderLinux/Sonarr.Windows.*
+
+    rm -f $testPackageFolderLinux/*.log.config
+
+    CleanFolder $testPackageFolderLinux true
+
+    ProgressEnd 'Creating Linux Test Package'
+}
+
+PackageTestsWindows()
+{
+    ProgressStart 'Creating Windows Test Package'
+
+    rm -rf $testPackageFolderWindows
+
+    echo "Copying Binaries"
+    cp -r $testPackageFolder $testPackageFolderWindows
+
+    if [ $runtime = "dotnet" ] ; then
+        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderWindows
+    else
+        mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolderWindows
+    fi
+
+    cp ./test.sh $testPackageFolderWindows
+
+    echo "Removing Sonarr.Mono"
+    rm -f $testPackageFolderWindows/Sonarr.Mono.*
+
+    rm -f $testPackageFolderWindows/*.log.config
+
+    CleanFolder $testPackageFolderWindows true
+
+    ProgressEnd 'Creating Windows Test Package'
 }
 
 PackageWindows()
 {
-    local framework="$1"
-    local runtime="$2"
+    ProgressStart 'Creating Windows Package'
 
-    ProgressStart "Creating Windows Package for $framework"
-
-    local folder=$artifactsFolder/$runtime/$framework/Sonarr
-
-    PackageFiles "$folder" "$framework" "$runtime"
-    cp -r $outputFolder/$framework-windows/$runtime/publish/* $folder
+    rm -rf $outputFolderWindows
+    
+    echo "Copying Binaries"
+    cp -r $outputFolder $outputFolderWindows
 
     echo "Removing Sonarr.Mono"
-    rm -f $folder/Sonarr.Mono.*
-    rm -f $folder/Mono.Posix.NETStandard.*
-    rm -f $folder/libMonoPosixHelper.*
+    rm -f $outputFolderWindows/Sonarr.Mono.*
 
     echo "Adding Sonarr.Windows to UpdatePackage"
-    cp $folder/Sonarr.Windows.* $folder/Sonarr.Update
+    cp $outputFolderWindows/Sonarr.Windows.* $outputFolderWindows/$updateSubFolder/
 
-    ProgressEnd "Creating Windows Package for $framework"
+    ProgressEnd 'Creating Windows Package'
 }
 
-Package()
+PublishArtifacts()
 {
-    local framework="$1"
-    local runtime="$2"
-    local SPLIT
-
-    IFS='-' read -ra SPLIT <<< "$runtime"
-
-    case "${SPLIT[0]}" in
-        linux|freebsd*)
-            PackageLinux "$framework" "$runtime"
-            ;;
-        win)
-            PackageWindows "$framework" "$runtime"
-            ;;
-        osx)
-            PackageMacOS "$framework" "$runtime"
-            ;;
-    esac
-}
-
-PackageTests()
-{
-    local framework="$1"
-    local runtime="$2"
-
-    ProgressStart "Creating $runtime Test Package for $framework"
-
-    cp test.sh "$testPackageFolder/$framework/$runtime/publish"
-
-    rm -f $testPackageFolder/$framework/$runtime/*.log.config
-
-    ProgressEnd "Creating $runtime Test Package for $framework"
-}
-
-UploadTestArtifacts()
-{
-    local framework="$1"
-
-    ProgressStart 'Publishing Test Artifacts'
-
-    # Tests
-    for dir in $testPackageFolder/$framework/*
-    do
-        local runtime=$(basename "$dir")
-        echo "##teamcity[publishArtifacts '$testPackageFolder/$framework/$runtime/publish/** => tests.$runtime.zip']"
-    done
-
-    ProgressEnd 'Publishing Test Artifacts'
-}
-
-UploadArtifacts()
-{
-    local framework="$1"
-
     ProgressStart 'Publishing Artifacts'
 
+    # Tests
+    echo "##teamcity[publishArtifacts '$testPackageFolderWindows/** => tests.windows.zip']"
+    echo "##teamcity[publishArtifacts '$testPackageFolderLinux/** => tests.linux.zip']"
+
     # Releases
-    for dir in $artifactsFolder/*
-    do
-        local runtime=$(basename "$dir")
-
-        echo "##teamcity[publishArtifacts '$artifactsFolder/$runtime/$framework/** => Sonarr.$BRANCH.$SONARR_VERSION.$runtime.zip']"
-    done
-
-    # Debian Package / Windows installer / macOS app
+    echo "##teamcity[publishArtifacts '$outputFolderWindows/** => Sonarr.$BRANCH.$BUILD_NUMBER.windows.zip!Sonarr']"
+    echo "##teamcity[publishArtifacts '$outputFolderLinux/** => Sonarr.$BRANCH.$BUILD_NUMBER.linux.tar.gz!Sonarr']"
+    echo "##teamcity[publishArtifacts '$outputFolderMacOS/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.tar.gz!Sonarr']"
+    echo "##teamcity[publishArtifacts '$outputFolderMacOSApp/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.zip']"
+    
+    # Debian Package
     echo "##teamcity[publishArtifacts 'distribution/** => distribution.zip']"
-
+    
     ProgressEnd 'Publishing Artifacts'
 }
 
-UploadUIArtifacts()
-{
-    local framework="$1"
-
-    ProgressStart 'Publishing UI Artifacts'
-
-    # UI folder
-    echo "##teamcity[publishArtifacts '$outputFolder/UI/** => UI.zip']"
-
-    ProgressEnd 'Publishing UI Artifacts'
-}
-
 # Use mono or .net depending on OS
 case "$(uname -s)" in
     CYGWIN*|MINGW32*|MINGW64*|MSYS*)
         # on windows, use dotnet
-        os="windows"
+        runtime="dotnet"
         ;;
     *)
         # otherwise use mono
-        os="posix"
+        runtime="mono"
         ;;
 esac
 
-POSITIONAL=()
-
-if [ $# -eq 0 ]; then
-    echo "No arguments provided, building everything"
-    BACKEND=YES
-    FRONTEND=YES
-    PACKAGES=YES
-    LINT=YES
-    ENABLE_EXTRA_PLATFORMS=NO
-    ENABLE_EXTRA_PLATFORMS_IN_SDK=NO
-fi
-
-while [[ $# -gt 0 ]]
-do
-key="$1"
-
-case $key in
-    --backend)
-        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
-        shift # past value
-        ;;
-    -f|--framework)
-        FRAMEWORK="$2"
-        shift # past argument
-        shift # past value
-        ;;
-    --frontend)
-        FRONTEND=YES
-        shift # past argument
-        ;;
-    --packages)
-        PACKAGES=YES
-        shift # past argument
-        ;;
-    --lint)
-        LINT=YES
-        shift # past argument
-        ;;
-    --all)
-        BACKEND=YES
-        FRONTEND=YES
-        PACKAGES=YES
-        LINT=YES
-        shift # past argument
-        ;;
-    *)    # unknown option
-        POSITIONAL+=("$1") # save it in an array for later
-        shift # past argument
-        ;;
-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 "net6.0" "win-x86"
-        PackageTests "net6.0" "linux-x64"
-        PackageTests "net6.0" "linux-musl-x64"
-        PackageTests "net6.0" "osx-x64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
-        then
-            PackageTests "net6.0" "freebsd-x64"
-        fi
-    else
-        PackageTests "$FRAMEWORK" "$RID"
-    fi
-
-    UploadTestArtifacts "net6.0"
-fi
-
-if [ "$FRONTEND" = "YES" ];
-then
-    YarnInstall
-
-    if [ "$LINT" = "YES" ];
-    then
-        LintUI
-    fi
-
-    RunWebpack
-    UploadUIArtifacts
-fi
-
-if [ "$PACKAGES" = "YES" ];
-then
-    UpdateVersionNumber
-
-    if [[ -z "$RID" || -z "$FRAMEWORK" ]];
-    then
-        Package "net6.0" "win-x64"
-        Package "net6.0" "win-x86"
-        Package "net6.0" "linux-x64"
-        Package "net6.0" "linux-musl-x64"
-        Package "net6.0" "linux-arm64"
-        Package "net6.0" "linux-musl-arm64"
-        Package "net6.0" "linux-arm"
-        Package "net6.0" "osx-x64"
-        Package "net6.0" "osx-arm64"
-        if [ "$ENABLE_EXTRA_PLATFORMS" = "YES" ];
-        then
-            Package "net6.0" "freebsd-x64"
-        fi
-    else
-        Package "$FRAMEWORK" "$RID"
-    fi
-
-    UploadArtifacts "net6.0"
-fi
+UpdateVersionNumber
+Build
+CreateReleaseInfo
+RunGulp
+PackageMono
+PackageMacOS
+PackageMacOSApp
+PackageTestsMono
+PackageTestsWindows
+PackageWindows
+PublishArtifacts

distribution/debian.sh

@@ -1,9 +1,8 @@
 fromdos ./debian/*
-chmod ugo-x ./debian/*
 cp -r ./debian ./debian_backup
 
-BuildVersion=${dependent_build_number:-4.10.0.999}
-BuildBranch=${dependent_build_branch:-main}
+BuildVersion=${dependent_build_number:-3.10.0.999}
+BuildBranch=${dependent_build_branch:-master}
 BootstrapVersion=`echo "$BuildVersion" | cut -d. -f1,2,3`
 BootstrapUpdater="BuiltIn"
 PackageUpdater="apt"
@@ -17,7 +16,7 @@ echo Updating changelog for $BuildVersion
 sed -i "s:{version}:$BuildVersion:g; s:{branch}:$BuildBranch:g;" debian/changelog
 sed -i "s:{version}:$BuildVersion:g; s:{updater}:$PackageUpdater:g" debian/preinst debian/postinst debian/postrm
 sed -i '/#BEGIN BUILTIN UPDATER/,/#END BUILTIN UPDATER/d' debian/preinst debian/postinst debian/postrm
-echo "# Do Not Edit\nPackageVersion=$BuildVersion\nPackageAuthor=[Team Sonarr](https://sonarr.tv)\nReleaseVersion=$BuildVersion\nUpdateMethod=$PackageUpdater\nBranch=$BuildBranch" > package_info
+echo "# Do Not Edit\nPackageVersion=$BuildVersion\nReleaseVersion=$BuildVersion\nUpdateMethod=$PackageUpdater\nBranch=$BuildBranch" > package_info
 
 echo Running debuild for $BuildVersion
 if [ -z "${TEST_OUTPUT}" ]; then
@@ -34,7 +33,7 @@ echo Updating changelog for $BootstrapVersion
 sed -i "s:{version}:$BootstrapVersion:g; s:{branch}:$BuildBranch:g;" debian/changelog
 sed -i "s:{version}:$BuildVersion:g; s:{updater}:$BootstrapUpdater:g" debian/preinst debian/postinst debian/postrm
 sed -i '/#BEGIN BUILTIN UPDATER/d; /#END BUILTIN UPDATER/d' debian/preinst debian/postinst debian/postrm
-echo "# Do Not Edit\nPackageVersion=$BootstrapVersion\nPackageAuthor=[Team Sonarr](https://sonarr.tv)\nReleaseVersion=$BuildVersion\nUpdateMethod=$BootstrapUpdater\nBranch=$BuildBranch" > package_info
+echo "# Do Not Edit\nPackageVersion=$BootstrapVersion\nReleaseVersion=$BuildVersion\nUpdateMethod=$BootstrapUpdater\nBranch=$BuildBranch" > package_info
 
 echo Running debuild for $BootstrapVersion
 if [ -z "${TEST_OUTPUT}" ]; then

distribution/debian/compat

@@ -1 +1 @@
-10
+8

distribution/debian/config

@@ -8,10 +8,7 @@ db_input high sonarr/owning_group || true
 db_endblock
 db_go
 
-db_beginblock
-db_input low sonarr/owning_umask || true
 db_input low sonarr/config_directory || true
-db_endblock
 db_go
 
 exit 0

distribution/debian/control

@@ -5,14 +5,18 @@ Source: sonarr
 Homepage: https://sonarr.tv
 Vcs-Git: git@github.com:Sonarr/Sonarr.git
 Vcs-Browser: https://github.com/Sonarr/Sonarr
-Build-Depends: debhelper (>= 9),
-  dh-systemd (>= 1.5)
+Build-Depends:  debhelper (>= 9),
+                dh-systemd (>= 1.5),
+                mono-devel (>= 5.18),
+                libmono-cil-dev (>= 5.18),
+                cli-common-dev (>= 0.9+xamarin5)
 
 Package: sonarr
 Architecture: all
 Provides: nzbdrone
 Conflicts: nzbdrone
 Replaces: nzbdrone
-Depends: adduser, libsqlite3-0 (>= 3.7), ${cli:Depends}, ${misc:Depends}
-Suggests: sqlite3 (>= 3.7)
+Depends: adduser, libsqlite3-0 (>= 3.7), libmediainfo0v5 (>= 0.7.52) | libmediainfo0 (>= 0.7.52), mono-runtime (>= 5.18), ca-certificates-mono, libmono-system-net-http4.0-cil (>= 4.0.0~alpha1), ${cli:Depends}, ${misc:Depends}
+Recommends: libmediainfo0v5 (>= 18.03) | libmediainfo0 (>= 18.03)
+Suggests: sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
 Description: Internet PVR

distribution/debian/postinst

@@ -9,8 +9,6 @@ db_get sonarr/owning_user
 USER="$RET"
 db_get sonarr/owning_group
 GROUP="$RET"
-db_get sonarr/owning_umask
-UMASK="$RET"
 db_get sonarr/config_directory
 CONFDIR="$RET"
 
@@ -66,11 +64,9 @@ fi
 # Create data directory
 if [ ! -d "$CONFDIR" ]; then
   mkdir -p "$CONFDIR"
+  chown -R $USER:$GROUP "$CONFDIR"
 fi
 
-# Set permissions on data directory (always do this instead only on creation in case user was changed via dpkg-reconfigure)
-chown -R $USER:$GROUP "$CONFDIR"
-
 #BEGIN BUILTIN UPDATER
 # Apply patch if present
 if [ "$UPDATER" = "BuiltIn" ] && [ -f /usr/lib/sonarr/bin_patch/release_info ]; then
@@ -96,7 +92,7 @@ fi
 chown -R $USER:$GROUP /usr/lib/sonarr
 
 # Update sonarr.service file
-sed -i "s:User=\w*:User=$USER:g; s:Group=\w*:Group=$GROUP:g; s:UMask=[0-9]*:UMask=$UMASK:g; s:-data=.*$:-data=$CONFDIR:g" /lib/systemd/system/sonarr.service
+sed -i "s:User=sonarr:User=$USER:g; s:Group=sonarr:Group=$GROUP:g; s:-data=/var/lib/sonarr:-data=$CONFDIR:g" /lib/systemd/system/sonarr.service
 
 #BEGIN BUILTIN UPDATER
 if [ "$UPDATER" = "BuiltIn" ]; then

distribution/debian/preinst

@@ -9,7 +9,7 @@ UPDATER={updater}
 # Existing nzbdrone packages do not have startup scripts and the process might still be running.
 # If the user manually installed nzbdrone then the process might still be running too.
 if [ $1 = "install" ]; then
-  psNzbDrone=`ps ax -o'user:20,pid,ppid,unit,args' | grep mono.*NzbDrone\\\\.exe || true`
+  psNzbDrone=`ps ax -o'user,pid,ppid,unit,args' | grep mono.*NzbDrone\\\\.exe || true`
   if [ ! -z "$psNzbDrone" ]; then
     # Get the user and optional systemd unit
     psNzbDroneUser=`echo "$psNzbDrone" | tr -s ' ' | cut -d ' ' -f 1`

distribution/debian/rules

@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-EXCLUDE_MODULEREFS = crypt32 httpapi __Internal ole32.dll
+EXCLUDE_MODULEREFS = crypt32 httpapi __Internal ole32.dll libmonosgen-2.0 clr mscorlib mscoree.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.DiaSymReader.Native.amd64.dll
 
 %:
 	dh $@ --with=systemd --with=cli

distribution/debian/sonarr.clideps-override

@@ -1,2 +1,2 @@
 ignores msbuild
-ignores libc6
+ignores libmediainfo0v5

distribution/debian/sonarr.service

@@ -1,6 +1,3 @@
-# This file is owned by the sonarr package, DO NOT MODIFY MANUALLY
-# Instead use 'dpkg-reconfigure -plow sonarr' to modify User/Group/UMask/-data
-# Or use systemd built-in override functionality using 'systemctl edit sonarr'
 [Unit]
 Description=Sonarr Daemon
 After=network.target
@@ -11,7 +8,7 @@ Group=sonarr
 UMask=002
 
 Type=simple
-ExecStart=/usr/lib/sonarr/bin/Sonarr -nobrowser -data=/var/lib/sonarr
+ExecStart=/usr/bin/mono --debug /usr/lib/sonarr/bin/Sonarr.exe -nobrowser -data=/var/lib/sonarr
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure

distribution/debian/templates

@@ -14,12 +14,6 @@ Description: Sonarr group:
   Any media files created by Sonarr will be writeable by this group.
   It's advisable to keep the group the same between download client, Sonarr and media centers.
 
-Template: sonarr/owning_umask
-Type: string
-Default: 0002
-Description: Sonarr umask:
-  Specifies the umask of the files created by Sonarr. 0002 means the files will be created with 664 as permissions.
-
 Template: sonarr/config_directory
 Type: string
 Default: /var/lib/sonarr

distribution/docker-build/Dockerfile

@@ -1,25 +1,16 @@
-FROM ubuntu:focal AS builder
+FROM ubuntu:xenial AS builder
 
 ENV DEBIAN_FRONTEND noninteractive 
 ENV MONO_VERSION 5.18
 
-RUN apt-get update && \
-    apt-get -y -o Dpkg::Options::="--force-confold" install --no-install-recommends \
-        apt-transport-https \
-        wget dirmngr gpg gpg-agent \
-        # add-apt-repository for PPAs
-        software-properties-common && \
-    rm -rf /var/lib/apt/lists/*
-	
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-    echo "deb http://download.mono-project.com/repo/debian stable-focal main" > /etc/apt/sources.list.d/mono-official-stable.list && \
+    echo "deb http://download.mono-project.com/repo/debian stable-xenial/snapshots/$MONO_VERSION main" > /etc/apt/sources.list.d/mono-official-stable.list && \
     apt-get update && apt-get install -y \ 
         devscripts build-essential tofrodos \
         dh-make dh-systemd \
         cli-common-dev \
         mono-complete \
-        sqlite3 libcurl4 mediainfo
-RUN apt-get upgrade -y
+        sqlite3 libcurl3 mediainfo
 
 RUN apt-cache policy mono-complete
 RUN apt-cache policy cli-common-dev

distribution/windows/setup/build.bat

@@ -1,10 +0,0 @@
-@REM SET SONARR_MAJOR_VERSION=4
-@REM SET SONARR_VERSION=4.0.0.5
-@REM SET BRANCH=develop
-@REM SET FRAMEWORK=net6.0
-@REM SET RUNTIME=win-x64
-echo ##teamcity[progressStart 'Building setup file']
-inno\ISCC.exe sonarr.iss
-echo ##teamcity[progressFinish 'Building setup file']
-
-echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*%RUNTIME%*.exe']

distribution/windows/setup/sonarr.iss

@@ -1,86 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define AppName "Sonarr"
-#define AppPublisher "Team Sonarr"
-#define AppURL "https://sonarr.tv/"
-#define ForumsURL "https://forums.sonarr.tv/"
-#define AppExeName "Sonarr.exe"
-#define BuildNumber "4.0"
-#define BuildNumber GetEnv('SONARR_VERSION')
-#define MajorVersion GetEnv('SONARR_MAJOR_VERSION')
-#define BranchName GetEnv('BRANCH')
-#define Framework GetEnv('FRAMEWORK')
-#define Runtime GetEnv('RUNTIME')
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this appl ication.
-; 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-6F73F67F7F71}
-AppName={#AppName}
-AppVersion={#MajorVersion}
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#ForumsURL}
-AppUpdatesURL={#AppURL}
-UsePreviousAppDir=no
-DefaultDirName={commonappdata}\Sonarr\bin
-DisableDirPage=yes
-DefaultGroupName={#AppName}
-DisableProgramGroupPage=yes
-OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.{#Runtime}-installer
-SolidCompression=yes
-AppCopyright=Creative Commons 3.0 License
-AllowUNCPath=False
-UninstallDisplayIcon={app}\Sonarr.exe
-DisableReadyPage=True
-CompressionThreads=2
-Compression=lzma2/normal
-AppContact={#ForumsURL}
-VersionInfoVersion={#MajorVersion}
-SetupLogging=yes
-OutputDir=output
-AppverName={#AppName}
-
-[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 unchecked
-Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive
-Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
-
-[Files]
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Sonarr\Sonarr.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\..\..\_artifacts\{#Runtime}\{#Framework}\Sonarr\*"; Excludes: "Sonarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"; Tasks: desktopIcon
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\Sonarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
-
-[InstallDelete]
-Name: "{commonappdata}\NzbDrone\bin"; Type: filesandordirs
-Name: "{app}"; Type: filesandordirs
-
-[Run]
-Filename: "{app}\Sonarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u /exitimmediately"; Flags: runhidden waituntilterminated;
-Filename: "{app}\Sonarr.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}\Sonarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i /exitimmediately"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\Sonarr.exe"; Description: "Open Sonarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\Sonarr.exe"; Description: "Start Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
-
-[UninstallRun]
-Filename: "{app}\Sonarr.Console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated skipifdoesntexist
-
-[Code]
-function PrepareToInstall(var NeedsRestart: Boolean): String;
-var
-  ResultCode: Integer;
-begin
-  Exec('net', 'stop nzbdrone', '', 0, ewWaitUntilTerminated, ResultCode)
-  Exec('sc', 'delete nzbdrone', '', 0, ewWaitUntilTerminated, ResultCode)
-end;

docker/tests/mono/complete/Dockerfile

@@ -17,9 +17,6 @@ RUN  fromdos /startup.sh
 
 WORKDIR /data/
 VOLUME ["/data/_tests_linux", "/data/_output_linux", "/data/_tests_results"]
- 
-RUN groupadd sonarrtst -g 4020 && useradd sonarrtst -u 4021 -g 4020 -m -s /bin/bash
-USER sonarrtst
 
 CMD bash /startup.sh
 

docker/tests/mono/sonarr/Dockerfile

@@ -25,8 +25,5 @@ RUN  fromdos /startup.sh
 WORKDIR /data/
 VOLUME ["/data/_tests_linux", "/data/_output_linux", "/data/_tests_results"]
 
-RUN groupadd sonarrtst -g 4020 && useradd sonarrtst -u 4021 -g 4020 -m -s /bin/bash
-USER sonarrtst
-
 CMD bash /startup.sh
 

docs.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-set -e
-
-PLATFORM=$1
-
-if [ "$PLATFORM" = "Windows" ]; then
-  RUNTIME="win-x64"
-elif [ "$PLATFORM" = "Linux" ]; then
-  RUNTIME="linux-x64"
-elif [ "$PLATFORM" = "Mac" ]; then
-  RUNTIME="osx-x64"
-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/Sonarr.sln
-
-platform=Posix
-
-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.5.0 Swashbuckle.AspNetCore.Cli
-
-dotnet tool run swagger tofile --output ./src/Sonarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/Sonarr.dll" v3 &
-
-sleep 30
-
-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

@@ -0,0 +1,293 @@
+{
+  "parser": "babel-eslint",
+
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "node": true,
+    "es6": true
+  },
+
+  "globals": {
+    "expect": false,
+    "chai": false,
+    "sinon": false
+  },
+
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "modules": true,
+      "impliedStrict": true
+    }
+  },
+
+  "plugins": [
+    "filenames",
+    "react"
+  ],
+
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+
+  "rules": {
+    "filenames/match-exported": ["error"],
+
+    # ECMAScript 6
+
+    "arrow-body-style": [0],
+    "arrow-parens": ["error", "always"],
+    "arrow-spacing": ["error", { "before": true, "after": true }],
+    "constructor-super": "error",
+    "generator-star-spacing": "off",
+    "no-class-assign": "error",
+    "no-confusing-arrow": "error",
+    "no-const-assign": "error",
+    "no-dupe-class-members": "error",
+    "no-duplicate-imports": "error",
+    "no-new-symbol": "error",
+    "no-this-before-super": "error",
+    "no-useless-escape": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-constructor": "error",
+    "no-var": "warn",
+    "object-shorthand": ["error", "properties"],
+    "prefer-arrow-callback": "error",
+    "prefer-const": "warn",
+    "prefer-reflect": "off",
+    "prefer-rest-params": "off",
+    "prefer-spread": "warn",
+    "prefer-template": "error",
+    "require-yield": "off",
+    "template-curly-spacing": ["error", "never"],
+    "yield-star-spacing": "off",
+
+    # Possible Errors
+
+    "comma-dangle": "error",
+    "no-cond-assign": "error",
+    "no-console": "off",
+    "no-constant-condition": "warn",
+    "no-control-regex": "error",
+    "no-debugger": "off",
+    "no-dupe-args": "error",
+    "no-dupe-keys": "error",
+    "no-duplicate-case": "error",
+    "no-empty": "warn",
+    "no-empty-character-class": "error",
+    "no-ex-assign": "error",
+    "no-extra-boolean-cast": "error",
+    "no-extra-parens": ["error", "functions"],
+    "no-extra-semi": "error",
+    "no-func-assign": "error",
+    "no-inner-declarations": "error",
+    "no-invalid-regexp": "error",
+    "no-irregular-whitespace": "error",
+    "no-negated-in-lhs": "error",
+    "no-obj-calls": "error",
+    "no-regex-spaces": "error",
+    "no-sparse-arrays": "error",
+    "no-unexpected-multiline": "error",
+    "no-unreachable": "warn",
+    "no-unsafe-finally": "error",
+    "use-isnan": "error",
+    "valid-jsdoc": "off",
+    "valid-typeof": "error",
+
+    # Best Practices
+
+    "accessor-pairs": "off",
+    "array-callback-return": "warn",
+    "block-scoped-var": "warn",
+    "consistent-return": "off",
+    "curly": "error",
+    "default-case": "error",
+    "dot-location": ["error", "property"],
+    "dot-notation": "error",
+    "eqeqeq": ["error", "smart"],
+    "guard-for-in": "error",
+    "no-alert": "warn",
+    "no-caller": "error",
+    "no-case-declarations": "error",
+    "no-div-regex": "error",
+    "no-else-return": "error",
+    "no-empty-function": ["error", {"allow": ["arrowFunctions"]}],
+    "no-empty-pattern": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-fallthrough": "error",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": ["error", {
+        "boolean": false,
+        "number": true,
+        "string": true,
+        "allow": [/* "!!", "~", "*", "+" */]
+    }],
+    "no-implicit-globals": "error",
+    "no-implied-eval": "error",
+    "no-invalid-this": "off",
+    "no-iterator": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-loop-func": "error",
+    "no-magic-numbers": ["off", {"ignoreArrayIndexes": true, "ignore": [0, 1] }],
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-native-reassign": ["error", {"exceptions": ["console"]}],
+    "no-new": "off",
+    "no-new-func": "error",
+    "no-new-wrappers": "error",
+    "no-octal": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "off",
+    "no-process-env": "off",
+    "no-proto": "error",
+    "no-redeclare": "error",
+    "no-return-assign": "warn",
+    "no-script-url": "error",
+    "no-self-assign": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-throw-literal": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unused-expressions": "error",
+    "no-unused-labels": "error",
+    "no-useless-call": "error",
+    "no-useless-concat": "error",
+    "no-void": "error",
+    "no-warning-comments": "off",
+    "no-with": "error",
+    "radix": ["error", "as-needed"],
+    "vars-on-top": "off",
+    "wrap-iife": ["error", "inside"],
+    "yoda": "error",
+
+    # Strict Mode
+
+    "strict": ["error", "never"],
+
+    # Variables
+
+    "init-declarations": ["error", "always"],
+    "no-catch-shadow": "error",
+    "no-delete-var": "error",
+    "no-label-var": "error",
+    "no-restricted-globals": "off",
+    "no-shadow": "error",
+    "no-shadow-restricted-names": "error",
+    "no-undef": "error",
+    "no-undef-init": "off",
+    "no-undefined": "off",
+    "no-unused-vars": ["error", { "args": "none", "ignoreRestSiblings": true }],
+    "no-use-before-define": "error",
+
+    # Node.js and CommonJS
+
+    "callback-return": "warn",
+    "global-require": "error",
+    "handle-callback-err": "warn",
+    "no-mixed-requires": "error",
+    "no-new-require": "error",
+    "no-path-concat": "error",
+    "no-process-exit": "error",
+
+    # Stylistic Issues
+
+    "array-bracket-spacing": ["error", "never"],
+    "block-spacing": ["error", "always"],
+    "brace-style": ["error", "1tbs", { "allowSingleLine": false }],
+    "camelcase": "off",
+    "comma-spacing": ["error", {"before": false, "after": true}],
+    "comma-style": ["error", "last"],
+    "computed-property-spacing": ["error", "never"],
+    "consistent-this": ["error", "self"],
+    "eol-last": "error",
+    "func-names": "off",
+    "func-style": ["error", "declaration"],
+    "indent": ["error", 2, {"SwitchCase": 1}],
+    "key-spacing": ["error", {"beforeColon": false, "afterColon": true}],
+    "keyword-spacing": ["error", { "before": true, "after": true}],
+    "lines-around-comment": ["error", { "beforeBlockComment": true, "afterBlockComment": false }],
+    "max-depth": ["error", {"maximum": 5}],
+    "max-nested-callbacks": ["error", 4],
+    "max-statements": "off",
+    "max-statements-per-line": ["error", { "max": 1 }],
+    "new-cap": ["error", {"capIsNewExceptions": ["$.Deferred", "DragDropContext", "DragLayer", "DragSource", "DropTarget"]}],
+    "new-parens": "error",
+    "newline-after-var": "off",
+    "newline-before-return": "off",
+    "newline-per-chained-call": "off",
+    "no-array-constructor": "error",
+    "no-bitwise": "error",
+    "no-continue": "error",
+    "no-inline-comments": "off",
+    "no-lonely-if": "warn",
+    "no-mixed-spaces-and-tabs": "error",
+    "no-multiple-empty-lines": ["error", { "max": 1 }],
+    "no-negated-condition": "warn",
+    "no-nested-ternary": "error",
+    "no-new-object": "error",
+    "no-plusplus": "off",
+    "no-restricted-syntax": "off",
+    "no-spaced-func": "error",
+    "no-ternary": "off",
+    "no-trailing-spaces": "error",
+    "no-underscore-dangle": ["error", { "allowAfterThis": true }],
+    "no-unneeded-ternary": "error",
+    "no-whitespace-before-property": "error",
+    "object-curly-spacing": ["error", "always"],
+    "one-var": ["error", "never"],
+    "one-var-declaration-per-line": ["error", "always"],
+    "operator-assignment": ["off", "never"],
+    "operator-linebreak": ["error", "after"],
+    "quote-props": ["error", "as-needed"],
+    "quotes": ["error", "single"],
+    "require-jsdoc": "off",
+    "semi": "error",
+    "semi-spacing": ["error", { "before": false, "after": true }],
+    "sort-vars": "off",
+    "space-before-blocks": ["error", "always"],
+    "space-before-function-paren": ["error", "never"],
+    "space-in-parens": "off",
+    "space-infix-ops": "off",
+    "space-unary-ops": "off",
+    "spaced-comment": "error",
+    "wrap-regex": "error",
+
+    # React
+
+    "react/jsx-boolean-value": [2, "always"],
+    "react/jsx-uses-vars": 2,
+    "react/jsx-closing-bracket-location": 2,
+    "react/jsx-tag-spacing": ["error"],
+    "react/jsx-curly-spacing": [2, "never"],
+    "react/jsx-equals-spacing": [2, "never"],
+    "react/jsx-indent-props": [2, 2],
+    "react/jsx-indent": [2, 2],
+    "react/jsx-key": 2,
+    "react/jsx-no-bind": [2, { "allowArrowFunctions": true }],
+    "react/jsx-no-duplicate-props": [2, { "ignoreCase": true }],
+    "react/jsx-max-props-per-line": [2, { "maximum": 2 }],
+    "react/jsx-handler-names": [2, { "eventHandlerPrefix": "(on|dispatch)", "eventHandlerPropPrefix": "on" }],
+    "react/jsx-no-undef": 2,
+    "react/jsx-pascal-case": 2,
+    "react/jsx-uses-react": 2,
+    // Explicitly disabled in case we want to enable them again
+    "react/no-did-mount-set-state": 0,
+    "react/no-did-update-set-state": 0,
+    "react/no-direct-mutation-state": 2,
+    "react/no-multi-comp": [2, { "ignoreStateless": true }],
+    "react/no-unknown-property": 2,
+    "react/prefer-es6-class": 2,
+    "react/prop-types": 2,
+    "react/react-in-jsx-scope": 2,
+    "react/self-closing-comp": 2,
+    "react/sort-comp": 2,
+    "react/jsx-wrap-multilines": 2
+  }
+}

frontend/.eslintrc.js

@@ -1,393 +0,0 @@
-// 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 })
-  .filter((dirent) => dirent.isDirectory())
-  .map((dirent) => dirent.name)
-  .join('|');
-
-module.exports = {
-  root: true,
-
-  parser: '@babel/eslint-parser',
-
-  env: {
-    browser: true,
-    commonjs: true,
-    node: true,
-    es6: true
-  },
-
-  globals: {
-    expect: false,
-    chai: false,
-    sinon: false,
-    JSX: true
-  },
-
-  parserOptions: {
-    ecmaVersion: 6,
-    sourceType: 'module',
-    babelOptions: {
-      configFile: `${frontendFolder}/babel.config.js`
-    },
-    ecmaFeatures: {
-      modules: true,
-      impliedStrict: true
-    }
-  },
-
-  plugins: [
-    'filenames',
-    'react',
-    'react-hooks',
-    'simple-import-sort',
-    'import',
-    '@typescript-eslint',
-    'prettier'
-  ],
-
-  settings: {
-    react: {
-      version: 'detect'
-    }
-  },
-
-  rules: {
-    'filenames/match-exported': ['error'],
-
-    // ECMAScript 6
-
-    'arrow-body-style': [0],
-    'arrow-parens': ['error', 'always'],
-    'arrow-spacing': ['error', { before: true, after: true }],
-    'constructor-super': 'error',
-    'generator-star-spacing': 'off',
-    'no-class-assign': 'error',
-    'no-confusing-arrow': 'error',
-    'no-const-assign': 'error',
-    'no-dupe-class-members': 'error',
-    'no-duplicate-imports': 'error',
-    'no-new-symbol': 'error',
-    'no-this-before-super': 'error',
-    'no-useless-escape': 'error',
-    'no-useless-computed-key': 'error',
-    'no-useless-constructor': 'error',
-    'no-var': 'warn',
-    'object-shorthand': ['error', 'properties'],
-    'prefer-arrow-callback': 'error',
-    'prefer-const': 'warn',
-    'prefer-reflect': 'off',
-    'prefer-rest-params': 'off',
-    'prefer-spread': 'warn',
-    'prefer-template': 'error',
-    'require-yield': 'off',
-    'template-curly-spacing': ['error', 'never'],
-    'yield-star-spacing': 'off',
-
-    // Possible Errors
-
-    'comma-dangle': 'error',
-    'no-cond-assign': 'error',
-    'no-console': 'off',
-    'no-constant-condition': 'warn',
-    'no-control-regex': 'error',
-    'no-debugger': 'off',
-    'no-dupe-args': 'error',
-    'no-dupe-keys': 'error',
-    'no-duplicate-case': 'error',
-    'no-empty': 'warn',
-    'no-empty-character-class': 'error',
-    'no-ex-assign': 'error',
-    'no-extra-boolean-cast': 'error',
-    'no-extra-parens': ['error', 'functions'],
-    'no-extra-semi': 'error',
-    'no-func-assign': 'error',
-    'no-inner-declarations': 'error',
-    'no-invalid-regexp': 'error',
-    'no-irregular-whitespace': 'error',
-    'no-negated-in-lhs': 'error',
-    'no-obj-calls': 'error',
-    'no-regex-spaces': 'error',
-    'no-sparse-arrays': 'error',
-    'no-unexpected-multiline': 'error',
-    'no-unreachable': 'warn',
-    'no-unsafe-finally': 'error',
-    'use-isnan': 'error',
-    'valid-jsdoc': 'off',
-    'valid-typeof': 'error',
-
-    // Best Practices
-
-    'accessor-pairs': 'off',
-    'array-callback-return': 'warn',
-    'block-scoped-var': 'warn',
-    'consistent-return': 'off',
-    curly: 'error',
-    'default-case': 'error',
-    'dot-location': ['error', 'property'],
-    'dot-notation': 'error',
-    eqeqeq: ['error', 'smart'],
-    'guard-for-in': 'error',
-    'no-alert': 'warn',
-    'no-caller': 'error',
-    'no-case-declarations': 'error',
-    'no-div-regex': 'error',
-    'no-else-return': 'error',
-    'no-empty-function': ['error', { allow: ['arrowFunctions'] }],
-    'no-empty-pattern': 'error',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'error',
-    'no-fallthrough': 'error',
-    'no-floating-decimal': 'error',
-    'no-implicit-coercion': ['error', {
-      boolean: false,
-      number: true,
-      string: true,
-      allow: [/* "!!", "~", "*", "+" */]
-    }],
-    'no-implicit-globals': 'error',
-    'no-implied-eval': 'error',
-    'no-invalid-this': 'off',
-    'no-iterator': 'error',
-    'no-labels': 'error',
-    'no-lone-blocks': 'error',
-    'no-loop-func': 'error',
-    'no-magic-numbers': ['off', { ignoreArrayIndexes: true, ignore: [0, 1] }],
-    'no-multi-spaces': 'error',
-    'no-multi-str': 'error',
-    'no-native-reassign': ['error', { exceptions: ['console'] }],
-    'no-new': 'off',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal': 'error',
-    'no-octal-escape': 'error',
-    'no-param-reassign': 'off',
-    'no-process-env': 'off',
-    'no-proto': 'error',
-    'no-redeclare': 'error',
-    'no-return-assign': 'warn',
-    'no-script-url': 'error',
-    'no-self-assign': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'error',
-    'no-throw-literal': 'error',
-    'no-unmodified-loop-condition': 'error',
-    'no-unused-expressions': 'error',
-    'no-unused-labels': 'error',
-    'no-useless-call': 'error',
-    'no-useless-concat': 'error',
-    'no-void': 'error',
-    'no-warning-comments': 'off',
-    'no-with': 'error',
-    radix: ['error', 'as-needed'],
-    'vars-on-top': 'off',
-    'wrap-iife': ['error', 'inside'],
-    yoda: 'error',
-
-    // Strict Mode
-
-    strict: ['error', 'never'],
-
-    // Variables
-
-    'init-declarations': ['error', 'always'],
-    'no-catch-shadow': 'error',
-    'no-delete-var': 'error',
-    'no-label-var': 'error',
-    'no-restricted-globals': 'off',
-    'no-shadow': 'error',
-    'no-shadow-restricted-names': 'error',
-    'no-undef': 'error',
-    'no-undef-init': 'off',
-    'no-undefined': 'off',
-    'no-unused-vars': ['error', { args: 'none', ignoreRestSiblings: true }],
-    'no-use-before-define': 'error',
-
-    // Node.js and CommonJS
-
-    'callback-return': 'warn',
-    'global-require': 'error',
-    'handle-callback-err': 'warn',
-    'no-mixed-requires': 'error',
-    'no-new-require': 'error',
-    'no-path-concat': 'error',
-    'no-process-exit': 'error',
-
-    // Stylistic Issues
-
-    'array-bracket-spacing': ['error', 'never'],
-    'block-spacing': ['error', 'always'],
-    'brace-style': ['error', '1tbs', { allowSingleLine: false }],
-    camelcase: 'off',
-    'comma-spacing': ['error', { before: false, after: true }],
-    'comma-style': ['error', 'last'],
-    'computed-property-spacing': ['error', 'never'],
-    'consistent-this': ['error', 'self'],
-    'eol-last': 'error',
-    'func-names': 'off',
-    'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
-    indent: ['error', 2, { SwitchCase: 1 }],
-    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
-    'keyword-spacing': ['error', { before: true, after: true }],
-    'lines-around-comment': ['error', { beforeBlockComment: true, afterBlockComment: false }],
-    'max-depth': ['error', { maximum: 5 }],
-    'max-nested-callbacks': ['error', 4],
-    'max-statements': 'off',
-    'max-statements-per-line': ['error', { max: 1 }],
-    'new-cap': ['error', { capIsNewExceptions: ['$.Deferred', 'DragDropContext', 'DragLayer', 'DragSource', 'DropTarget'] }],
-    'new-parens': 'error',
-    'newline-after-var': 'off',
-    'newline-before-return': 'off',
-    'newline-per-chained-call': 'off',
-    'no-array-constructor': 'error',
-    'no-bitwise': 'error',
-    'no-continue': 'error',
-    'no-inline-comments': 'off',
-    'no-lonely-if': 'warn',
-    'no-mixed-spaces-and-tabs': 'error',
-    'no-multiple-empty-lines': ['error', { max: 1 }],
-    'no-negated-condition': 'warn',
-    'no-nested-ternary': 'error',
-    'no-new-object': 'error',
-    'no-plusplus': 'off',
-    'no-restricted-syntax': 'off',
-    'no-spaced-func': 'error',
-    'no-ternary': 'off',
-    'no-trailing-spaces': 'error',
-    'no-underscore-dangle': ['error', { allowAfterThis: true }],
-    'no-unneeded-ternary': 'error',
-    'no-whitespace-before-property': 'error',
-    'object-curly-spacing': ['error', 'always'],
-    'one-var': ['error', 'never'],
-    'one-var-declaration-per-line': ['error', 'always'],
-    'operator-assignment': ['off', 'never'],
-    'operator-linebreak': ['error', 'after'],
-    'quote-props': ['error', 'as-needed'],
-    quotes: ['error', 'single'],
-    'require-jsdoc': 'off',
-    semi: 'error',
-    'semi-spacing': ['error', { before: false, after: true }],
-    'sort-vars': 'off',
-    'space-before-blocks': ['error', 'always'],
-    'space-before-function-paren': ['error', 'never'],
-    'space-in-parens': 'off',
-    'space-infix-ops': 'off',
-    'space-unary-ops': 'off',
-    'spaced-comment': 'error',
-    'wrap-regex': 'error',
-
-    // ImportSort
-
-    'simple-import-sort/imports': 'error',
-    'import/newline-after-import': 'error',
-
-    // React
-
-    'react/jsx-boolean-value': [2, 'always'],
-    'react/jsx-uses-vars': 2,
-    'react/jsx-closing-bracket-location': 2,
-    'react/jsx-tag-spacing': ['error'],
-    'react/jsx-curly-spacing': [2, 'never'],
-    'react/jsx-equals-spacing': [2, 'never'],
-    'react/jsx-indent-props': [2, 2],
-    'react/jsx-indent': [2, 2, { indentLogicalExpressions: true }],
-    'react/jsx-key': 2,
-    'react/jsx-no-bind': [2, { allowArrowFunctions: true }],
-    'react/jsx-no-duplicate-props': [2, { ignoreCase: true }],
-    'react/jsx-max-props-per-line': [2, { maximum: 2 }],
-    'react/jsx-handler-names': [2, { eventHandlerPrefix: '(on|dispatch)', eventHandlerPropPrefix: 'on' }],
-    'react/jsx-no-undef': 2,
-    'react/jsx-pascal-case': 2,
-    'react/jsx-uses-react': 2,
-    // Explicitly disabled in case we want to enable them again
-    'react/no-did-mount-set-state': 0,
-    'react/no-did-update-set-state': 0,
-    'react/no-direct-mutation-state': 2,
-    'react/no-multi-comp': [2, { ignoreStateless: true }],
-    'react/no-unknown-property': 2,
-    'react/prefer-es6-class': 2,
-    'react/prop-types': 2,
-    'react/react-in-jsx-scope': 2,
-    'react/self-closing-comp': 2,
-    'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2,
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'error'
-  },
-  overrides: [
-    {
-      files: [
-        '*.js'
-      ],
-      rules: {
-        'simple-import-sort/imports': [
-          'error',
-          {
-            groups: [
-              // Packages
-              // Absolute Paths
-              // Relative Paths
-              // Css
-              ['^@?\\w', `^(${dirs})(/.*|$)`, '^\\.', '^\\..*css$']
-            ]
-          }
-        ]
-      }
-    },
-    {
-      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": [
-    "stylelint-order"
-  ],
-  "ignoreFiles": [
-    "frontend/src/Styles/scaffolding.css",
-    "**/*.js"
-  ],
-  "rules": {
+"plugins": [
+  "stylelint-order"
+],
+"ignoreFiles": [
+  "frontend/src/Styles/scaffolding.css",
+  "**/*.js"
+],
+"rules": {
     "at-rule-empty-line-before": [
       "always",
       {
@@ -15,46 +15,96 @@
         ]
       }
     ],
+    "at-rule-name-case": "lower",
+    "at-rule-name-newline-after": "always-multi-line",
+    "at-rule-name-space-after": "always",
     "at-rule-no-unknown": [
       true,
       {
         "ignoreAtRules": [
           "/^add\\-mixin$/",
           "/^define\\-mixin$/"
-        ]
+        ] 
       }
     ],
     "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": [
+    "function-url-scheme-blacklist": [
       "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": true
-  },
-
-  "typescript.preferences.quoteStyle": "single",
-
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
-}

frontend/babel.config.js

@@ -4,21 +4,20 @@ module.exports = {
   plugins: [
     // Stage 1
     '@babel/plugin-proposal-export-default-from',
-    ['@babel/plugin-transform-optional-chaining', { loose }],
-    ['@babel/plugin-transform-nullish-coalescing-operator', { loose }],
+    ['@babel/plugin-proposal-optional-chaining', { loose }],
+    ['@babel/plugin-proposal-nullish-coalescing-operator', { loose }],
 
     // Stage 2
-    '@babel/plugin-transform-export-namespace-from',
+    '@babel/plugin-proposal-export-namespace-from',
 
     // Stage 3
-    ['@babel/plugin-transform-class-properties', { loose }],
+    ['@babel/plugin-proposal-class-properties', { loose }],
     '@babel/plugin-syntax-dynamic-import'
   ],
   env: {
     development: {
       presets: [
-        ['@babel/preset-react', { development: true }],
-        '@babel/preset-typescript'
+        ['@babel/preset-react', { development: true }]
       ],
       plugins: [
         'babel-plugin-inline-classnames'
@@ -26,8 +25,7 @@ module.exports = {
     },
     production: {
       presets: [
-        '@babel/preset-react',
-        '@babel/preset-typescript'
+        '@babel/preset-react'
       ],
       plugins: [
         'babel-plugin-transform-react-remove-prop-types'

frontend/build/webpack.config.js

@@ -1,284 +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',
-
-    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: '[name]-[contenthash].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: 'Content/[id]-[chunkhash].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')
-              }
-            ]
-          }
-        }
-      }),
-
-      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
-                    }
-                  ]
-                ]
-              }
-            }
-          ]
-        },
-
-        // 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: '[name]/[local]/[hash:base64:5]'
-                }
-              }
-            },
-            {
-              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,17 @@
+const gulp = require('gulp');
+
+require('./clean');
+require('./copy');
+require('./webpack');
+
+gulp.task('build',
+  gulp.series('clean',
+    gulp.parallel(
+      'webpack',
+      'copyHtml',
+      'copyFonts',
+      'copyImages'
+    )
+  )
+);
+

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,34 @@
+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());
+});

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,23 @@
+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/`,
+    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,18 @@
+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'));
+}
+
+gulp.task('watch', gulp.series('build', watch));

frontend/gulp/webpack.js

@@ -0,0 +1,268 @@
+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 MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+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 = true;
+
+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
+HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets, assetTags) {
+  const head = assetTags.head.map((v) => {
+    v.attributes = { rel: 'stylesheet', type: 'text/css', href: `/${v.attributes.href.replace('\\', '/')}` };
+    return this.createHtmlTag(v);
+  });
+  const body = assetTags.body.map((v) => {
+    v.attributes = { src: `/${v.attributes.src}` };
+    return this.createHtmlTag(v);
+  });
+
+  return html
+    .replace('<!-- webpack bundles head -->', head.join('\r\n  '))
+    .replace('<!-- webpack bundles body -->', body.join('\r\n  '));
+};
+
+const plugins = [
+  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$/,
+        issuer: {
+          // monaco-editor includes the editor.worker.js in other language workers,
+          // don't use worker-loader in that case
+          exclude: /monaco-editor/
+        },
+        use: {
+          loader: 'worker-loader',
+          options: {
+            name: '[name].js',
+            inline: inlineWebWorkers,
+            fallback: !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)
+    .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/jsconfig.json

@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "target": "es6",
+        "checkJs": false,
+        "baseUrl": "src",
+        "jsx": "react",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "paths": {
+            "*": [
+                "*"
+            ]
+        }
+    },
+    "include": [
+        "./src/**/*"
+    ],
+    "exclude": [
+    ]
+}

frontend/postcss.config.js

@@ -1,31 +1,23 @@
 const reload = require('require-nocache')(module);
 
-const cssVarsFiles = [
-  './src/Styles/Variables/dimensions',
-  './src/Styles/Variables/fonts',
-  './src/Styles/Variables/animations',
-  './src/Styles/Variables/zIndexes'
-].map(require.resolve);
+module.exports = (ctx, configPath, options) => {
+  const config = {
+    plugins: {
+      'postcss-mixins': {
+        mixinsDir: [
+          '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 = [
-  '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: [
-    ['postcss-mixins', {
-      mixinsFiles
-    }],
-    ['postcss-simple-vars', {
-      variables: () =>
-        cssVarsFiles.reduce((acc, vars) => {
-          return Object.assign(acc, reload(vars));
-        }, {})
-    }],
-    'postcss-color-function',
-    'postcss-nested'
-  ]
+  return config;
 };

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

@@ -0,0 +1,123 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { align, icons } from 'Helpers/Props';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+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 PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import BlacklistRowConnector from './BlacklistRowConnector';
+
+class Blacklist extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isFetching,
+      isPopulated,
+      error,
+      items,
+      columns,
+      totalRecords,
+      isClearingBlacklistExecuting,
+      onClearBlacklistPress,
+      ...otherProps
+    } = this.props;
+
+    return (
+      <PageContent title="Blacklist">
+        <PageToolbar>
+          <PageToolbarSection>
+            <PageToolbarButton
+              label="Clear"
+              iconName={icons.CLEAR}
+              isSpinning={isClearingBlacklistExecuting}
+              onPress={onClearBlacklistPress}
+            />
+          </PageToolbarSection>
+
+          <PageToolbarSection alignContent={align.RIGHT}>
+            <TableOptionsModalWrapper
+              {...otherProps}
+              columns={columns}
+            >
+              <PageToolbarButton
+                label="Options"
+                iconName={icons.TABLE}
+              />
+            </TableOptionsModalWrapper>
+          </PageToolbarSection>
+        </PageToolbar>
+
+        <PageContentBody>
+          {
+            isFetching && !isPopulated &&
+              <LoadingIndicator />
+          }
+
+          {
+            !isFetching && !!error &&
+              <div>Unable to load blacklist</div>
+          }
+
+          {
+            isPopulated && !error && !items.length &&
+              <div>
+                No history blacklist
+              </div>
+          }
+
+          {
+            isPopulated && !error && !!items.length &&
+              <div>
+                <Table
+                  columns={columns}
+                  {...otherProps}
+                >
+                  <TableBody>
+                    {
+                      items.map((item) => {
+                        return (
+                          <BlacklistRowConnector
+                            key={item.id}
+                            columns={columns}
+                            {...item}
+                          />
+                        );
+                      })
+                    }
+                  </TableBody>
+                </Table>
+
+                <TablePager
+                  totalRecords={totalRecords}
+                  isFetching={isFetching}
+                  {...otherProps}
+                />
+              </div>
+          }
+        </PageContentBody>
+      </PageContent>
+    );
+  }
+}
+
+Blacklist.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  totalRecords: PropTypes.number,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  onClearBlacklistPress: PropTypes.func.isRequired
+};
+
+export default Blacklist;

frontend/src/Activity/Blacklist/BlacklistConnector.js

@@ -0,0 +1,154 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import withCurrentPage from 'Components/withCurrentPage';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import * as blacklistActions from 'Store/Actions/blacklistActions';
+import { executeCommand } from 'Store/Actions/commandActions';
+import * as commandNames from 'Commands/commandNames';
+import Blacklist from './Blacklist';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.blacklist,
+    createCommandExecutingSelector(commandNames.CLEAR_BLACKLIST),
+    (blacklist, isClearingBlacklistExecuting) => {
+      return {
+        isClearingBlacklistExecuting,
+        ...blacklist
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  ...blacklistActions,
+  executeCommand
+};
+
+class BlacklistConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      useCurrentPage,
+      fetchBlacklist,
+      gotoBlacklistFirstPage
+    } = this.props;
+
+    registerPagePopulator(this.repopulate);
+
+    if (useCurrentPage) {
+      fetchBlacklist();
+    } else {
+      gotoBlacklistFirstPage();
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (prevProps.isClearingBlacklistExecuting && !this.props.isClearingBlacklistExecuting) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  componentWillUnmount() {
+    this.props.clearBlacklist();
+    unregisterPagePopulator(this.repopulate);
+  }
+
+  //
+  // Control
+
+  repopulate = () => {
+    this.props.fetchBlacklist();
+  }
+  //
+  // Listeners
+
+  onFirstPagePress = () => {
+    this.props.gotoBlacklistFirstPage();
+  }
+
+  onPreviousPagePress = () => {
+    this.props.gotoBlacklistPreviousPage();
+  }
+
+  onNextPagePress = () => {
+    this.props.gotoBlacklistNextPage();
+  }
+
+  onLastPagePress = () => {
+    this.props.gotoBlacklistLastPage();
+  }
+
+  onPageSelect = (page) => {
+    this.props.gotoBlacklistPage({ page });
+  }
+
+  onSortPress = (sortKey) => {
+    this.props.setBlacklistSort({ sortKey });
+  }
+
+  onTableOptionChange = (payload) => {
+    this.props.setBlacklistTableOption(payload);
+
+    if (payload.pageSize) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  onClearBlacklistPress = () => {
+    this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
+  }
+
+  onTableOptionChange = (payload) => {
+    this.props.setBlacklistTableOption(payload);
+
+    if (payload.pageSize) {
+      this.props.gotoBlacklistFirstPage();
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <Blacklist
+        onFirstPagePress={this.onFirstPagePress}
+        onPreviousPagePress={this.onPreviousPagePress}
+        onNextPagePress={this.onNextPagePress}
+        onLastPagePress={this.onLastPagePress}
+        onPageSelect={this.onPageSelect}
+        onSortPress={this.onSortPress}
+        onTableOptionChange={this.onTableOptionChange}
+        onClearBlacklistPress={this.onClearBlacklistPress}
+        {...this.props}
+      />
+    );
+  }
+}
+
+BlacklistConnector.propTypes = {
+  useCurrentPage: PropTypes.bool.isRequired,
+  isClearingBlacklistExecuting: PropTypes.bool.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  fetchBlacklist: PropTypes.func.isRequired,
+  gotoBlacklistFirstPage: PropTypes.func.isRequired,
+  gotoBlacklistPreviousPage: PropTypes.func.isRequired,
+  gotoBlacklistNextPage: PropTypes.func.isRequired,
+  gotoBlacklistLastPage: PropTypes.func.isRequired,
+  gotoBlacklistPage: PropTypes.func.isRequired,
+  setBlacklistSort: PropTypes.func.isRequired,
+  setBlacklistTableOption: PropTypes.func.isRequired,
+  clearBlacklist: PropTypes.func.isRequired,
+  executeCommand: PropTypes.func.isRequired
+};
+
+export default withCurrentPage(
+  connect(createMapStateToProps, mapDispatchToProps)(BlacklistConnector)
+);

frontend/src/Activity/Blacklist/BlacklistDetailsModal.js

@@ -0,0 +1,89 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import Button from 'Components/Link/Button';
+import DescriptionList from 'Components/DescriptionList/DescriptionList';
+import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import Modal from 'Components/Modal/Modal';
+import ModalContent from 'Components/Modal/ModalContent';
+import ModalHeader from 'Components/Modal/ModalHeader';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalFooter from 'Components/Modal/ModalFooter';
+
+class BlacklistDetailsModal extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      isOpen,
+      sourceTitle,
+      protocol,
+      indexer,
+      message,
+      onModalClose
+    } = this.props;
+
+    return (
+      <Modal
+        isOpen={isOpen}
+        onModalClose={onModalClose}
+      >
+        <ModalContent
+          onModalClose={onModalClose}
+        >
+          <ModalHeader>
+            Details
+          </ModalHeader>
+
+          <ModalBody>
+            <DescriptionList>
+              <DescriptionListItem
+                title="Name"
+                data={sourceTitle}
+              />
+
+              <DescriptionListItem
+                title="Protocol"
+                data={protocol}
+              />
+
+              {
+                !!message &&
+                  <DescriptionListItem
+                    title="Indexer"
+                    data={indexer}
+                  />
+              }
+
+              {
+                !!message &&
+                  <DescriptionListItem
+                    title="Message"
+                    data={message}
+                  />
+              }
+            </DescriptionList>
+          </ModalBody>
+
+          <ModalFooter>
+            <Button onPress={onModalClose}>
+              Close
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  }
+}
+
+BlacklistDetailsModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  sourceTitle: PropTypes.string.isRequired,
+  protocol: PropTypes.string.isRequired,
+  indexer: PropTypes.string,
+  message: PropTypes.string,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default BlacklistDetailsModal;

frontend/src/Activity/Blacklist/BlacklistRow.css

@@ -0,0 +1,18 @@
+.language,
+.quality {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 100px;
+}
+
+.indexer {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 80px;
+}
+
+.actions {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 70px;
+}

frontend/src/Activity/Blacklist/BlacklistRow.js

@@ -0,0 +1,186 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { icons, kinds } from 'Helpers/Props';
+import IconButton from 'Components/Link/IconButton';
+import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
+import TableRow from 'Components/Table/TableRow';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeQuality from 'Episode/EpisodeQuality';
+import SeriesTitleLink from 'Series/SeriesTitleLink';
+import BlacklistDetailsModal from './BlacklistDetailsModal';
+import styles from './BlacklistRow.css';
+
+class BlacklistRow extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isDetailsModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onDetailsPress = () => {
+    this.setState({ isDetailsModalOpen: true });
+  }
+
+  onDetailsModalClose = () => {
+    this.setState({ isDetailsModalOpen: false });
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      series,
+      sourceTitle,
+      language,
+      quality,
+      date,
+      protocol,
+      indexer,
+      message,
+      columns,
+      onRemovePress
+    } = this.props;
+
+    return (
+      <TableRow>
+        {
+          columns.map((column) => {
+            const {
+              name,
+              isVisible
+            } = column;
+
+            if (!isVisible) {
+              return null;
+            }
+
+            if (name === 'series.sortTitle') {
+              return (
+                <TableRowCell key={name}>
+                  <SeriesTitleLink
+                    titleSlug={series.titleSlug}
+                    title={series.title}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'sourceTitle') {
+              return (
+                <TableRowCell key={name}>
+                  {sourceTitle}
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'language') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.language}
+                >
+                  <EpisodeLanguage
+                    language={language}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'quality') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.quality}
+                >
+                  <EpisodeQuality
+                    quality={quality}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'date') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  date={date}
+                />
+              );
+            }
+
+            if (name === 'indexer') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.indexer}
+                >
+                  {indexer}
+                </TableRowCell>
+              );
+            }
+
+            if (name === 'actions') {
+              return (
+                <TableRowCell
+                  key={name}
+                  className={styles.actions}
+                >
+                  <IconButton
+                    name={icons.INFO}
+                    onPress={this.onDetailsPress}
+                  />
+
+                  <IconButton
+                    title="Remove from blacklist"
+                    name={icons.REMOVE}
+                    kind={kinds.DANGER}
+                    onPress={onRemovePress}
+                  />
+                </TableRowCell>
+              );
+            }
+
+            return null;
+          })
+        }
+
+        <BlacklistDetailsModal
+          isOpen={this.state.isDetailsModalOpen}
+          sourceTitle={sourceTitle}
+          protocol={protocol}
+          indexer={indexer}
+          message={message}
+          onModalClose={this.onDetailsModalClose}
+        />
+      </TableRow>
+    );
+  }
+
+}
+
+BlacklistRow.propTypes = {
+  id: PropTypes.number.isRequired,
+  series: PropTypes.object.isRequired,
+  sourceTitle: PropTypes.string.isRequired,
+  language: PropTypes.object.isRequired,
+  quality: PropTypes.object.isRequired,
+  date: PropTypes.string.isRequired,
+  protocol: PropTypes.string.isRequired,
+  indexer: PropTypes.string,
+  message: PropTypes.string,
+  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onRemovePress: PropTypes.func.isRequired
+};
+
+export default BlacklistRow;

frontend/src/Activity/Blacklist/BlacklistRowConnector.js

@@ -0,0 +1,26 @@
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { removeFromBlacklist } from 'Store/Actions/blacklistActions';
+import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
+import BlacklistRow from './BlacklistRow';
+
+function createMapStateToProps() {
+  return createSelector(
+    createSeriesSelector(),
+    (series) => {
+      return {
+        series
+      };
+    }
+  );
+}
+
+function createMapDispatchToProps(dispatch, props) {
+  return {
+    onRemovePress() {
+      dispatch(removeFromBlacklist({ id: props.id }));
+    }
+  };
+}
+
+export default connect(createMapStateToProps, createMapDispatchToProps)(BlacklistRow);

frontend/src/Activity/Blocklist/Blocklist.js

@@ -1,261 +0,0 @@
-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';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import 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 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';
-
-class Blocklist extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      allSelected: false,
-      allUnselected: false,
-      lastToggled: null,
-      selectedState: {},
-      isConfirmRemoveModalOpen: false,
-      isConfirmClearModalOpen: false,
-      items: props.items
-    };
-  }
-
-  componentDidUpdate(prevProps) {
-    const {
-      items
-    } = this.props;
-
-    if (hasDifferentItems(prevProps.items, items)) {
-      this.setState((state) => {
-        return {
-          ...removeOldSelectedState(state, getRemovedItems(prevProps.items, items)),
-          items
-        };
-      });
-
-      return;
-    }
-  }
-
-  //
-  // Control
-
-  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
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      error,
-      items,
-      columns,
-      totalRecords,
-      isRemoving,
-      isClearingBlocklistExecuting,
-      ...otherProps
-    } = this.props;
-
-    const {
-      allSelected,
-      allUnselected,
-      selectedState,
-      isConfirmRemoveModalOpen,
-      isConfirmClearModalOpen
-    } = this.state;
-
-    const selectedIds = this.getSelectedIds();
-
-    return (
-      <PageContent title={translate('Blocklist')}>
-        <PageToolbar>
-          <PageToolbarSection>
-            <PageToolbarButton
-              label={translate('RemoveSelected')}
-              iconName={icons.REMOVE}
-              isDisabled={!selectedIds.length}
-              isSpinning={isRemoving}
-              onPress={this.onRemoveSelectedPress}
-            />
-
-            <PageToolbarButton
-              label={translate('Clear')}
-              iconName={icons.CLEAR}
-              isDisabled={!items.length}
-              isSpinning={isClearingBlocklistExecuting}
-              onPress={this.onClearBlocklistPress}
-            />
-          </PageToolbarSection>
-
-          <PageToolbarSection alignContent={align.RIGHT}>
-            <TableOptionsModalWrapper
-              {...otherProps}
-              columns={columns}
-            >
-              <PageToolbarButton
-                label={translate('Options')}
-                iconName={icons.TABLE}
-              />
-            </TableOptionsModalWrapper>
-          </PageToolbarSection>
-        </PageToolbar>
-
-        <PageContentBody>
-          {
-            isFetching && !isPopulated &&
-              <LoadingIndicator />
-          }
-
-          {
-            !isFetching && !!error &&
-              <Alert kind={kinds.DANGER}>
-                {translate('BlocklistLoadError')}
-              </Alert>
-          }
-
-          {
-            isPopulated && !error && !items.length &&
-              <Alert kind={kinds.INFO}>
-                {translate('NoHistoryBlocklist')}
-              </Alert>
-          }
-
-          {
-            isPopulated && !error && !!items.length &&
-              <div>
-                <Table
-                  selectAll={true}
-                  allSelected={allSelected}
-                  allUnselected={allUnselected}
-                  columns={columns}
-                  {...otherProps}
-                  onSelectAllChange={this.onSelectAllChange}
-                >
-                  <TableBody>
-                    {
-                      items.map((item) => {
-                        return (
-                          <BlocklistRowConnector
-                            key={item.id}
-                            isSelected={selectedState[item.id] || false}
-                            columns={columns}
-                            {...item}
-                            onSelectedChange={this.onSelectedChange}
-                          />
-                        );
-                      })
-                    }
-                  </TableBody>
-                </Table>
-
-                <TablePager
-                  totalRecords={totalRecords}
-                  isFetching={isFetching}
-                  {...otherProps}
-                />
-              </div>
-          }
-        </PageContentBody>
-
-        <ConfirmModal
-          isOpen={isConfirmRemoveModalOpen}
-          kind={kinds.DANGER}
-          title={translate('RemoveSelected')}
-          message={translate('RemoveSelectedBlocklistMessageText')}
-          confirmLabel={translate('RemoveSelected')}
-          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 = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  totalRecords: PropTypes.number,
-  isRemoving: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
-  onRemoveSelected: PropTypes.func.isRequired,
-  onClearBlocklistPress: PropTypes.func.isRequired
-};
-
-export default Blocklist;

frontend/src/Activity/Blocklist/BlocklistConnector.js

@@ -1,152 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-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 { executeCommand } from 'Store/Actions/commandActions';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
-import Blocklist from './Blocklist';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.blocklist,
-    createCommandExecutingSelector(commandNames.CLEAR_BLOCKLIST),
-    (blocklist, isClearingBlocklistExecuting) => {
-      return {
-        isClearingBlocklistExecuting,
-        ...blocklist
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  ...blocklistActions,
-  executeCommand
-};
-
-class BlocklistConnector extends Component {
-
-  //
-  // Lifecycle
-
-  componentDidMount() {
-    const {
-      useCurrentPage,
-      fetchBlocklist,
-      gotoBlocklistFirstPage
-    } = this.props;
-
-    registerPagePopulator(this.repopulate);
-
-    if (useCurrentPage) {
-      fetchBlocklist();
-    } else {
-      gotoBlocklistFirstPage();
-    }
-  }
-
-  componentDidUpdate(prevProps) {
-    if (prevProps.isClearingBlocklistExecuting && !this.props.isClearingBlocklistExecuting) {
-      this.props.gotoBlocklistFirstPage();
-    }
-  }
-
-  componentWillUnmount() {
-    this.props.clearBlocklist();
-    unregisterPagePopulator(this.repopulate);
-  }
-
-  //
-  // Control
-
-  repopulate = () => {
-    this.props.fetchBlocklist();
-  };
-  //
-  // Listeners
-
-  onFirstPagePress = () => {
-    this.props.gotoBlocklistFirstPage();
-  };
-
-  onPreviousPagePress = () => {
-    this.props.gotoBlocklistPreviousPage();
-  };
-
-  onNextPagePress = () => {
-    this.props.gotoBlocklistNextPage();
-  };
-
-  onLastPagePress = () => {
-    this.props.gotoBlocklistLastPage();
-  };
-
-  onPageSelect = (page) => {
-    this.props.gotoBlocklistPage({ page });
-  };
-
-  onRemoveSelected = (ids) => {
-    this.props.removeBlocklistItems({ ids });
-  };
-
-  onSortPress = (sortKey) => {
-    this.props.setBlocklistSort({ sortKey });
-  };
-
-  onClearBlocklistPress = () => {
-    this.props.executeCommand({ name: commandNames.CLEAR_BLOCKLIST });
-  };
-
-  onTableOptionChange = (payload) => {
-    this.props.setBlocklistTableOption(payload);
-
-    if (payload.pageSize) {
-      this.props.gotoBlocklistFirstPage();
-    }
-  };
-
-  //
-  // Render
-
-  render() {
-    return (
-      <Blocklist
-        onFirstPagePress={this.onFirstPagePress}
-        onPreviousPagePress={this.onPreviousPagePress}
-        onNextPagePress={this.onNextPagePress}
-        onLastPagePress={this.onLastPagePress}
-        onPageSelect={this.onPageSelect}
-        onRemoveSelected={this.onRemoveSelected}
-        onSortPress={this.onSortPress}
-        onTableOptionChange={this.onTableOptionChange}
-        onClearBlocklistPress={this.onClearBlocklistPress}
-        {...this.props}
-      />
-    );
-  }
-}
-
-BlocklistConnector.propTypes = {
-  useCurrentPage: PropTypes.bool.isRequired,
-  isClearingBlocklistExecuting: PropTypes.bool.isRequired,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchBlocklist: PropTypes.func.isRequired,
-  gotoBlocklistFirstPage: PropTypes.func.isRequired,
-  gotoBlocklistPreviousPage: PropTypes.func.isRequired,
-  gotoBlocklistNextPage: PropTypes.func.isRequired,
-  gotoBlocklistLastPage: PropTypes.func.isRequired,
-  gotoBlocklistPage: PropTypes.func.isRequired,
-  removeBlocklistItems: PropTypes.func.isRequired,
-  setBlocklistSort: PropTypes.func.isRequired,
-  setBlocklistTableOption: PropTypes.func.isRequired,
-  clearBlocklist: PropTypes.func.isRequired,
-  executeCommand: PropTypes.func.isRequired
-};
-
-export default withCurrentPage(
-  connect(createMapStateToProps, mapDispatchToProps)(BlocklistConnector)
-);

frontend/src/Activity/Blocklist/BlocklistDetailsModal.js

@@ -1,90 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import DescriptionList from 'Components/DescriptionList/DescriptionList';
-import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
-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 translate from 'Utilities/String/translate';
-
-class BlocklistDetailsModal extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isOpen,
-      sourceTitle,
-      protocol,
-      indexer,
-      message,
-      onModalClose
-    } = this.props;
-
-    return (
-      <Modal
-        isOpen={isOpen}
-        onModalClose={onModalClose}
-      >
-        <ModalContent
-          onModalClose={onModalClose}
-        >
-          <ModalHeader>
-            Details
-          </ModalHeader>
-
-          <ModalBody>
-            <DescriptionList>
-              <DescriptionListItem
-                title={translate('Name')}
-                data={sourceTitle}
-              />
-
-              <DescriptionListItem
-                title={translate('Protocol')}
-                data={protocol}
-              />
-
-              {
-                !!message &&
-                  <DescriptionListItem
-                    title={translate('Indexer')}
-                    data={indexer}
-                  />
-              }
-
-              {
-                !!message &&
-                  <DescriptionListItem
-                    title={translate('Message')}
-                    data={message}
-                  />
-              }
-            </DescriptionList>
-          </ModalBody>
-
-          <ModalFooter>
-            <Button onPress={onModalClose}>
-              {translate('Close')}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    );
-  }
-}
-
-BlocklistDetailsModal.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  sourceTitle: PropTypes.string.isRequired,
-  protocol: PropTypes.string.isRequired,
-  indexer: PropTypes.string,
-  message: PropTypes.string,
-  onModalClose: PropTypes.func.isRequired
-};
-
-export default BlocklistDetailsModal;

frontend/src/Activity/Blocklist/BlocklistRow.css

@@ -1,18 +0,0 @@
-.languages,
-.quality {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 100px;
-}
-
-.indexer {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 80px;
-}
-
-.actions {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  width: 70px;
-}

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

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

frontend/src/Activity/Blocklist/BlocklistRow.js

@@ -1,212 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import IconButton from 'Components/Link/IconButton';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
-import TableRow from 'Components/Table/TableRow';
-import EpisodeFormats from 'Episode/EpisodeFormats';
-import EpisodeLanguages from 'Episode/EpisodeLanguages';
-import EpisodeQuality from 'Episode/EpisodeQuality';
-import { icons, kinds } from 'Helpers/Props';
-import SeriesTitleLink from 'Series/SeriesTitleLink';
-import translate from 'Utilities/String/translate';
-import BlocklistDetailsModal from './BlocklistDetailsModal';
-import styles from './BlocklistRow.css';
-
-class BlocklistRow extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isDetailsModalOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onDetailsPress = () => {
-    this.setState({ isDetailsModalOpen: true });
-  };
-
-  onDetailsModalClose = () => {
-    this.setState({ isDetailsModalOpen: false });
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      id,
-      series,
-      sourceTitle,
-      languages,
-      quality,
-      customFormats,
-      date,
-      protocol,
-      indexer,
-      message,
-      isSelected,
-      columns,
-      onSelectedChange,
-      onRemovePress
-    } = this.props;
-
-    return (
-      <TableRow>
-        <TableSelectCell
-          id={id}
-          isSelected={isSelected}
-          onSelectedChange={onSelectedChange}
-        />
-
-        {
-          columns.map((column) => {
-            const {
-              name,
-              isVisible
-            } = column;
-
-            if (!isVisible) {
-              return null;
-            }
-
-            if (name === 'series.sortTitle') {
-              return (
-                <TableRowCell key={name}>
-                  <SeriesTitleLink
-                    titleSlug={series.titleSlug}
-                    title={series.title}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'sourceTitle') {
-              return (
-                <TableRowCell key={name}>
-                  {sourceTitle}
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'languages') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.languages}
-                >
-                  <EpisodeLanguages
-                    languages={languages}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'quality') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.quality}
-                >
-                  <EpisodeQuality
-                    quality={quality}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <EpisodeFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'date') {
-              return (
-                <RelativeDateCellConnector
-                  key={name}
-                  date={date}
-                />
-              );
-            }
-
-            if (name === 'indexer') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.indexer}
-                >
-                  {indexer}
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'actions') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.actions}
-                >
-                  <IconButton
-                    name={icons.INFO}
-                    onPress={this.onDetailsPress}
-                  />
-
-                  <IconButton
-                    title={translate('RemoveFromBlocklist')}
-                    name={icons.REMOVE}
-                    kind={kinds.DANGER}
-                    onPress={onRemovePress}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            return null;
-          })
-        }
-
-        <BlocklistDetailsModal
-          isOpen={this.state.isDetailsModalOpen}
-          sourceTitle={sourceTitle}
-          protocol={protocol}
-          indexer={indexer}
-          message={message}
-          onModalClose={this.onDetailsModalClose}
-        />
-      </TableRow>
-    );
-  }
-
-}
-
-BlocklistRow.propTypes = {
-  id: PropTypes.number.isRequired,
-  series: PropTypes.object.isRequired,
-  sourceTitle: PropTypes.string.isRequired,
-  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
-  quality: PropTypes.object.isRequired,
-  customFormats: PropTypes.arrayOf(PropTypes.object).isRequired,
-  date: PropTypes.string.isRequired,
-  protocol: PropTypes.string.isRequired,
-  indexer: PropTypes.string,
-  message: PropTypes.string,
-  isSelected: PropTypes.bool.isRequired,
-  columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onSelectedChange: PropTypes.func.isRequired,
-  onRemovePress: PropTypes.func.isRequired
-};
-
-export default BlocklistRow;

frontend/src/Activity/Blocklist/BlocklistRowConnector.js

@@ -1,26 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { removeBlocklistItem } from 'Store/Actions/blocklistActions';
-import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
-import BlocklistRow from './BlocklistRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    createSeriesSelector(),
-    (series) => {
-      return {
-        series
-      };
-    }
-  );
-}
-
-function createMapDispatchToProps(dispatch, props) {
-  return {
-    onRemovePress() {
-      dispatch(removeBlocklistItem({ id: props.id }));
-    }
-  };
-}
-
-export default connect(createMapStateToProps, createMapDispatchToProps)(BlocklistRow);

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

@@ -1,14 +1,12 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import DescriptionList from 'Components/DescriptionList/DescriptionList';
-import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
-import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription';
-import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle';
-import Link from 'Components/Link/Link';
 import formatDateTime from 'Utilities/Date/formatDateTime';
 import formatAge from 'Utilities/Number/formatAge';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
-import translate from 'Utilities/String/translate';
+import Link from 'Components/Link/Link';
+import DescriptionList from 'Components/DescriptionList/DescriptionList';
+import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
+import DescriptionListItemTitle from 'Components/DescriptionList/DescriptionListItemTitle';
+import DescriptionListItemDescription from 'Components/DescriptionList/DescriptionListItemDescription';
 import styles from './HistoryDetails.css';
 
 function HistoryDetails(props) {
@@ -16,7 +14,6 @@ function HistoryDetails(props) {
     eventType,
     sourceTitle,
     data,
-    downloadId,
     shortDateFormat,
     timeFormat
   } = props;
@@ -25,113 +22,83 @@ function HistoryDetails(props) {
     const {
       indexer,
       releaseGroup,
-      seriesMatchType,
-      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' ?
-            <DescriptionListItem
-              title={translate('CustomFormatScore')}
-              data={formatCustomFormatScore(customFormatScore)}
-            /> :
-            null
-        }
-
-        {
-          seriesMatchType ?
-            <DescriptionListItem
-              descriptionClassName={styles.description}
-              title={translate('SeriesMatchType')}
-              data={seriesMatchType}
-            /> :
-            null
-        }
-
-        {
-          nzbInfoUrl ?
+          !!nzbInfoUrl &&
             <span>
               <DescriptionListItemTitle>
-                {translate('InfoUrl')}
+                Info URL
               </DescriptionListItemTitle>
 
               <DescriptionListItemDescription>
                 <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
               </DescriptionListItemDescription>
-            </span> :
-            null
+            </span>
         }
 
         {
-          downloadClientNameInfo ?
+          !!downloadClient &&
             <DescriptionListItem
-              title={translate('DownloadClient')}
-              data={downloadClientNameInfo}
-            /> :
-            null
+              title="Download Client"
+              data={downloadClient}
+            />
         }
 
         {
-          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>
     );
@@ -146,26 +113,16 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          downloadId ?
+          !!message &&
             <DescriptionListItem
-              title={translate('GrabId')}
-              data={downloadId}
-            /> :
-            null
-        }
-
-        {
-          message ?
-            <DescriptionListItem
-              title={translate('Message')}
+              title="Message"
               data={message}
-            /> :
-            null
+            />
         }
       </DescriptionList>
     );
@@ -173,7 +130,6 @@ function HistoryDetails(props) {
 
   if (eventType === 'downloadFolderImported') {
     const {
-      customFormatScore,
       droppedPath,
       importedPath
     } = data;
@@ -182,37 +138,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>
     );
@@ -220,21 +165,20 @@ function HistoryDetails(props) {
 
   if (eventType === 'episodeFileDeleted') {
     const {
-      reason,
-      customFormatScore
+      reason
     } = data;
 
     let reasonMessage = '';
 
     switch (reason) {
       case 'Manual':
-        reasonMessage = translate('DeletedReasonManual');
+        reasonMessage = 'File was deleted by via UI';
         break;
       case 'MissingFromDisk':
-        reasonMessage = translate('DeletedReasonEpisodeMissingFromDisk');
+        reasonMessage = 'Sonarr was unable to find the file on disk so it was removed';
         break;
       case 'Upgrade':
-        reasonMessage = translate('DeletedReasonUpgrade');
+        reasonMessage = 'File was deleted to import an upgrade';
         break;
       default:
         reasonMessage = '';
@@ -243,23 +187,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>
     );
   }
@@ -275,22 +210,22 @@ function HistoryDetails(props) {
     return (
       <DescriptionList>
         <DescriptionListItem
-          title={translate('SourcePath')}
+          title="Source Path"
           data={sourcePath}
         />
 
         <DescriptionListItem
-          title={translate('SourceRelativePath')}
+          title="Source Relative Path"
           data={sourceRelativePath}
         />
 
         <DescriptionListItem
-          title={translate('DestinationPath')}
+          title="Destination Path"
           data={path}
         />
 
         <DescriptionListItem
-          title={translate('DestinationRelativePath')}
+          title="Destination Relative Path"
           data={relativePath}
         />
       </DescriptionList>
@@ -306,26 +241,16 @@ function HistoryDetails(props) {
       <DescriptionList>
         <DescriptionListItem
           descriptionClassName={styles.description}
-          title={translate('Name')}
+          title="Name"
           data={sourceTitle}
         />
 
         {
-          downloadId ?
+          !!message &&
             <DescriptionListItem
-              title={translate('GrabId')}
-              data={downloadId}
-            /> :
-            null
-        }
-
-        {
-          message ?
-            <DescriptionListItem
-              title={translate('Message')}
+              title="Message"
               data={message}
-            /> :
-            null
+            />
         }
       </DescriptionList>
     );
@@ -335,7 +260,7 @@ function HistoryDetails(props) {
     <DescriptionList>
       <DescriptionListItem
         descriptionClassName={styles.description}
-        title={translate('Name')}
+        title="Name"
         data={sourceTitle}
       />
     </DescriptionList>
@@ -346,7 +271,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

@@ -1,33 +1,32 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import { kinds } from 'Helpers/Props';
 import Button from 'Components/Link/Button';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 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 { kinds } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
+import ModalBody from 'Components/Modal/ModalBody';
+import ModalFooter from 'Components/Modal/ModalFooter';
 import HistoryDetails from './HistoryDetails';
 import styles from './HistoryDetailsModal.css';
 
 function getHeaderTitle(eventType) {
   switch (eventType) {
     case 'grabbed':
-      return translate('Grabbed');
+      return 'Grabbed';
     case 'downloadFailed':
-      return translate('DownloadFailed');
+      return 'Download Failed';
     case 'downloadFolderImported':
-      return translate('EpisodeImported');
+      return 'Episode Imported';
     case 'episodeFileDeleted':
-      return translate('EpisodeFileDeleted');
+      return 'Episode File Deleted';
     case 'episodeFileRenamed':
-      return translate('EpisodeFileRenamed');
+      return 'Episode File Renamed';
     case 'downloadIgnored':
-      return translate('DownloadIgnored');
+      return 'Download Ignored';
     default:
-      return translate('Unknown');
+      return 'Unknown';
   }
 }
 
@@ -37,7 +36,6 @@ function HistoryDetailsModal(props) {
     eventType,
     sourceTitle,
     data,
-    downloadId,
     isMarkingAsFailed,
     shortDateFormat,
     timeFormat,
@@ -60,7 +58,6 @@ function HistoryDetailsModal(props) {
             eventType={eventType}
             sourceTitle={sourceTitle}
             data={data}
-            downloadId={downloadId}
             shortDateFormat={shortDateFormat}
             timeFormat={timeFormat}
           />
@@ -75,14 +72,14 @@ function HistoryDetailsModal(props) {
                 isSpinning={isMarkingAsFailed}
                 onPress={onMarkAsFailedPress}
               >
-                {translate('MarkAsFailed')}
+                Mark as Failed
               </SpinnerButton>
           }
 
           <Button
             onPress={onModalClose}
           >
-            {translate('Close')}
+            Close
           </Button>
         </ModalFooter>
       </ModalContent>
@@ -95,7 +92,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,21 +1,18 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Alert from 'Components/Alert';
+import { align, icons } from 'Helpers/Props';
+import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import PageContent from 'Components/Page/PageContent';
-import PageContentBody from 'Components/Page/PageContentBody';
-import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import 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 hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import translate from 'Utilities/String/translate';
-import HistoryFilterModal from './HistoryFilterModal';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import FilterMenu from 'Components/Menu/FilterMenu';
 import HistoryRowConnector from './HistoryRowConnector';
 
 class History extends Component {
@@ -53,7 +50,6 @@ class History extends Component {
       columns,
       selectedFilterKey,
       filters,
-      customFilters,
       totalRecords,
       isEpisodesFetching,
       isEpisodesPopulated,
@@ -68,11 +64,11 @@ class History extends Component {
     const hasError = error || episodesError;
 
     return (
-      <PageContent title={translate('History')}>
+      <PageContent title="History">
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
-              label={translate('Refresh')}
+              label="Refresh"
               iconName={icons.REFRESH}
               isSpinning={isFetching}
               onPress={onFirstPagePress}
@@ -85,7 +81,7 @@ class History extends Component {
               columns={columns}
             >
               <PageToolbarButton
-                label={translate('Options')}
+                label="Options"
                 iconName={icons.TABLE}
               />
             </TableOptionsModalWrapper>
@@ -94,8 +90,7 @@ class History extends Component {
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}
               filters={filters}
-              customFilters={customFilters}
-              filterModalConnectorComponent={HistoryFilterModal}
+              customFilters={[]}
               onFilterSelect={onFilterSelect}
             />
           </PageToolbarSection>
@@ -109,9 +104,7 @@ class History extends Component {
 
           {
             !isFetchingAny && hasError &&
-              <Alert kind={kinds.DANGER}>
-                {translate('HistoryLoadError')}
-              </Alert>
+              <div>Unable to load history</div>
           }
 
           {
@@ -119,9 +112,9 @@ class History extends Component {
             // wait for the episodes to populate because they are never coming.
 
             isPopulated && !hasError && !items.length &&
-              <Alert kind={kinds.INFO}>
-                {translate('NoHistoryFound')}
-              </Alert>
+              <div>
+                No history found
+              </div>
           }
 
           {
@@ -166,9 +159,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,
   isEpisodesFetching: PropTypes.bool.isRequired,
   isEpisodesPopulated: PropTypes.bool.isRequired,

frontend/src/Activity/History/HistoryConnector.js

@@ -2,27 +2,24 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import withCurrentPage from 'Components/withCurrentPage';
-import { clearEpisodes, fetchEpisodes } from 'Store/Actions/episodeActions';
-import { clearEpisodeFiles } from 'Store/Actions/episodeFileActions';
-import * as historyActions from 'Store/Actions/historyActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import withCurrentPage from 'Components/withCurrentPage';
+import * as historyActions from 'Store/Actions/historyActions';
+import { fetchEpisodes, clearEpisodes } from 'Store/Actions/episodeActions';
+import { clearEpisodeFiles } from 'Store/Actions/episodeFileActions';
 import History from './History';
 
 function createMapStateToProps() {
   return createSelector(
     (state) => state.history,
     (state) => state.episodes,
-    createCustomFiltersSelector('history'),
-    (history, episodes, customFilters) => {
+    (history, episodes) => {
       return {
         isEpisodesFetching: episodes.isFetching,
         isEpisodesPopulated: episodes.isPopulated,
         episodesError: episodes.error,
-        customFilters,
         ...history
       };
     }
@@ -81,38 +78,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);
@@ -120,7 +117,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

@@ -1,9 +1,8 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import { icons, kinds } from 'Helpers/Props';
 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) {
@@ -39,21 +38,21 @@ function getIconKind(eventType) {
 function getTooltip(eventType, data) {
   switch (eventType) {
     case 'grabbed':
-      return translate('EpisodeGrabbedTooltip', { indexer: data.indexer, downloadClient: data.downloadClient });
+      return `Episode grabbed from ${data.indexer} and sent to ${data.downloadClient}`;
     case 'seriesFolderImported':
-      return translate('SeriesFolderImportedTooltip');
+      return 'Episode imported from series folder';
     case 'downloadFolderImported':
-      return translate('EpisodeImportedTooltip');
+      return 'Episode downloaded successfully and picked up from download client';
     case 'downloadFailed':
-      return translate('DownloadFailedEpisodeTooltip');
+      return 'Episode download failed';
     case 'episodeFileDeleted':
-      return translate('EpisodeFileDeletedTooltip');
+      return 'Episode file deleted';
     case 'episodeFileRenamed':
-      return translate('EpisodeFileRenamedTooltip');
+      return 'Episode file renamed';
     case 'downloadIgnored':
-      return translate('DownloadIgnoredEpisodeTooltip');
+      return 'Episode Download Ignored';
     default:
-      return translate('UnknownEventTooltip');
+      return 'Unknown event';
   }
 }
 

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,21 +1,18 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import { icons } from 'Helpers/Props';
 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 TableRowCell from 'Components/Table/Cells/TableRowCell';
 import episodeEntities from 'Episode/episodeEntities';
-import EpisodeFormats from 'Episode/EpisodeFormats';
-import EpisodeLanguages from 'Episode/EpisodeLanguages';
-import EpisodeQuality from 'Episode/EpisodeQuality';
-import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
 import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
-import { icons, tooltipPositions } from 'Helpers/Props';
+import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
+import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeQuality from 'Episode/EpisodeQuality';
 import SeriesTitleLink from 'Series/SeriesTitleLink';
-import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore';
-import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import HistoryEventTypeCell from './HistoryEventTypeCell';
+import HistoryDetailsModal from './Details/HistoryDetailsModal';
 import styles from './HistoryRow.css';
 
 class HistoryRow extends Component {
@@ -46,11 +43,11 @@ class HistoryRow extends Component {
 
   onDetailsPress = () => {
     this.setState({ isDetailsModalOpen: true });
-  };
+  }
 
   onDetailsModalClose = () => {
     this.setState({ isDetailsModalOpen: false });
-  };
+  }
 
   //
   // Render
@@ -60,16 +57,14 @@ class HistoryRow extends Component {
       episodeId,
       series,
       episode,
-      languages,
+      language,
+      languageCutoffNotMet,
       quality,
-      customFormats,
-      customFormatScore,
       qualityCutoffNotMet,
       eventType,
       sourceTitle,
       date,
       data,
-      downloadId,
       isMarkingAsFailed,
       columns,
       shortDateFormat,
@@ -132,7 +127,7 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'episodes.title') {
+            if (name === 'episodeTitle') {
               return (
                 <TableRowCell key={name}>
                   <EpisodeTitleLink
@@ -146,10 +141,13 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'languages') {
+            if (name === 'language') {
               return (
                 <TableRowCell key={name}>
-                  <EpisodeLanguages languages={languages} />
+                  <EpisodeLanguage
+                    language={language}
+                    isCutoffMet={languageCutoffNotMet}
+                  />
                 </TableRowCell>
               );
             }
@@ -165,16 +163,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormats') {
-              return (
-                <TableRowCell key={name}>
-                  <EpisodeFormats
-                    formats={customFormats}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'date') {
               return (
                 <RelativeDateCellConnector
@@ -206,24 +194,6 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'customFormatScore') {
-              return (
-                <TableRowCell
-                  key={name}
-                  className={styles.customFormatScore}
-                >
-                  <Tooltip
-                    anchor={formatCustomFormatScore(
-                      customFormatScore,
-                      customFormats.length
-                    )}
-                    tooltip={<EpisodeFormats formats={customFormats} />}
-                    position={tooltipPositions.BOTTOM}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'releaseGroup') {
               return (
                 <TableRowCell
@@ -235,28 +205,16 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'sourceTitle') {
-              return (
-                <TableRowCell
-                  key={name}
-                >
-                  {sourceTitle}
-                </TableRowCell>
-              );
-            }
-
             if (name === 'details') {
               return (
                 <TableRowCell
                   key={name}
                   className={styles.details}
                 >
-                  <div className={styles.actionContents}>
-                    <IconButton
-                      name={icons.INFO}
-                      onPress={this.onDetailsPress}
-                    />
-                  </div>
+                  <IconButton
+                    name={icons.INFO}
+                    onPress={this.onDetailsPress}
+                  />
                 </TableRowCell>
               );
             }
@@ -270,7 +228,6 @@ class HistoryRow extends Component {
           eventType={eventType}
           sourceTitle={sourceTitle}
           data={data}
-          downloadId={downloadId}
           isMarkingAsFailed={isMarkingAsFailed}
           shortDateFormat={shortDateFormat}
           timeFormat={timeFormat}
@@ -287,16 +244,14 @@ HistoryRow.propTypes = {
   episodeId: PropTypes.number,
   series: PropTypes.object.isRequired,
   episode: PropTypes.object,
-  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
+  language: PropTypes.object.isRequired,
+  languageCutoffNotMet: PropTypes.bool.isRequired,
   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,
@@ -305,8 +260,4 @@ HistoryRow.propTypes = {
   onMarkAsFailedPress: PropTypes.func.isRequired
 };
 
-HistoryRow.defaultProps = {
-  customFormats: []
-};
-
 export default HistoryRow;

frontend/src/Activity/History/HistoryRowConnector.js

@@ -3,8 +3,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { fetchHistory, markAsFailed } from 'Store/Actions/historyActions';
-import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
 import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
+import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
 import HistoryRow from './HistoryRow';
 
@@ -49,7 +49,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);
-  background-color: var(--torrentColor);
+  border-color: $torrentColor;
+  background-color: $torrentColor;
 }
 
 .usenet {
   composes: label from '~Components/Label.css';
 
-  border-color: var(--usenetColor);
-  background-color: var(--usenetColor);
+  border-color: $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,31 +1,27 @@
 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';
-import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
-import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
-import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
-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 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 { align, icons } from 'Helpers/Props';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import TablePager from 'Components/Table/TablePager';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
+import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
+import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
+import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
+import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
+import RemoveQueueItemsModal from './RemoveQueueItemsModal';
 import QueueOptionsConnector from './QueueOptionsConnector';
 import QueueRowConnector from './QueueRowConnector';
-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,
@@ -76,23 +62,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;
-    }
-
-    if (!_.isEmpty(nextState)) {
-      this.setState(nextState);
+      this.setState({ isPendingSelected });
     }
   }
 
@@ -101,45 +77,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._shouldBlockRefresh = true;
-    });
-  };
+    this.setState({ isConfirmRemoveModalOpen: 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
@@ -153,16 +121,11 @@ class Queue extends Component {
       isEpisodesPopulated,
       episodesError,
       columns,
-      selectedFilterKey,
-      filters,
-      customFilters,
-      count,
       totalRecords,
       isGrabbing,
       isRemoving,
       isRefreshMonitoredDownloadsExecuting,
       onRefreshPress,
-      onFilterSelect,
       ...otherProps
     } = this.props;
 
@@ -183,7 +146,7 @@ class Queue extends Component {
     const disableSelectedActions = selectedCount === 0;
 
     return (
-      <PageContent title={translate('Queue')}>
+      <PageContent title="Queue">
         <PageToolbar>
           <PageToolbarSection>
             <PageToolbarButton
@@ -196,7 +159,7 @@ class Queue extends Component {
             <PageToolbarSeparator />
 
             <PageToolbarButton
-              label={translate('GrabSelected')}
+              label="Grab Selected"
               iconName={icons.DOWNLOAD}
               isDisabled={disableSelectedActions || !isPendingSelected}
               isSpinning={isGrabbing}
@@ -204,7 +167,7 @@ class Queue extends Component {
             />
 
             <PageToolbarButton
-              label={translate('RemoveSelected')}
+              label="Remove Selected"
               iconName={icons.REMOVE}
               isDisabled={disableSelectedActions}
               isSpinning={isRemoving}
@@ -221,51 +184,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 ?
-              <LoadingIndicator /> :
-              null
+            isRefreshing && !isAllPopulated &&
+              <LoadingIndicator />
           }
 
           {
-            !isRefreshing && hasError ?
-              <Alert kind={kinds.DANGER}>
-                {translate('QueueLoadError')}
-              </Alert> :
-              null
+            !isRefreshing && hasError &&
+              <div>
+                Failed to load Queue
+              </div>
           }
 
           {
-            isAllPopulated && !hasError && !items.length ?
-              <Alert kind={kinds.INFO}>
-                {
-                  selectedFilterKey !== 'all' && count > 0 ?
-                    translate('QueueFilterHasNoItems') :
-                    translate('QueueIsEmpty')
-                }
-              </Alert> :
-              null
+            isPopulated && !hasError && !items.length &&
+              <div>
+                Queue is empty
+              </div>
           }
 
           {
-            isAllPopulated && !hasError && !!items.length ?
+            isAllPopulated && !hasError && !!items.length &&
               <div>
                 <Table
                   columns={columns}
@@ -287,7 +234,6 @@ class Queue extends Component {
                             columns={columns}
                             {...item}
                             onSelectedChange={this.onSelectedChange}
-                            onQueueRowModalOpenOrClose={this.onQueueRowModalOpenOrClose}
                           />
                         );
                       })
@@ -300,8 +246,7 @@ class Queue extends Component {
                   isFetching={isRefreshing}
                   {...otherProps}
                 />
-              </div> :
-              null
+              </div>
           }
         </PageContentBody>
 
@@ -315,17 +260,6 @@ class Queue extends Component {
               return !!(item && item.seriesId && item.episodeId);
             })
           )}
-          allPending={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}
         />
@@ -343,22 +277,13 @@ Queue.propTypes = {
   isEpisodesPopulated: PropTypes.bool.isRequired,
   episodesError: 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,
-  onFilterSelect: PropTypes.func.isRequired
-};
-
-Queue.defaultProps = {
-  count: 0
+  onRemoveSelectedPress: PropTypes.func.isRequired
 };
 
 export default Queue;

frontend/src/Activity/Queue/QueueConnector.js

@@ -2,16 +2,15 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import * as commandNames from 'Commands/commandNames';
-import withCurrentPage from 'Components/withCurrentPage';
-import { executeCommand } from 'Store/Actions/commandActions';
-import { clearEpisodes, fetchEpisodes } from 'Store/Actions/episodeActions';
-import * as queueActions from 'Store/Actions/queueActions';
-import { createCustomFiltersSelector } from 'Store/Selectors/createClientSideCollectionSelector';
-import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
-import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import withCurrentPage from 'Components/withCurrentPage';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import { executeCommand } from 'Store/Actions/commandActions';
+import * as queueActions from 'Store/Actions/queueActions';
+import { fetchEpisodes, clearEpisodes } from 'Store/Actions/episodeActions';
+import * as commandNames from 'Commands/commandNames';
 import Queue from './Queue';
 
 function createMapStateToProps() {
@@ -19,16 +18,12 @@ function createMapStateToProps() {
     (state) => state.episodes,
     (state) => state.queue.options,
     (state) => state.queue.paged,
-    (state) => state.queue.status.item,
-    createCustomFiltersSelector('queue'),
     createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
-    (episodes, options, queue, status, customFilters, isRefreshMonitoredDownloadsExecuting) => {
+    (episodes, options, queue, isRefreshMonitoredDownloadsExecuting) => {
       return {
-        count: options.includeUnknownSeriesItems ? status.totalCount : status.count,
         isEpisodesFetching: episodes.isFetching,
         isEpisodesPopulated: episodes.isPopulated,
         episodesError: episodes.error,
-        customFilters,
         isRefreshMonitoredDownloadsExecuting,
         ...options,
         ...queue
@@ -53,7 +48,6 @@ class QueueConnector extends Component {
     const {
       useCurrentPage,
       fetchQueue,
-      fetchQueueStatus,
       gotoQueueFirstPage
     } = this.props;
 
@@ -64,8 +58,6 @@ class QueueConnector extends Component {
     } else {
       gotoQueueFirstPage();
     }
-
-    fetchQueueStatus();
   }
 
   componentDidUpdate(prevProps) {
@@ -98,38 +90,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);
@@ -137,21 +125,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
@@ -165,7 +153,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}
@@ -181,14 +168,12 @@ QueueConnector.propTypes = {
   useCurrentPage: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).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.css

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

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

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

frontend/src/Activity/Queue/QueueDetails.js

@@ -1,71 +1,115 @@
+import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { icons, kinds } from 'Helpers/Props';
 import Icon from 'Components/Icon';
-import Popover from 'Components/Tooltip/Popover';
-import { icons, tooltipPositions } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import QueueStatus from './QueueStatus';
-import styles from './QueueDetails.css';
 
 function QueueDetails(props) {
   const {
     title,
     size,
     sizeleft,
+    estimatedCompletionTime,
     status,
     trackedDownloadState,
     trackedDownloadStatus,
-    statusMessages,
     errorMessage,
     progressBar
   } = props;
 
   const progress = (100 - sizeleft / size * 100);
-  const isDownloading = status === 'downloading';
-  const isPaused = status === 'paused';
-  const hasWarning = trackedDownloadStatus === 'warning';
-  const hasError = trackedDownloadStatus === 'error';
-
-  if (
-    (isDownloading || isPaused) &&
-    !hasWarning &&
-    !hasError
-  ) {
-    const state = isPaused ? translate('Paused') : translate('Downloading');
-
-    if (progress < 5) {
-      return (
-        <Icon
-          name={icons.DOWNLOADING}
-          title={`${state} - ${progress.toFixed(1)}% ${title}`}
-        />
-      );
-    }
 
+  if (status === 'pending') {
     return (
-      <Popover
-        className={styles.progressBarContainer}
-        anchor={progressBar}
-        title={`${state} - ${progress.toFixed(1)}%`}
-        body={
-          <div>{title}</div>
-        }
-        position={tooltipPositions.LEFT}
+      <Icon
+        name={icons.PENDING}
+        title={`Release will be processed ${moment(estimatedCompletionTime).fromNow()}`}
       />
     );
   }
 
-  return (
-    <QueueStatus
-      sourceTitle={title}
-      status={status}
-      trackedDownloadStatus={trackedDownloadStatus}
-      trackedDownloadState={trackedDownloadState}
-      statusMessages={statusMessages}
-      errorMessage={errorMessage}
-      position={tooltipPositions.LEFT}
-    />
-  );
+  if (status === 'completed') {
+    if (errorMessage) {
+      return (
+        <Icon
+          name={icons.DOWNLOAD}
+          kind={kinds.DANGER}
+          title={`Import failed: ${errorMessage}`}
+        />
+      );
+    }
+
+    if (trackedDownloadStatus === 'warning') {
+      return (
+        <Icon
+          name={icons.DOWNLOAD}
+          kind={kinds.WARNING}
+          title={'Downloaded - Unable to Import: check logs for details'}
+        />
+      );
+    }
+
+    if (trackedDownloadState === 'importPending') {
+      return (
+        <Icon
+          name={icons.DOWNLOAD}
+          kind={kinds.PURPLE}
+          title={'Downloaded - Waiting to Import'}
+        />
+      );
+    }
+
+    if (trackedDownloadState === 'importing') {
+      return (
+        <Icon
+          name={icons.DOWNLOAD}
+          kind={kinds.PURPLE}
+          title={'Downloaded - Importing'}
+        />
+      );
+    }
+  }
+
+  if (errorMessage) {
+    return (
+      <Icon
+        name={icons.DOWNLOADING}
+        kind={kinds.DANGER}
+        title={`Download failed: ${errorMessage}`}
+      />
+    );
+  }
+
+  if (status === 'failed') {
+    return (
+      <Icon
+        name={icons.DOWNLOADING}
+        kind={kinds.DANGER}
+        title="Download failed: check download client for more details"
+      />
+    );
+  }
+
+  if (status === 'warning') {
+    return (
+      <Icon
+        name={icons.DOWNLOADING}
+        kind={kinds.WARNING}
+        title="Download warning: check download client for more details"
+      />
+    );
+  }
+
+  if (progress < 5) {
+    return (
+      <Icon
+        name={icons.DOWNLOADING}
+        title={`Episode is downloading - ${progress.toFixed(1)}% ${title}`}
+      />
+    );
+  }
+
+  return progressBar;
 }
 
 QueueDetails.propTypes = {
@@ -76,14 +120,8 @@ QueueDetails.propTypes = {
   status: PropTypes.string.isRequired,
   trackedDownloadState: PropTypes.string.isRequired,
   trackedDownloadStatus: PropTypes.string.isRequired,
-  statusMessages: PropTypes.arrayOf(PropTypes.object),
   errorMessage: PropTypes.string,
   progressBar: PropTypes.node.isRequired
 };
 
-QueueDetails.defaultProps = {
-  trackedDownloadStatus: 'ok',
-  trackedDownloadState: 'downloading'
-};
-
 export default QueueDetails;