foreman_rh_cloud 1.0.4 → 2.0.6

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/__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,
@@ -36,4 +36,17 @@ const fixtures = {
     runWithGetState({ activeTab: 'reports' }, toggleFullScreen, accountID),
 };
 
-describe('Dashboard actions', () => testActionSnapshotWithFixtures(fixtures));
+describe('Dashboard actions', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    delete window.location;
+    window.location = { href: jest.fn() };
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  return testActionSnapshotWithFixtures(fixtures);
+});

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
-import Dashboard, { reducers } from '../index';
+import Dashboard from '../Dashboard';
+import reducers from '../../../ForemanInventoryUploadReducers';
 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,

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

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Grid } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import AutoUploadSwitcher from '../AutoUploadSwitcher';
+
+const PageHeader = () => (
+  <React.Fragment>
+    <Grid.Row>
+      <Grid.Col xs={12}>
+        <h1>{__('Red Hat Inventory Uploads')}</h1>
+      </Grid.Col>
+    </Grid.Row>
+    <Grid.Row>
+      <Grid.Col xs={4} xsOffset={8}>
+        <AutoUploadSwitcher />
+      </Grid.Col>
+    </Grid.Row>
+  </React.Fragment>
+);
+
+export default PageHeader;

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import PageHeader from '../PageHeader';
+
+const fixtures = {
+  'render without Props': {},
+  /** fixtures, props for the component */
+};
+
+describe('PageHeader', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(PageHeader, fixtures));
+});

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

@@ -0,0 +1,33 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageHeader rendering render without Props 1`] = `
+<Fragment>
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={12}
+    >
+      <h1>
+        Red Hat Inventory Uploads
+      </h1>
+    </Col>
+  </Row>
+  <Row
+    bsClass="row"
+    componentClass="div"
+  >
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={4}
+      xsOffset={8}
+    >
+      <Connect(AutoUploadSwitcher) />
+    </Col>
+  </Row>
+</Fragment>
+`;

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

@@ -0,0 +1 @@
+export { default } from './PageHeader';

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,3 +1,4 @@
 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 }) =>
-  date ? (
+const ScheduledRun = ({ date, autoUploadEnabled }) =>
+  autoUploadEnabled && date ? (
     <Grid.Col sm={12} className="scheduled_run">
       <p>
         <Icon name="calendar" />
@@ -18,10 +18,12 @@ const ScheduledRun = ({ date }) =>
 
 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,10 +1,9 @@
-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,5 +21,3 @@ exports[`ScheduledRun rendering render with Props 1`] = `
   </p>
 </Col>
 `;
-
-exports[`ScheduledRun rendering render without Props 1`] = `""`;

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

@@ -1 +1,12 @@
-export { default } from './ScheduledRun';
+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);

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/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}
   />
-  <ScheduledRun
+  <Connect(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/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/__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,7 +1,7 @@
 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';
 

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

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

data/webpack/ForemanInventoryUpload/ForemanInventoryUpload.js

@@ -1,14 +1,15 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { Grid } from 'patternfly-react';
 import AccountList from './Components/AccountList';
+import PageHeader from './Components/PageHeader';
 
 const ForemanInventoryUpload = () => (
   <IntlProvider locale={navigator.language}>
-    <div className="inventory-upload">
-      <h1>{__('Red Hat Inventory Uploads')}</h1>
+    <Grid fluid className="inventory-upload">
+      <PageHeader />
       <AccountList />
-    </div>
+    </Grid>
   </IntlProvider>
 );
 

data/webpack/ForemanInventoryUpload/ForemanInventoryUpload.test.js

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

data/webpack/ForemanInventoryUpload/__snapshots__/ForemanInventoryUpload.test.js.snap

@@ -4,13 +4,14 @@ exports[`ForemanInventoryUpload render without Props 1`] = `
 <IntlProvider
   locale="en-US"
 >
-  <div
+  <Grid
+    bsClass="container"
     className="inventory-upload"
+    componentClass="div"
+    fluid={true}
   >
-    <h1>
-      Red Hat Inventory Uploads
-    </h1>
+    <PageHeader />
     <Connect(AccountList) />
-  </div>
+  </Grid>
 </IntlProvider>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -109,9 +109,11 @@ files:
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
 - app/helpers/foreman_inventory_upload_helper.rb
+- app/models/setting/rh_cloud.rb
 - app/views/foreman_inventory_upload/layouts/react.html.erb
 - config/routes.rb
 - lib/foreman_inventory_upload.rb
+- lib/foreman_inventory_upload/async/async_helpers.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
 - lib/foreman_inventory_upload/async/generate_report_job.rb
 - lib/foreman_inventory_upload/async/progress_output.rb
@@ -141,9 +143,11 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
+- test/unit/fact_helpers_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
+- test/unit/slice_generator_test.rb.orig
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js
@@ -191,6 +195,16 @@ files:
 - webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap
 - webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss
 - webpack/ForemanInventoryUpload/Components/AccountList/index.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.fixtures.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherActions.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcherConstants.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcher.test.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/AutoUploadSwitcherActions.test.js
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcher.test.js.snap
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/__tests__/__snapshots__/AutoUploadSwitcherActions.test.js.snap
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/autoUploadSwitcher.scss
+- webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/index.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.fixtures.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js
 - webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.stories.js
@@ -231,6 +245,10 @@ files:
 - webpack/ForemanInventoryUpload/Components/NavContainer/__tests__/__snapshots__/NavContainer.test.js.snap
 - webpack/ForemanInventoryUpload/Components/NavContainer/index.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/navContainer.scss
+- webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/PageHeader.test.js
+- webpack/ForemanInventoryUpload/Components/PageHeader/__tests__/__snapshots__/PageHeader.test.js.snap
+- webpack/ForemanInventoryUpload/Components/PageHeader/index.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.fixtures.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerate.js
 - webpack/ForemanInventoryUpload/Components/ReportGenerate/ReportGenerateHelper.js
@@ -304,13 +322,6 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/index.js
-- webpack/stories/ForemanInventoryUploadReducers.js
-- webpack/stories/configureStore.js
-- webpack/stories/decorators/index.js
-- webpack/stories/decorators/withCardsDecorator.js
-- webpack/stories/index.js
-- webpack/stories/index.scss
-- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
@@ -342,5 +353,7 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/slice_generator_test.rb.orig
+- test/unit/fact_helpers_test.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/slice_generator_test.rb