foreman_rh_cloud 11.2.0 → 12.0.0

data/test/unit/slice_generator_test.rb

@@ -3,13 +3,12 @@ require 'test_plugin_helper'
 class SliceGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     location = FactoryBot.create(:location)
 
     @host = FactoryBot.create(
@@ -17,7 +16,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :redhat,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization,
       location: location

data/test/unit/tags_generator_test.rb

@@ -3,6 +3,7 @@ require 'test_plugin_helper'
 class TagsGeneratorTest < ActiveSupport::TestCase
   include KatelloLocationFix
   include CandlepinIsolation
+  include KatelloCVEHelper
 
   setup do
     UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
@@ -25,18 +26,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       organization: env.organization,
       location: @location2,
       hostgroup: @hostgroup2,
-      content_view_environments: [
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env
-        ),
-        FactoryBot.create(
-          :katello_content_view_environment,
-          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
-          lifecycle_environment: env2
-        ),
-      ]
+      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)

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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -90,7 +89,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/foreman_rh_cloud/locale/en/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/fr/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js
@@ -220,8 +218,6 @@ files:
 - lib/tasks/insights.rake
 - lib/tasks/rh_cloud_inventory.rake
 - locale/Makefile
-- locale/en/LC_MESSAGES/foreman_rh_cloud.mo
-- locale/en/foreman_rh_cloud.po
 - locale/foreman_rh_cloud.pot
 - locale/fr/LC_MESSAGES/foreman_rh_cloud.mo
 - locale/fr/foreman_rh_cloud.po
@@ -652,7 +648,6 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -670,8 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files: