Redux changes and refactoring

src/components/ReleaseVersionDisplay/ReleaseVersionDisplay.js

@@ -1,13 +1,23 @@
 import React from 'react';
 import './ReleaseVersionDisplay.css';
 import * as Constants from '../../constants';
+import {connect} from 'react-redux';
 import DropDown from '../UI/DropDown/DropDown';
 import Grid from '../UI/Grid/Grid';
 import Text from '../UI/Text/Text';
 import Button from '../UI/Button/Button';
 import UpgradeIcon from '../UpgradeIcon/UpgradeIcon';
 
-export default props => {
+const mapStateToProps = state => {
+  return {
+    Release: state.relver.Release,
+    ReleaseUpgradeAvailable: state.relver.ReleaseUpgradeAvailable,
+    ReleaseVersion: state.relver.Version,
+    VersionLookup: state.relver.VersionLookup,
+  };
+};
+
+export default connect(mapStateToProps)(props => {
   let optionsDisplay = [];
   let key = 0;
   if (props.releaseExtracting) {
@@ -26,7 +36,7 @@ export default props => {
             key={key++}
             row={5}
             rowSpan={7}
-            text={props.installedVersion}
+            text={props.text}
             textAlign={'left'}/>
     ));
   } else if (props.downloadDisabled) {
@@ -46,7 +56,7 @@ export default props => {
             key={key++}
             row={5}
             rowSpan={7}
-            text={props.installedVersion}
+            text={props.text}
             textAlign={'left'}/>
     ));
   } else {
@@ -74,14 +84,14 @@ export default props => {
                 items={Constants.RELEASE_TYPES}
                 row={5}
                 rowSpan={7}
-                selected={props.release}/>
+                selected={props.Release}/>
       <Text col={dimensions => dimensions.columns / 3}
             colSpan={remain=>remain / 2}
             rowSpan={4}
             text={'Version'}
             textAlign={'left'}
             type={'Heading2'}/>
-      <UpgradeIcon available={props.versionAvailable}
+      <UpgradeIcon available={props.ReleaseUpgradeAvailable}
                    col={dimensions => ((dimensions.columns / 3) * 2) - 6}
                    colSpan={4}
                    release
@@ -90,11 +100,11 @@ export default props => {
                 col={dimensions => dimensions.columns / 3}
                 colSpan={remain=>remain / 2 - 1}
                 disabled={props.disabled}
-                items={props.versions}
+                items={props.VersionLookup[Constants.RELEASE_TYPES[props.Release]]}
                 row={5}
                 rowSpan={7}
-                selected={props.version}/>
+                selected={props.ReleaseVersion}/>
       {optionsDisplay}
     </Grid>
   );
-};
+});