foreman_rh_cloud 4.0.25.1 → 5.0.29

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!
 
@@ -183,7 +189,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates obfuscated ip_address fields without inisghts-client' do
-    FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
+    Setting[:obfuscate_inventory_ips] = true
 
     @host.interfaces << FactoryBot.build(:nic_managed)
     batch = Host.where(id: @host.id).in_batches.first
@@ -254,7 +260,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'obfuscates fqdn when setting set' do
-    FactoryBot.create(:setting, :name => 'obfuscate_inventory_hostnames', :value => true)
+    Setting[:obfuscate_inventory_hostnames] = true
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -441,6 +447,18 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'excludes hosts with host_registration_insights set to false' do
+    @host.host_parameters << HostParameter.create(
+      name: 'host_registration_insights',
+      value: "false",
+      parameter_type: 'boolean'
+    )
+
+    count = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).count
+
+    assert_equal 0, count
+  end
+
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 
@@ -457,9 +475,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,
@@ -605,7 +637,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'include packages installed in the report' do
-    FactoryBot.create(:setting, :name => 'exclude_installed_packages', :value => false)
+    Setting[:exclude_installed_packages] = false
     installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
 
     another_host = FactoryBot.create(

data/test/unit/tags_generator_test.rb

@@ -63,16 +63,16 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   end
 
   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: ''),
-      ]
+    Setting[:include_parameter_tags] = true
+
+    @host.stubs(:host_params).returns(
+      {
+        'bool_param' => true,
+        'false_param' => false,
+        'int_param' => 1,
+        'empty_param' => nil,
+        'empty_str_param' => '',
+      }
     )
 
     generator = create_generator
@@ -85,16 +85,16 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   end
 
   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: ''),
-      ]
+    Setting[:include_parameter_tags] = false
+
+    @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/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,7 +4,10 @@ import {
   DropdownItem,
   KebabToggle,
   DropdownPosition,
+  Grid,
+  GridItem,
 } from '@patternfly/react-core';
+import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
   ACTIONS_HISTORY_BUTTON_TEXT,
@@ -43,23 +46,32 @@ const PageTitle = () => {
     </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}
-      />
-      <CloudPingModal
-        isOpen={showPingModal}
-        toggle={togglePingModal}
-        title={CLOUD_PING_TITLE}
-      />
-    </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,53 +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>,
-        <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]}
-  />
-</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/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/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/ForemanRhCloudFills.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
+import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
 
 const fills = [
   {
@@ -9,6 +10,12 @@ const fills = [
     component: () => <InventoryAutoUploadSwitcher />,
     weight: 50,
   },
+  {
+    slot: 'host-details-page-tabs',
+    name: 'Insights',
+    component: props => <NewHostDetailsTab {...props} />,
+    weight: 700,
+  },
 ];
 
 export const registerFills = () => {

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

@@ -1,12 +1,10 @@
 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 />
     <Text component={TextVariants.p}>
       {__(
         'Insights synchronization process is used to provide Insights recommendations output for hosts managed here.'

data/webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss

@@ -1,3 +1,4 @@
 .insights_settings {
   float: right;
+  margin-top: 22px;
 }

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js

@@ -4,7 +4,10 @@ import PropTypes from 'prop-types';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import SelectAllAlert from './SelectAllAlert';
-import { columns } from './InsightsTableConstants';
+import {
+  columns as defaultColumns,
+  getColumnsWithoutHostname,
+} from './InsightsTableConstants';
 import TableEmptyState from '../../../common/table/EmptyState';
 import { modifySelectedRows, getSortColumnIndex } from './InsightsTableHelpers';
 import Pagination from './Pagination';
@@ -27,10 +30,12 @@ const InsightsTable = ({
   clearAllSelection,
   error,
   isAllSelected,
+  hideHost,
 }) => {
   const { perPage: appPerPage } = useForemanSettings();
   const perPage = urlPerPage || appPerPage;
   const [rows, setRows] = React.useState([]);
+  const [columns, setColumns] = React.useState(defaultColumns);
 
   // acts as componentDidMount
   useEffect(() => {
@@ -38,8 +43,12 @@ const InsightsTable = ({
   }, []);
 
   useEffect(() => {
-    setRows(modifySelectedRows(hits, selectedIds, showSelectAllAlert));
-  }, [hits, selectedIds]);
+    setRows(
+      modifySelectedRows(hits, selectedIds, showSelectAllAlert, hideHost)
+    );
+
+    if (hideHost) setColumns(getColumnsWithoutHostname());
+  }, [hits, selectedIds, hideHost]);
 
   return (
     <React.Fragment>
@@ -51,14 +60,19 @@ const InsightsTable = ({
         isAllSelected={isAllSelected}
       />
       <Table
-        className="recommendations-table"
+        className="rh-cloud-recommendations-table"
         aria-label="Recommendations Table"
         onSelect={(_event, isSelected, rowId) =>
           onTableSelect(isSelected, rowId, rows, selectedIds)
         }
         canSelectAll
-        sortBy={{ index: getSortColumnIndex(sortBy), direction: sortOrder }}
-        onSort={onTableSort}
+        sortBy={{
+          index: getSortColumnIndex(columns, sortBy),
+          direction: sortOrder,
+        }}
+        onSort={(_event, index, direction) =>
+          onTableSort(columns, index, direction)
+        }
         cells={columns}
         rows={rows}
         variant="compact"
@@ -89,6 +103,7 @@ InsightsTable.propTypes = {
   query: PropTypes.string,
   error: PropTypes.string,
   isAllSelected: PropTypes.bool,
+  hideHost: PropTypes.bool,
 };
 
 InsightsTable.defaultProps = {
@@ -102,6 +117,7 @@ InsightsTable.defaultProps = {
   query: '',
   error: '',
   isAllSelected: false,
+  hideHost: false,
 };
 
 export default InsightsTable;

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js

@@ -2,14 +2,13 @@ import URI from 'urijs';
 import { push } from 'connected-react-router';
 import { get } from 'foremanReact/redux/API';
 import { selectQueryParams } from './InsightsTableSelectors';
-import { INSIGHTS_PATH } from '../../InsightsCloudSyncConstants';
 import {
-  columns,
   INSIGHTS_HITS_API_KEY,
   INSIGHTS_HITS_PATH,
   INSIGHTS_SET_SELECTED_IDS,
   INSIGHTS_SET_SELECT_ALL_ALERT,
   INSIGHTS_SET_SELECT_ALL,
+  NEW_HOST_PATH,
 } from './InsightsTableConstants';
 
 export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
@@ -29,17 +28,20 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
     select_all: isSelectAll,
   });
 
-  dispatch(
-    push({
-      pathname: INSIGHTS_PATH,
-      search: uri.search(),
-    })
-  );
+  updateUrl(uri, dispatch);
 
   if (!isSelectAll) {
     dispatch(setSelectAllAlert(false));
   }
 
+  let search = query;
+  if (isNewHostPage(uri)) {
+    const hostname = uri.pathname().split('/new/hosts/')[1];
+    const hostQuery = `hostname = ${hostname}`;
+    const q = query?.trim();
+    search = q ? `${hostQuery} AND (${q})` : hostQuery;
+  }
+
   return dispatch(
     get({
       key: INSIGHTS_HITS_API_KEY,
@@ -47,7 +49,7 @@ export const fetchInsights = (queryParams = {}) => (dispatch, getState) => {
       params: {
         page,
         per_page: perPage,
-        search: query,
+        search,
         order: `${sortBy} ${sortOrder}`,
       },
       handleSuccess: response => {
@@ -96,7 +98,7 @@ export const clearAllSelection = () => dispatch => {
   dispatch(setSelectAll(false));
 };
 
-export const onTableSort = (_event, index, direction) => {
+export const onTableSort = (columns, index, direction) => {
   // The checkbox column shifts the data columns by 1;
   const { sortKey } = columns[index - 1];
   return fetchInsights({
@@ -144,11 +146,16 @@ export const onTableSelect = (
 const setSelectAllUrl = selectAllValue => dispatch => {
   const uri = new URI();
   uri.setSearch({ select_all: selectAllValue });
+  updateUrl(uri, dispatch);
+};
 
-  dispatch(
-    push({
-      pathname: INSIGHTS_PATH,
-      search: uri.search(),
-    })
-  );
+const updateUrl = (uri, dispatch) => {
+  const nextUrlParams = { search: uri.search() };
+  if (isNewHostPage(uri)) {
+    // we need to keep the hash so the insights tab will remain selected in the new host details page.
+    nextUrlParams.hash = '/Insights';
+  }
+  dispatch(push(nextUrlParams));
 };
+
+const isNewHostPage = uri => uri.pathname().includes(NEW_HOST_PATH);