foreman_rh_cloud 3.0.18.1 → 3.0.19

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

@@ -1,18 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SyncButton selectors should return InventorySync 1`] = `
-Object {
-  "disconnectHosts": 0,
-  "error": "some-error",
-  "status": "RESOLVED",
-  "syncHosts": 1,
-}
-`;
-
-exports[`SyncButton selectors should return InventorySync SyncHosts 1`] = `1`;
-
-exports[`SyncButton selectors should return InventorySync disconnectHosts 1`] = `0`;
-
-exports[`SyncButton selectors should return InventorySync error 1`] = `"some-error"`;
-
-exports[`SyncButton selectors should return InventorySync status 1`] = `"RESOLVED"`;
+exports[`SyncButton selectors should return InventorySync status 1`] = `"PENDING"`;

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

@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SyncButton integration test Successful task was triggered on the server resulting in an info toast and polling on the task: handleSync was called 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": <Toast
+            disconnectHosts={2}
+            syncHosts={0}
+          />,
+          "sticky": true,
+          "type": "success",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "errorToast": [Function],
+      "interval": 3000,
+      "type": "API_GET",
+      "url": "/foreman_inventory_upload/tasks/1",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": <span>
+            Inventory sync has started:
+             
+            <a
+              href="/foreman_tasks/tasks/1"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              view the task page for more details
+            </a>
+          </span>,
+          "sticky": false,
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "errorToast": [Function],
+      "type": "API_POST",
+      "url": "/foreman_inventory_upload/tasks",
+    },
+  ],
+]
+`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/integrations.test.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import { IntegrationTestHelper } from '@theforeman/test';
+import * as API from 'foremanReact/redux/API';
+import { noop } from 'foremanReact/common/helpers';
+import SyncButton from '../index';
+import { successResponse } from './SyncButtonFixtures';
+import {
+  INVENTORY_SYNC,
+  INVENTORY_SYNC_TASK_UPDATE,
+} from '../SyncButtonConstants';
+
+jest.spyOn(API, 'post');
+jest.spyOn(API, 'get');
+
+describe('SyncButton integration test', () => {
+  it('Successful task was triggered on the server resulting in an info toast and polling on the task', async () => {
+    API.post.mockImplementation(({ handleSuccess = noop, key, ...action }) => {
+      if (key === INVENTORY_SYNC) {
+        handleSuccess(successResponse);
+      }
+      return { type: 'API_POST', ...action };
+    });
+    API.get.mockImplementation(({ handleSuccess = noop, key, ...action }) => {
+      if (key === INVENTORY_SYNC_TASK_UPDATE) {
+        handleSuccess(
+          {
+            data: {
+              endedAt: '2021-03-22T15:59:02.468+02:00',
+              output: {
+                host_statuses: {
+                  sync: 0,
+                  disconnect: 2,
+                },
+              },
+              result: 'success',
+            },
+          },
+          jest.fn
+        );
+      }
+      return { type: 'API_GET', ...action };
+    });
+
+    const integrationTestHelper = new IntegrationTestHelper();
+    const wrapper = integrationTestHelper.mount(<SyncButton />);
+    const instance = wrapper.find('SyncButton').instance();
+    instance.props.handleSync();
+    await IntegrationTestHelper.flushAllPromises();
+    integrationTestHelper.takeActionsSnapshot('handleSync was called');
+  });
+});

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

@@ -2,21 +2,18 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as actions from './SyncButtonActions';
-import reducer from './SyncButtonReducer';
 import SyncButton from './SyncButton';
 import { selectCloudToken } from '../../../InventorySettings/InventorySettingsSelectors';
-import { selectStatus } from './SyncButtonSelectors';
+import { selectTaskStatus } from './SyncButtonSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
   cloudToken: selectCloudToken(state),
-  status: selectStatus(state),
+  status: selectTaskStatus(state),
 });
 
 // map action dispatchers to props
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
-export const reducers = { inventorySync: reducer };
-
 // export connected component
 export default connect(mapStateToProps, mapDispatchToProps)(SyncButton);

data/webpack/ForemanInventoryUpload/ForemanInventoryUploadReducers.js

@@ -2,13 +2,11 @@ import { combineReducers } from 'redux';
 import { reducers as accountListReducers } from './Components/AccountList';
 import { reducers as dashboardReducers } from './Components/Dashboard';
 import { reducers as filterReducers } from './Components/InventoryFilter';
-import { reducers as inventorySyncReducers } from './Components/PageHeader/components/SyncButton';
 
 export default {
   inventoryUpload: combineReducers({
     ...accountListReducers,
     ...dashboardReducers,
     ...filterReducers,
-    ...inventorySyncReducers,
   }),
 };

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTable.test.js.snap

@@ -61,6 +61,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     expandId="expandable-toggle"
     gridBreakPoint="grid-md"
     isStickyHeader={false}
+    isTreeTable={false}
     onSelect={[Function]}
     onSort={[Function]}
     ouiaSafe={true}
@@ -137,6 +138,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
         "currPage": "Current page",
         "items": "",
         "itemsPerPage": "Items per page",
+        "ofWord": "of",
         "optionsToggle": "Items per page",
         "page": "",
         "paginationTitle": "Pagination",

data/webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js

@@ -0,0 +1,4 @@
+export const withInterval = (action, interval = 3000) => ({
+  ...action,
+  interval,
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.18.1
+  version: 3.0.19
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -213,6 +213,8 @@ files:
 - lib/insights_cloud/async/rules_result.rb
 - lib/inventory_sync/async/host_result.rb
 - lib/inventory_sync/async/inventory_full_sync.rb
+- lib/inventory_sync/async/inventory_hosts_sync.rb
+- lib/inventory_sync/async/query_inventory_job.rb
 - lib/tasks/foreman_rh_cloud_tasks.rake
 - lib/tasks/insights.rake
 - lib/tasks/rh_cloud_inventory.rake
@@ -397,17 +399,14 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButton.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonConstants.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonReducer.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonSelectors.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButton.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonActions.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonFixtures.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonReducer.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonSelectors.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButton.test.js.snap
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonActions.test.js.snap
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonReducer.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonSelectors.test.js.snap
+- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/integrations.test.js.snap
+- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/integrations.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Modal.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Toast.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.scss
@@ -588,6 +587,7 @@ files:
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
+- webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
 - webpack/__mocks__/foremanReact/routes/RouterSelector.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/__tests__/ForemanRhCloudHelpers.test.js
@@ -610,7 +610,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -625,31 +625,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
-- test/controllers/uploads_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/accounts_controller_test.rb
-- test/controllers/uploads_settings_controller_test.rb
 - test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb
+- test/controllers/insights_sync/settings_controller_test.rb
 - test/controllers/reports_controller_test.rb
-- test/test_plugin_helper.rb
-- test/jobs/upload_report_job_test.rb
+- test/controllers/uploads_controller_test.rb
+- test/controllers/uploads_settings_controller_test.rb
+- test/factories/insights_factories.rb
+- test/factories/inventory_upload_factories.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
-- test/factories/inventory_upload_factories.rb
-- test/factories/insights_factories.rb
-- test/unit/tags_generator_test.rb
-- test/unit/shell_process_job_test.rb
-- test/unit/metadata_generator_test.rb
+- test/jobs/upload_report_job_test.rb
+- test/test_plugin_helper.rb
+- test/unit/archived_report_generator_test.rb
+- test/unit/fact_helpers_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
-- test/unit/services/foreman_rh_cloud/branch_info_test.rb
+- test/unit/metadata_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
-- test/unit/fact_helpers_test.rb
-- test/unit/archived_report_generator_test.rb
+- test/unit/services/foreman_rh_cloud/branch_info_test.rb
+- test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
+- test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
+- test/unit/tags_generator_test.rb

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonReducer.js

@@ -1,36 +0,0 @@
-import Immutable from 'seamless-immutable';
-import { STATUS } from 'foremanReact/constants';
-import {
-  INVENTORY_SYNC_REQUEST,
-  INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_ERROR,
-} from './SyncButtonConstants';
-
-export default (
-  state = Immutable({}),
-  { type, payload: { syncHosts, disconnectHosts, error } = {} }
-) => {
-  switch (type) {
-    case INVENTORY_SYNC_REQUEST:
-      return state.merge({
-        ...state,
-        status: STATUS.PENDING,
-        error: null,
-      });
-    case INVENTORY_SYNC_SUCCESS:
-      return state.merge({
-        ...state,
-        status: STATUS.RESOLVED,
-        syncHosts,
-        disconnectHosts,
-      });
-    case INVENTORY_SYNC_ERROR:
-      return state.merge({
-        ...state,
-        status: STATUS.ERROR,
-        error,
-      });
-    default:
-      return state;
-  }
-};

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonActions.test.js

@@ -1,31 +0,0 @@
-import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import { API } from 'foremanReact/redux/API';
-import { handleSync } from '../SyncButtonActions';
-import { successResponse } from './SyncButtonFixtures';
-
-jest.mock('foremanReact/redux/API');
-API.post.mockImplementation(async () => successResponse);
-
-const fixtures = {
-  'should handleSync': () => handleSync(),
-  'should handleSync with error message': () => {
-    API.post.mockImplementationOnce(() =>
-      Promise.reject(new Error('Network error!'))
-    );
-
-    return handleSync();
-  },
-  'should handleSync with custom error message': () => {
-    API.post.mockImplementationOnce(() => {
-      const customError = new Error('Server error!');
-      customError.response = {
-        data: { message: 'Custom error to display in a toast' },
-      };
-      return Promise.reject(customError);
-    });
-
-    return handleSync();
-  },
-};
-
-describe('SyncButton actions', () => testActionSnapshotWithFixtures(fixtures));

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonReducer.test.js

@@ -1,26 +0,0 @@
-import { testReducerSnapshotWithFixtures } from '@theforeman/test';
-import reducer from '../SyncButtonReducer';
-import { syncHosts, disconnectHosts } from './SyncButtonFixtures';
-import {
-  INVENTORY_SYNC_REQUEST,
-  INVENTORY_SYNC_SUCCESS,
-} from '../SyncButtonConstants';
-
-const fixtures = {
-  'should return the initial state': {},
-  'should handle INVENTORY_SYNC_REQUEST': {
-    action: {
-      type: INVENTORY_SYNC_REQUEST,
-      payload: {},
-    },
-  },
-  'should handle INVENTORY_SYNC_SUCCESS': {
-    action: {
-      type: INVENTORY_SYNC_SUCCESS,
-      payload: { syncHosts, disconnectHosts },
-    },
-  },
-};
-
-describe('AccountList reducer', () =>
-  testReducerSnapshotWithFixtures(reducer, fixtures));

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

@@ -1,98 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SyncButton actions should handleSync 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {},
-      "type": "INVENTORY_SYNC_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "disconnectHosts": 0,
-        "syncHosts": 1,
-      },
-      "type": "INVENTORY_SYNC_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": <Toast
-            disconnectHosts={0}
-            syncHosts={1}
-          />,
-          "sticky": true,
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`SyncButton actions should handleSync with custom error message 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {},
-      "type": "INVENTORY_SYNC_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "error": "Server error!",
-      },
-      "type": "INVENTORY_SYNC_ERROR",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Custom error to display in a toast",
-          "sticky": true,
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`SyncButton actions should handleSync with error message 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {},
-      "type": "INVENTORY_SYNC_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "error": "Network error!",
-      },
-      "type": "INVENTORY_SYNC_ERROR",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Network error!",
-          "sticky": true,
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;