diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd50b5..781f3dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,20 @@ # Changelog + +## 1.3.3 + +* \#49: Download progress is not visible if dependencies are missing +* \#51: javascript error +* \#52: Mount location is not set error on new install +* \#53: Busy notification is still visible when 'Install' button is available + ## 1.3.2 + * \#48: Support pinning files to cache * Fixed Skynet export display * Properly detect existing remote * Reduced number of Linux binaries to: - * CentOS 7 - * Solus + * CentOS 7 + * Solus * S3 mount support [disabled] ## 1.3.1 diff --git a/src/App.jsx b/src/App.jsx index ec9708e..415f0a7 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -98,7 +98,7 @@ class App extends IPCContainer { !this.props.DownloadActive && (selectedVersion !== 'unavailable') && (selectedVersion !== this.props.InstalledVersion); - + console.log(selectedVersion); const missingDependencies = (this.props.MissingDependencies.length > 0) && this.props.AllowMount; @@ -230,7 +230,7 @@ class App extends IPCContainer { skynetSupported={skynetSupported}/> )); - } else if (selectedVersion !== 'unavailable') { + } else if (!downloadEnabled && (selectedVersion !== 'unavailable')) { mainContent.push(( diff --git a/src/components/NewReleases/NewRelease/NewRelease.js b/src/components/NewReleases/NewRelease/NewRelease.js index 0ad4fec..a8ea41a 100644 --- a/src/components/NewReleases/NewRelease/NewRelease.js +++ b/src/components/NewReleases/NewRelease/NewRelease.js @@ -9,6 +9,12 @@ import { } from '../../../redux/actions/error_actions'; import {installReleaseByVersion} from '../../../redux/actions/install_actions'; +const mapStateToProps = state => { + return { + AllowInstall: state.install.MissingDependencies.length === 0, + }; +}; + const mapDispatchToProps = dispatch => { return { installReleaseByVersion: (release, version) => dispatch(installReleaseByVersion(release, version)), @@ -17,7 +23,15 @@ const mapDispatchToProps = dispatch => { }; }; -export default connect(null, mapDispatchToProps)(({dismiss, release, lastItem, notifyError, notifyInfo, installReleaseByVersion}) => { +export default connect(mapStateToProps, mapDispatchToProps)(({ + AllowInstall, + dismiss, + release, + lastItem, + notifyError, + notifyInfo, + installReleaseByVersion + }) => { const title = '[' + Constants.RELEASE_TYPES[release.Release] + '] ' + release.Display; const installReleaseVersion = () => { dismiss(); @@ -46,7 +60,9 @@ export default connect(null, mapDispatchToProps)(({dismiss, release, lastItem, n
- + {AllowInstall ? + : null} {lastItem ? null : } diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js index b9f77fa..c8131dd 100644 --- a/src/containers/MountItems/MountItems.js +++ b/src/containers/MountItems/MountItems.js @@ -304,15 +304,12 @@ class MountItems extends IPCContainer { const providerState = this.props.ProviderState[provider]; if (location.length === 0) { location = (this.props.Platform === 'win32') ? - providerState.MountLocation || driveLetters[0] : + !providerState.MountLocation || providerState.MountLocation.trim().length === 0 ? driveLetters[0] : providerState.MountLocation : providerState.MountLocation; } if (location !== providerState.MountLocation) { - const value = (this.props.Platform === 'win32') ? - driveLetters.indexOf(location) : - location; - this.handleMountLocationChanged(provider, value); + this.handleMountLocationChanged(provider, location); } if (!this.props.AutoMountProcessed[provider] && diff --git a/src/helpers.js b/src/helpers.js index 8457149..7346e4d 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -188,7 +188,7 @@ const _execProcessGetOutput = (cmd, working, args) => { } const proc = spawn(cmd, args, processOptions); - let output; + let output = ''; proc.stdout.on('data', data => { output += data.toString(); }); proc.on('error', (err) => { reject(err); });