Revert "Merge pull request #922 from mturley/enable-conversion-hosts-…

…page" This reverts commit c949f5b. https://bugzilla.redhat.com/show_bug.cgi?id=1703104
ManageIQ · May 9, 2019 · 95934a1 · 95934a1
1 parent 0fed6dd
commit 95934a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/app/javascript/react/screens/App/Settings/Settings.js b/app/javascript/react/screens/App/Settings/Settings.js
@@ -17,23 +17,31 @@ const Settings = props => {
           <strong>{__('Migration Settings')}</strong>
         </Breadcrumb.Item>
       </Toolbar>
-      <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>
+      {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>
+      )}
     </React.Fragment>
   );
 };
 
 Settings.propTypes = {
   match: PropTypes.object,
-  redirectTo: PropTypes.func
+  redirectTo: PropTypes.func,
+  hideConversionHostSettings: PropTypes.bool // TODO remove this when we are ready to release ConversionHostsSettings
 };
 
 export default Settings;
diff --git a/app/javascript/react/screens/App/Settings/index.js b/app/javascript/react/screens/App/Settings/index.js
@@ -5,7 +5,9 @@ import * as RouterActions from '../../../../redux/actions/routerActions';
 
 export const reducers = { settings: reducer };
 
-const mapStateToProps = () => ({});
+const mapStateToProps = () => ({
+  hideConversionHostSettings: true // TODO remove this when we are ready to release ConversionHostsSettings
+});
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => Object.assign(stateProps, ownProps.data, dispatchProps);