foreman_rh_cloud 12.1.5 → 12.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf912ff1170fb60a3b10a6d1178f71ad7a92662c2272a883179eb30a62e2c2e
-  data.tar.gz: 3ff64877a61a50890423e1d25980ea37e9fc3ae949f875be344b299f5580ab24
+  metadata.gz: a5297c9be7a8e61f55e175c20b5f322b19c015d9a29bdd9c1bf42248ad1ffedf
+  data.tar.gz: 59cab12bcca78ee78eba81af4c0089f1dcaac84b35244936b707692c4881f7ba
 SHA512:
-  metadata.gz: 5792bc34bf4e7a254cacc14cd014b9e008378d695ddc5ae00afcbd5f10371840a53ecdd106f2a845531a2c174fab3c7d1b931ba0a6f766c749124adcbcff742f
-  data.tar.gz: dffa948ae7cca41a839be2c07f26193ccc11c9af71d84c07d4b0f256a0ad0e5763ce107cf69a22ecb6436212a5e68d09512a4043eb8eb5b01a2268c88d0d44fd
+  metadata.gz: d8a544fe9144aad08668231c90d3c221a316501dc3d7f3766c444d2617c22949a5d4bde889960f6ff5cd9a6005f07885cb99ca059ab8b64ca7a5f058fc8df192
+  data.tar.gz: 123d446d857e98c371c362b26af1be131e59d41c7ade186a11d061fcb5078b39358a998be23eceb1e4dafcc66e9e6a8dd10c70652ad60b13f01d54675fbd4576

data/app/controllers/insights_cloud/ui_requests_controller.rb

@@ -75,6 +75,17 @@ module InsightsCloud
       res.headers[new_header] = header_content
     end
 
+    def translate_insights_host
+      facet = InsightsFacet.find_by(uuid: params[:uuid])
+      if facet.present?
+        Rails.logger.debug "Found InsightsFacet #{params[:uuid]}"
+        redirect_to host_details_page_path(facet.host_id)
+      else
+        Rails.logger.error "Could not find InsightsFacet for #{params[:uuid]}"
+        redirect_to '/page-not-found'
+      end
+    end
+
     private
 
     def ensure_org

data/app/services/foreman_rh_cloud/url_remediations_retriever.rb

@@ -28,7 +28,7 @@ module ForemanRhCloud
     end
 
     def payload
-      @payload.to_json
+      @payload.present? ? @payload.to_json : @payload # don't run .to_json if @payload is ''
     end
 
     def method

data/config/routes.rb

@@ -38,8 +38,13 @@ Rails.application.routes.draw do
     unless ForemanRhCloud.with_local_advisor_engine?
       get 'inventory_upload', to: '/react#index'
     end
+    if ForemanRhCloud.with_local_advisor_engine?
+      get 'recommendations', to: '/react#index'
+      get 'recommendations/:rule_id', to: '/react#index'
+    end
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
     get 'insights_vulnerability', to: '/react#index'
+    get 'insights_vulnerability/:cve_id', to: '/react#index'
   end
 
   scope :module => :'insights_cloud/api', :path => :redhat_access do
@@ -56,6 +61,8 @@ Rails.application.routes.draw do
     match '/api/lightspeed/*path', to: 'machine_telemetries#forward_request', via: :all
   end
 
+  get '/insights_hosts/:uuid', to: 'insights_cloud/ui_requests#translate_insights_host'
+
   # API routes
 
   namespace :api, :defaults => { :format => 'json' } do

data/lib/foreman_rh_cloud/engine.rb

@@ -33,134 +33,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |app|
       app.reloader.to_prepare do
-        Foreman::Plugin.register :foreman_rh_cloud do
-          requires_foreman '>= 3.13'
-          register_gettext
-
-          apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
-
-          settings do
-            category(:rh_cloud, N_('Insights')) do
-              setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
-              setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
-              setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
-              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.)'), default: false, full_name: N_('Obfuscate host names'))
-              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
-              setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
-              setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
-              setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
-              setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings.'))
-            end
-          end
-
-          # Add permissions
-          security_block :foreman_rh_cloud do
-            permission(
-              :generate_foreman_rh_cloud,
-              'foreman_inventory_upload/reports': [:generate],
-              'foreman_inventory_upload/tasks': [:create],
-              'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
-              'foreman_inventory_upload/uploads': [:enable_cloud_connector],
-              'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
-              'foreman_inventory_upload/missing_hosts': [:remove_hosts],
-              'insights_cloud/settings': [:update],
-              'insights_cloud/tasks': [:create]
-            )
-            permission(
-              :view_foreman_rh_cloud,
-              'foreman_inventory_upload/accounts': [:index],
-              'foreman_inventory_upload/reports': [:last],
-              'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
-              'foreman_inventory_upload/tasks': [:show],
-              'foreman_inventory_upload/cloud_status': [:index],
-              'foreman_inventory_upload/uploads_settings': [:index],
-              'foreman_inventory_upload/missing_hosts': [:index],
-              'api/v2/rh_cloud/advisor_engine_config': [:show],
-              'react': [:index]
-            )
-            permission(
-              :view_insights_hits,
-              {
-                '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
-                'insights_cloud/hits': [:index, :show, :auto_complete_search, :resolutions],
-                'insights_cloud/settings': [:index, :show],
-                'insights_cloud/ui_requests': [:forward_request],
-                'react': [:index],
-              },
-              :resource_type => ::InsightsHit.name
-            )
-            permission(
-              :dispatch_cloud_requests,
-              'api/v2/rh_cloud/cloud_request': [:update]
-            )
-            permission(
-              :control_organization_insights,
-              'insights_cloud/settings': [:set_org_parameter]
-            )
-          end
-
-          plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
-
-          role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
-                                                      generate a report, upload it to the cloud and download it locally'
-
-          add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
-            Role::MANAGER => plugin_permissions,
-            Role::SYSTEM_ADMIN => plugin_permissions
-
-          # Adding a top-level menu item
-          sub_menu :top_menu, :insights_menu, caption: N_('Insights'), icon: 'fa fa-cloud', after: :hosts_menu do
-            menu :top_menu,
-              :inventory_upload,
-              caption: N_('Inventory Upload'),
-              url: '/foreman_rh_cloud/inventory_upload',
-              url_hash: { controller: :react, action: :index },
-              parent: :insights_menu
-            menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
-            menu :top_menu,
-              :insights_vulnerability,
-              caption: N_('Vulnerability'),
-              url: '/foreman_rh_cloud/insights_vulnerability',
-              url_hash: { controller: :react, action: :index },
-              parent: :insights_menu,
-              if: -> { ForemanRhCloud.with_local_advisor_engine? }
-          end
-
-          register_facet InsightsFacet, :insights do
-            configure_host do
-              api_view :list => 'api/v2/hosts/insights/insights', :single => 'api/v2/hosts/insights/single'
-              set_dependent_action :destroy
-            end
-          end
-
-          register_global_js_file 'global'
-
-          register_custom_status InventorySync::InventoryStatus
-          register_custom_status InsightsClientReportStatus
-
-          describe_host do
-            overview_buttons_provider :insights_host_overview_buttons
-          end
-
-          extend_page 'hosts/show' do |context|
-            context.add_pagelet :main_tabs,
-              partial: 'hosts/insights_tab',
-              name: _('Insights'),
-              id: 'insights',
-              onlyif: proc { |host| host.insights }
-          end
-
-          extend_page 'hosts/_list' do |context|
-            context.with_profile :cloud, _('RH Cloud'), default: true do
-              add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100,
-                          export_data: CsvExporter::ExportDefinition.new(:insights_recommendations_count, callback: ->(host) { host&.insights_hits&.count })
-              add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
-            end
-          end
-
-          extend_template_helpers ForemanRhCloud::TemplateRendererHelper
-          allowed_template_helpers :remediations_playbook, :download_rh_playbook
-        end
+        ForemanRhCloud::Plugin.register
 
         ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
@@ -229,10 +102,15 @@ module ForemanRhCloud
         Katello::Api::V2::OrganizationsController.before_action(:local_find_taxonomy, only: :download_debug_certificate)
 
         Katello::Api::V2::RepositoriesController.include Foreman::Controller::SmartProxyAuth
+        # patch the callbacks order for :index, since find_product has to run after the user is already initialized
+        Katello::Api::V2::RepositoriesController.skip_before_action(:find_product, only: :index)
+        Katello::Api::V2::RepositoriesController.skip_before_action(:find_optional_organization, only: :index)
         Katello::Api::V2::RepositoriesController.add_smart_proxy_filters(
           :index,
           features: ForemanRhCloud.on_prem_smart_proxy_features
         )
+        Katello::Api::V2::RepositoriesController.before_action(:find_product, only: :index)
+        Katello::Api::V2::RepositoriesController.before_action(:find_optional_organization, only: :index)
       end
     end
 
@@ -259,6 +137,6 @@ module ForemanRhCloud
   end
 
   def self.on_prem_smart_proxy_features
-    ['Insights']
+    ['iop']
   end
 end

data/lib/foreman_rh_cloud/plugin.rb

@@ -0,0 +1,138 @@
+module ForemanRhCloud
+  module Plugin
+    def self.register
+      # This module is auto-loaded, but plugin settings cannot be redefined
+      # Ensure that we don't try to re-register the plugin on code reload
+      return if Foreman::Plugin.find(:foreman_rh_cloud)
+
+      Foreman::Plugin.register :foreman_rh_cloud do
+        requires_foreman '>= 3.13'
+        register_gettext
+
+        apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
+
+        settings do
+          category(:rh_cloud, N_('Insights')) do
+            setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
+            setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
+            setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
+            setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.)'), default: false, full_name: N_('Obfuscate host names'))
+            setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
+            setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
+            setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
+            setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+            setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings.'))
+          end
+        end
+
+        # Add permissions
+        security_block :foreman_rh_cloud do
+          permission(
+            :generate_foreman_rh_cloud,
+            'foreman_inventory_upload/reports': [:generate],
+            'foreman_inventory_upload/tasks': [:create],
+            'api/v2/rh_cloud/inventory': [:get_hosts, :remove_hosts, :sync_inventory_status, :download_file, :generate_report, :enable_cloud_connector],
+            'foreman_inventory_upload/uploads': [:enable_cloud_connector],
+            'foreman_inventory_upload/uploads_settings': [:set_advanced_setting],
+            'foreman_inventory_upload/missing_hosts': [:remove_hosts],
+            'insights_cloud/settings': [:update],
+            'insights_cloud/tasks': [:create]
+          )
+          permission(
+            :view_foreman_rh_cloud,
+            'foreman_inventory_upload/accounts': [:index],
+            'foreman_inventory_upload/reports': [:last],
+            'foreman_inventory_upload/uploads': [:auto_upload, :show_auto_upload, :download_file, :last],
+            'foreman_inventory_upload/tasks': [:show],
+            'foreman_inventory_upload/cloud_status': [:index],
+            'foreman_inventory_upload/uploads_settings': [:index],
+            'foreman_inventory_upload/missing_hosts': [:index],
+            'api/v2/rh_cloud/advisor_engine_config': [:show],
+            'react': [:index]
+          )
+          permission(
+            :view_insights_hits,
+            {
+              '/foreman_rh_cloud/insights_cloud': [:index], # for bookmarks and later for showing the page
+              'insights_cloud/hits': [:index, :show, :auto_complete_search, :resolutions],
+              'insights_cloud/settings': [:index, :show],
+              'insights_cloud/ui_requests': [:forward_request, :translate_insights_host],
+              'react': [:index],
+            },
+            :resource_type => ::InsightsHit.name
+          )
+          permission(
+            :dispatch_cloud_requests,
+            'api/v2/rh_cloud/cloud_request': [:update]
+          )
+          permission(
+            :control_organization_insights,
+            'insights_cloud/settings': [:set_org_parameter]
+          )
+        end
+
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud, :view_insights_hits, :dispatch_cloud_requests, :control_organization_insights]
+
+        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                    generate a report, upload it to the cloud and download it locally'
+
+        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+          Role::MANAGER => plugin_permissions,
+          Role::SYSTEM_ADMIN => plugin_permissions
+
+        # Adding a top-level menu item
+        sub_menu :top_menu, :insights_menu, caption: N_('Insights'), icon: 'fa fa-cloud', after: :hosts_menu do
+          menu :top_menu,
+            :inventory_upload,
+            caption: N_('Inventory Upload'),
+            url: '/foreman_rh_cloud/inventory_upload',
+            url_hash: { controller: :react, action: :index },
+            parent: :insights_menu
+          menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
+          menu :top_menu,
+            :insights_vulnerability,
+            caption: N_('Vulnerability'),
+            url: '/foreman_rh_cloud/insights_vulnerability',
+            url_hash: { controller: :react, action: :index },
+            parent: :insights_menu,
+            if: -> { ForemanRhCloud.with_local_advisor_engine? }
+        end
+
+        register_facet InsightsFacet, :insights do
+          configure_host do
+            api_view :list => 'api/v2/hosts/insights/insights', :single => 'api/v2/hosts/insights/single'
+            set_dependent_action :destroy
+          end
+        end
+
+        register_global_js_file 'global'
+
+        register_custom_status InventorySync::InventoryStatus
+        register_custom_status InsightsClientReportStatus
+
+        describe_host do
+          overview_buttons_provider :insights_host_overview_buttons
+        end
+
+        extend_page 'hosts/show' do |context|
+          context.add_pagelet :main_tabs,
+            partial: 'hosts/insights_tab',
+            name: _('Insights'),
+            id: 'insights',
+            onlyif: proc { |host| host.insights }
+        end
+
+        extend_page 'hosts/_list' do |context|
+          context.with_profile :cloud, _('RH Cloud'), default: true do
+            add_pagelet :hosts_table_column_header, key: :insights_recommendations_count, label: _('Recommendations'), sortable: true, width: '12%', class: 'hidden-xs ellipsis', priority: 100,
+                        export_data: CsvExporter::ExportDefinition.new(:insights_recommendations_count, callback: ->(host) { host&.insights_hits&.count })
+            add_pagelet :hosts_table_column_content, key: :insights_recommendations_count, callback: ->(host) { hits_counts_cell(host) }, class: 'hidden-xs ellipsis text-center', priority: 100
+          end
+        end
+
+        extend_template_helpers ForemanRhCloud::TemplateRendererHelper
+        allowed_template_helpers :remediations_playbook, :download_rh_playbook
+      end
+    end
+  end
+end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.1.5'.freeze
+  VERSION = '12.2.1'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.1.5",
+  "version": "12.2.1",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/insights_cloud/ui_requests_controller_test.rb

@@ -9,6 +9,29 @@ module InsightsCloud
       FactoryBot.create(:common_parameter, name: InsightsCloud.enable_client_param, key_type: 'boolean', value: true)
     end
 
+    context '#translate_insights_host' do
+      setup do
+        @org = FactoryBot.create(:organization)
+        @loc = FactoryBot.create(:location)
+        @host = FactoryBot.create(:host, :with_subscription, :organization => @org)
+        @facet = InsightsFacet.create(host: @host, uuid: @host.subscription_facet.uuid)
+      end
+
+      test "should redirect to host details page by id" do
+        get :translate_insights_host, params: { "uuid" => @host.subscription_facet.uuid }, session: set_session
+        assert_equal 302, @response.status
+        assert @response.redirect?
+        assert_equal "http://test.host/new/hosts/#{@host.id}", @response.redirect_url
+      end
+
+      test "should redirect to not-found page" do
+        get :translate_insights_host, params: { "uuid" => "foo" }, session: set_session
+        assert_equal 302, @response.status
+        assert @response.redirect?
+        assert_equal "http://test.host/page-not-found", @response.redirect_url
+      end
+    end
+
     context '#forward_request' do
       include MockCerts
 

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+import './CVEsHostDetailsTab.scss';
 
 const CVEsHostDetailsTab = ({ systemId }) => {
   const scope = 'vulnerability';

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.scss

@@ -0,0 +1,3 @@
+div.rh-cloud-insights-vulnerability-host-details-component {
+  padding: 24px;
+}

data/webpack/CveDetailsPage/CveDetailsPage.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+
+const CveDetailsPage = () => {
+  const { cveId } = useParams();
+  const scope = 'vulnerability';
+  const module = './CveDetailPage';
+
+  return (
+    <ScalprumProvider {...providerOptions}>
+      <div className="rh-cloud-cve-details-page">
+        <ScalprumComponent scope={scope} module={module} cveId={cveId} />
+      </div>
+    </ScalprumProvider>
+  );
+};
+
+export default CveDetailsPage;

data/webpack/CveDetailsPage/CveDetailsPage.test.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import CveDetailsPage from './CveDetailsPage';
+
+// Mock react-router-dom
+jest.mock('react-router-dom', () => ({
+  useParams: jest.fn(() => ({ cveId: 'CVE-2021-1234' })),
+}));
+
+jest.mock('@scalprum/react-core', () => ({
+  ScalprumComponent: jest.fn(props => (
+    <div data-testid="mock-scalprum-component">{JSON.stringify(props)}</div>
+  )),
+  ScalprumProvider: jest.fn(({ children }) => <div>{children}</div>),
+}));
+
+describe('CveDetailsPage component', () => {
+  it('renders the container with correct class', () => {
+    const { container } = render(<CveDetailsPage />);
+    expect(
+      container.querySelector('.rh-cloud-cve-details-page')
+    ).toBeTruthy();
+  });
+
+  it('passes cveId from URL params to ScalprumComponent', () => {
+    const { getByTestId } = render(<CveDetailsPage />);
+    const mockComponent = getByTestId('mock-scalprum-component');
+    expect(mockComponent.textContent).toContain('CVE-2021-1234');
+  });
+});

data/webpack/CveDetailsPage/index.js

@@ -0,0 +1 @@
+export { default } from './CveDetailsPage';

data/webpack/ForemanColumnExtensions/index.js

@@ -1,20 +1,16 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { Link } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { CVECountCell } from '../InsightsVulnerabilityHostIndexExtensions/CVECountCell';
 
-const RecommendationsCell = hostDetails => {
+const HostedRecommendationsCell = hostDetails => {
   const insightsAttributes = propsToCamelCase(
     // eslint-disable-next-line camelcase
     hostDetails?.insights_attributes ?? {}
   );
-  // Local insights advisor
-  if (insightsAttributes.useLocalAdvisorEngine) {
-    // TODO: Replace this placeholder with the actual local advisor integration
-    return <span>Local advisor placeholder</span>;
-  }
-
-  // Hosted insights advisor
   const { insightsHitsCount: hitsCount } = insightsAttributes;
   if (hitsCount === undefined || hitsCount === null) return '—';
   const hostname = hostDetails?.name;
@@ -23,6 +19,40 @@ const RecommendationsCell = hostDetails => {
   return <a href={hitsUrl}>{hitsCount}</a>;
 };
 
+const IopRecommendationsCell = ({ hostDetails }) => {
+  // eslint-disable-next-line camelcase
+  const uuid = hostDetails?.insights_attributes?.uuid;
+  const { response } = useAPI(
+    uuid ? 'get' : null,
+    `/insights_cloud/api/insights/v1/system/${uuid}`,
+    { key: `HOST_RECS_COUNT_${uuid}` }
+  );
+
+  const hits = response?.hits;
+  return hits === undefined ? (
+    '—'
+  ) : (
+    <Link to={`hosts/${hostDetails.name}#/Insights`}>{hits}</Link>
+  );
+};
+
+IopRecommendationsCell.propTypes = {
+  hostDetails: PropTypes.object.isRequired,
+};
+
+const RecommendationsCell = hostDetails => {
+  const insightsAttributes = propsToCamelCase(
+    // eslint-disable-next-line camelcase
+    hostDetails?.insights_attributes ?? {}
+  );
+
+  return insightsAttributes.useLocalAdvisorEngine ? (
+    <IopRecommendationsCell hostDetails={hostDetails} />
+  ) : (
+    <HostedRecommendationsCell hostDetails={hostDetails} />
+  );
+};
+
 const insightsCategoryName = __('Insights');
 
 const hostsIndexColumnExtensions = [

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

@@ -3,6 +3,7 @@ import { Text } from '@patternfly/react-core';
 import { useSelector } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { getDocsURL } from 'foremanReact/common/helpers';
 import { FormattedMessage } from 'react-intl';
 import { selectSubscriptionConnectionEnabled } from '../../../InventorySettings/InventorySettingsSelectors';
 
@@ -53,6 +54,28 @@ export const PageDescription = () => {
           />
         </Text>
       )}
+      <Text ouiaId="text-minimal-data-collection">
+        <FormattedMessage
+          id="minimal-data-collection-message"
+          defaultMessage={__(
+            'Learn more about {minimalDataCollectionSetting}.'
+          )}
+          values={{
+            minimalDataCollectionSetting: (
+              <a
+                href={getDocsURL(
+                  'Managing_Hosts',
+                  'setting-minimal-data-collection'
+                )}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {__('setting minimal data collection')}
+              </a>
+            ),
+          }}
+        />
+      </Text>
       <Text ouiaId="text-more-info-subscription">
         {__('For more information about the Subscriptions service, see:')}
         &nbsp;

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

@@ -15,6 +15,8 @@ jest.mock('react-intl', () => {
     }),
   };
 });
+jest.mock('foremanReact/common/helpers', () => ({ getDocsURL: () => {} }));
+
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 

data/webpack/ForemanRhCloudPages.js

@@ -1,19 +1,24 @@
+/* eslint-disable spellcheck/spell-checker */
 import React from 'react';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerRoutes as foremanRegisterRoutes } from 'foremanReact/routes/RoutingService';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
 import InsightsVulnerabilityListPage from './InsightsVulnerability/InsightsVulnerabilityListPage';
 import InsightsCloudSync from './InsightsCloudSync';
+import IopRecommendationDetails from './IopRecommendationDetails/IopRecommendationDetails';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
+import CveDetailsPage from './CveDetailsPage';
 
 const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
+  { name: 'IopRecommendationDetails', type: IopRecommendationDetails },
   { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
   {
     name: 'InsightsVulnerabilityListPage',
     type: InsightsVulnerabilityListPage,
   },
+  { name: 'CveDetailsPage', type: CveDetailsPage },
 ];
 
 export const registerPages = () => {
@@ -26,6 +31,11 @@ export const routes = [
     exact: true,
     render: props => <InsightsCloudSync {...props} />,
   },
+  {
+    path: '/foreman_rh_cloud/recommendations',
+    exact: false,
+    render: props => <IopRecommendationDetails {...props} />,
+  },
   {
     path: '/foreman_rh_cloud/inventory_upload',
     exact: true,
@@ -36,6 +46,11 @@ export const routes = [
     exact: true,
     render: props => <InsightsVulnerabilityListPage {...props} />,
   },
+  {
+    path: '/foreman_rh_cloud/insights_vulnerability/:cveId',
+    exact: true,
+    render: props => <CveDetailsPage {...props} />,
+  },
 ];
 
 export const registerRoutes = () => {

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import InsightsTable from './Components/InsightsTable';
+import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { foremanUrl } from '../ForemanRhCloudHelpers';
 import RemediationModal from './Components/RemediationModal';
 import {
   INSIGHTS_SYNC_PAGE_TITLE,
@@ -11,7 +14,9 @@ import './InsightsCloudSync.scss';
 import Pagination from './Components/InsightsTable/Pagination';
 import ToolbarDropdown from './Components/ToolbarDropdown';
 import InsightsSettings from './Components/InsightsSettings';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
+// Hosted Insights advisor
 const InsightsCloudSync = ({ syncInsights, query, fetchInsights }) => {
   const onRecommendationSync = () => syncInsights(fetchInsights, query);
   const toolbarButtons = (
@@ -54,4 +59,37 @@ InsightsCloudSync.defaultProps = {
   query: '',
 };
 
-export default InsightsCloudSync;
+// Local Insights advisor
+const scope = 'advisor';
+const module = './ListWrapped';
+
+export const generateRuleUrl = ruleId =>
+  foremanUrl(`/foreman_rh_cloud/recommendations/${ruleId}`);
+
+const IopRecommendationsPage = props => (
+  <ScalprumComponent
+    scope={scope}
+    module={module}
+    IopRemediationModal={RemediationModal}
+    generateRuleUrl={generateRuleUrl}
+    {...props}
+  />
+);
+
+const IopRecommendationsPageWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopRecommendationsPage {...props} />
+  </ScalprumProvider>
+);
+
+const RecommendationsPage = props => {
+  const isLocalAdvisorEngine = useAdvisorEngineConfig();
+
+  return isLocalAdvisorEngine ? (
+    <IopRecommendationsPageWrapped {...props} />
+  ) : (
+    <InsightsCloudSync {...props} />
+  );
+};
+
+export default RecommendationsPage;

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -1,54 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`InsightsCloudSync render 1`] = `
-<div
-  className="rh-cloud-insights"
->
-  <Connect(InsightsSettings) />
-  <PageLayout
-    beforeToolbarComponent={null}
-    header="Red Hat Insights"
-    onSearch={[Function]}
-    searchProps={
-      Object {
-        "autocomplete": Object {
-          "id": "searchBar",
-          "searchQuery": "",
-          "url": "/insights_cloud/hits/auto_complete_search",
-          "useKeyShortcuts": true,
-        },
-        "bookmarks": Object {
-          "canCreateBookmarks": true,
-          "documentationUrl": "4.1.5Searching",
-          "url": "/api/bookmarks",
-        },
-        "controller": "insights_hits",
-      }
-    }
-    searchQuery=""
-    searchable={true}
-    toolbarButtons={
-      <React.Fragment>
-        <span
-          className="insights-toolbar-buttons"
-        >
-          <Memo(Connect(RemediationModal)) />
-          <ToolbarDropdown
-            onRecommendationSync={[Function]}
-          />
-        </span>
-        <span
-          className="pull-right"
-        >
-          <Pagination
-            isCompact={true}
-            variant="top"
-          />
-        </span>
-      </React.Fragment>
-    }
-  >
-    <Connect(InsightsTable) />
-  </PageLayout>
-</div>
+<InsightsCloudSync
+  fetchInsights={[Function]}
+  query=""
+  status="RESOLVED"
+  syncInsights={[Function]}
+/>
 `;

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { Grid, GridItem } from '@patternfly/react-core';
 import {
   Dropdown,
@@ -21,7 +22,10 @@ import {
 } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
 import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
 import { useAdvisorEngineConfig } from '../common/Hooks/ConfigHooks';
+import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
 
+// Hosted Insights advisor
 const NewHostDetailsTab = ({ hostName, router }) => {
   const dispatch = useDispatch();
   const query = useSelector(selectSearch);
@@ -104,4 +108,49 @@ NewHostDetailsTab.defaultProps = {
   router: {},
 };
 
-export default NewHostDetailsTab;
+// Local Insights advisor
+const scope = 'advisor';
+const module = './SystemDetailsWrapped';
+
+const IopInsightsTab = props => (
+  <ScalprumComponent
+    scope={scope}
+    module={module}
+    IopRemediationModal={RemediationModal}
+    generateRuleUrl={generateRuleUrl}
+    {...props}
+  />
+);
+
+const IopInsightsTabWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopInsightsTab {...props} />
+  </ScalprumProvider>
+);
+
+const InsightsTab = props => {
+  const { response } = props;
+  const isLocalAdvisorEngine =
+    // eslint-disable-next-line camelcase
+    response?.insights_attributes?.use_local_advisor_engine;
+
+  return isLocalAdvisorEngine ? (
+    <IopInsightsTabWrapped {...props} />
+  ) : (
+    <NewHostDetailsTab {...props} />
+  );
+};
+
+InsightsTab.propTypes = {
+  response: PropTypes.shape({
+    insights_attributes: {
+      use_local_advisor_engine: PropTypes.bool,
+    },
+  }),
+};
+
+InsightsTab.defaultProps = {
+  response: {},
+};
+
+export default InsightsTab;

data/webpack/IopRecommendationDetails/IopRecommendationDetails.js

@@ -0,0 +1,34 @@
+import React from 'react';
+import { useRouteMatch } from 'react-router-dom';
+import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
+
+import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
+import { providerOptions } from '../common/ScalprumModule/ScalprumContext';
+
+const scope = 'advisor';
+const module = './RecommendationDetailsWrapped';
+
+const IopRecommendationDetails = props => {
+  const urlParams = useRouteMatch('/foreman_rh_cloud/recommendations/:rule_id');
+  // eslint-disable-next-line camelcase
+  const ruleId = urlParams?.params?.rule_id;
+  return (
+    <div className="iop-recommendation-details-scalprum">
+      <ScalprumComponent
+        scope={scope}
+        module={module}
+        IopRemediationModal={RemediationModal}
+        ruleId={ruleId}
+        {...props}
+      />
+    </div>
+  );
+};
+
+const IopRecommendationDetailsWrapped = props => (
+  <ScalprumProvider {...providerOptions}>
+    <IopRecommendationDetails {...props} />
+  </ScalprumProvider>
+);
+
+export default IopRecommendationDetailsWrapped;

data/webpack/common/ScalprumModule/ScalprumContext.js

@@ -4,6 +4,16 @@ export const modulesConfig = {
     manifestLocation: `${window.location.origin}/assets/apps/vulnerability/fed-mods.json`,
     cdnPath: `${window.location.origin}/assets/apps/vulnerability/`,
   },
+  advisor: {
+    name: 'advisor',
+    manifestLocation: `${window.location.origin}/assets/apps/advisor/fed-mods.json`,
+    cdnPath: `${window.location.origin}/assets/apps/advisor/`,
+  },
+  inventory: {
+    name: 'inventory',
+    manifestLocation: `${window.location.origin}/assets/apps/inventory/fed-mods.json`,
+    cdnPath: `${window.location.origin}/assets/apps/inventory/`,
+  },
 };
 
 export const mockUser = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.1.5
+  version: 12.2.1
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -202,6 +202,7 @@ files:
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/async/exponential_backoff.rb
 - lib/foreman_rh_cloud/engine.rb
+- lib/foreman_rh_cloud/plugin.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
 - lib/insights_cloud/async/cloud_connector_announce_task.rb
@@ -290,8 +291,12 @@ files:
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb
 - webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js
+- webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.scss
 - webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js
 - webpack/CVEsHostDetailsTab/index.js
+- webpack/CveDetailsPage/CveDetailsPage.js
+- webpack/CveDetailsPage/CveDetailsPage.test.js
+- webpack/CveDetailsPage/index.js
 - webpack/ForemanColumnExtensions/index.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
@@ -621,6 +626,7 @@ files:
 - webpack/InsightsVulnerability/InsightsVulnerabilityListPage.test.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js
 - webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js
+- webpack/IopRecommendationDetails/IopRecommendationDetails.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js