Merge pull request #922 from mturley/enable-conversion-hosts-page

Enable (un-hide) the Conversion Hosts tab of the Settings page (cherry picked from commit c0da5af) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1703104
ManageIQ · Apr 25, 2019 · c949f5b · c949f5b
1 parent b74dc63
commit c949f5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/app/javascript/react/screens/App/Settings/Settings.js b/app/javascript/react/screens/App/Settings/Settings.js
@@ -17,31 +17,23 @@ const Settings = props => {
           <strong>{__('Migration Settings')}</strong>
         </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
@@ -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);