foreman_rh_cloud 12.2.8 → 12.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38498696c8d02e84313b43772ce7bdb72dc2acdbe13531fa2791461b57197f57
-  data.tar.gz: 988fe5f03e6f151e3030b76086cb88d93882fd2e636a0a3af4cbe9424ff6b237
+  metadata.gz: 63d8defd7b60eed828c60406f2b1a033fa933355f02b040b0f44e9018ca8d5d1
+  data.tar.gz: fbe5cb540881d63b46deea02356a85a091813fe7b379743eacb40b274f9e0975
 SHA512:
-  metadata.gz: 9e5df4e3ae29100c018dfa8ed7b3398e4c37b4eab0af566b2310835e45eca0741ccc645ce343791f81b955ef502ee40b4372038311cddf010ee8ed71ceeda1b1
-  data.tar.gz: 5d49315537875841245a6cc17ddfc560e2721bccde4bf55cd42a01d71c91b7bbdf21b34225b142374cce46763bf7eae37f06708c3e4ebe81eee95741de8a75db
+  metadata.gz: f7d0c5e06c009759a191f015ac3fe8fd81380591c1ce8357618bd2b80a202f499d011b599ee6e7ab370dd451188fe0db2a8b952d66bd8ac841f7a35c0fdcf7eb
+  data.tar.gz: 7f8968b0aaea95c2b8e3f656964dae6a7ccdf7ec4cab1b2eecc550ebf0fea889e64eda671959ce3a13aa99318918977fbe5ee39fe4c06f8bbd6067813f40945d

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.8'.freeze
+  VERSION = '12.2.9'.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": "12.2.8",
+  "version": "12.2.9",
   "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: 12.2.8
+  version: 12.2.9
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team