foreman_rh_cloud 4.0.31 → 5.0.31

data/test/jobs/upload_report_job_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
-class UploadReportJobTest < ActiveJob::TestCase
+class UploadReportJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'returns aborted state when disconnected' do
@@ -10,9 +12,9 @@ class UploadReportJobTest < ActiveJob::TestCase
         'idCert' => 'TEST_CERT',
       }
     )
-    FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
+    Setting[:content_disconnected] = true
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
@@ -24,7 +26,7 @@ class UploadReportJobTest < ActiveJob::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/test_plugin_helper.rb

@@ -32,8 +32,6 @@ module KatelloLocationFix
 
   included do
     setup do
-      FactoryBot.create(:setting, name: 'default_location_subscribed_hosts')
-      FactoryBot.create(:setting, name: 'default_location_puppet_content')
       Setting[:default_location_subscribed_hosts] = Location.first.title
     end
   end

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -41,7 +41,7 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   end
 
   def setup_global_foreman_proxy
-    FactoryBot.create(:setting, :name => 'http_proxy', :value => @global_foreman_proxy_mock)
+    Setting[:http_proxy] = @global_foreman_proxy_mock
   end
 
   def setup_cdn_proxy

data/test/unit/rh_cloud_permissions_test.rb

@@ -0,0 +1,14 @@
+require 'test_plugin_helper'
+require 'unit/shared/access_permissions_test_base'
+
+class RhCloudPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(
+    Rails.application.routes,
+    [
+      'insights_cloud/api/machine_telemetries/forward_request',
+      'insights_cloud/api/machine_telemetries/branch_info',
+    ],
+    skip_patterns: [/^(?!foreman_inventory_upload|insights_cloud|.*rh_cloud).*/]) # include only plugin paths
+end

data/test/unit/services/foreman_rh_cloud/branch_info_test.rb

@@ -38,7 +38,7 @@ class BranchInfoTest < ActiveSupport::TestCase
   test 'should generate appropriate labels' do
     2.times { FactoryBot.create(:katello_host_collection, :organization_id => @host.organization.id) }
 
-    FactoryBot.create(:setting, :settings_type => 'boolean', :default => true, :name => :include_parameter_tags)
+    Setting[:include_parameter_tags] = true
 
     Katello::HostCollection.all.map do |collection|
       FactoryBot.create(:katello_host_collection_host, :host_id => @host.id, :host_collection_id => collection.id)

data/test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb

@@ -8,7 +8,7 @@ class TemplateRendererHelperTest < ActiveSupport::TestCase
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/shell_process_job_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
 class ShellProcessJobTest < ActiveSupport::TestCase
   class TestProcessJob < ForemanInventoryUpload::Async::ShellProcess
@@ -13,11 +14,12 @@ class ShellProcessJobTest < ActiveSupport::TestCase
     end
   end
 
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
   include FolderIsolation
 
   test 'Runs a process with environment vars' do
     label = Foreman.uuid
-    TestProcessJob.perform_now(label)
+    ForemanTasks.sync_task(TestProcessJob, label)
 
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
 

data/test/unit/slice_generator_test.rb

@@ -189,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
@@ -260,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)
@@ -637,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,7 +63,7 @@ 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)
+    Setting[:include_parameter_tags] = true
 
     @host.stubs(:host_params).returns(
       {
@@ -85,7 +85,7 @@ 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)
+    Setting[:include_parameter_tags] = false
 
     @host.stubs(:host_params).returns(
       {

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -1,5 +1,5 @@
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,

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

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { FormGroup, TextInput } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import ClearButton from './Components/ClearButton';
 import './inventoryFilter.scss';
 import { ANY_ORGANIZATION } from './InventoryFilterConstants';
@@ -12,13 +13,14 @@ const InventoryFilter = ({
   handleFilterChange,
   handleFilterClear,
   filterTerm,
-  organization,
 }) => {
   useEffect(() => {
     const initialTerm = organization === ANY_ORGANIZATION ? '' : organization;
     handleFilterChange(initialTerm);
   }, []);
 
+  const organization = useForemanOrganization()?.title;
+
   return (
     <form id="inventory_filter_form">
       <FormGroup>
@@ -39,14 +41,12 @@ InventoryFilter.propTypes = {
   handleFilterChange: PropTypes.func,
   handleFilterClear: PropTypes.func,
   filterTerm: PropTypes.string,
-  organization: PropTypes.string,
 };
 
 InventoryFilter.defaultProps = {
   handleFilterChange: noop,
   handleFilterClear: noop,
   filterTerm: '',
-  organization: '',
 };
 
 export default InventoryFilter;

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/index.js

@@ -1,6 +1,5 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { selectCurrentOrganization } from 'foremanReact/components/Layout/LayoutSelectors';
 import reducer from './InventoryFilterReducer';
 import * as actions from './InventoryFilterActions';
 import InventoryFilter from './InventoryFilter';
@@ -10,7 +9,6 @@ export const reducers = { inventoryFilter: reducer };
 
 const mapStateToProps = state => ({
   filterTerm: selectFilterTerm(state),
-  organization: selectCurrentOrganization(state),
 });
 // map action dispatchers to props
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);

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/Components/PageHeader/components/SyncButton/SyncButtonActions.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { post } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
 import Toast from './components/Toast';

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,8 @@
 import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
+import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
+import InsightsTotalRiskCard from './InsightsHostDetailsTab/InsightsTotalRiskChart';
 
 const fills = [
   {
@@ -9,6 +11,18 @@ const fills = [
     component: () => <InventoryAutoUploadSwitcher />,
     weight: 50,
   },
+  {
+    slot: 'host-details-page-tabs',
+    name: 'Insights',
+    component: props => <NewHostDetailsTab {...props} />,
+    weight: 400,
+  },
+  {
+    slot: 'details-cards',
+    name: 'insights-total-risk-chart',
+    component: props => <InsightsTotalRiskCard {...props} />,
+    weight: 1100,
+  },
 ];
 
 export const registerFills = () => {

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

@@ -1,5 +1,5 @@
 import { API } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { insightsCloudUrl } from '../../InsightsCloudSyncHelpers';
 import {
   INSIGHTS_SYNC_SETTING_SET,