Redux changes and refactoring

src/components/DependencyList/Dependency/Dependency.js

@@ -1,7 +1,15 @@
 import React from 'react';
 import './Dependency.css';
+import {connect} from 'react-redux';
+import * as Constants from '../../../constants';
 
-export default props => {
+const mapStateToProps = state => {
+  return {
+    AllowDownload: (state.download.DownloadType !== Constants.INSTALL_TYPES.Dependency),
+  };
+};
+
+export default connect(mapStateToProps)(props => {
   return (
     <div className={'Dependency'}>
       <table width="100%">
@@ -11,7 +19,7 @@ export default props => {
               <h3>{props.name}</h3>
             </td>
             <td>
-              {props.allowDownload ?
+              {props.AllowDownload ?
                 <a href={void(0)} className={'DependencyLink'} onClick={()=>{props.onDownload(props.download); return false;}}><u>Install</u></a> :
                 'Installing...'}
             </td>
@@ -20,4 +28,4 @@ export default props => {
       </table>
     </div>
   );
-};
+});

src/components/DependencyList/DependencyList.js

@@ -1,13 +1,19 @@
 import React from 'react';
 import './DependencyList.css';
+import {connect} from 'react-redux';
 import Dependency from './Dependency/Dependency';
 import Box from '../UI/Box/Box';
 
-export default props => {
-  const items = props.dependencies.map((k, i)=> {
+const mapStateToProps = state => {
+  return {
+    MissingDependencies: state.install.MissingDependencies,
+  };
+};
+
+export default connect(mapStateToProps)(props => {
+  const items = props.MissingDependencies.map((k, i)=> {
     return (
-      <Dependency allowDownload={props.allowDownload}
-                  download={k.download}
+      <Dependency download={k.download}
                   key={i}
                   name={k.display}
                   onDownload={props.onDownload}/>
@@ -22,5 +28,4 @@ export default props => {
       {items}
     </Box>
   );
-
-};
+});

src/components/ReleaseVersionDisplay/ReleaseVersionDisplay.js

@@ -11,6 +11,12 @@ import {setActiveRelease} from "../../redux/actions/release_version_actions";
 
 const mapStateToProps = state => {
   return {
+    AppPlatform: state.common.AppPlatform,
+    DownloadActive: state.download.DownloadActive,
+    InstallActive: state.install.InstallActive,
+    InstallType: state.install.InstallType,
+    InstalledVersion: state.relver.InstalledVersion,
+    MountsBusy: state.mounts.MountsBusy,
     Release: state.relver.Release,
     ReleaseUpgradeAvailable: state.relver.ReleaseUpgradeAvailable,
     ReleaseVersion: state.relver.Version,
@@ -35,9 +41,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
     props.setActiveRelease(props.Release, parseInt(e.target.value, 10));
   };
 
+  const text = props.InstalledVersion + ' [' + props.AppPlatform + ']';
+  const disabled = props.DownloadActive || props.InstallActive || props.MountsBusy;
+  const releaseExtracting = (props.InstallType === Constants.INSTALL_TYPES.Release);
+
   let optionsDisplay = [];
   let key = 0;
-  if (props.releaseExtracting) {
+  if (releaseExtracting) {
     optionsDisplay.push((
       <Text col={dimensions => (dimensions.columns / 3) * 2}
             colSpan={'remain'}
@@ -53,7 +63,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
             key={key++}
             row={5}
             rowSpan={7}
-            text={props.text}
+            text={text}
             textAlign={'left'}/>
     ));
   } else if (props.downloadDisabled) {
@@ -73,7 +83,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
             key={key++}
             row={5}
             rowSpan={7}
-            text={props.text}
+            text={text}
             textAlign={'left'}/>
     ));
   } else {
@@ -97,7 +107,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
             type={'Heading2'}/>
       <DropDown changed={handleReleaseChanged}
                 colSpan={remain=>remain / 3 - 1}
-                disabled={props.disabled}
+                disabled={disabled}
                 items={Constants.RELEASE_TYPES}
                 row={5}
                 rowSpan={7}
@@ -116,7 +126,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => {
       <DropDown changed={handleVersionChanged}
                 col={dimensions => dimensions.columns / 3}
                 colSpan={remain=>remain / 2 - 1}
-                disabled={props.disabled}
+                disabled={disabled}
                 items={props.VersionLookup[Constants.RELEASE_TYPES[props.Release]]}
                 row={5}
                 rowSpan={7}