foreman_rh_cloud 0.9.12 → 0.9.13

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

@@ -1 +1,2 @@
-export const handleToggleResponse = { data: { autoUploadEnabled: true } };
+export const currentHostObfuscationEnabled = false;
+export const handleToggleResponse = { data: { hostObfuscationEnabled: true } };

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Switch, FieldLevelHelp } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
+import './HostObfuscationSwitcher.scss';
 
 const HostObfuscationSwitcher = ({ hostObfuscationEnabled, handleToggle }) => (
   <div className="host_obfuscation_switcher">

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.scss

@@ -0,0 +1,3 @@
+.host_obfuscation_switcher {
+  margin-bottom: 5px;
+}

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherActions.js

@@ -1,9 +1,7 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
-import {
-  HOST_OBFUSCATION_TOGGLE,
-  HOST_OBFUSCATION_TOGGLE_ERROR,
-} from './HostObfuscationSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from './HostObfuscationSwitcherConstants';
 
 export const handleToggle = currentHostObfuscationEnabled => async dispatch => {
   const toggledHostObfuscationEnabled = !currentHostObfuscationEnabled;
@@ -19,12 +17,13 @@ export const handleToggle = currentHostObfuscationEnabled => async dispatch => {
         hostObfuscationEnabled,
       },
     });
-  } catch (error) {
-    dispatch({
-      type: HOST_OBFUSCATION_TOGGLE_ERROR,
-      payload: {
-        error: error.message,
-      },
-    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
   }
 };

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherConstants.js

@@ -1,3 +1 @@
 export const HOST_OBFUSCATION_TOGGLE = 'HOST_OBFUSCATION_TOGGLE';
-
-export const HOST_OBFUSCATION_TOGGLE_ERROR = 'HOST_OBFUSCATION_TOGGLE_ERROR';

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/HostObfuscationSwitcherActions.test.js

@@ -1,13 +1,23 @@
 import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
 import API from 'foremanReact/API';
 import { handleToggle } from '../HostObfuscationSwitcherActions';
-import { handleToggleResponse } from '../HostObfuscationSwitcher.fixtures';
+import {
+  handleToggleResponse,
+  currentHostObfuscationEnabled,
+} from '../HostObfuscationSwitcher.fixtures';
 
 jest.mock('foremanReact/API');
 API.post.mockImplementation(async () => handleToggleResponse);
 
 const fixtures = {
-  'should handleToggle': () => handleToggle(),
+  'should handleToggle': () => handleToggle(currentHostObfuscationEnabled),
+  'should handleToggle with error': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network error!'))
+    );
+
+    return handleToggle(currentHostObfuscationEnabled);
+  },
 };
 
 describe('HostObfuscationSwitcher actions', () =>

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/__snapshots__/HostObfuscationSwitcherActions.test.js.snap

@@ -5,10 +5,27 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "hostObfuscationEnabled": undefined,
+        "hostObfuscationEnabled": true,
       },
       "type": "HOST_OBFUSCATION_TOGGLE",
     },
   ],
 ]
 `;
+
+exports[`HostObfuscationSwitcher actions should handleToggle with error 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Network error!",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;

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

@@ -2,13 +2,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 './inventorySettings.scss';
 
 const InventorySettings = () => (
   <div className="inventory_settings">
     <h3>{__('Settings')}</h3>
     <AutoUploadSwitcher />
+    <ExcludePackagesSwitcher />
     <HostObfuscationSwitcher />
+    <IpsObfuscationSwitcher />
   </div>
 );
 

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

@@ -8,6 +8,8 @@ exports[`InventorySettings rendering render without Props 1`] = `
     Settings
   </h3>
   <Connect(AutoUploadSwitcher) />
+  <Connect(ExcludePackagesSwitcher) />
   <Connect(HostObfuscationSwitcher) />
+  <Connect(IpsObfuscationSwitcher) />
 </div>
 `;

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

@@ -0,0 +1 @@
+export const handleToggleResponse = { data: { ipsObfuscationEnabled: true } };

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Switch, FieldLevelHelp } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const IpsObfuscationSwitcher = ({ ipsObfuscationEnabled, handleToggle }) => (
+  <div className="ips_obfuscation_switcher">
+    <span>Obfuscate host ipv4 addresses</span>
+    <FieldLevelHelp
+      content={__('Obfuscate ipv4 addresses sent to the Red Hat cloud')}
+    />
+    <Switch
+      size="mini"
+      value={ipsObfuscationEnabled}
+      onChange={() => handleToggle(ipsObfuscationEnabled)}
+    />
+  </div>
+);
+
+IpsObfuscationSwitcher.propTypes = {
+  ipsObfuscationEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+};
+
+IpsObfuscationSwitcher.defaultProps = {
+  ipsObfuscationEnabled: false,
+};
+
+export default IpsObfuscationSwitcher;

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherActions.js

@@ -0,0 +1,29 @@
+import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
+import { IPS_OBFUSCATION_TOGGLE } from './IpsObfuscationSwitcherConstants';
+
+export const handleToggle = currentIpsObfuscationEnabled => async dispatch => {
+  const toggledIpsObfuscationEnabled = !currentIpsObfuscationEnabled;
+  try {
+    const {
+      data: { ipsObfuscationEnabled },
+    } = await API.post(inventoryUrl('ips_obfuscation'), {
+      value: toggledIpsObfuscationEnabled,
+    });
+    dispatch({
+      type: IPS_OBFUSCATION_TOGGLE,
+      payload: {
+        ipsObfuscationEnabled,
+      },
+    });
+  } catch (error) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message: error.message,
+      })
+    );
+  }
+};

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants.js

@@ -0,0 +1 @@
+export const IPS_OBFUSCATION_TOGGLE = 'IPS_OBFUSCATION_TOGGLE';

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { noop } from 'patternfly-react';
+
+import IpsObfuscationSwitcher from '../IpsObfuscationSwitcher';
+
+const fixtures = {
+  'render with props': { ipsObfuscationEnabled: true, handleToggle: noop },
+};
+
+describe('IpsObfuscationSwitcher', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(IpsObfuscationSwitcher, fixtures));
+});

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcherActions.test.js

@@ -0,0 +1,21 @@
+import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import API from 'foremanReact/API';
+import { handleToggle } from '../IpsObfuscationSwitcherActions';
+import { handleToggleResponse } from '../IpsObfuscationSwitcher.fixtures';
+
+jest.mock('foremanReact/API');
+API.post.mockImplementation(async () => handleToggleResponse);
+
+const fixtures = {
+  'should handleToggle': () => handleToggle(false),
+  'should handleError': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('test error'))
+    );
+
+    return handleToggle(false);
+  },
+};
+
+describe('IpsObfuscationSwitcher actions', () =>
+  testActionSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IpsObfuscationSwitcher rendering render with props 1`] = `
+<div
+  className="ips_obfuscation_switcher"
+>
+  <span>
+    Obfuscate host ipv4 addresses
+  </span>
+  <FieldLevelHelp
+    buttonClass=""
+    content="Obfuscate ipv4 addresses sent to the Red Hat cloud"
+    placement="top"
+    rootClose={true}
+  />
+  <Switch
+    animate={true}
+    baseClass="bootstrap-switch"
+    bsSize={null}
+    defaultValue={true}
+    disabled={false}
+    handleWidth="auto"
+    inverse={false}
+    labelText=" "
+    labelWidth="auto"
+    offColor="default"
+    offText="OFF"
+    onChange={[Function]}
+    onColor="primary"
+    onText="ON"
+    readonly={false}
+    size="mini"
+    tristate={false}
+    value={true}
+    wrapperClass="wrapper"
+  />
+</div>
+`;

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/__snapshots__/IpsObfuscationSwitcherActions.test.js.snap

@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`IpsObfuscationSwitcher actions should handleError 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "test error",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`IpsObfuscationSwitcher actions should handleToggle 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "ipsObfuscationEnabled": true,
+      },
+      "type": "IPS_OBFUSCATION_TOGGLE",
+    },
+  ],
+]
+`;

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

@@ -0,0 +1,20 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import * as actions from './IpsObfuscationSwitcherActions';
+import IpsObfuscationSwitcher from './IpsObfuscationSwitcher';
+import { selectIpsObfuscationEnabled } from '../AccountList/AccountListSelectors';
+
+// map state to props
+const mapStateToProps = state => ({
+  ipsObfuscationEnabled: selectIpsObfuscationEnabled(state),
+});
+
+// map action dispatchers to props
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+// export connected component
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(IpsObfuscationSwitcher);

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

@@ -21,7 +21,12 @@ class SyncButton extends React.Component {
     return (
       <React.Fragment>
         <SyncModal show={this.state.showModal} toggleModal={this.toggleModal} />
-        <Button className="sync_button" onClick={handleClick} bsSize="lg">
+        <Button
+          className="sync_button"
+          onClick={handleClick}
+          bsSize="lg"
+          disabled={status === STATUS.PENDING}
+        >
           {!cloudToken && (
             <span>
               <Icon name="warning" />{' '}
@@ -40,12 +45,13 @@ class SyncButton extends React.Component {
 }
 
 SyncButton.propTypes = {
-  cloudToken: PropTypes.string.isRequired,
+  cloudToken: PropTypes.string,
   handleSync: PropTypes.func.isRequired,
   status: PropTypes.string,
 };
 
 SyncButton.defaultProps = {
+  cloudToken: null,
   status: null,
 };
 

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

@@ -6,7 +6,7 @@ import Toast from './components/Toast';
 import {
   INVENTORY_SYNC_REQUEST,
   INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_FAILURE,
+  INVENTORY_SYNC_ERROR,
 } from './SyncButtonConstants';
 
 export const handleSync = () => async dispatch => {
@@ -40,20 +40,18 @@ export const handleSync = () => async dispatch => {
     response: { data: { message: toastMessage } = {} } = {},
   }) {
     dispatch({
-      type: INVENTORY_SYNC_FAILURE,
+      type: INVENTORY_SYNC_ERROR,
       payload: {
         error: message,
       },
     });
 
-    if (toastMessage) {
-      dispatch(
-        addToast({
-          sticky: true,
-          type: 'error',
-          message: toastMessage,
-        })
-      );
-    }
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message: toastMessage || message,
+      })
+    );
   }
 };

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

@@ -1,3 +1,3 @@
 export const INVENTORY_SYNC_REQUEST = 'INVENTORY_SYNC_REQUEST';
 export const INVENTORY_SYNC_SUCCESS = 'INVENTORY_SYNC_SUCCESS';
-export const INVENTORY_SYNC_FAILURE = 'INVENTORY_SYNC_FAILURE';
+export const INVENTORY_SYNC_ERROR = 'INVENTORY_SYNC_ERROR';

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

@@ -3,7 +3,7 @@ import { STATUS } from 'foremanReact/constants';
 import {
   INVENTORY_SYNC_REQUEST,
   INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_FAILURE,
+  INVENTORY_SYNC_ERROR,
 } from './SyncButtonConstants';
 
 export default (
@@ -24,7 +24,7 @@ export default (
         syncHosts,
         disconnectHosts,
       });
-    case INVENTORY_SYNC_FAILURE:
+    case INVENTORY_SYNC_ERROR:
       return state.merge({
         ...state,
         status: STATUS.ERROR,

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

@@ -8,6 +8,24 @@ API.post.mockImplementation(async () => successResponse);
 
 const fixtures = {
   'should handleSync': () => handleSync(),
+  'should handleSync with error message': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network error!'))
+    );
+
+    return handleSync();
+  },
+  'should handleSync with custom error message': () => {
+    API.post.mockImplementationOnce(() => {
+      const customError = new Error('Server error!');
+      customError.response = {
+        data: { message: 'Custom error to display in a toast' },
+      };
+      return Promise.reject(customError);
+    });
+
+    return handleSync();
+  },
 };
 
 describe('SyncButton actions', () => testActionSnapshotWithFixtures(fixtures));