foreman_rh_cloud 11.0.0 → 11.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd4ee874e42e9236bbc4fae540911c372af73f3a336507c9421693b8fb128da
-  data.tar.gz: da0c96b9b8fb3d737d0f8902da7176adbd2f1a8810260ddeba547c3a22004ec7
+  metadata.gz: 5f59aefea33a7933386cdc77e326b13ceca715d51f4fdf3c02905896363bcc33
+  data.tar.gz: 95b711179cb036dbfcb8a6261db1f6c9911ff931807a4a0d9765440534c30c8f
 SHA512:
-  metadata.gz: 12343eaac2bfb4c666c156a84a868f02a3b684f4a4bf044f7a838d9134d140ec6fb698b356c35efb8b11618fa0c36b3a61c0cc411caf48ff91b8fc9957528074
-  data.tar.gz: 41f578f21a65aee43ade158a99991c1b3b7b37ee2000e0e1c8c7d55cba60ac94d31e734d205e589bfc1bf1850fb98142b91ea975b3d9580361a11803eac8f17b
+  metadata.gz: 4bf762fb0c67730e9317948e6ca74921717d8699fb532b4f3c196049ac38f5ba145d7a9a54122f9c18710e4ede293c4d35beb3e3b462b20e936acd8c5547ed8f
+  data.tar.gz: 91e0dceccebc4fb48d93c7916f0a229a0b1d2077f0319e67fa014ecb29f0adade7c28e6af1ac717d0b12488065031b37ecf20b84c816086d260385211d15e468

data/config/initializers/zeitwerk.rb

@@ -1,3 +1,5 @@
+require "#{ForemanRhCloud::Engine.root}/lib/foreman_rh_cloud/version"
+
 Rails.autoloaders.main.ignore(
   ForemanRhCloud::Engine.root.join('lib/foreman_rh_cloud/version.rb')
 )

data/lib/foreman_rh_cloud/engine.rb

@@ -151,46 +151,46 @@ module ForemanRhCloud
       end
     end
 
-    rake_tasks do
-      Rake::Task['db:seed'].enhance do
-        ForemanRhCloud::Engine.load_seed
-      end
-    end
-
-    initializer 'foreman_rh_cloud.register_rex_features', :before => :finisher_hook do |_app|
+    initializer 'foreman_rh_cloud.register_scheduled_tasks', :before => :finisher_hook do |_app|
       # skip database manipulations while tables do not exist, like in migrations
-      if ActiveRecord::Base.connection.data_source_exists?(ForemanTasks::Task.table_name)
-        RemoteExecutionFeature.register(
-          :rh_cloud_remediate_hosts,
-          N_('Apply Insights recommendations'),
-          description: N_('Run remediation playbook generated by Insights'),
-          host_action_button: false
-        )
-        RemoteExecutionFeature.register(
-          :rh_cloud_connector_run_playbook,
-          N_('Run RH Cloud playbook'),
-          description: N_('Run playbook genrated by Red Hat remediations app'),
-          host_action_button: false,
-          provided_inputs: ['playbook_url', 'report_url', 'correlation_id', 'report_interval']
-        )
-        RemoteExecutionFeature.register(
-          :ansible_configure_cloud_connector,
-          N_('Configure Cloud Connector on given hosts'),
-          :description => N_('Configure Cloud Connector on given hosts'),
-          :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
-        )
-
-        # skip object creation when admin user is not present, for example in test DB
-        if User.unscoped.find_by_login(User::ANONYMOUS_ADMIN).present?
-          ::ForemanTasks.dynflow.config.on_init(false) do |world|
-            ForemanRhCloud::Engine.register_scheduled_task(ForemanInventoryUpload::Async::GenerateAllReportsJob, '0 0 * * *')
-            ForemanRhCloud::Engine.register_scheduled_task(InventorySync::Async::InventoryScheduledSync, '0 0 * * *')
-            ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsScheduledSync, '0 0 * * *')
-            ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsClientStatusAging, '0 0 * * *')
-          end
+      # skip object creation when admin user is not present, for example in test DB
+      if ActiveRecord::Base.connection.data_source_exists?(ForemanTasks::Task.table_name) && User.unscoped.find_by_login(User::ANONYMOUS_ADMIN).present?
+        ::ForemanTasks.dynflow.config.on_init(false) do |world|
+          ForemanRhCloud::Engine.register_scheduled_task(ForemanInventoryUpload::Async::GenerateAllReportsJob, '0 0 * * *')
+          ForemanRhCloud::Engine.register_scheduled_task(InventorySync::Async::InventoryScheduledSync, '0 0 * * *')
+          ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsScheduledSync, '0 0 * * *')
+          ForemanRhCloud::Engine.register_scheduled_task(InsightsCloud::Async::InsightsClientStatusAging, '0 0 * * *')
         end
       end
     rescue ActiveRecord::NoDatabaseError
     end
+
+    config.to_prepare do
+      RemoteExecutionFeature.register(
+        :rh_cloud_remediate_hosts,
+        N_('Apply Insights recommendations'),
+        description: N_('Run remediation playbook generated by Insights'),
+        host_action_button: false
+      )
+      RemoteExecutionFeature.register(
+        :rh_cloud_connector_run_playbook,
+        N_('Run RH Cloud playbook'),
+        description: N_('Run playbook genrated by Red Hat remediations app'),
+        host_action_button: false,
+        provided_inputs: ['playbook_url', 'report_url', 'correlation_id', 'report_interval']
+      )
+      RemoteExecutionFeature.register(
+        :ansible_configure_cloud_connector,
+        N_('Configure Cloud Connector on given hosts'),
+        :description => N_('Configure Cloud Connector on given hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+      )
+    end
+
+    rake_tasks do
+      Rake::Task['db:seed'].enhance do
+        ForemanRhCloud::Engine.load_seed
+      end
+    end
   end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.0.0'.freeze
+  VERSION = '11.0.2'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "11.0.0",
+  "version": "11.0.2",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,11 @@
     "@theforeman/vendor": ">= 10.1.1"
   },
   "devDependencies": {
-    "@babel/core": "~7.7.0",
+    "@babel/core": "^7.7.0",
     "@theforeman/builder": ">= 10.1.1",
     "@theforeman/test": ">= 10.1.1",
     "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
     "babel-eslint": "~10.0.0",
-    "cosmiconfig-typescript-loader": "~4.3.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",
     "jed": "~1.1.1",

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -8,19 +8,19 @@ export const PageDescription = () => (
   <div id="inventory_page_description">
     <Text>
       {__(
-        'The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Satellite instance.'
+        'The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.'
       )}
     </Text>
     <Text>
       {__(
-        'The Satellite inventory upload plugin automatically uploads Satellite host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.'
+        'The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.'
       )}
     </Text>
     <Text>
       <FormattedMessage
         id="enable-upload-hint"
         defaultMessage={__(
-          'To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
+          'To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.'
         )}
         values={{
           uploadButtonName: <strong>{__('Automatic inventory upload')}</strong>,

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap

@@ -5,14 +5,14 @@ exports[`PageDescription rendering render without Props 1`] = `
   id="inventory_page_description"
 >
   <Text>
-    The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Satellite instance.
+    The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.
   </Text>
   <Text>
-    The Satellite inventory upload plugin automatically uploads Satellite host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.
+    The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.
   </Text>
   <Text>
     <FormattedMessage
-      defaultMessage="To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
+      defaultMessage="To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
       id="enable-upload-hint"
       values={
         Object {

data/webpack/ForemanRhCloudFills.js

@@ -2,7 +2,8 @@ import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
-import InsightsTotalRiskCard from './InsightsHostDetailsTab/InsightsTotalRiskChart';
+import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
+import { isNotRhelHost } from './ForemanRhCloudHelpers';
 
 const fills = [
   {
@@ -16,22 +17,27 @@ const fills = [
     name: 'Insights',
     component: props => <NewHostDetailsTab {...props} />,
     weight: 400,
+    metadata: {
+      hideTab: isNotRhelHost,
+    },
   },
   {
     slot: 'host-overview-cards',
     name: 'insights-total-risk-chart',
-    component: props => <InsightsTotalRiskCard {...props} />,
+    component: props => <InsightsTotalRiskChartWrapper {...props} />,
     weight: 2800,
   },
 ];
 
 export const registerFills = () => {
-  fills.forEach(({ slot, name, component: Component, weight }, index) =>
-    addGlobalFill(
-      slot,
-      name,
-      <Component key={`rh-cloud-fill-${index}`} />,
-      weight
-    )
+  fills.forEach(
+    ({ slot, name, component: Component, weight, metadata }, index) =>
+      addGlobalFill(
+        slot,
+        name,
+        <Component key={`rh-cloud-fill-${index}`} />,
+        weight,
+        metadata
+      )
   );
 };

data/webpack/ForemanRhCloudHelpers.js

@@ -4,3 +4,7 @@
  * should be imported once core moves it to the ReactApp folder.
  */
 export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
+
+export const isNotRhelHost = ({ hostDetails }) =>
+  // eslint-disable-next-line camelcase
+  !new RegExp('red\\s?hat', 'i').test(hostDetails?.operatingsystem_name);

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChartWrapper.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import InsightsTotalRiskChart from './InsightsTotalRiskChart';
+import { isNotRhelHost } from '../ForemanRhCloudHelpers';
+
+export const InsightsTotalRiskChartWrapper = props => {
+  if (props.status === 'RESOLVED') {
+    return (
+      !isNotRhelHost(props.hostDetails) && <InsightsTotalRiskChart {...props} /> // check for RHEL hosts
+    );
+  }
+  return null;
+};
+
+InsightsTotalRiskChartWrapper.propTypes = {
+  status: PropTypes.string,
+  hostDetails: PropTypes.object,
+};
+
+InsightsTotalRiskChartWrapper.defaultProps = {
+  status: 'PENDING',
+  hostDetails: {},
+};

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -37,7 +37,7 @@ const NewHostDetailsTab = ({ hostName, router }) => {
 
   const dropdownItems = [
     <DropdownItem key="insights-link" ouiaId="insights-link">
-      <a onClick={onSatInsightsClick}>{__('Go to Satellite Insights page')}</a>
+      <a onClick={onSatInsightsClick}>{__('Go to Foreman Insights page')}</a>
     </DropdownItem>,
   ];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -585,6 +585,7 @@ files:
 - webpack/InsightsHostDetailsTab/InsightsTabReducer.js
 - webpack/InsightsHostDetailsTab/InsightsTabSelectors.js
 - webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js
+- webpack/InsightsHostDetailsTab/InsightsTotalRiskChartWrapper.js
 - webpack/InsightsHostDetailsTab/NewHostDetailsTab.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.fixtures.js
 - webpack/InsightsHostDetailsTab/__tests__/InsightsTab.test.js
@@ -639,7 +640,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -657,8 +658,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: