foreman_rh_cloud 2.0.12 → 2.0.16

data/webpack/InsightsCloudSync/InsightsCloudSync.test.js

@@ -6,9 +6,7 @@ import InsightsCloudSync from './InsightsCloudSync';
 const fixtures = {
   render: {
     syncInsights: noop,
-    data: {
-      settingsUrl: 'www.example.com/settings',
-    },
+    settingsUrl: 'www.example.com/settings',
   },
 };
 

data/webpack/InsightsCloudSync/InsightsCloudSyncActions.js

@@ -1,9 +1,7 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { insightsCloudUrl } from './InsightsCloudSyncHelpers';
-import {
-  INSIGHTS_CLOUD_SYNC_SUCCESS,
-  INSIGHTS_CLOUD_SYNC_FAILURE,
-} from './InsightsCloudSyncConstants';
+import { INSIGHTS_CLOUD_SYNC_SUCCESS } from './InsightsCloudSyncConstants';
 
 export const syncInsights = () => async dispatch => {
   try {
@@ -12,12 +10,13 @@ export const syncInsights = () => async dispatch => {
       type: INSIGHTS_CLOUD_SYNC_SUCCESS,
       payload: {},
     });
-  } catch (error) {
-    dispatch({
-      type: INSIGHTS_CLOUD_SYNC_FAILURE,
-      payload: {
-        error: error.message,
-      },
-    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
   }
 };

data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js

@@ -1,6 +1,4 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const INSIGHTS_CLOUD_SYNC_SUCCESS = 'INSIGHTS_CLOUD_SYNC_SUCCESS';
-export const INSIGHTS_CLOUD_SYNC_FAILURE = 'INSIGHTS_CLOUD_SYNC_FAILURE';
-
 export const INSIGHTS_SYNC_PAGE_TITLE = __('Red Hat Insights cloud sync');

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

@@ -19,7 +19,7 @@ exports[`InsightsCloudSync render 1`] = `
              recommendations output for hosts managed here
       </p>
       <p>
-        1. Obtain an RHSM API token: 
+        1. Obtain an Red Hat API token: 
         <a
           href="https://access.redhat.com/management/api"
           rel="noopener noreferrer"

data/webpack/InsightsHostDetailsTab/InsightsTab.js

@@ -40,12 +40,14 @@ class InsightsHostDetailsTab extends React.Component {
       )
     );
     return (
-      <Grid.Row>
-        <Grid.Col xs={12}>
-          <h2>Recommendations</h2>
-          <ListView id="hits_list">{items}</ListView>
-        </Grid.Col>
-      </Grid.Row>
+      <div id="host_details_insights_tab">
+        <Grid.Row>
+          <Grid.Col xs={12}>
+            <h2>Recommendations</h2>
+            <ListView id="hits_list">{items}</ListView>
+          </Grid.Col>
+        </Grid.Row>
+      </div>
     );
   }
 }

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -1,4 +1,4 @@
-#host_details_insights_react_container {
+#host_details_insights_tab {
   #btn_toolbar {
     float: right;
   }
@@ -77,7 +77,7 @@
     }
 
     &::-webkit-scrollbar-thumb {
-      background: #0e0e0e6e;
+      background: #222;
       border-radius: 6px;
       border: 3px solid transparent;
       background-clip: content-box;

data/webpack/InsightsHostDetailsTab/InsightsTabActions.js

@@ -1,9 +1,9 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { insightsCloudUrl } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import {
   INSIGHTS_HITS_REQUEST,
   INSIGHTS_HITS_SUCCESS,
-  INSIGHTS_HITS_FAILURE,
 } from './InsightsTabConstants';
 
 export const fetchHits = hostID => async dispatch => {
@@ -19,12 +19,13 @@ export const fetchHits = hostID => async dispatch => {
       type: INSIGHTS_HITS_SUCCESS,
       payload: { hits },
     });
-  } catch (error) {
-    dispatch({
-      type: INSIGHTS_HITS_FAILURE,
-      payload: {
-        error: error.message,
-      },
-    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
   }
 };

data/webpack/InsightsHostDetailsTab/InsightsTabConstants.js

@@ -1,3 +1,2 @@
 export const INSIGHTS_HITS_REQUEST = 'INSIGHTS_HITS_REQUEST';
 export const INSIGHTS_HITS_SUCCESS = 'INSIGHTS_HITS_SUCCESS';
-export const INSIGHTS_HITS_FAILURE = 'INSIGHTS_HITS_FAILURE';

data/webpack/InsightsHostDetailsTab/InsightsTabReducer.js

@@ -1,25 +1,18 @@
 import Immutable from 'seamless-immutable';
-import {
-  INSIGHTS_HITS_SUCCESS,
-  INSIGHTS_HITS_FAILURE,
-} from './InsightsTabConstants';
+import { INSIGHTS_HITS_SUCCESS } from './InsightsTabConstants';
 
 const initialState = Immutable({
   hits: [],
 });
 
 export default (state = initialState, action) => {
-  const { payload: { hits, error } = {} } = action;
+  const { payload: { hits } = {} } = action;
 
   switch (action.type) {
     case INSIGHTS_HITS_SUCCESS:
       return state.merge({
         hits,
       });
-    case INSIGHTS_HITS_FAILURE:
-      return state.merge({
-        error,
-      });
     default:
       return state;
   }

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabActions.test.js

@@ -4,10 +4,16 @@ import { fetchHits } from '../InsightsTabActions';
 import { hostID, hits } from './InsightsTab.fixtures';
 
 jest.mock('foremanReact/API');
-API.get.mockImplementation(async () => hits);
+API.get.mockImplementation(async () => ({ data: { hits } }));
 
 const fixtures = {
   'should fetchHits': () => fetchHits(hostID),
+  'should fetchHits with error': () => {
+    API.get.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network error!'))
+    );
+    return fetchHits(hostID);
+  },
 };
 
 describe('InsightsTab actions', () => testActionSnapshotWithFixtures(fixtures));

data/webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js

@@ -4,7 +4,6 @@ import { hits } from './InsightsTab.fixtures';
 import {
   INSIGHTS_HITS_REQUEST,
   INSIGHTS_HITS_SUCCESS,
-  INSIGHTS_HITS_FAILURE,
 } from '../InsightsTabConstants';
 
 const fixtures = {
@@ -21,14 +20,6 @@ const fixtures = {
       payload: { hits },
     },
   },
-  'should handle INSIGHTS_HITS_FAILURE': {
-    action: {
-      type: INSIGHTS_HITS_FAILURE,
-      payload: {
-        error: 'some-error',
-      },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap

@@ -1,30 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`InsightsTab rendering render with props 1`] = `
-<Row
-  bsClass="row"
-  componentClass="div"
+<div
+  id="host_details_insights_tab"
 >
-  <Col
-    bsClass="col"
+  <Row
+    bsClass="row"
     componentClass="div"
-    xs={12}
   >
-    <h2>
-      Recommendations
-    </h2>
-    <ListView
-      className=""
-      id="hits_list"
+    <Col
+      bsClass="col"
+      componentClass="div"
+      xs={12}
     >
-      <ListItem
-        key="0"
-        resultsUrl="https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/"
-        solutionUrl="https://access.redhat.com/node/3359651"
-        title="New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled"
-        totalRisk={2}
-      />
-    </ListView>
-  </Col>
-</Row>
+      <h2>
+        Recommendations
+      </h2>
+      <ListView
+        className=""
+        id="hits_list"
+      >
+        <ListItem
+          key="0"
+          resultsUrl="https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/"
+          solutionUrl="https://access.redhat.com/node/3359651"
+          title="New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled"
+          totalRisk={2}
+        />
+      </ListView>
+    </Col>
+  </Row>
+</div>
 `;

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap

@@ -11,9 +11,47 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "error": "Cannot read property 'hits' of undefined",
+        "hits": Array [
+          Object {
+            "insights_hit": Object {
+              "hostname": "my-host.example.com",
+              "last_seen": "2020-08-19T04:43:09.068706Z",
+              "likelihood": 2,
+              "publish_date": "2018-04-16T10:03:16Z",
+              "results_url": "https://cloud.redhat.com/insights/advisor/recommendations/ansible_deprecated_repo%7CANSIBLE_DEPRECATED_REPO/4739b323-a343-4e89-b71b-81991b8dc656/",
+              "rhel_version": "7.8",
+              "solution_url": "https://access.redhat.com/node/3359651",
+              "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
+              "total_risk": 2,
+              "uuid": "4739b323-a343-4e89-b71b-81991b8dc656",
+            },
+          },
+        ],
       },
-      "type": "INSIGHTS_HITS_FAILURE",
+      "type": "INSIGHTS_HITS_SUCCESS",
+    },
+  ],
+]
+`;
+
+exports[`InsightsTab actions should fetchHits with error 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {},
+      "type": "INSIGHTS_HITS_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Network error!",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
     },
   ],
 ]

data/webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap

@@ -1,12 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle INSIGHTS_HITS_FAILURE 1`] = `
-Object {
-  "error": "some-error",
-  "hits": Array [],
-}
-`;
-
 exports[`AccountList reducer should handle INSIGHTS_HITS_REQUEST 1`] = `
 Object {
   "hits": Array [],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.16
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -120,14 +120,20 @@ files:
 - app/models/inventory_sync/inventory_status.rb
 - app/models/setting/rh_cloud.rb
 - app/overrides/hosts_list.rb
+- app/services/foreman_rh_cloud/cloud_auth.rb
 - app/views/foreman_rh_cloud/react/insights_cloud.html.erb
 - app/views/foreman_rh_cloud/react/inventory_upload.html.erb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
+- config/Gemfile.lock.gh_test
+- config/database.yml.example
+- config/package-lock.json.gh_test
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
 - db/migrate/20200727111529_add_uuid_column_to_insights_facets.foreman_rh_cloud.rb
+- db/migrate/20201007115752_add_hits_count_to_insights_facets_table.foreman_rh_cloud.rb
+- db/migrate/20201007121540_setup_hits_count_cache.foreman_rh_cloud.rb
 - lib/foreman_inventory_upload.rb
 - lib/foreman_inventory_upload/async/async_helpers.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
@@ -259,6 +265,18 @@ files:
 - webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/__snapshots__/DashboardSelectors.test.js.snap
 - webpack/ForemanInventoryUpload/Components/Dashboard/dashboard.scss
 - webpack/ForemanInventoryUpload/Components/Dashboard/index.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcher.fixtures.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcher.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherActions.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/ExcludePackagesSwitcherConstants.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/ExcludePackagesSwitcher.test.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/ExcludePackagesSwitcherActions.test.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/ExcludePackagesSwitcher.test.js.snap
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/ExcludePackagesSwitcherActions.test.js.snap
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/__snapshots__/integration.test.js.snap
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/__tests__/integration.test.js
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/excludePackagesSwitcher.scss
+- webpack/ForemanInventoryUpload/Components/ExcludePackagesSwitcher/index.js
 - webpack/ForemanInventoryUpload/Components/FileDownload/FileDownload.fixtures.js
 - webpack/ForemanInventoryUpload/Components/FileDownload/FileDownload.js
 - webpack/ForemanInventoryUpload/Components/FileDownload/FileDownloadHelper.js
@@ -275,13 +293,13 @@ files:
 - webpack/ForemanInventoryUpload/Components/FullScreenModal/index.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.fixtures.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.js
+- webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcher.scss
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherActions.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/HostObfuscationSwitcherConstants.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/HostObfuscationSwitcher.test.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/HostObfuscationSwitcherActions.test.js
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/__snapshots__/HostObfuscationSwitcher.test.js.snap
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/__tests__/__snapshots__/HostObfuscationSwitcherActions.test.js.snap
-- webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/hostObfuscationSwitcher.scss
 - webpack/ForemanInventoryUpload/Components/HostObfuscationSwitcher/index.js
 - webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/ClearButton.js
 - webpack/ForemanInventoryUpload/Components/InventoryFilter/Components/ClearButton/index.js
@@ -308,6 +326,15 @@ files:
 - webpack/ForemanInventoryUpload/Components/InventorySettings/__tests__/__snapshots__/InventorySettings.test.js.snap
 - webpack/ForemanInventoryUpload/Components/InventorySettings/index.js
 - webpack/ForemanInventoryUpload/Components/InventorySettings/inventorySettings.scss
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.fixtures.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherActions.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcher.test.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcherActions.test.js
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/__snapshots__/IpsObfuscationSwitcher.test.js.snap
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/__snapshots__/IpsObfuscationSwitcherActions.test.js.snap
+- webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/index.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.fixtures.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainer.js
 - webpack/ForemanInventoryUpload/Components/NavContainer/NavContainerHelper.js