[#52: Mount location is not set error on new install] [#49: Download progress is not visible if dependencies are missing] [#51: javascript error] [#53: Busy notification is still visible when 'Install' button is available]

This commit is contained in:
2021-03-08 16:25:06 -06:00
parent ef5ae37656
commit 721a08c33f
5 changed files with 34 additions and 12 deletions

View File

@@ -1,5 +1,14 @@
# Changelog # 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 ## 1.3.2
* \#48: Support pinning files to cache * \#48: Support pinning files to cache
* Fixed Skynet export display * Fixed Skynet export display
* Properly detect existing remote * Properly detect existing remote

View File

@@ -98,7 +98,7 @@ class App extends IPCContainer {
!this.props.DownloadActive && !this.props.DownloadActive &&
(selectedVersion !== 'unavailable') && (selectedVersion !== 'unavailable') &&
(selectedVersion !== this.props.InstalledVersion); (selectedVersion !== this.props.InstalledVersion);
console.log(selectedVersion);
const missingDependencies = (this.props.MissingDependencies.length > 0) && const missingDependencies = (this.props.MissingDependencies.length > 0) &&
this.props.AllowMount; this.props.AllowMount;
@@ -230,7 +230,7 @@ class App extends IPCContainer {
skynetSupported={skynetSupported}/> skynetSupported={skynetSupported}/>
</Box> </Box>
)); ));
} else if (selectedVersion !== 'unavailable') { } else if (!downloadEnabled && (selectedVersion !== 'unavailable')) {
mainContent.push(( mainContent.push((
<Box dxStyle={{padding: 'var(--default_spacing)', height: '170px'}} <Box dxStyle={{padding: 'var(--default_spacing)', height: '170px'}}
key={'md_' + key++}> key={'md_' + key++}>

View File

@@ -9,6 +9,12 @@ import {
} from '../../../redux/actions/error_actions'; } from '../../../redux/actions/error_actions';
import {installReleaseByVersion} from '../../../redux/actions/install_actions'; import {installReleaseByVersion} from '../../../redux/actions/install_actions';
const mapStateToProps = state => {
return {
AllowInstall: state.install.MissingDependencies.length === 0,
};
};
const mapDispatchToProps = dispatch => { const mapDispatchToProps = dispatch => {
return { return {
installReleaseByVersion: (release, version) => dispatch(installReleaseByVersion(release, version)), 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 title = '[' + Constants.RELEASE_TYPES[release.Release] + '] ' + release.Display;
const installReleaseVersion = () => { const installReleaseVersion = () => {
dismiss(); dismiss();
@@ -46,7 +60,9 @@ export default connect(null, mapDispatchToProps)(({dismiss, release, lastItem, n
<div style={{width: 'var(--default_spacing)'}}/> <div style={{width: 'var(--default_spacing)'}}/>
</td> </td>
<td width="50%"> <td width="50%">
<Button buttonStyles={{width: '100%'}} clicked={installReleaseVersion}>Install</Button> {AllowInstall ?
<Button buttonStyles={{width: '100%'}}
clicked={installReleaseVersion}>Install</Button> : null}
</td> </td>
</tr> </tr>
{lastItem ? null : <tr style={{height: 'var(--default_spacing)'}}/>} {lastItem ? null : <tr style={{height: 'var(--default_spacing)'}}/>}

View File

@@ -304,15 +304,12 @@ class MountItems extends IPCContainer {
const providerState = this.props.ProviderState[provider]; const providerState = this.props.ProviderState[provider];
if (location.length === 0) { if (location.length === 0) {
location = (this.props.Platform === 'win32') ? location = (this.props.Platform === 'win32') ?
providerState.MountLocation || driveLetters[0] : !providerState.MountLocation || providerState.MountLocation.trim().length === 0 ? driveLetters[0] : providerState.MountLocation :
providerState.MountLocation; providerState.MountLocation;
} }
if (location !== providerState.MountLocation) { if (location !== providerState.MountLocation) {
const value = (this.props.Platform === 'win32') ? this.handleMountLocationChanged(provider, location);
driveLetters.indexOf(location) :
location;
this.handleMountLocationChanged(provider, value);
} }
if (!this.props.AutoMountProcessed[provider] && if (!this.props.AutoMountProcessed[provider] &&

View File

@@ -188,7 +188,7 @@ const _execProcessGetOutput = (cmd, working, args) => {
} }
const proc = spawn(cmd, args, processOptions); const proc = spawn(cmd, args, processOptions);
let output; let output = '';
proc.stdout.on('data', data => { output += data.toString(); }); proc.stdout.on('data', data => { output += data.toString(); });
proc.on('error', (err) => { reject(err); }); proc.on('error', (err) => { reject(err); });