Do custom gzip compression on mono when returning api responses to avoid a memory leak.

.editorconfig

@@ -9,7 +9,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{js,html,js,hbs,less,css}]
+[*.{js,html,js,hbs,less}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.npmrc

@@ -0,0 +1 @@
+save-prefix=""

.yarnrc

@@ -1,2 +1 @@
-save-exact true
-registry "https://registry.yarnpkg.com"
+save-prefix ""

CONTRIBUTING.md

@@ -7,7 +7,21 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 
 ## Development ##
 
-See the readme for information on setting up your development environment.
+### Tools required ###
+- Visual Studio 2015
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
+- npm (node package manager)
+- git
+
+### Getting started ###
+
+1.  Fork Sonarr
+2.  Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
+3.  Run `npm install`
+4.  Run `npm start` - Used to compile the UI components and copy them.
+    Leave this window open.
+    If you have gulp globally installed you can use `gulp watch` instead
+5.  Compile in Visual Studio
 
 ### 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)

README.md

@@ -20,39 +20,33 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 
 ### Requirements
 
-* [Visual Studio 2017] (https://www.visualstudio.com/vs/)
+* Visual Studio 2015 (https://www.visualstudio.com/vs/)
 * [Git](https://git-scm.com/downloads)
 * [NodeJS](https://nodejs.org/en/download/)
-* [Yarn](https://yarnpkg.com/)
 
 ### Setup
 
-* Make sure all the required software mentioned above are installed
-* Clone the repository into your development machine. [*info*](https://help.github.com/en/articles/working-with-forks)
+* Make sure all the required software mentioned above are installed.
+* Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
 * Grab the submodules `git submodule init && git submodule update`
-* Install the required Node Packages `yarn`
+* Install the required Node Packages `npm install`
+* Start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
 
-### Backend Development
+*Please note gulp must be running at all times while you are working with Sonarr client source files.*
 
-* Run `yarn build` to build the UI
-* Open `Sonarr.sln` in Visual Studio
+### Development
+
+* Open `NzbDrone.sln` in Visual Studio
 * Make sure `NzbDrone.Console` is set as the startup project
-* Build `NzbDrone.Windows` and `NzbDrone.Mono` projects
-* Build Solution
-
-### UI Development
-
-* Run `yarn watch` to build UI and rebuild automatically when changes are detected
-* Run Sonarr.Console.exe (or debug in Visual Studio)
 
 ### License
 
-
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* Copyright 2010-2019
+* Copyright 2010-2017
 
 ### Sponsors
 
 * [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
     * [ReSharper](http://www.jetbrains.com/resharper/)
+    * [WebStorm](http://www.jetbrains.com/webstorm/)
     * [TeamCity](http://www.jetbrains.com/teamcity/)

frontend/.eslintrc

@@ -28,12 +28,6 @@
     "react"
   ],
 
-  "settings": {
-    "react": {
-      "version": "detect"
-    }
-  },
-
   "rules": {
     "filenames/match-exported": ["error"],
 
@@ -215,6 +209,7 @@
     "lines-around-comment": ["error", { "beforeBlockComment": true, "afterBlockComment": false }],
     "max-depth": ["error", {"maximum": 5}],
     "max-nested-callbacks": ["error", 4],
+    "max-params": ["error", 6],
     "max-statements": "off",
     "max-statements-per-line": ["error", { "max": 1 }],
     "new-cap": ["error", {"capIsNewExceptions": ["$.Deferred", "DragDropContext", "DragLayer", "DragSource", "DropTarget"]}],

frontend/.stylelintrc

@@ -24,7 +24,7 @@
         "ignoreAtRules": [
           "/^add\\-mixin$/",
           "/^define\\-mixin$/"
-        ] 
+        ]
       }
     ],
     "at-rule-no-vendor-prefix": true,

frontend/babel.config.js

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

frontend/browsers.js

@@ -1,6 +0,0 @@
-module.exports = [
-  '>0.25%',
-  'not ie 11',
-  'not op_mini all',
-  'not chrome < 60'
-];

frontend/gulp/build.js

@@ -1,18 +1,15 @@
 const gulp = require('gulp');
+const runSequence = require('run-sequence');
 
 require('./clean');
 require('./copy');
-require('./webpack');
-
-gulp.task('build',
-  gulp.series('clean',
-    gulp.parallel(
-      'webpack',
-      'copyHtml',
-      'copyFonts',
-      'copyImages',
-      'copyJs'
-    )
-  )
-);
 
+gulp.task('build', () => {
+  return runSequence('clean', [
+    'webpack',
+    'copyHtml',
+    'copyFonts',
+    'copyImages',
+    'copyJs'
+  ]);
+});

frontend/gulp/copy.js

@@ -1,15 +1,15 @@
-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');
+var path = require('path');
+var gulp = require('gulp');
+var print = require('gulp-print').default;
+var cache = require('gulp-cached');
+var livereload = require('gulp-livereload');
+var paths = require('./helpers/paths.js');
 
 gulp.task('copyJs', () => {
   return gulp.src(
     [
       path.join(paths.src.root, 'polyfills.js')
-    ], { base: paths.src.root })
+    ])
     .pipe(cache('copyJs'))
     .pipe(print())
     .pipe(gulp.dest(paths.dest.root))
@@ -17,7 +17,7 @@ gulp.task('copyJs', () => {
 });
 
 gulp.task('copyHtml', () => {
-  return gulp.src(paths.src.html, { base: paths.src.root })
+  return gulp.src(paths.src.html)
     .pipe(cache('copyHtml'))
     .pipe(print())
     .pipe(gulp.dest(paths.dest.root))
@@ -26,20 +26,20 @@ gulp.task('copyHtml', () => {
 
 gulp.task('copyFonts', () => {
   return gulp.src(
-    path.join(paths.src.fonts, '**', '*.*'), { base: paths.src.root }
+    path.join(paths.src.fonts, '**', '*.*')
   )
     .pipe(cache('copyFonts'))
     .pipe(print())
-    .pipe(gulp.dest(paths.dest.root))
+    .pipe(gulp.dest(paths.dest.fonts))
     .pipe(livereload());
 });
 
 gulp.task('copyImages', () => {
   return gulp.src(
-    path.join(paths.src.images, '**', '*.*'), { base: paths.src.root }
+    path.join(paths.src.images, '**', '*.*')
   )
     .pipe(cache('copyImages'))
     .pipe(print())
-    .pipe(gulp.dest(paths.dest.root))
+    .pipe(gulp.dest(paths.dest.images))
     .pipe(livereload());
 });

frontend/gulp/gulpFile.js

@@ -1,5 +1,8 @@
 require('./build.js');
 require('./clean.js');
 require('./copy.js');
+require('./imageMin.js');
+require('./start.js');
+require('./stripBom.js');
 require('./watch.js');
 require('./webpack.js');

frontend/gulp/helpers/errorHandler.js

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

frontend/gulp/helpers/html-annotate-loader.js

@@ -0,0 +1,15 @@
+const path = require('path');
+const rootPath = path.resolve(__dirname + '/../../src/');
+module.exports = function(source) {
+  if (this.cacheable) {
+    this.cacheable();
+  }
+
+  const resourcePath = this.resourcePath.replace(rootPath, '');
+  const wrappedSource =`
+  <!-- begin ${resourcePath} -->
+    ${source}
+  <!-- end ${resourcePath} -->`;
+
+  return wrappedSource;
+};

frontend/gulp/helpers/paths.js

@@ -1,15 +1,15 @@
-const root = './frontend/src';
+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/`,
+    html: root + '*.html',
+    scripts: root + '**/*.js',
+    content: root + 'Content/',
+    fonts: root + 'Content/Fonts/',
+    images: root + 'Content/Images/',
     exclude: {
-      libs: `!${root}/JsLibraries/**`
+      libs: `!${root}JsLibraries/**`
     }
   },
   dest: {

frontend/gulp/imageMin.js

@@ -0,0 +1,15 @@
+var gulp = require('gulp');
+var print = require('gulp-print').default;
+var paths = require('./helpers/paths.js');
+
+gulp.task('imageMin', () => {
+  var imagemin = require('gulp-imagemin');
+  return gulp.src(paths.src.images)
+    .pipe(imagemin({
+      progressive: false,
+      optimizationLevel: 4,
+      svgoPlugins: [{ removeViewBox: false }]
+    }))
+    .pipe(print())
+    .pipe(gulp.dest(paths.src.content + 'Images/'));
+});

frontend/gulp/start.js

@@ -0,0 +1,104 @@
+// will download and run sonarr (server) in a non-windows enviroment
+// you can use this if you don't care about the server code and just want to work
+// with the web code.
+
+var http = require('http');
+var gulp = require('gulp');
+var fs = require('fs');
+var targz = require('tar.gz');
+var del = require('del');
+var spawn = require('child_process').spawn;
+
+function download(url, dest, cb) {
+  console.log('Downloading ' + url + ' to ' + dest);
+  var file = fs.createWriteStream(dest);
+  http.get(url, function(response) {
+    response.pipe(file);
+    file.on('finish', function() {
+      console.log('Download completed');
+      file.close(cb);
+    });
+  });
+}
+
+function getLatest(cb) {
+  var branch = 'develop';
+  process.argv.forEach(function(val) {
+    var branchMatch = /branch=([\S]*)/.exec(val);
+    if (branchMatch && branchMatch.length > 1) {
+      branch = branchMatch[1];
+    }
+  });
+
+  var url = 'http://services.sonarr.tv/v1/update/' + branch + '?os=osx';
+
+  console.log('Checking for latest version:', url);
+
+  http.get(url, function(res) {
+    var data = '';
+
+    res.on('data', function(chunk) {
+      data += chunk;
+    });
+
+    res.on('end', function() {
+      var updatePackage = JSON.parse(data).updatePackage;
+      console.log('Latest version available: ' + updatePackage.version + ' Release Date: ' + updatePackage.releaseDate);
+      cb(updatePackage);
+    });
+  }).on('error', function(e) {
+    console.log('problem with request: ' + e.message);
+  });
+}
+
+function extract(source, dest, cb) {
+  console.log('extracting download page to ' + dest);
+  new targz().extract(source, dest, function(err) {
+    if (err) {
+      console.log(err);
+    }
+    console.log('Update package extracted.');
+    cb();
+  });
+}
+
+gulp.task('getSonarr', function() {
+  try {
+    fs.mkdirSync('./_start/');
+  } catch (e) {
+    if (e.code !== 'EEXIST') {
+      throw e;
+    }
+  }
+
+  getLatest(function(updatePackage) {
+    var packagePath = './_start/' + updatePackage.filename;
+    var dirName = './_start/' + updatePackage.version;
+    download(updatePackage.url, packagePath, function() {
+      extract(packagePath, dirName, function() {
+        // clean old binaries
+        console.log('Cleaning old binaries');
+        del.sync(['./_output/*', '!./_output/UI/']);
+        console.log('copying binaries to target');
+        gulp.src(dirName + '/NzbDrone/*.*')
+          .pipe(gulp.dest('./_output/'));
+      });
+    });
+  });
+});
+
+gulp.task('startSonarr', function() {
+  var ls = spawn('mono', ['--debug', './_output/NzbDrone.exe']);
+
+  ls.stdout.on('data', function(data) {
+    process.stdout.write(data);
+  });
+
+  ls.stderr.on('data', function(data) {
+    process.stdout.write(data);
+  });
+
+  ls.on('close', function(code) {
+    console.log('child process exited with code ' + code);
+  });
+});

frontend/gulp/stripBom.js

@@ -0,0 +1,13 @@
+const gulp = require('gulp');
+const paths = require('./helpers/paths.js');
+const stripbom = require('gulp-stripbom');
+
+function stripBom(dest) {
+  gulp.src([paths.src.scripts, paths.src.exclude.libs])
+    .pipe(stripbom({ showLog: false }))
+    .pipe(gulp.dest(dest));
+}
+
+gulp.task('stripBom', () => {
+  stripBom(paths.src.root);
+});

frontend/gulp/watch.js

@@ -1,18 +1,27 @@
 const gulp = require('gulp');
 const livereload = require('gulp-livereload');
-const gulpWatch = require('gulp-watch');
+const watch = 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'));
+function watchTask(glob, task) {
+  const options = {
+    name: `watch: ${task}`,
+    verbose: true
+  };
+  return watch(glob, options, () => {
+    gulp.start(task);
+  });
 }
 
-gulp.task('watch', gulp.series('build', watch));
+gulp.task('watch', ['copyHtml', 'copyFonts', 'copyImages', 'copyJs'], () => {
+  livereload.listen({ start: true });
+
+  gulp.start('webpackWatch');
+
+  watchTask(paths.src.html, 'copyHtml');
+  watchTask(`${paths.src.fonts}**/*.*`, 'copyFonts');
+  watchTask(`${paths.src.images}**/*.*`, 'copyImages');
+});

frontend/gulp/webpack.js

@@ -4,38 +4,57 @@ 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 browsers = require('../browsers');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 
 const uiFolder = 'UI';
-const frontendFolder = path.join(__dirname, '..');
-const srcFolder = path.join(frontendFolder, 'src');
+const root = path.join(__dirname, '..', 'src');
 const isProduction = process.argv.indexOf('--production') > -1;
 
-console.log('Source Folder:', srcFolder);
+console.log('ROOT:', root);
 console.log('isProduction:', isProduction);
 
 const cssVarsFiles = [
   '../src/Styles/Variables/colors',
   '../src/Styles/Variables/dimensions',
   '../src/Styles/Variables/fonts',
-  '../src/Styles/Variables/animations',
-  '../src/Styles/Variables/zIndexes'
+  '../src/Styles/Variables/animations'
 ].map(require.resolve);
 
+const extractCSSPlugin = new ExtractTextPlugin({
+  filename: path.join('_output', uiFolder, 'Content', 'styles.css'),
+  allChunks: true,
+  disable: false,
+  ignoreOrder: true
+});
+
 const plugins = [
+  extractCSSPlugin,
+
+  new webpack.optimize.CommonsChunkPlugin({
+    name: 'vendor'
+  }),
+
   new webpack.DefinePlugin({
     __DEV__: !isProduction,
     'process.env.NODE_ENV': isProduction ? JSON.stringify('production') : JSON.stringify('development')
-  }),
-
-  new MiniCssExtractPlugin({
-    filename: path.join('_output', uiFolder, 'Content', 'styles.css')
   })
 ];
 
+if (isProduction) {
+  plugins.push(new UglifyJSPlugin({
+    sourceMap: true,
+    uglifyOptions: {
+      mangle: false,
+      output: {
+        comments: false,
+        beautify: true
+      }
+    }
+  }));
+}
+
 const config = {
-  mode: isProduction ? 'production' : 'development',
   devtool: '#source-map',
 
   stats: {
@@ -54,8 +73,8 @@ const config = {
 
   resolve: {
     modules: [
-      srcFolder,
-      path.join(srcFolder, 'Shims'),
+      root,
+      path.join(root, 'Shims'),
       'node_modules'
     ],
     alias: {
@@ -68,10 +87,6 @@ const config = {
     sourceMapFilename: '[file].map'
   },
 
-  optimization: {
-    chunkIds: 'named'
-  },
-
   plugins,
 
   resolveLoader: {
@@ -86,56 +101,53 @@ const config = {
       {
         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',
-                    targets: browsers
-                  }
-                ]
-              ]
+        loader: 'babel-loader',
+        query: {
+          plugins: ['transform-class-properties'],
+          presets: ['es2015', 'decorators-legacy', 'react', 'stage-2'],
+          env: {
+            development: {
+              plugins: ['transform-react-jsx-source']
             }
           }
-        ]
+        }
       },
 
       // CSS Modules
       {
         test: /\.css$/,
         exclude: /(node_modules|globals.css)/,
-        use: [
-          { loader: MiniCssExtractPlugin.loader },
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-              localIdentName: '[name]/[local]/[hash:base64:5]',
-              modules: true
-            }
-          },
-          {
-            loader: 'postcss-loader',
-            options: {
-              ident: 'postcss',
-              config: {
-                ctx: {
-                  cssVarsFiles
-                },
-                path: 'frontend/postcss.config.js'
+        use: extractCSSPlugin.extract({
+          fallback: 'style-loader',
+          use: [
+            {
+              loader: 'css-variables-loader',
+              options: {
+                cssVarsFiles
+              }
+            },
+            {
+              loader: 'css-loader',
+              options: {
+                modules: true,
+                importLoaders: 1,
+                localIdentName: '[name]-[local]-[hash:base64:5]',
+                sourceMap: true
+              }
+            },
+            {
+              loader: 'postcss-loader',
+              options: {
+                config: {
+                  ctx: {
+                    cssVarsFiles
+                  },
+                  path: 'frontend/postcss.config.js'
+                }
               }
             }
-          }
-        ]
+          ]
+        })
       },
 
       // Global styles
@@ -183,16 +195,17 @@ const config = {
 };
 
 gulp.task('webpack', () => {
-  return webpackStream(config)
-    .pipe(gulp.dest('./'));
+  return gulp.src('index.js')
+    .pipe(webpackStream(config))
+    .pipe(gulp.dest(''));
 });
 
 gulp.task('webpackWatch', () => {
   config.watch = true;
-
-  return webpackStream(config)
+  return gulp.src('')
+    .pipe(webpackStream(config))
     .on('error', errorHandler)
-    .pipe(gulp.dest('./'))
+    .pipe(gulp.dest(''))
     .on('error', errorHandler)
     .pipe(livereload())
     .on('error', errorHandler);

frontend/postcss.config.js

@@ -1,5 +1,4 @@
 const reload = require('require-nocache')(module);
-const browsers = require('./browsers');
 
 module.exports = (ctx, configPath, options) => {
   const config = {
@@ -15,10 +14,17 @@ module.exports = (ctx, configPath, options) => {
             return Object.assign(acc, reload(vars));
           }, {})
       },
-      'postcss-color-function': {},
       'postcss-nested': {},
       autoprefixer: {
-        browsers
+        browsers: [
+          'Chrome >= 30',
+          'Firefox >= 30',
+          'Safari >= 6',
+          'Edge >= 12',
+          'Explorer >= 11',
+          'iOS >= 7',
+          'Android >= 4.4'
+        ]
       }
     }
   };

frontend/src/Activity/Blacklist/Blacklist.js

@@ -1,10 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { align, icons } from 'Helpers/Props';
+import { 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 PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
@@ -42,18 +41,6 @@ class Blacklist extends Component {
               onPress={onClearBlacklistPress}
             />
           </PageToolbarSection>
-
-          <PageToolbarSection alignContent={align.RIGHT}>
-            <TableOptionsModalWrapper
-              {...otherProps}
-              columns={columns}
-            >
-              <PageToolbarButton
-                label="Options"
-                iconName={icons.TABLE}
-              />
-            </TableOptionsModalWrapper>
-          </PageToolbarSection>
         </PageToolbar>
 
         <PageContentBodyConnector>

frontend/src/Activity/Blacklist/BlacklistConnector.js

@@ -105,14 +105,6 @@ class BlacklistConnector extends Component {
     this.props.executeCommand({ name: commandNames.CLEAR_BLACKLIST });
   }
 
-  onTableOptionChange = (payload) => {
-    this.props.setBlacklistTableOption(payload);
-
-    if (payload.pageSize) {
-      this.props.gotoBlacklistFirstPage();
-    }
-  }
-
   //
   // Render
 
@@ -134,7 +126,6 @@ class BlacklistConnector extends Component {
 }
 
 BlacklistConnector.propTypes = {
-  useCurrentPage: PropTypes.bool.isRequired,
   isClearingBlacklistExecuting: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   fetchBlacklist: PropTypes.func.isRequired,

frontend/src/Activity/Blacklist/BlacklistRow.css

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

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

@@ -1,5 +1,5 @@
 .description {
-  composes: description from '~Components/DescriptionList/DescriptionListItemDescription.css';
+  composes: title from 'Components/DescriptionList/DescriptionListItemDescription.css';
 
   overflow-wrap: break-word;
 }

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

@@ -231,16 +231,6 @@ function HistoryDetails(props) {
       </DescriptionList>
     );
   }
-
-  return (
-    <DescriptionList>
-      <DescriptionListItem
-        descriptionClassName={styles.description}
-        title="Name"
-        data={sourceTitle}
-      />
-    </DescriptionList>
-  );
 }
 
 HistoryDetails.propTypes = {

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

@@ -1,5 +1,5 @@
 .markAsFailedButton {
-  composes: button from '~Components/Link/Button.css';
+  composes: button from 'Components/Link/Button.css';
 
   margin-right: auto;
 }

frontend/src/Activity/History/History.js

@@ -5,7 +5,6 @@ import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 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 PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
@@ -76,16 +75,6 @@ class History extends Component {
           </PageToolbarSection>
 
           <PageToolbarSection alignContent={align.RIGHT}>
-            <TableOptionsModalWrapper
-              {...otherProps}
-              columns={columns}
-            >
-              <PageToolbarButton
-                label="Options"
-                iconName={icons.TABLE}
-              />
-            </TableOptionsModalWrapper>
-
             <FilterMenu
               alignMenu={align.RIGHT}
               selectedFilterKey={selectedFilterKey}

frontend/src/Activity/History/HistoryConnector.js

@@ -8,7 +8,6 @@ import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
 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() {
@@ -29,8 +28,7 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
   ...historyActions,
   fetchEpisodes,
-  clearEpisodes,
-  clearEpisodeFiles
+  clearEpisodes
 };
 
 class HistoryConnector extends Component {
@@ -70,7 +68,6 @@ class HistoryConnector extends Component {
     unregisterPagePopulator(this.repopulate);
     this.props.clearHistory();
     this.props.clearEpisodes();
-    this.props.clearEpisodeFiles();
   }
 
   //
@@ -140,7 +137,6 @@ class HistoryConnector extends Component {
 }
 
 HistoryConnector.propTypes = {
-  useCurrentPage: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   fetchHistory: PropTypes.func.isRequired,
   gotoHistoryFirstPage: PropTypes.func.isRequired,
@@ -153,8 +149,7 @@ HistoryConnector.propTypes = {
   setHistoryTableOption: PropTypes.func.isRequired,
   clearHistory: PropTypes.func.isRequired,
   fetchEpisodes: PropTypes.func.isRequired,
-  clearEpisodes: PropTypes.func.isRequired,
-  clearEpisodeFiles: PropTypes.func.isRequired
+  clearEpisodes: PropTypes.func.isRequired
 };
 
 export default withCurrentPage(

frontend/src/Activity/History/HistoryEventTypeCell.css

@@ -1,5 +1,5 @@
 .cell {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 35px;
   text-align: center;

frontend/src/Activity/History/HistoryRow.css

@@ -1,23 +1,23 @@
 .downloadClient {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 120px;
 }
 
 .indexer {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 80px;
 }
 
 .releaseGroup {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 110px;
 }
 
 .details {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 30px;
 }

frontend/src/Activity/Queue/ProtocolLabel.css

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

frontend/src/Activity/Queue/Queue.js

@@ -3,10 +3,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 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 { align, icons } from 'Helpers/Props';
+import { icons } from 'Helpers/Props';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
@@ -17,7 +16,6 @@ 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';
@@ -45,27 +43,22 @@ class Queue extends Component {
     // before episodes start fetching or when episodes start fetching.
 
     if (
-      this.props.isFetching &&
-      nextProps.isPopulated &&
-      hasDifferentItems(this.props.items, nextProps.items) &&
-      nextProps.items.some((e) => e.episodeId)
+      (
+        this.props.isFetching &&
+        nextProps.isPopulated &&
+        hasDifferentItems(this.props.items, nextProps.items)
+      ) ||
+      (!this.props.isEpisodesFetching && nextProps.isEpisodesFetching)
     ) {
       return false;
     }
 
-    if (!this.props.isEpisodesFetching && nextProps.isEpisodesFetching) {
-      return false;
-    }
-
     return true;
   }
 
   componentDidUpdate(prevProps) {
     if (hasDifferentItems(prevProps.items, this.props.items)) {
-      this.setState((state) => {
-        return removeOldSelectedState(state, prevProps.items);
-      });
-
+      this.setState({ selectedState: {} });
       return;
     }
 
@@ -146,7 +139,7 @@ class Queue extends Component {
     } = this.state;
 
     const isRefreshing = isFetching || isEpisodesFetching || isCheckForFinishedDownloadExecuting;
-    const isAllPopulated = isPopulated && (isEpisodesPopulated || !items.length || items.every((e) => !e.episodeId));
+    const isAllPopulated = isPopulated && (isEpisodesPopulated || !items.length);
     const hasError = error || episodesError;
     const selectedCount = this.getSelectedIds().length;
     const disableSelectedActions = selectedCount === 0;
@@ -180,21 +173,6 @@ class Queue extends Component {
               onPress={this.onRemoveSelectedPress}
             />
           </PageToolbarSection>
-
-          <PageToolbarSection
-            alignContent={align.RIGHT}
-          >
-            <TableOptionsModalWrapper
-              columns={columns}
-              {...otherProps}
-              optionsComponent={QueueOptionsConnector}
-            >
-              <PageToolbarButton
-                label="Options"
-                iconName={icons.TABLE}
-              />
-            </TableOptionsModalWrapper>
-          </PageToolbarSection>
         </PageToolbar>
 
         <PageContentBodyConnector>

frontend/src/Activity/Queue/QueueConnector.js

@@ -164,8 +164,6 @@ class QueueConnector extends Component {
 }
 
 QueueConnector.propTypes = {
-  includeUnknownSeriesItems: PropTypes.bool.isRequired,
-  useCurrentPage: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   fetchQueue: PropTypes.func.isRequired,
   gotoQueueFirstPage: PropTypes.func.isRequired,

frontend/src/Activity/Queue/QueueRow.css

@@ -1,23 +1,23 @@
 .quality {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 150px;
 }
 
 .protocol {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 100px;
 }
 
 .progress {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 150px;
 }
 
 .actions {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 70px;
 }

frontend/src/Activity/Queue/QueueRow.js

@@ -10,7 +10,6 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
 import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
 import EpisodeQuality from 'Episode/EpisodeQuality';
 import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
 import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
@@ -72,11 +71,9 @@ class QueueRow extends Component {
       errorMessage,
       series,
       episode,
-      language,
       quality,
       protocol,
       indexer,
-      outputPath,
       downloadClient,
       estimatedCompletionTime,
       timeleft,
@@ -207,16 +204,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'language') {
-              return (
-                <TableRowCell key={name}>
-                  <EpisodeLanguage
-                    language={language}
-                  />
-                </TableRowCell>
-              );
-            }
-
             if (name === 'quality') {
               return (
                 <TableRowCell key={name}>
@@ -253,22 +240,6 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'title') {
-              return (
-                <TableRowCell key={name}>
-                  {title}
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'outputPath') {
-              return (
-                <TableRowCell key={name}>
-                  {outputPath}
-                </TableRowCell>
-              );
-            }
-
             if (name === 'estimatedCompletionTime') {
               return (
                 <TimeleftCell
@@ -369,11 +340,9 @@ QueueRow.propTypes = {
   errorMessage: PropTypes.string,
   series: PropTypes.object,
   episode: PropTypes.object,
-  language: PropTypes.object.isRequired,
   quality: PropTypes.object.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
-  outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
   estimatedCompletionTime: PropTypes.string,
   timeleft: PropTypes.string,

frontend/src/Activity/Queue/QueueStatusCell.css

@@ -1,5 +1,5 @@
 .status {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 30px;
 }

frontend/src/Activity/Queue/QueueStatusCell.js

@@ -116,7 +116,6 @@ function QueueStatusCell(props) {
         title={title}
         body={hasWarning || hasError ? getDetailedPopoverBody(statusMessages) : sourceTitle}
         position={tooltipPositions.RIGHT}
-        canFlip={false}
       />
     </TableRowCell>
   );

frontend/src/Activity/Queue/Status/QueueStatusConnector.js

@@ -12,12 +12,8 @@ function createMapStateToProps() {
     (state) => state.queue.options.includeUnknownSeriesItems,
     (app, status, includeUnknownSeriesItems) => {
       const {
-        errors,
-        warnings,
-        unknownErrors,
-        unknownWarnings,
         count,
-        totalCount
+        unknownCount
       } = status.item;
 
       return {
@@ -25,9 +21,7 @@ function createMapStateToProps() {
         isReconnecting: app.isReconnecting,
         isPopulated: status.isPopulated,
         ...status.item,
-        count: includeUnknownSeriesItems ? totalCount : count,
-        errors: includeUnknownSeriesItems ? errors || unknownErrors : errors,
-        warnings: includeUnknownSeriesItems ? warnings || unknownWarnings : warnings
+        count: includeUnknownSeriesItems ? count : count - unknownCount
       };
     }
   );

frontend/src/Activity/Queue/TimeleftCell.css

@@ -1,5 +1,5 @@
 .timeleft {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 100px;
 }

frontend/src/AddSeries/AddNewSeries/AddNewSeries.css

@@ -17,7 +17,7 @@
 }
 
 .searchInput {
-  composes: input from '~Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   height: 46px;
   border-radius: 0;

frontend/src/AddSeries/AddNewSeries/AddNewSeries.js

@@ -100,7 +100,6 @@ class AddNewSeries extends Component {
               name="seriesLookup"
               value={term}
               placeholder="eg. Breaking Bad, tvdb:####"
-              autoFocus={true}
               onChange={this.onSearchInputChange}
             />
 

frontend/src/AddSeries/AddNewSeries/AddNewSeriesConnector.js

@@ -10,7 +10,7 @@ import AddNewSeries from './AddNewSeries';
 function createMapStateToProps() {
   return createSelector(
     (state) => state.addSeries,
-    (state) => state.router.location,
+    (state) => state.routing.location,
     (addSeries, location) => {
       const { params } = parseUrl(location.search);
 

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContent.css

@@ -36,28 +36,28 @@
 }
 
 .searchForMissingEpisodesContainer {
-  composes: container from '~Components/Form/CheckInput.css';
+  composes: container from 'Components/Form/CheckInput.css';
 
   flex: 0 1 0;
 }
 
 .searchForMissingEpisodesInput {
-  composes: input from '~Components/Form/CheckInput.css';
+  composes: input from 'Components/Form/CheckInput.css';
 
   margin-top: 0;
 }
 
 .modalFooter {
-  composes: modalFooter from '~Components/Modal/ModalFooter.css';
+  composes: modalFooter from 'Components/Modal/ModalFooter.css';
 }
 
 .addButton {
   @add-mixin truncate;
-  composes: button from '~Components/Link/SpinnerButton.css';
+  composes: button from 'Components/Link/SpinnerButton.css';
 }
 
 .hideLanguageProfile {
-  composes: group from '~Components/Form/FormGroup.css';
+  composes: group from 'Components/Form/FormGroup.css';
 
   display: none;
 }

frontend/src/AddSeries/AddNewSeries/AddNewSeriesModalContent.js

@@ -70,8 +70,7 @@ class AddNewSeriesModalContent extends Component {
       showLanguageProfile,
       isSmallScreen,
       onModalClose,
-      onInputChange,
-      ...otherProps
+      onInputChange
     } = this.props;
 
     return (
@@ -88,8 +87,7 @@ class AddNewSeriesModalContent extends Component {
         <ModalBody>
           <div className={styles.container}>
             {
-              isSmallScreen ?
-                null :
+              !isSmallScreen &&
                 <div className={styles.poster}>
                   <SeriesPoster
                     className={styles.poster}
@@ -100,15 +98,11 @@ class AddNewSeriesModalContent extends Component {
             }
 
             <div className={styles.info}>
-              {
-                overview ?
-                  <div className={styles.overview}>
-                    {overview}
-                  </div> :
-                  null
-              }
+              <div className={styles.overview}>
+                {overview}
+              </div>
 
-              <Form {...otherProps}>
+              <Form>
                 <FormGroup>
                   <FormLabel>Root Folder</FormLabel>
 

frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.js

@@ -78,14 +78,12 @@ class AddNewSeriesSearchResult extends Component {
           {...linkProps}
         >
           {
-            isSmallScreen ?
-              null :
-              <SeriesPoster
-                className={styles.poster}
-                images={images}
-                size={250}
-                overflow={true}
-              />
+            !isSmallScreen &&
+            <SeriesPoster
+              className={styles.poster}
+              images={images}
+              size={250}
+            />
           }
 
           <div>
@@ -93,22 +91,18 @@ class AddNewSeriesSearchResult extends Component {
               {title}
 
               {
-                !title.contains(year) && year ?
-                  <span className={styles.year}>
-                    ({year})
-                  </span> :
-                  null
+                !title.contains(year) && !!year &&
+                <span className={styles.year}>({year})</span>
               }
 
               {
-                isExistingSeries ?
-                  <Icon
-                    className={styles.alreadyExistsIcon}
-                    name={icons.CHECK_CIRCLE}
-                    size={36}
-                    title="Already in your library"
-                  /> :
-                  null
+                isExistingSeries &&
+                <Icon
+                  className={styles.alreadyExistsIcon}
+                  name={icons.CHECK_CIRCLE}
+                  size={36}
+                  title="Already in your library"
+                />
               }
             </div>
 
@@ -121,30 +115,27 @@ class AddNewSeriesSearchResult extends Component {
               </Label>
 
               {
-                network ?
-                  <Label size={sizes.LARGE}>
-                    {network}
-                  </Label> :
-                  null
+                !!network &&
+                <Label size={sizes.LARGE}>
+                  {network}
+                </Label>
               }
 
               {
-                seasonCount ?
-                  <Label size={sizes.LARGE}>
-                    {seasons}
-                  </Label> :
-                  null
+                !!seasonCount &&
+                <Label size={sizes.LARGE}>
+                  {seasons}
+                </Label>
               }
 
               {
-                status === 'ended' ?
-                  <Label
-                    kind={kinds.DANGER}
-                    size={sizes.LARGE}
-                  >
+                status === 'ended' &&
+                <Label
+                  kind={kinds.DANGER}
+                  size={sizes.LARGE}
+                >
                   Ended
-                  </Label> :
-                  null
+                </Label>
               }
             </div>
 

frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooter.css

@@ -14,7 +14,7 @@
 }
 
 .importButton {
-  composes: button from '~Components/Link/SpinnerButton.css';
+  composes: button from 'Components/Link/SpinnerButton.css';
 
   height: 35px;
 }
@@ -26,7 +26,7 @@
 }
 
 .loading {
-  composes: loading from '~Components/Loading/LoadingIndicator.css';
+  composes: loading from 'Components/Loading/LoadingIndicator.css';
 
   margin: 0 10px 0 12px;
   text-align: left;

frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.css

@@ -1,11 +1,11 @@
 .folder {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 1 0 200px;
 }
 
 .monitor {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 0 1 200px;
   min-width: 185px;
@@ -13,28 +13,28 @@
 
 .qualityProfile,
 .languageProfile {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 0 1 250px;
   min-width: 170px;
 }
 
 .seriesType {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 0 1 200px;
   min-width: 120px;
 }
 
 .seasonFolder {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 0 1 150px;
   min-width: 120px;
 }
 
 .series {
-  composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
+  composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
 
   flex: 0 1 400px;
   min-width: 300px;

frontend/src/AddSeries/ImportSeries/Import/ImportSeriesRow.css

@@ -1,16 +1,16 @@
 .selectInput {
-  composes: input from '~Components/Form/CheckInput.css';
+  composes: input from 'Components/Form/CheckInput.css';
 }
 
 .folder {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 1 0 200px;
   line-height: 36px;
 }
 
 .monitor {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 0 1 200px;
   min-width: 185px;
@@ -18,35 +18,35 @@
 
 .qualityProfile,
 .languageProfile {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 0 1 250px;
   min-width: 170px;
 }
 
 .seriesType {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 0 1 200px;
   min-width: 120px;
 }
 
 .seasonFolder {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 0 1 150px;
   min-width: 120px;
 }
 
 .series {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   flex: 0 1 400px;
   min-width: 300px;
 }
 
 .hideLanguageProfile {
-  composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
+  composes: cell from 'Components/Table/Cells/VirtualTableRowCell.css';
 
   display: none;
 }

frontend/src/AddSeries/ImportSeries/Import/ImportSeriesSelected.css

@@ -1,3 +1,3 @@
 .input {
-  composes: input from '~Components/Form/CheckInput.css';
+  composes: input from 'Components/Form/CheckInput.css';
 }

frontend/src/AddSeries/ImportSeries/Import/SelectSeries/ImportSeriesSelectSeries.css

@@ -1,6 +1,11 @@
-.button {
-  composes: link from '~Components/Link/Link.css';
+.tether {
+  z-index: 2000;
+}
 
+.button {
+  composes: link from 'Components/Link/Link.css';
+
+  position: relative;
   display: flex;
   align-items: center;
   padding: 6px 16px;
@@ -31,10 +36,9 @@
 }
 
 .contentContainer {
-  z-index: $popperZIndex;
   margin-top: 4px;
-  /* 400px container witdh with 8px padding on each side */
-  width: 384px;
+  padding: 0 8px;
+  width: 400px;
 }
 
 .content {
@@ -61,7 +65,7 @@
 }
 
 .searchInput {
-  composes: input from '~Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   border-radius: 0;
 }

frontend/src/AddSeries/ImportSeries/Import/SelectSeries/ImportSeriesSelectSeries.js

@@ -1,10 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { Manager, Popper, Reference } from 'react-popper';
-import getUniqueElememtId from 'Utilities/getUniqueElementId';
+import ReactDOM from 'react-dom';
+import TetherComponent from 'react-tether';
 import { icons, kinds } from 'Helpers/Props';
 import Icon from 'Components/Icon';
-import Portal from 'Components/Portal';
 import FormInputButton from 'Components/Form/FormInputButton';
 import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
@@ -13,6 +12,19 @@ import ImportSeriesSearchResultConnector from './ImportSeriesSearchResultConnect
 import ImportSeriesTitle from './ImportSeriesTitle';
 import styles from './ImportSeriesSelectSeries.css';
 
+const tetherOptions = {
+  skipMoveElement: true,
+  constraints: [
+    {
+      to: 'window',
+      attachment: 'together',
+      pin: true
+    }
+  ],
+  attachment: 'top center',
+  targetAttachment: 'bottom center'
+};
+
 class ImportSeriesSelectSeries extends Component {
 
   //
@@ -22,9 +34,6 @@ class ImportSeriesSelectSeries extends Component {
     super(props, context);
 
     this._seriesLookupTimeout = null;
-    this._scheduleUpdate = null;
-    this._buttonId = getUniqueElememtId();
-    this._contentId = getUniqueElememtId();
 
     this.state = {
       term: props.id,
@@ -32,15 +41,17 @@ class ImportSeriesSelectSeries extends Component {
     };
   }
 
-  componentDidUpdate() {
-    if (this._scheduleUpdate) {
-      this._scheduleUpdate();
-    }
-  }
-
   //
   // Control
 
+  _setButtonRef = (ref) => {
+    this._buttonRef = ref;
+  }
+
+  _setContentRef = (ref) => {
+    this._contentRef = ref;
+  }
+
   _addListener() {
     window.addEventListener('click', this.onWindowClick);
   }
@@ -53,18 +64,14 @@ class ImportSeriesSelectSeries extends Component {
   // Listeners
 
   onWindowClick = (event) => {
-    const button = document.getElementById(this._buttonId);
-    const content = document.getElementById(this._contentId);
+    const button = ReactDOM.findDOMNode(this._buttonRef);
+    const content = ReactDOM.findDOMNode(this._contentRef);
 
-    if (!button || !content) {
+    if (!button) {
       return;
     }
 
-    if (
-      !button.contains(event.target) &&
-      !content.contains(event.target) &&
-      this.state.isOpen
-    ) {
+    if (!button.contains(event.target) && content && !content.contains(event.target) && this.state.isOpen) {
       this.setState({ isOpen: false });
       this._removeListener();
     }
@@ -122,158 +129,129 @@ class ImportSeriesSelectSeries extends Component {
       error.responseJSON.message;
 
     return (
-      <Manager>
-        <Reference>
-          {({ ref }) => (
-            <div
-              ref={ref}
-              id={this._buttonId}
-            >
-              <Link
-                ref={ref}
-                className={styles.button}
-                component="div"
-                onPress={this.onPress}
-              >
-                {
-                  isLookingUpSeries && isQueued && !isPopulated ?
-                    <LoadingIndicator
-                      className={styles.loading}
-                      size={20}
-                    /> :
-                    null
-                }
+      <TetherComponent
+        classes={{
+          element: styles.tether
+        }}
+        {...tetherOptions}
+      >
+        <Link
+          ref={this._setButtonRef}
+          className={styles.button}
+          component="div"
+          onPress={this.onPress}
+        >
+          {
+            isLookingUpSeries && isQueued && !isPopulated &&
+              <LoadingIndicator
+                className={styles.loading}
+                size={20}
+              />
+          }
 
-                {
-                  isPopulated && selectedSeries && isExistingSeries ?
-                    <Icon
-                      className={styles.warningIcon}
-                      name={icons.WARNING}
-                      kind={kinds.WARNING}
-                    /> :
-                    null
-                }
+          {
+            isPopulated && selectedSeries && isExistingSeries &&
+              <Icon
+                className={styles.warningIcon}
+                name={icons.WARNING}
+                kind={kinds.WARNING}
+              />
+          }
 
-                {
-                  isPopulated && selectedSeries ?
-                    <ImportSeriesTitle
-                      title={selectedSeries.title}
-                      year={selectedSeries.year}
-                      network={selectedSeries.network}
-                      isExistingSeries={isExistingSeries}
-                    /> :
-                    null
-                }
+          {
+            isPopulated && selectedSeries &&
+              <ImportSeriesTitle
+                title={selectedSeries.title}
+                year={selectedSeries.year}
+                network={selectedSeries.network}
+                isExistingSeries={isExistingSeries}
+              />
+          }
 
-                {
-                  isPopulated && !selectedSeries ?
-                    <div className={styles.noMatches}>
-                      <Icon
-                        className={styles.warningIcon}
-                        name={icons.WARNING}
-                        kind={kinds.WARNING}
-                      />
+          {
+            isPopulated && !selectedSeries &&
+              <div className={styles.noMatches}>
+                <Icon
+                  className={styles.warningIcon}
+                  name={icons.WARNING}
+                  kind={kinds.WARNING}
+                />
 
                 No match found!
-                    </div> :
-                    null
-                }
+              </div>
+          }
 
-                {
-                  !isFetching && !!error ?
-                    <div>
-                      <Icon
-                        className={styles.warningIcon}
-                        title={errorMessage}
-                        name={icons.WARNING}
-                        kind={kinds.WARNING}
-                      />
+          {
+            !isFetching && !!error &&
+              <div>
+                <Icon
+                  className={styles.warningIcon}
+                  title={errorMessage}
+                  name={icons.WARNING}
+                  kind={kinds.WARNING}
+                />
 
                 Search failed, please try again later.
-                    </div> :
-                    null
-                }
+              </div>
+          }
 
-                <div className={styles.dropdownArrowContainer}>
-                  <Icon
-                    name={icons.CARET_DOWN}
+          <div className={styles.dropdownArrowContainer}>
+            <Icon
+              name={icons.CARET_DOWN}
+            />
+          </div>
+        </Link>
+
+        {
+          this.state.isOpen &&
+            <div
+              ref={this._setContentRef}
+              className={styles.contentContainer}
+            >
+              <div className={styles.content}>
+                <div className={styles.searchContainer}>
+                  <div className={styles.searchIconContainer}>
+                    <Icon name={icons.SEARCH} />
+                  </div>
+
+                  <TextInput
+                    className={styles.searchInput}
+                    name={`${name}_textInput`}
+                    value={this.state.term}
+                    onChange={this.onSearchInputChange}
                   />
+
+                  <FormInputButton
+                    kind={kinds.DEFAULT}
+                    spinnerIcon={icons.REFRESH}
+                    canSpin={true}
+                    isSpinning={isFetching}
+                    onPress={this.onRefreshPress}
+                  >
+                    <Icon name={icons.REFRESH} />
+                  </FormInputButton>
                 </div>
-              </Link>
-            </div>
-          )}
-        </Reference>
 
-        <Portal>
-          <Popper
-            placement="bottom"
-            modifiers={{
-              preventOverflow: {
-                boundariesElement: 'viewport'
-              }
-            }}
-          >
-            {({ ref, style, scheduleUpdate }) => {
-              this._scheduleUpdate = scheduleUpdate;
-
-              return (
-                <div
-                  ref={ref}
-                  id={this._contentId}
-                  className={styles.contentContainer}
-                  style={style}
-                >
+                <div className={styles.results}>
                   {
-                    this.state.isOpen ?
-                      <div className={styles.content}>
-                        <div className={styles.searchContainer}>
-                          <div className={styles.searchIconContainer}>
-                            <Icon name={icons.SEARCH} />
-                          </div>
-
-                          <TextInput
-                            className={styles.searchInput}
-                            name={`${name}_textInput`}
-                            value={this.state.term}
-                            onChange={this.onSearchInputChange}
-                          />
-
-                          <FormInputButton
-                            kind={kinds.DEFAULT}
-                            spinnerIcon={icons.REFRESH}
-                            canSpin={true}
-                            isSpinning={isFetching}
-                            onPress={this.onRefreshPress}
-                          >
-                            <Icon name={icons.REFRESH} />
-                          </FormInputButton>
-                        </div>
-
-                        <div className={styles.results}>
-                          {
-                            items.map((item) => {
-                              return (
-                                <ImportSeriesSearchResultConnector
-                                  key={item.tvdbId}
-                                  tvdbId={item.tvdbId}
-                                  title={item.title}
-                                  year={item.year}
-                                  network={item.network}
-                                  onPress={this.onSeriesSelect}
-                                />
-                              );
-                            })
-                          }
-                        </div>
-                      </div> :
-                      null
+                    items.map((item) => {
+                      return (
+                        <ImportSeriesSearchResultConnector
+                          key={item.tvdbId}
+                          tvdbId={item.tvdbId}
+                          title={item.title}
+                          year={item.year}
+                          network={item.network}
+                          onPress={this.onSeriesSelect}
+                        />
+                      );
+                    })
                   }
                 </div>
-              );
-            }}
-          </Popper>
-        </Portal>
-      </Manager>
+              </div>
+            </div>
+        }
+      </TetherComponent>
     );
   }
 }

frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.css

@@ -0,0 +1,18 @@
+.link {
+  composes: link from 'Components/Link/Link.css';
+
+  display: block;
+}
+
+.freeSpace,
+.unmappedFolders {
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
+
+  width: 150px;
+}
+
+.actions {
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
+
+  width: 45px;
+}

frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRow.js

@@ -6,9 +6,9 @@ import IconButton from 'Components/Link/IconButton';
 import Link from 'Components/Link/Link';
 import TableRow from 'Components/Table/TableRow';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import styles from './RootFolderRow.css';
+import styles from './ImportSeriesRootFolderRow.css';
 
-function RootFolderRow(props) {
+function ImportSeriesRootFolderRow(props) {
   const {
     id,
     path,
@@ -49,7 +49,7 @@ function RootFolderRow(props) {
   );
 }
 
-RootFolderRow.propTypes = {
+ImportSeriesRootFolderRow.propTypes = {
   id: PropTypes.number.isRequired,
   path: PropTypes.string.isRequired,
   freeSpace: PropTypes.number.isRequired,
@@ -57,9 +57,9 @@ RootFolderRow.propTypes = {
   onDeletePress: PropTypes.func.isRequired
 };
 
-RootFolderRow.defaultProps = {
+ImportSeriesRootFolderRow.defaultProps = {
   freeSpace: 0,
   unmappedFolders: []
 };
 
-export default RootFolderRow;
+export default ImportSeriesRootFolderRow;

frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesRootFolderRowConnector.js

@@ -0,0 +1,48 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { deleteRootFolder } from 'Store/Actions/rootFolderActions';
+import ImportSeriesRootFolderRow from './ImportSeriesRootFolderRow';
+
+function createMapStateToProps() {
+  return createSelector(
+    () => {
+      return {
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  deleteRootFolder
+};
+
+class ImportSeriesRootFolderRowConnector extends Component {
+
+  //
+  // Listeners
+
+  onDeletePress = () => {
+    this.props.deleteRootFolder({ id: this.props.id });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <ImportSeriesRootFolderRow
+        {...this.props}
+        onDeletePress={this.onDeletePress}
+      />
+    );
+  }
+}
+
+ImportSeriesRootFolderRowConnector.propTypes = {
+  id: PropTypes.number.isRequired,
+  deleteRootFolder: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(ImportSeriesRootFolderRowConnector);

frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolder.js

@@ -2,15 +2,39 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { icons, kinds, sizes } from 'Helpers/Props';
 import Button from 'Components/Link/Button';
-import Icon from 'Components/Icon';
 import FieldSet from 'Components/FieldSet';
+import Icon from 'Components/Icon';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
-import RootFolders from 'RootFolder/RootFolders';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import ImportSeriesRootFolderRowConnector from './ImportSeriesRootFolderRowConnector';
 import styles from './ImportSeriesSelectFolder.css';
 
+const rootFolderColumns = [
+  {
+    name: 'path',
+    label: 'Path',
+    isVisible: true
+  },
+  {
+    name: 'freeSpace',
+    label: 'Free Space',
+    isVisible: true
+  },
+  {
+    name: 'unmappedFolders',
+    label: 'Unmapped Folders',
+    isVisible: true
+  },
+  {
+    name: 'actions',
+    isVisible: true
+  }
+];
+
 class ImportSeriesSelectFolder extends Component {
 
   //
@@ -86,13 +110,26 @@ class ImportSeriesSelectFolder extends Component {
                 {
                   items.length > 0 ?
                     <div className={styles.recentFolders}>
-                      <FieldSet legend="Root Folders">
-                        <RootFolders
-                          isFetching={isFetching}
-                          isPopulated={isPopulated}
-                          error={error}
-                          items={items}
-                        />
+                      <FieldSet legend="Recent Folders">
+                        <Table
+                          columns={rootFolderColumns}
+                        >
+                          <TableBody>
+                            {
+                              items.map((rootFolder) => {
+                                return (
+                                  <ImportSeriesRootFolderRowConnector
+                                    key={rootFolder.id}
+                                    id={rootFolder.id}
+                                    path={rootFolder.path}
+                                    freeSpace={rootFolder.freeSpace}
+                                    unmappedFolders={rootFolder.unmappedFolders}
+                                  />
+                                );
+                              })
+                            }
+                          </TableBody>
+                        </Table>
                       </FieldSet>
 
                       <Button
@@ -144,7 +181,8 @@ ImportSeriesSelectFolder.propTypes = {
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onNewRootFolderSelect: PropTypes.func.isRequired
+  onNewRootFolderSelect: PropTypes.func.isRequired,
+  onDeleteRootFolderPress: PropTypes.func.isRequired
 };
 
 export default ImportSeriesSelectFolder;

frontend/src/AddSeries/ImportSeries/SelectFolder/ImportSeriesSelectFolderConnector.js

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { push } from 'connected-react-router';
+import { push } from 'react-router-redux';
 import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
-import { fetchRootFolders, addRootFolder } from 'Store/Actions/rootFolderActions';
+import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions';
 import ImportSeriesSelectFolder from './ImportSeriesSelectFolder';
 
 function createMapStateToProps() {
@@ -24,6 +24,7 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
   fetchRootFolders,
   addRootFolder,
+  deleteRootFolder,
   push
 };
 
@@ -59,6 +60,10 @@ class ImportSeriesSelectFolderConnector extends Component {
     this.props.addRootFolder({ path });
   }
 
+  onDeleteRootFolderPress = (id) => {
+    this.props.deleteRootFolder({ id });
+  }
+
   //
   // Render
 
@@ -67,6 +72,7 @@ class ImportSeriesSelectFolderConnector extends Component {
       <ImportSeriesSelectFolder
         {...this.props}
         onNewRootFolderSelect={this.onNewRootFolderSelect}
+        onDeleteRootFolderPress={this.onDeleteRootFolderPress}
       />
     );
   }
@@ -78,6 +84,7 @@ ImportSeriesSelectFolderConnector.propTypes = {
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
   fetchRootFolders: PropTypes.func.isRequired,
   addRootFolder: PropTypes.func.isRequired,
+  deleteRootFolder: PropTypes.func.isRequired,
   push: PropTypes.func.isRequired
 };
 

frontend/src/App/App.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import DocumentTitle from 'react-document-title';
 import { Provider } from 'react-redux';
-import { ConnectedRouter } from 'connected-react-router';
+import { ConnectedRouter } from 'react-router-redux';
 import PageConnector from 'Components/Page/PageConnector';
 import AppRoutes from './AppRoutes';
 

frontend/src/App/ColorImpairedContext.js

@@ -1,6 +0,0 @@
-import React from 'react';
-
-const ColorImpairedContext = React.createContext(false);
-export const ColorImpairedConsumer = ColorImpairedContext.Consumer;
-
-export default ColorImpairedContext;

frontend/src/Calendar/Agenda/AgendaEvent.css

@@ -63,27 +63,27 @@
  */
 
 .downloaded {
-  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
+  composes: downloaded from 'Calendar/Events/CalendarEvent.css';
 }
 
 .downloading {
-  composes: downloading from '~Calendar/Events/CalendarEvent.css';
+  composes: downloading from 'Calendar/Events/CalendarEvent.css';
 }
 
 .unmonitored {
-  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
+  composes: unmonitored from 'Calendar/Events/CalendarEvent.css';
 }
 
 .onAir {
-  composes: onAir from '~Calendar/Events/CalendarEvent.css';
+  composes: onAir from 'Calendar/Events/CalendarEvent.css';
 }
 
 .missing {
-  composes: missing from '~Calendar/Events/CalendarEvent.css';
+  composes: missing from 'Calendar/Events/CalendarEvent.css';
 }
 
 .premiere {
-  composes: premiere from '~Calendar/Events/CalendarEvent.css';
+  composes: premiere from 'Calendar/Events/CalendarEvent.css';
 }
 
 @media only screen and (max-width: $breakpointSmall) {

frontend/src/Calendar/CalendarConnector.js

@@ -175,7 +175,6 @@ class CalendarConnector extends Component {
 }
 
 CalendarConnector.propTypes = {
-  useCurrentPage: PropTypes.bool.isRequired,
   time: PropTypes.string,
   view: PropTypes.string.isRequired,
   firstDayOfWeek: PropTypes.number.isRequired,

frontend/src/Calendar/CalendarPage.css

@@ -1,11 +1,11 @@
 .calendarPageBody {
-  composes: contentBody from '~Components/Page/PageContentBody.css';
+  composes: contentBody from 'Components/Page/PageContentBody.css';
 
   display: flex;
 }
 
 .calendarInnerPageBody {
-  composes: innerContentBody from '~Components/Page/PageContentBody.css';
+  composes: innerContentBody from 'Components/Page/PageContentBody.css';
 
   display: flex;
   flex-direction: column;

frontend/src/Calendar/CalendarPageConnector.js

@@ -25,7 +25,7 @@ function createMissingEpisodeIdsSelector() {
           moment(airDateUtc).isAfter(start) &&
           moment(airDateUtc).isBefore(end) &&
           isBefore(episode.airDateUtc) &&
-          !queueDetails.some((details) => !!details.episode && details.episode.id === episode.id)
+          !queueDetails.some((details) => details.episode.id === episode.id)
         ) {
           acc.push(episode.id);
         }

frontend/src/Calendar/Events/CalendarEvent.css

@@ -5,10 +5,6 @@
   border-bottom: 1px solid $borderColor;
   border-left: 4px solid $borderColor;
   font-size: 12px;
-
-  &:global(.colorImpaired) {
-    border-left-width: 5px;
-  }
 }
 
 .info,
@@ -43,10 +39,6 @@
 
 .downloaded {
   border-left-color: $successColor !important;
-
-  &:global(.colorImpaired) {
-    border-left-color: color($successColor, saturation(+15%)) !important;
-  }
 }
 
 .downloading {
@@ -57,7 +49,7 @@
   border-left-color: $gray !important;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(45deg, transparent, transparent 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
   }
 }
 
@@ -65,7 +57,7 @@
   border-left-color: $warningColor !important;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(90deg, transparent, transparent 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
   }
 }
 
@@ -73,8 +65,7 @@
   border-left-color: $dangerColor !important;
 
   &:global(.colorImpaired) {
-    border-left-color: color($dangerColor saturation(+15%)) !important;
-    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(90deg, transparent, transparent 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
   }
 }
 
@@ -82,6 +73,6 @@
   border-left-color: $primaryColor !important;
 
   &:global(.colorImpaired) {
-    background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+    background: repeating-linear-gradient(90deg, transparent, transparent 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
   }
 }

frontend/src/Calendar/Events/CalendarEventGroup.css

@@ -58,25 +58,25 @@
  */
 
 .downloaded {
-  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
+  composes: downloaded from 'Calendar/Events/CalendarEvent.css';
 }
 
 .downloading {
-  composes: downloading from '~Calendar/Events/CalendarEvent.css';
+  composes: downloading from 'Calendar/Events/CalendarEvent.css';
 }
 
 .unmonitored {
-  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
+  composes: unmonitored from 'Calendar/Events/CalendarEvent.css';
 }
 
 .onAir {
-  composes: onAir from '~Calendar/Events/CalendarEvent.css';
+  composes: onAir from 'Calendar/Events/CalendarEvent.css';
 }
 
 .missing {
-  composes: missing from '~Calendar/Events/CalendarEvent.css';
+  composes: missing from 'Calendar/Events/CalendarEvent.css';
 }
 
 .premiere {
-  composes: premiere from '~Calendar/Events/CalendarEvent.css';
+  composes: premiere from 'Calendar/Events/CalendarEvent.css';
 }

frontend/src/Calendar/Events/CalendarEventGroupConnector.js

@@ -10,7 +10,7 @@ function createIsDownloadingSelector() {
     (state) => state.queue.details,
     (episodeIds, details) => {
       return details.items.some((item) => {
-        return item.episode && episodeIds.includes(item.episode.id);
+        return episodeIds.includes(item.episode.id);
       });
     }
   );

frontend/src/Calendar/Header/CalendarHeader.css

@@ -8,7 +8,7 @@
 }
 
 .todayButton {
-  composes: button from '~Components/Link/Button.css';
+  composes: button from 'Components/Link/Button.css';
 
   margin-left: 5px;
 }
@@ -30,13 +30,13 @@
 }
 
 .viewMenu {
-  composes: menu from '~Components/Menu/Menu.css';
+  composes: menu from 'Components/Menu/Menu.css';
 
   line-height: 31px;
 }
 
 .loading {
-  composes: loading from '~Components/Loading/LoadingIndicator.css';
+  composes: loading from 'Components/Loading/LoadingIndicator.css';
 
   margin-top: 5px;
   margin-right: 10px;

frontend/src/Calendar/Header/CalendarHeader.js

@@ -83,7 +83,6 @@ class CalendarHeader extends Component {
       end,
       longDateFormat,
       isSmallScreen,
-      collapseViewButtons,
       onTodayPress,
       onPreviousPress,
       onNextPress
@@ -146,7 +145,7 @@ class CalendarHeader extends Component {
             }
 
             {
-              collapseViewButtons ?
+              isSmallScreen ?
                 <Menu
                   className={styles.viewMenu}
                   alignMenu={align.RIGHT}
@@ -159,18 +158,6 @@ class CalendarHeader extends Component {
                   </MenuButton>
 
                   <MenuContent>
-                    {
-                      isSmallScreen ?
-                        null :
-                        <ViewMenuItem
-                          name={calendarViews.MONTH}
-                          selectedView={view}
-                          onPress={this.onViewChange}
-                        >
-                          Month
-                        </ViewMenuItem>
-                    }
-
                     <ViewMenuItem
                       name={calendarViews.WEEK}
                       selectedView={view}
@@ -256,7 +243,6 @@ CalendarHeader.propTypes = {
   end: PropTypes.string.isRequired,
   view: PropTypes.oneOf(calendarViews.all).isRequired,
   isSmallScreen: PropTypes.bool.isRequired,
-  collapseViewButtons: PropTypes.bool.isRequired,
   longDateFormat: PropTypes.string.isRequired,
   onViewChange: PropTypes.func.isRequired,
   onTodayPress: PropTypes.func.isRequired,

frontend/src/Calendar/Header/CalendarHeaderConnector.js

@@ -23,7 +23,6 @@ function createMapStateToProps() {
       ]);
 
       result.isSmallScreen = dimensions.isSmallScreen;
-      result.collapseViewButtons = dimensions.isLargeScreen;
       result.longDateFormat = uiSettings.longDateFormat;
 
       return result;

frontend/src/Calendar/Legend/Legend.js

@@ -63,21 +63,6 @@ function Legend(props) {
         />
       </div>
 
-      <div>
-        <LegendItem
-          status="onAir"
-          name="On Air"
-          tooltip="Episode is currently airing"
-          colorImpairedMode={colorImpairedMode}
-        />
-
-        <LegendItem
-          status="missing"
-          tooltip="Episode has aired and is missing from disk"
-          colorImpairedMode={colorImpairedMode}
-        />
-      </div>
-
       <div>
         <LegendItem
           status="downloading"

frontend/src/Calendar/Legend/LegendIconItem.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
-import styles from './LegendIconItem.css';
+import styles from './legendIconItem.css';
 
 function LegendIconItem(props) {
   const {

frontend/src/Calendar/Legend/LegendItem.css

@@ -13,29 +13,29 @@
  */
 
 .downloaded {
-  composes: downloaded from '~Calendar/Events/CalendarEvent.css';
+  composes: downloaded from 'Calendar/Events/CalendarEvent.css';
 }
 
 .downloading {
-  composes: downloading from '~Calendar/Events/CalendarEvent.css';
+  composes: downloading from 'Calendar/Events/CalendarEvent.css';
 }
 
 .unmonitored {
-  composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
+  composes: unmonitored from 'Calendar/Events/CalendarEvent.css';
 }
 
 .onAir {
-  composes: onAir from '~Calendar/Events/CalendarEvent.css';
+  composes: onAir from 'Calendar/Events/CalendarEvent.css';
 }
 
 .missing {
-  composes: missing from '~Calendar/Events/CalendarEvent.css';
+  composes: missing from 'Calendar/Events/CalendarEvent.css';
 }
 
 .premiere {
-  composes: premiere from '~Calendar/Events/CalendarEvent.css';
+  composes: premiere from 'Calendar/Events/CalendarEvent.css';
 }
 
 .unaired {
-  composes: unaired from '~Calendar/Events/CalendarEvent.css';
+  composes: unaired from 'Calendar/Events/CalendarEvent.css';
 }

frontend/src/Components/FileBrowser/FileBrowserModal.css

@@ -1,5 +1,5 @@
 .modal {
-  composes: modal from '~Components/Modal/Modal.css';
+  composes: modal from 'Components/Modal/Modal.css';
 
   height: 600px;
 }

frontend/src/Components/FileBrowser/FileBrowserModalContent.css

@@ -1,12 +1,12 @@
 .modalBody {
-  composes: modalBody from '~Components/Modal/ModalBody.css';
+  composes: modalBody from 'Components/Modal/ModalBody.css';
 
   display: flex;
   flex-direction: column;
 }
 
 .mappedDrivesWarning {
-  composes: alert from '~Components/Alert.css';
+  composes: alert from 'Components/Alert.css';
 
   margin: 0;
   margin-bottom: 20px;
@@ -18,7 +18,7 @@
 }
 
 .pathInput {
-  composes: inputWrapper from '~Components/Form/PathInput.css';
+  composes: pathInputWrapper from 'Components/Form/PathInput.css';
 
   flex: 0 0 auto;
 }

frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js

@@ -42,8 +42,8 @@ function createMapStateToProps() {
 }
 
 const mapDispatchToProps = {
-  dispatchFetchPaths: fetchPaths,
-  dispatchClearPaths: clearPaths
+  fetchPaths,
+  clearPaths
 };
 
 class FileBrowserModalContentConnector extends Component {
@@ -51,16 +51,9 @@ class FileBrowserModalContentConnector extends Component {
   // Lifecycle
 
   componentDidMount() {
-    const {
-      value,
-      includeFiles,
-      dispatchFetchPaths
-    } = this.props;
-
-    dispatchFetchPaths({
-      path: value,
-      allowFoldersWithoutTrailingSlashes: true,
-      includeFiles
+    this.props.fetchPaths({
+      path: this.props.value,
+      allowFoldersWithoutTrailingSlashes: true
     });
   }
 
@@ -68,24 +61,18 @@ class FileBrowserModalContentConnector extends Component {
   // Listeners
 
   onFetchPaths = (path) => {
-    const {
-      includeFiles,
-      dispatchFetchPaths
-    } = this.props;
-
-    dispatchFetchPaths({
+    this.props.fetchPaths({
       path,
-      allowFoldersWithoutTrailingSlashes: true,
-      includeFiles
+      allowFoldersWithoutTrailingSlashes: true
     });
   }
 
   onClearPaths = () => {
-    // this.props.dispatchClearPaths();
+    // this.props.clearPaths();
   }
 
   onModalClose = () => {
-    this.props.dispatchClearPaths();
+    this.props.clearPaths();
     this.props.onModalClose();
   }
 
@@ -106,14 +93,9 @@ class FileBrowserModalContentConnector extends Component {
 
 FileBrowserModalContentConnector.propTypes = {
   value: PropTypes.string,
-  includeFiles: PropTypes.bool.isRequired,
-  dispatchFetchPaths: PropTypes.func.isRequired,
-  dispatchClearPaths: PropTypes.func.isRequired,
+  fetchPaths: PropTypes.func.isRequired,
+  clearPaths: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
 
-FileBrowserModalContentConnector.defaultProps = {
-  includeFiles: false
-};
-
 export default connect(createMapStateToProps, mapDispatchToProps)(FileBrowserModalContentConnector);

frontend/src/Components/FileBrowser/FileBrowserRow.css

@@ -1,5 +1,5 @@
 .type {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+  composes: cell from 'Components/Table/Cells/TableRowCell.css';
 
   width: 32px;
 }

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

@@ -3,13 +3,13 @@
 }
 
 .numberInput {
-  composes: input from '~Components/Form/TextInput.css';
+  composes: input from 'Components/Form/TextInput.css';
 
   margin-right: 3px;
 }
 
 .selectInput {
-  composes: select from '~Components/Form/SelectInput.css';
+  composes: select from 'Components/Form/SelectInput.css';
 
   margin-left: 3px;
 }

frontend/src/Components/Filter/Builder/FilterBuilderRowValue.js

@@ -3,8 +3,7 @@ import React, { Component } from 'react';
 import convertToBytes from 'Utilities/Number/convertToBytes';
 import formatBytes from 'Utilities/Number/formatBytes';
 import { kinds, filterBuilderTypes, filterBuilderValueTypes } from 'Helpers/Props';
-import tagShape from 'Helpers/Props/Shapes/tagShape';
-import TagInput from 'Components/Form/TagInput';
+import TagInput, { tagShape } from 'Components/Form/TagInput';
 import FilterBuilderRowValueTag from './FilterBuilderRowValueTag';
 
 export const NAME = 'value';

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

@@ -7,7 +7,7 @@
 }
 
 .label {
-  composes: label from '~Components/Label.css';
+  composes: label from 'Components/Label.css';
 
   border-style: none;
   font-size: 13px;

frontend/src/Components/Filter/Builder/IndexerFilterBuilderRowValueConnector.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import tagShape from 'Helpers/Props/Shapes/tagShape';
 import { fetchIndexers } from 'Store/Actions/settingsActions';
+import { tagShape } from 'Components/Form/TagInput';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 function createMapStateToProps() {

frontend/src/Components/Filter/Builder/QualityFilterBuilderRowValueConnector.js

@@ -3,8 +3,8 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import getQualities from 'Utilities/Quality/getQualities';
-import tagShape from 'Helpers/Props/Shapes/tagShape';
 import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
+import { tagShape } from 'Components/Form/TagInput';
 import FilterBuilderRowValue from './FilterBuilderRowValue';
 
 function createMapStateToProps() {

frontend/src/Components/Form/AutoCompleteInput.css

@@ -1,29 +1,34 @@
 .input {
-  composes: input from '~Components/Form/Input.css';
+  composes: input from 'Components/Form/Input.css';
 }
 
 .hasError {
-  composes: hasError from '~Components/Form/Input.css';
+  composes: hasError from 'Components/Form/Input.css';
 }
 
 .hasWarning {
-  composes: hasWarning from '~Components/Form/Input.css';
+  composes: hasWarning from 'Components/Form/Input.css';
+}
+
+.inputWrapper {
+  display: flex;
 }
 
 .inputContainer {
+  position: relative;
   flex-grow: 1;
 }
 
-.suggestionsContainer {
+.container {
   @add-mixin scrollbar;
   @add-mixin scrollbarTrack;
   @add-mixin scrollbarThumb;
 }
 
-.suggestionsContainerOpen {
-  z-index: $popperZIndex;
-
-  .suggestionsContainer {
+.inputContainerOpen {
+  .container {
+    position: absolute;
+    z-index: 1;
     overflow-y: auto;
     max-height: 200px;
     width: 100%;
@@ -34,16 +39,20 @@
   }
 }
 
-.suggestionsList {
+.list {
   margin: 5px 0;
   padding-left: 0;
   list-style-type: none;
 }
 
-.suggestion {
+.listItem {
   padding: 0 16px;
 }
 
-.suggestionHighlighted {
+.match {
+  font-weight: bold;
+}
+
+.highlighted {
   background-color: $menuItemHoverBackgroundColor;
 }

frontend/src/Components/Form/AutoCompleteInput.js

@@ -1,7 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Autosuggest from 'react-autosuggest';
+import classNames from 'classnames';
 import jdu from 'jdu';
-import AutoSuggestInput from './AutoSuggestInput';
+import styles from './AutoCompleteInput.css';
 
 class AutoCompleteInput extends Component {
 
@@ -37,6 +39,31 @@ class AutoCompleteInput extends Component {
     });
   }
 
+  onInputKeyDown = (event) => {
+    const {
+      name,
+      value,
+      onChange
+    } = this.props;
+
+    const { suggestions } = this.state;
+
+    if (
+      event.key === 'Tab' &&
+      suggestions.length &&
+      suggestions[0] !== this.props.value
+    ) {
+      event.preventDefault();
+
+      if (value) {
+        onChange({
+          name,
+          value: suggestions[0]
+        });
+      }
+    }
+  }
+
   onInputBlur = () => {
     this.setState({ suggestions: [] });
   }
@@ -61,37 +88,74 @@ class AutoCompleteInput extends Component {
 
   render() {
     const {
+      className,
+      inputClassName,
       name,
       value,
-      ...otherProps
+      placeholder,
+      hasError,
+      hasWarning
     } = this.props;
 
     const { suggestions } = this.state;
 
+    const inputProps = {
+      className: classNames(
+        inputClassName,
+        hasError && styles.hasError,
+        hasWarning && styles.hasWarning,
+      ),
+      name,
+      value,
+      placeholder,
+      autoComplete: 'off',
+      spellCheck: false,
+      onChange: this.onInputChange,
+      onKeyDown: this.onInputKeyDown,
+      onBlur: this.onInputBlur
+    };
+
+    const theme = {
+      container: styles.inputContainer,
+      containerOpen: styles.inputContainerOpen,
+      suggestionsContainer: styles.container,
+      suggestionsList: styles.list,
+      suggestion: styles.listItem,
+      suggestionHighlighted: styles.highlighted
+    };
+
     return (
-      <AutoSuggestInput
-        {...otherProps}
-        name={name}
-        value={value}
-        suggestions={suggestions}
-        getSuggestionValue={this.getSuggestionValue}
-        renderSuggestion={this.renderSuggestion}
-        onInputBlur={this.onInputBlur}
-        onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-        onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-      />
+      <div className={className}>
+        <Autosuggest
+          id={name}
+          inputProps={inputProps}
+          theme={theme}
+          suggestions={suggestions}
+          getSuggestionValue={this.getSuggestionValue}
+          renderSuggestion={this.renderSuggestion}
+          onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+          onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+        />
+      </div>
     );
   }
 }
 
 AutoCompleteInput.propTypes = {
+  className: PropTypes.string.isRequired,
+  inputClassName: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   value: PropTypes.string,
   values: PropTypes.arrayOf(PropTypes.string).isRequired,
+  placeholder: PropTypes.string,
+  hasError: PropTypes.bool,
+  hasWarning: PropTypes.bool,
   onChange: PropTypes.func.isRequired
 };
 
 AutoCompleteInput.defaultProps = {
+  className: styles.inputWrapper,
+  inputClassName: styles.input,
   value: ''
 };
 

frontend/src/Components/Form/AutoSuggestInput.js

@@ -1,257 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Autosuggest from 'react-autosuggest';
-import { Manager, Popper, Reference } from 'react-popper';
-import classNames from 'classnames';
-import Portal from 'Components/Portal';
-import styles from './AutoSuggestInput.css';
-
-class AutoSuggestInput extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this._scheduleUpdate = null;
-  }
-
-  componentDidUpdate(prevProps) {
-    if (
-      this._scheduleUpdate &&
-      prevProps.suggestions !== this.props.suggestions
-    ) {
-      this._scheduleUpdate();
-    }
-  }
-
-  //
-  // Control
-
-  renderInputComponent = (inputProps) => {
-    const { renderInputComponent } = this.props;
-
-    return (
-      <Reference>
-        {({ ref }) => {
-          if (renderInputComponent) {
-            return renderInputComponent(inputProps, ref);
-          }
-
-          return (
-            <div ref={ref}>
-              <input
-                {...inputProps}
-              />
-            </div>
-          );
-        }}
-      </Reference>
-    );
-  }
-
-  renderSuggestionsContainer = ({ containerProps, children }) => {
-    return (
-      <Portal>
-        <Popper
-          placement='bottom-start'
-          modifiers={{
-            computeMaxHeight: {
-              order: 851,
-              enabled: true,
-              fn: this.onComputeMaxHeight
-            },
-            flip: {
-              padding: this.props.minHeight
-            }
-          }}
-        >
-          {({ ref: popperRef, style, scheduleUpdate }) => {
-            this._scheduleUpdate = scheduleUpdate;
-
-            return (
-              <div
-                ref={popperRef}
-                style={style}
-                className={children ? styles.suggestionsContainerOpen : undefined}
-              >
-                <div
-                  {...containerProps}
-                  style={{
-                    maxHeight: style.maxHeight
-                  }}
-                >
-                  {children}
-                </div>
-              </div>
-            );
-          }}
-        </Popper>
-      </Portal>
-    );
-  }
-
-  //
-  // Listeners
-
-  onComputeMaxHeight = (data) => {
-    const {
-      top,
-      bottom,
-      width
-    } = data.offsets.reference;
-
-    const windowHeight = window.innerHeight;
-
-    if ((/^botton/).test(data.placement)) {
-      data.styles.maxHeight = windowHeight - bottom;
-    } else {
-      data.styles.maxHeight = top;
-    }
-
-    data.styles.width = width;
-
-    return data;
-  }
-
-  onInputChange = (event, { newValue }) => {
-    this.props.onChange({
-      name: this.props.name,
-      value: newValue
-    });
-  }
-
-  onInputKeyDown = (event) => {
-    const {
-      name,
-      value,
-      suggestions,
-      onChange
-    } = this.props;
-
-    if (
-      event.key === 'Tab' &&
-      suggestions.length &&
-      suggestions[0] !== this.props.value
-    ) {
-      event.preventDefault();
-
-      if (value) {
-        onChange({
-          name,
-          value: suggestions[0]
-        });
-      }
-    }
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      forwardedRef,
-      className,
-      inputContainerClassName,
-      name,
-      value,
-      placeholder,
-      suggestions,
-      hasError,
-      hasWarning,
-      getSuggestionValue,
-      renderSuggestion,
-      onInputChange,
-      onInputKeyDown,
-      onInputFocus,
-      onInputBlur,
-      onSuggestionsFetchRequested,
-      onSuggestionsClearRequested,
-      onSuggestionSelected,
-      ...otherProps
-    } = this.props;
-
-    const inputProps = {
-      className: classNames(
-        className,
-        hasError && styles.hasError,
-        hasWarning && styles.hasWarning,
-      ),
-      name,
-      value,
-      placeholder,
-      autoComplete: 'off',
-      spellCheck: false,
-      onChange: onInputChange || this.onInputChange,
-      onKeyDown: onInputKeyDown || this.onInputKeyDown,
-      onFocus: onInputFocus,
-      onBlur: onInputBlur
-    };
-
-    const theme = {
-      container: inputContainerClassName,
-      containerOpen: styles.suggestionsContainerOpen,
-      suggestionsContainer: styles.suggestionsContainer,
-      suggestionsList: styles.suggestionsList,
-      suggestion: styles.suggestion,
-      suggestionHighlighted: styles.suggestionHighlighted
-    };
-
-    return (
-      <Manager>
-        <Autosuggest
-          {...otherProps}
-          ref={forwardedRef}
-          id={name}
-          inputProps={inputProps}
-          theme={theme}
-          suggestions={suggestions}
-          getSuggestionValue={getSuggestionValue}
-          renderInputComponent={this.renderInputComponent}
-          renderSuggestionsContainer={this.renderSuggestionsContainer}
-          renderSuggestion={renderSuggestion}
-          onSuggestionSelected={onSuggestionSelected}
-          onSuggestionsFetchRequested={onSuggestionsFetchRequested}
-          onSuggestionsClearRequested={onSuggestionsClearRequested}
-        />
-      </Manager>
-    );
-  }
-}
-
-AutoSuggestInput.propTypes = {
-  forwardedRef: PropTypes.func,
-  className: PropTypes.string.isRequired,
-  inputContainerClassName: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
-  placeholder: PropTypes.string,
-  suggestions: PropTypes.array.isRequired,
-  hasError: PropTypes.bool,
-  hasWarning: PropTypes.bool,
-  enforceMaxHeight: PropTypes.bool.isRequired,
-  minHeight: PropTypes.number.isRequired,
-  maxHeight: PropTypes.number.isRequired,
-  getSuggestionValue: PropTypes.func.isRequired,
-  renderInputComponent: PropTypes.func,
-  renderSuggestion: PropTypes.func.isRequired,
-  onInputChange: PropTypes.func,
-  onInputKeyDown: PropTypes.func,
-  onInputFocus: PropTypes.func,
-  onInputBlur: PropTypes.func.isRequired,
-  onSuggestionsFetchRequested: PropTypes.func.isRequired,
-  onSuggestionsClearRequested: PropTypes.func.isRequired,
-  onSuggestionSelected: PropTypes.func,
-  onChange: PropTypes.func.isRequired
-};
-
-AutoSuggestInput.defaultProps = {
-  className: styles.input,
-  inputContainerClassName: styles.inputContainer,
-  enforceMaxHeight: true,
-  minHeight: 50,
-  maxHeight: 200
-};
-
-export default AutoSuggestInput;

frontend/src/Components/Form/CaptchaInput.css

@@ -3,19 +3,19 @@
 }
 
 .input {
-  composes: input from '~Components/Form/Input.css';
+  composes: input from 'Components/Form/Input.css';
 }
 
 .hasError {
-  composes: hasError from '~Components/Form/Input.css';
+  composes: hasError from 'Components/Form/Input.css';
 }
 
 .hasWarning {
-  composes: hasWarning from '~Components/Form/Input.css';
+  composes: hasWarning from 'Components/Form/Input.css';
 }
 
 .hasButton {
-  composes: hasButton from '~Components/Form/Input.css';
+  composes: hasButton from 'Components/Form/Input.css';
 }
 
 .recaptchaWrapper {

frontend/src/Components/Form/CheckInput.css

@@ -94,7 +94,7 @@
 }
 
 .helpText {
-  composes: helpText from '~Components/Form/FormInputHelpText.css';
+  composes: helpText from 'Components/Form/FormInputHelpText.css';
 
   margin-top: 8px;
   margin-left: 5px;

frontend/src/Components/Form/DeviceInput.css

@@ -2,7 +2,7 @@
   display: flex;
 }
 
-.input {
-  composes: input from '~./TagInput.css';
-  composes: hasButton from '~Components/Form/Input.css';
+.inputContainer {
+  composes: inputContainer from './TagInput.css';
+  composes: hasButton from 'Components/Form/Input.css';
 }

frontend/src/Components/Form/DeviceInput.js

@@ -1,10 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { icons } from 'Helpers/Props';
-import tagShape from 'Helpers/Props/Shapes/tagShape';
 import Icon from 'Components/Icon';
 import FormInputButton from './FormInputButton';
-import TagInput from './TagInput';
+import TagInput, { tagShape } from './TagInput';
 import styles from './DeviceInput.css';
 
 class DeviceInput extends Component {
@@ -47,7 +46,6 @@ class DeviceInput extends Component {
   render() {
     const {
       className,
-      name,
       items,
       selectedDevices,
       hasError,
@@ -59,8 +57,7 @@ class DeviceInput extends Component {
     return (
       <div className={className}>
         <TagInput
-          inputContainerClassName={styles.input}
-          name={name}
+          className={styles.inputContainer}
           tags={selectedDevices}
           tagList={items}
           allowNew={true}

frontend/src/Components/Form/EnhancedSelectInput.css

@@ -1,6 +1,10 @@
+.tether {
+  z-index: 2000;
+}
+
 .enhancedSelect {
-  composes: input from '~Components/Form/Input.css';
-  composes: link from '~Components/Link/Link.css';
+  composes: input from 'Components/Form/Input.css';
+  composes: link from 'Components/Link/Link.css';
 
   position: relative;
   display: flex;
@@ -17,11 +21,11 @@
 }
 
 .hasError {
-  composes: hasError from '~Components/Form/Input.css';
+  composes: hasError from 'Components/Form/Input.css';
 }
 
 .hasWarning {
-  composes: hasWarning from '~Components/Form/Input.css';
+  composes: hasWarning from 'Components/Form/Input.css';
 }
 
 .isDisabled {
@@ -40,13 +44,10 @@
 }
 
 .optionsContainer {
-  z-index: $popperZIndex;
   width: auto;
 }
 
 .options {
-  composes: scroller from '~Components/Scroller/Scroller.css';
-
   border: 1px solid $inputBorderColor;
   border-radius: 4px;
   background-color: $white;
@@ -61,7 +62,7 @@
 }
 
 .optionsModalBody {
-  composes: modalBody from '~Components/Modal/ModalBody.css';
+  composes: modalBody from 'Components/Modal/ModalBody.css';
 
   display: flex;
   justify-content: center;
@@ -70,7 +71,7 @@
 }
 
 .optionsModalScroller {
-  composes: scroller from '~Components/Scroller/Scroller.css';
+  composes: scroller from 'Components/Scroller/Scroller.css';
 
   border: 1px solid $inputBorderColor;
   border-radius: 4px;

frontend/src/Components/Form/EnhancedSelectInput.js

@@ -1,23 +1,35 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { Manager, Popper, Reference } from 'react-popper';
+import ReactDOM from 'react-dom';
+import TetherComponent from 'react-tether';
 import classNames from 'classnames';
-import getUniqueElememtId from 'Utilities/getUniqueElementId';
 import isMobileUtil from 'Utilities/isMobile';
 import * as keyCodes from 'Utilities/Constants/keyCodes';
-import { icons, sizes, scrollDirections } from 'Helpers/Props';
+import { icons, scrollDirections } from 'Helpers/Props';
 import Icon from 'Components/Icon';
-import Portal from 'Components/Portal';
 import Link from 'Components/Link/Link';
 import Measure from 'Components/Measure';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
 import Scroller from 'Components/Scroller/Scroller';
-import HintedSelectInputSelectedValue from './HintedSelectInputSelectedValue';
-import HintedSelectInputOption from './HintedSelectInputOption';
+import EnhancedSelectInputSelectedValue from './EnhancedSelectInputSelectedValue';
+import EnhancedSelectInputOption from './EnhancedSelectInputOption';
 import styles from './EnhancedSelectInput.css';
 
+const tetherOptions = {
+  skipMoveElement: true,
+  constraints: [
+    {
+      to: 'window',
+      attachment: 'together',
+      pin: true
+    }
+  ],
+  attachment: 'top left',
+  targetAttachment: 'bottom left'
+};
+
 function isArrowKey(keyCode) {
   return keyCode === keyCodes.UP_ARROW || keyCode === keyCodes.DOWN_ARROW;
 }
@@ -75,10 +87,6 @@ class EnhancedSelectInput extends Component {
   constructor(props, context) {
     super(props, context);
 
-    this._scheduleUpdate = null;
-    this._buttonId = getUniqueElememtId();
-    this._optionsId = getUniqueElememtId();
-
     this.state = {
       isOpen: false,
       selectedIndex: getSelectedIndex(props),
@@ -88,10 +96,6 @@ class EnhancedSelectInput extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (this._scheduleUpdate) {
-      this._scheduleUpdate();
-    }
-
     if (prevProps.value !== this.props.value) {
       this.setState({
         selectedIndex: getSelectedIndex(this.props)
@@ -102,6 +106,14 @@ class EnhancedSelectInput extends Component {
   //
   // Control
 
+  _setButtonRef = (ref) => {
+    this._buttonRef = ref;
+  }
+
+  _setOptionsRef = (ref) => {
+    this._optionsRef = ref;
+  }
+
   _addListener() {
     window.addEventListener('click', this.onWindowClick);
   }
@@ -113,26 +125,9 @@ class EnhancedSelectInput extends Component {
   //
   // Listeners
 
-  onComputeMaxHeight = (data) => {
-    const {
-      top,
-      bottom
-    } = data.offsets.reference;
-
-    const windowHeight = window.innerHeight;
-
-    if ((/^botton/).test(data.placement)) {
-      data.styles.maxHeight = windowHeight - bottom;
-    } else {
-      data.styles.maxHeight = top;
-    }
-
-    return data;
-  }
-
   onWindowClick = (event) => {
-    const button = document.getElementById(this._buttonId);
-    const options = document.getElementById(this._optionsId);
+    const button = ReactDOM.findDOMNode(this._buttonRef);
+    const options = ReactDOM.findDOMNode(this._optionsRef);
 
     if (!button || this.state.isMobile) {
       return;
@@ -150,11 +145,9 @@ class EnhancedSelectInput extends Component {
   }
 
   onBlur = () => {
-    // Calling setState without this check prevents the click event from being properly handled on Chrome (it is on firefox)
-    const origIndex = getSelectedIndex(this.props);
-    if (origIndex !== this.state.selectedIndex) {
-      this.setState({ selectedIndex: origIndex });
-    }
+    this.setState({
+      selectedIndex: getSelectedIndex(this.props)
+    });
   }
 
   onKeyDown = (event) => {
@@ -278,116 +271,85 @@ class EnhancedSelectInput extends Component {
 
     return (
       <div>
-        <Manager>
-          <Reference>
-            {({ ref }) => (
-              <div
-                ref={ref}
-                id={this._buttonId}
-              >
-                <Measure
-                  whitelist={['width']}
-                  onMeasure={this.onMeasure}
-                >
-                  <Link
-                    className={classNames(
-                      className,
-                      hasError && styles.hasError,
-                      hasWarning && styles.hasWarning,
-                      isDisabled && disabledClassName
-                    )}
-                    isDisabled={isDisabled}
-                    onBlur={this.onBlur}
-                    onKeyDown={this.onKeyDown}
-                    onPress={this.onPress}
-                  >
-                    <SelectedValueComponent
-                      {...selectedValueOptions}
-                      {...selectedOption}
-                      isDisabled={isDisabled}
-                    >
-                      {selectedOption ? selectedOption.value : null}
-                    </SelectedValueComponent>
-
-                    <div
-                      className={isDisabled ?
-                        styles.dropdownArrowContainerDisabled :
-                        styles.dropdownArrowContainer
-                      }
-                    >
-                      <Icon
-                        name={icons.CARET_DOWN}
-                      />
-                    </div>
-                  </Link>
-                </Measure>
-              </div>
-            )}
-          </Reference>
-          <Portal>
-            <Popper
-              placement="bottom-start"
-              modifiers={{
-                computeMaxHeight: {
-                  order: 851,
-                  enabled: true,
-                  fn: this.onComputeMaxHeight
-                }
-              }}
+        <TetherComponent
+          classes={{
+            element: styles.tether
+          }}
+          {...tetherOptions}
+        >
+          <Measure
+            whitelist={['width']}
+            onMeasure={this.onMeasure}
+          >
+            <Link
+              ref={this._setButtonRef}
+              className={classNames(
+                className,
+                hasError && styles.hasError,
+                hasWarning && styles.hasWarning,
+                isDisabled && disabledClassName
+              )}
+              isDisabled={isDisabled}
+              onBlur={this.onBlur}
+              onKeyDown={this.onKeyDown}
+              onPress={this.onPress}
             >
-              {({ ref, style, scheduleUpdate }) => {
-                this._scheduleUpdate = scheduleUpdate;
+              <SelectedValueComponent
+                {...selectedValueOptions}
+                {...selectedOption}
+                isDisabled={isDisabled}
+              >
+                {selectedOption ? selectedOption.value : null}
+              </SelectedValueComponent>
 
-                return (
-                  <div
-                    ref={ref}
-                    id={this._optionsId}
-                    className={styles.optionsContainer}
-                    style={{
-                      ...style,
-                      minWidth: width
-                    }}
-                  >
-                    {
-                      isOpen && !isMobile ?
-                        <Scroller
-                          className={styles.options}
-                          style={{
-                            maxHeight: style.maxHeight
-                          }}
+              <div
+                className={isDisabled ?
+                  styles.dropdownArrowContainerDisabled :
+                  styles.dropdownArrowContainer
+                }
+              >
+                <Icon
+                  name={icons.CARET_DOWN}
+                />
+              </div>
+            </Link>
+          </Measure>
+
+          {
+            isOpen && !isMobile &&
+              <div
+                ref={this._setOptionsRef}
+                className={styles.optionsContainer}
+                style={{
+                  minWidth: width
+                }}
+              >
+                <div className={styles.options}>
+                  {
+                    values.map((v, index) => {
+                      return (
+                        <OptionComponent
+                          key={v.key}
+                          id={v.key}
+                          isSelected={index === selectedIndex}
+                          {...v}
+                          isMobile={false}
+                          onSelect={this.onSelect}
                         >
-                          {
-                            values.map((v, index) => {
-                              return (
-                                <OptionComponent
-                                  key={v.key}
-                                  id={v.key}
-                                  isSelected={index === selectedIndex}
-                                  {...v}
-                                  isMobile={false}
-                                  onSelect={this.onSelect}
-                                >
-                                  {v.value}
-                                </OptionComponent>
-                              );
-                            })
-                          }
-                        </Scroller> :
-                        null
-                    }
-                  </div>
-                );
-              }
-              }
-            </Popper>
-          </Portal>
-        </Manager>
+                          {v.value}
+                        </OptionComponent>
+                      );
+                    })
+                  }
+                </div>
+              </div>
+          }
+        </TetherComponent>
 
         {
           isMobile &&
             <Modal
               className={styles.optionsModal}
-              size={sizes.EXTRA_SMALL}
               isOpen={isOpen}
               onModalClose={this.onOptionsModalClose}
             >
@@ -442,8 +404,8 @@ EnhancedSelectInput.defaultProps = {
   disabledClassName: styles.isDisabled,
   isDisabled: false,
   selectedValueOptions: {},
-  selectedValueComponent: HintedSelectInputSelectedValue,
-  optionComponent: HintedSelectInputOption
+  selectedValueComponent: EnhancedSelectInputSelectedValue,
+  optionComponent: EnhancedSelectInputOption
 };
 
 export default EnhancedSelectInput;

frontend/src/Components/Form/EnhancedSelectInputOption.css

@@ -7,17 +7,13 @@
   cursor: default;
 
   &:hover {
-    background-color: #f8f8f8;
+    background-color: #f9f9f9;
   }
 }
 
 .isSelected {
   background-color: #e2e2e2;
 
-  &:hover {
-    background-color: #e2e2e2;
-  }
-
   &.isMobile {
     background-color: inherit;
 

frontend/src/Components/Form/Form.css

@@ -1,3 +0,0 @@
-.validationFailures {
-  margin-bottom: 20px;
-}

frontend/src/Components/Form/Form.js

@@ -2,42 +2,37 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { kinds } from 'Helpers/Props';
 import Alert from 'Components/Alert';
-import styles from './Form.css';
 
 function Form({ children, validationErrors, validationWarnings, ...otherProps }) {
   return (
     <div>
-      {
-        validationErrors.length || validationWarnings.length ?
-          <div className={styles.validationFailures}>
-            {
-              validationErrors.map((error, index) => {
-                return (
-                  <Alert
-                    key={index}
-                    kind={kinds.DANGER}
-                  >
-                    {error.errorMessage}
-                  </Alert>
-                );
-              })
-            }
+      <div>
+        {
+          validationErrors.map((error, index) => {
+            return (
+              <Alert
+                key={index}
+                kind={kinds.DANGER}
+              >
+                {error.errorMessage}
+              </Alert>
+            );
+          })
+        }
 
-            {
-              validationWarnings.map((warning, index) => {
-                return (
-                  <Alert
-                    key={index}
-                    kind={kinds.WARNING}
-                  >
-                    {warning.errorMessage}
-                  </Alert>
-                );
-              })
-            }
-          </div> :
-          null
-      }
+        {
+          validationWarnings.map((warning, index) => {
+            return (
+              <Alert
+                key={index}
+                kind={kinds.WARNING}
+              >
+                {warning.errorMessage}
+              </Alert>
+            );
+          })
+        }
+      </div>
 
       {children}
     </div>

frontend/src/Components/Form/FormInputButton.css

@@ -1,5 +1,5 @@
 .button {
-  composes: button from '~Components/Link/Button.css';
+  composes: button from 'Components/Link/Button.css';
 
   border-left: none;
   border-top-left-radius: 0;

frontend/src/Components/Form/FormInputGroup.css

@@ -1,6 +1,5 @@
 .inputGroupContainer {
   flex: 1 1 auto;
-  min-width: 0;
 }
 
 .inputGroup {
@@ -12,7 +11,6 @@
 .inputContainer {
   position: relative;
   flex: 1 1 auto;
-  min-width: 0;
 }
 
 .inputUnit {

frontend/src/Components/Form/FormInputGroup.js

@@ -16,7 +16,7 @@ import QualityProfileSelectInputConnector from './QualityProfileSelectInputConne
 import LanguageProfileSelectInputConnector from './LanguageProfileSelectInputConnector';
 import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
 import SeriesTypeSelectInput from './SeriesTypeSelectInput';
-import EnhancedSelectInput from './EnhancedSelectInput';
+import SelectInput from './SelectInput';
 import TagInputConnector from './TagInputConnector';
 import TextTagInputConnector from './TextTagInputConnector';
 import TextInput from './TextInput';
@@ -65,7 +65,7 @@ function getComponent(type) {
       return RootFolderSelectInputConnector;
 
     case inputTypes.SELECT:
-      return EnhancedSelectInput;
+      return SelectInput;
 
     case inputTypes.SERIES_TYPE_SELECT:
       return SeriesTypeSelectInput;

frontend/src/Components/Form/FormInputHelpText.css

@@ -33,7 +33,7 @@
 }
 
 .link {
-  composes: link from '~Components/Link/Link.css';
+  composes: link from 'Components/Link/Link.css';
 
   margin-left: 5px;
 }

frontend/src/Components/Form/HintedSelectInputOption.css

@@ -1,23 +0,0 @@
-.optionText {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex: 1 0 0;
-  min-width: 0;
-
-  &.isMobile {
-    display: block;
-
-    .hintText {
-      margin-left: 0;
-    }
-  }
-}
-
-.hintText {
-  @add-mixin truncate;
-
-  margin-left: 15px;
-  color: $darkGray;
-  font-size: $smallFontSize;
-}

frontend/src/Components/Form/HintedSelectInputOption.js

@@ -1,44 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-import EnhancedSelectInputOption from './EnhancedSelectInputOption';
-import styles from './HintedSelectInputOption.css';
-
-function HintedSelectInputOption(props) {
-  const {
-    value,
-    hint,
-    isMobile,
-    ...otherProps
-  } = props;
-
-  return (
-    <EnhancedSelectInputOption
-      isMobile={isMobile}
-      {...otherProps}
-    >
-      <div className={classNames(
-        styles.optionText,
-        isMobile && styles.isMobile
-      )}
-      >
-        <div>{value}</div>
-
-        {
-          hint != null &&
-            <div className={styles.hintText}>
-              {hint}
-            </div>
-        }
-      </div>
-    </EnhancedSelectInputOption>
-  );
-}
-
-HintedSelectInputOption.propTypes = {
-  value: PropTypes.string.isRequired,
-  hint: PropTypes.node,
-  isMobile: PropTypes.bool.isRequired
-};
-
-export default HintedSelectInputOption;

frontend/src/Components/Form/HintedSelectInputSelectedValue.css

@@ -1,24 +0,0 @@
-.selectedValue {
-  composes: selectedValue from '~./EnhancedSelectInputSelectedValue.css';
-
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  overflow: hidden;
-}
-
-.valueText {
-  @add-mixin truncate;
-
-  flex: 0 0 auto;
-}
-
-.hintText {
-  @add-mixin truncate;
-
-  flex: 1 10 0;
-  margin-left: 15px;
-  color: $gray;
-  text-align: right;
-  font-size: $smallFontSize;
-}