foreman_rh_cloud 1.0.18 → 2.0.4

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

@@ -1,19 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import Dashboard from './index';
-import { generating, uploading } from './Dashboard.fixtures';
 
-const store = configureStore();
+export default {
+  title: 'Dashboard',
+  component: Dashboard,
+};
 
-storiesOf('Dashboard', module)
-  .addDecorator(withKnobs)
-  .add('Dashboard', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <Dashboard generating={generating} uploading={uploading} />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <Dashboard />;

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.open(inventoryUrl(`${accountID}/uploads/file`), '_blank');
+  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__/Dashboard.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { shallow, testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import Dashboard from '../Dashboard';
 import { props } from '../Dashboard.fixtures';
 

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

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import {
   startPolling,
@@ -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 { IntegrationTestHelper } from '@theforeman/test';
 
-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__/DashboardReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   INVENTORY_POLLING_START,

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectDashboard,
   selectPollingProcessID,
@@ -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/FileDownload/__tests__/FileDownload.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import FileDownload from '../FileDownload';
 

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__/FullScreenModal.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import FullScreenModal from '../FullScreenModal';
 

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/NavContainer/NavContainer.fixtures.js

@@ -1,10 +1,13 @@
+import React from 'react';
+import { noop } from 'patternfly-react';
+
 export const props = {
   items: [
     {
       icon: 'some-icon',
       name: 'some-name',
-      component: jest.fn,
-      onClick: jest.fn,
+      component: () => <p>test</p>,
+      onClick: noop,
     },
   ],
 };

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { mount } from 'enzyme';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { mount, testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import NavContainer from '../NavContainer';
 import { props } from '../NavContainer.fixtures';
 

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

@@ -45,7 +45,7 @@ exports[`NavContainer rendering render with Props 1`] = `
         eventKey={0}
         key="0"
       >
-        <bound fn />
+        <component />
       </TabPane>
     </TabContent>
     <FullScreenModal

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ReportGenerate from '../ReportGenerate';
 import { props } from '../ReportGenerate.fixtures';

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ReportUpload from '../ReportUpload';
 import { props } from '../ReportUpload.fixtures';

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

@@ -1,9 +1,10 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 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__/StatusChart.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import StatusChart from '../StatusChart';
 

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__/TabBody.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TabBody from '../TabBody';
 

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/__tests__/TabContainer.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TabContainer from '../TabContainer';
 

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/TabFooter/__tests__/TabFooter.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TabFooter from '../TabFooter';
 

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}

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TabHeader from '../TabHeader';
 

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

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