foreman_rh_cloud 0.9.14 → 1.0.4

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

@@ -13,6 +13,7 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account1"
+    initExpanded={true}
     key="0"
   />
   <ListItem
@@ -24,6 +25,7 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account2"
+    initExpanded={false}
     key="1"
   />
   <ListItem
@@ -35,9 +37,8 @@ exports[`AccountList rendering render with props 1`] = `
       }
     }
     accountID="Account3"
+    initExpanded={false}
     key="2"
   />
 </ListView>
 `;
-
-exports[`AccountList rendering show empty results 1`] = `<inventoryEmptyResults />`;

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

@@ -5,47 +5,9 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "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",
-        "excludePackages": false,
-        "hostObfuscationEnabled": true,
-        "ipsObfuscationEnabled": true,
+        "error": "Cannot read property 'data' of undefined",
       },
-      "type": "INVENTORY_ACCOUNT_STATUS_POLLING",
-    },
-  ],
-]
-`;
-
-exports[`AccountList actions should invoke toast notification upon failure 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "test error",
-          "sticky": true,
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
+      "type": "INVENTORY_ACCOUNT_STATUS_POLLING_ERROR",
     },
   ],
 ]

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

@@ -1,23 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle AUTO_UPLOAD_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "autoUploadEnabled": true,
-  "error": null,
-  "pollingProcessID": 0,
-}
-`;
-
-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 {
@@ -37,12 +19,7 @@ Object {
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
-  "cloudToken": "some-cloud-token",
   "error": null,
-  "excludePackages": false,
-  "hostObfuscationEnabled": true,
-  "ipsObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;
@@ -83,15 +60,6 @@ Object {
 }
 `;
 
-exports[`AccountList reducer should handle IPS_OBFUSCATION_TOGGLE 1`] = `
-Object {
-  "accounts": Object {},
-  "error": null,
-  "ipsObfuscationEnabled": true,
-  "pollingProcessID": 0,
-}
-`;
-
 exports[`AccountList reducer should return the initial state 1`] = `
 Object {
   "accounts": Object {},

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

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
+
 exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
@@ -20,16 +22,6 @@ Object {
 }
 `;
 
-exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
-
-exports[`AccountList selectors should return AccountList cloudToken 1`] = `"some-cloud-token"`;
-
-exports[`AccountList selectors should return AccountList excludePackages 1`] = `false`;
-
-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`] = `
 Object {
   "accounts": Object {
@@ -49,10 +41,6 @@ Object {
       "upload_report_status": "success",
     },
   },
-  "autoUploadEnabled": true,
-  "cloudToken": "some-cloud-token",
-  "excludePackages": false,
-  "hostObfuscationEnabled": true,
   "pollingProcessID": 0,
 }
 `;

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

@@ -9,14 +9,12 @@ 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/Dashboard/DashboardActions.js

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

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

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

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

@@ -14,13 +14,14 @@ 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 = () => rhCloudStateWrapper({ dashboard: state });
+  const getState = () => ({
+    dashboard: state,
+  });
   action(params)(dispatch, getState);
 };
 

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

@@ -1,8 +1,7 @@
 import React from 'react';
 import { IntegrationTestHelper } from 'react-redux-test-utils';
 
-import Dashboard from '../Dashboard';
-import reducers from '../../../../ForemanRhCloudReducers';
+import Dashboard, { reducers } from '../index';
 import { accountID } from '../Dashboard.fixtures';
 
 describe('Dashboard integration test', () => {

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

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

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

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

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

@@ -8,7 +8,6 @@ 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,20 +1,18 @@
-#full-screen-terminal {
-  .modal-dialog {
-    width: 95%;
-    height: 95%;
-    margin: 30px 0 0 30px;
+.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/ScheduledRun/ScheduledRun.fixtures.js

@@ -1,4 +1,3 @@
 export const props = {
   date: '2019-08-21T16:14:16.520+03:00',
-  autoUploadEnabled: true,
 };

data/webpack/ForemanInventoryUpload/Components/ScheduledRun/ScheduledRun.js

@@ -5,8 +5,8 @@ import { FormattedRelative } from 'react-intl';
 import { translate as __ } from 'foremanReact/common/I18n';
 import './scheduledRun.scss';
 
-const ScheduledRun = ({ date, autoUploadEnabled }) =>
-  autoUploadEnabled && date ? (
+const ScheduledRun = ({ date }) =>
+  date ? (
     <Grid.Col sm={12} className="scheduled_run">
       <p>
         <Icon name="calendar" />
@@ -18,12 +18,10 @@ const ScheduledRun = ({ date, autoUploadEnabled }) =>
 
 ScheduledRun.propTypes = {
   date: PropTypes.string,
-  autoUploadEnabled: PropTypes.bool,
 };
 
 ScheduledRun.defaultProps = {
   date: null,
-  autoUploadEnabled: true,
 };
 
 export default ScheduledRun;

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

@@ -4,6 +4,7 @@ import ScheduledRun from '../ScheduledRun';
 import { props } from '../ScheduledRun.fixtures';
 
 const fixtures = {
+  'render without Props': {},
   'render with Props': props,
 };
 

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

@@ -21,3 +21,5 @@ exports[`ScheduledRun rendering render with Props 1`] = `
   </p>
 </Col>
 `;
+
+exports[`ScheduledRun rendering render without Props 1`] = `""`;

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

@@ -1,12 +1 @@
-import { connect } from 'react-redux';
-
-import ScheduledRun from './ScheduledRun';
-import { selectAutoUploadEnabled } from '../AccountList/AccountListSelectors';
-
-// map state to props
-const mapStateToProps = state => ({
-  autoUploadEnabled: selectAutoUploadEnabled(state),
-});
-
-// export connected component
-export default connect(mapStateToProps)(ScheduledRun);
+export { default } from './ScheduledRun';

data/webpack/ForemanInventoryUpload/Components/StatusChart/StatusChart.js

@@ -27,7 +27,7 @@ const StatusChart = ({ completed }) => {
     <Grid.Col sm={4}>
       <div className="status-chart">
         <DonutChart
-          id="donut-chart-1"
+          id="donunt-chart-1"
           size={{
             width: 210,
             height: 210,

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

@@ -43,7 +43,7 @@ exports[`StatusChart rendering render without Props 1`] = `
           "width": 11,
         }
       }
-      id="donut-chart-1"
+      id="donunt-chart-1"
       legend={
         Object {
           "show": false,

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

@@ -12,7 +12,7 @@ exports[`TabBody rendering render without Props 1`] = `
     exitCode=""
     logs={null}
   />
-  <Connect(ScheduledRun)
+  <ScheduledRun
     date={null}
   />
 </Row>

data/webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.scss

@@ -1,4 +1,4 @@
-.dashboard .tab-content {
+.tab-content {
   padding: 20px;
   min-height: 0;
 

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

@@ -2,7 +2,6 @@ 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 }) => (
@@ -13,11 +12,7 @@ const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
     <Grid.Col sm={6}>
       <div className="tab-action-buttons">
         {onRestart ? (
-          <Button
-            bsStyle="primary"
-            onClick={onRestart}
-            disabled={isExitCodeLoading(exitCode)}
-          >
+          <Button bsStyle="primary" onClick={onRestart}>
             {__('Restart')}
           </Button>
         ) : null}