foreman_inventory_upload 1.0.0.beta7 → 1.0.0

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

@@ -9,7 +9,7 @@ import {
 } from '../AccountListConstants';
 import reducer from '../AccountListReducer';
 import {
-  statuses,
+  accounts,
   error,
   pollingProcessID,
   accountID,
@@ -22,7 +22,7 @@ const fixtures = {
     action: {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
-        statuses,
+        accounts,
       },
     },
   },

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

@@ -1,15 +1,15 @@
 import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 import {
   selectAccountsList,
-  selectStatuses,
+  selectAccounts,
   selectPollingProcessID,
 } from '../AccountListSelectors';
-import { pollingProcessID, statuses } from '../AccountList.fixtures';
+import { pollingProcessID, accounts } from '../AccountList.fixtures';
 
 const state = {
   ForemanInventoryUpload: {
     accountsList: {
-      statuses,
+      accounts,
       pollingProcessID,
     },
   },
@@ -17,7 +17,7 @@ const state = {
 
 const fixtures = {
   'should return AccountsList': () => selectAccountsList(state),
-  'should return AccountList statuses': () => selectStatuses(state),
+  'should return AccountList accounts': () => selectAccounts(state),
   'should return AccountList pollingProcessID': () =>
     selectPollingProcessID(state),
 };

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

@@ -5,37 +5,40 @@ exports[`AccountList rendering render with props 1`] = `
   className="account_list"
 >
   <ListItem
-    initExpanded={true}
-    key="0"
-    name="Account1"
-    statuses={
+    account={
       Object {
         "generate_report_status": "running",
+        "label": "test_org1",
         "upload_report_status": "running",
       }
     }
+    accountID="Account1"
+    initExpanded={true}
+    key="0"
   />
   <ListItem
-    initExpanded={false}
-    key="1"
-    name="Account2"
-    statuses={
+    account={
       Object {
         "generate_report_status": "failure",
+        "label": "test_org2",
         "upload_report_status": "unknown",
       }
     }
+    accountID="Account2"
+    initExpanded={false}
+    key="1"
   />
   <ListItem
-    initExpanded={false}
-    key="2"
-    name="Account3"
-    statuses={
+    account={
       Object {
         "generate_report_status": "running",
+        "label": "test_org3",
         "upload_report_status": "success",
       }
     }
+    accountID="Account3"
+    initExpanded={false}
+    key="2"
   />
 </ListView>
 `;

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

@@ -2,65 +2,68 @@
 
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
-  "error": null,
-  "pollingProcessID": 0,
-  "statuses": 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",
     },
   },
+  "error": null,
+  "pollingProcessID": 0,
 }
 `;
 
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING_ERROR 1`] = `
 Object {
+  "accounts": Object {},
   "error": "some-error",
   "pollingProcessID": 0,
-  "statuses": Object {},
 }
 `;
 
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING_START 1`] = `
 Object {
+  "accounts": Object {},
   "error": null,
   "pollingProcessID": 0,
-  "statuses": Object {},
 }
 `;
 
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING_STOP 1`] = `
 Object {
+  "accounts": Object {},
   "error": null,
   "pollingProcessID": 0,
-  "statuses": Object {},
 }
 `;
 
 exports[`AccountList reducer should handle INVENTORY_PROCESS_RESTART 1`] = `
 Object {
-  "error": null,
-  "pollingProcessID": 0,
-  "statuses": Object {
+  "accounts": Object {
     "user@redhat.com": Object {
       "upload_report_status": "Restarting...",
     },
   },
+  "error": null,
+  "pollingProcessID": 0,
 }
 `;
 
 exports[`AccountList reducer should return the initial state 1`] = `
 Object {
+  "accounts": Object {},
   "error": null,
   "pollingProcessID": 0,
-  "statuses": Object {},
 }
 `;

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

@@ -2,18 +2,21 @@
 
 exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
 
-exports[`AccountList selectors should return AccountList statuses 1`] = `
+exports[`AccountList selectors should return AccountList accounts 1`] = `
 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",
   },
 }
@@ -21,20 +24,23 @@ Object {
 
 exports[`AccountList selectors should return AccountsList 1`] = `
 Object {
-  "pollingProcessID": 0,
-  "statuses": 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",
     },
   },
+  "pollingProcessID": 0,
 }
 `;

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

@@ -5,14 +5,14 @@ import * as actions from './AccountListActions';
 import reducer from './AccountListReducer';
 import AccountList from './AccountList';
 import {
-  selectStatuses,
+  selectAccounts,
   selectPollingProcessID,
   selectError,
 } from './AccountListSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
-  statuses: selectStatuses(state),
+  accounts: selectAccounts(state),
   pollingProcessID: selectPollingProcessID(state),
   error: selectError(state),
 });
@@ -24,7 +24,4 @@ const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 export const reducers = { accountsList: reducer };
 
 // export connected component
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(AccountList);
+export default connect(mapStateToProps, mapDispatchToProps)(AccountList);

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

@@ -45,7 +45,7 @@ class Dashboard extends React.Component {
     const {
       uploading,
       generating,
-      statuses,
+      account,
       showFullScreen,
       activeTab,
     } = this.props;
@@ -59,7 +59,7 @@ class Dashboard extends React.Component {
             props: {
               ...generating,
               restartProcess: this.handleRestart,
-              exitCode: statuses.generate_report_status,
+              exitCode: account.generate_report_status,
               toggleFullScreen: this.handleToggleFullScreen,
             },
             onClick: () => this.handleTabChange('generating'),
@@ -72,7 +72,7 @@ class Dashboard extends React.Component {
               ...uploading,
               restartProcess: this.handleRestart,
               downloadReports: this.handleDownload,
-              exitCode: statuses.upload_report_status,
+              exitCode: account.upload_report_status,
               toggleFullScreen: this.handleToggleFullScreen,
             },
             onClick: () => this.handleTabChange('uploading'),
@@ -115,7 +115,7 @@ Dashboard.propTypes = {
   restartProcess: PropTypes.func,
   downloadReports: PropTypes.func,
   pollingProcessID: PropTypes.number,
-  statuses: PropTypes.shape({
+  account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
   }),
@@ -134,7 +134,7 @@ Dashboard.defaultProps = {
   restartProcess: noop,
   downloadReports: noop,
   pollingProcessID: 0,
-  statuses: {
+  account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
   },

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

@@ -31,7 +31,4 @@ const mapDispatchToProps = dispatch =>
 export const reducers = { dashboard: reducer };
 
 // export connected component
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Dashboard);
+export default connect(mapStateToProps, mapDispatchToProps)(Dashboard);

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

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`NavContainer rendering render with Props 1`] = `
-<Uncontrolled(TabContainer)
+<ForwardRef
   defaultActiveKey={0}
   id="basic-tabs-pf"
 >
@@ -54,11 +54,11 @@ exports[`NavContainer rendering render with Props 1`] = `
       toggleFullScreen={[Function]}
     />
   </div>
-</Uncontrolled(TabContainer)>
+</ForwardRef>
 `;
 
 exports[`NavContainer rendering render without Props 1`] = `
-<Uncontrolled(TabContainer)
+<ForwardRef
   defaultActiveKey={0}
   id="basic-tabs-pf"
 >
@@ -85,5 +85,5 @@ exports[`NavContainer rendering render without Props 1`] = `
       toggleFullScreen={[Function]}
     />
   </div>
-</Uncontrolled(TabContainer)>
+</ForwardRef>
 `;

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

@@ -5,7 +5,10 @@ import './statusChart.scss';
 
 const StatusChart = ({ completed }) => {
   const donutConfigData = {
-    columns: [['Completed', completed], ['Remain', 100 - completed]],
+    columns: [
+      ['Completed', completed],
+      ['Remain', 100 - completed],
+    ],
     order: null,
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_inventory_upload
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta7
+  version: 1.0.0
 platform: ruby
 authors:
 - Inventory upload team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -104,9 +104,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/foreman_inventory_upload/accounts_controller.rb
 - app/controllers/foreman_inventory_upload/react_controller.rb
 - app/controllers/foreman_inventory_upload/reports_controller.rb
-- app/controllers/foreman_inventory_upload/statuses_controller.rb
 - app/controllers/foreman_inventory_upload/uploads_controller.rb
 - app/helpers/foreman_inventory_upload_helper.rb
 - app/views/dashboard/_inventory_upload_widget.html.erb
@@ -134,8 +134,8 @@ files:
 - locale/foreman_yupana.pot
 - locale/gemspec.rb
 - package.json
+- test/controllers/accounts_controller_test.rb
 - test/controllers/reports_controller_test.rb
-- test/controllers/statuses_controller_test.rb
 - test/controllers/uploads_controller_test.rb
 - test/factories/inventory_upload_factories.rb
 - test/test_plugin_helper.rb
@@ -325,9 +325,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 
@@ -335,7 +335,7 @@ specification_version: 4
 summary: Summary of ForemanInventoryUpload.
 test_files:
 - test/controllers/uploads_controller_test.rb
-- test/controllers/statuses_controller_test.rb
+- test/controllers/accounts_controller_test.rb
 - test/controllers/reports_controller_test.rb
 - test/test_plugin_helper.rb
 - test/factories/inventory_upload_factories.rb

data/app/controllers/foreman_inventory_upload/statuses_controller.rb

@@ -1,41 +0,0 @@
-module ForemanInventoryUpload
-  class StatusesController < ::ApplicationController
-    # override default "welcome screen behavior, since we don't have a model"
-    def welcome
-      true
-    end
-
-    def index
-      portal_users = RedhatAccess::TelemetryConfiguration
-                     .where(enable_telemetry: true)
-                     .distinct
-                     .pluck(:portal_user)
-
-      statuses = Hash[
-        portal_users.map do |portal_user|
-          generate_report_status = status_for(portal_user, ForemanInventoryUpload::Async::GenerateReportJob)
-          upload_report_status = status_for(portal_user, ForemanInventoryUpload::Async::UploadReportJob)
-
-          [
-            portal_user,
-            {
-              generate_report_status: generate_report_status,
-              upload_report_status: upload_report_status,
-            },
-          ]
-        end
-      ]
-
-      render json: {
-        statuses: statuses,
-      }, status: :ok
-    end
-
-    private
-
-    def status_for(portal_user, job_class)
-      label = job_class.output_label(portal_user)
-      ForemanInventoryUpload::Async::ProgressOutput.get(label)&.status
-    end
-  end
-end