foreman_rh_cloud 2.0.11 → 3.0.14

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 '@theforeman/test';
+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 '@theforeman/test';
+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));

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

@@ -1,10 +1,9 @@
 import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 import reducer from '../SyncButtonReducer';
-import { syncHosts, disconnectHosts, error } from './SyncButtonFixtures';
+import { syncHosts, disconnectHosts } from './SyncButtonFixtures';
 import {
   INVENTORY_SYNC_REQUEST,
   INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_FAILURE,
 } from '../SyncButtonConstants';
 
 const fixtures = {
@@ -21,12 +20,6 @@ const fixtures = {
       payload: { syncHosts, disconnectHosts },
     },
   },
-  'should handle INVENTORY_SYNC_FAILURE': {
-    action: {
-      type: INVENTORY_SYNC_FAILURE,
-      payload: { error },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -34,3 +34,65 @@ Array [
   ],
 ]
 `;
+
+exports[`SyncButton actions should handleSync with custom error message 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {},
+      "type": "INVENTORY_SYNC_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "error": "Server error!",
+      },
+      "type": "INVENTORY_SYNC_ERROR",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Custom error to display in a toast",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`SyncButton actions should handleSync with error message 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {},
+      "type": "INVENTORY_SYNC_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "error": "Network error!",
+      },
+      "type": "INVENTORY_SYNC_ERROR",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Network error!",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;

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

@@ -1,12 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle INVENTORY_SYNC_FAILURE 1`] = `
-Object {
-  "error": "some-error",
-  "status": "ERROR",
-}
-`;
-
 exports[`AccountList reducer should handle INVENTORY_SYNC_REQUEST 1`] = `
 Object {
   "error": null,

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

@@ -21,10 +21,10 @@ const SyncModal = ({ show, toggleModal }) => (
     <Modal.Body>
       <Grid>
         <p>
-          {__(`Please go over the following steps to add a RHSM API token:`)}
+          {__(`Please go over the following steps to add a Red Hat API token:`)}
         </p>
         <p>
-          {__(`1. Obtain an RHSM API token: `)}
+          {__(`1. Obtain an Red Hat API token: `)}
           <a
             href="https://access.redhat.com/management/api"
             target="_blank"

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

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { noop, Grid, Button, Icon } from 'patternfly-react';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 import './tabHeader.scss';
 
 const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
@@ -12,7 +13,11 @@ const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
     <Grid.Col sm={6}>
       <div className="tab-action-buttons">
         {onRestart ? (
-          <Button bsStyle="primary" onClick={onRestart}>
+          <Button
+            bsStyle="primary"
+            onClick={onRestart}
+            disabled={isExitCodeLoading(exitCode)}
+          >
             {__('Restart')}
           </Button>
         ) : null}

data/webpack/ForemanInventoryUpload/Components/Terminal/Terminal.js

@@ -4,6 +4,7 @@ import { Grid, Spinner } from 'patternfly-react';
 import { isEqual } from 'lodash';
 import './terminal.scss';
 import { isTerminalScrolledDown } from './TerminalHelper';
+import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 
 class Terminal extends React.Component {
   constructor(props) {
@@ -67,10 +68,7 @@ class Terminal extends React.Component {
     } else {
       modifiedLogs = <p>{logs}</p>;
     }
-    const exitCodeLowerCase = exitCode.toLowerCase();
-    const loading =
-      exitCodeLowerCase.indexOf('running') !== -1 ||
-      exitCodeLowerCase.indexOf('restarting') !== -1;
+    const loading = isExitCodeLoading(exitCode);
     return (
       <Grid.Col sm={12}>
         <div

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -15,3 +15,11 @@ export const getActionsHistoryUrl = () =>
   foremanUrl(
     '/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
   );
+
+export const isExitCodeLoading = exitCode => {
+  const exitCodeLC = exitCode.toLowerCase();
+  return (
+    exitCodeLC.indexOf('running') !== -1 ||
+    exitCodeLC.indexOf('restarting') !== -1
+  );
+};

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

@@ -0,0 +1,92 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Text, TextVariants, Popover, Button } from '@patternfly/react-core';
+import { InfoAltIcon, CaretRightIcon } from '@patternfly/react-icons';
+import { FormGroup, Grid } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from '../../../ForemanRhCloudHelpers';
+import Switcher from '../../../common/Switcher';
+import AdvancedSettings from './components/AdvancedSettings';
+
+const InventoryAutoUploadSwitcher = ({
+  autoUploadEnabled,
+  handleToggle,
+  fetchSettings,
+}) => {
+  useEffect(() => {
+    fetchSettings();
+  }, [fetchSettings]);
+
+  return (
+    <FormGroup>
+      <Grid>
+        <h3>{__('Red Hat Cloud Inventory')}</h3>
+        <hr />
+        <Grid.Row>
+          <Switcher
+            id="auto-upload"
+            label={__('Inventory Auto Upload')}
+            tooltip={__(
+              'Enable automatic upload of your hosts inventory to the Red Hat cloud'
+            )}
+            isChecked={autoUploadEnabled}
+            onChange={() => handleToggle(autoUploadEnabled)}
+            labelCol={5}
+          />
+
+          <Grid.Col sm={5}>
+            <Popover
+              headerContent={<strong>Advanced Inventory Settings</strong>}
+              bodyContent={
+                <AdvancedSettings
+                  autoUploadEnabled={autoUploadEnabled}
+                  handleToggle={handleToggle}
+                />
+              }
+              position="right"
+            >
+              <Button
+                variant="secondary"
+                style={{ fontSize: 'small', marginTop: '-4px' }}
+              >
+                {__('Show Advanced Settings')} <CaretRightIcon />
+              </Button>
+            </Popover>
+          </Grid.Col>
+        </Grid.Row>
+        <br />
+        <Grid.Row>
+          <Grid.Col sm={12}>
+            <Text component={TextVariants.p}>
+              <InfoAltIcon /> {__('More details can be found in')}{' '}
+              <Text
+                component={TextVariants.a}
+                href={foremanUrl('/foreman_rh_cloud/inventory_upload')}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <strong>
+                  {__('Configure')}
+                  {' > '}
+                  {__('Inventory Upload')}
+                </strong>
+              </Text>
+            </Text>
+          </Grid.Col>
+        </Grid.Row>
+      </Grid>
+    </FormGroup>
+  );
+};
+
+InventoryAutoUploadSwitcher.propTypes = {
+  autoUploadEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+  fetchSettings: PropTypes.func.isRequired,
+};
+
+InventoryAutoUploadSwitcher.defaultProps = {
+  autoUploadEnabled: true,
+};
+
+export default InventoryAutoUploadSwitcher;