From 24b43d5254714a8c9ddfc35158863cc6ef005d7b Mon Sep 17 00:00:00 2001
From: Mike Turley <mturley@redhat.com>
Date: Wed, 27 Mar 2019 14:41:07 -0400
Subject: [PATCH] Enable (un-hide) the Conversion Hosts tab of the Settings
 page

---
 .../react/screens/App/Settings/Settings.js    | 30 +++++++------------
 .../react/screens/App/Settings/index.js       |  4 +--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/app/javascript/react/screens/App/Settings/Settings.js b/app/javascript/react/screens/App/Settings/Settings.js
index f6b3a94b4a..1f4f2ab015 100644
--- a/app/javascript/react/screens/App/Settings/Settings.js
+++ b/app/javascript/react/screens/App/Settings/Settings.js
@@ -15,31 +15,23 @@ const Settings = props => {
         <Breadcrumb.Item href="#/plans">{__('Migration')}</Breadcrumb.Item>
         <Breadcrumb.Item active>{__('Migration Settings')}</Breadcrumb.Item>
       </Toolbar>
-      {props.hideConversionHostSettings ? (
-        <React.Fragment>
-          <h2>{__('Migration Throttling')}</h2>
-          <GeneralSettings />
-        </React.Fragment>
-      ) : (
-        <div style={{ marginTop: 10 }}>
-          <Tabs id="settings-tabs" activeKey={match.path} onSelect={key => redirectTo(key)} unmountOnExit>
-            <Tab eventKey="/settings" title={__('Migration Throttling')}>
-              <GeneralSettings />
-            </Tab>
-            <Tab eventKey="/settings/conversion_hosts" title={__('Conversion Hosts')}>
-              <ConversionHostsSettings />
-            </Tab>
-          </Tabs>
-        </div>
-      )}
+      <div style={{ marginTop: 10 }}>
+        <Tabs id="settings-tabs" activeKey={match.path} onSelect={key => redirectTo(key)} unmountOnExit>
+          <Tab eventKey="/settings" title={__('Migration Throttling')}>
+            <GeneralSettings />
+          </Tab>
+          <Tab eventKey="/settings/conversion_hosts" title={__('Conversion Hosts')}>
+            <ConversionHostsSettings />
+          </Tab>
+        </Tabs>
+      </div>
     </React.Fragment>
   );
 };
 
 Settings.propTypes = {
   match: PropTypes.object,
-  redirectTo: PropTypes.func,
-  hideConversionHostSettings: PropTypes.bool // TODO remove this when we are ready to release ConversionHostsSettings
+  redirectTo: PropTypes.func
 };
 
 export default Settings;
diff --git a/app/javascript/react/screens/App/Settings/index.js b/app/javascript/react/screens/App/Settings/index.js
index 7ed9d509f3..c7763403d0 100644
--- a/app/javascript/react/screens/App/Settings/index.js
+++ b/app/javascript/react/screens/App/Settings/index.js
@@ -5,9 +5,7 @@ import * as RouterActions from '../../../../redux/actions/routerActions';
 
 export const reducers = { settings: reducer };
 
-const mapStateToProps = () => ({
-  hideConversionHostSettings: true // TODO remove this when we are ready to release ConversionHostsSettings
-});
+const mapStateToProps = () => ({});
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => Object.assign(stateProps, ownProps.data, dispatchProps);