foreman_rh_cloud 14.2.1 → 14.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89dec7188d18373800314f614305ccece5e477bb6d1db9ce24c35c288b101ee2
-  data.tar.gz: 4d7fe9c4aff407cbf2945a45f4d2c032f7a2d5672740c890e3691287c3cd35c6
+  metadata.gz: 1c2ad7078753ff687e7dfa1cf410efbfbc3f1ad9b8dc74500f9e77bf0c9a7fc9
+  data.tar.gz: 9eb2679eb38c91fa3c1163915328d91959f7e6408e73bd4fc0c4d7fe98b9a0cf
 SHA512:
-  metadata.gz: 6e2daa770c20d244f2b86f81cc447661de17c1b7ead87cf1989bf1a5fe50858601a1f847c4fdaff88501313da45cb0d826d169906cd4682f32ebb8b0c6e3e5f4
-  data.tar.gz: 830c5dc063d390c5b76d8e637b89eebbafc77add2d2245f71a5372b292c324057c5ba0c3394f4ae436c2a718979c352a405b127b8f38e578513d3460b1c1fffa
+  metadata.gz: 0e4cb92c3a41b257ebf018a988ced92b086aa5cec373214888bb22a3dc43f765a007f42182b1da6a058c97b8633d59e1239efef658c3e0d53744bb9b8fc41125
+  data.tar.gz: 780195de89dcac76c3774a8b48ae67c7c52ad8b2b4f1029020e1c1e42ec701092f2122ff4caec64de083cf01094ebac40b42cf1d0985d06fdbbc46838331d541

data/app/models/concerns/rh_cloud_host.rb

@@ -10,7 +10,8 @@ module RhCloudHost
     )
 
     has_many :insights_hits, through: :insights, source: :hits
-    scoped_search :relation => :insights, :on => :hits_count, :only_explicit => true, :rename => :insights_recommendations_count
+    scoped_search :on => :id, :rename => :insights_recommendations_count, :only_explicit => true,
+      :ext_method => :search_by_insights_recommendations_count, :complete_value => false
 
     has_one :insights_client_report_status_object, :class_name => '::InsightsClientReportStatus', :foreign_key => 'host_id'
     scoped_search :relation => :insights_client_report_status_object, :on => :status, :rename => :insights_client_report_status,
@@ -46,6 +47,40 @@ module RhCloudHost
   end
 
   module ClassMethods
+    def search_by_insights_recommendations_count(_key, operator, value)
+      if ForemanRhCloud.with_iop_smart_proxy?
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Searching by recommendations count is not available in IoP mode.')
+        )
+      end
+
+      unless ScopedSearch::QueryBuilder::SQL_OPERATORS.value?(operator)
+        raise ScopedSearch::QueryNotSupported.new(
+          _('Unsupported operator for recommendations count search: %s') % operator
+        )
+      end
+
+      facet_table = InsightsFacet.table_name
+      hits_count_col = "COALESCE(#{facet_table}.hits_count, 0)"
+
+      if ['IN', 'NOT IN'].include?(operator)
+        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
+        placeholders = (['?'] * values.size).join(',')
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} (#{placeholders})", *values]
+        )
+      else
+        condition = sanitize_sql_for_conditions(
+          ["#{hits_count_col} #{operator} ?", value_to_sql(operator, value)]
+        )
+      end
+
+      {
+        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
+        conditions: condition,
+      }
+    end
+
     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

data/config/routes.rb

@@ -33,6 +33,7 @@ Rails.application.routes.draw do
   namespace :foreman_rh_cloud do
     get 'inventory_upload', to: 'foreman_rh_cloud#inventory_upload'
     get 'recommendations', to: 'foreman_rh_cloud#recommendations'
+    get 'recommendations/pathways/:slug', to: 'foreman_rh_cloud#recommendations'
     get 'recommendations/:rule_id', to: 'foreman_rh_cloud#recommendations'
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
     get 'insights_vulnerability', to: '/react#index'

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -59,11 +59,13 @@ module ForemanInventoryUpload
       def try_execute
         if content_disconnected?
           logger.info("Upload canceled: connection to Insights is not enabled. Report location: #{filename}")
+          done!
           return
         end
 
         unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
           logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          done!
           return
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '14.2.1'.freeze
+  VERSION = '14.3.0'.freeze
 end

data/package.json

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

data/test/jobs/upload_report_direct_job_test.rb

@@ -401,4 +401,33 @@ class UploadReportDirectJobTest < ActiveSupport::TestCase
       file.close
     end
   end
+
+  test 'mark as done when upload aborted due to missing certificate' do
+    # Remove certificate from organization
+    Organization.any_instance.stubs(:owner_details).returns({})
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
+
+  test 'mark as done when upload aborted due to disconnected mode' do
+    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(false)
+
+    action = create_action(ForemanInventoryUpload::Async::UploadReportDirectJob)
+    action.expects(:action_subject).with(@organization)
+    plan_action(action, nil, @organization.id)
+
+    # Execute the action
+    action.send(:try_execute)
+
+    # Verify it is marked as done
+    assert action.done?
+  end
 end

data/test/unit/insights_facet_test.rb

@@ -6,6 +6,10 @@ class InsightsFacetTest < ActiveSupport::TestCase
     InsightsFacet.reset_counters(@host.insights.id, :hits_count)
   end
 
+  teardown do
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+  end
+
   test 'host with hits can be deleted' do
     assert_equal 1, @host.insights.hits.count
 
@@ -16,6 +20,7 @@ class InsightsFacetTest < ActiveSupport::TestCase
   end
 
   test 'search host by recommendations_count' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
     FactoryBot.create(:host) # create another host with no recommendations
 
     assert_equal 1, Host.search_for('insights_recommendations_count = 1').count

data/test/unit/rh_cloud_host_test.rb

@@ -343,6 +343,74 @@ class RhCloudHostTest < ActiveSupport::TestCase
     end
   end
 
+  context 'scoped search on insights_recommendations_count' do
+    setup do
+      @org = FactoryBot.create(:organization)
+    end
+
+    teardown do
+      ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    end
+
+    test 'searches insights_facets.hits_count in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'supports greater-than operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count > 0')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'raises QueryNotSupported in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+      error = assert_raises(ScopedSearch::QueryNotSupported) do
+        Host::Managed.search_for('insights_recommendations_count = 1')
+      end
+
+      assert_match(/not available in IoP mode/, error.message)
+    end
+
+    test 'supports IN operator in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      host_with_hits = FactoryBot.create(:host, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_hits.insights.id, :hits_count)
+      host_without_hits = FactoryBot.create(:host, :managed, organization: @org)
+
+      results = Host::Managed.search_for('insights_recommendations_count ^ (1,2,3)')
+
+      assert_includes results, host_with_hits
+      assert_not_includes results, host_without_hits
+    end
+
+    test 'handles hosts without insights 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, :with_insights_hits, organization: @org)
+      InsightsFacet.reset_counters(host_with_facet.insights.id, :hits_count)
+
+      results = Host::Managed.search_for('insights_recommendations_count = 1')
+
+      assert_includes results, host_with_facet
+      assert_not_includes results, host_without_facet
+    end
+  end
+
   test 'scoped search for user_omitted inventory status works' do
     host1 = FactoryBot.create(:host, :managed)
     host2 = FactoryBot.create(:host, :managed)

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

@@ -8,6 +8,7 @@ import EmptyState from './Components/EmptyState';
 import ErrorState from './Components/ErrorState';
 import EmptyResults from './Components/EmptyResults';
 import { filterAccounts } from './AccountListHelper';
+import { ACCOUNT_STATUS_POLLING_INTERVAL_MS } from './AccountListConstants';
 import './accountList.scss';
 
 const AccountList = ({
@@ -21,7 +22,10 @@ const AccountList = ({
 }) => {
   useEffect(() => {
     fetchAccountsStatus();
-    const pollingID = setInterval(fetchAccountsStatus, 2000);
+    const pollingID = setInterval(
+      fetchAccountsStatus,
+      ACCOUNT_STATUS_POLLING_INTERVAL_MS
+    );
     startAccountStatusPolling(pollingID);
 
     return () => {

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

@@ -7,3 +7,8 @@ export const INVENTORY_ACCOUNT_STATUS_POLLING_START =
 export const INVENTORY_ACCOUNT_STATUS_POLLING_STOP =
   'INVENTORY_ACCOUNT_STATUS_POLLING_STOP';
 export const INVENTORY_PROCESS_RESTART = 'INVENTORY_PROCESS_RESTART';
+
+// How often to re-fetch account statuses while generation/upload is in
+// progress. Frequent enough to reflect status changes promptly, without
+// hammering the status endpoint.
+export const ACCOUNT_STATUS_POLLING_INTERVAL_MS = 2000;

data/webpack/ForemanInventoryUpload/Components/TaskConstants.js

@@ -0,0 +1,6 @@
+// Task durations reported by the API are in seconds; used to derive
+// minutes/seconds for display in TaskHistory and TaskProgress.
+export const SECONDS_PER_MINUTE = 60;
+
+// Progress percentage to show once a task has finished running.
+export const PERCENT_COMPLETE = 100;

data/webpack/ForemanInventoryUpload/Components/TaskHistory/TaskHistory.js

@@ -18,6 +18,7 @@ import {
 } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+import { SECONDS_PER_MINUTE } from '../TaskConstants';
 import './taskHistory.scss';
 
 const TaskHistory = ({ tasks, title }) => {
@@ -52,8 +53,8 @@ const TaskHistory = ({ tasks, title }) => {
     if (!Number.isFinite(seconds) || seconds < 0) {
       return __('N/A');
     }
-    const mins = Math.floor(seconds / 60);
-    const secs = Math.floor(seconds % 60);
+    const mins = Math.floor(seconds / SECONDS_PER_MINUTE);
+    const secs = Math.floor(seconds % SECONDS_PER_MINUTE);
     if (mins > 0) {
       return `${mins}m ${secs}s`;
     }

data/webpack/ForemanInventoryUpload/Components/TaskProgress/TaskProgress.js

@@ -29,6 +29,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import { selectSubscriptionConnectionEnabled } from '../InventorySettings/InventorySettingsSelectors';
 import { useIopConfig } from '../../../common/Hooks/ConfigHooks';
+import { SECONDS_PER_MINUTE, PERCENT_COMPLETE } from '../TaskConstants';
 import './taskProgress.scss';
 
 const TaskProgress = ({
@@ -213,8 +214,8 @@ const TaskProgress = ({
     ) {
       return '';
     }
-    const mins = Math.floor(seconds / 60);
-    const secs = Math.floor(seconds % 60);
+    const mins = Math.floor(seconds / SECONDS_PER_MINUTE);
+    const secs = Math.floor(seconds % SECONDS_PER_MINUTE);
     if (mins > 0) {
       return `${mins}m ${secs}s`;
     }
@@ -232,7 +233,7 @@ const TaskProgress = ({
   if (isStartingNewTask) {
     progressValue = 0;
   } else if (task.state === 'stopped') {
-    progressValue = 100;
+    progressValue = PERCENT_COMPLETE;
   } else {
     progressValue = task.progress || 0;
   }

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -7,7 +7,7 @@ export const inventoryUrl = path =>
 
 export const getInventoryDocsUrl = () =>
   getDocsURL(
-    'Managing_Hosts',
+    'Administering_Project',
     'configuring-foreman-server-for-cloud-connection'
   );
 

data/webpack/ForemanInventoryUpload/__tests__/ForemanInventoryHelpers.test.js

@@ -10,11 +10,11 @@ jest.mock('foremanReact/common/helpers', () => ({
 
 describe('ForemanInventoryUpload helpers', () => {
   describe('getInventoryDocsUrl', () => {
-    it('requests the Managing Hosts guide at the cloud connection chapter', () => {
+    it('requests the admin guide cloud connection chapter', () => {
       getInventoryDocsUrl();
       expect(getDocsURL).toHaveBeenCalledWith(
-        'Managing_Hosts',
-        'configuring-foreman-server-for-cloud-connection'
+        'Administering_Project',
+        'configuring-foreman-server-for-cloud-connection'
       );
     });
   });

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModalFooter.js

@@ -3,7 +3,10 @@ import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
-import { JOB_INVOCATION_PATH } from './RemediationTableConstants';
+import {
+  JOB_INVOCATION_PATH,
+  FORM_SUBMIT_DELAY_MS,
+} from './RemediationTableConstants';
 
 const ModalFooter = ({ toggleModal, resolutions, hostsIds, isIop }) => {
   let token = document.querySelector('meta[name="csrf-token"]');
@@ -24,7 +27,7 @@ const ModalFooter = ({ toggleModal, resolutions, hostsIds, isIop }) => {
     setTimeout(() => {
       // eslint-disable-next-line no-unused-expressions
       formRef.current?.submit?.();
-    }, 100);
+    }, FORM_SUBMIT_DELAY_MS);
   };
   return (
     <form

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationTableConstants.js

@@ -45,3 +45,7 @@ export const JOB_INVOCATION_PATH = foremanUrl('/job_invocations/new');
 export const REMEDIATIONS_API_KEY = 'INSIGHTS_REMEDIATIONS';
 
 export const SUBMIT_RESOLUTIONS = 'SUBMIT_INSIGHTS_RESOLUTIONS';
+
+// Brief delay before the (non-React) form submit/navigation fires, so the
+// button's isLoading spinner has a chance to render first.
+export const FORM_SUBMIT_DELAY_MS = 100;

data/webpack/IopRecommendationDetails/IopRecommendationDetails.js

@@ -8,11 +8,30 @@ import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';
 
 const scope = 'advisor';
 const module = './RecommendationDetailsWrapped';
+const pathwayModule = './PathwayDetailsWrapped';
 
 const IopRecommendationDetails = props => {
+  const pathwayMatch = useRouteMatch(
+    '/foreman_rh_cloud/recommendations/pathways/:slug'
+  );
   const urlParams = useRouteMatch('/foreman_rh_cloud/recommendations/:rule_id');
   // eslint-disable-next-line camelcase
   const ruleId = urlParams?.params?.rule_id;
+
+  if (pathwayMatch) {
+    return (
+      <div className="iop-pathway-details-scalprum advisor">
+        <ScalprumComponent
+          scope={scope}
+          module={pathwayModule}
+          pathwayId={pathwayMatch.params.slug}
+          IopRemediationModal={RemediationModal}
+          {...props}
+        />
+      </div>
+    );
+  }
+
   return (
     <div className="iop-recommendation-details-scalprum advisor">
       <ScalprumComponent

data/webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js

@@ -1,4 +1,8 @@
-export const withInterval = (action, interval = 3000) => ({
+// Arbitrary fallback for this test double only; the real foremanReact
+// default lives in IntervalMiddleware/IntervalConstants.js.
+const DEFAULT_INTERVAL_MS = 3000;
+
+export const withInterval = (action, interval = DEFAULT_INTERVAL_MS) => ({
   ...action,
   interval,
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 14.2.1
+  version: 14.3.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -381,6 +381,7 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/toolbarButtons.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/index.js
+- webpack/ForemanInventoryUpload/Components/TaskConstants.js
 - webpack/ForemanInventoryUpload/Components/TaskHistory/TaskHistory.js
 - webpack/ForemanInventoryUpload/Components/TaskHistory/index.js
 - webpack/ForemanInventoryUpload/Components/TaskHistory/taskHistory.scss
@@ -532,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: