Merge remote-tracking branch 'Sonarr/phantom-develop' into phantom-develop

Author: tingtom

frontend/src/Activity/History/HistoryConnector.js

@@ -8,6 +8,7 @@ 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() {
@@ -28,7 +29,8 @@ function createMapStateToProps() {
 const mapDispatchToProps = {
   ...historyActions,
   fetchEpisodes,
-  clearEpisodes
+  clearEpisodes,
+  clearEpisodeFiles
 };
 
 class HistoryConnector extends Component {
@@ -68,6 +70,7 @@ class HistoryConnector extends Component {
     unregisterPagePopulator(this.repopulate);
     this.props.clearHistory();
     this.props.clearEpisodes();
+    this.props.clearEpisodeFiles();
   }
 
   //
@@ -150,7 +153,8 @@ HistoryConnector.propTypes = {
   setHistoryTableOption: PropTypes.func.isRequired,
   clearHistory: PropTypes.func.isRequired,
   fetchEpisodes: PropTypes.func.isRequired,
-  clearEpisodes: PropTypes.func.isRequired
+  clearEpisodes: PropTypes.func.isRequired,
+  clearEpisodeFiles: PropTypes.func.isRequired
 };
 
 export default withCurrentPage(

frontend/src/Activity/Queue/QueueStatusCell.js

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

frontend/src/Books/Details/SeriesDetailsSeason.css

@@ -74,13 +74,19 @@
 }
 
 .collapseButtonContainer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   padding: 10px 15px;
   width: 100%;
   border-top: 1px solid $borderColor;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
   background-color: #fafafa;
-  text-align: center;
+}
+
+.collapseButtonIcon {
+  margin-bottom: -4px;
 }
 
 .expandButtonIcon {

frontend/src/Books/Details/SeriesDetailsSeason.js

@@ -456,6 +456,7 @@ class SeriesDetailsSeason extends Component {
                 }
                 <div className={styles.collapseButtonContainer}>
                   <IconButton
+                    iconClassName={styles.collapseButtonIcon}
                     name={icons.COLLAPSE}
                     size={20}
                     title="Hide episodes"

frontend/src/Components/Tooltip/Tooltip.js

@@ -35,6 +35,33 @@ class Tooltip extends Component {
     }
   }
 
+  //
+  // Control
+
+  computeMaxSize = (data) => {
+    const {
+      top,
+      right,
+      bottom,
+      left
+    } = data.offsets.reference;
+
+    const windowWidth = window.innerWidth;
+    const windowHeight = window.innerHeight;
+
+    if ((/^top/).test(data.placement)) {
+      data.styles.maxHeight = top - 20;
+    } else if ((/^bottom/).test(data.placement)) {
+      data.styles.maxHeight = windowHeight - bottom - 20;
+    } else if ((/^right/).test(data.placement)) {
+      data.styles.maxWidth = windowWidth - right - 30;
+    } else {
+      data.styles.maxWidth = left - 30;
+    }
+
+    return data;
+  }
+
   //
   // Listeners
 
@@ -72,7 +99,8 @@ class Tooltip extends Component {
       anchor,
       tooltip,
       kind,
-      position
+      position,
+      canFlip
     } = this.props;
 
     return (
@@ -98,10 +126,18 @@ class Tooltip extends Component {
             // are shown (Quality Definitions for example).
             eventsEnabled={false}
             modifiers={{
+              computeMaxHeight: {
+                order: 851,
+                enabled: true,
+                fn: this.computeMaxSize
+              },
               preventOverflow: {
               // Fixes positioning for tooltips in the queue
               // and likely others.
                 escapeWithReference: true
+              },
+              flip: {
+                enabled: canFlip
               }
             }}
           >
@@ -132,7 +168,9 @@ class Tooltip extends Component {
                           )}
                         />
 
-                        <div className={bodyClassName}>
+                        <div
+                          className={bodyClassName}
+                        >
                           {tooltip}
                         </div>
                       </div> :
@@ -154,13 +192,15 @@ Tooltip.propTypes = {
   anchor: PropTypes.node.isRequired,
   tooltip: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   kind: PropTypes.oneOf([kinds.DEFAULT, kinds.INVERSE]),
-  position: PropTypes.oneOf(tooltipPositions.all)
+  position: PropTypes.oneOf(tooltipPositions.all),
+  canFlip: PropTypes.bool.isRequired
 };
 
 Tooltip.defaultProps = {
   bodyClassName: styles.body,
   kind: kinds.DEFAULT,
-  position: tooltipPositions.TOP
+  position: tooltipPositions.TOP,
+  canFlip: true
 };
 
 export default Tooltip;

frontend/src/Episode/Summary/EpisodeSummaryConnector.js

@@ -1,6 +1,8 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { deleteEpisodeFile } from 'Store/Actions/episodeFileActions';
+import { fetchEpisodeFile, deleteEpisodeFile } from 'Store/Actions/episodeFileActions';
 import createEpisodeSelector from 'Store/Selectors/createEpisodeSelector';
 import createEpisodeFileSelector from 'Store/Selectors/createEpisodeFileSelector';
 import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
@@ -52,8 +54,50 @@ function createMapDispatchToProps(dispatch, props) {
         id: props.episodeFileId,
         episodeEntity: props.episodeEntity
       }));
+    },
+
+    dispatchFetchEpisodeFile() {
+      dispatch(fetchEpisodeFile({
+        id: props.episodeFileId
+      }));
     }
   };
 }
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(EpisodeSummary);
+class EpisodeSummaryConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    const {
+      episodeFileId,
+      path,
+      dispatchFetchEpisodeFile
+    } = this.props;
+
+    if (episodeFileId && !path) {
+      dispatchFetchEpisodeFile({ id: episodeFileId });
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      dispatchFetchEpisodeFile,
+      ...otherProps
+    } = this.props;
+
+    return <EpisodeSummary {...otherProps} />;
+  }
+}
+
+EpisodeSummaryConnector.propTypes = {
+  episodeFileId: PropTypes.number,
+  path: PropTypes.string,
+  dispatchFetchEpisodeFile: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, createMapDispatchToProps)(EpisodeSummaryConnector);

frontend/src/Store/Actions/episodeFileActions.js

@@ -31,6 +31,7 @@ export const defaultState = {
 //
 // Actions Types
 
+export const FETCH_EPISODE_FILE = 'episodeFiles/fetchEpisodeFile';
 export const FETCH_EPISODE_FILES = 'episodeFiles/fetchEpisodeFiles';
 export const DELETE_EPISODE_FILE = 'episodeFiles/deleteEpisodeFile';
 export const DELETE_EPISODE_FILES = 'episodeFiles/deleteEpisodeFiles';
@@ -40,6 +41,7 @@ export const CLEAR_EPISODE_FILES = 'episodeFiles/clearEpisodeFiles';
 //
 // Action Creators
 
+export const fetchEpisodeFile = createThunk(FETCH_EPISODE_FILE);
 export const fetchEpisodeFiles = createThunk(FETCH_EPISODE_FILES);
 export const deleteEpisodeFile = createThunk(DELETE_EPISODE_FILE);
 export const deleteEpisodeFiles = createThunk(DELETE_EPISODE_FILES);
@@ -55,6 +57,7 @@ const deleteEpisodeFileHelper = createRemoveItemHandler(section, '/episodeFile')
 // Action Handlers
 
 export const actionHandlers = handleThunks({
+  [FETCH_EPISODE_FILE]: createFetchHandler(section, '/episodeFile'),
   [FETCH_EPISODE_FILES]: createFetchHandler(section, '/episodeFile'),
 
   [DELETE_EPISODE_FILE]: function(getState, payload, dispatch) {

frontend/src/Styles/globals.css

@@ -1,7 +1,6 @@
 /* stylelint-disable */
 
-@import '~normalize.css/normalize.css';
-@import 'scaffolding.css';
-@import '/Content/Fonts/fonts.css';
+@import "~normalize.css/normalize.css";
+@import "scaffolding.css";
 
 /* stylelint-enable */

frontend/src/index.html

@@ -1,28 +1,54 @@
 <!DOCTYPE html>
 <html lang="en">
-
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <meta name="mobile-web-app-capable" content="yes"/>
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
 
     <!-- Chrome, Opera, and Firefox OS -->
-    <meta name="theme-color" content="#3a3f51"/>
+    <meta name="theme-color" content="#3a3f51" />
     <!-- Windows Phone -->
-    <meta name="msapplication-navbutton-color" content="#3a3f51"/>
+    <meta name="msapplication-navbutton-color" content="#3a3f51" />
 
     <meta name="description" content="Readarr">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="/Content/Images/Icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/Content/Images/Icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/Content/Images/Icons/favicon-16x16.png">
-    <link rel="manifest" href="/Content/Images/Icons/manifest.json">
-    <link rel="mask-icon" href="/Content/Images/Icons/safari-pinned-tab.svg" color="#00ccff">
-    <link rel="shortcut icon" type="image/ico" href="/favicon.ico" data-no-hash />
-    <meta name="msapplication-config" content="/Content/Images/Icons/browserconfig.xml">
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="/Content/Images/Icons/apple-touch-icon.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="/Content/Images/Icons/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="/Content/Images/Icons/favicon-16x16.png"
+    />
+    <link rel="manifest" href="/Content/Images/Icons/manifest.json" />
+    <link
+      rel="mask-icon"
+      href="/Content/Images/Icons/safari-pinned-tab.svg"
+      color="#00ccff"
+    />
+    <link
+      rel="shortcut icon"
+      type="image/ico"
+      href="/favicon.ico"
+      data-no-hash
+    />
+    <meta
+      name="msapplication-config"
+      content="/Content/Images/Icons/browserconfig.xml"
+    />
 
-    <link rel="stylesheet" type="text/css" href="/Content/styles.css">
+    <link rel="stylesheet" type="text/css" href="/Content/styles.css" />
+    <link rel="stylesheet" type="text/css" href="/Content/Fonts/fonts.css" />
 
     <title>Readarr</title>
 
@@ -57,5 +83,4 @@
   <script src="/vendor.js"></script>
   <script src="/preload.js"></script>
   <script src="/index.js"></script>
-
 </html>