From eedaa2a7b8d37e618879d1c928f70d545dd30aba Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 11 Nov 2018 00:14:39 -0500 Subject: [PATCH] Fixed: OS specific paths for import artist tip --- .../SelectFolder/ImportArtistSelectFolder.js | 4 +++- .../SelectFolder/ImportArtistSelectFolderConnector.js | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolder.js b/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolder.js index c186469e8..691ac76b4 100644 --- a/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolder.js +++ b/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolder.js @@ -68,6 +68,7 @@ class ImportArtistSelectFolder extends Component { render() { const { + isWindows, isFetching, isPopulated, error, @@ -98,7 +99,7 @@ class ImportArtistSelectFolder extends Component { Some tips to ensure the import goes smoothly: @@ -172,6 +173,7 @@ class ImportArtistSelectFolder extends Component { } ImportArtistSelectFolder.propTypes = { + isWindows: PropTypes.bool.isRequired, isFetching: PropTypes.bool.isRequired, isPopulated: PropTypes.bool.isRequired, error: PropTypes.object, diff --git a/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolderConnector.js b/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolderConnector.js index 10d010903..00e9afc98 100644 --- a/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolderConnector.js +++ b/frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolderConnector.js @@ -4,14 +4,19 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { push } from 'react-router-redux'; +import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector'; import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions'; import ImportArtistSelectFolder from './ImportArtistSelectFolder'; function createMapStateToProps() { return createSelector( (state) => state.rootFolders, - (rootFolders) => { - return rootFolders; + createSystemStatusSelector(), + (rootFolders, systemStatus) => { + return { + ...rootFolders, + isWindows: systemStatus.isWindows + }; } ); }