foreman_rh_cloud 4.0.25 → 5.0.28

data/test/unit/slice_generator_test.rb

@@ -22,7 +22,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       location: location
     )
 
-    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(
+      :katello_pool,
+      account_number: '1234',
+      cp_id: 1,
+      organization: env.organization,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: env.organization.id)
+    )
     @host.interfaces.first.identifier = 'test_nic1'
     @host.save!
 
@@ -457,9 +463,23 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports an account for hosts with multiple pools' do
-    first_pool = @host.organization.pools.first
-    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
-    new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
+    new_org = FactoryBot.create(:organization)
+    first_pool = FactoryBot.create(
+      :katello_pool,
+      account_number: '5678',
+      cp_id: 2,
+      organization: new_org,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: new_org.id)
+    )
+    second_pool = FactoryBot.create(
+      :katello_pool,
+      account_number: '9012',
+      cp_id: 3,
+      organization: new_org,
+      subscription: FactoryBot.create(:katello_subscription, organization_id: new_org.id)
+    )
+    new_org.pools << first_pool
+    new_org.pools << second_pool
 
     another_host = FactoryBot.create(
       :host,

data/test/unit/tags_generator_test.rb

@@ -65,14 +65,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'generates parameter tags' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -87,14 +87,14 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'skips parameter tags if include_parameter_tags setting is off' do
     FactoryBot.create(:setting, :name => 'include_parameter_tags', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
 
-    @host.stubs(:host_inherited_params_objects).returns(
-      [
-        OpenStruct.new(name: 'bool_param', value: true),
-        OpenStruct.new(name: 'false_param', value: false),
-        OpenStruct.new(name: 'int_param', value: 1),
-        OpenStruct.new(name: 'empty_param', value: nil),
-        OpenStruct.new(name: 'empty_str_param', value: ''),
-      ]
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -1,4 +1,12 @@
 .rh-cloud-inventory-page {
+  #main {
+    padding: 0;
+
+    #breadcrumb {
+      display: none;
+    }
+  }
+
   .account-list {
     .pf-c-accordion__toggle {
       margin-top: 10px;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettings.scss

@@ -10,9 +10,5 @@
       margin-top: 0;
       font-weight: 600;
     }
-
-    .foreman-switcher {
-      display: block;
-    }
   }
 }

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

@@ -1,5 +1,21 @@
 .rh-cloud-inventory-page {
   .inventory-upload-header {
+    margin-top: 35px;
+
+    h1 {
+      font-family: 'RedHatDisplay';
+      font-weight: 400;
+      margin: 0;
+    }
+
+    p {
+      font-size: 16px;
+    }
+
+    .pf-c-dropdown__toggle {
+      margin-right: -20px;
+    }
+
     .settings-alert {
       margin-bottom: 30px;
       .pf-c-alert {
@@ -18,10 +34,7 @@
 
     .inventory-upload-header-title {
       margin-top: -15px;
-
-      h1 {
-        margin: 0;
-      }
+      margin-bottom: 8px;
     }
 
     .title-dropdown {

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

@@ -4,19 +4,26 @@ import {
   DropdownItem,
   KebabToggle,
   DropdownPosition,
+  Grid,
+  GridItem,
 } from '@patternfly/react-core';
+import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
   ACTIONS_HISTORY_BUTTON_TEXT,
   DOCS_BUTTON_TEXT,
+  CLOUD_PING_TITLE,
 } from '../../ForemanInventoryConstants';
 import {
   getActionsHistoryUrl,
   getInventoryDocsUrl,
 } from '../../ForemanInventoryHelpers';
+import CloudPingModal from './components/CloudPingModal';
 
 const PageTitle = () => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const [showPingModal, setPingModal] = useState(false);
+  const togglePingModal = () => setPingModal(v => !v);
   const dropdownItems = [
     <DropdownItem
       key="tasks-history-button"
@@ -34,20 +41,37 @@ const PageTitle = () => {
     >
       {DOCS_BUTTON_TEXT}
     </DropdownItem>,
+    <DropdownItem key="cloud-ping" onClick={togglePingModal}>
+      {CLOUD_PING_TITLE}
+    </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>
+    <Grid className="inventory-upload-header-title">
+      <GridItem span={6}>
+        <Head>
+          <title>{INVENTORY_PAGE_TITLE}</title>
+        </Head>
+        <h1>{INVENTORY_PAGE_TITLE}</h1>
+      </GridItem>
+      <GridItem span={6}>
+        <Dropdown
+          className="title-dropdown"
+          onSelect={() => setIsDropdownOpen(false)}
+          toggle={
+            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+          }
+          isOpen={isDropdownOpen}
+          isPlain
+          dropdownItems={dropdownItems}
+          position={DropdownPosition.right}
+        />
+        <CloudPingModal
+          isOpen={showPingModal}
+          toggle={togglePingModal}
+          title={CLOUD_PING_TITLE}
+        />
+      </GridItem>
+    </Grid>
   );
 };
 export default PageTitle;

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

@@ -1,43 +1,64 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PageTitle rendering render without Props 1`] = `
-<div
-  className="row form-group inventory-upload-header-title"
+<Grid
+  className="inventory-upload-header-title"
 >
-  <h1
-    className="col-md-8"
+  <GridItem
+    span={6}
   >
-    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>
+    <Head>
+      <title>
+        Red Hat Inventory
+      </title>
+    </Head>
+    <h1>
+      Red Hat Inventory
+    </h1>
+  </GridItem>
+  <GridItem
+    span={6}
+  >
+    <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>,
+          <DropdownItem
+            onClick={[Function]}
+          >
+            Connectivity test
+          </DropdownItem>,
+        ]
+      }
+      isOpen={false}
+      isPlain={true}
+      onSelect={[Function]}
+      position="right"
+      toggle={
+        <KebabToggle
+          onToggle={[Function]}
+        />
+      }
+    />
+    <CloudPingModal
+      isOpen={false}
+      title="Connectivity test"
+      toggle={[Function]}
+    />
+  </GridItem>
+</Grid>
 `;

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

@@ -0,0 +1,144 @@
+/* eslint-disable camelcase */
+import React, { useCallback, useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { Table, TableBody, TableHeader } from '@patternfly/react-table';
+import {
+  Card,
+  CardTitle,
+  CardBody,
+  Modal,
+  ModalVariant,
+  Spinner,
+  Text,
+} from '@patternfly/react-core';
+import {
+  CheckCircleIcon,
+  ExclamationCircleIcon,
+} from '@patternfly/react-icons';
+import { get } from 'foremanReact/redux/API';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
+import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
+import './index.scss';
+
+export const API_KEY = 'CLOUD_PING';
+
+const CloudPingModal = ({ title, isOpen, toggle }) => {
+  const [rows, setRows] = useState([]);
+  const [tokenStatus, setTokenStatus] = useState({});
+  const dispatch = useDispatch();
+  const handleSuccess = useCallback(
+    ({
+      data: {
+        ping: { cert_auth = [], token_auth = {} },
+      },
+    }) => {
+      cert_auth.length &&
+        setRows(
+          cert_auth.map(cert => ({
+            cells: [
+              {
+                title: (
+                  <>
+                    <StatusIcon
+                      isPending={status === STATUS.PENDING}
+                      authStatus={cert}
+                    />{' '}
+                    {cert.org_name}
+                  </>
+                ),
+              },
+            ],
+          }))
+        );
+      setTokenStatus(token_auth);
+    },
+    [status]
+  );
+
+  useEffect(() => {
+    isOpen &&
+      dispatch(
+        get({
+          key: API_KEY,
+          url: inventoryUrl('status'),
+          handleSuccess,
+        })
+      );
+  }, [isOpen, dispatch, handleSuccess]);
+
+  const status = useSelector(state => selectAPIStatus(state, API_KEY));
+  const isPending = status === STATUS.PENDING;
+  // const error = useSelector(state => selectAPIErrorMessage(state, API_KEY));
+
+  return (
+    <>
+      <Modal
+        id="cloud-ping-modal"
+        appendTo={document.getElementsByClassName('react-container')[0]}
+        variant={ModalVariant.large}
+        title={title}
+        isOpen={isOpen}
+        onClose={toggle}
+      >
+        <Card className="token-status">
+          <CardTitle>
+            <StatusIcon isPending={isPending} authStatus={tokenStatus} />{' '}
+            {__('API token status')}
+          </CardTitle>
+        </Card>
+        <Card className="certs-status">
+          <CardTitle>{__('Organization status')}</CardTitle>
+          <CardBody>
+            <Text>
+              {__('Displays manifest statuses per accessible organizations.')}
+            </Text>
+            {isPending ? (
+              <Spinner size="xl" />
+            ) : (
+              <>
+                <Text className="pull-right">
+                  {sprintf(__('%s organizations'), rows.length)}
+                </Text>
+                <Table aria-label="Simple Table" cells={['']} rows={rows}>
+                  <TableHeader />
+                  <TableBody />
+                </Table>{' '}
+              </>
+            )}
+          </CardBody>
+        </Card>
+      </Modal>
+    </>
+  );
+};
+
+const StatusIcon = ({ isPending, authStatus }) => {
+  if (isPending) return <Spinner size="sm" />;
+  if (authStatus.success) return <CheckCircleIcon color="green" />;
+  if (authStatus.error) return <ExclamationCircleIcon color="red" />;
+  return <Spinner size="sm" />;
+};
+
+StatusIcon.propTypes = {
+  isPending: PropTypes.bool,
+  authStatus: PropTypes.shape({
+    success: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+    error: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+  }),
+};
+
+StatusIcon.defaultProps = {
+  isPending: true,
+  authStatus: {},
+};
+
+CloudPingModal.propTypes = {
+  title: PropTypes.string.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+  toggle: PropTypes.func.isRequired,
+};
+
+export default CloudPingModal;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.scss

@@ -0,0 +1,5 @@
+#cloud-ping-modal {
+  .token-status {
+    margin-bottom: 24px;
+  }
+}

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

@@ -1,24 +1,26 @@
 import React from 'react';
+import { Text } from '@patternfly/react-core';
+
 import { translate as __ } from 'foremanReact/common/I18n';
 
 export const PageDescription = () => (
   <div id="inventory_page_description">
-    <p>
+    <Text>
       {__(
         'Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.'
       )}
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__(
         'Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:'
       )}
@@ -30,8 +32,8 @@ export const PageDescription = () => (
       >
         {__('About subscription watch')}
       </a>
-    </p>
-    <p>
+    </Text>
+    <Text>
       {__('For more information about Insights and Cloud Connector read')}
       &nbsp;
       <a
@@ -41,7 +43,7 @@ export const PageDescription = () => (
       >
         {__('Red Hat Insights Data and Application Security')}
       </a>
-    </p>
+    </Text>
   </div>
 );
 

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

@@ -4,16 +4,16 @@ exports[`PageDescription rendering render without Props 1`] = `
 <div
   id="inventory_page_description"
 >
-  <p>
+  <Text>
     Red Hat Insights is a set of cloud services which provide unified subscription reporting, predictive analysis and remediation of issues through this Satellite instance.
-  </p>
-  <p>
+  </Text>
+  <Text>
     You can toggle the Auto upload switch to the ON position to enable Satellite to automatically upload your host inventory once a day.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Click Restart to upload your host inventory to Red Hat Insights. Perform this step for each organization from which you want to manually upload a host inventory.
-  </p>
-  <p>
+  </Text>
+  <Text>
     Enabling inventory uploads is required by subscription watch. For more information about subscription watch see link:
      
     <a
@@ -23,8 +23,8 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       About subscription watch
     </a>
-  </p>
-  <p>
+  </Text>
+  <Text>
     For more information about Insights and Cloud Connector read
      
     <a
@@ -34,6 +34,6 @@ exports[`PageDescription rendering render without Props 1`] = `
     >
       Red Hat Insights Data and Application Security
     </a>
-  </p>
+  </Text>
 </div>
 `;

data/webpack/ForemanInventoryUpload/ForemanInventoryConstants.js

@@ -7,3 +7,5 @@ export const DOCS_BUTTON_TEXT = __('Documentation');
 export const ACTIONS_HISTORY_BUTTON_TEXT = __('Actions history');
 
 export const SYNC_BUTTON_TEXT = __(' Sync inventory status');
+
+export const CLOUD_PING_TITLE = __('Connectivity test');

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -33,7 +33,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
       >
         <Popover
           bodyContent={
-            <UNDEFINED
+            <Memo(Connect(AdvancedSettings))
               autoUploadEnabled={true}
               handleToggle={[Function]}
             />

data/webpack/InsightsCloudSync/Components/InsightsHeader/InsightsHeader.scss

@@ -1,4 +1,8 @@
 .insights-header {
-  margin-bottom: '15px';
   overflow: auto;
+  margin-bottom: 30px;
+
+  p {
+    font-size: 16px;
+  }
 }

data/webpack/InsightsCloudSync/Components/InsightsHeader/index.js

@@ -1,15 +1,15 @@
 import React from 'react';
+import { Text, TextVariants } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
-import InsightsSettings from '../InsightsSettings';
 import './InsightsHeader.scss';
 
 const InsightsHeader = () => (
   <div className="insights-header">
-    <InsightsSettings />
-    <p>
-      {__(`Insights synchronization process is used to provide Insights
-             recommendations output for hosts managed here`)}
-    </p>
+    <Text component={TextVariants.p}>
+      {__(
+        'Insights synchronization process is used to provide Insights recommendations output for hosts managed here.'
+      )}
+    </Text>
   </div>
 );
 

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import InsightsSyncSwitcher from '../InsightsSyncSwitcher';
+import SwitcherPF4 from '../../../common/Switcher/SwitcherPF4';
 import './insightsSettings.scss';
 
 class InsightsSettings extends Component {
@@ -14,10 +14,14 @@ class InsightsSettings extends Component {
     const { insightsSyncEnabled, setInsightsSyncEnabled } = this.props;
     return (
       <div className="insights_settings">
-        <h3>{__('Settings')}</h3>
-        <InsightsSyncSwitcher
-          insightsSyncEnabled={insightsSyncEnabled}
-          setInsightsSyncEnabled={setInsightsSyncEnabled}
+        <SwitcherPF4
+          id="insights_sync_switcher"
+          label={__('Sync automatically')}
+          tooltip={__(
+            'Enable automatic synchronization of Insights recommendations from the Red Hat cloud'
+          )}
+          isChecked={insightsSyncEnabled}
+          onChange={() => setInsightsSyncEnabled(!insightsSyncEnabled)}
         />
       </div>
     );

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

@@ -4,12 +4,12 @@ exports[`InsightsSettings rendering render without Props 1`] = `
 <div
   className="insights_settings"
 >
-  <h3>
-    Settings
-  </h3>
-  <InsightsSyncSwitcher
-    insightsSyncEnabled={false}
-    setInsightsSyncEnabled={[Function]}
+  <SwitcherPF4
+    id="insights_sync_switcher"
+    isChecked={false}
+    label="Sync automatically"
+    onChange={[Function]}
+    tooltip="Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
   />
 </div>
 `;