Fixed: Filter mapped drives when running from service

This commit is contained in:
Qstick 2018-09-04 22:38:48 -04:00
parent 70dc4d86dc
commit 68aaa49e9f
6 changed files with 51 additions and 4 deletions

View file

@ -5,6 +5,18 @@
flex-direction: column;
}
.mappedDrivesWarning {
composes: alert from 'Components/Alert.css';
margin: 0;
margin-bottom: 20px;
}
.faqLink {
color: $alertWarningColor;
font-weight: bold;
}
.pathInput {
composes: pathInputWrapper from 'Components/Form/PathInput.css';

View file

@ -1,8 +1,10 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import { scrollDirections } from 'Helpers/Props';
import { kinds, scrollDirections } from 'Helpers/Props';
import Alert from 'Components/Alert';
import Button from 'Components/Link/Button';
import Link from 'Components/Link/Link';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
@ -101,6 +103,7 @@ class FileBrowserModalContent extends Component {
parent,
directories,
files,
isWindowsService,
onModalClose,
...otherProps
} = this.props;
@ -119,6 +122,16 @@ class FileBrowserModalContent extends Component {
className={styles.modalBody}
scrollDirection={scrollDirections.NONE}
>
{
isWindowsService &&
<Alert
className={styles.mappedDrivesWarning}
kind={kinds.WARNING}
>
Mapped network drives are not available when running as a Windows Service, see the <Link className={styles.faqLink} to="https://github.com/Lidarr/Lidarr/wiki/FAQ">FAQ</Link> for more information.
</Alert>
}
<PathInput
className={styles.pathInput}
placeholder="Start typing or select a path below"
@ -230,6 +243,7 @@ FileBrowserModalContent.propTypes = {
currentPath: PropTypes.string.isRequired,
directories: PropTypes.arrayOf(PropTypes.object).isRequired,
files: PropTypes.arrayOf(PropTypes.object).isRequired,
isWindowsService: PropTypes.bool.isRequired,
onFetchPaths: PropTypes.func.isRequired,
onClearPaths: PropTypes.func.isRequired,
onChange: PropTypes.func.isRequired,

View file

@ -4,12 +4,14 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchPaths, clearPaths } from 'Store/Actions/pathActions';
import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
import FileBrowserModalContent from './FileBrowserModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.paths,
(paths) => {
createSystemStatusSelector(),
(paths, systemStatus) => {
const {
isFetching,
isPopulated,
@ -32,7 +34,8 @@ function createMapStateToProps() {
currentPath,
directories,
files,
paths: filteredPaths
paths: filteredPaths,
isWindowsService: true || systemStatus.isWindows && systemStatus.mode === 'service'
};
}
);