foreman_rh_cloud 11.4.1 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8fc6102624f1f64c8417c8417d1ba48e5db528a0551027ba3fd2fac84cb11e
-  data.tar.gz: 9a8a361d435e8ad403937c50b46c6ed3f56f127342320d00258480bd9dfad194
+  metadata.gz: d3666ab0afa45f6fbf3fbe06ec110cbbf7d7eca432b02686e945afca5b412f31
+  data.tar.gz: ce3380aca30486d23d89c3e9b30d17cbc862e51ba55032b1e60565ec63af1cc2
 SHA512:
-  metadata.gz: b3d88a21a8bdb3990d0b5f76b20b9b43e1cac02d1c5f8c1adcbc565fa2291d67ede4c4fd5cc794b83db7569048853bf13dc1fa0eeb7fa0556c1e77c390ebf10e
-  data.tar.gz: 7309c277c4478897a0cf00d5fb2a18cf9007e2231bf6c63e16ee880feed2bc664ab340e9af84d092ae4b31bd8fe1e6e3c4f282a4628a56cd463eea2b3f234b2d
+  metadata.gz: b853fd7fe75e52c4127984c2644feb55fb455d52d68a86b55ed9d96b84e03d05408fc9ddf5190253d2938965c8583b33903682fabfe137f42ce06f57a2d96a09
+  data.tar.gz: fb4777f06aa6d47e0038cc3533b86779a95694c23e4d01b01bc78e10c07196f16df87ead87d4787e8c4dc518813d7ef4e250d8fe955857ebe6811ad5e8b0d3ec

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -18,10 +18,10 @@ module Api
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
         param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
-        param :disconnected, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
+        param :no_upload, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
         def generate_report
           organization_id = params[:organization_id]
-          disconnected = params[:disconnected] || false
+          disconnected = params[:no_upload] || false
 
           start_report_generation(organization_id, disconnected)
 

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -8,10 +8,6 @@ module ForemanRhCloud
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
-      if ForemanRhCloud.with_local_advisor_engine?
-        final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
-      end
-
       response = RestClient::Request.execute(final_params)
 
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -34,13 +34,7 @@ module ForemanRhCloud
         ),
       }
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
-      params = path_params(requested_url, certs)
-
-      if ForemanRhCloud.with_local_advisor_engine?
-        params[:ssl_ca_file] = ForemanRhCloud.ca_cert
-      end
-
-      base_params.merge(params)
+      base_params.merge(path_params(requested_url, certs))
     end
 
     def prepare_forward_payload(original_request, controller_name)
@@ -69,12 +63,6 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
-      when lightspeed?
-        {
-          url: ForemanRhCloud.cert_base_url + request_path,
-          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
-        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -107,10 +95,6 @@ module ForemanRhCloud
       headers
     end
 
-    def lightspeed?
-      ->(request_path) { request_path.include? '/lightspeed' }
-    end
-
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/services/foreman_rh_cloud/rules_ingester.rb

@@ -13,18 +13,7 @@ module ForemanRhCloud
 
     def fetch_rules_data
       advisor_url = "#{ForemanRhCloud.on_premise_url}/r/insights/v1/static/release/content.json"
-      uri = URI.parse(advisor_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      # Set CA certificate
-      http.ca_file = ForemanRhCloud.ca_cert
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-      request = Net::HTTP::Get.new(uri.request_uri)
-
-      response = http.request(request)
-      JSON.parse(response.body, symbolize_names: true)
+      JSON.parse(Net::HTTP.get(URI.parse(advisor_url)), symbolize_names: true)
     end
 
     def fetch_rules_and_resolutions

data/config/routes.rb

@@ -49,10 +49,6 @@ Rails.application.routes.draw do
     end
   end
 
-  scope :module => :'insights_cloud/api' do
-    match '/api/lightspeed/*path', to: 'machine_telemetries#forward_request', via: :all
-  end
-
   # API routes
 
   namespace :api, :defaults => { :format => 'json' } do

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -3,7 +3,7 @@ module ForemanInventoryUpload
     class QueueForUploadJob < ::Actions::EntryAction
       def plan(base_folder, report_file, organization_id, disconnected)
         enqueue_task = plan_self(base_folder: base_folder, report_file: report_file)
-        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id) unless disconnected
+        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id, disconnected)
       end
 
       def run
@@ -59,8 +59,8 @@ module ForemanInventoryUpload
         input[:report_file]
       end
 
-      def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id)
+      def plan_upload_report(enqueued_file_name, organization_id, disconnected)
+        plan_action(UploadReportJob, enqueued_file_name, organization_id, disconnected)
       end
     end
   end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -7,15 +7,15 @@ module ForemanInventoryUpload
         "upload_for_#{label}"
       end
 
-      def plan(filename, organization_id)
+      def plan(filename, organization_id, disconnected = false)
         label = UploadReportJob.output_label(organization_id)
-        super(label, filename: filename, organization_id: organization_id)
+        super(label, filename: filename, organization_id: organization_id, disconnected: disconnected)
       end
 
       def try_execute
         if content_disconnected?
           progress_output do |progress_output|
-            progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
+            progress_output.write_line('Upload canceled because connection to Insights is not enabled or the --no-upload option was passed.')
             progress_output.status = "Task aborted, exit 1"
             done!
           end
@@ -78,7 +78,7 @@ module ForemanInventoryUpload
       end
 
       def content_disconnected?
-        !Setting[:subscription_connection_enabled]
+        input[:disconnected] || !Setting[:subscription_connection_enabled]
       end
     end
   end

data/lib/foreman_rh_cloud/engine.rb

@@ -212,15 +212,4 @@ module ForemanRhCloud
   def self.with_local_advisor_engine?
     SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
   end
-
-  def self.ca_cert
-    # The reference to candlepin ca_cert_file can be removed
-    # once the setting is dropped. Foreman 3.15 introduces
-    # a single CA file that bundles all CAs.
-    if ::SETTINGS.dig(:katello, :candlepin, :ca_cert_file)
-      ::SETTINGS[:katello][:candlepin][:ca_cert_file]
-    else
-      ::SETTINGS[:ssl_ca_file]
-    end
-  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.4.1'.freeze
+  VERSION = '12.0.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "11.4.1",
+  "version": "12.0.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -19,13 +19,13 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 10.1.1"
+    "@theforeman/vendor": ">= 15.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": ">= 10.1.1",
-    "@theforeman/test": ">= 10.1.1",
-    "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
+    "@theforeman/builder": ">= 15.0.1",
+    "@theforeman/test": ">= 15.0.1",
+    "@theforeman/eslint-plugin-foreman": ">= 15.0.1",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -14,7 +14,7 @@ module InventoryUpload::Api
         .expects(:start_report_generation)
         .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected }
+      post :generate_report, params: { organization_id: @test_org.id, no_upload: @disconnected }
 
       assert_response :success
     end

data/test/jobs/upload_report_job_test.rb

@@ -18,7 +18,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/Upload canceled/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/__snapshots__/ListItem.test.js.snap

@@ -10,13 +10,7 @@ exports[`ListItem rendering render with Props 1`] = `
       <Label
         className="account-icon"
         color="blue"
-        icon={
-          <UserIcon
-            color="currentColor"
-            noVerticalAlign={false}
-            size="sm"
-          />
-        }
+        icon={<UserIcon />}
         variant="outline"
       />
       test

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/__snapshots__/ListItemStatus.test.js.snap

@@ -12,11 +12,7 @@ exports[`ListItemStatus rendering render with Props 1`] = `
     <p>
       Generating
     </p>
-    <CheckIcon
-      color="currentColor"
-      noVerticalAlign={false}
-      size="sm"
-    />
+    <CheckIcon />
   </GridItem>
   <GridItem
     className="item"

data/webpack/ForemanInventoryUpload/Components/AccountList/accountList.scss

@@ -8,11 +8,11 @@
   }
 
   .account-list {
-    .pf-c-accordion__toggle {
+    .pf-v5-c-accordion__toggle {
       margin-top: 10px;
     }
 
-    .pf-c-accordion__toggle-text {
+    .pf-v5-c-accordion__toggle-text {
       font-size: 16px;
       display: flex;
       justify-content: space-between;
@@ -21,7 +21,7 @@
       .account-icon {
         margin-right: 5px;
 
-        .pf-c-label__icon {
+        .pf-v5-c-label__icon {
           margin: 0;
         }
       }

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -29,7 +29,7 @@ const InventoryFilter = ({
           value={filterTerm}
           type="text"
           placeholder={__('Filter..')}
-          onChange={handleFilterChange}
+          onChange={(e, v) => handleFilterChange(v)}
         />
         <ClearButton onClear={handleFilterClear} />
       </FormGroup>

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/inventoryFilter.scss

@@ -1,5 +1,5 @@
 #inventory_filter_form {
-  .pf-c-form__group-control {
+  .pf-v5-c-form__group-control {
     display: -ms-flexbox;
     display: -webkit-flex;
     display: flex;

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageHeader.scss

@@ -12,18 +12,18 @@
       font-size: 16px;
     }
 
-    .pf-c-dropdown__toggle {
+    .pf-v5-c-dropdown__toggle {
       margin-right: -20px;
     }
 
     .settings-alert {
       margin-bottom: 30px;
-      .pf-c-alert {
+      .pf-v5-c-alert {
         margin-bottom: 5px;
 
-        .pf-c-alert__title {
-          font-size: var(--pf-global--FontSize--md);
-          line-height: var(--pf-global--LineHeight--md);
+        .pf-v5-c-alert__title {
+          font-size: var(--pf-v5-global--FontSize--md);
+          line-height: var(--pf-v5-global--LineHeight--md);
         }
       }
     }

data/webpack/ForemanInventoryUpload/Components/PageHeader/PageTitle.js

@@ -1,12 +1,11 @@
 import React, { useState } from 'react';
+import { Grid, GridItem } from '@patternfly/react-core';
 import {
   Dropdown,
   DropdownItem,
   KebabToggle,
   DropdownPosition,
-  Grid,
-  GridItem,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import Head from 'foremanReact/components/Head';
 import {
   INVENTORY_PAGE_TITLE,
@@ -58,7 +57,9 @@ const PageTitle = () => {
           className="title-dropdown"
           onSelect={() => setIsDropdownOpen(false)}
           toggle={
-            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+            <KebabToggle
+              onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)}
+            />
           }
           isOpen={isDropdownOpen}
           isPlain

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -2,7 +2,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { Table, TableBody, TableHeader } from '@patternfly/react-table';
+import {
+  Table,
+  TableBody,
+  TableHeader,
+} from '@patternfly/react-table/deprecated';
 import {
   Card,
   CardTitle,
@@ -11,6 +15,7 @@ import {
   ModalVariant,
   Spinner,
   Text,
+  Icon,
 } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
@@ -108,8 +113,18 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
 
 const StatusIcon = ({ isPending, authStatus }) => {
   if (isPending) return <Spinner size="sm" />;
-  if (authStatus.success) return <CheckCircleIcon color="green" />;
-  if (authStatus.error) return <ExclamationCircleIcon color="red" />;
+  if (authStatus.success)
+    return (
+      <Icon color="green">
+        <CheckCircleIcon />
+      </Icon>
+    );
+  if (authStatus.error)
+    return (
+      <Icon color="red">
+        <ExclamationCircleIcon />
+      </Icon>
+    );
   return <Spinner size="sm" />;
 };
 

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

@@ -22,7 +22,6 @@ class SyncButton extends React.Component {
         <Button
           className="sync_button"
           onClick={handleClick}
-          size="lg"
           isDisabled={status === STATUS.PENDING}
           variant="secondary"
         >

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

@@ -6,7 +6,6 @@ exports[`SyncButton rendering render with Props 1`] = `
     className="sync_button"
     isDisabled={false}
     onClick={[Function]}
-    size="lg"
     variant="secondary"
   >
      Sync all inventory status

data/webpack/ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload/__tests__/__snapshots__/InventoryAutoUpload.test.js.snap

@@ -56,11 +56,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
           >
             Show Advanced Settings
              
-            <CaretRightIcon
-              color="currentColor"
-              noVerticalAlign={false}
-              size="sm"
-            />
+            <CaretRightIcon />
           </Button>
         </Popover>
       </Col>
@@ -78,11 +74,7 @@ exports[`InventoryAutoUpload rendering render with props 1`] = `
         <Text
           component="p"
         >
-          <InfoAltIcon
-            color="currentColor"
-            noVerticalAlign={false}
-            size="sm"
-          />
+          <InfoAltIcon />
            
           More details can be found in
            

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js

@@ -1,7 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import {
+  Table,
+  TableHeader,
+  TableBody,
+} from '@patternfly/react-table/deprecated';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import SelectAllAlert from './SelectAllAlert';
 import {

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js

@@ -4,7 +4,7 @@ import {
   InsightsLabel,
   Section,
 } from '@redhat-cloud-services/frontend-components';
-import { DropdownItem } from '@patternfly/react-core';
+import { DropdownItem } from '@patternfly/react-core/deprecated';
 import { sortable, cellWidth } from '@patternfly/react-table';
 import { AnsibeTowerIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';

data/webpack/InsightsCloudSync/Components/InsightsTable/Pagination.js

@@ -20,13 +20,13 @@ const paginationTitles = {
   page: '', // doesn't work well with translations as it adds 's' for plural, see: https://github.com/patternfly/patternfly-react/issues/6707
   itemsPerPage: __('Items per page'),
   perPageSuffix: __('per page'),
-  toFirstPage: __('Go to first page'),
-  toPreviousPage: __('Go to previous page'),
-  toLastPage: __('Go to last page'),
-  toNextPage: __('Go to next page'),
-  optionsToggle: __('Items per page'),
-  currPage: __('Current page'),
-  paginationTitle: __('Pagination'),
+  toFirstPageAriaLabel: __('Go to first page'),
+  toPreviousPageAriaLabel: __('Go to previous page'),
+  toLastPageAriaLabel: __('Go to last page'),
+  toNextPageAriaLabel: __('Go to next page'),
+  optionsToggleAriaLabel: __('Items per page'),
+  currPageAriaLabel: __('Current page'),
+  paginationAriaLabel: __('Pagination'),
 };
 
 const Pagination = ({ variant, ...props }) => {

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -1,5 +1,5 @@
 .rh-cloud-recommendations-table {
-  .pf-c-table__check {
+  .pf-v5-c-table__check {
     input:disabled {
       display: none;
     }

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

@@ -1,7 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import {
+  Table,
+  TableHeader,
+  TableBody,
+} from '@patternfly/react-table/deprecated';
 import { Modal, ModalVariant, Button } from '@patternfly/react-core';
 import { isEmpty } from 'lodash';
 import { STATUS } from 'foremanReact/constants';

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

@@ -1,11 +1,18 @@
 import React from 'react';
 import { cellWidth } from '@patternfly/react-table';
+import { Icon } from '@patternfly/react-core';
 import { CheckCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 
 export const rebootFormatter = ({ title: reboot }) => ({
-  children: reboot ? <CheckCircleIcon color="green" /> : __('No'),
+  children: reboot ? (
+    <Icon color="green">
+      <CheckCircleIcon />
+    </Icon>
+  ) : (
+    __('No')
+  ),
 });
 
 export const columns = [

data/webpack/InsightsCloudSync/Components/ToolbarDropdown.js

@@ -1,7 +1,11 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Dropdown, DropdownItem, KebabToggle } from '@patternfly/react-core';
+import {
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core/deprecated';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { redHatAdvisorSystems } from '../InsightsCloudSyncHelpers';
 import { useAdvisorEngineConfig } from '../../common/Hooks/ConfigHooks';
@@ -35,7 +39,9 @@ const ToolbarDropdown = ({ onRecommendationSync }) => {
     <Dropdown
       className="title-dropdown"
       onSelect={() => setIsDropdownOpen(false)}
-      toggle={<KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />}
+      toggle={
+        <KebabToggle onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)} />
+      }
       isOpen={isDropdownOpen}
       isPlain
       dropdownItems={dropdownItems}

data/webpack/InsightsCloudSync/InsightsCloudSync.scss

@@ -78,7 +78,7 @@
       width: 100%;
     }
 
-    .pf-c-pagination {
+    .pf-v5-c-pagination {
       padding-right: 0;
     }
   }

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -3,8 +3,14 @@ import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { push } from 'connected-react-router';
 import { useHistory } from 'react-router-dom';
-import { DropdownItem, Bullseye, Title } from '@patternfly/react-core';
-import { ChartDonut, ChartLegend, ChartLabel } from '@patternfly/react-charts';
+import { Bullseye, Title } from '@patternfly/react-core';
+import { DropdownItem } from '@patternfly/react-core/deprecated';
+import {
+  ChartDonut,
+  ChartLegend,
+  ChartLabel,
+  ChartTooltip,
+} from '@patternfly/react-charts';
 import { STATUS } from 'foremanReact/constants';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
@@ -90,6 +96,9 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
         { x: critical.title, y: critical.value },
       ]}
       labels={({ datum: { x, y } }) => `${x}: ${y}`}
+      labelComponent={
+        <ChartTooltip constrainToVisibleArea renderInPortal={false} />
+      }
       legendComponent={legend}
       legendPosition="right"
       subTitle="Recommendations"

data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js

@@ -3,13 +3,12 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { Grid, GridItem } from '@patternfly/react-core';
 import {
-  Grid,
-  GridItem,
   Dropdown,
   DropdownItem,
   KebabToggle,
-} from '@patternfly/react-core';
+} from '@patternfly/react-core/deprecated';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import InsightsTable from '../InsightsCloudSync/Components/InsightsTable';
 import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
@@ -76,7 +75,9 @@ const NewHostDetailsTab = ({ hostName, router }) => {
           ouiaId="insights-dropdown"
           onSelect={() => setIsDropdownOpen(false)}
           toggle={
-            <KebabToggle onToggle={isOpen => setIsDropdownOpen(isOpen)} />
+            <KebabToggle
+              onToggle={(_event, isOpen) => setIsDropdownOpen(isOpen)}
+            />
           }
           isOpen={isDropdownOpen}
           isPlain

data/webpack/common/DropdownToggle.js

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Dropdown, KebabToggle } from '@patternfly/react-core';
+import { Dropdown, KebabToggle } from '@patternfly/react-core/deprecated';
 
 const DropdownToggle = ({ items, ...props }) => {
   const [isOpen, setOpen] = useState(false);
   return (
     <Dropdown
       onSelect={() => setOpen(false)}
-      toggle={<KebabToggle onToggle={value => setOpen(value)} />}
+      toggle={<KebabToggle onToggle={(_event, value) => setOpen(value)} />}
       isOpen={isOpen}
       isPlain
       dropdownItems={items}

data/webpack/common/Switcher/HelpLabel.js

@@ -9,7 +9,7 @@ export const HelpLabel = ({ text, id, className }) => {
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
       <button
         onClick={e => e.preventDefault()}
-        className={`pf-c-form__group-label-help ${className}`}
+        className={`pf-v5-c-form__group-label-help ${className}`}
       >
         <HelpIcon />
       </button>

data/webpack/common/Switcher/SwitcherPF4.scss

@@ -7,7 +7,7 @@ label.foreman-rh-cloud-switcher {
     padding-left: 5px;
   }
 
-  .pf-c-switch__toggle {
+  .pf-v5-c-switch__toggle {
     margin-right: 5px;
   }
 }

data/webpack/common/Switcher/__tests__/__snapshots__/HelpLabel.test.js.snap

@@ -7,14 +7,10 @@ exports[`InsightsCloudSync helpers should return insights cloud Url 1`] = `
   id="some-id-help"
 >
   <button
-    className="pf-c-form__group-label-help some-class"
+    className="pf-v5-c-form__group-label-help some-class"
     onClick={[Function]}
   >
-    <HelpIcon
-      color="currentColor"
-      noVerticalAlign={false}
-      size="sm"
-    />
+    <HelpIcon />
   </button>
 </Popover>
 `;

data/webpack/common/table/EmptyState.js

@@ -5,7 +5,7 @@ import {
   EmptyStateIcon,
   Spinner,
   EmptyStateVariant,
-  Title,
+  EmptyStateHeader,
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon, CheckIcon } from '@patternfly/react-icons';
 
@@ -16,33 +16,40 @@ const TableEmptyState = ({ status, error, rowsLength }) => {
   switch (status) {
     case STATUS.PENDING:
       return (
-        <EmptyState variant={EmptyStateVariant.small}>
-          <EmptyStateIcon variant="container" component={Spinner} />
-          <Title headingLevel="h2" size="lg">
-            {__('Loading')}
-          </Title>
+        <EmptyState variant={EmptyStateVariant.sm}>
+          <EmptyStateHeader
+            titleText={<>{__('Loading')}</>}
+            icon={<EmptyStateIcon icon={Spinner} />}
+            headingLevel="h2"
+          />
         </EmptyState>
       );
     case STATUS.ERROR:
       return (
-        <EmptyState variant={EmptyStateVariant.small}>
-          <EmptyStateIcon
-            variant="container"
-            component={ExclamationCircleIcon}
+        <EmptyState variant={EmptyStateVariant.sm}>
+          <EmptyStateHeader
+            titleText={
+              <>
+                {sprintf(
+                  __('The server returned the following error: %s'),
+                  error
+                )}
+              </>
+            }
+            icon={<EmptyStateIcon icon={ExclamationCircleIcon} />}
+            headingLevel="h2"
           />
-          <Title headingLevel="h2" size="lg">
-            {sprintf(__('The server returned the following error: %s'), error)}
-          </Title>
         </EmptyState>
       );
     case STATUS.RESOLVED:
       if (rowsLength > 0) return null;
       return (
-        <EmptyState variant={EmptyStateVariant.large}>
-          <EmptyStateIcon variant="container" component={CheckIcon} />
-          <Title headingLevel="h2" size="lg">
-            {__('There are no recommendations for your hosts')}
-          </Title>
+        <EmptyState variant={EmptyStateVariant.lg}>
+          <EmptyStateHeader
+            titleText={<>{__('There are no recommendations for your hosts')}</>}
+            icon={<EmptyStateIcon icon={CheckIcon} />}
+            headingLevel="h2"
+          />
         </EmptyState>
       );
     default:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.4.1
+  version: 12.0.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -16,9 +16,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 16.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,29 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 16.0.0
-- !ruby/object:Gem::Dependency
-  name: foreman_remote_execution
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 15.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 16.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 15.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 16.0.0
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -56,9 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,9 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement
@@ -697,7 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: