foreman_rh_cloud 5.0.28 → 5.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012fcceed18a6413326df32052bee870b299682bc114d5c3e59954bda33b2475
-  data.tar.gz: bb72b384fc54d6c19951c453c69b0ecaae5d26bf844fc85b4d4b56f04e1e76bd
+  metadata.gz: 5a77b9dd6b10d3bf354a1ea4888ac4c829a66de66da4f432860e76ffe1b2a887
+  data.tar.gz: 81913ea4f9745d2c2e08d2c6b5117395c3b360b1879acdd21c8b83fabeccb4a0
 SHA512:
-  metadata.gz: 70904b446fce3a2ca3a794c418aaa1591f4276bd35d1636a629e7361b75c62163fc76ad45caa024752a763ef6a9e6344e979dff8f9e9a017c19ac878f667a649
-  data.tar.gz: 4fd0e25610e4848565178f19e5a3ffb1da2d9b1505cd604f18a9276bba931f6fea3fbbddcd6c1e375a9d655a4c0b506c3937d89e9e7899b4aed37ae05c72b542
+  metadata.gz: 026bf10d2031f225aa64539059ed9fea96254a04e4dfb305db0ffc3ca7c0c3c9676b5d331a78cdf98320c3175765a1d862e7be707f4f69ef0f95a8149977119f
+  data.tar.gz: c8b159a4c8f86bfcf710094b3b6e49b06b00d0d8448f8d853ee0777bf356cd6a3165c497b98f9bba3106f1c1ac234f49f297ff3cf58b548fcb2d462c04eb4f33

data/app/controllers/insights_cloud/hits_controller.rb

@@ -7,7 +7,7 @@ module InsightsCloud
 
       render json: {
         hasToken: !Setting[:rh_cloud_token].empty?,
-        hits: hits.map { |hit| hit.attributes.merge(hostname: hit.host&.name, has_playbook: hit.has_playbook?) },
+        hits: hits.map { |hit| hit.attributes.merge(hostname: hit.host&.name, has_playbook: hit.has_playbook?, host_uuid: hit.host_uuid) },
         itemCount: hits.count,
       }, status: :ok
     end

data/app/models/insights_hit.rb

@@ -22,4 +22,8 @@ class InsightsHit < ApplicationRecord
   def has_playbook?
     !rule.nil?
   end
+
+  def host_uuid
+    insights_facet.uuid
+  end
 end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -34,6 +34,7 @@ module ForemanInventoryUpload
 
       def self.for_slice(base)
         base
+          .search_for("not params.#{InsightsCloud.enable_client_param} = f")
           .joins(:subscription_facet)
           .preload(
             :interfaces,

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.28'.freeze
+  VERSION = '5.0.29'.freeze
 end

data/lib/inventory_sync/async/host_result.rb

@@ -17,7 +17,6 @@ module InventorySync
         @sub_ids.map do |sub_id|
           host_id = host_id(sub_id)
           if host_id
-            touched << host_id
             {
               host_id: host_id,
               status: InventorySync::InventoryStatus::SYNC,
@@ -28,10 +27,6 @@ module InventorySync
         end.compact
       end
 
-      def touched
-        @touched ||= []
-      end
-
       def host_id(sub_id)
         hosts[sub_id]
       end

data/lib/inventory_sync/async/inventory_full_sync.rb

@@ -14,11 +14,7 @@ module InventorySync
       end
 
       def setup_statuses
-        @subscribed_hosts_ids = Set.new(
-          ForemanInventoryUpload::Generators::Queries.for_slice(
-            Host.unscoped.where(organization: input[:organization_id])
-          ).pluck(:id)
-        )
+        @subscribed_hosts_ids = Set.new(affected_host_ids)
 
         InventorySync::InventoryStatus.transaction do
           InventorySync::InventoryStatus.where(host_id: @subscribed_hosts_ids).delete_all
@@ -35,8 +31,10 @@ module InventorySync
       def update_statuses_batch
         results = yield
 
-        update_hosts_status(results.status_hashes, results.touched)
-        host_statuses[:sync] += results.touched.size
+        existing_hosts = results.status_hashes.select { |hash| @subscribed_hosts_ids.include?(hash[:host_id]) }
+
+        update_hosts_status(existing_hosts)
+        host_statuses[:sync] += existing_hosts.size
       end
 
       def rescue_strategy_for_self
@@ -45,9 +43,10 @@ module InventorySync
 
       private
 
-      def update_hosts_status(status_hashes, touched)
+      def update_hosts_status(status_hashes)
         InventorySync::InventoryStatus.create(status_hashes)
-        @subscribed_hosts_ids.subtract(touched)
+        updated_ids = status_hashes.map { |hash| hash[:host_id] }
+        @subscribed_hosts_ids.subtract(updated_ids)
       end
 
       def add_missing_hosts_statuses(hosts_ids)
@@ -68,6 +67,12 @@ module InventorySync
           disconnect: 0,
         }
       end
+
+      def affected_host_ids
+        ForemanInventoryUpload::Generators::Queries.for_slice(
+          Host.unscoped.where(organization: input[:organization_id])
+        ).pluck(:id)
+      end
     end
   end
 end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -35,18 +35,14 @@ module InventorySync
       private
 
       def add_missing_insights_facets(uuids_hash)
-        existing_facets = InsightsFacet.where(host_id: uuids_hash.keys).pluck(:host_id, :uuid)
-        missing_facets = uuids_hash.except(*existing_facets.map(&:first)).map do |host_id, uuid|
+        all_facets = uuids_hash.map do |host_id, uuid|
           {
             host_id: host_id,
             uuid: uuid,
           }
         end
-        InsightsFacet.create(missing_facets)
 
-        existing_facets.select { |host_id, uuid| uuid.empty? }.each do |host_id, _uuid|
-          InsightsFacet.where(host_id: host_id).update_all(uuid: uuids_hash[host_id])
-        end
+        InsightsFacet.upsert_all(all_facets, unique_by: :host_id) unless all_facets.empty?
       end
 
       def plan_self_host_sync

data/package.json

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

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -4,7 +4,7 @@ class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
 
   test 'should return allow_auto_insights_sync setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_insights_sync', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_insights_sync] = false
 
     assert_equal false, Setting[:allow_auto_insights_sync]
 
@@ -16,7 +16,7 @@ class SettingsControllerTest < ActionController::TestCase
   end
 
   test 'should update allow_auto_insights_sync setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_insights_sync', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_insights_sync] = false
 
     assert_equal false, Setting[:allow_auto_insights_sync]
 

data/test/controllers/uploads_settings_controller_test.rb

@@ -4,7 +4,7 @@ class UploadsSettingsControllerTest < ActionController::TestCase
   tests ForemanInventoryUpload::UploadsSettingsController
 
   test 'should get upload inventory settings' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+    Setting[:allow_auto_inventory_upload] = true
 
     assert_equal true, Setting[:allow_auto_inventory_upload]
 
@@ -17,7 +17,7 @@ class UploadsSettingsControllerTest < ActionController::TestCase
   end
 
   test 'should update allow_auto_inventory_upload setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_inventory_upload] = false
 
     assert_equal false, Setting[:allow_auto_inventory_upload]
 

data/test/jobs/insights_full_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsFullSyncTest < ActiveSupport::TestCase
@@ -7,7 +7,7 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')

data/test/jobs/insights_resolutions_sync_test.rb

@@ -63,7 +63,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     }
 
     @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Resolutions data is replaced with data from cloud' do

data/test/jobs/insights_rules_sync_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class InsightsRulesSyncTest < ActiveSupport::TestCase
@@ -112,7 +112,7 @@ class InsightsRulesSyncTest < ActiveSupport::TestCase
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
 
     InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
   end
 
   test 'Hits data is replaced with data from cloud' do

data/test/jobs/inventory_full_sync_test.rb

@@ -37,6 +37,18 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host3 = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+
+    @host3.subscription_facet.pools << pool
+
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -151,7 +163,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
         {
           "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
           "rhel_machine_id": null,
-          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
+          "subscription_manager_id": "#{@host3.subscription_facet.uuid}",
           "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
           "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
           "ip_addresses": [
@@ -159,7 +171,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
             "fd6e:2298:736e::857",
             "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
           ],
-          "fqdn": "rhel8-demo.oss-lab.net",
+          "fqdn": "#{@host3.fqdn}",
           "mac_addresses": [
             "6e:66:a6:fe:fc:07",
             "00:00:00:00:00:00"
@@ -242,7 +254,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be SYNC for inventory hosts' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
@@ -254,7 +266,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'TEST TOKEN')
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
@@ -265,10 +277,24 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Task should be aborted if token is not present' do
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: '')
+    Setting[:rh_cloud_token] = ''
 
     InventorySync::Async::InventoryFullSync.any_instance.expects(:plan_self).never
 
     ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
   end
+
+  test 'Should skip hosts that are not returned in query' do
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+
+    Setting[:rh_cloud_token] = 'TEST TOKEN'
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
+    InventorySync::Async::InventoryFullSync.any_instance.expects(:affected_host_ids).returns([@host1.id, @host2.id])
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
+    @host2.reload
+
+    assert_nil InventorySync::InventoryStatus.where(host_id: @host3.id).first
+  end
 end

data/test/jobs/inventory_hosts_sync_test.rb

@@ -6,7 +6,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
@@ -265,4 +265,19 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     assert_equal @host2_inventory_id, @host2.insights.uuid
   end
+
+  test 'Inventory should sync empty facets list' do
+    empty_inventory = @inventory.deep_clone
+    empty_inventory['results'] = []
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:query_inventory).returns(empty_inventory)
+    InventorySync::Async::InventoryHostsSync.any_instance.expects(:plan_self_host_sync)
+
+    assert_nil @host2.insights
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync)
+
+    @host2.reload
+
+    assert_nil @host2.insights
+  end
 end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -5,7 +5,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
 
   test 'Schedules an execution if auto upload is enabled' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+    Setting[:allow_auto_inventory_upload] = true
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
 
@@ -13,7 +13,7 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
   end
 
   test 'Skips execution if auto upload is disabled' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+    Setting[:allow_auto_inventory_upload] = false
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 

data/test/jobs/inventory_self_host_sync_test.rb

@@ -6,7 +6,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-    FactoryBot.create(:setting, name: 'rh_cloud_token', value: 'MOCK_TOKEN')
+    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(:host)

data/test/jobs/upload_report_job_test.rb

@@ -12,7 +12,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
         'idCert' => 'TEST_CERT',
       }
     )
-    FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
+    Setting[:content_disconnected] = true
 
     ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 

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/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/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)
@@ -447,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)
 
@@ -625,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/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/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);

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

@@ -4,10 +4,12 @@ import {
   InsightsLabel,
   Section,
 } from '@redhat-cloud-services/frontend-components';
+import { DropdownItem } from '@patternfly/react-core';
 import { sortable, cellWidth } from '@patternfly/react-table';
-import { AnsibeTowerIcon } from '@patternfly/react-icons';
+import { AnsibeTowerIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
+import DropdownToggle from '../../../common/DropdownToggle';
 
 export const totalRiskFormatter = ({ title: totalRisk }) => ({
   children: (
@@ -28,30 +30,73 @@ export const hasPlaybookFormatter = ({ title: hasPlaybook }) => ({
   ),
 });
 
+export const actionsFormatter = (props, { rowData = {} }) => {
+  const { recommendationUrl, accessRHUrl } = rowData;
+  const dropdownItems = [];
+
+  recommendationUrl &&
+    dropdownItems.push(
+      <DropdownItem key="recommendation-url">
+        <a href={recommendationUrl} target="_blank" rel="noopener noreferrer">
+          {__('View in Red Hat Insights')} <ExternalLinkAltIcon />
+        </a>
+      </DropdownItem>
+    );
+
+  accessRHUrl &&
+    dropdownItems.push(
+      <DropdownItem key="access-url">
+        <a href={accessRHUrl} target="_blank" rel="noopener noreferrer">
+          {__('Knowledgebase article')} <ExternalLinkAltIcon />
+        </a>
+      </DropdownItem>
+    );
+
+  return {
+    children: <DropdownToggle items={dropdownItems} />,
+  };
+};
+
 export const columns = [
   {
+    id: 'hostname',
     sortKey: 'hostname',
     title: __('Hostname'),
     transforms: [cellWidth(20), sortable],
   },
   {
+    id: 'recommendation',
     sortKey: 'title',
     title: __('Recommendation'),
     transforms: [cellWidth(50), sortable],
   },
   {
+    id: 'total risk',
     sortKey: 'total_risk',
     title: __('Total risk'),
     transforms: [cellWidth(15), sortable],
     cellTransforms: [totalRiskFormatter],
   },
   {
+    id: 'remediate',
     title: __('Remediate'),
-    transforms: [cellWidth(15)],
+    transforms: [cellWidth(10)],
     cellTransforms: [hasPlaybookFormatter],
   },
+  {
+    id: 'actions',
+    title: '',
+    transforms: [cellWidth(5)],
+    cellTransforms: [actionsFormatter],
+  },
 ];
 
+export const getColumnsWithoutHostname = () => {
+  const nextCols = columns.slice(1);
+  nextCols[0].transforms = [cellWidth(70), sortable];
+  return nextCols;
+};
+
 export const paginationTitles = {
   items: __('items'),
   page: __('page'),
@@ -75,3 +120,5 @@ export const INSIGHTS_SET_SELECTED_IDS = 'INSIGHTS_SET_SELECTED_IDS';
 export const INSIGHTS_SET_SELECT_ALL_ALERT = 'INSIGHTS_SET_SELECT_ALL_ALERT';
 
 export const INSIGHTS_SET_SELECT_ALL = 'INSIGHTS_SET_SELECT_ALL';
+
+export const NEW_HOST_PATH = '/new/hosts/';

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

@@ -1,25 +1,42 @@
 /* eslint-disable camelcase */
-import { columns } from './InsightsTableConstants';
-
-export const modifySelectedRows = (hits, selectedIds, showSelectAllAlert) => {
+export const modifySelectedRows = (
+  hits,
+  selectedIds,
+  showSelectAllAlert,
+  hideHost
+) => {
   if (hits.length === 0) return [];
 
   return hits
     .asMutable()
-    .map(({ id, hostname, title, total_risk, has_playbook }) => {
-      const disableCheckbox = !has_playbook;
-      return {
-        cells: [hostname, title, total_risk, has_playbook],
-        disableCheckbox,
+    .map(
+      ({
         id,
-        /** The main table checkbox will be seen as selected only if all rows are selected,
-         * in this case we need to select also the disabled once and hide it with css */
-        selected: selectedIds[id] || (disableCheckbox && showSelectAllAlert),
-      };
-    });
+        hostname,
+        title,
+        total_risk,
+        has_playbook,
+        results_url,
+        solution_url,
+      }) => {
+        const disableCheckbox = !has_playbook;
+        const cells = [hostname, title, total_risk, has_playbook, results_url];
+        if (hideHost) cells.shift();
+        return {
+          cells,
+          disableCheckbox,
+          id,
+          /** The main table checkbox will be seen as selected only if all rows are selected,
+           * in this case we need to select also the disabled once and hide it with css */
+          selected: selectedIds[id] || (disableCheckbox && showSelectAllAlert),
+          recommendationUrl: results_url,
+          accessRHUrl: solution_url,
+        };
+      }
+    );
 };
 
-export const getSortColumnIndex = sortBy => {
+export const getSortColumnIndex = (columns, sortBy) => {
   let colIndex = 0;
   columns.forEach((col, index) => {
     if (col.sortKey === sortBy) {

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

@@ -17,6 +17,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
     cells={
       Array [
         Object {
+          "id": "hostname",
           "sortKey": "hostname",
           "title": "Hostname",
           "transforms": Array [
@@ -25,6 +26,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
           ],
         },
         Object {
+          "id": "recommendation",
           "sortKey": "title",
           "title": "Recommendation",
           "transforms": Array [
@@ -36,6 +38,7 @@ exports[`InsightsTable rendering render with Props 1`] = `
           "cellTransforms": Array [
             [Function],
           ],
+          "id": "total risk",
           "sortKey": "total_risk",
           "title": "Total risk",
           "transforms": Array [
@@ -47,14 +50,25 @@ exports[`InsightsTable rendering render with Props 1`] = `
           "cellTransforms": Array [
             [Function],
           ],
+          "id": "remediate",
           "title": "Remediate",
           "transforms": Array [
             [Function],
           ],
         },
+        Object {
+          "cellTransforms": Array [
+            [Function],
+          ],
+          "id": "actions",
+          "title": "",
+          "transforms": Array [
+            [Function],
+          ],
+        },
       ]
     }
-    className="recommendations-table"
+    className="rh-cloud-recommendations-table"
     contentId="expanded-content"
     dropdownDirection="down"
     dropdownPosition="right"

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableActions.test.js.snap

@@ -31,7 +31,6 @@ Array [
       "payload": Object {
         "args": Array [
           Object {
-            "pathname": "/foreman_rh_cloud/insights_cloud",
             "search": "?page=2&per_page=7&search=&sort_by=&sort_order=&select_all=true",
           },
         ],

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -1,21 +1,19 @@
 @import '~@redhat-cloud-services/frontend-components/index.css';
 
-.rh-cloud-insights {
-  .recommendations-table {
-    .pf-c-table__check {
-      input:disabled {
-        display: none;
-      }
+.rh-cloud-recommendations-table {
+  .pf-c-table__check {
+    input:disabled {
+      display: none;
     }
+  }
 
-    .td-insights-remediate-playbook {
-      svg {
-        margin-right: 5px;
-      }
+  .td-insights-remediate-playbook {
+    svg {
+      margin-right: 5px;
     }
+  }
 
-    .td-insights-remediate-manual {
-      padding-left: 18px;
-    }
+  .td-insights-remediate-manual {
+    padding-left: 18px;
   }
 }

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.scss

@@ -6,18 +6,4 @@
       margin-top: 5px;
     }
   }
-
-  // applies to the backdrop parent of the modal
-  @at-root .pf-c-backdrop {
-    width: calc(100% - 200px);
-    left: 200px;
-  }
-
-  // where the vertical nav breaks: https://github.com/theforeman/foreman/blob/3347fa49d500964f0209122d8d36c920d1feafcc/webpack/assets/javascripts/react_app/components/Layout/components/Toolbar/HeaderToolbar.scss#L26
-  @media (max-width: 768px) {
-    @at-root .pf-c-backdrop {
-      width: 100%;
-      left: 0;
-    }
-  }
 }

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -2,6 +2,8 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { redHatAdvisorSystems } from '../InsightsCloudSyncHelpers';
 
 const ToolbarDropdown = ({ onRecommendationSync }) => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
@@ -12,6 +14,17 @@ const ToolbarDropdown = ({ onRecommendationSync }) => {
     >
       {__('Sync recommendations')}
     </DropdownItem>,
+    <DropdownItem key="cloud-advisor-systems-link">
+      <a
+        href={redHatAdvisorSystems()}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {__('View in Red Hat Insights')}
+        {'  '}
+        <ExternalLinkAltIcon />
+      </a>
+    </DropdownItem>,
   ];
   return (
     <Dropdown

data/webpack/InsightsCloudSync/InsightsCloudSyncHelpers.js

@@ -8,3 +8,11 @@ export const cloudTokenSettingUrl = () => {
   settingsUrl.setSearch({ search: 'name = rh_cloud_token' });
   return settingsUrl.toString();
 };
+
+export const redHatConsole = path => `https://console.redhat.com/${path || ''}`;
+export const redHatInsights = path => redHatConsole(`insights/${path || ''}`);
+export const redHatInventory = path =>
+  redHatInsights(`inventory/${path || ''}`);
+export const redHatAdvisor = path => redHatInsights(`advisor/${path || ''}`);
+export const redHatAdvisorSystems = path =>
+  redHatAdvisor(`systems/${path || ''}`);

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -84,3 +84,7 @@
     }
   }
 }
+
+#new_host_details_insights_tab {
+  padding: 24px;
+}

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -0,0 +1,104 @@
+import React, { useEffect, useState } from 'react';
+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 {
+  Grid,
+  GridItem,
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import InsightsTable from '../InsightsCloudSync/Components/InsightsTable';
+import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
+import Pagination from '../InsightsCloudSync/Components/InsightsTable/Pagination';
+import { INSIGHTS_SEARCH_PROPS } from '../InsightsCloudSync/InsightsCloudSyncConstants';
+import { fetchInsights } from '../InsightsCloudSync/Components/InsightsTable/InsightsTableActions';
+import {
+  selectSearch,
+  selectHits,
+} from '../InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors';
+import './InsightsTab.scss';
+import { redHatAdvisorSystems } from '../InsightsCloudSync/InsightsCloudSyncHelpers';
+
+const NewHostDetailsTab = ({ hostName, router }) => {
+  const dispatch = useDispatch();
+  const query = useSelector(selectSearch);
+  const hits = useSelector(selectHits);
+
+  useEffect(() => () => router.replace({ search: null }), [router]);
+
+  const onSearch = q => dispatch(fetchInsights({ query: q, page: 1 }));
+
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const onSatInsightsClick = () =>
+    router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
+
+  const dropdownItems = [
+    <DropdownItem key="insights-link">
+      <a onClick={onSatInsightsClick}>{__('Go to Satellite Insights page')}</a>
+    </DropdownItem>,
+  ];
+
+  if (hits.length) {
+    const { host_uuid: uuid } = hits[0];
+    dropdownItems.push(
+      <DropdownItem key="insights-advisor-link">
+        <a
+          href={redHatAdvisorSystems(uuid)}
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {__('View in Red Hat Insights')}
+          {'  '}
+          <ExternalLinkAltIcon />
+        </a>
+      </DropdownItem>
+    );
+  }
+
+  return (
+    <Grid id="new_host_details_insights_tab" hasGutter>
+      <GridItem span={5}>
+        <SearchBar
+          data={INSIGHTS_SEARCH_PROPS}
+          onSearch={onSearch}
+          initialQuery={query}
+        />
+      </GridItem>
+      <GridItem span={4}>
+        <RemediationModal />
+        <Dropdown
+          className="insights-dropdown"
+          onSelect={() => setIsDropdownOpen(false)}
+          toggle={
+            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+          }
+          isOpen={isDropdownOpen}
+          isPlain
+          dropdownItems={dropdownItems}
+        />
+      </GridItem>
+      <GridItem span={3}>
+        <Pagination variant="top" isCompact />
+      </GridItem>
+      <GridItem>
+        <InsightsTable hideHost hostname={hostName} />
+      </GridItem>
+    </Grid>
+  );
+};
+
+NewHostDetailsTab.propTypes = {
+  hostName: PropTypes.string,
+  router: PropTypes.object,
+};
+
+NewHostDetailsTab.defaultProps = {
+  hostName: '',
+  router: {},
+};
+
+export default NewHostDetailsTab;

data/webpack/common/DropdownToggle.js

@@ -0,0 +1,24 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Dropdown, KebabToggle } from '@patternfly/react-core';
+
+const DropdownToggle = ({ items, ...props }) => {
+  const [isOpen, setOpen] = useState(false);
+  return (
+    <Dropdown
+      onSelect={() => setOpen(false)}
+      toggle={<KebabToggle onToggle={value => setOpen(value)} />}
+      isOpen={isOpen}
+      isPlain
+      dropdownItems={items}
+      position="right"
+      {...props}
+    />
+  );
+};
+
+DropdownToggle.propTypes = {
+  items: PropTypes.array.isRequired,
+};
+
+export default DropdownToggle;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.28
+  version: 5.0.29
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -595,6 +595,7 @@ files:
 - webpack/InsightsHostDetailsTab/InsightsTabConstants.js
 - webpack/InsightsHostDetailsTab/InsightsTabReducer.js
 - webpack/InsightsHostDetailsTab/InsightsTabSelectors.js
+- webpack/InsightsHostDetailsTab/NewHostDetailsTab.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabActions.test.js
@@ -628,6 +629,7 @@ files:
 - webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudSelectors.test.js.snap
 - webpack/__tests__/__snapshots__/ForemanRhCloudTestHelpers.test.js.snap
+- webpack/common/DropdownToggle.js
 - webpack/common/ForemanTasks/ForemanTasksActions.js
 - webpack/common/ForemanTasks/ForemanTasksHelpers.js
 - webpack/common/ForemanTasks/index.js