foreman_rh_cloud 3.0.17 → 3.0.18

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -1,32 +1,34 @@
-.account-list {
-  .pf-c-accordion__toggle {
-    margin-top: 10px;
-  }
+.rh-cloud-inventory-page {
+  .account-list {
+    .pf-c-accordion__toggle {
+      margin-top: 10px;
+    }
 
-  .pf-c-accordion__toggle-text {
-    font-size: 16px;
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
+    .pf-c-accordion__toggle-text {
+      font-size: 16px;
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
 
-    .account-icon {
-      margin-right: 5px;
+      .account-icon {
+        margin-right: 5px;
 
-      .pf-c-label__icon {
-        margin: 0;
+        .pf-c-label__icon {
+          margin: 0;
+        }
       }
-    }
 
-    span {
-      align-self: center;
-    }
+      span {
+        align-self: center;
+      }
 
-    .status {
-      margin: 0;
+      .status {
+        margin: 0;
+      }
     }
-  }
 
-  .list-item-status > span {
-    margin-left: 7px;
+    .list-item-status > span {
+      margin-left: 7px;
+    }
   }
 }

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

@@ -1,4 +1,4 @@
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 export const pollingProcessID = 1;
 

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.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 { translate as __ } from 'foremanReact/common/I18n';
 import ReportGenerate from '../ReportGenerate';
 import ReportUpload from '../ReportUpload';

data/webpack/ForemanInventoryUpload/Components/FileDownload/FileDownload.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 './fileDownload.scss';
 
 const FileDownload = ({ onClick }) => (

data/webpack/ForemanInventoryUpload/Components/FileDownload/fileDownload.scss

@@ -1,3 +1,5 @@
-button {
-  float: right;
+.rh-cloud-inventory-page {
+  button {
+    float: right;
+  }
 }

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/FullScreenModal.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Modal, Icon, noop } from 'patternfly-react';
+import { Modal, Icon } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import Terminal from '../Terminal';
 import './fullScreenModal.scss';

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.scss

@@ -1,19 +1,21 @@
-#full-screen-terminal {
-  .modal-dialog {
-    width: 95%;
-    height: 95%;
-    margin: 30px 0 0 30px;
+.rh-cloud-inventory-page {
+  #full-screen-terminal {
+    .modal-dialog {
+      width: 95%;
+      height: 95%;
+      margin: 30px 0 0 30px;
 
-    .modal-body {
-      padding: 0;
-      display: flex;
-      height: -webkit-fill-available;
-      height: -moz-available;
-      height: fill-available;
+      .modal-body {
+        padding: 0;
+        display: flex;
+        height: -webkit-fill-available;
+        height: -moz-available;
+        height: fill-available;
 
-      .terminal {
-        margin: 0 -20px;
-        height: 100%;
+        .terminal {
+          margin: 0 -20px;
+          height: 100%;
+        }
       }
     }
   }

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/ClearButton.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Icon, OverlayTrigger, Tooltip, noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
+import { Icon, OverlayTrigger, Tooltip } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 const ClearButton = ({ onClear }) => (

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

@@ -1,2 +1,2 @@
 export const filterTerm = 'test_filter_term';
-export const org = { title: 'some_org', id: 1 };
+export const organization = { title: 'some_org', id: 1 };

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormGroup, FormControl, noop } from 'patternfly-react';
+import { FormGroup, FormControl } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import ClearButton from './Components/ClearButton';
 import './inventoryFilter.scss';

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilterReducer.js

@@ -16,7 +16,7 @@ const initialState = Immutable({
 
 export default (
   state = initialState,
-  { type, payload: { filterTerm, org, organization } = {} }
+  { type, payload: { filterTerm, organization } = {} }
 ) => {
   switch (type) {
     case INVENTORY_FILTER_UPDATE:
@@ -27,17 +27,9 @@ export default (
       return state.merge({
         filterTerm: '',
       });
-    case LAYOUT_CHANGE_ORG: {
-      const { title } = org;
-      // Any org is used only in it's translated form in the redux
-      const term = title === __(ANY_ORGANIZATION) ? '' : title;
-      return state.merge({
-        filterTerm: term,
-      });
-    }
+    case LAYOUT_CHANGE_ORG:
     case LAYOUT_INITIALIZE: {
-      // Layout action changed in Jul 20 2020 - https://github.com/theforeman/foreman/commit/e4c39a7d8f8b50ba45ef63e46f6f6914b69f247a
-      const { title } = organization || {}; // org was renamed
+      const { title } = organization || {};
       // Any org is used only in it's translated form in the redux
       const term = title === __(ANY_ORGANIZATION) ? '' : title;
       return state.merge({

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilter.test.js

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

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/InventoryFilterReducer.test.js

@@ -4,7 +4,7 @@ import {
   LAYOUT_INITIALIZE,
 } from 'foremanReact/components/Layout/LayoutConstants';
 import reducer from '../InventoryFilterReducer';
-import { filterTerm, org } from '../InventoryFilter.fixtures';
+import { filterTerm, organization } from '../InventoryFilter.fixtures';
 import {
   INVENTORY_FILTER_UPDATE,
   INVENTORY_FILTER_CLEAR,
@@ -29,13 +29,13 @@ const fixtures = {
   'should handle LAYOUT_CHANGE_ORG': {
     action: {
       type: LAYOUT_CHANGE_ORG,
-      payload: { org },
+      payload: { organization },
     },
   },
   'should handle LAYOUT_INITIALIZE': {
     action: {
       type: LAYOUT_INITIALIZE,
-      payload: { organization: org },
+      payload: { organization },
     },
   },
 };

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingActions.js

@@ -0,0 +1,7 @@
+import { setSetting } from '../InventorySettingsActions';
+
+export const handleToggle = (name, current) =>
+  setSetting({
+    setting: name,
+    value: !current,
+  });

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js

@@ -0,0 +1,26 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const settingsDict = {
+  autoUploadEnabled: {
+    name: 'allow_auto_inventory_upload',
+    label: __('Auto upload'),
+    tooltip: __(
+      'Enable automatic upload of your hosts inventory to the Red Hat cloud'
+    ),
+  },
+  hostObfuscationEnabled: {
+    name: 'obfuscate_inventory_hostnames',
+    label: __('Obfuscate host names'),
+    tooltip: __('Obfuscate host names sent to the Red Hat cloud'),
+  },
+  ipsObfuscationEnabled: {
+    name: 'obfuscate_inventory_ips',
+    label: __('Obfuscate host ipv4 addresses'),
+    tooltip: __('Obfuscate ipv4 addresses sent to the Red Hat cloud'),
+  },
+  excludePackagesEnabled: {
+    name: 'exclude_installed_packages',
+    label: __('Exclude Packages'),
+    tooltip: __('Exclude packages from being uploaded to the Red Hat cloud'),
+  },
+};

data/webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/__tests__/AdvancedSettingActions.test.js

@@ -0,0 +1,9 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import { handleToggle } from '../AdvancedSettingActions';
+
+const fixtures = {
+  'should handleToggle': () => handleToggle('autoUploadEnabled', false),
+};
+
+describe('AdvancedSetting actions', () =>
+  testActionSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AdvancedSetting actions should handleToggle 1`] = `
+Array [
+  Array [
+    Object {
+      "errorToast": [Function],
+      "key": "INVENTORY_SETTINGS",
+      "params": Object {
+        "setting": "autoUploadEnabled",
+        "value": true,
+      },
+      "type": "post-some-type",
+      "url": "/foreman_inventory_upload/setting",
+    },
+  ],
+]
+`;

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector, useDispatch } from 'react-redux';
+import { selectSettings } from '../InventorySettingsSelectors';
+import { handleToggle } from './AdvancedSettingActions';
+import SwitcherPF4 from '../../../../common/Switcher/SwitcherPF4';
+import { settingsDict } from './AdvancedSettingsConstants';
+
+const AdvancedSetting = ({ setting }) => {
+  const settingValue = useSelector(store => selectSettings(store)[setting]);
+  const dispatch = useDispatch();
+  const onToggle = () =>
+    dispatch(handleToggle(settingsDict[setting].name, settingValue));
+  return (
+    <SwitcherPF4
+      id={settingsDict[setting].name}
+      label={settingsDict[setting].label}
+      tooltip={settingsDict[setting].tooltip}
+      isChecked={settingValue}
+      onChange={onToggle}
+    />
+  );
+};
+
+AdvancedSetting.propTypes = {
+  setting: PropTypes.string.isRequired,
+};
+
+export default AdvancedSetting;

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

@@ -1,18 +1,17 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import AutoUploadSwitcher from '../AutoUploadSwitcher';
-import HostObfuscationSwitcher from '../HostObfuscationSwitcher';
-import ExcludePackagesSwitcher from '../ExcludePackagesSwitcher';
-import IpsObfuscationSwitcher from '../IpsObfuscationSwitcher';
+
+import AdvancedSetting from './AdvancedSetting';
+import { settingsDict } from './AdvancedSetting/AdvancedSettingsConstants';
+
 import './InventorySettings.scss';
 
 const InventorySettings = () => (
   <div className="inventory-settings">
     <h3>{__('Settings')}</h3>
-    <AutoUploadSwitcher />
-    <ExcludePackagesSwitcher />
-    <HostObfuscationSwitcher />
-    <IpsObfuscationSwitcher />
+    {Object.keys(settingsDict).map(key => (
+      <AdvancedSetting setting={key} key={key} />
+    ))}
   </div>
 );
 

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.scss

@@ -1,12 +1,18 @@
-.inventory-settings {
-  border: 1px solid #ededed;
-  border-radius: 4px;
-  padding: 10px;
-  margin-bottom: 15px;
-  float: right;
+.rh-cloud-inventory-page {
+  .inventory-settings {
+    border: 1px solid #ededed;
+    border-radius: 4px;
+    padding: 10px;
+    margin-bottom: 15px;
+    float: right;
 
-  h3 {
-    margin-top: 0;
-    font-weight: 600;
+    h3 {
+      margin-top: 0;
+      font-weight: 600;
+    }
+
+    .foreman-switcher {
+      display: block;
+    }
   }
 }

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

@@ -0,0 +1,23 @@
+import { get, post } from 'foremanReact/redux/API';
+import {
+  INVENTORY_SETTINGS,
+  INVENTORY_GET_SETTINGS_PATH,
+  INVENTORY_SET_SETTINGS_PATH,
+} from './InventorySettingsConstants';
+
+export const getSettings = () =>
+  get({
+    key: INVENTORY_SETTINGS,
+    url: INVENTORY_GET_SETTINGS_PATH,
+  });
+
+export const setSetting = setting => dispatch => {
+  dispatch(
+    post({
+      key: INVENTORY_SETTINGS,
+      url: INVENTORY_SET_SETTINGS_PATH,
+      params: setting,
+      errorToast: error => error.message,
+    })
+  );
+};

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

@@ -0,0 +1,9 @@
+import { foremanUrl } from '../../../ForemanRhCloudHelpers';
+
+export const INVENTORY_SETTINGS = 'INVENTORY_SETTINGS';
+export const INVENTORY_GET_SETTINGS_PATH = foremanUrl(
+  '/foreman_inventory_upload/settings'
+);
+export const INVENTORY_SET_SETTINGS_PATH = foremanUrl(
+  '/foreman_inventory_upload/setting'
+);

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

@@ -0,0 +1,19 @@
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { INVENTORY_SETTINGS } from './InventorySettingsConstants';
+
+export const selectSettings = state =>
+  selectAPIResponse(state, INVENTORY_SETTINGS);
+
+export const selectAutoUploadEnabled = state =>
+  selectSettings(state).autoUploadEnabled;
+
+export const selectHostObfuscationEnabled = state =>
+  selectSettings(state).hostObfuscationEnabled;
+
+export const selectIpsObfuscationEnabled = state =>
+  selectSettings(state).ipsObfuscationEnabled;
+
+export const selectExcludePackages = state =>
+  selectSettings(state).excludePackagesEnabled;
+
+export const selectCloudToken = state => selectSettings(state).cloudToken;

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

@@ -0,0 +1,14 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import { getSettings, setSetting } from '../InventorySettingsActions';
+
+const fixtures = {
+  'should getSettings': () => getSettings(),
+  'should setSetting hostObfuscation true': () =>
+    setSetting({
+      setting: 'hostObfuscation',
+      value: true,
+    }),
+};
+
+describe('Inventory settings actions', () =>
+  testActionSnapshotWithFixtures(fixtures));