foreman_rh_cloud 13.0.2 → 13.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f456ece118ec6f05c0457692a01b6a6ab4515d96d8c332df3ae542d63d7c0bde
-  data.tar.gz: d0934f134fcf9724af3c624a542ec371079f5b5f4ababe62a59eab45dbe17f6b
+  metadata.gz: 07f9c21862525b394bf03e7490168fc1f0d66e8af832c4ce8e3f8d5796bde269
+  data.tar.gz: b88f3038b40d623c2d5df92f801d328bd568f9360d17760a6b2c0dff3808bf11
 SHA512:
-  metadata.gz: bb7f8a102e4b6cc4926365f5584168b93cd774484fa8891ed84db92e62b9556306d62ef51f503e8b4a05ece3c36b9a6f5c787e3668665ada2fdec2e9cc4c7dec
-  data.tar.gz: 2c5b475fd42ef87c2e672ac1532b167dbda49b2f1df41382cd06b3db4985e74c3ef774e1ac40ea1772d765a4bf336ccb93ed4a13f3b0ee4dc842e12a827d9beb
+  metadata.gz: 8773fa656f0fbd4f50833faf50e7d4a88bca97f9b39d0c62d944ba2bbfbef9fd18f5adaa1647e8d4ece97a0fca330935d1acb46fd54359428aa8f43cb3b9d403
+  data.tar.gz: 98c7cec90e073a517582fcd789add89684e2788c425bab6d2d4793611277d65ce7d21e3b0fc18b66beeb8fd553407c9172308f89e60e7516bdacd49bdfcbadaf

data/lib/foreman_rh_cloud/engine.rb

@@ -115,23 +115,20 @@ module ForemanRhCloud
       if defined?(Katello) && !Foreman.in_setup_db_rake?
         Katello::Api::V2::OrganizationsController.include Foreman::Controller::SmartProxyAuth
         # patch the callbacks order for :download_debug_certificate, since local_find_taxonomy has to run after the user is already initialized
-        Katello::Api::V2::OrganizationsController.skip_before_action(:local_find_taxonomy, only: :download_debug_certificate)
-        Katello::Api::V2::OrganizationsController.add_smart_proxy_filters(
-          [:index, :download_debug_certificate],
-          features: ForemanRhCloud.on_prem_smart_proxy_features
-        )
-        Katello::Api::V2::OrganizationsController.before_action(:local_find_taxonomy, only: :download_debug_certificate)
-
+        Katello::Api::V2::OrganizationsController.before_find_taxonomy_actions do
+          Katello::Api::V2::OrganizationsController.add_smart_proxy_filters(
+            [:index, :download_debug_certificate],
+            features: ForemanRhCloud.on_prem_smart_proxy_features
+          )
+        end
         Katello::Api::V2::RepositoriesController.include Foreman::Controller::SmartProxyAuth
         # patch the callbacks order for :index, since find_product has to run after the user is already initialized
-        Katello::Api::V2::RepositoriesController.skip_before_action(:find_product, only: :index)
-        Katello::Api::V2::RepositoriesController.skip_before_action(:find_optional_organization, only: :index)
-        Katello::Api::V2::RepositoriesController.add_smart_proxy_filters(
-          :index,
-          features: ForemanRhCloud.on_prem_smart_proxy_features
-        )
-        Katello::Api::V2::RepositoriesController.before_action(:find_product, only: :index)
-        Katello::Api::V2::RepositoriesController.before_action(:find_optional_organization, only: :index)
+        Katello::Api::V2::RepositoriesController.before_index_actions do
+          Katello::Api::V2::RepositoriesController.add_smart_proxy_filters(
+            :index,
+            features: ForemanRhCloud.on_prem_smart_proxy_features
+          )
+        end
       end
     end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.2'.freeze
+  VERSION = '13.0.4'.freeze
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -45,6 +45,7 @@ namespace :rh_cloud_inventory do
           archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
           archived_report_generator.render(organization: organization, filter: filter)
           puts "Successfully generated #{target} for organization id #{organization}"
+          puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
 
           next unless ForemanRhCloud.with_iop_smart_proxy?
 

data/package.json

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

data/webpack/ForemanRhCloudFills.js

@@ -4,7 +4,11 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
 import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
-import { isNotRhelHost, vulnerabilityDisabled } from './ForemanRhCloudHelpers';
+import {
+  isNotRhelHost,
+  vulnerabilityDisabled,
+  hasNoInsightsFacet,
+} from './ForemanRhCloudHelpers';
 import CVEsHostDetailsTabWrapper from './CVEsHostDetailsTab/CVEsHostDetailsTab';
 
 const fills = [
@@ -20,7 +24,7 @@ const fills = [
     component: props => <NewHostDetailsTab {...props} />,
     weight: 400,
     metadata: {
-      hideTab: isNotRhelHost,
+      hideTab: props => isNotRhelHost(props) || hasNoInsightsFacet(props),
       title: __('Recommendations'),
     },
   },

data/webpack/ForemanRhCloudHelpers.js

@@ -14,3 +14,7 @@ export const isNotRhelHost = ({ hostDetails }) =>
 
 export const vulnerabilityDisabled = ({ hostDetails }) =>
   isNotRhelHost({ hostDetails }) || !hostDetails?.vulnerability?.enabled;
+
+export const hasNoInsightsFacet = ({ response, hostDetails }) =>
+  // eslint-disable-next-line camelcase
+  !(response?.insights_attributes || hostDetails?.insights_attributes);

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -131,28 +131,15 @@ const IopInsightsTabWrapped = props => (
 );
 
 const InsightsTab = props => {
-  const { response } = props;
-  const isLocalAdvisorEngine =
-    // eslint-disable-next-line camelcase
-    response?.insights_attributes?.use_iop_mode;
+  const isLocalIop = useAdvisorEngineConfig();
 
-  return isLocalAdvisorEngine ? (
+  return isLocalIop ? (
     <IopInsightsTabWrapped {...props} />
   ) : (
     <NewHostDetailsTab {...props} />
   );
 };
 
-InsightsTab.propTypes = {
-  response: PropTypes.shape({
-    insights_attributes: {
-      use_iop_mode: PropTypes.bool,
-    },
-  }),
-};
-
-InsightsTab.defaultProps = {
-  response: {},
-};
+InsightsTab.defaultProps = {};
 
 export default InsightsTab;

data/webpack/__tests__/ForemanRhCloudHelpers.test.js

@@ -1,5 +1,5 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { foremanUrl, vulnerabilityDisabled } from '../ForemanRhCloudHelpers';
+import { foremanUrl, vulnerabilityDisabled, hasNoInsightsFacet } from '../ForemanRhCloudHelpers';
 
 global.URL_PREFIX = 'MY_TEST_URL_PREFIX.example.com';
 
@@ -34,6 +34,21 @@ const fixtures = {
     }),
   'vulnerabilityDisabled returns true for missing hostDetails': () =>
     vulnerabilityDisabled({}),
+  'hasNoInsightsFacet returns false when insights_attributes is present': () =>
+    hasNoInsightsFacet({
+      response: {
+        insights_attributes: {
+          uuid: 'test-uuid',
+          insights_hits_count: 5,
+        },
+      },
+    }),
+  'hasNoInsightsFacet returns true when insights_attributes is missing': () =>
+    hasNoInsightsFacet({
+      response: {},
+    }),
+  'hasNoInsightsFacet returns true when response is missing': () =>
+    hasNoInsightsFacet({}),
 };
 
 describe('ForemanRhCloud helpers', () =>

data/webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap

@@ -1,5 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`ForemanRhCloud helpers hasNoInsightsFacet returns false when insights_attributes is present 1`] = `false`;
+
+exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when insights_attributes is missing 1`] = `true`;
+
+exports[`ForemanRhCloud helpers hasNoInsightsFacet returns true when response is missing 1`] = `true`;
+
 exports[`ForemanRhCloud helpers should return foreman Url 1`] = `"MY_TEST_URL_PREFIX.example.com/test_path"`;
 
 exports[`ForemanRhCloud helpers vulnerabilityDisabled returns false for RHEL host with vulnerability enabled 1`] = `false`;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.2
+  version: 13.0.4
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.14.0.rc1.1
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.14.0.rc1.1
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement