foreman_rh_cloud 2.0.12 → 2.0.13

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

@@ -8,6 +8,24 @@ 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,10 +1,9 @@
 import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 import reducer from '../SyncButtonReducer';
-import { syncHosts, disconnectHosts, error } from './SyncButtonFixtures';
+import { syncHosts, disconnectHosts } from './SyncButtonFixtures';
 import {
   INVENTORY_SYNC_REQUEST,
   INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_FAILURE,
 } from '../SyncButtonConstants';
 
 const fixtures = {
@@ -21,12 +20,6 @@ const fixtures = {
       payload: { syncHosts, disconnectHosts },
     },
   },
-  'should handle INVENTORY_SYNC_FAILURE': {
-    action: {
-      type: INVENTORY_SYNC_FAILURE,
-      payload: { error },
-    },
-  },
 };
 
 describe('AccountList reducer', () =>

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

@@ -34,3 +34,65 @@ Array [
   ],
 ]
 `;
+
+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",
+    },
+  ],
+]
+`;

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

@@ -1,12 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList reducer should handle INVENTORY_SYNC_FAILURE 1`] = `
-Object {
-  "error": "some-error",
-  "status": "ERROR",
-}
-`;
-
 exports[`AccountList reducer should handle INVENTORY_SYNC_REQUEST 1`] = `
 Object {
   "error": null,

data/webpack/ForemanInventoryUpload/Components/TabHeader/TabHeader.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { noop, Grid, Button, Icon } from 'patternfly-react';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 import './tabHeader.scss';
 
 const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
@@ -12,7 +13,11 @@ const TabHeader = ({ exitCode, onRestart, onDownload, toggleFullScreen }) => (
     <Grid.Col sm={6}>
       <div className="tab-action-buttons">
         {onRestart ? (
-          <Button bsStyle="primary" onClick={onRestart}>
+          <Button
+            bsStyle="primary"
+            onClick={onRestart}
+            disabled={isExitCodeLoading(exitCode)}
+          >
             {__('Restart')}
           </Button>
         ) : null}

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

@@ -4,6 +4,7 @@ import { Grid, Spinner } from 'patternfly-react';
 import { isEqual } from 'lodash';
 import './terminal.scss';
 import { isTerminalScrolledDown } from './TerminalHelper';
+import { isExitCodeLoading } from '../../ForemanInventoryHelpers';
 
 class Terminal extends React.Component {
   constructor(props) {
@@ -67,10 +68,7 @@ class Terminal extends React.Component {
     } else {
       modifiedLogs = <p>{logs}</p>;
     }
-    const exitCodeLowerCase = exitCode.toLowerCase();
-    const loading =
-      exitCodeLowerCase.indexOf('running') !== -1 ||
-      exitCodeLowerCase.indexOf('restarting') !== -1;
+    const loading = isExitCodeLoading(exitCode);
     return (
       <Grid.Col sm={12}>
         <div

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -15,3 +15,11 @@ export const getActionsHistoryUrl = () =>
   foremanUrl(
     '/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'
   );
+
+export const isExitCodeLoading = exitCode => {
+  const exitCodeLC = exitCode.toLowerCase();
+  return (
+    exitCodeLC.indexOf('running') !== -1 ||
+    exitCodeLC.indexOf('restarting') !== -1
+  );
+};

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsActions.js

@@ -1,10 +1,9 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { insightsCloudUrl } from '../../InsightsCloudSyncHelpers';
 import {
   INSIGHTS_SYNC_SETTING_SET,
-  INSIGHTS_SYNC_SETTING_SET_FAILURE,
   INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
-  INSIGHTS_SYNC_SETTINGS_GET_FAILURE,
 } from './InsightsSettingsConstants';
 
 export const getInsightsSyncSettings = () => async dispatch => {
@@ -20,15 +19,14 @@ export const getInsightsSyncSettings = () => async dispatch => {
         },
       },
     });
-  } catch (error) {
-    dispatch({
-      type: INSIGHTS_SYNC_SETTINGS_GET_FAILURE,
-      payload: {
-        settings: {
-          error: error.message,
-        },
-      },
-    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
   }
 };
 
@@ -47,14 +45,13 @@ export const setInsightsSyncEnabled = currentInsightsSyncEnabled => async dispat
         },
       },
     });
-  } catch (error) {
-    dispatch({
-      type: INSIGHTS_SYNC_SETTING_SET_FAILURE,
-      payload: {
-        settings: {
-          error: error.message,
-        },
-      },
-    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
   }
 };

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsConstants.js

@@ -1,10 +1,4 @@
 export const INSIGHTS_SYNC_SETTING_SET = 'INSIGHTS_SYNC_SETTING_SET';
 
-export const INSIGHTS_SYNC_SETTING_SET_FAILURE =
-  'INSIGHTS_SYNC_SETTING_SET_FAILURE';
-
 export const INSIGHTS_SYNC_SETTINGS_GET_SUCCESS =
   'INSIGHTS_SYNC_SETTINGS_GET_SUCCESS';
-
-export const INSIGHTS_SYNC_SETTINGS_GET_FAILURE =
-  'INSIGHTS_SYNC_SETTINGS_GET_FAILURE';

data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsReducer.js

@@ -1,9 +1,7 @@
 import Immutable from 'seamless-immutable';
 import {
   INSIGHTS_SYNC_SETTING_SET,
-  INSIGHTS_SYNC_SETTING_SET_FAILURE,
   INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
-  INSIGHTS_SYNC_SETTINGS_GET_FAILURE,
 } from './InsightsSettingsConstants';
 
 const initialState = Immutable({
@@ -15,9 +13,7 @@ export default (state = initialState, action) => {
 
   switch (action.type) {
     case INSIGHTS_SYNC_SETTINGS_GET_SUCCESS:
-    case INSIGHTS_SYNC_SETTINGS_GET_FAILURE:
     case INSIGHTS_SYNC_SETTING_SET:
-    case INSIGHTS_SYNC_SETTING_SET_FAILURE:
       return state.merge({
         ...state,
         ...settings,

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

@@ -22,12 +22,28 @@ const runWithGetState = (state, action, params) => dispatch => {
 const fixtures = {
   'should generate INSIGHTS_SYNC_SETTINGS_GET_SUCCESS action': () =>
     runWithGetState({ settings: {} }, getInsightsSyncSettings, {}),
+  'should handle getInsightsSyncSettings with error ': () => {
+    API.get.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network error!'))
+    );
+    return runWithGetState({ settings: {} }, getInsightsSyncSettings, {});
+  },
   'should generate INSIGHTS_SYNC_SETTING_SET action': () =>
     runWithGetState(
       { settings: { insightsSyncEnabled: false } },
       setInsightsSyncEnabled,
       true
     ),
+  'should handle setInsightsSyncEnabled with error ': () => {
+    API.patch.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network error!'))
+    );
+    return runWithGetState(
+      { settings: { insightsSyncEnabled: false } },
+      setInsightsSyncEnabled,
+      true
+    );
+  },
 };
 
 describe('InsightsSettings actions', () => {

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

@@ -1,12 +1,9 @@
 import { testReducerSnapshotWithFixtures } from '@theforeman/test';
-
+import reducer from '../InsightsSettingsReducer';
 import {
   INSIGHTS_SYNC_SETTING_SET,
-  INSIGHTS_SYNC_SETTING_SET_FAILURE,
   INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
-  INSIGHTS_SYNC_SETTINGS_GET_FAILURE,
 } from '../InsightsSettingsConstants';
-import reducer from '../InsightsSettingsReducer';
 
 const fixtures = {
   'should return the initial state': {},
@@ -20,16 +17,6 @@ const fixtures = {
       },
     },
   },
-  'should handle INSIGHTS_SYNC_SETTINGS_GET_FAILURE': {
-    action: {
-      type: INSIGHTS_SYNC_SETTINGS_GET_FAILURE,
-      payload: {
-        settings: {
-          error: 'test error',
-        },
-      },
-    },
-  },
   'should handle INSIGHTS_SYNC_SETTING_SET': {
     action: {
       type: INSIGHTS_SYNC_SETTING_SET,
@@ -40,16 +27,6 @@ const fixtures = {
       },
     },
   },
-  'should handle INSIGHTS_SYNC_SETTING_SET_FAILURE': {
-    action: {
-      type: INSIGHTS_SYNC_SETTING_SET_FAILURE,
-      payload: {
-        settings: {
-          error: 'test set error',
-        },
-      },
-    },
-  },
 };
 
 describe('InsightsSettings reducer', () =>

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}>
@@ -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;