Fixed: Truncate custom format card tags

(cherry picked from commit fe476a319e1768a929e326e87a54b10bc5e4f402)

.editorconfig

@@ -42,6 +42,7 @@ csharp_style_var_elsewhere = true:suggestion
 
 # Stylecop Rules
 dotnet_diagnostic.SA0001.severity = none
+dotnet_diagnostic.SA1005.severity = none
 dotnet_diagnostic.SA1025.severity = none
 dotnet_diagnostic.SA1101.severity = none
 dotnet_diagnostic.SA1116.severity = none

SECURITY.md

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

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.0.0'
+  majorVersion: '4.3.1'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'
@@ -27,7 +27,6 @@ trigger:
     include:
     - develop
     - master
-    - zeus
 
 pr:
   branches:
@@ -1093,7 +1092,7 @@ stages:
           projectVersion: '$(radarrVersion)'
           extraProperties: |
             sonar.exclusions=**/obj/**,**/*.dll,**/NzbDrone.Core.Test/Files/**/*,./frontend/**,**/ExternalModules/**,./src/Libraries/**
-            sonar.coverage.exclusions=**/Radarr.Api.V*/**/*
+            sonar.coverage.exclusions=**/Radarr.Api.V3/**/*
             sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml
             sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml
       - bash: |

docs.sh

@@ -29,7 +29,7 @@ dotnet msbuild -restore $slnFile -p:Configuration=Debug -p:Platform=$platform -p
 dotnet new tool-manifest
 dotnet tool install --version 6.3.0 Swashbuckle.AspNetCore.Cli
 
-dotnet tool run swagger tofile --output ./src/Radarr.Api.V4/openapi.json "$outputFolder/net6.0/$RUNTIME/radarr.console.dll" v4 &
+dotnet tool run swagger tofile --output ./src/Radarr.Api.V3/openapi.json "$outputFolder/net6.0/$RUNTIME/radarr.console.dll" v3 &
 
 sleep 45
 

frontend/.eslintrc.js

@@ -39,7 +39,6 @@ module.exports = {
   plugins: [
     'filenames',
     'react',
-    'react-hooks',
     'simple-import-sort',
     'import'
   ],
@@ -309,9 +308,7 @@ module.exports = {
     'react/react-in-jsx-scope': 2,
     'react/self-closing-comp': 2,
     'react/sort-comp': 2,
-    'react/jsx-wrap-multilines': 2,
+    'react/jsx-wrap-multilines': 2
-    'react-hooks/rules-of-hooks': 'error',
-    'react-hooks/exhaustive-deps': 'error'
   },
   overrides: [
     {

frontend/postcss.config.js

@@ -1,6 +1,7 @@
 const reload = require('require-nocache')(module);
 
 const cssVarsFiles = [
+  './src/Styles/Variables/colors',
   './src/Styles/Variables/dimensions',
   './src/Styles/Variables/fonts',
   './src/Styles/Variables/animations',
@@ -28,4 +29,4 @@ module.exports = {
     'postcss-color-function',
     'postcss-nested'
   ]
-};
+};

frontend/src/Activity/Queue/ProtocolLabel.css

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

frontend/src/AddMovie/AddNewMovie/AddNewMovie.css

@@ -6,12 +6,12 @@
 .searchIconContainer {
   width: 58px;
   height: 46px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-right: none;
   border-radius: 4px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  background-color: var(--searchIconContainerBackgroundColor);
+  background-color: #edf1f2;
   text-align: center;
   line-height: 46px;
 }
@@ -25,7 +25,7 @@
 }
 
 .clearLookupButton {
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-left: none;
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.css

@@ -4,7 +4,7 @@
 
 .year {
   margin-left: 5px;
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .poster {

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js

@@ -20,6 +20,10 @@ class AddNewMovieModalContent extends Component {
   //
   // Listeners
 
+  onQualityProfileIdChange = ({ value }) => {
+    this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
+  };
+
   onAddMoviePress = () => {
     this.props.onAddMoviePress();
   };
@@ -36,7 +40,7 @@ class AddNewMovieModalContent extends Component {
       isAdding,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       folder,
@@ -126,9 +130,9 @@ class AddNewMovieModalContent extends Component {
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
+                    name="qualityProfileId"
-                    onChange={onInputChange}
+                    onChange={this.onQualityProfileIdChange}
-                    {...qualityProfileIds}
+                    {...qualityProfileId}
                   />
                 </FormGroup>
 
@@ -185,7 +189,7 @@ AddNewMovieModalContent.propTypes = {
   addError: PropTypes.object,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.object),
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,

frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js

@@ -58,7 +58,7 @@ class AddNewMovieModalContentConnector extends Component {
       tmdbId,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       tags
@@ -68,7 +68,7 @@ class AddNewMovieModalContentConnector extends Component {
       tmdbId,
       rootFolderPath: rootFolderPath.value,
       monitor: monitor.value,
-      qualityProfileIds: qualityProfileIds.value,
+      qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
       searchForMovie: searchForMovie.value,
       tags: tags.value
@@ -93,7 +93,7 @@ AddNewMovieModalContentConnector.propTypes = {
   tmdbId: PropTypes.number.isRequired,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.object),
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.css

@@ -9,15 +9,13 @@
 .underlay {
   @add-mixin cover;
 
-  background-color: var(--addMovieBackgroundColor);
+  background-color: $white;
   transition: background 500ms;
 
   &:hover {
-    background-color: var(--pageBackground);
+    background-color: #eaf2ff;
-    box-shadow: 0 0 12px var(--black);
     color: inherit;
     text-decoration: none;
-    transition: all 200ms ease-in;
   }
 }
 
@@ -33,7 +31,7 @@
   display: block;
   margin-right: 20px;
   height: 250px;
-  background-color: var(--defaultColor);
+  background-color: $defaultColor;
 }
 
 .content {
@@ -58,7 +56,7 @@
 
 .year {
   margin-left: 10px;
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .icons {
@@ -77,7 +75,7 @@
 
 .exclusionIcon {
   margin-left: 10px;
-  color: var(--dangerColor);
+  color: $dangerColor;
   pointer-events: all;
 }
 

frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js

@@ -72,19 +72,15 @@ class AddNewMovieSearchResult extends Component {
       colorImpairedMode,
       id,
       monitored,
+      hasFile,
       isAvailable,
       queueStatus,
       queueState,
       runtime,
       movieRuntimeFormat,
-      certification,
+      certification
-      statistics
     } = this.props;
 
-    const {
-      movieFileCount
-    } = statistics;
-
     const {
       isNewAddMovieModalOpen
     } = this.state;
@@ -124,7 +120,7 @@ class AddNewMovieSearchResult extends Component {
                   isExistingMovie &&
                     <MovieIndexProgressBar
                       monitored={monitored}
-                      hasFile={movieFileCount > 0}
+                      hasFile={hasFile}
                       status={status}
                       posterWidth={posterWidth}
                       detailedProgressBar={true}
@@ -237,7 +233,7 @@ class AddNewMovieSearchResult extends Component {
               {
                 isExistingMovie && isSmallScreen &&
                   <MovieStatusLabel
-                    hasMovieFiles={movieFileCount > 0}
+                    hasMovieFiles={hasFile}
                     monitored={monitored}
                     isAvailable={isAvailable}
                     id={id}
@@ -294,14 +290,7 @@ AddNewMovieSearchResult.propTypes = {
   queueState: PropTypes.string,
   runtime: PropTypes.number.isRequired,
   movieRuntimeFormat: PropTypes.string.isRequired,
-  certification: PropTypes.string,
+  certification: PropTypes.string
-  statistics: PropTypes.object
-};
-
-AddNewMovieSearchResult.defaultProps = {
-  statistics: {
-    movieFileCount: 0
-  }
 };
 
 export default AddNewMovieSearchResult;

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

@@ -25,13 +25,13 @@ class ImportMovieFooter extends Component {
 
     const {
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability
     } = props;
 
     this.state = {
       monitor: defaultMonitor,
-      qualityProfileIds: defaultQualityProfileIds,
+      qualityProfileId: defaultQualityProfileId,
       minimumAvailability: defaultMinimumAvailability
     };
   }
@@ -39,16 +39,16 @@ class ImportMovieFooter extends Component {
   componentDidUpdate(prevProps, prevState) {
     const {
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability,
       isMonitorMixed,
-      isQualityProfileIdsMixed,
+      isQualityProfileIdMixed,
       isMinimumAvailabilityMixed
     } = this.props;
 
     const {
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability
     } = this.state;
 
@@ -60,10 +60,10 @@ class ImportMovieFooter extends Component {
       newState.monitor = defaultMonitor;
     }
 
-    if (isQualityProfileIdsMixed && qualityProfileIds !== MIXED) {
+    if (isQualityProfileIdMixed && qualityProfileId !== MIXED) {
-      newState.qualityProfileIds = MIXED;
+      newState.qualityProfileId = MIXED;
-    } else if (!isQualityProfileIdsMixed && qualityProfileIds !== defaultQualityProfileIds) {
+    } else if (!isQualityProfileIdMixed && qualityProfileId !== defaultQualityProfileId) {
-      newState.qualityProfileIds = defaultQualityProfileIds;
+      newState.qualityProfileId = defaultQualityProfileId;
     }
 
     if (isMinimumAvailabilityMixed && minimumAvailability !== MIXED) {
@@ -94,7 +94,7 @@ class ImportMovieFooter extends Component {
       isImporting,
       isLookingUpMovie,
       isMonitorMixed,
-      isQualityProfileIdsMixed,
+      isQualityProfileIdMixed,
       isMinimumAvailabilityMixed,
       hasUnsearchedItems,
       importError,
@@ -105,7 +105,7 @@ class ImportMovieFooter extends Component {
 
     const {
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability
     } = this.state;
 
@@ -148,10 +148,10 @@ class ImportMovieFooter extends Component {
 
           <FormInputGroup
             type={inputTypes.QUALITY_PROFILE_SELECT}
-            name="qualityProfileIds"
+            name="qualityProfileId"
-            value={qualityProfileIds}
+            value={qualityProfileId}
             isDisabled={!selectedCount}
-            includeMixed={isQualityProfileIdsMixed}
+            includeMixed={isQualityProfileIdMixed}
             onChange={this.onInputChange}
           />
         </div>
@@ -251,10 +251,10 @@ ImportMovieFooter.propTypes = {
   isImporting: PropTypes.bool.isRequired,
   isLookingUpMovie: PropTypes.bool.isRequired,
   defaultMonitor: PropTypes.string.isRequired,
-  defaultQualityProfileIds: PropTypes.arrayOf(PropTypes.number),
+  defaultQualityProfileId: PropTypes.number,
   defaultMinimumAvailability: PropTypes.string,
   isMonitorMixed: PropTypes.bool.isRequired,
-  isQualityProfileIdsMixed: PropTypes.bool.isRequired,
+  isQualityProfileIdMixed: PropTypes.bool.isRequired,
   isMinimumAvailabilityMixed: PropTypes.bool.isRequired,
   hasUnsearchedItems: PropTypes.bool.isRequired,
   importError: PropTypes.object,

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

@@ -18,7 +18,7 @@ function createMapStateToProps() {
     (addMovie, importMovie, selectedIds) => {
       const {
         monitor: defaultMonitor,
-        qualityProfileIds: defaultQualityProfileIds,
+        qualityProfileId: defaultQualityProfileId,
         minimumAvailability: defaultMinimumAvailability
       } = addMovie.defaults;
 
@@ -30,7 +30,7 @@ function createMapStateToProps() {
       } = importMovie;
 
       const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
-      const isQualityProfileIdsMixed = isMixed(items, selectedIds, defaultQualityProfileIds, 'qualityProfileIds');
+      const isQualityProfileIdMixed = isMixed(items, selectedIds, defaultQualityProfileId, 'qualityProfileId');
       const isMinimumAvailabilityMixed = isMixed(items, selectedIds, defaultMinimumAvailability, 'minimumAvailability');
       const hasUnsearchedItems = !isLookingUpMovie && items.some((item) => !item.isPopulated);
 
@@ -39,10 +39,10 @@ function createMapStateToProps() {
         isLookingUpMovie,
         isImporting,
         defaultMonitor,
-        defaultQualityProfileIds,
+        defaultQualityProfileId,
         defaultMinimumAvailability,
         isMonitorMixed,
-        isQualityProfileIdsMixed,
+        isQualityProfileIdMixed,
         isMinimumAvailabilityMixed,
         importError,
         hasUnsearchedItems

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

@@ -11,7 +11,7 @@ function ImportMovieRow(props) {
   const {
     id,
     monitor,
-    qualityProfileIds,
+    qualityProfileId,
     minimumAvailability,
     selectedMovie,
     isExistingMovie,
@@ -62,8 +62,8 @@ function ImportMovieRow(props) {
       <VirtualTableRowCell className={styles.qualityProfile}>
         <FormInputGroup
           type={inputTypes.QUALITY_PROFILE_SELECT}
-          name="qualityProfileIds"
+          name="qualityProfileId"
-          value={qualityProfileIds}
+          value={qualityProfileId}
           onChange={onInputChange}
         />
       </VirtualTableRowCell>
@@ -74,7 +74,7 @@ function ImportMovieRow(props) {
 ImportMovieRow.propTypes = {
   id: PropTypes.string.isRequired,
   monitor: PropTypes.string.isRequired,
-  qualityProfileIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,
   selectedMovie: PropTypes.object,
   isExistingMovie: PropTypes.bool.isRequired,

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

@@ -15,7 +15,7 @@ class ImportMovieTable extends Component {
     const {
       unmappedFolders,
       defaultMonitor,
-      defaultQualityProfileIds,
+      defaultQualityProfileId,
       defaultMinimumAvailability,
       onMovieLookup,
       onSetImportMovieValue
@@ -23,7 +23,7 @@ class ImportMovieTable extends Component {
 
     const values = {
       monitor: defaultMonitor,
-      qualityProfileIds: defaultQualityProfileIds,
+      qualityProfileId: defaultQualityProfileId,
       minimumAvailability: defaultMinimumAvailability
     };
 
@@ -167,7 +167,7 @@ ImportMovieTable.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object),
   unmappedFolders: PropTypes.arrayOf(PropTypes.object),
   defaultMonitor: PropTypes.string.isRequired,
-  defaultQualityProfileIds: PropTypes.arrayOf(PropTypes.number),
+  defaultQualityProfileId: PropTypes.number,
   defaultMinimumAvailability: PropTypes.string,
   allSelected: PropTypes.bool.isRequired,
   allUnselected: PropTypes.bool.isRequired,

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

@@ -13,7 +13,7 @@ function createMapStateToProps() {
     (addMovie, importMovie, dimensions, allMovies) => {
       return {
         defaultMonitor: addMovie.defaults.monitor,
-        defaultQualityProfileIds: addMovie.defaults.qualityProfileIds,
+        defaultQualityProfileId: addMovie.defaults.qualityProfileId,
         defaultMinimumAvailability: addMovie.defaults.minimumAvailability,
         items: importMovie.items,
         isSmallScreen: dimensions.isSmallScreen,

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSearchResult.css

@@ -4,7 +4,7 @@
   width: 100%;
 
   &:hover {
-    background-color: var(--menuItemHoverBackgroundColor);
+    background-color: $menuItemHoverBackgroundColor;
   }
 }
 
@@ -17,7 +17,7 @@
   composes: link from '~Components/Link/Link.css';
 
   margin-left: auto;
-  color: var(--textColor);
+  color: $textColor;
 }
 
 .tmdbLinkIcon {

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.css

@@ -7,10 +7,10 @@
   padding: 6px 16px;
   width: 100%;
   height: 35px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor;
 }
 
 .loading {
@@ -38,9 +38,9 @@
 
 .content {
   padding: 4px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
 }
 
 .searchContainer {
@@ -49,12 +49,12 @@
 
 .searchIconContainer {
   width: 58px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-right: none;
   border-radius: 4px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  background-color: var(--searchIconContainerBackgroundColor);
+  background-color: #edf1f2;
   text-align: center;
   line-height: 33px;
 }

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

@@ -5,7 +5,6 @@ import FormInputButton from 'Components/Form/FormInputButton';
 import TextInput from 'Components/Form/TextInput';
 import Icon from 'Components/Icon';
 import Link from 'Components/Link/Link';
-import SpinnerButton from 'Components/Link/SpinnerButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Portal from 'Components/Portal';
 import { icons, kinds } from 'Helpers/Props';
@@ -243,7 +242,7 @@ class ImportMovieSelectMovie extends Component {
                           <FormInputButton
                             kind={kinds.DEFAULT}
                             spinnerIcon={icons.REFRESH}
-                            ButtonComponent={SpinnerButton}
+                            canSpin={true}
                             isSpinning={isFetching}
                             onPress={this.onRefreshPress}
                           >

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieTitle.css

@@ -9,7 +9,7 @@
 
 .year {
   margin-left: 5px;
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .existing {

frontend/src/App/App.js

@@ -4,7 +4,6 @@ import React from 'react';
 import DocumentTitle from 'react-document-title';
 import { Provider } from 'react-redux';
 import PageConnector from 'Components/Page/PageConnector';
-import ApplyTheme from './ApplyTheme';
 import AppRoutes from './AppRoutes';
 
 function App({ store, history }) {
@@ -12,11 +11,9 @@ function App({ store, history }) {
     <DocumentTitle title={window.Radarr.instanceName}>
       <Provider store={store}>
         <ConnectedRouter history={history}>
-          <ApplyTheme>
+          <PageConnector>
-            <PageConnector>
+            <AppRoutes app={App} />
-              <AppRoutes app={App} />
+          </PageConnector>
-            </PageConnector>
-          </ApplyTheme>
         </ConnectedRouter>
       </Provider>
     </DocumentTitle>

frontend/src/App/AppRoutes.js

@@ -22,7 +22,7 @@ import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementCo
 import MetadataSettings from 'Settings/Metadata/MetadataSettings';
 import NotificationSettings from 'Settings/Notifications/NotificationSettings';
 import Profiles from 'Settings/Profiles/Profiles';
-import QualityConnector from 'Settings/Quality/QualityConnector';
+import Quality from 'Settings/Quality/Quality';
 import Settings from 'Settings/Settings';
 import TagSettings from 'Settings/Tags/TagSettings';
 import UISettingsConnector from 'Settings/UI/UISettingsConnector';
@@ -143,7 +143,7 @@ function AppRoutes(props) {
 
       <Route
         path="/settings/quality"
-        component={QualityConnector}
+        component={Quality}
       />
 
       <Route

frontend/src/App/ApplyTheme.js

@@ -1,49 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Fragment, useCallback, useEffect } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import themes from 'Styles/Themes';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.settings.ui.item.theme || window.Radarr.theme,
-    (
-      theme
-    ) => {
-      return {
-        theme
-      };
-    }
-  );
-}
-
-function ApplyTheme({ theme, children }) {
-  // Update the CSS Variables
-  const updateCSSVariables = useCallback(() => {
-    const arrayOfVariableKeys = Object.keys(themes[theme]);
-    const arrayOfVariableValues = Object.values(themes[theme]);
-
-    // Loop through each array key and set the CSS Variables
-    arrayOfVariableKeys.forEach((cssVariableKey, index) => {
-      // Based on our snippet from MDN
-      document.documentElement.style.setProperty(
-        `--${cssVariableKey}`,
-        arrayOfVariableValues[index]
-      );
-    });
-  }, [theme]);
-
-  // On Component Mount and Component Update
-  useEffect(() => {
-    updateCSSVariables(theme);
-  }, [updateCSSVariables, theme]);
-
-  return <Fragment>{children}</Fragment>;
-}
-
-ApplyTheme.propTypes = {
-  theme: PropTypes.string.isRequired,
-  children: PropTypes.object.isRequired
-};
-
-export default connect(createMapStateToProps)(ApplyTheme);

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -2,11 +2,11 @@
   display: flex;
   overflow-x: hidden;
   padding: 5px;
-  border-bottom: 1px solid var(--borderColor);
+  border-bottom: 1px solid $borderColor;
   font-size: $defaultFontSize;
 
   &:hover {
-    background-color: var(--tableRowHoverBackgroundColor);
+    background-color: $tableRowHoverBackgroundColor;
   }
 }
 

frontend/src/Calendar/CalendarPageConnector.js

@@ -24,7 +24,7 @@ function createMissingMovieIdsSelector() {
         const inCinemas = movie.inCinemas;
 
         if (
-          (!movie.statistics || movie.statistics.movieFileCount === 0) &&
+          !movie.hasFile &&
           moment(inCinemas).isAfter(start) &&
           moment(inCinemas).isBefore(end) &&
           isBefore(movie.inCinemas) &&

frontend/src/Calendar/Day/CalendarDay.css

@@ -2,8 +2,8 @@
   flex: 1 0 14.28%;
   overflow: hidden;
   min-height: 70px;
-  border-bottom: 1px solid var(--calendarBorderColor);
+  border-bottom: 1px solid $calendarBorderColor;
-  border-left: 1px solid var(--calendarBorderColor);
+  border-left: 1px solid $calendarBorderColor;
 }
 
 .isSingleDay {
@@ -12,14 +12,14 @@
 
 .dayOfMonth {
   padding-right: 5px;
-  border-bottom: 1px solid var(--calendarBorderColor);
+  border-bottom: 1px solid $calendarBorderColor;
   text-align: right;
 }
 
 .isToday {
-  background-color: var(--calendarTodayBackgroundColor);
+  background-color: $calendarTodayBackgroundColor;
 }
 
 .isDifferentMonth {
-  color: var(--disabledColor);
+  color: $disabledColor;
 }

frontend/src/Calendar/Day/CalendarDays.css

@@ -1,6 +1,6 @@
 .days {
   display: flex;
-  border-right: 1px solid var(--calendarBorderColor);
+  border-right: 1px solid $calendarBorderColor;
 }
 
 .day,

frontend/src/Calendar/Day/DayOfWeek.css

@@ -1,6 +1,6 @@
 .dayOfWeek {
   flex: 1 0 14.28%;
-  background-color: var(--calendarBackgroudColor);
+  background-color: #e4eaec;
   text-align: center;
 }
 
@@ -9,5 +9,5 @@
 }
 
 .isToday {
-  background-color: var(--calendarTodayBackgroundColor);
+  background-color: $calendarTodayBackgroundColor;
 }

frontend/src/Calendar/Events/CalendarEvent.css

@@ -1,11 +1,9 @@
-$fullColorGradient: rgba(244, 245, 246, 0.2);
-
 .event {
   overflow-x: hidden;
   margin: 4px 2px;
   padding: 5px;
-  border-bottom: 1px solid var(--calendarBorderColor);
+  border-bottom: 1px solid $borderColor;
-  border-left: 4px solid var(--calendarBorderColor);
+  border-left: 4px solid $borderColor;
   font-size: 12px;
 
   &:global(.colorImpaired) {
@@ -17,10 +15,10 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
   composes: link from '~Components/Link/Link.css';
 
   display: block;
-  color: var(--defaultColor);
+  color: $defaultColor;
 
   &:hover {
-    color: var(--defaultColor);
+    color: $defaultColor;
     text-decoration: none;
   }
 }
@@ -31,7 +29,7 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
 }
 
 .movieInfo {
-  color: var(--calendarTextDim);
+  color: $calendarTextDim;
 }
 
 .movieTitle,
@@ -42,7 +40,7 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
 }
 
 .movieTitle {
-  color: var(--calendarTextDimAlternate);
+  color: #3a3f51;
   font-size: $defaultFontSize;
 }
 
@@ -55,85 +53,37 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
  */
 
 .downloaded {
-  border-left-color: var(--successColor) !important;
+  border-left-color: $successColor !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(39, 194, 76, 0.4) !important;
-  }
 
   &:global(.colorImpaired) {
-    border-left-color: color(var(--successColor), saturation(+15%)) !important;
+    border-left-color: color($successColor, saturation(+15%)) !important;
   }
 }
 
 .queue {
-  border-left-color: var(--purple) !important;
+  border-left-color: $purple !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(122, 67, 182, 0.4) !important;
-  }
 }
 
 .unmonitored {
-  border-left-color: var(--gray) !important;
+  border-left-color: $gray !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(173, 173, 173, 0.5) !important;
-  }
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
-  }
-
-  &:global(.fullColor.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
-  }
 }
 
 .missingUnmonitored {
-  border-left-color: var(--warningColor) !important;
+  border-left-color: $warningColor !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(255, 165, 0, 0.6) !important;
-  }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+    background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-  }
-
-  &:global(.fullColor.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
   }
 }
 
 .missingMonitored {
-  border-left-color: var(--dangerColor) !important;
+  border-left-color: $dangerColor !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(240, 80, 80, 0.6) !important;
-  }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-  }
-
-  &:global(.fullColor.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
   }
 }
 
-.unaired {
+.continuing {
-  border-left-color: var(--primaryColor) !important;
+  border-left-color: $primaryColor !important;
-
-  &:global(.fullColor) {
-    background-color: rgba(93, 156, 236, 0.4) !important;
-  }
-
-  &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
-  }
-
-  &:global(.fullColor.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $fullColorGradient, $fullColorGradient 5px, transparent 5px, transparent 10px);
-  }
 }

frontend/src/Calendar/Events/CalendarEvent.js

@@ -32,7 +32,6 @@ class CalendarEvent extends Component {
       queueItem,
       showMovieInformation,
       showCutoffUnmetIcon,
-      fullColorEvents,
       colorImpairedMode,
       date
     } = this.props;
@@ -63,8 +62,7 @@ class CalendarEvent extends Component {
             styles.event,
             styles.link,
             styles[statusStyle],
-            colorImpairedMode && 'colorImpaired',
+            colorImpairedMode && 'colorImpaired'
-            fullColorEvents && 'fullColor'
           )}
           // component="div"
           to={link}
@@ -99,7 +97,7 @@ class CalendarEvent extends Component {
                 <Icon
                   className={styles.statusIcon}
                   name={icons.MOVIE_FILE}
-                  kind={fullColorEvents ? kinds.DEFAULT : kinds.WARNING}
+                  kind={kinds.WARNING}
                   title={translate('QualityCutoffHasNotBeenMet')}
                 />
             }
@@ -144,12 +142,11 @@ CalendarEvent.propTypes = {
   digitalRelease: PropTypes.string,
   monitored: PropTypes.bool.isRequired,
   certification: PropTypes.string,
-  hasFile: PropTypes.bool,
+  hasFile: PropTypes.bool.isRequired,
   grabbed: PropTypes.bool,
   queueItem: PropTypes.object,
   showMovieInformation: PropTypes.bool.isRequired,
   showCutoffUnmetIcon: PropTypes.bool.isRequired,
-  fullColorEvents: PropTypes.bool.isRequired,
   timeFormat: PropTypes.string.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired,
   date: PropTypes.string.isRequired

frontend/src/Calendar/Events/CalendarEventQueueDetails.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import QueueDetails from 'Activity/Queue/QueueDetails';
 import CircularProgressBar from 'Components/CircularProgressBar';
+import colors from 'Styles/Variables/colors';
 import translate from 'Utilities/String/translate';
 
 function CalendarEventQueueDetails(props) {
@@ -34,7 +35,7 @@ function CalendarEventQueueDetails(props) {
             progress={progress}
             size={20}
             strokeWidth={2}
-            strokeColor={'#7a43b6'}
+            strokeColor={colors.purple}
           />
         </div>
       }

frontend/src/Calendar/Legend/Legend.js

@@ -9,7 +9,6 @@ import styles from './Legend.css';
 function Legend(props) {
   const {
     showCutoffUnmetIcon,
-    fullColorEvents,
     colorImpairedMode
   } = props;
 
@@ -20,7 +19,7 @@ function Legend(props) {
       <LegendIconItem
         name={translate('CutoffUnmet')}
         icon={icons.MOVIE_FILE}
-        kind={fullColorEvents ? kinds.DEFAULT : kinds.WARNING}
+        kind={kinds.WARNING}
         tooltip={translate('QualityOrLangCutoffHasNotBeenMet')}
       />
     );
@@ -32,14 +31,12 @@ function Legend(props) {
         <LegendItem
           style='ended'
           name={translate('DownloadedAndMonitored')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
           style='availNotMonitored'
           name={translate('DownloadedButNotMonitored')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
@@ -48,14 +45,12 @@ function Legend(props) {
         <LegendItem
           style='missingMonitored'
           name={translate('MissingMonitoredAndConsideredAvailable')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
           style='missingUnmonitored'
           name={translate('MissingNotMonitored')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
@@ -64,14 +59,12 @@ function Legend(props) {
         <LegendItem
           style='queue'
           name={translate('Queued')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
 
         <LegendItem
           style='continuing'
           name={translate('Unreleased')}
-          fullColorEvents={fullColorEvents}
           colorImpairedMode={colorImpairedMode}
         />
       </div>
@@ -86,9 +79,7 @@ function Legend(props) {
 }
 
 Legend.propTypes = {
-  view: PropTypes.string.isRequired,
   showCutoffUnmetIcon: PropTypes.bool.isRequired,
-  fullColorEvents: PropTypes.bool.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired
 };
 

frontend/src/Calendar/Legend/LegendConnector.js

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

frontend/src/Calendar/Legend/LegendIconItem.js

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

frontend/src/Calendar/Legend/LegendItem.css

@@ -1,5 +1,3 @@
-$fullColorGradient: rgba(244, 245, 246, 0.2);
-
 .legendItemContainer {
   margin-right: 5px;
   width: 220px;
@@ -22,55 +20,53 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
 .queue {
   composes: legendItemColor;
 
-  background-color: var(--queueColor);
+  background-color: $queueColor;
 }
 
 .continuing {
   composes: legendItemColor;
 
-  background-color: var(--primaryColor);
+  background-color: $primaryColor;
 }
 
 .availNotMonitored {
   composes: legendItemColor;
 
-  background-color: var(--darkGray);
+  background-color: $darkGray;
 }
 
 .ended {
   composes: legendItemColor;
 
-  background-color: var(--successColor);
+  background-color: $successColor;
 }
 
 .missingMonitored {
   composes: legendItemColor;
 
-  background-color: var(--dangerColor);
+  background-color: $dangerColor;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color(var(--dangerColor) shade(5%)), color(var(--dangerColor) shade(5%)) 5px, color(var(--dangerColor) shade(15%)) 5px, color(var(--dangerColor) shade(15%)) 10px);
+    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
   }
 }
 
 .missingUnmonitored {
   composes: legendItemColor;
 
-  background-color: var(--warningColor);
+  background-color: $warningColor;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, color(var(--warningColor) tint(15%)) 5px, color(var(--warningColor) tint(15%)) 10px);
+    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
   }
 }
 
 .missingMonitoredColorImpaired {
-  background: repeating-linear-gradient(90deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-  color: var(--white);
 }
 
 .missingUnmonitoredColorImpaired {
-  background: repeating-linear-gradient(45deg, var(--colorImpairedGradientDark), var(--colorImpairedGradientDark) 5px, var(--colorImpairedGradient) 5px, var(--colorImpairedGradient) 10px);
+  background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
-  color: var(--white);
 }
 
 .legendItemText {

frontend/src/Calendar/Legend/LegendItem.js

@@ -7,7 +7,6 @@ function LegendItem(props) {
   const {
     name,
     style,
-    fullColorEvents,
     colorImpairedMode
   } = props;
 
@@ -17,8 +16,7 @@ function LegendItem(props) {
         className={classNames(
           styles.legendItem,
           styles[style],
-          colorImpairedMode && 'colorImpaired',
+          colorImpairedMode && 'colorImpaired'
-          fullColorEvents && 'fullColor'
         )}
       />
       <div className={classNames(styles.legendItemText, colorImpairedMode && styles[`${style}ColorImpaired`])}>
@@ -31,7 +29,6 @@ function LegendItem(props) {
 LegendItem.propTypes = {
   name: PropTypes.string.isRequired,
   style: PropTypes.string.isRequired,
-  fullColorEvents: PropTypes.bool.isRequired,
   colorImpairedMode: PropTypes.bool.isRequired
 };
 

frontend/src/Calendar/Options/CalendarOptionsModalContent.js

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

frontend/src/Calendar/iCal/CalendarLinkModalContent.js

@@ -22,7 +22,7 @@ function getUrls(state) {
     tags
   } = state;
 
-  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/v4/calendar/Radarr.ics?`;
+  let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/v3/calendar/Radarr.ics?`;
 
   if (unmonitored) {
     icalUrl += 'unmonitored=true&';

frontend/src/Collection/AddNewCollectionMovieModalContent.css

@@ -4,7 +4,7 @@
 
 .year {
   margin-left: 5px;
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .poster {

frontend/src/Collection/AddNewCollectionMovieModalContent.js

@@ -46,7 +46,7 @@ class AddNewCollectionMovieModalContent extends Component {
       onInputChange,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie
     } = this.props;
@@ -126,13 +126,13 @@ class AddNewCollectionMovieModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>{translate('QualityProfiles')}</FormLabel>
+                  <FormLabel>{translate('QualityProfile')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
+                    name="qualityProfileId"
                     onChange={this.onQualityProfileIdChange}
-                    {...qualityProfileIds}
+                    {...qualityProfileId}
                   />
                 </FormGroup>
 
@@ -189,7 +189,7 @@ AddNewCollectionMovieModalContent.propTypes = {
   addError: PropTypes.object,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.object,
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   folder: PropTypes.string.isRequired,

frontend/src/Collection/AddNewCollectionMovieModalContentConnector.js

@@ -25,7 +25,7 @@ function createMapStateToProps() {
       const collectionDefaults = {
         rootFolderPath: collection.rootFolderPath,
         monitor: 'movieOnly',
-        qualityProfileIds: collection.qualityProfileIds,
+        qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         searchForMovie: collection.searchOnAdd,
         tags: []
@@ -70,7 +70,7 @@ class AddNewCollectionMovieModalContentConnector extends Component {
       title,
       rootFolderPath,
       monitor,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       searchForMovie,
       tags
@@ -81,7 +81,7 @@ class AddNewCollectionMovieModalContentConnector extends Component {
       title,
       rootFolderPath: rootFolderPath.value,
       monitor: monitor.value,
-      qualityProfileIds: qualityProfileIds.value,
+      qualityProfileId: qualityProfileId.value,
       minimumAvailability: minimumAvailability.value,
       searchForMovie: searchForMovie.value,
       tags: tags.value
@@ -109,7 +109,7 @@ AddNewCollectionMovieModalContentConnector.propTypes = {
   title: PropTypes.string.isRequired,
   rootFolderPath: PropTypes.object,
   monitor: PropTypes.object.isRequired,
-  qualityProfileIds: PropTypes.object,
+  qualityProfileId: PropTypes.object,
   minimumAvailability: PropTypes.object.isRequired,
   searchForMovie: PropTypes.object.isRequired,
   tags: PropTypes.object.isRequired,

frontend/src/Collection/Edit/EditCollectionModalContent.js

@@ -46,7 +46,7 @@ class EditCollectionModalContent extends Component {
 
     const {
       monitored,
-      qualityProfileIds,
+      qualityProfileId,
       minimumAvailability,
       // Id,
       rootFolderPath,
@@ -104,12 +104,12 @@ class EditCollectionModalContent extends Component {
                 </FormGroup>
 
                 <FormGroup>
-                  <FormLabel>{translate('QualityProfiles')}</FormLabel>
+                  <FormLabel>{translate('QualityProfile')}</FormLabel>
 
                   <FormInputGroup
                     type={inputTypes.QUALITY_PROFILE_SELECT}
-                    name="qualityProfileIds"
+                    name="qualityProfileId"
-                    {...qualityProfileIds}
+                    {...qualityProfileId}
                     onChange={onInputChange}
                   />
                 </FormGroup>

frontend/src/Collection/Edit/EditCollectionModalContentConnector.js

@@ -39,7 +39,7 @@ function createMapStateToProps() {
 
       const movieSettings = {
         monitored: collection.monitored,
-        qualityProfileIds: collection.qualityProfileIds,
+        qualityProfileId: collection.qualityProfileId,
         minimumAvailability: collection.minimumAvailability,
         rootFolderPath: collection.rootFolderPath,
         searchOnAdd: collection.searchOnAdd

frontend/src/Collection/Overview/CollectionMovie.css

@@ -6,7 +6,7 @@ $hoverScale: 1.05;
 
   &:hover {
     z-index: 2;
-    box-shadow: 0 0 10px var(--black);
+    box-shadow: 0 0 10px $black;
     transition: all 200ms ease-in;
 
     .poster {
@@ -28,7 +28,7 @@ $hoverScale: 1.05;
 .poster {
   position: relative;
   display: block;
-  background-color: var(--defaultColor);
+  background-color: $defaultColor;
 }
 
 .overlay {
@@ -44,7 +44,7 @@ $hoverScale: 1.05;
 
 .overlayTitle {
   padding: 5px;
-  color: var(--offWhite);
+  color: $offWhite;
   text-align: left;
   font-weight: bold;
   font-size: 15px;
@@ -67,7 +67,7 @@ $hoverScale: 1.05;
   z-index: 3;
   border-radius: 4px;
   background-color: #707070;
-  color: var(--white);
+  color: $white;
   font-size: $smallFontSize;
   opacity: 0;
   transition: opacity 0;
@@ -77,7 +77,7 @@ $hoverScale: 1.05;
   composes: button from '~Components/Link/IconButton.css';
 
   &:hover {
-    color: var(--radarrYellow);
+    color: $radarrYellow;
   }
 }
 
@@ -102,16 +102,16 @@ $hoverScale: 1.05;
 
   position: relative;
   display: block;
-  background-color: var(--defaultColor);
+  background-color: $defaultColor;
 }
 
 .monitorToggleButton {
   composes: toggleButton from '~Components/MonitorToggleButton.css';
 
   width: 25px;
-  color: var(--white);
+  color: $white;
 
   &:hover {
-    color: var(--iconButtonHoverLightColor);
+    color: $iconButtonHoverLightColor;
   }
 }

frontend/src/Collection/Overview/CollectionMovieLabel.css

@@ -3,7 +3,7 @@
   align-items: stretch;
   overflow: hidden;
   margin: 2px 4px;
-  border: 1px solid var(--borderColor);
+  border: 1px solid $borderColor;
   border-radius: 4px;
   background-color: #eee;
   cursor: default;
@@ -17,34 +17,34 @@
   padding: 0 4px;
   border-left: 4px;
   border-left-style: solid;
-  background-color: var(--white);
+  background-color: $white;
-  color: var(--defaultColor);
+  color: $defaultColor;
 }
 
 .primary {
-  border-color: var(--primaryColor);
+  border-color: $primaryColor;
 }
 
 .danger {
-  border-color: var(--dangerColor);
+  border-color: $dangerColor;
 }
 
 .success {
-  border-color: var(--successColor);
+  border-color: $successColor;
 }
 
 .purple {
-  border-color: var(--purple);
+  border-color: $purple;
 }
 
 .warning {
-  border-color: var(--warningColor);
+  border-color: $warningColor;
 }
 
 .info {
-  border-color: var(--infoColor);
+  border-color: $infoColor;
 }
 
 .queue {
-  border-color: var(--queueColor);
+  border-color: $queueColor;
 }

frontend/src/Collection/Overview/CollectionMovieLabel.js

@@ -17,13 +17,11 @@ class CollectionMovieLabel extends Component {
       status,
       monitored,
       isAvailable,
+      hasFile,
       onMonitorTogglePress,
-      isSaving,
+      isSaving
-      statistics
     } = this.props;
 
-    const { movieFileCount } = statistics;
-
     return (
       <div className={styles.movie}>
         <div className={styles.movieTitle}>
@@ -48,11 +46,11 @@ class CollectionMovieLabel extends Component {
             <div
               className={classNames(
                 styles.movieStatus,
-                styles[getStatusStyle(status, monitored, movieFileCount > 0, isAvailable, 'kinds')]
+                styles[getStatusStyle(status, monitored, hasFile, isAvailable, 'kinds')]
               )}
             >
               {
-                movieFileCount > 0 ? translate('Downloaded') : translate('Missing')
+                hasFile ? translate('Downloaded') : translate('Missing')
               }
             </div>
         }
@@ -65,9 +63,9 @@ CollectionMovieLabel.propTypes = {
   id: PropTypes.number,
   title: PropTypes.string.isRequired,
   status: PropTypes.string,
-  statistics: PropTypes.object.isRequired,
   isAvailable: PropTypes.bool,
   monitored: PropTypes.bool,
+  hasFile: PropTypes.bool,
   isSaving: PropTypes.bool.isRequired,
   movieFile: PropTypes.object,
   movieFileId: PropTypes.number,
@@ -77,7 +75,9 @@ CollectionMovieLabel.propTypes = {
 CollectionMovieLabel.defaultProps = {
   isSaving: false,
   statistics: {
-    movieFileCount: 0
+    episodeFileCount: 0,
+    totalEpisodeCount: 0,
+    percentOfEpisodes: 0
   }
 };
 

frontend/src/Collection/Overview/CollectionOverview.css

@@ -104,7 +104,7 @@ $hoverScale: 1.05;
   width: 25px;
 
   &:hover {
-    color: var(--iconButtonHoverLightColor);
+    color: $iconButtonHoverLightColor;
   }
 }
 
@@ -131,7 +131,7 @@ $hoverScale: 1.05;
     width: 20px;
 
     &:hover {
-      color: var(--iconButtonHoverLightColor);
+      color: $iconButtonHoverLightColor;
     }
   }
 }

frontend/src/Collection/Overview/CollectionOverview.js

@@ -96,7 +96,7 @@ class CollectionOverview extends Component {
   render() {
     const {
       monitored,
-      qualityProfileIds,
+      qualityProfileId,
       rootFolderPath,
       genres,
       id,
@@ -212,7 +212,7 @@ class CollectionOverview extends Component {
                         <span className={styles.qualityProfileName}>
                           {
                             <QualityProfileNameConnector
-                              qualityProfileIds={qualityProfileIds}
+                              qualityProfileId={qualityProfileId}
                             />
                           }
                         </span>
@@ -325,7 +325,7 @@ class CollectionOverview extends Component {
 CollectionOverview.propTypes = {
   id: PropTypes.number.isRequired,
   monitored: PropTypes.bool.isRequired,
-  qualityProfileIds: PropTypes.number.isRequired,
+  qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,
   searchOnAdd: PropTypes.bool.isRequired,
   rootFolderPath: PropTypes.string.isRequired,

frontend/src/Collection/Overview/CollectionOverviews.css

@@ -5,7 +5,7 @@
 .container {
   &:hover {
     .content {
-      background-color: var(--tableRowHoverBackgroundColor);
+      background-color: $tableRowHoverBackgroundColor;
     }
   }
 }

frontend/src/Commands/commandNames.js

@@ -15,7 +15,6 @@ export const REFRESH_MOVIE = 'RefreshMovie';
 export const RENAME_FILES = 'RenameFiles';
 export const RENAME_MOVIE = 'RenameMovie';
 export const RESET_API_KEY = 'ResetApiKey';
-export const RESET_QUALITY_DEFINITIONS = 'ResetQualityDefinitions';
 export const RSS_SYNC = 'RssSync';
 export const MOVIE_SEARCH = 'MoviesSearch';
 export const IMPORT_LIST_SYNC = 'ImportListSync';

frontend/src/Components/Alert.css

@@ -7,25 +7,25 @@
 }
 
 .danger {
-  border-color: var(--alertDangerBorderColor);
+  border-color: $alertDangerBorderColor;
-  background-color: var(--alertDangerBackgroundColor);
+  background-color: $alertDangerBackgroundColor;
-  color: var(--alertDangerColor);
+  color: $alertDangerColor;
 }
 
 .info {
-  border-color: var(--alertInfoBorderColor);
+  border-color: $alertInfoBorderColor;
-  background-color: var(--alertInfoBackgroundColor);
+  background-color: $alertInfoBackgroundColor;
-  color: var(--alertInfoColor);
+  color: $alertInfoColor;
 }
 
 .success {
-  border-color: var(--alertSuccessBorderColor);
+  border-color: $alertSuccessBorderColor;
-  background-color: var(--alertSuccessBackgroundColor);
+  background-color: $alertSuccessBackgroundColor;
-  color: var(--alertSuccessColor);
+  color: $alertSuccessColor;
 }
 
 .warning {
-  border-color: var(--alertWarningBorderColor);
+  border-color: $alertWarningBorderColor;
-  background-color: var(--alertWarningBackgroundColor);
+  background-color: $alertWarningBackgroundColor;
-  color: var(--alertWarningColor);
+  color: $alertWarningColor;
 }

frontend/src/Components/Card.css

@@ -3,9 +3,9 @@
   margin: 10px;
   padding: 10px;
   border-radius: 3px;
-  background-color: var(--cardBackgroundColor);
+  background-color: $white;
-  box-shadow: 0 0 10px 1px var(--cardShadowColor);
+  box-shadow: 0 0 10px 1px $cardShadowColor;
-  color: var(--defaultColor);
+  color: $defaultColor;
 }
 
 .underlay {

frontend/src/Components/CircularProgressBar.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import colors from 'Styles/Variables/colors';
 import styles from './CircularProgressBar.css';
 
 class CircularProgressBar extends Component {
@@ -131,7 +132,7 @@ CircularProgressBar.defaultProps = {
   containerClassName: styles.circularProgressBarContainer,
   size: 60,
   strokeWidth: 5,
-  strokeColor: '#ffc230',
+  strokeColor: colors.radarrYellow,
   showProgressText: false
 };
 

frontend/src/Components/FieldSet.css

@@ -13,7 +13,7 @@
   width: 100%;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
-  color: var(--textColor);
+  color: #3a3f51;
   font-size: 21px;
   line-height: inherit;
 

frontend/src/Components/FileBrowser/FileBrowserModalContent.css

@@ -13,7 +13,7 @@
 }
 
 .faqLink {
-  color: var(--alertWarningColor);
+  color: $alertWarningColor;
   font-weight: bold;
 }
 

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

@@ -3,7 +3,7 @@
   margin-bottom: 5px;
 
   &:hover {
-    background-color: var(--tableRowHoverBackgroundColor);
+    background-color: $tableRowHoverBackgroundColor;
   }
 }
 

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

@@ -17,5 +17,5 @@
 
 .or {
   margin: 0 3px;
-  color: var(--themeDarkColor);
+  color: $themeDarkColor;
 }

frontend/src/Components/Filter/CustomFilters/CustomFilter.css

@@ -4,7 +4,7 @@
   padding: 5px;
 
   &:hover {
-    background-color: var(--tableRowHoverBackgroundColor);
+    background-color: $tableRowHoverBackgroundColor;
   }
 }
 

frontend/src/Components/Form/AutoSuggestInput.css

@@ -27,10 +27,10 @@
     overflow-y: auto;
     max-height: 200px;
     width: 100%;
-    border: 1px solid var(--inputBorderColor);
+    border: 1px solid $inputBorderColor;
     border-radius: 4px;
-    background-color: var(--inputBackgroundColor);
+    background-color: $white;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor;
   }
 }
 
@@ -46,5 +46,5 @@
 }
 
 .suggestionHighlighted {
-  background-color: var(--menuItemHoverBackgroundColor);
+  background-color: $menuItemHoverBackgroundColor;
 }

frontend/src/Components/Form/CheckInput.css

@@ -32,21 +32,21 @@
   height: 20px;
   border: 1px solid #ccc;
   border-radius: 2px;
-  background-color: var(--white);
+  background-color: $white;
-  color: var(--white);
+  color: $white;
   text-align: center;
   line-height: 20px;
 }
 
 .checkbox:focus + .input {
   outline: 0;
-  border-color: var(--inputFocusBorderColor);
+  border-color: $inputFocusBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
 }
 
 .dangerIsChecked {
-  border-color: var(--dangerColor);
+  border-color: $dangerColor;
-  background-color: var(--dangerColor);
+  background-color: $dangerColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -54,8 +54,8 @@
 }
 
 .primaryIsChecked {
-  border-color: var(--primaryColor);
+  border-color: $primaryColor;
-  background-color: var(--primaryColor);
+  background-color: $primaryColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -63,8 +63,8 @@
 }
 
 .successIsChecked {
-  border-color: var(--successColor);
+  border-color: $successColor;
-  background-color: var(--successColor);
+  background-color: $successColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -72,8 +72,8 @@
 }
 
 .warningIsChecked {
-  border-color: var(--warningColor);
+  border-color: $warningColor;
-  background-color: var(--warningColor);
+  background-color: $warningColor;
 
   &.isDisabled {
     opacity: 0.7;
@@ -82,15 +82,15 @@
 
 .isNotChecked {
   &.isDisabled {
-    border-color: var(--disabledCheckInputColor);
+    border-color: $disabledCheckInputColor;
-    background-color: var(--disabledCheckInputColor);
+    background-color: $disabledCheckInputColor;
     opacity: 0.7;
   }
 }
 
 .isIndeterminate {
-  border-color: var(--gray);
+  border-color: $gray;
-  background-color: var(--gray);
+  background-color: $gray;
 }
 
 .helpText {

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -39,7 +39,7 @@
 .dropdownArrowContainerDisabled {
   composes: dropdownArrowContainer;
 
-  color: var(--disabledInputColor);
+  color: $disabledInputColor;
 }
 
 .optionsContainer {
@@ -50,9 +50,9 @@
 .options {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
 }
 
 .optionsModal {
@@ -76,9 +76,9 @@
 .optionsModalScroller {
   composes: scroller from '~Components/Scroller/Scroller.css';
 
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
 }
 
 .loading {
@@ -90,7 +90,7 @@
   display: flex;
   justify-content: flex-end;
   height: 40px;
-  border-bottom: 1px solid var(--borderColor);
+  border-bottom: 1px solid $borderColor;
 }
 
 .mobileCloseButton {
@@ -100,6 +100,6 @@
   line-height: 40px;
 
   &:hover {
-    color: var(--modalCloseButtonHoverColor);
+    color: $modalCloseButtonHoverColor;
   }
 }

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -7,7 +7,7 @@
   cursor: default;
 
   &:hover {
-    background-color: var(--inputHoverBackgroundColor);
+    background-color: #f8f8f8;
   }
 }
 
@@ -24,17 +24,17 @@
 }
 
 .isSelected {
-  background-color: var(--inputSelectedBackgroundColor);
+  background-color: #e2e2e2;
 
   &:hover {
-    background-color: var(--inputSelectedBackgroundColor);
+    background-color: #e2e2e2;
   }
 
   &.isMobile {
     background-color: inherit;
 
     .iconContainer {
-      color: var(--primaryColor);
+      color: $primaryColor;
     }
   }
 }
@@ -49,7 +49,7 @@
 
 .isMobile {
   height: 50px;
-  border-bottom: 1px solid var(--borderColor);
+  border-bottom: 1px solid $borderColor;
 
   &:last-child {
     border: none;

frontend/src/Components/Form/EnhancedSelectInputSelectedValue.css

@@ -3,5 +3,5 @@
 }
 
 .isDisabled {
-  color: var(--disabledInputColor);
+  color: $disabledInputColor;
 }

frontend/src/Components/Form/FormInputButton.js

@@ -2,19 +2,33 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Button from 'Components/Link/Button';
+import SpinnerButton from 'Components/Link/SpinnerButton';
 import { kinds } from 'Helpers/Props';
 import styles from './FormInputButton.css';
 
 function FormInputButton(props) {
   const {
     className,
-    ButtonComponent,
+    canSpin,
     isLastButton,
     ...otherProps
   } = props;
 
+  if (canSpin) {
+    return (
+      <SpinnerButton
+        className={classNames(
+          className,
+          !isLastButton && styles.middleButton
+        )}
+        kind={kinds.PRIMARY}
+        {...otherProps}
+      />
+    );
+  }
+
   return (
-    <ButtonComponent
+    <Button
       className={classNames(
         className,
         !isLastButton && styles.middleButton
@@ -27,14 +41,14 @@ function FormInputButton(props) {
 
 FormInputButton.propTypes = {
   className: PropTypes.string.isRequired,
-  ButtonComponent: PropTypes.elementType.isRequired,
+  isLastButton: PropTypes.bool.isRequired,
-  isLastButton: PropTypes.bool.isRequired
+  canSpin: PropTypes.bool.isRequired
 };
 
 FormInputButton.defaultProps = {
   className: styles.button,
-  ButtonComponent: Button,
+  isLastButton: true,
-  isLastButton: true
+  canSpin: false
 };
 
 export default FormInputButton;

frontend/src/Components/Form/FormInputGroup.css

@@ -6,6 +6,7 @@
 .inputGroup {
   display: flex;
   flex: 1 1 auto;
+  flex-wrap: wrap;
 }
 
 .inputContainer {
@@ -39,7 +40,7 @@
 }
 
 .pendingChangesIcon {
-  color: var(--warningColor);
+  color: $warningColor;
   font-size: 20px;
   line-height: 35px;
 }

frontend/src/Components/Form/FormInputGroup.js

@@ -20,7 +20,6 @@ import NumberInput from './NumberInput';
 import OAuthInputConnector from './OAuthInputConnector';
 import PasswordInput from './PasswordInput';
 import PathInputConnector from './PathInputConnector';
-import PlexMachineInputConnector from './PlexMachineInputConnector';
 import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector';
 import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
 import TagInputConnector from './TagInputConnector';
@@ -63,9 +62,6 @@ function getComponent(type) {
     case inputTypes.PATH:
       return PathInputConnector;
 
-    case inputTypes.PLEX_MACHINE_SELECT:
-      return PlexMachineInputConnector;
-
     case inputTypes.QUALITY_PROFILE_SELECT:
       return QualityProfileSelectInputConnector;
 

frontend/src/Components/Form/FormInputHelpText.css

@@ -1,14 +1,14 @@
 .helpText {
   margin-top: 5px;
-  color: var(--helpTextColor);
+  color: $helpTextColor;
   line-height: 20px;
 }
 
 .isError {
-  color: var(--dangerColor);
+  color: $dangerColor;
 
   .link {
-    color: var(--dangerColor);
+    color: $dangerColor;
 
     &:hover {
       color: #e01313;
@@ -17,10 +17,10 @@
 }
 
 .isWarning {
-  color: var(--warningColor);
+  color: $warningColor;
 
   .link {
-    color: var(--warningColor);
+    color: $warningColor;
 
     &:hover {
       color: #e36c00;

frontend/src/Components/Form/FormLabel.css

@@ -7,11 +7,11 @@
 }
 
 .hasError {
-  color: var(--dangerColor);
+  color: $dangerColor;
 }
 
 .isAdvanced {
-  color: var(--advancedFormLabelColor);
+  color: $advancedFormLabelColor;
 }
 
 @media only screen and (max-width: $breakpointLarge) {

frontend/src/Components/Form/HintedSelectInputOption.css

@@ -18,11 +18,11 @@
   @add-mixin truncate;
 
   margin-left: 15px;
-  color: var(--darkGray);
+  color: $darkGray;
   font-size: $smallFontSize;
 }
 
 .divider {
   border: none;
-  border-bottom: 1px solid var(--lightGray);
+  border-bottom: 1px solid $lightGray;
 }

frontend/src/Components/Form/HintedSelectInputSelectedValue.css

@@ -18,7 +18,7 @@
 
   flex: 1 10 0;
   margin-left: 15px;
-  color: var(--gray);
+  color: $gray;
   text-align: right;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/Input.css

@@ -2,27 +2,26 @@
   padding: 6px 16px;
   width: 100%;
   height: 35px;
-  border: 1px solid var(--inputBorderColor);
+  border: 1px solid $inputBorderColor;
   border-radius: 4px;
-  background-color: var(--inputBackgroundColor);
+  background-color: $white;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor;
-  color: var(--textColor);
 
   &:focus {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 
 .hasError {
-  border-color: var(--inputErrorBorderColor);
+  border-color: $inputErrorBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputErrorBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputErrorBoxShadowColor;
 }
 
 .hasWarning {
-  border-color: var(--inputWarningBorderColor);
+  border-color: $inputWarningBorderColor;
-  box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputWarningBoxShadowColor);
+  box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputWarningBoxShadowColor;
 }
 
 .hasButton {

frontend/src/Components/Form/KeyValueListInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 

frontend/src/Components/Form/KeyValueListInputItem.css

@@ -1,7 +1,7 @@
 .itemContainer {
   display: flex;
   margin-bottom: 3px;
-  border-bottom: 1px solid var(--inputBorderColor);
+  border-bottom: 1px solid $inputBorderColor;
 
   &:last-child {
     margin-bottom: 0;

frontend/src/Components/Form/OAuthInput.js

@@ -5,7 +5,6 @@ import { kinds } from 'Helpers/Props';
 
 function OAuthInput(props) {
   const {
-    className,
     label,
     authorizing,
     error,
@@ -13,21 +12,21 @@ function OAuthInput(props) {
   } = props;
 
   return (
-    <SpinnerErrorButton
+    <div>
-      className={className}
+      <SpinnerErrorButton
-      kind={kinds.PRIMARY}
+        kind={kinds.PRIMARY}
-      isSpinning={authorizing}
+        isSpinning={authorizing}
-      error={error}
+        error={error}
-      onPress={onPress}
+        onPress={onPress}
-    >
+      >
-      {label}
+        {label}
-    </SpinnerErrorButton>
+      </SpinnerErrorButton>
+    </div>
   );
 }
 
 OAuthInput.propTypes = {
-  className: PropTypes.string,
+  label: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
   authorizing: PropTypes.bool.isRequired,
   error: PropTypes.object,
   onPress: PropTypes.func.isRequired

frontend/src/Components/Form/PlexMachineInput.js

@@ -1,44 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import SelectInput from './SelectInput';
-
-function PlexMachineInput(props) {
-  const {
-    isFetching,
-    isDisabled,
-    value,
-    values,
-    onChange,
-    ...otherProps
-  } = props;
-
-  const helpText = 'Authenticate with plex.tv to show servers to use for authentication';
-
-  return (
-    <>
-      {
-        isFetching ?
-          <LoadingIndicator /> :
-          <SelectInput
-            value={value}
-            values={values}
-            isDisabled={isDisabled}
-            onChange={onChange}
-            helpText={helpText}
-            {...otherProps}
-          />
-      }
-    </>
-  );
-}
-
-PlexMachineInput.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  value: PropTypes.string,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default PlexMachineInput;

frontend/src/Components/Form/PlexMachineInputConnector.js

@@ -1,115 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchPlexResources } from 'Store/Actions/settingsActions';
-import PlexMachineInput from './PlexMachineInput';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state, { value }) => value,
-    (state) => state.oAuth,
-    (state) => state.settings.plex,
-    (value, oAuth, plex) => {
-
-      let values = [{ key: value, value }];
-      let isDisabled = true;
-
-      if (plex.isPopulated) {
-        const serverValues = plex.items.filter((item) => item.provides.includes('server')).map((item) => {
-          return ({
-            key: item.clientIdentifier,
-            value: `${item.name} / ${item.owned ? 'Owner' : 'User'} / ${item.clientIdentifier}`
-          });
-        });
-
-        if (serverValues.find((item) => item.key === value)) {
-          values = serverValues;
-        } else {
-          values = values.concat(serverValues);
-        }
-
-        isDisabled = false;
-      }
-
-      return ({
-        accessToken: oAuth.result?.accessToken,
-        values,
-        isDisabled,
-        ...plex
-      });
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  dispatchFetchPlexResources: fetchPlexResources
-};
-
-class PlexMachineInputConnector extends Component {
-
-  //
-  // Lifecycle
-  componentDidMount = () => {
-    const {
-      accessToken,
-      dispatchFetchPlexResources
-    } = this.props;
-
-    if (accessToken) {
-      dispatchFetchPlexResources({ accessToken });
-    }
-
-  };
-
-  componentDidUpdate(prevProps) {
-    const {
-      accessToken,
-      dispatchFetchPlexResources
-    } = this.props;
-
-    const oldToken = prevProps.accessToken;
-    if (accessToken && accessToken !== oldToken) {
-      dispatchFetchPlexResources({ accessToken });
-    }
-  }
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      isDisabled,
-      value,
-      values,
-      onChange
-    } = this.props;
-
-    return (
-      <PlexMachineInput
-        isFetching={isFetching}
-        isPopulated={isPopulated}
-        isDisabled={isDisabled}
-        value={value}
-        values={values}
-        onChange={onChange}
-        {...this.props}
-      />
-    );
-  }
-}
-
-PlexMachineInputConnector.propTypes = {
-  dispatchFetchPlexResources: PropTypes.func.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.string.isRequired,
-  values: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  isDisabled: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  oAuth: PropTypes.object,
-  accessToken: PropTypes.string,
-  onChange: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(PlexMachineInputConnector);

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
 import sortByName from 'Utilities/Array/sortByName';
-import EnhancedSelectInput from './EnhancedSelectInput';
+import SelectInput from './SelectInput';
 
 function createMapStateToProps() {
   return createSelector(
@@ -45,14 +45,40 @@ function createMapStateToProps() {
 
 class QualityProfileSelectInputConnector extends Component {
 
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      name,
+      value,
+      values
+    } = this.props;
+
+    if (!value || !values.some((v) => v.key === value) ) {
+      const firstValue = _.find(values, (option) => !isNaN(parseInt(option.key)));
+
+      if (firstValue) {
+        this.onChange({ name, value: firstValue.key });
+      }
+    }
+  }
+
+  //
+  // Listeners
+
+  onChange = ({ name, value }) => {
+    this.props.onChange({ name, value: parseInt(value) });
+  };
+
   //
   // Render
 
   render() {
     return (
-      <EnhancedSelectInput
+      <SelectInput
         {...this.props}
-        onChange={this.props.onChange}
+        onChange={this.onChange}
       />
     );
   }
@@ -60,7 +86,7 @@ class QualityProfileSelectInputConnector extends Component {
 
 QualityProfileSelectInputConnector.propTypes = {
   name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.arrayOf(PropTypes.string)]),
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   includeNoChange: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired

frontend/src/Components/Form/RootFolderSelectInputOption.css

@@ -21,17 +21,17 @@
 .movieFolder {
   @add-mixin truncate;
 
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .freeSpace {
   margin-left: 15px;
-  color: var(--darkGray);
+  color: $darkGray;
   font-size: $smallFontSize;
 }
 
 .isMissing {
   margin-left: 15px;
-  color: var(--dangerColor);
+  color: $dangerColor;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/RootFolderSelectInputSelectedValue.css

@@ -20,13 +20,13 @@
 .movieFolder {
   @add-mixin truncate;
   flex: 0 1 auto;
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .freeSpace {
   flex: 0 0 auto;
   margin-left: 15px;
-  color: var(--gray);
+  color: $gray;
   text-align: right;
   font-size: $smallFontSize;
 }

frontend/src/Components/Form/SelectInput.css

@@ -12,10 +12,6 @@
   composes: hasWarning from '~Components/Form/Input.css';
 }
 
-.hasButton {
-  composes: hasButton from '~Components/Form/Input.css';
-}
-
 .isDisabled {
   opacity: 0.7;
   cursor: not-allowed;

frontend/src/Components/Form/SelectInput.js

@@ -28,7 +28,6 @@ class SelectInput extends Component {
       isDisabled,
       hasError,
       hasWarning,
-      hasButton,
       autoFocus,
       onBlur
     } = this.props;
@@ -39,7 +38,6 @@ class SelectInput extends Component {
           className,
           hasError && styles.hasError,
           hasWarning && styles.hasWarning,
-          hasButton && styles.hasButton,
           isDisabled && disabledClassName
         )}
         disabled={isDisabled}
@@ -82,7 +80,6 @@ SelectInput.propTypes = {
   isDisabled: PropTypes.bool,
   hasError: PropTypes.bool,
   hasWarning: PropTypes.bool,
-  hasButton: PropTypes.bool,
   autoFocus: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired,
   onBlur: PropTypes.func

frontend/src/Components/Form/TagInput.css

@@ -7,8 +7,8 @@
 
   &.isFocused {
     outline: 0;
-    border-color: var(--inputFocusBorderColor);
+    border-color: $inputFocusBorderColor;
-    box-shadow: inset 0 1px 1px var(--inputBoxShadowColor), 0 0 8px var(--inputFocusBoxShadowColor);
+    box-shadow: inset 0 1px 1px $inputBoxShadowColor, 0 0 8px $inputFocusBoxShadowColor;
   }
 }
 
@@ -20,6 +20,4 @@
   width: 0%;
   height: 31px;
   border: none;
-  background-color: var(--inputBackground);
-  color: var(--textColor);
 }

frontend/src/Components/Form/TextInput.css

@@ -3,7 +3,7 @@
 }
 
 .readOnly {
-  background-color: var(--inputReadOnlyBackgroundColor);
+  background-color: #eee;
 }
 
 .hasError {

frontend/src/Components/Form/UMaskInput.css

@@ -49,5 +49,5 @@
 }
 
 .readOnly {
-  background-color: var(--inputReadOnlyBackgroundColor);
+  background-color: #eee;
 }

frontend/src/Components/Icon.css

@@ -1,5 +1,5 @@
 .danger {
-  color: var(--dangerColor);
+  color: $dangerColor;
 }
 
 .default {
@@ -7,33 +7,25 @@
 }
 
 .disabled {
-  color: var(--disabledColor);
+  color: $disabledColor;
 }
 
 .info {
-  color: var(--infoColor);
+  color: $infoColor;
-
-  &:global(.darken) {
-    color: color(var(--infoColor) shade(30%));
-  }
 }
 
 .pink {
-  color: var(--pink);
+  color: $pink;
-
-  &:global(.darken) {
-    color: color(var(--pink) shade(30%));
-  }
 }
 
 .success {
-  color: var(--successColor);
+  color: $successColor;
 }
 
 .warning {
-  color: var(--warningColor);
+  color: $warningColor;
 }
 
 .purple {
-  color: var(--purple);
+  color: $purple;
 }

frontend/src/Components/Icon.js

@@ -18,7 +18,6 @@ class Icon extends PureComponent {
       kind,
       size,
       title,
-      darken,
       isSpinning,
       ...otherProps
     } = this.props;
@@ -27,8 +26,7 @@ class Icon extends PureComponent {
       <FontAwesomeIcon
         className={classNames(
           className,
-          styles[kind],
+          styles[kind]
-          darken && 'darken'
         )}
         icon={name}
         spin={isSpinning}
@@ -61,7 +59,6 @@ Icon.propTypes = {
   kind: PropTypes.string.isRequired,
   size: PropTypes.number.isRequired,
   title: PropTypes.string,
-  darken: PropTypes.bool.isRequired,
   isSpinning: PropTypes.bool.isRequired,
   fixedWidth: PropTypes.bool.isRequired
 };
@@ -69,7 +66,6 @@ Icon.propTypes = {
 Icon.defaultProps = {
   kind: kinds.DEFAULT,
   size: 14,
-  darken: false,
   isSpinning: false,
   fixedWidth: false
 };

frontend/src/Components/InfoLabel.css

@@ -1,7 +1,7 @@
 .label {
   display: inline-block;
   margin: 2px;
-  color: var(--white);
+  color: $white;
   /** text-align: center; **/
   white-space: nowrap;
   line-height: 1;
@@ -10,7 +10,7 @@
 
 .title {
   margin-bottom: 2px;
-  color: var(--helpTextColor);
+  color: $helpTextColor;
   font-size: 10px;
 }
 
@@ -36,5 +36,5 @@
 /** Outline **/
 
 .outline {
-  background-color: var(--white);
+  background-color: $white;
 }

frontend/src/Components/Label.css

@@ -3,7 +3,7 @@
   margin: 2px;
   border: 1px solid;
   border-radius: 2px;
-  color: var(--white);
+  color: $white;
   text-align: center;
   white-space: nowrap;
   line-height: 1;
@@ -13,95 +13,94 @@
 /** Kinds **/
 
 .danger {
-  border-color: var(--dangerColor);
+  border-color: $dangerColor;
-  background-color: var(--dangerColor);
+  background-color: $dangerColor;
 
   &.outline {
-    color: var(--dangerColor);
+    color: $dangerColor;
   }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, color(var(--dangerColor) shade(5%)), color(var(--dangerColor) shade(5%)) 5px, color(var(--dangerColor) shade(15%)) 5px, color(var(--dangerColor) shade(15%)) 10px);
+    background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
   }
 }
 
 .default {
-  border-color: var(--themeLightColor);
+  border-color: $themeLightColor;
-  background-color: var(--themeLightColor);
+  background-color: $themeLightColor;
 
   &.outline {
-    color: var(--themeLightColor);
+    color: $themeLightColor;
   }
 }
 
 .disabled {
-  border-color: var(--disabledColor);
+  border-color: $disabledColor;
-  background-color: var(--disabledColor);
+  background-color: $disabledColor;
 
   &.outline {
-    color: var(--offWhite);
+    color: $disabledColor;
   }
 }
 
 .info {
-  border-color: var(--infoColor);
+  border-color: $infoColor;
-  background-color: var(--infoColor);
+  background-color: $infoColor;
-  color: var(--infoTextColor);
 
   &.outline {
-    color: var(--infoColor);
+    color: $infoColor;
   }
 }
 
 .inverse {
-  border-color: var(--inverseLabelColor);
+  border-color: $lightGray;
-  background-color: var(--inverseLabelColor);
+  background-color: $lightGray;
-  color: var(--inverseLabelTextColor);
+  color: $defaultColor;
 
   &.outline {
-    background-color: var(--inverseLabelTextColor) !important;
+    background-color: $defaultColor !important;
-    color: var(--inverseLabelColor);
+    color: $lightGray;
   }
 }
 
 .primary {
-  border-color: var(--primaryColor);
+  border-color: $primaryColor;
-  background-color: var(--primaryColor);
+  background-color: $primaryColor;
 
   &.outline {
-    color: var(--primaryColor);
+    color: $primaryColor;
   }
 }
 
 .success {
-  border-color: var(--successColor);
+  border-color: $successColor;
-  background-color: var(--successColor);
+  background-color: $successColor;
   color: #eee;
 
   &.outline {
-    color: var(--successColor);
+    color: $successColor;
   }
 }
 
 .warning {
-  border-color: var(--warningColor);
+  border-color: $warningColor;
-  background-color: var(--warningColor);
+  background-color: $warningColor;
 
   &.outline {
-    color: var(--warningColor);
+    color: $warningColor;
   }
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, var(--warningColor), var(--warningColor) 5px, color(var(--warningColor) tint(15%)) 5px, color(var(--warningColor) tint(15%)) 10px);
+    background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
   }
 }
 
 .queue {
-  border-color: var(--queueColor);
+  border-color: $queueColor;
-  background-color: var(--queueColor);
+  background-color: $queueColor;
 
   &.outline {
-    color: var(--queueColor);
+    color: $queueColor;
   }
 }
 
@@ -126,5 +125,5 @@
 /** Outline **/
 
 .outline {
-  background-color: var(--disabledLabelColor);
+  background-color: $white;
 }

frontend/src/Components/Link/Button.css

@@ -19,62 +19,62 @@
 }
 
 .danger {
-  border-color: var(--dangerBorderColor);
+  border-color: $dangerBorderColor;
-  background-color: var(--dangerBackgroundColor);
+  background-color: $dangerBackgroundColor;
-  color: var(--white);
+  color: $white;
 
   &:hover {
-    border-color: var(--dangerHoverBorderColor);
+    border-color: $dangerHoverBorderColor;
-    background-color: var(--dangerHoverBackgroundColor);
+    background-color: $dangerHoverBackgroundColor;
-    color: var(--white);
+    color: $white;
   }
 }
 
 .default {
-  border-color: var(--defaultBorderColor);
+  border-color: $defaultBorderColor;
-  background-color: var(--defaultBackgroundColor);
+  background-color: $defaultBackgroundColor;
-  color: var(--defaultColor);
+  color: $defaultColor;
 
   &:hover {
-    border-color: var(--defaultHoverBorderColor);
+    border-color: $defaultHoverBorderColor;
-    background-color: var(--defaultHoverBackgroundColor);
+    background-color: $defaultHoverBackgroundColor;
-    color: var(--defaultColor);
+    color: $defaultColor;
   }
 }
 
 .primary {
-  border-color: var(--primaryBorderColor);
+  border-color: $primaryBorderColor;
-  background-color: var(--primaryBackgroundColor);
+  background-color: $primaryBackgroundColor;
-  color: var(--white);
+  color: $white;
 
   &:hover {
-    border-color: var(--primaryHoverBorderColor);
+    border-color: $primaryHoverBorderColor;
-    background-color: var(--primaryHoverBackgroundColor);
+    background-color: $primaryHoverBackgroundColor;
-    color: var(--white);
+    color: $white;
   }
 }
 
 .success {
-  border-color: var(--successBorderColor);
+  border-color: $successBorderColor;
-  background-color: var(--successBackgroundColor);
+  background-color: $successBackgroundColor;
-  color: var(--white);
+  color: $white;
 
   &:hover {
-    border-color: var(--successHoverBorderColor);
+    border-color: $successHoverBorderColor;
-    background-color: var(--successHoverBackgroundColor);
+    background-color: $successHoverBackgroundColor;
-    color: var(--white);
+    color: $white;
   }
 }
 
 .warning {
-  border-color: var(--warningBorderColor);
+  border-color: $warningBorderColor;
-  background-color: var(--warningBackgroundColor);
+  background-color: $warningBackgroundColor;
-  color: var(--white);
+  color: $white;
 
   &:hover {
-    border-color: var(--warningHoverBorderColor);
+    border-color: $warningHoverBorderColor;
-    background-color: var(--warningHoverBackgroundColor);
+    background-color: $warningHoverBackgroundColor;
-    color: var(--white);
+    color: $white;
   }
 }
 

frontend/src/Components/Link/IconButton.css

@@ -12,10 +12,10 @@
   &:hover {
     border: none;
     background-color: inherit;
-    color: var(--iconButtonHoverColor);
+    color: $iconButtonHoverColor;
   }
 
   &.isDisabled {
-    color: var(--iconButtonDisabledColor);
+    color: $iconButtonDisabledColor;
   }
 }

frontend/src/Components/Link/Link.css

@@ -15,10 +15,10 @@
 }
 
 .to {
-  color: var(--linkColor);
+  color: $linkColor;
 
   &:hover {
-    color: var(--linkHoverColor);
+    color: $linkHoverColor;
     text-decoration: underline;
   }
 }

frontend/src/Components/Loading/LoadingIndicator.css

@@ -26,7 +26,7 @@
 
 .ripple {
   position: absolute;
-  border: 2px solid var(--themeDarkColor);
+  border: 2px solid #3a3f51;
   border-radius: 100%;
   animation: rippleContainer 1.25s 0s infinite cubic-bezier(0.21, 0.53, 0.56, 0.8);
   animation-fill-mode: both;

frontend/src/Components/Menu/MenuButton.css

@@ -10,12 +10,12 @@
   }
 
   &:hover {
-    color: var(--toobarButtonHoverColor);
+    color: $toobarButtonHoverColor;
   }
 }
 
 .isDisabled {
-  color: var(--disabledColor);
+  color: $disabledColor;
 
   pointer-events: none;
 }

frontend/src/Components/Menu/MenuContent.css

@@ -2,7 +2,7 @@
   z-index: $popperZIndex;
   display: flex;
   flex-direction: column;
-  background-color: var(--toolbarMenuItemBackgroundColor);
+  background-color: $toolbarMenuItemBackgroundColor;
   line-height: 20px;
 }
 

frontend/src/Components/Menu/MenuItem.css

@@ -5,19 +5,19 @@
   padding: 10px 20px;
   min-width: 150px;
   max-width: 250px;
-  background-color: var(--toolbarMenuItemBackgroundColor);
+  background-color: $toolbarMenuItemBackgroundColor;
-  color: var(--menuItemColor);
+  color: $menuItemColor;
   line-height: 20px;
 
   &:hover,
   &:focus {
-    background-color: var(--toolbarMenuItemHoverBackgroundColor);
+    background-color: $toolbarMenuItemHoverBackgroundColor;
-    color: var(--menuItemHoverColor);
+    color: $menuItemHoverColor;
     text-decoration: none;
   }
 }
 
 .isDisabled {
-  color: var(--disabledColor);
+  color: $disabledColor;
   pointer-events: none;
 }

frontend/src/Components/Menu/MenuItemSeparator.css

@@ -2,5 +2,5 @@
   overflow: hidden;
   min-height: 1px;
   height: 1px;
-  background-color: var(--themeDarkColor);
+  background-color: $themeDarkColor;
 }

frontend/src/Components/Modal/ConfirmModal.js

@@ -33,7 +33,7 @@ function ConfirmModal(props) {
 
       return () => unbindShortcut('enter', onConfirm);
     }
-  }, [bindShortcut, unbindShortcut, isOpen, onConfirm]);
+  }, [isOpen, onConfirm]);
 
   return (
     <Modal

frontend/src/Components/Modal/Modal.css

@@ -12,7 +12,7 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background-color: var(--modalBackdropBackgroundColor);
+  background-color: $modalBackdropBackgroundColor;
   opacity: 1;
 }