foreman_rh_cloud 2.0.11 → 3.0.14

data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsActions.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`InsightsSettings actions should generate INSIGHTS_SYNC_SETTINGS_GET_SUCCESS action 1`] = `
+exports[`InsightsSettings actions should generate INSIGHTS_SYNC_SETTING_SET action 1`] = `
 Array [
   Array [
     Object {
@@ -9,13 +9,13 @@ Array [
           "insightsSyncEnabled": true,
         },
       },
-      "type": "INSIGHTS_SYNC_SETTINGS_GET_SUCCESS",
+      "type": "INSIGHTS_SYNC_SETTING_SET",
     },
   ],
 ]
 `;
 
-exports[`InsightsSettings actions should generate INSIGHTS_SYNC_SETTING_SET action 1`] = `
+exports[`InsightsSettings actions should generate INSIGHTS_SYNC_SETTINGS_GET_SUCCESS action 1`] = `
 Array [
   Array [
     Object {
@@ -24,7 +24,41 @@ Array [
           "insightsSyncEnabled": true,
         },
       },
-      "type": "INSIGHTS_SYNC_SETTING_SET",
+      "type": "INSIGHTS_SYNC_SETTINGS_GET_SUCCESS",
+    },
+  ],
+]
+`;
+
+exports[`InsightsSettings actions should handle getInsightsSyncSettings with error  1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Network error!",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`InsightsSettings actions should handle setInsightsSyncEnabled with error  1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Network error!",
+          "sticky": true,
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
     },
   ],
 ]

data/webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsReducer.test.js.snap

@@ -6,20 +6,6 @@ Object {
 }
 `;
 
-exports[`InsightsSettings reducer should handle INSIGHTS_SYNC_SETTING_SET_FAILURE 1`] = `
-Object {
-  "error": "test set error",
-  "insightsSyncEnabled": false,
-}
-`;
-
-exports[`InsightsSettings reducer should handle INSIGHTS_SYNC_SETTINGS_GET_FAILURE 1`] = `
-Object {
-  "error": "test error",
-  "insightsSyncEnabled": false,
-}
-`;
-
 exports[`InsightsSettings reducer should handle INSIGHTS_SYNC_SETTINGS_GET_SUCCESS 1`] = `
 Object {
   "insightsSyncEnabled": true,

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -6,7 +6,7 @@ import { Button, Icon } from 'patternfly-react';
 import { INSIGHTS_SYNC_PAGE_TITLE } from './InsightsCloudSyncConstants';
 import InsightsSettings from './Components/InsightsSettings';
 
-const InsightsCloudSync = ({ data: { settingsUrl }, syncInsights }) => {
+const InsightsCloudSync = ({ settingsUrl, syncInsights }) => {
   document.title = INSIGHTS_SYNC_PAGE_TITLE;
   return (
     <IntlProvider locale={navigator.language}>
@@ -19,7 +19,7 @@ const InsightsCloudSync = ({ data: { settingsUrl }, syncInsights }) => {
              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"
               target="_blank"
@@ -51,9 +51,7 @@ const InsightsCloudSync = ({ data: { settingsUrl }, syncInsights }) => {
 
 InsightsCloudSync.propTypes = {
   syncInsights: PropTypes.func.isRequired,
-  data: PropTypes.shape({
-    settingsUrl: PropTypes.string.isRequired,
-  }).isRequired,
+  settingsUrl: PropTypes.string.isRequired,
 };
 
 export default InsightsCloudSync;

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

@@ -17,16 +17,14 @@ class InsightsHostDetailsTab extends React.Component {
     if (!hits.length) {
       return <h2>No recommendations were found for this host!</h2>;
     }
-    const hitsSorted = orderBy(hits, ['insights_hit.total_risk'], ['desc']);
+    const hitsSorted = orderBy(hits, ['total_risk'], ['desc']);
     const items = hitsSorted.map(
       (
         {
-          insights_hit: {
-            title,
-            total_risk: totalRisk,
-            results_url: resultsUrl,
-            solution_url: solutionUrl,
-          },
+          title,
+          total_risk: totalRisk,
+          results_url: resultsUrl,
+          solution_url: solutionUrl,
         },
         index
       ) => (
@@ -40,12 +38,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__/InsightsTab.fixtures.js

@@ -2,20 +2,18 @@ export const hostID = 1234;
 
 export const hits = [
   {
-    insights_hit: {
-      hostname: 'my-host.example.com',
-      rhel_version: '7.8',
-      uuid: '4739b323-a343-4e89-b71b-81991b8dc656',
-      last_seen: '2020-08-19T04:43:09.068706Z',
-      title:
-        'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled',
-      solution_url: 'https://access.redhat.com/node/3359651',
-      total_risk: 2,
-      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/',
-    },
+    hostname: 'my-host.example.com',
+    rhel_version: '7.8',
+    uuid: '4739b323-a343-4e89-b71b-81991b8dc656',
+    last_seen: '2020-08-19T04:43:09.068706Z',
+    title:
+      'New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled',
+    solution_url: 'https://access.redhat.com/node/3359651',
+    total_risk: 2,
+    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/',
   },
 ];
 

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,45 @@ Array [
   Array [
     Object {
       "payload": Object {
-        "error": "Cannot read property 'hits' of undefined",
+        "hits": Array [
+          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",
     },
   ],
 ]