foreman_rh_cloud 2.0.8 → 2.0.13

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.scss

@@ -0,0 +1,20 @@
+#sync_modal {
+  height: 300px;
+  margin: auto;
+  overflow: hidden;
+
+  .modal-content {
+    width: 700px;
+  }
+
+  .modal-body {
+    .container {
+      padding: 0;
+
+      button {
+        float: right;
+        margin-top: 10px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,22 @@
+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 '../../../AccountList/AccountListSelectors';
+import { selectStatus } from './SyncButtonSelectors';
+
+// map state to props
+const mapStateToProps = state => ({
+  cloudToken: selectCloudToken(state),
+  status: selectStatus(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/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import DocsButton from '../DocsButton';
 import HistoryButton from '../HistoryButton';
+import SyncButton from '../SyncButton';
 import './toolbarButtons.scss';
 
 const ToolbarButtons = () => (
   <div className="inventory_toolbar_buttons">
+    <SyncButton />
     <HistoryButton />
     <DocsButton />
   </div>

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

@@ -4,6 +4,7 @@ exports[`ToolbarButtons rendering render without Props 1`] = `
 <div
   className="inventory_toolbar_buttons"
 >
+  <Connect(SyncButton) />
   <HistoryButton />
   <DocsButton />
 </div>

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/toolbarButtons.scss

@@ -1,7 +1,12 @@
 .inventory_toolbar_buttons {
   float: right;
 
-  .tasks_history_button {
+  .tasks_history_button,
+  .sync_button {
     margin-right: 5px;
   }
+
+  .sync_button .spinner {
+    margin: 3px 5px 0 -3px;
+  }
 }

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

@@ -27,7 +27,7 @@ const StatusChart = ({ completed }) => {
     <Grid.Col sm={4}>
       <div className="status-chart">
         <DonutChart
-          id="donunt-chart-1"
+          id="donut-chart-1"
           size={{
             width: 210,
             height: 210,

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

@@ -43,7 +43,7 @@ exports[`StatusChart rendering render without Props 1`] = `
           "width": 11,
         }
       }
-      id="donunt-chart-1"
+      id="donut-chart-1"
       legend={
         Object {
           "show": false,

data/webpack/ForemanInventoryUpload/Components/TabContainer/tabContainer.scss

@@ -1,4 +1,4 @@
-.tab-content {
+.dashboard .tab-content {
   padding: 20px;
   min-height: 0;
 

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/ForemanInventoryConstants.js

@@ -1,7 +1,9 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 
-export const INVENTORY_PAGE_TITLE = __('Red Hat Inventory Uploads');
+export const INVENTORY_PAGE_TITLE = __('Red Hat Inventory');
 
 export const DOCS_BUTTON_TEXT = __(' Documentation');
 
 export const ACTIONS_HISTORY_BUTTON_TEXT = __(' Actions history');
+
+export const SYNC_BUTTON_TEXT = __(' Sync inventory status');

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/ForemanInventoryUpload/ForemanInventoryUploadReducers.js

@@ -2,11 +2,13 @@ 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/ForemanRhCloudPages.js

@@ -0,0 +1,9 @@
+import ForemanInventoryUpload from './ForemanInventoryUpload';
+import InsightsCloudSync from './InsightsCloudSync';
+import InsightsHostDetailsTab from './InsightsHostDetailsTab';
+
+export default [
+  { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
+  { name: 'InsightsCloudSync', type: InsightsCloudSync },
+  { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
+];

data/webpack/ForemanRhCloudReducers.js

@@ -1,10 +1,12 @@
 import { combineReducers } from 'redux';
 import inventoryUploadReducers from './ForemanInventoryUpload/ForemanInventoryUploadReducers';
 import insightsReducers from './InsightsCloudSync/InsightsCloudSyncReducers';
+import { hostInsightsReducers } from './InsightsHostDetailsTab';
 
 export default {
   ForemanRhCloud: combineReducers({
     ...inventoryUploadReducers,
     ...insightsReducers,
+    ...hostInsightsReducers,
   }),
 };

data/webpack/ForemanRhCloudSelectors.js

@@ -1,5 +1,10 @@
 export const selectForemanRhCloud = state => state.ForemanRhCloud;
+
 export const selectForemanInventoryUpload = state =>
   selectForemanRhCloud(state).inventoryUpload;
+
 export const selectInsightsCloudSync = state =>
   selectForemanRhCloud(state).InsightsCloudSync;
+
+export const selectHostInsights = state =>
+  selectForemanRhCloud(state).hostInsights;

data/webpack/ForemanRhCloudTestHelpers.js

@@ -1,6 +1,20 @@
-export const rhCloudStateWrapper = innerState => ({
+export const rhCloudStateWrapper = (
+  inventoryState = {},
+  insightsState = {},
+  hostInsightsState = {}
+) => ({
   ForemanRhCloud: {
-    inventoryUpload: { ...innerState },
-    InsightsCloudSync: { ...innerState },
+    inventoryUpload: { ...inventoryState },
+    InsightsCloudSync: { ...insightsState },
+    hostInsights: { ...hostInsightsState },
   },
 });
+
+export const inventoryStateWrapper = innerState =>
+  rhCloudStateWrapper(innerState);
+
+export const insightsStateWrapper = innerState =>
+  rhCloudStateWrapper({}, innerState);
+
+export const hostInsightsStateWrapper = innerState =>
+  rhCloudStateWrapper({}, {}, innerState);

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

@@ -0,0 +1,33 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import InsightsSyncSwitcher from '../InsightsSyncSwitcher';
+import './insightsSettings.scss';
+
+class InsightsSettings extends Component {
+  componentDidMount() {
+    const { getInsightsSyncSettings } = this.props;
+    getInsightsSyncSettings();
+  }
+
+  render() {
+    const { insightsSyncEnabled, setInsightsSyncEnabled } = this.props;
+    return (
+      <div className="insights_settings">
+        <h3>{__('Settings')}</h3>
+        <InsightsSyncSwitcher
+          insightsSyncEnabled={insightsSyncEnabled}
+          setInsightsSyncEnabled={setInsightsSyncEnabled}
+        />
+      </div>
+    );
+  }
+}
+
+InsightsSettings.propTypes = {
+  insightsSyncEnabled: PropTypes.bool.isRequired,
+  getInsightsSyncSettings: PropTypes.func.isRequired,
+  setInsightsSyncEnabled: PropTypes.func.isRequired,
+};
+
+export default InsightsSettings;

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

@@ -0,0 +1,57 @@
+import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { insightsCloudUrl } from '../../InsightsCloudSyncHelpers';
+import {
+  INSIGHTS_SYNC_SETTING_SET,
+  INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
+} from './InsightsSettingsConstants';
+
+export const getInsightsSyncSettings = () => async dispatch => {
+  try {
+    const {
+      data: { insightsSyncEnabled },
+    } = await API.get(insightsCloudUrl('settings'));
+    dispatch({
+      type: INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
+      payload: {
+        settings: {
+          insightsSyncEnabled,
+        },
+      },
+    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
+  }
+};
+
+export const setInsightsSyncEnabled = currentInsightsSyncEnabled => async dispatch => {
+  try {
+    const {
+      data: { insightsSyncEnabled },
+    } = await API.patch(insightsCloudUrl('settings'), {
+      insightsSyncEnabled: currentInsightsSyncEnabled,
+    });
+    dispatch({
+      type: INSIGHTS_SYNC_SETTING_SET,
+      payload: {
+        settings: {
+          insightsSyncEnabled,
+        },
+      },
+    });
+  } catch ({ message }) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message,
+      })
+    );
+  }
+};

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

@@ -0,0 +1,4 @@
+export const INSIGHTS_SYNC_SETTING_SET = 'INSIGHTS_SYNC_SETTING_SET';
+
+export const INSIGHTS_SYNC_SETTINGS_GET_SUCCESS =
+  'INSIGHTS_SYNC_SETTINGS_GET_SUCCESS';

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

@@ -0,0 +1,24 @@
+import Immutable from 'seamless-immutable';
+import {
+  INSIGHTS_SYNC_SETTING_SET,
+  INSIGHTS_SYNC_SETTINGS_GET_SUCCESS,
+} from './InsightsSettingsConstants';
+
+const initialState = Immutable({
+  insightsSyncEnabled: false,
+});
+
+export default (state = initialState, action) => {
+  const { payload: { settings } = {} } = action;
+
+  switch (action.type) {
+    case INSIGHTS_SYNC_SETTINGS_GET_SUCCESS:
+    case INSIGHTS_SYNC_SETTING_SET:
+      return state.merge({
+        ...state,
+        ...settings,
+      });
+    default:
+      return state;
+  }
+};

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

@@ -0,0 +1,6 @@
+import { selectInsightsCloudSync } from '../../../ForemanRhCloudSelectors';
+
+export const selectSettings = state => selectInsightsCloudSync(state).settings;
+
+export const selectInsightsSyncEnabled = state =>
+  selectSettings(state).insightsSyncEnabled;

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

@@ -0,0 +1,18 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { noop } from 'patternfly-react';
+
+import InsightsSettings from '../InsightsSettings';
+
+const fixtures = {
+  'render without Props': {
+    insightsSyncEnabled: false,
+    getInsightsSyncSettings: noop,
+    setInsightsSyncEnabled: noop,
+  },
+  /** fixtures, props for the component */
+};
+
+describe('InsightsSettings', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(InsightsSettings, fixtures));
+});

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

@@ -0,0 +1,62 @@
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
+import API from 'foremanReact/API';
+import {
+  getInsightsSyncSettings,
+  setInsightsSyncEnabled,
+} from '../InsightsSettingsActions';
+import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
+
+const serverMock = {
+  data: { insightsSyncEnabled: true },
+};
+
+jest.mock('foremanReact/API');
+API.get.mockImplementation(() => serverMock);
+API.patch.mockImplementation(() => serverMock);
+
+const runWithGetState = (state, action, params) => dispatch => {
+  const getState = () => rhCloudStateWrapper({ InsightsCloudSync: state });
+  action(params)(dispatch, getState);
+};
+
+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', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    delete window.location;
+    window.location = { href: jest.fn() };
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  return testActionSnapshotWithFixtures(fixtures);
+});