foreman_rh_cloud 0.9.8 → 0.9.13

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

@@ -0,0 +1,36 @@
+import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { inventoryStateWrapper } from '../../../../../../ForemanRhCloudTestHelpers';
+import {
+  status,
+  error,
+  syncHosts,
+  disconnectHosts,
+} from './SyncButtonFixtures';
+import {
+  selectInventorySync,
+  selectStatus,
+  selectError,
+  selectSyncHosts,
+  selectDisconnectHosts,
+} from '../SyncButtonSelectors';
+
+const state = inventoryStateWrapper({
+  inventorySync: {
+    status,
+    error,
+    syncHosts,
+    disconnectHosts,
+  },
+});
+
+const fixtures = {
+  'should return InventorySync': () => selectInventorySync(state),
+  'should return InventorySync status': () => selectStatus(state),
+  'should return InventorySync error': () => selectError(state),
+  'should return InventorySync SyncHosts': () => selectSyncHosts(state),
+  'should return InventorySync disconnectHosts': () =>
+    selectDisconnectHosts(state),
+};
+
+describe('SyncButton selectors', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

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

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SyncButton rendering render with Props 1`] = `
+<Fragment>
+  <SyncModal
+    show={false}
+    toggleModal={[Function]}
+  />
+  <Button
+    active={false}
+    block={false}
+    bsClass="btn"
+    bsSize="lg"
+    bsStyle="default"
+    className="sync_button"
+    disabled={false}
+    onClick={[Function]}
+  >
+    <Icon
+      name="refresh"
+      type="fa"
+    />
+     Sync inventory status
+  </Button>
+</Fragment>
+`;

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

@@ -0,0 +1,98 @@
+// 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",
+    },
+  ],
+]
+`;

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

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountList reducer should handle INVENTORY_SYNC_REQUEST 1`] = `
+Object {
+  "error": null,
+  "status": "PENDING",
+}
+`;
+
+exports[`AccountList reducer should handle INVENTORY_SYNC_SUCCESS 1`] = `
+Object {
+  "disconnectHosts": 0,
+  "status": "RESOLVED",
+  "syncHosts": 1,
+}
+`;
+
+exports[`AccountList reducer should return the initial state 1`] = `Object {}`;

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

@@ -0,0 +1,18 @@
+// 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"`;

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

@@ -0,0 +1,63 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Icon, Modal, Grid, Button } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from '../../../../../../ForemanRhCloudHelpers';
+import './modal.scss';
+
+const SyncModal = ({ show, toggleModal }) => (
+  <Modal show={show} onHide={toggleModal} id="sync_modal">
+    <Modal.Header>
+      <button
+        className="close"
+        onClick={toggleModal}
+        aria-hidden="true"
+        aria-label="Close"
+      >
+        <Icon type="pf" name="close" />
+      </button>
+      <Modal.Title>{__('Token is required')}</Modal.Title>
+    </Modal.Header>
+    <Modal.Body>
+      <Grid>
+        <p>
+          {__(`Please go over the following steps to add a RHSM API token:`)}
+        </p>
+        <p>
+          {__(`1. Obtain an RHSM API token: `)}
+          <a
+            href="https://access.redhat.com/management/api"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            access.redhat.com <Icon name="external-link" />
+          </a>
+          <br />
+          {__("2. Copy the token to 'Red Hat Cloud token' setting: ")}
+          <a
+            href={foremanUrl('/settings?search=name+%3D+rh_cloud_token')}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {__('Red Hat Cloud token ')}
+            <Icon name="external-link" />
+          </a>
+          <br />
+          {__(
+            '3. Now you can synchronize inventory status manually, by clicking the "Sync inventory status" button.'
+          )}
+        </p>
+        <Button bsStyle="primary" bsSize="lg" onClick={toggleModal}>
+          Close
+        </Button>
+      </Grid>
+    </Modal.Body>
+  </Modal>
+);
+
+SyncModal.propTypes = {
+  show: PropTypes.bool.isRequired,
+  toggleModal: PropTypes.func.isRequired,
+};
+
+export default SyncModal;

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

@@ -0,0 +1,41 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from '../../../../../../ForemanRhCloudHelpers';
+
+const Toast = ({ syncHosts, disconnectHosts }) => {
+  const totalHosts = syncHosts + disconnectHosts;
+  return (
+    <span>
+      <p>
+        {__('Hosts with subscription in organization: ')}
+        <strong>{totalHosts}</strong>
+      </p>
+      <p>
+        {__('Successfully synced hosts: ')}
+        <strong>{syncHosts}</strong>
+      </p>
+      <p>
+        {__('Disconnected hosts: ')}
+        <strong>{disconnectHosts}</strong>
+      </p>
+      <p>
+        For more info, please visit the{' '}
+        <a
+          href={foremanUrl('/hosts')}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          hosts page
+        </a>
+      </p>
+    </span>
+  );
+};
+
+Toast.propTypes = {
+  syncHosts: PropTypes.number.isRequired,
+  disconnectHosts: PropTypes.number.isRequired,
+};
+
+export default Toast;

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/isEqual';
 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