foreman_rh_cloud 1.0.7 → 1.0.8

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

@@ -32,6 +32,8 @@ export const processStatusName = 'upload_report_status';
 
 export const autoUploadEnabled = true;
 
+export const hostObfuscationEnabled = true;
+
 export const filterTerm = 'some_filter';
 
 export const props = {
@@ -41,3 +43,7 @@ export const props = {
   stopAccountStatusPolling: noop,
   pollingProcessID,
 };
+
+export const fetchAccountsStatusResponse = {
+  data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
+};

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -11,13 +11,14 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts, autoUploadEnabled },
+      data: { accounts, autoUploadEnabled, hostObfuscationEnabled },
     } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     });
   } catch (error) {

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js

@@ -1,11 +1,12 @@
 import Immutable from 'seamless-immutable';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -22,6 +23,7 @@ export default (state = initialState, action) => {
       accountID,
       processStatusName,
       autoUploadEnabled,
+      hostObfuscationEnabled,
     } = {},
   } = action;
 
@@ -31,6 +33,7 @@ export default (state = initialState, action) => {
         ...state,
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -57,6 +60,11 @@ export default (state = initialState, action) => {
         ...state,
         autoUploadEnabled,
       });
+    case HOST_OBFUSCATION_TOGGLE:
+      return state.merge({
+        ...state,
+        hostObfuscationEnabled,
+      });
     default:
       return state;
   }

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js

@@ -2,9 +2,16 @@ import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;
+
 export const selectAccounts = state => selectAccountsList(state).accounts;
+
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
+
 export const selectError = state => selectAccountsList(state).error;
+
 export const selectAutoUploadEnabled = state =>
   selectAccountsList(state).autoUploadEnabled;
+
+export const selectHostObfuscationEnabled = state =>
+  selectAccountsList(state).hostObfuscationEnabled;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js

@@ -1,13 +1,20 @@
 import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import API from 'foremanReact/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
   stopAccountStatusPolling,
   restartProcess,
 } from '../AccountListActions';
-import { pollingProcessID } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  fetchAccountsStatusResponse,
+} from '../AccountList.fixtures';
 import { accountID, activeTab } from '../../Dashboard/Dashboard.fixtures';
 
+jest.mock('foremanReact/API');
+API.get.mockImplementation(async () => fetchAccountsStatusResponse);
+
 const fixtures = {
   'should fetchAccountsStatus': () => fetchAccountsStatus(),
   'should startAccountStatusPolling': () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js

@@ -15,8 +15,10 @@ import {
   accountID,
   processStatusName,
   autoUploadEnabled,
+  hostObfuscationEnabled,
 } from '../AccountList.fixtures';
 import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -26,6 +28,7 @@ const fixtures = {
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
       },
     },
   },
@@ -65,6 +68,14 @@ const fixtures = {
       },
     },
   },
+  'should handle HOST_OBFUSCATION_TOGGLE': {
+    action: {
+      type: HOST_OBFUSCATION_TOGGLE,
+      payload: {
+        hostObfuscationEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListSelectors.test.js

@@ -4,19 +4,22 @@ import {
   selectAccounts,
   selectPollingProcessID,
   selectAutoUploadEnabled,
+  selectHostObfuscationEnabled,
 } from '../AccountListSelectors';
 import {
   pollingProcessID,
   accounts,
   autoUploadEnabled,
+  hostObfuscationEnabled,
 } from '../AccountList.fixtures';
-import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = inventoryStateWrapper({
+const state = rhCloudStateWrapper({
   accountsList: {
     accounts,
     pollingProcessID,
     autoUploadEnabled,
+    hostObfuscationEnabled,
   },
 });
 
@@ -27,6 +30,8 @@ const fixtures = {
     selectPollingProcessID(state),
   'should return AccountList autoUploadEnabled': () =>
     selectAutoUploadEnabled(state),
+  'should return AccountList hostObfuscationEnabled': () =>
+    selectHostObfuscationEnabled(state),
 };
 
 describe('AccountList selectors', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListActions.test.js.snap

@@ -5,9 +5,27 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "error": "Cannot read property 'data' of undefined",
+        "accounts": Object {
+          "Account1": Object {
+            "generate_report_status": "running",
+            "label": "test_org1",
+            "upload_report_status": "running",
+          },
+          "Account2": Object {
+            "generate_report_status": "failure",
+            "label": "test_org2",
+            "upload_report_status": "unknown",
+          },
+          "Account3": Object {
+            "generate_report_status": "running",
+            "label": "test_org3",
+            "upload_report_status": "success",
+          },
+        },
+        "autoUploadEnabled": true,
+        "hostObfuscationEnabled": true,
       },
-      "type": "INVENTORY_ACCOUNT_STATUS_POLLING_ERROR",
+      "type": "INVENTORY_ACCOUNT_STATUS_POLLING",
     },
   ],
 ]

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap

@@ -9,6 +9,15 @@ Object {
 }
 `;
 
+exports[`AccountList reducer should handle HOST_OBFUSCATION_TOGGLE 1`] = `
+Object {
+  "accounts": Object {},
+  "error": null,
+  "hostObfuscationEnabled": true,
+  "pollingProcessID": 0,
+}
+`;
+
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
   "accounts": Object {
@@ -30,6 +39,7 @@ Object {
   },
   "autoUploadEnabled": true,
   "error": null,
+  "hostObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap

@@ -22,6 +22,8 @@ Object {
 
 exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
 
+exports[`AccountList selectors should return AccountList hostObfuscationEnabled 1`] = `true`;
+
 exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
 
 exports[`AccountList selectors should return AccountsList 1`] = `
@@ -44,6 +46,7 @@ Object {
     },
   },
   "autoUploadEnabled": true,
+  "hostObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js

@@ -6,17 +6,17 @@ import './autoUploadSwitcher.scss';
 
 const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
   <div className="auto_upload_switcher">
-    <Switch
-      size="mini"
-      value={autoUploadEnabled}
-      onChange={() => handleToggle(autoUploadEnabled)}
-    />
+    <span>Auto upload</span>
     <FieldLevelHelp
       content={__(
         'Enable automatic upload of your host inventory to the Red Hat cloud'
       )}
     />
-    <span>Allow Auto Upload</span>
+    <Switch
+      size="mini"
+      value={autoUploadEnabled}
+      onChange={() => handleToggle(autoUploadEnabled)}
+    />
   </div>
 );
 

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

@@ -4,6 +4,15 @@ exports[`AutoUploadSwitcher rendering render with props 1`] = `
 <div
   className="auto_upload_switcher"
 >
+  <span>
+    Auto upload
+  </span>
+  <FieldLevelHelp
+    buttonClass=""
+    content="Enable automatic upload of your host inventory to the Red Hat cloud"
+    placement="top"
+    rootClose={true}
+  />
   <Switch
     animate={true}
     baseClass="bootstrap-switch"
@@ -25,14 +34,5 @@ exports[`AutoUploadSwitcher rendering render with props 1`] = `
     value={true}
     wrapperClass="wrapper"
   />
-  <FieldLevelHelp
-    buttonClass=""
-    content="Enable automatic upload of your host inventory to the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <span>
-    Allow Auto Upload
-  </span>
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/autoUploadSwitcher.scss

@@ -1,3 +1,3 @@
 .auto_upload_switcher {
-  float: right;
+  margin-bottom: 5px;
 }

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -14,13 +14,13 @@ import {
   activeTab,
   accountID,
 } from '../Dashboard.fixtures';
-import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
 jest.mock('foremanReact/API');
 API.get.mockImplementation(() => serverMock);
 
 const runWithGetState = (state, action, params) => dispatch => {
-  const getState = () => inventoryStateWrapper({ dashboard: state });
+  const getState = () => rhCloudStateWrapper({ dashboard: state });
   action(params)(dispatch, getState);
 };
 

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardSelectors.test.js

@@ -13,9 +13,9 @@ import {
   activeTab,
   accountID,
 } from '../Dashboard.fixtures';
-import { inventoryStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = inventoryStateWrapper({
+const state = rhCloudStateWrapper({
   dashboard: {
     [accountID]: {
       generating: {

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

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

data/webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.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 HostObfuscationSwitcher = ({ hostObfuscationEnabled, handleToggle }) => (
+  <div className="host_obfuscation_switcher">
+    <span>Obfuscate host names</span>
+    <FieldLevelHelp
+      content={__('Obfuscate host names sent to the Red Hat cloud')}
+    />
+    <Switch
+      size="mini"
+      value={hostObfuscationEnabled}
+      onChange={() => handleToggle(hostObfuscationEnabled)}
+    />
+  </div>
+);
+
+HostObfuscationSwitcher.propTypes = {
+  hostObfuscationEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+};
+
+HostObfuscationSwitcher.defaultProps = {
+  hostObfuscationEnabled: false,
+};
+
+export default HostObfuscationSwitcher;

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

@@ -0,0 +1,30 @@
+import API from 'foremanReact/API';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
+import {
+  HOST_OBFUSCATION_TOGGLE,
+  HOST_OBFUSCATION_TOGGLE_ERROR,
+} from './HostObfuscationSwitcherConstants';
+
+export const handleToggle = currentHostObfuscationEnabled => async dispatch => {
+  const toggledHostObfuscationEnabled = !currentHostObfuscationEnabled;
+  try {
+    const {
+      data: { hostObfuscationEnabled },
+    } = await API.post(inventoryUrl('host_obfuscation'), {
+      value: toggledHostObfuscationEnabled,
+    });
+    dispatch({
+      type: HOST_OBFUSCATION_TOGGLE,
+      payload: {
+        hostObfuscationEnabled,
+      },
+    });
+  } catch (error) {
+    dispatch({
+      type: HOST_OBFUSCATION_TOGGLE_ERROR,
+      payload: {
+        error: error.message,
+      },
+    });
+  }
+};

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

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

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

@@ -0,0 +1,14 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { noop } from 'patternfly-react';
+
+import HostObfuscationSwitcher from '../HostObfuscationSwitcher';
+
+const fixtures = {
+  'render with props': { hostObfuscationEnabled: true, handleToggle: noop },
+  /** fixtures, props for the component */
+};
+
+describe('HostObfuscationSwitcher', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(HostObfuscationSwitcher, fixtures));
+});

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

@@ -0,0 +1,14 @@
+import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import API from 'foremanReact/API';
+import { handleToggle } from '../HostObfuscationSwitcherActions';
+import { handleToggleResponse } from '../HostObfuscationSwitcher.fixtures';
+
+jest.mock('foremanReact/API');
+API.post.mockImplementation(async () => handleToggleResponse);
+
+const fixtures = {
+  'should handleToggle': () => handleToggle(),
+};
+
+describe('HostObfuscationSwitcher actions', () =>
+  testActionSnapshotWithFixtures(fixtures));