foreman_rh_cloud 3.0.17 → 3.0.18

data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap

@@ -7,9 +7,21 @@ exports[`InventorySettings rendering render without Props 1`] = `
   <h3>
     Settings
   </h3>
-  <Connect(AutoUploadSwitcher) />
-  <Connect(ExcludePackagesSwitcher) />
-  <Connect(HostObfuscationSwitcher) />
-  <Connect(IpsObfuscationSwitcher) />
+  <AdvancedSetting
+    key="autoUploadEnabled"
+    setting="autoUploadEnabled"
+  />
+  <AdvancedSetting
+    key="hostObfuscationEnabled"
+    setting="hostObfuscationEnabled"
+  />
+  <AdvancedSetting
+    key="ipsObfuscationEnabled"
+    setting="ipsObfuscationEnabled"
+  />
+  <AdvancedSetting
+    key="excludePackagesEnabled"
+    setting="excludePackagesEnabled"
+  />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettingsActions.test.js.snap

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Inventory settings actions should getSettings 1`] = `
+Object {
+  "key": "INVENTORY_SETTINGS",
+  "type": "get-some-type",
+  "url": "/foreman_inventory_upload/settings",
+}
+`;
+
+exports[`Inventory settings actions should setSetting hostObfuscation true 1`] = `
+Array [
+  Array [
+    Object {
+      "errorToast": [Function],
+      "key": "INVENTORY_SETTINGS",
+      "params": Object {
+        "setting": "hostObfuscation",
+        "value": true,
+      },
+      "type": "post-some-type",
+      "url": "/foreman_inventory_upload/setting",
+    },
+  ],
+]
+`;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/index.js

@@ -1 +1,16 @@
-export { default } from './InventorySettings';
+import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import InventorySettings from './InventorySettings';
+import { getSettings } from './InventorySettingsActions';
+
+const ConnectedInventorySettings = () => {
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(getSettings());
+  }, [dispatch]);
+
+  return <InventorySettings />;
+};
+
+export default ConnectedInventorySettings;

data/webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.fixtures.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 export const props = {
   items: [

data/webpack/ForemanInventoryUpload/Components/NavContainer/navContainer.scss

@@ -1,7 +1,9 @@
-.dashboard {
-  .nav_item {
-    font-size: 12px;
-    text-align: center;
-    width: 130px;
+.rh-cloud-inventory-page {
+  .dashboard {
+    .nav_item {
+      font-size: 12px;
+      text-align: center;
+      width: 130px;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss

@@ -1,4 +1,4 @@
-.rh-cloud-page {
+.rh-cloud-inventory-page {
   .inventory-upload-header {
     .settings-alert {
       margin-bottom: 30px;

data/webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap

@@ -9,7 +9,7 @@ exports[`PageHeader rendering render without Props 1`] = `
   <div
     className="inventory-upload-header-description"
   >
-    <InventorySettings />
+    <ConnectedInventorySettings />
     <PageDescription />
   </div>
   <Row

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SettingsWarning/index.js

@@ -4,7 +4,7 @@ import { SettingsWarning } from './SettingsWarning';
 import {
   selectAutoUploadEnabled,
   selectHostObfuscationEnabled,
-} from '../../../AccountList/AccountListSelectors';
+} from '../../../InventorySettings/InventorySettingsSelectors';
 import { CONNECTOR_STATUS } from '../CloudConnectorButton/CloudConnectorConstants';
 import { selectStatus } from '../CloudConnectorButton/CloudConnectorSelectors';
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButton.test.js

@@ -1,5 +1,5 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 import SyncButton from '../SyncButton';
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Modal.js

@@ -6,7 +6,7 @@ import { foremanUrl } from '../../../../../../ForemanRhCloudHelpers';
 import './modal.scss';
 
 const SyncModal = ({ show, toggleModal }) => (
-  <Modal show={show} onHide={toggleModal} id="sync_modal">
+  <Modal show={show} onHide={toggleModal} id="inventory-sync-modal">
     <Modal.Header>
       <button
         className="close"

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.scss

@@ -1,4 +1,4 @@
-#sync_modal {
+#inventory-sync-modal {
   height: 300px;
   margin: auto;
   overflow: hidden;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import * as actions from './SyncButtonActions';
 import reducer from './SyncButtonReducer';
 import SyncButton from './SyncButton';
-import { selectCloudToken } from '../../../AccountList/AccountListSelectors';
+import { selectCloudToken } from '../../../InventorySettings/InventorySettingsSelectors';
 import { selectStatus } from './SyncButtonSelectors';
 
 // map state to props

data/webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js

@@ -1,4 +1,4 @@
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 export const exitCode = 'exit 0';
 export const logs = ['No running process'];

data/webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 import TabContainer from '../TabContainer';
 import TabHeader from '../TabHeader';
 import TabBody from '../TabBody';

data/webpack/ForemanInventoryUpload/Components/ReportUpload/ReportUpload.fixtures.js

@@ -1,4 +1,4 @@
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 export const files = ['some-file'];
 export const exitCode = 'exit 0';

data/webpack/ForemanInventoryUpload/Components/ReportUpload/ReportUpload.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 import TabContainer from '../TabContainer';
 import TabHeader from '../TabHeader';
 import TabBody from '../TabBody';

data/webpack/ForemanInventoryUpload/Components/ScheduledRun/index.js

@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 
 import ScheduledRun from './ScheduledRun';
-import { selectAutoUploadEnabled } from '../AccountList/AccountListSelectors';
+import { selectAutoUploadEnabled } from '../InventorySettings/InventorySettingsSelectors';
 
 // map state to props
 const mapStateToProps = state => ({

data/webpack/ForemanInventoryUpload/Components/ScheduledRun/scheduledRun.scss

@@ -1,11 +1,13 @@
-.scheduled_run {
-  font-size: 14px;
+.rh-cloud-inventory-page {
+  .scheduled_run {
+    font-size: 14px;
 
-  p {
-    margin: 0 0 -10px 0;
+    p {
+      margin: 0 0 -10px 0;
 
-    .fa {
-      margin-right: 5px;
+      .fa {
+        margin-right: 5px;
+      }
     }
   }
 }

data/webpack/ForemanInventoryUpload/Components/StatusChart/statusChart.scss

@@ -1,8 +1,10 @@
-.status-chart {
-  display: flex;
-  align-items: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  margin: 10%;
-  padding: 5%;
+.rh-cloud-inventory-page {
+  .status-chart {
+    display: flex;
+    align-items: center;
+    -webkit-justify-content: center;
+    justify-content: center;
+    margin: 10%;
+    padding: 5%;
+  }
 }

data/webpack/ForemanInventoryUpload/Components/TabBody/tabBody.scss

@@ -1,3 +1,5 @@
-.tab_body {
-  margin-bottom: 0;
+.rh-cloud-inventory-page {
+  .tab_body {
+    margin-bottom: 0;
+  }
 }

data/webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.scss

@@ -1,8 +1,10 @@
-.dashboard .tab-content {
-  padding: 20px;
-  min-height: 0;
+.rh-cloud-inventory-page {
+  .dashboard .tab-content {
+    padding: 20px;
+    min-height: 0;
 
-  .row {
-    margin-bottom: 20px;
+    .row {
+      margin-bottom: 20px;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { noop, Grid, Button, Icon } from 'patternfly-react';
+import { Grid, Button, Icon } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 import './tabHeader.scss';

data/webpack/ForemanInventoryUpload/Components/TabHeader/tabHeader.scss

@@ -1,20 +1,22 @@
-.tab-header {
-  h1 {
-    margin-top: 0;
-  }
-
-  p {
-    font-size: 16px;
-  }
+.rh-cloud-inventory-page {
+  .tab-header {
+    h1 {
+      margin-top: 0;
+    }
 
-  .tab-action-buttons {
-    float: right;
+    p {
+      font-size: 16px;
+    }
 
-    button {
-      margin-left: 5px;
+    .tab-action-buttons {
+      float: right;
 
-      span {
+      button {
         margin-left: 5px;
+
+        span {
+          margin-left: 5px;
+        }
       }
     }
   }

data/webpack/ForemanInventoryUpload/Components/Terminal/terminal.scss

@@ -1,32 +1,34 @@
-.terminal {
-  height: 200px;
-  background-color: #222;
-  padding: 10px 0;
-  margin-bottom: 20px;
-  overflow-y: scroll;
-  overflow-x: hidden;
+.rh-cloud-inventory-page {
+  .terminal {
+    height: 200px;
+    background-color: #222;
+    padding: 10px 0;
+    margin-bottom: 20px;
+    overflow-y: scroll;
+    overflow-x: hidden;
 
-  p {
-    font-family: monospace;
-    font-size: 16px;
-    color: #22da26;
-    overflow-wrap: anywhere;
+    p {
+      font-family: monospace;
+      font-size: 16px;
+      color: #22da26;
+      overflow-wrap: anywhere;
 
-    &.terminal_error {
-      color: #f00;
+      &.terminal_error {
+        color: #f00;
+      }
     }
-  }
 
-  &::-webkit-scrollbar {
-    width: 12px;
-    height: 12px;
-    background: #aaa;
-  }
+    &::-webkit-scrollbar {
+      width: 12px;
+      height: 12px;
+      background: #aaa;
+    }
 
-  &::-webkit-scrollbar-thumb {
-    background: #222;
-    border-radius: 6px;
-    border: 3px solid transparent;
-    background-clip: content-box;
+    &::-webkit-scrollbar-thumb {
+      background: #222;
+      border-radius: 6px;
+      border: 3px solid transparent;
+      background-clip: content-box;
+    }
   }
 }

data/webpack/ForemanInventoryUpload/ForemanInventoryUpload.js

@@ -4,7 +4,7 @@ import AccountList from './Components/AccountList';
 import PageHeader from './Components/PageHeader';
 
 const ForemanInventoryUpload = () => (
-  <div className="rh-cloud-page">
+  <div className="rh-cloud-inventory-page">
     <PageLayout searchable={false} beforeToolbarComponent={<PageHeader />}>
       <AccountList />
     </PageLayout>

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/InventoryAutoUpload.js

@@ -7,16 +7,21 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 import Switcher from '../../../common/Switcher';
 import AdvancedSettings from './components/AdvancedSettings';
+import { settingsDict } from '../../Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants';
 
 const InventoryAutoUploadSwitcher = ({
   autoUploadEnabled,
-  handleToggle,
-  fetchSettings,
+  setSetting,
+  getSettings,
 }) => {
   useEffect(() => {
-    fetchSettings();
-  }, [fetchSettings]);
-
+    getSettings();
+  }, [getSettings]);
+  const handleToggle = () =>
+    setSetting({
+      setting: settingsDict.autoUploadEnabled.name,
+      value: !autoUploadEnabled,
+    });
   return (
     <FormGroup>
       <Grid>
@@ -30,7 +35,7 @@ const InventoryAutoUploadSwitcher = ({
               'Enable automatic upload of your hosts inventory to the Red Hat cloud'
             )}
             isChecked={autoUploadEnabled}
-            onChange={() => handleToggle(autoUploadEnabled)}
+            onChange={handleToggle}
             labelCol={5}
           />
 
@@ -81,8 +86,8 @@ const InventoryAutoUploadSwitcher = ({
 
 InventoryAutoUploadSwitcher.propTypes = {
   autoUploadEnabled: PropTypes.bool,
-  handleToggle: PropTypes.func.isRequired,
-  fetchSettings: PropTypes.func.isRequired,
+  setSetting: PropTypes.func.isRequired,
+  getSettings: PropTypes.func.isRequired,
 };
 
 InventoryAutoUploadSwitcher.defaultProps = {

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/InventoryAutoUpload.test.js

@@ -1,13 +1,13 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 import InventoryAutoUpload from '../InventoryAutoUpload';
 
 const fixtures = {
   'render with props': {
     autoUploadEnabled: true,
-    handleToggle: noop,
-    fetchSettings: noop,
+    setSetting: noop,
+    getSettings: noop,
   },
 };