foreman_rh_cloud 14.1.0 → 14.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc86813dfba949a2d7125c96245b767f5ecc4edee058828bac97042ce5d4ee0
-  data.tar.gz: e6d920065bbe1a0a560c49050614abbad1c72d4f4c5e1494edf390db0495833e
+  metadata.gz: 8561ef219578d2be3678f2576fba36e1cb3f2a91aab82b5438369aa08ddd0a05
+  data.tar.gz: 6abcf201d049e27b6dc90fef6f5094a0f6f72d337f49aa6cdf328d8aa92e3516
 SHA512:
-  metadata.gz: e672658acda2399401392268c238361a81720e58d6d5693e70b1195c8aaef4d22ee35918b1ee329fae40d03efb09ad77c5562e9d81a905bd9e3b86945ed5a7f7
-  data.tar.gz: 1ff3460a85b2a26b64de9a472dcaf864bcb9cdd71043736a94f7f0784eb48ed91dcee94c84ae7ad4ae3c10bd31df8addd89175cf7c9ff6b221b8fadbe5035391
+  metadata.gz: cf0448da7b88a0ddca0e2726805b9c0fb6e5356651e64ac09d0a18cd16d05a393dab07f4a19c445948a39fd1a4111e17c275c8ffaf33df974cc80a9af1693ba0
+  data.tar.gz: 7e780f06f64dc1f5042a10ec48f3c397d5b767bc5b6ac2c08ac7d9cc059518df4415ee442b37216777a471a0286d59a73a56142a6b80cb10b04213d477a9c4d7

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -32,14 +32,10 @@ module InsightsCloud::Api
       rescue RestClient::ExceptionWithResponse => e
         response_obj = e.response.presence || e.exception
         code = response_obj.try(:code) || response_obj.try(:http_code) || 500
-        message = 'Cloud request failed'
-
-        return render json: {
-          :message => message,
-          :error => response_obj.to_s,
-          :headers => {},
-          :response => response_obj,
-        }, status: code
+        upstream_content_type = response_obj.try(:headers)&.[](:content_type)
+        content_type = upstream_content_type&.match?(/json/) ? upstream_content_type : 'application/json'
+
+        return render body: response_obj.to_s, status: code, content_type: content_type
       rescue StandardError => e
         # Catch any other exceptions here, such as Errno::ECONNREFUSED
         logger.warn("Cloud request failed with exception: #{e}")

data/app/controllers/insights_cloud/ui_requests_controller.rb

@@ -36,14 +36,10 @@ module InsightsCloud
       rescue RestClient::ExceptionWithResponse => e
         response_obj = e.response.presence || e.exception
         code = response_obj.try(:code) || response_obj.try(:http_code) || 500
-        message = 'Cloud request failed'
+        upstream_content_type = response_obj.try(:headers)&.[](:content_type)
+        content_type = upstream_content_type&.match?(/json/) ? upstream_content_type : 'application/json'
 
-        return render json: {
-          :message => message,
-          :error => response_obj.to_s,
-          :headers => {},
-          :response => response_obj,
-        }, status: code
+        return render body: response_obj.to_s, status: code, content_type: content_type
       rescue StandardError => e
         # Catch any other exceptions here, such as Errno::ECONNREFUSED
         logger.warn("Cloud request failed with exception: #{e}")

data/app/services/foreman_rh_cloud/url_remediations_retriever.rb

@@ -1,11 +1,24 @@
 module ForemanRhCloud
   class URLRemediationsRetriever < RemediationsRetriever
-    attr_reader :url, :payload, :headers
+    attr_reader :url, :headers
 
     def initialize(url:, organization_id:, payload: '', headers: {}, logger: Logger.new(IO::NULL))
       super(logger: logger)
 
-      @url = url
+      parsed_url = URI.parse(url)
+      query_params = parsed_url.query ? CGI.parse(parsed_url.query) : {}
+      hosts_param = query_params.delete('hosts')
+
+      if hosts_param.present?
+        @host_uuids = hosts_param.flat_map { |v| v.split(',') }.map(&:strip).reject(&:blank?)
+        @host_uuids = nil if @host_uuids.empty?
+        parsed_url.query = query_params.any? ? URI.encode_www_form(query_params) : nil
+        @url = parsed_url.to_s
+      else
+        @host_uuids = nil
+        @url = url
+      end
+
       @payload = payload
       @headers = headers
       @organization_id = organization_id
@@ -14,7 +27,7 @@ module ForemanRhCloud
     private
 
     def query_playbook
-      logger.debug("Querying playbook at: #{url} with payload: #{payload} and headers: #{headers}")
+      logger.debug("Querying playbook via #{method.to_s.upcase} at: #{url} with payload: #{payload} and headers: #{headers}")
 
       super
     end
@@ -28,11 +41,12 @@ module ForemanRhCloud
     end
 
     def payload
-      @payload.present? ? @payload.to_json : @payload # don't run .to_json if @payload is ''
+      return @host_uuids.to_json if @host_uuids.present?
+      @payload.present? ? @payload.to_json : @payload
     end
 
     def method
-      :get
+      @host_uuids.present? ? :post : :get
     end
 
     def organization

data/lib/foreman_inventory_upload/async/destroy_organization_hbi_hosts_job.rb

@@ -0,0 +1,49 @@
+module ForemanInventoryUpload
+  module Async
+    class DestroyOrganizationHbiHostsJob < ::Actions::EntryAction
+      include ForemanRhCloud::CertAuth
+
+      def plan(organization_id)
+        plan_self(organization_id: organization_id)
+      end
+
+      def run
+        org = Organization.find_by(id: input[:organization_id])
+        unless org
+          output[:result] = _("Organization not found")
+          return
+        end
+
+        logger.info("Destroying all HBI hosts for organization #{org.label} (id: #{org.id})")
+
+        execute_cloud_request(
+          organization: org,
+          method: :delete,
+          url: ForemanInventoryUpload.hosts_delete_all_url,
+          headers: {
+            content_type: :json,
+          }
+        )
+
+        output[:result] = format(_("Successfully deleted all HBI hosts for organization %s"), org.label)
+      rescue RestClient::NotFound
+        output[:result] = format(_("No HBI hosts found for organization %s"), org&.label)
+      rescue StandardError => e
+        logger.error(format(_("Failed to destroy HBI hosts for organization %s: %s"), org&.label, e.message))
+        raise
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rescue_strategy
+        Dynflow::Action::Rescue::Skip
+      end
+
+      def humanized_name
+        _("Destroy HBI hosts for organization")
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -103,6 +103,10 @@ module ForemanInventoryUpload
     "#{inventory_base_url}/#{host_uuid}"
   end
 
+  def self.hosts_delete_all_url
+    "#{inventory_base_url}/all?confirm_delete_all=true"
+  end
+
   def self.hosts_by_ids_url(host_uuids)
     host_ids_string = host_uuids.join(',')
     "#{inventory_base_url}/#{host_ids_string}"

data/lib/foreman_rh_cloud/engine.rb

@@ -42,6 +42,7 @@ module ForemanRhCloud
         ::Katello::Api::Rhsm::CandlepinDynflowProxyController.include InsightsCloud::PackageProfileUploadExtensions
         ::Katello::Api::Rhsm::CandlepinProxiesController.include InsightsCloud::CandlepinProxiesExtensions
         ::Katello::RegistrationManager.singleton_class.prepend ::ForemanRhCloud::RegistrationManagerExtensions
+        ::Actions::Katello::Organization::Destroy.prepend ::ForemanRhCloud::OrganizationDestroyExtensions
       end
     end
 

data/lib/foreman_rh_cloud/organization_destroy_extensions.rb

@@ -0,0 +1,10 @@
+module ForemanRhCloud
+  module OrganizationDestroyExtensions
+    extend ActiveSupport::Concern
+
+    def remove_consumers(organization)
+      plan_action(ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob, organization.id) if ForemanRhCloud.with_iop_smart_proxy?
+      super
+    end
+  end
+end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '14.1.0'.freeze
+  VERSION = '14.1.2'.freeze
 end

data/package.json

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

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -154,8 +154,22 @@ module InsightsCloud::Api
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
         assert_equal 500, @response.status
-        assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
-        assert_match /#{@body}/, JSON.parse(@response.body)['response']
+        assert_equal @body, @response.body
+      end
+
+      test "should forward JSON error responses without double-escaping" do
+        json_error = { errors: [{ detail: 'inventory_id must exist', status: '404' }] }.to_json
+        net_http_resp = Net::HTTPResponse.new(1.0, 404, "Not Found")
+        net_http_resp['content-type'] = 'application/json'
+        res = RestClient::Response.create(json_error, net_http_resp, @http_req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotFound.new(res))
+
+        get :forward_request, params: { "path" => "api/vulnerability/v1/systems/00000000-0000-0000-0000-000000000000" }
+        assert_equal 404, @response.status
+        assert_includes @response.content_type, 'application/json'
+        assert_equal json_error, @response.body
+        parsed = JSON.parse(@response.body)
+        assert_equal 'inventory_id must exist', parsed['errors'][0]['detail']
       end
 
       test "should create insights facet" do

data/test/controllers/insights_cloud/ui_requests_controller_test.rb

@@ -177,8 +177,22 @@ module InsightsCloud
 
         get :forward_request, params: { "controller" => "vulnerabilities", "path" => "api/vulnerability/v1/cves" }, session: set_session
         assert_equal 500, @response.status
-        assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
-        assert_match(/#{@body}/, JSON.parse(@response.body)['response'])
+        assert_equal @body, @response.body
+      end
+
+      test "should forward JSON error responses without double-escaping" do
+        json_error = { errors: [{ detail: 'inventory_id must exist', status: '404' }] }.to_json
+        net_http_resp = Net::HTTPResponse.new(1.0, 404, "Not Found")
+        net_http_resp['content-type'] = 'application/json'
+        res = RestClient::Response.create(json_error, net_http_resp, @http_req)
+        ::ForemanRhCloud::InsightsApiForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotFound.new(res))
+
+        get :forward_request, params: { "controller" => "vulnerabilities", "path" => "api/vulnerability/v1/systems/00000000-0000-0000-0000-000000000000" }, session: set_session
+        assert_equal 404, @response.status
+        assert_includes @response.content_type, 'application/json'
+        assert_equal json_error, @response.body
+        parsed = JSON.parse(@response.body)
+        assert_equal 'inventory_id must exist', parsed['errors'][0]['detail']
       end
 
       test "should allow forward_request with nil location (Any location)" do

data/test/jobs/destroy_organization_hbi_hosts_job_test.rb

@@ -0,0 +1,63 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class DestroyOrganizationHbiHostsJobTest < ActiveSupport::TestCase
+  include Dynflow::Testing::Factories
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    @org = FactoryBot.create(:organization)
+  end
+
+  test 'Deletes all HBI hosts for organization' do
+    expected_url = ForemanInventoryUpload.hosts_delete_all_url
+
+    ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob.any_instance.expects(:execute_cloud_request).with do |params|
+      params[:organization] == @org &&
+        params[:method] == :delete &&
+        params[:url] == expected_url &&
+        params[:headers][:content_type] == :json
+    end.returns(mock_response)
+
+    action = create_and_plan_action(ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob, @org.id)
+    action = run_action(action)
+
+    assert_match(/Successfully deleted/, action.output[:result])
+  end
+
+  test 'Handles RestClient::NotFound gracefully' do
+    ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob.any_instance.expects(:execute_cloud_request).raises(RestClient::NotFound)
+
+    action = create_and_plan_action(ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob, @org.id)
+    action = run_action(action)
+
+    assert_match(/No HBI hosts found/, action.output[:result])
+  end
+
+  test 'Raises on other errors' do
+    ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob.any_instance.expects(:execute_cloud_request).raises(
+      RestClient::InternalServerError.new
+    )
+
+    action = create_and_plan_action(ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob, @org.id)
+
+    assert_raises(RestClient::InternalServerError) do
+      run_action(action)
+    end
+  end
+
+  test 'hosts_delete_all_url returns correct format' do
+    url = ForemanInventoryUpload.hosts_delete_all_url
+
+    assert_match %r{/hosts/all\?confirm_delete_all=true$}, url
+  end
+
+  def mock_response(code: 200, body: '')
+    response = mock('response')
+    response.stubs(:code).returns(code)
+    response.stubs(:body).returns(body)
+    response
+  end
+end

data/test/unit/organization_destroy_extensions_test.rb

@@ -0,0 +1,50 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class OrganizationDestroyExtensionsTest < ActiveSupport::TestCase
+  include Dynflow::Testing
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    @organization = stub
+    @organization.stubs(:label).returns('test_org')
+    @organization.stubs(:id).returns(1)
+    @organization.stubs(:validate_destroy).returns([])
+    @organization.stubs(:products).returns([])
+    @organization.stubs(:activation_keys).returns([])
+    @organization.stubs(:content_views).returns(stub(:non_default => []))
+    @organization.stubs(:default_content_view).returns(stub(:content_view_environments => []))
+    @organization.stubs(:promotion_paths).returns([])
+    @organization.stubs(:providers).returns([])
+    @organization.stubs(:library).returns(stub(:destroy! => true))
+
+    where_clause = mock
+    where_clause.stubs(:where).returns([])
+    ::Host.stubs(:unscoped).returns(where_clause)
+  end
+
+  teardown do
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+  end
+
+  test 'plans DestroyOrganizationHbiHostsJob when in IoP mode' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+    action = create_action(::Actions::Katello::Organization::Destroy)
+    action.stubs(:action_subject).with(@organization)
+    plan_action(action, @organization)
+
+    assert_action_planned_with(action, ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob, @organization.id)
+  end
+
+  test 'does not plan DestroyOrganizationHbiHostsJob when not in IoP mode' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+
+    action = create_action(::Actions::Katello::Organization::Destroy)
+    action.stubs(:action_subject).with(@organization)
+    plan_action(action, @organization)
+
+    refute_action_planned(action, ForemanInventoryUpload::Async::DestroyOrganizationHbiHostsJob)
+  end
+end

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

@@ -1,8 +1,8 @@
 require 'test_plugin_helper'
 
 class URLRemediationsRetrieverTest < ActiveSupport::TestCase
-  test 'Calls the given url' do
-    retreiver = ForemanRhCloud::URLRemediationsRetriever.new(
+  test 'Calls the given url with GET when no hosts in URL' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
       organization_id: FactoryBot.create(:organization).id,
       url: 'http://test.example.com',
       payload: 'TEST_PAYLOAD',
@@ -11,19 +11,96 @@ class URLRemediationsRetrieverTest < ActiveSupport::TestCase
       }
     )
 
-    retreiver.stubs(:cert_auth_available?).returns(true)
+    retriever.stubs(:cert_auth_available?).returns(true)
 
     response = mock('response')
     response.stubs(:body).returns('TEST_RESPONSE')
-    retreiver.expects(:execute_cloud_request).with do |params|
+    retriever.expects(:execute_cloud_request).with do |params|
       params[:method] == :get &&
       params[:url] == 'http://test.example.com' &&
       params[:headers][:custom1] == 'TEST_HEADER' &&
       params[:payload] == "\"TEST_PAYLOAD\""
     end.returns(response)
 
-    actual = retreiver.create_playbook
+    actual = retriever.create_playbook
 
     assert_equal 'TEST_RESPONSE', actual
   end
+
+  test 'Uses POST with hosts in body when URL contains hosts query param' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2,uuid-3'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2', 'uuid-3']
+    end.returns(response)
+
+    actual = retriever.create_playbook
+
+    assert_equal 'TEST_PLAYBOOK', actual
+  end
+
+  test 'Preserves other query params when extracting hosts' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1,uuid-2&localhost=false'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url].include?('localhost=false') &&
+      !params[:url].include?('hosts=') &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Merges multiple hosts query params into a single array' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts=uuid-1&hosts=uuid-2'
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :post &&
+      params[:url] == 'http://test.example.com/api/remediations/1234/playbook' &&
+      JSON.parse(params[:payload]) == ['uuid-1', 'uuid-2']
+    end.returns(response)
+
+    retriever.create_playbook
+  end
+
+  test 'Falls back to GET when hosts query param is empty' do
+    retriever = ForemanRhCloud::URLRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
+      url: 'http://test.example.com/api/remediations/1234/playbook?hosts='
+    )
+
+    retriever.stubs(:cert_auth_available?).returns(true)
+
+    response = mock('response')
+    response.stubs(:body).returns('TEST_PLAYBOOK')
+    retriever.expects(:execute_cloud_request).with do |params|
+      params[:method] == :get
+    end.returns(response)
+
+    retriever.create_playbook
+  end
 end

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -3,6 +3,10 @@ import PropTypes from 'prop-types';
 import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';
 import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
 import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+import {
+  vulnerabilityDisabled,
+  useTabRedirect,
+} from '../ForemanRhCloudHelpers';
 import './CVEsHostDetailsTab.scss';
 
 const CVEsHostDetailsTab = ({ systemId }) => {
@@ -26,6 +30,15 @@ CVEsHostDetailsTab.propTypes = {
 
 const CVEsHostDetailsTabWrapper = ({ response }) => {
   const permissions = useInsightsPermissions();
+  const isHostDataLoaded = Boolean(response?.id);
+  const shouldHideTab = useTabRedirect(
+    isHostDataLoaded && vulnerabilityDisabled({ hostDetails: response })
+  );
+
+  if (shouldHideTab) {
+    return null;
+  }
+
   return (
     <ScalprumProvider {...createProviderOptions(permissions)}>
       <CVEsHostDetailsTab
@@ -38,10 +51,19 @@ const CVEsHostDetailsTabWrapper = ({ response }) => {
 
 CVEsHostDetailsTabWrapper.propTypes = {
   response: PropTypes.shape({
+    id: PropTypes.number,
+    operatingsystem_name: PropTypes.string,
+    vulnerability: PropTypes.shape({
+      enabled: PropTypes.bool,
+    }),
     subscription_facet_attributes: PropTypes.shape({
-      uuid: PropTypes.string.isRequired,
+      uuid: PropTypes.string,
     }),
-  }).isRequired,
+  }),
+};
+
+CVEsHostDetailsTabWrapper.defaultProps = {
+  response: {},
 };
 
 export default CVEsHostDetailsTabWrapper;

data/webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js

@@ -1,6 +1,17 @@
 import React from 'react';
 import { render } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
 import CVEsHostDetailsTabWrapper from '../CVEsHostDetailsTab';
+import { OVERVIEW_TAB_PATH } from '../../ForemanRhCloudHelpers';
+
+const mockHistoryReplace = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    replace: mockHistoryReplace,
+  }),
+}));
 
 jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
   useForemanContext: () => ({
@@ -25,31 +36,44 @@ jest.mock('@scalprum/react-core', () => {
   };
 });
 
+const defaultResponse = {
+  id: 1,
+  operatingsystem_name: 'Red Hat Enterprise Linux 8',
+  vulnerability: { enabled: true },
+  subscription_facet_attributes: { uuid: '1-2-3' },
+};
+
 describe('CVEsHostDetailsTabWrapper', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  it('renders without crashing', () => {
+  it('renders without crashing and does not redirect for valid host', () => {
     const { container } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: '1-2-3' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={defaultResponse} />
+      </MemoryRouter>
     );
     expect(
       container.querySelector(
         '.rh-cloud-insights-vulnerability-host-details-component'
       )
     ).toBeTruthy();
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
   });
 
   it('remounts ScalprumComponent when systemId changes', () => {
     const { ScalprumComponent } = require('@scalprum/react-core');
 
+    const responseHostA = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-A' },
+    };
+
     const { rerender } = render(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-A' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostA} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).not.toHaveBeenCalled();
@@ -58,10 +82,15 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
 
+    const responseHostB = {
+      ...defaultResponse,
+      subscription_facet_attributes: { uuid: 'uuid-host-B' },
+    };
+
     rerender(
-      <CVEsHostDetailsTabWrapper
-        response={{ subscription_facet_attributes: { uuid: 'uuid-host-B' } }}
-      />
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={responseHostB} />
+      </MemoryRouter>
     );
 
     expect(mockUnmountTracker).toHaveBeenCalledTimes(1);
@@ -70,4 +99,38 @@ describe('CVEsHostDetailsTabWrapper', () => {
       expect.anything()
     );
   });
+
+  it('redirects to Overview when tab should be hidden', () => {
+    const nonRhelResponse = {
+      id: 2,
+      operatingsystem_name: 'Ubuntu 20.04',
+      vulnerability: { enabled: false },
+      subscription_facet_attributes: { uuid: '1-2-3' },
+    };
+
+    const { container } = render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={nonRhelResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    expect(
+      container.querySelector(
+        '.rh-cloud-insights-vulnerability-host-details-component'
+      )
+    ).toBeNull();
+  });
+
+  it('does not redirect when host data is not yet loaded', () => {
+    const emptyResponse = { subscription_facet_attributes: { uuid: '1-2-3' } };
+
+    render(
+      <MemoryRouter>
+        <CVEsHostDetailsTabWrapper response={emptyResponse} />
+      </MemoryRouter>
+    );
+
+    expect(mockHistoryReplace).not.toHaveBeenCalled();
+  });
 });

data/webpack/ForemanRhCloudHelpers.js

@@ -1,3 +1,6 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 /**
  * copied from core, since it's not in the ReactApp folder,
  * it's complicated to import it and mock it in tests.
@@ -5,6 +8,25 @@
  */
 export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
 
+export const OVERVIEW_TAB_PATH = '/Overview';
+
+/**
+ * Redirects to Overview tab when the current tab should be hidden
+ * @param {boolean} shouldRedirect - Whether to redirect (e.g., host loaded AND tab should hide)
+ * @returns {boolean} - Returns shouldRedirect for convenience
+ */
+export const useTabRedirect = shouldRedirect => {
+  const history = useHistory();
+
+  useEffect(() => {
+    if (shouldRedirect && history) {
+      history.replace(OVERVIEW_TAB_PATH);
+    }
+  }, [shouldRedirect, history]);
+
+  return shouldRedirect;
+};
+
 export const isNotRhelHost = ({ hostDetails }) =>
   // This regex tries matches sane variations of "RedHat", "RHEL" and "RHCOS"
   !new RegExp('red[\\s\\-]?hat|rh[\\s\\-]?el|rhc[\\s\\-]?os', 'i').test(

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -25,6 +25,11 @@ import { useIopConfig } from '../common/Hooks/ConfigHooks';
 import { generateRuleUrl } from '../InsightsCloudSync/InsightsCloudSync';
 import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
 import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
+import {
+  isNotRhelHost,
+  hasNoInsightsFacet,
+  useTabRedirect,
+} from '../ForemanRhCloudHelpers';
 
 // Hosted Insights advisor
 const NewHostDetailsTab = ({ hostName, router }) => {
@@ -165,7 +170,18 @@ const IopInsightsTabWrapped = props => {
 };
 
 const InsightsTab = props => {
+  const { response } = props;
   const isIop = useIopConfig();
+  const isHostDataLoaded = Boolean(response?.id);
+  const shouldHideTab = useTabRedirect(
+    isHostDataLoaded &&
+      (isNotRhelHost({ hostDetails: response }) ||
+        hasNoInsightsFacet({ response, hostDetails: response }))
+  );
+
+  if (shouldHideTab) {
+    return null;
+  }
 
   return isIop ? (
     <IopInsightsTabWrapped {...props} />
@@ -174,6 +190,16 @@ const InsightsTab = props => {
   );
 };
 
-InsightsTab.defaultProps = {};
+InsightsTab.propTypes = {
+  response: PropTypes.shape({
+    id: PropTypes.number,
+    operatingsystem_name: PropTypes.string,
+    insights_attributes: PropTypes.object,
+  }),
+};
+
+InsightsTab.defaultProps = {
+  response: {},
+};
 
 export default InsightsTab;

data/webpack/InsightsHostDetailsTab/__tests__/NewHostDetailsTab.test.js

@@ -2,9 +2,20 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { Provider } from 'react-redux';
+import { MemoryRouter } from 'react-router-dom';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import NewHostDetailsTab from '../NewHostDetailsTab';
+import { OVERVIEW_TAB_PATH } from '../../ForemanRhCloudHelpers';
+
+const mockHistoryReplace = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    replace: mockHistoryReplace,
+  }),
+}));
 
 jest.mock('../../common/Hooks/ConfigHooks', () => ({
   useIopConfig: jest.fn(() => false),
@@ -14,8 +25,33 @@ jest.mock('foremanReact/common/I18n', () => ({
   translate: jest.fn(str => str),
 }));
 
+jest.mock(
+  'foremanReact/components/SearchBar',
+  () => () => <div>SearchBar</div>,
+  { virtual: true }
+);
+
+jest.mock('../../InsightsCloudSync/Components/InsightsTable', () => () => (
+  <div>InsightsTable</div>
+));
+
+jest.mock('../../InsightsCloudSync/Components/RemediationModal', () => () => (
+  <div>RemediationModal</div>
+));
+
+jest.mock(
+  '../../InsightsCloudSync/Components/InsightsTable/Pagination',
+  () => () => <div>Pagination</div>
+);
+
 const mockStore = configureMockStore([thunk]);
 
+const defaultResponse = {
+  id: 1,
+  operatingsystem_name: 'Red Hat Enterprise Linux 8',
+  insights_attributes: { uuid: 'test-uuid' },
+};
+
 describe('NewHostDetailsTab', () => {
   let store;
   let mockRouter;
@@ -68,17 +104,18 @@ describe('NewHostDetailsTab', () => {
     it('should preserve hash when clearing search params on unmount', () => {
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
-      // Unmount the component to trigger cleanup
       unmount();
 
-      // Verify router.replace was called with both search: null AND the existing hash
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
         hash: '#/Insights',
@@ -90,16 +127,18 @@ describe('NewHostDetailsTab', () => {
 
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
       unmount();
 
-      // When there's no hash, should only pass search: null
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
       });
@@ -114,16 +153,18 @@ describe('NewHostDetailsTab', () => {
 
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={routerWithoutLocation}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={routerWithoutLocation}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
       unmount();
 
-      // Should still call replace with search: null even if location is undefined
       expect(routerWithoutLocation.replace).toHaveBeenCalledWith({
         search: null,
       });
@@ -132,23 +173,94 @@ describe('NewHostDetailsTab', () => {
     it('should use the latest hash value at unmount time, not a stale captured value', () => {
       const { unmount } = render(
         <Provider store={store}>
-          <NewHostDetailsTab
-            hostName="test-host.example.com"
-            router={mockRouter}
-          />
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              router={mockRouter}
+              response={defaultResponse}
+            />
+          </MemoryRouter>
         </Provider>
       );
 
-      // Change the hash after mount, before unmount
       mockRouter.location.hash = '#/Overview';
 
       unmount();
 
-      // Verify router.replace was called with the UPDATED hash, not the initial '#/Insights'
       expect(mockRouter.replace).toHaveBeenCalledWith({
         search: null,
         hash: '#/Overview',
       });
     });
   });
+
+  describe('tab visibility', () => {
+    it('should redirect to Overview when host is not RHEL', () => {
+      const nonRhelResponse = {
+        id: 2,
+        operatingsystem_name: 'Ubuntu 20.04',
+        insights_attributes: { uuid: 'test-uuid' },
+      };
+
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={nonRhelResponse}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    });
+
+    it('should redirect to Overview when insights facet is missing', () => {
+      const responseWithoutInsights = {
+        id: 3,
+        operatingsystem_name: 'Red Hat Enterprise Linux 8',
+      };
+
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={responseWithoutInsights}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).toHaveBeenCalledWith(OVERVIEW_TAB_PATH);
+    });
+
+    it('should not redirect when host is valid RHEL with insights facet', () => {
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab
+              hostName="test-host.example.com"
+              response={defaultResponse}
+            />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).not.toHaveBeenCalled();
+    });
+
+    it('should not redirect when host data is not yet loaded', () => {
+      render(
+        <Provider store={store}>
+          <MemoryRouter>
+            <NewHostDetailsTab hostName="test-host.example.com" response={{}} />
+          </MemoryRouter>
+        </Provider>
+      );
+
+      expect(mockHistoryReplace).not.toHaveBeenCalled();
+    });
+  });
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 14.1.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -51,34 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.18'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: theforeman-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 description: Foreman plugin that process & upload data to Red Hat Cloud
 email:
 - rlavi@redhat.com, sshtein@redhat.com
@@ -188,6 +160,7 @@ files:
 - lib/foreman_inventory_upload/async/async_helpers.rb
 - lib/foreman_inventory_upload/async/create_missing_insights_facets.rb
 - lib/foreman_inventory_upload/async/delayed_start.rb
+- lib/foreman_inventory_upload/async/destroy_organization_hbi_hosts_job.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
 - lib/foreman_inventory_upload/async/generate_host_report.rb
 - lib/foreman_inventory_upload/async/host_inventory_report_job.rb
@@ -206,6 +179,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/organization_destroy_extensions.rb
 - lib/foreman_rh_cloud/plugin.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
@@ -260,6 +234,7 @@ files:
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/create_missing_insights_facets_test.rb
+- test/jobs/destroy_organization_hbi_hosts_job_test.rb
 - test/jobs/exponential_backoff_test.rb
 - test/jobs/generate_host_report_test.rb
 - test/jobs/host_inventory_report_job_test.rb
@@ -286,6 +261,7 @@ files:
 - test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/organization_destroy_extensions_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_host_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
@@ -692,6 +668,7 @@ test_files:
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/create_missing_insights_facets_test.rb
+- test/jobs/destroy_organization_hbi_hosts_job_test.rb
 - test/jobs/exponential_backoff_test.rb
 - test/jobs/generate_host_report_test.rb
 - test/jobs/host_inventory_report_job_test.rb
@@ -718,6 +695,7 @@ test_files:
 - test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/organization_destroy_extensions_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_host_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb