foreman_rh_cloud 12.2.16 → 12.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49dae3d74466145bf0eb7704cdc6c8b47e7633747f02e377561bed5d462bffa5
-  data.tar.gz: 35a46941cf4ab3f58820b7df16131ae52d0f7ab6a5100ecc98b08a736dc75c6c
+  metadata.gz: 79c93d459f33a153d6d5ef0477cddc3b0f4b992716bb1a9b9352d0d8274b9185
+  data.tar.gz: 0f7d20917c23789936882787bcb492353a56ac4061b27fcabb138a93dc9c9909
 SHA512:
-  metadata.gz: 40989fd8eeb177bf99fba7014aa3add78d5789e94419cf9be07e4ba6a1e0acbf90b0d1cb4f0dd3a5d68eb168a0556519b12bac8f9254ada0f26a0a0789e992d0
-  data.tar.gz: c156603a5ebef7081bd6d96f37b426b377ca39637a4b08aaa932f7008514591fb5c63aa3b5140043c8cf596606d9eb0d23057dcdbe0a62612d60752c98e911da
+  metadata.gz: 61917464374fddd39409ba0e4dd5c8f2b40a8eb18091a0e4af381b78930a460186c334f5e7b93a5b052b6dff98101551da59390f82ee94880601abe08bf645dc
+  data.tar.gz: 49af34b52d989a0558c538f5da8e027d26953261d69cbea8ed5535c11ae407ab50b0b7c2dcf78302b7281cfff2a6f1c74dc93cf0f8cb942a15d141263000a93d

data/app/models/concerns/rh_cloud_host.rb

@@ -21,7 +21,8 @@ module RhCloudHost
     scoped_search :relation => :inventory_sync_status_object, :on => :status, :rename => :insights_inventory_sync_status,
       :complete_value => { :disconnect => ::InventorySync::InventoryStatus::DISCONNECT,
                            :sync => ::InventorySync::InventoryStatus::SYNC }
-    scoped_search :relation => :insights, :on => :uuid, :only_explicit => true, :rename => :insights_uuid
+    scoped_search :on => :id, :rename => :insights_uuid, :only_explicit => true,
+      :ext_method => :search_by_insights_uuid, :complete_value => false
 
     def insights_facet
       insights
@@ -41,4 +42,33 @@ module RhCloudHost
       insights_facet.update!(uuid: subscription_facet.uuid)
     end
   end
+
+  module ClassMethods
+    def search_by_insights_uuid(_key, operator, value)
+      # Determine which facet table to search based on IoP mode
+      facet_table = ForemanRhCloud.with_iop_smart_proxy? ? Katello::Host::SubscriptionFacet.table_name : InsightsFacet.table_name
+
+      # Build SQL condition
+      if ['IN', 'NOT IN'].include?(operator)
+        # For IN/NOT IN, value may be an array or comma-separated string
+        # Convert to array and build placeholders for each value
+        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
+        placeholders = (['?'] * values.size).join(',')
+        condition = sanitize_sql_for_conditions(
+          ["#{facet_table}.uuid #{operator} (#{placeholders})", *values]
+        )
+      else
+        # For other operators (=, !=, LIKE, etc.), use value_to_sql for proper SQL formatting
+        condition = sanitize_sql_for_conditions(
+          ["#{facet_table}.uuid #{operator} ?", value_to_sql(operator, value)]
+        )
+      end
+
+      # Return search parameters with LEFT JOIN to include hosts without facets
+      {
+        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
+        conditions: condition,
+      }
+    end
+  end
 end

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -7,9 +7,15 @@ module ForemanInventoryUpload
 
       def run
         organization = ::Organization.find(input[:organization_id])
-        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+        # Find hosts with subscription facets but without insights facets
+        # Note: We can't use scoped_search 'null? insights_uuid' because the null? operator
+        # doesn't work with ext_methods - it would check hosts.id IS NULL instead of the facet
+        hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, use_batches: false)
+                                                                            .left_outer_joins(:insights)
+                                                                            .where(insights_facets: { id: nil })
+
         facet_count = 0
-        hosts_without_facets.each do |batch|
+        hosts_without_facets.in_batches(of: ForemanInventoryUpload.slice_size) do |batch|
           facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
             {
               host_id: host_id,

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -95,8 +95,8 @@ module ForemanInventoryUpload
           begin
             upload_file(cer_path)
             progress_output.write_line("Upload completed successfully")
-            move_to_done_folder
-            progress_output.write_line("Uploaded file moved to done/ folder")
+            done_path = move_to_done_folder
+            progress_output.write_line("Uploaded report moved to #{done_path}")
             progress_output.status = "pid #{Process.pid} exit 0"
           rescue StandardError => e
             progress_output.write_line("Upload failed: #{e.message}")
@@ -139,6 +139,7 @@ module ForemanInventoryUpload
         done_file = ForemanInventoryUpload.done_file_path(File.basename(filename))
         FileUtils.mv(filename, done_file)
         logger.debug("Moved #{filename} to #{done_file}")
+        done_file
       end
 
       def certificate

data/lib/foreman_inventory_upload.rb

@@ -32,7 +32,18 @@ module ForemanInventoryUpload
 
   def self.report_file_paths(organization_id)
     filename = facts_archive_name(organization_id)
-    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
+    # Report files start in generated
+    # They are then MOVED (not copied) to uploads, then done.
+    # When they are moved to the new folder, they overwrite any file with the same name.
+    # If it's a generate-only, it will be in generated
+    # Failed or incomplete uploads will be in uploads
+    # Completed uploads will be in done
+    # The ordering here ensures we get the correct file path every time.
+    Dir[
+      ForemanInventoryUpload.generated_reports_file_path(filename),
+      ForemanInventoryUpload.uploads_file_path(filename),
+      ForemanInventoryUpload.done_file_path(filename)
+    ]
   end
 
   def self.generated_reports_folder
@@ -44,6 +55,10 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.generated_reports_file_path(filename)
+    File.join(ForemanInventoryUpload.generated_reports_folder, filename)
+  end
+
   def self.outputs_folder
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.16'.freeze
+  VERSION = '12.2.18'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -46,6 +46,10 @@ namespace :rh_cloud_inventory do
             filter,
             false # don't upload; the user ran report:generate and not report:generate_upload
           )
+          unless Setting[:subscription_connection_enabled]
+            report_paths = ForemanInventoryUpload.report_file_paths(organization_id)
+            puts "Report saved to #{report_paths.first}" if report_paths.any?
+          end
         end
         puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -5,6 +5,49 @@ class AccountsControllerTest < ActionController::TestCase
 
   include FolderIsolation
 
+  test 'report_file_paths finds report in generated_reports folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    generated_path = ForemanInventoryUpload.generated_reports_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(generated_path))
+    FileUtils.touch(generated_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, generated_path
+  end
+
+  test 'report_file_paths finds report in uploads folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    uploads_path = ForemanInventoryUpload.uploads_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(uploads_path))
+    FileUtils.touch(uploads_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, uploads_path
+  end
+
+  test 'report_file_paths finds report in done folder' do
+    test_org = FactoryBot.create(:organization)
+    filename = ForemanInventoryUpload.facts_archive_name(test_org.id)
+
+    done_path = ForemanInventoryUpload.done_file_path(filename)
+    FileUtils.mkdir_p(File.dirname(done_path))
+    FileUtils.touch(done_path)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_includes paths, done_path
+  end
+
+  test 'report_file_paths returns empty when no report exists' do
+    test_org = FactoryBot.create(:organization)
+
+    paths = ForemanInventoryUpload.report_file_paths(test_org.id)
+    assert_empty paths
+  end
+
   test 'Returns statuses for each process type' do
     test_org = FactoryBot.create(:organization)
 

data/test/test_plugin_helper.rb

@@ -31,6 +31,7 @@ module FolderIsolation
       ForemanInventoryUpload.stubs(:base_folder).returns(@tmpdir)
       ForemanInventoryUpload.instance_variable_set(:@outputs_folder, nil)
       ForemanInventoryUpload.instance_variable_set(:@uploads_folders, nil)
+      ForemanInventoryUpload.instance_variable_set(:@generated_reports_folder, nil)
     end
 
     teardown do

data/test/unit/rh_cloud_host_test.rb

@@ -188,4 +188,158 @@ class RhCloudHostTest < ActiveSupport::TestCase
       assert_equal local_uuid, @host.insights_uuid
     end
   end
+
+  context 'scoped search on insights_uuid' do
+    setup do
+      @org = FactoryBot.create(:organization)
+    end
+
+    teardown do
+      ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    end
+
+    test 'searches insights_facet.uuid in non-IoP mode with = operator' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host1 = FactoryBot.create(:host, :managed, organization: @org)
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'insights-uuid-123')
+      host2 = FactoryBot.create(:host, :managed, organization: @org)
+      host2.insights = FactoryBot.create(:insights_facet, host_id: host2.id, uuid: 'insights-uuid-456')
+
+      results = Host::Managed.search_for('insights_uuid = insights-uuid-123')
+
+      assert_includes results, host1
+      assert_not_includes results, host2
+    end
+
+    test 'searches subscription_facet.uuid in IoP mode with = operator' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      host1 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host2 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      # Even if insights_facet has different UUID, should use subscription_facet UUID
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'stale-123')
+
+      results = Host::Managed.search_for("insights_uuid = #{host1.subscription_facet.uuid}")
+
+      assert_includes results, host1
+      assert_not_includes results, host2
+    end
+
+    test 'searches with ^ operator (IN) in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host1 = FactoryBot.create(:host, :managed, organization: @org)
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'uuid-1')
+      host2 = FactoryBot.create(:host, :managed, organization: @org)
+      host2.insights = FactoryBot.create(:insights_facet, host_id: host2.id, uuid: 'uuid-2')
+      host3 = FactoryBot.create(:host, :managed, organization: @org)
+      host3.insights = FactoryBot.create(:insights_facet, host_id: host3.id, uuid: 'uuid-3')
+
+      results = Host::Managed.search_for('insights_uuid ^ (uuid-1,uuid-2)')
+
+      assert_includes results, host1
+      assert_includes results, host2
+      assert_not_includes results, host3
+    end
+
+    test 'searches with ^ operator (IN) in IoP mode - THE BUG FIX' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      host1 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host2 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host3 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      # Create insights facets with stale UUIDs to verify we're using subscription_facet
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'stale-1')
+      host2.insights = FactoryBot.create(:insights_facet, host_id: host2.id, uuid: 'stale-2')
+      host3.insights = FactoryBot.create(:insights_facet, host_id: host3.id, uuid: 'stale-3')
+
+      uuid1 = host1.subscription_facet.uuid
+      uuid2 = host2.subscription_facet.uuid
+
+      # This is the search query that remediation modal creates
+      results = Host::Managed.search_for("insights_uuid ^ (#{uuid1},#{uuid2})")
+
+      # Should find hosts by subscription_facet UUID, not insights_facet UUID
+      assert_includes results, host1
+      assert_includes results, host2
+      assert_not_includes results, host3
+    end
+
+    test 'searches with !^ operator (NOT IN) in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host1 = FactoryBot.create(:host, :managed, organization: @org)
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'uuid-1')
+      host2 = FactoryBot.create(:host, :managed, organization: @org)
+      host2.insights = FactoryBot.create(:insights_facet, host_id: host2.id, uuid: 'uuid-2')
+      host3 = FactoryBot.create(:host, :managed, organization: @org)
+      host3.insights = FactoryBot.create(:insights_facet, host_id: host3.id, uuid: 'uuid-3')
+
+      results = Host::Managed.search_for('insights_uuid !^ (uuid-1,uuid-2)')
+
+      assert_not_includes results, host1
+      assert_not_includes results, host2
+      assert_includes results, host3
+    end
+
+    test 'searches with !^ operator (NOT IN) in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      host1 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host2 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host3 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      uuid1 = host1.subscription_facet.uuid
+      uuid2 = host2.subscription_facet.uuid
+
+      results = Host::Managed.search_for("insights_uuid !^ (#{uuid1},#{uuid2})")
+
+      assert_not_includes results, host1
+      assert_not_includes results, host2
+      assert_includes results, host3
+    end
+
+    test 'handles hosts without facets in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_without_facet = FactoryBot.create(:host, :managed, organization: @org)
+      host_with_facet = FactoryBot.create(:host, :managed, organization: @org)
+      host_with_facet.insights = FactoryBot.create(:insights_facet, host_id: host_with_facet.id, uuid: 'uuid-1')
+
+      results = Host::Managed.search_for('insights_uuid = uuid-1')
+
+      assert_includes results, host_with_facet
+      assert_not_includes results, host_without_facet
+    end
+
+    test 'handles hosts without subscription_facet in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      host_without_sub = FactoryBot.create(:host, :managed, organization: @org)
+      host_with_sub = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      uuid = host_with_sub.subscription_facet.uuid
+
+      results = Host::Managed.search_for("insights_uuid = #{uuid}")
+
+      assert_includes results, host_with_sub
+      assert_not_includes results, host_without_sub
+    end
+
+    test 'mode changes are reflected in searches' do
+      host1 = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      host1.insights = FactoryBot.create(:insights_facet, host_id: host1.id, uuid: 'insights-uuid-abc')
+      insights_uuid = 'insights-uuid-abc'
+      subscription_uuid = host1.subscription_facet.uuid
+
+      # Non-IoP mode: should find by insights_facet UUID
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      results = Host::Managed.search_for("insights_uuid = #{insights_uuid}")
+      assert_includes results, host1
+
+      # IoP mode: should find by subscription_facet UUID
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      results = Host::Managed.search_for("insights_uuid = #{subscription_uuid}")
+      assert_includes results, host1
+
+      # Should NOT find by old insights_facet UUID in IoP mode
+      results = Host::Managed.search_for("insights_uuid = #{insights_uuid}")
+      assert_not_includes results, host1
+    end
+  end
 end

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -32,13 +32,28 @@ const NewHostDetailsTab = ({ hostName, router }) => {
   const hits = useSelector(selectHits);
   const isIop = useIopConfig();
 
-  useEffect(() => () => router.replace({ search: null }), [router]);
+  useEffect(
+    () => () => {
+      // Preserve hash when clearing search params to prevent tab navigation bugs
+      if (router && typeof router.replace === 'function') {
+        const replaceOptions = { search: null };
+        if (router.location && router.location.hash) {
+          replaceOptions.hash = router.location.hash;
+        }
+        router.replace(replaceOptions);
+      }
+    },
+    [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 onSatInsightsClick = () => {
+    if (router && typeof router.push === 'function') {
+      router.push({ pathname: '/foreman_rh_cloud/insights_cloud' });
+    }
+  };
 
   const dropdownItems = [
     <DropdownItem key="insights-link" ouiaId="insights-link">

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

@@ -0,0 +1,154 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import NewHostDetailsTab from '../NewHostDetailsTab';
+
+jest.mock('../../common/Hooks/ConfigHooks', () => ({
+  useIopConfig: jest.fn(() => false),
+}));
+
+jest.mock('foremanReact/common/I18n', () => ({
+  translate: jest.fn(str => str),
+}));
+
+const mockStore = configureMockStore([thunk]);
+
+describe('NewHostDetailsTab', () => {
+  let store;
+  let mockRouter;
+
+  beforeEach(() => {
+    mockRouter = {
+      push: jest.fn(),
+      replace: jest.fn(),
+      location: {
+        pathname: '/new/hosts/test-host.example.com',
+        search: '?page=1&per_page=20',
+        hash: '#/Insights',
+        query: { page: '1', per_page: '20' },
+      },
+    };
+
+    store = mockStore({
+      API: {},
+      ForemanRhCloud: {
+        InsightsCloudSync: {
+          table: {
+            selectedIds: {},
+            isAllSelected: false,
+            showSelectAllAlert: false,
+          },
+        },
+      },
+      insightsHostDetailsTab: {
+        query: '',
+        hits: [],
+        selectedIds: {},
+        error: null,
+      },
+      router: {
+        location: {
+          pathname: '/new/hosts/test-host.example.com',
+          search: '?page=1&per_page=20',
+          hash: '#/Insights',
+          query: { page: '1', per_page: '20' },
+        },
+      },
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('cleanup effect', () => {
+    it('should preserve hash when clearing search params on unmount', () => {
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={mockRouter}
+          />
+        </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',
+      });
+    });
+
+    it('should only clear search params when no hash exists', () => {
+      mockRouter.location.hash = '';
+
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={mockRouter}
+          />
+        </Provider>
+      );
+
+      unmount();
+
+      // When there's no hash, should only pass search: null
+      expect(mockRouter.replace).toHaveBeenCalledWith({
+        search: null,
+      });
+    });
+
+    it('should handle router.location being undefined gracefully', () => {
+      const routerWithoutLocation = {
+        push: jest.fn(),
+        replace: jest.fn(),
+        location: undefined,
+      };
+
+      const { unmount } = render(
+        <Provider store={store}>
+          <NewHostDetailsTab
+            hostName="test-host.example.com"
+            router={routerWithoutLocation}
+          />
+        </Provider>
+      );
+
+      unmount();
+
+      // Should still call replace with search: null even if location is undefined
+      expect(routerWithoutLocation.replace).toHaveBeenCalledWith({
+        search: null,
+      });
+    });
+
+    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}
+          />
+        </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',
+      });
+    });
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.16
+  version: 12.2.18
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -629,6 +629,7 @@ files:
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabReducer.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTabSelectors.test.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js
+- webpack/InsightsHostDetailsTab/__tests__/NewHostDetailsTab.test.js
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTab.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabActions.test.js.snap
 - webpack/InsightsHostDetailsTab/__tests__/__snapshots__/InsightsTabReducer.test.js.snap