foreman_rh_cloud 3.0.14 → 3.0.15

data/webpack/ForemanInventoryUpload/Components/InventorySettings/{inventorySettings.scss → InventorySettings.scss}

@@ -1,15 +1,12 @@
-.inventory_settings {
+.inventory-settings {
   border: 1px solid #ededed;
   border-radius: 4px;
   padding: 10px;
   margin-bottom: 15px;
+  float: right;
 
   h3 {
     margin-top: 0;
     font-weight: 600;
   }
-
-  .bootstrap-switch {
-    float: right;
-  }
 }

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

@@ -2,7 +2,7 @@
 
 exports[`InventorySettings rendering render without Props 1`] = `
 <div
-  className="inventory_settings"
+  className="inventory-settings"
 >
   <h3>
     Settings

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcher.js

@@ -1,17 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Switch, FieldLevelHelp } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 
 const IpsObfuscationSwitcher = ({ ipsObfuscationEnabled, handleToggle }) => (
   <div className="ips_obfuscation_switcher">
-    <span>Obfuscate host ipv4 addresses</span>
-    <FieldLevelHelp
-      content={__('Obfuscate ipv4 addresses sent to the Red Hat cloud')}
-    />
-    <Switch
-      size="mini"
-      value={ipsObfuscationEnabled}
+    <SwitcherPF4
+      id="ips-obfuscation-settings-switcher"
+      label={__('Obfuscate host ipv4 addresses')}
+      tooltip={__('Obfuscate ipv4 addresses sent to the Red Hat cloud')}
+      isChecked={ipsObfuscationEnabled}
       onChange={() => handleToggle(ipsObfuscationEnabled)}
     />
   </div>

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/IpsObfuscationSwitcherActions.js

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import { IPS_OBFUSCATION_TOGGLE } from './IpsObfuscationSwitcherConstants';

data/webpack/ForemanInventoryUpload/Components/IpsObfuscationSwitcher/__tests__/IpsObfuscationSwitcherActions.test.js

@@ -1,9 +1,9 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { handleToggle } from '../IpsObfuscationSwitcherActions';
 import { handleToggleResponse } from '../IpsObfuscationSwitcher.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 API.post.mockImplementation(async () => handleToggleResponse);
 
 const fixtures = {

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

@@ -4,35 +4,12 @@ exports[`IpsObfuscationSwitcher rendering render with props 1`] = `
 <div
   className="ips_obfuscation_switcher"
 >
-  <span>
-    Obfuscate host ipv4 addresses
-  </span>
-  <FieldLevelHelp
-    buttonClass=""
-    content="Obfuscate ipv4 addresses sent to the Red Hat cloud"
-    placement="top"
-    rootClose={true}
-  />
-  <Switch
-    animate={true}
-    baseClass="bootstrap-switch"
-    bsSize={null}
-    defaultValue={true}
-    disabled={false}
-    handleWidth="auto"
-    inverse={false}
-    labelText=" "
-    labelWidth="auto"
-    offColor="default"
-    offText="OFF"
+  <SwitcherPF4
+    id="ips-obfuscation-settings-switcher"
+    isChecked={true}
+    label="Obfuscate host ipv4 addresses"
     onChange={[Function]}
-    onColor="primary"
-    onText="ON"
-    readonly={false}
-    size="mini"
-    tristate={false}
-    value={true}
-    wrapperClass="wrapper"
+    tooltip="Obfuscate ipv4 addresses sent to the Red Hat cloud"
   />
 </div>
 `;

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.js

@@ -4,33 +4,25 @@ import InventorySettings from '../InventorySettings';
 import PageDescription from './components/PageDescription';
 import InventoryFilter from '../InventoryFilter';
 import ToolbarButtons from './components/ToolbarButtons';
-import { INVENTORY_PAGE_TITLE } from '../../ForemanInventoryConstants';
-import './pageHeader.scss';
+import PageTitle from './PageTitle';
+import './PageHeader.scss';
 
 const PageHeader = () => (
-  <React.Fragment>
-    <Grid.Row>
-      <Grid.Col xs={6}>
-        <h1 className="inventory_title">{INVENTORY_PAGE_TITLE}</h1>
-      </Grid.Col>
-    </Grid.Row>
-    <Grid.Row>
-      <Grid.Col xs={9}>
-        <PageDescription />
-      </Grid.Col>
-      <Grid.Col xs={3}>
-        <InventorySettings />
-      </Grid.Col>
-    </Grid.Row>
+  <div className="inventory-upload-header">
+    <PageTitle />
+    <div className="inventory-upload-header-description">
+      <InventorySettings />
+      <PageDescription />
+    </div>
     <Grid.Row>
       <Grid.Col xs={4}>
         <InventoryFilter />
       </Grid.Col>
-      <Grid.Col xs={6} xsOffset={2}>
+      <Grid.Col xs={7} xsOffset={1}>
         <ToolbarButtons />
       </Grid.Col>
     </Grid.Row>
-  </React.Fragment>
+  </div>
 );
 
 PageHeader.propTypes = {};

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss

@@ -0,0 +1,19 @@
+.rh-cloud-page {
+  .inventory-upload-header {
+    .inventory-upload-header-description {
+      overflow: auto;
+    }
+
+    .inventory-upload-header-title {
+      margin-top: -15px;
+
+      h1 {
+        margin: 0;
+      }
+    }
+
+    .title-dropdown {
+      float: right;
+    }
+  }
+}

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js

@@ -0,0 +1,53 @@
+import React, { useState } from 'react';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  DropdownPosition,
+} from '@patternfly/react-core';
+import {
+  INVENTORY_PAGE_TITLE,
+  ACTIONS_HISTORY_BUTTON_TEXT,
+  DOCS_BUTTON_TEXT,
+} from '../../ForemanInventoryConstants';
+import {
+  getActionsHistoryUrl,
+  getInventoryDocsUrl,
+} from '../../ForemanInventoryHelpers';
+
+const PageTitle = () => {
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const dropdownItems = [
+    <DropdownItem
+      key="tasks-history-button"
+      href={getActionsHistoryUrl()}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {ACTIONS_HISTORY_BUTTON_TEXT}
+    </DropdownItem>,
+    <DropdownItem
+      key="inventory-documentation-button"
+      href={getInventoryDocsUrl()}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {DOCS_BUTTON_TEXT}
+    </DropdownItem>,
+  ];
+  return (
+    <div className="row form-group inventory-upload-header-title">
+      <h1 className="col-md-8">{INVENTORY_PAGE_TITLE}</h1>
+      <Dropdown
+        className="title-dropdown"
+        onSelect={() => setIsDropdownOpen(false)}
+        toggle={<KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />}
+        isOpen={isDropdownOpen}
+        isPlain
+        dropdownItems={dropdownItems}
+        position={DropdownPosition.right}
+      />
+    </div>
+  );
+};
+export default PageTitle;

data/webpack/ForemanInventoryUpload/Components/PageHeader/{components/DocsButton/__tests__/DocsButton.test.js → __tests__/PageTitle.test.js}

@@ -1,12 +1,12 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
-import DocsButton from '../DocsButton';
+import PageTitle from '../PageTitle';
 
 const fixtures = {
   'render without Props': {},
 };
 
-describe('DocsButton', () => {
+describe('PageTitle', () => {
   describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(DocsButton, fixtures));
+    testComponentSnapshotsWithFixtures(PageTitle, fixtures));
 });

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

@@ -1,42 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PageHeader rendering render without Props 1`] = `
-<Fragment>
-  <Row
-    bsClass="row"
-    componentClass="div"
-  >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      xs={6}
-    >
-      <h1
-        className="inventory_title"
-      >
-        Red Hat Inventory
-      </h1>
-    </Col>
-  </Row>
-  <Row
-    bsClass="row"
-    componentClass="div"
+<div
+  className="inventory-upload-header"
+>
+  <PageTitle />
+  <div
+    className="inventory-upload-header-description"
   >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      xs={9}
-    >
-      <PageDescription />
-    </Col>
-    <Col
-      bsClass="col"
-      componentClass="div"
-      xs={3}
-    >
-      <InventorySettings />
-    </Col>
-  </Row>
+    <InventorySettings />
+    <PageDescription />
+  </div>
   <Row
     bsClass="row"
     componentClass="div"
@@ -51,11 +25,11 @@ exports[`PageHeader rendering render without Props 1`] = `
     <Col
       bsClass="col"
       componentClass="div"
-      xs={6}
-      xsOffset={2}
+      xs={7}
+      xsOffset={1}
     >
       <ToolbarButtons />
     </Col>
   </Row>
-</Fragment>
+</div>
 `;

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

@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageTitle rendering render without Props 1`] = `
+<div
+  className="row form-group inventory-upload-header-title"
+>
+  <h1
+    className="col-md-8"
+  >
+    Red Hat Inventory
+  </h1>
+  <Dropdown
+    className="title-dropdown"
+    dropdownItems={
+      Array [
+        <DropdownItem
+          href="/foreman_tasks/tasks?search=action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateReportJob+or+action++%3D++ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Actions history
+        </DropdownItem>,
+        <DropdownItem
+          href="/links/manual/+?root_url=https%3A%2F%2Faccess.redhat.com%2Fproducts%2Fsubscription-central"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Documentation
+        </DropdownItem>,
+      ]
+    }
+    isOpen={false}
+    isPlain={true}
+    onSelect={[Function]}
+    position="right"
+    toggle={
+      <KebabToggle
+        onToggle={[Function]}
+      />
+    }
+  />
+</div>
+`;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorActions.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { get, post } from 'foremanReact/redux/API';
+import { CONFIGURE_CLOUD_CONNECTOR } from './CloudConnectorConstants';
+import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
+import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
+
+export const configureCloudConnector = () =>
+  post({
+    key: CONFIGURE_CLOUD_CONNECTOR,
+    url: inventoryUrl('cloud_connector'),
+    successToast: response => (
+      <span>
+        {__('Cloud connector setup is in progress now: ')}
+        <a href={foremanUrl(`/job_invocations/${response.data.id}`)}>
+          {__('Cloud connector job link')}
+        </a>
+      </span>
+    ),
+    errorToast: error => `${__('Cloud connector setup has failed: ')} ${error}`,
+  });
+
+export const getCloudConnector = () =>
+  get({
+    key: CONFIGURE_CLOUD_CONNECTOR,
+    url: inventoryUrl('cloud_connector'),
+  });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/CloudConnectorButton.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Spinner, Button, Popover } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { CONNECTOR_STATUS } from './CloudConnectorConstants';
+
+export const CloudConnectorButton = ({ status, onClick, jobLink }) => {
+  if (status === CONNECTOR_STATUS.PENDING) {
+    return (
+      <Popover
+        bodyContent={
+          <div>
+            {__('Cloud connector job is still running, you can view it here:')}
+            <a href={jobLink} target="_blank" rel="noopener noreferrer">
+              {__('Open job')}
+            </a>
+          </div>
+        }
+        aria-label="Popover with Link to cloud connector job"
+        closeBtnAriaLabel="Close cloud connector Popover"
+      >
+        <Button variant="secondary">
+          <Spinner size="sm" /> {__('Cloud Connector in progress')}
+        </Button>
+      </Popover>
+    );
+  }
+
+  if (status === CONNECTOR_STATUS.RESOLVED) {
+    return (
+      <Button variant="secondary" isDisabled>
+        {__('Cloud Connector is configured')}
+      </Button>
+    );
+  }
+
+  return (
+    <Button variant="secondary" onClick={onClick}>
+      {__('Configure Cloud Connector')}
+    </Button>
+  );
+};
+
+CloudConnectorButton.propTypes = {
+  status: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired,
+  jobLink: PropTypes.string,
+};
+CloudConnectorButton.defaultProps = {
+  jobLink: '',
+};