foreman_rh_cloud 2.0.5 → 2.0.10

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

@@ -5,9 +5,28 @@ 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,
+        "cloudToken": "some-cloud-token",
+        "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 {
@@ -29,7 +38,9 @@ Object {
     },
   },
   "autoUploadEnabled": true,
+  "cloudToken": "some-cloud-token",
   "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/AccountList/index.js

@@ -9,12 +9,14 @@ import {
   selectPollingProcessID,
   selectError,
 } from './AccountListSelectors';
+import { selectFilterTerm } from '../InventoryFilter/InventoryFilterSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
   accounts: selectAccounts(state),
   pollingProcessID: selectPollingProcessID(state),
   error: selectError(state),
+  filterTerm: selectFilterTerm(state),
 });
 
 // map action dispatchers to props

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/AutoUploadSwitcherActions.js

@@ -1,4 +1,5 @@
 import API from 'foremanReact/API';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   AUTO_UPLOAD_TOGGLE,
   AUTO_UPLOAD_TOGGLE_ERROR,
@@ -9,7 +10,9 @@ export const handleToggle = currentAutoUploadEnabled => async dispatch => {
   try {
     const {
       data: { autoUploadEnabled },
-    } = await API.post('auto_upload', { value: toggledAutoUploadEnabled });
+    } = await API.post(inventoryUrl('auto_upload'), {
+      value: toggledAutoUploadEnabled,
+    });
     dispatch({
       type: AUTO_UPLOAD_TOGGLE,
       payload: {

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/DashboardActions.js

@@ -1,4 +1,6 @@
 import API from 'foremanReact/API';
+import { selectActiveTab } from './DashboardSelectors';
+import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_POLLING_START,
   INVENTORY_POLLING_STOP,
@@ -8,7 +10,6 @@ import {
   INVENTORY_REPORTS_DOWNLOAD,
   INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN,
 } from './DashboardConstants';
-import { selectActiveTab } from './DashboardSelectors';
 
 export const startPolling = (accountID, pollingProcessID) => ({
   type: INVENTORY_POLLING_START,
@@ -34,7 +35,7 @@ export const fetchLogs = accountID => async (dispatch, getState) => {
     const processController = activeTab === 'uploading' ? 'uploads' : 'reports';
     const {
       data: { output, scheduled },
-    } = await API.get(`${accountID}/${processController}/last`);
+    } = await API.get(inventoryUrl(`${accountID}/${processController}/last`));
     const outputArray = output.split('\n');
     dispatch({
       type: INVENTORY_POLLING,
@@ -66,7 +67,7 @@ export const setActiveTab = (accountID, tabName) => ({
 });
 
 export const downloadReports = accountID => {
-  window.location.href = `/foreman_inventory_upload/${accountID}/uploads/file`;
+  window.location.href = inventoryUrl(`${accountID}/uploads/file`);
   return {
     type: INVENTORY_REPORTS_DOWNLOAD,
     payload: {

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

@@ -1,4 +1,4 @@
-import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
+import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectDashboard = (state, accountID) =>
   selectForemanInventoryUpload(state).dashboard[accountID] || {};

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

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

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { IntegrationTestHelper } from '@theforeman/test';
 
 import Dashboard from '../Dashboard';
-import reducers from '../../../ForemanInventoryUploadReducers';
+import reducers from '../../../../ForemanRhCloudReducers';
 import { accountID } from '../Dashboard.fixtures';
 
 describe('Dashboard integration test', () => {

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

@@ -13,8 +13,9 @@ import {
   activeTab,
   accountID,
 } from '../Dashboard.fixtures';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 
-const state = {
+const state = rhCloudStateWrapper({
   dashboard: {
     [accountID]: {
       generating: {
@@ -29,7 +30,7 @@ const state = {
       pollingProcessID,
     },
   },
-};
+});
 
 const fixtures = {
   'should return Dashboard': () => selectDashboard(state, accountID),

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

@@ -10,7 +10,11 @@ const FullScreenModal = ({
   toggleFullScreen,
   terminalProps,
 }) => (
-  <Modal show={showFullScreen} onHide={toggleFullScreen}>
+  <Modal
+    id="full-screen-terminal"
+    show={showFullScreen}
+    onHide={toggleFullScreen}
+  >
     <Modal.Header>
       <button
         className="close"

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

@@ -8,6 +8,7 @@ exports[`FullScreenModal rendering render without Props 1`] = `
   bsClass="modal"
   dialogComponentClass={[Function]}
   enforceFocus={true}
+  id="full-screen-terminal"
   keyboard={true}
   manager={
     ModalManager {

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

@@ -1,18 +1,20 @@
-.modal-dialog {
-  width: 95%;
-  height: 95%;
-  margin: 30px 0 0 30px;
+#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/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 '@theforeman/test';
+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 '@theforeman/test';
+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));

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

@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HostObfuscationSwitcher rendering render with props 1`] = `
+<div
+  className="host_obfuscation_switcher"
+>
+  <span>
+    Obfuscate host names
+  </span>
+  <FieldLevelHelp
+    buttonClass=""
+    content="Obfuscate host names 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>
+`;