foreman_theme_satellite 15.0.1 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d1c10a945a4ca3a9acb424095ac0c06cc3c0e5ff80b81845fb70557bf407c4
-  data.tar.gz: e6bdbe897bb42bf32c56ce145da297ae3f4a9c7ea8482ecfd1b7cdd2097c4855
+  metadata.gz: 28d862fbdb104b79fa833150bb249feab7187f414864781f125cb257ba515dd4
+  data.tar.gz: 50f529104715b7cc4946768896f85aa01f1fa33b1efa84f6f45395c2440c1a1c
 SHA512:
-  metadata.gz: 283e64a919a07d076d10cc48f29a7fe0b04c0e18b3cfe79e776776af8fc42e55ca222d90cee4a9de8b48796f32ad3e0fdb7b3ed40e23febb0b8c1352f0d3ff0d
-  data.tar.gz: 53025f3274b9f40da49cc3e38e127c9aa006fe82af9abfde896fb75d30e0d897dca1a207fd1a74e9c3258ae23ea607d88653a743436a4a57156438f295972c48
+  metadata.gz: 60a19d65b32f48568cd7c50e4a2afd0ed3313e4e217b3b52b888834cecdace43dfb3c961f00fcdcfa5e17ae35e94d9af0152d8e25722860e09a2bad48f8bb582
+  data.tar.gz: 647be6e21bb8a1508828af5ab46f7c7854e7654c72ef0fe0c0826ea5e9068a750a5b8f1a317929576c0f529eed3b3592d287620185c8f75ca793f125c1f0d6e7

data/README.md

@@ -361,7 +361,6 @@ class ComputeResource < ApplicationRecord
   def self.supported_providers
     {
       'Libvirt'   => 'Foreman::Model::Libvirt',
-      'Ovirt'     => 'Foreman::Model::Ovirt',
       'EC2'       => 'Foreman::Model::EC2',
       'Vmware'    => 'Foreman::Model::Vmware',
       'Openstack' => 'Foreman::Model::Openstack',
@@ -379,7 +378,7 @@ module ComputeResourceBranding
     end
 
     def providers_requiring_url
-      _('Libvirt, oVirt and OpenStack')
+      _('Libvirt and OpenStack')
     end
   end
 end

data/app/controllers/concerns/documentation_controller_branding.rb

@@ -29,6 +29,10 @@ module DocumentationControllerBranding
     documentation_url(section)
   end
 
+  def support_url
+    'https://access.redhat.com/products/red-hat-satellite#get-support'
+  end
+
   # For new documentation at docs.theforeman.org
   # We do not use flavor downstream, but keeping it here for the same method signature
   # rubocop:disable Lint/UnusedMethodArgument
@@ -36,5 +40,14 @@ module DocumentationControllerBranding
     url = ForemanThemeSatellite::Documentation::DOCS_GUIDES_LINKS.dig(guide, chapter)
     url || "#{ForemanThemeSatellite.documentation_root}/#{guide.downcase}/#{chapter}"
   end
+
+  def upgrade_url(section)
+    case section
+    when 'documentation'
+      "#{ForemanThemeSatellite.unversioned_documentation_root}#Upgrade"
+    when 'helper'
+      'https://access.redhat.com/labs/satelliteupgradehelper'
+    end
+  end
   # rubocop:enable Lint/UnusedMethodArgument
 end

data/app/controllers/concerns/provisioning_templates_controller_branding.rb

@@ -47,8 +47,6 @@ module ProvisioningTemplatesControllerBranding
     'kickstart_ifcfg_get_identifier_names',
     'kickstart_kernel_options',
     'kickstart_networking_setup',
-    'Kickstart oVirt-RHVH',
-    'Kickstart oVirt-RHVH PXELinux',
     'kickstart_rhsm',
     'Linux host_init_config default',
     'ntp',

data/lib/foreman_theme_satellite/documentation.rb

@@ -22,7 +22,6 @@ module ForemanThemeSatellite
       'ComputeResources' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/",
       'NoVNC' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_provisioning_resources_provisioning#using-novnc-to-access-virtual-machines_provisioning",
       'VMwareNotes' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_virtual_machines_in_vmware_vmware-provisioning",
-      'RHEVNotes' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_virtual_machines_on_ovirt_rhv-provisioning",
       'OpenStackNotes' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_openstack_openstack-provisioning",
       'LibvirtNote' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_virtual_machines_on_kvm_kvm-provisioning",
       'EC2' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_in_amazon_ec2_ec2-provisioning",
@@ -41,7 +40,7 @@ module ForemanThemeSatellite
       'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
       'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
       'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
-      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring-external-services#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
+      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/performing-additional-configuration-on-server_satellite#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
       'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
       'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
       'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/configuring_authentication_for_red_hat_satellite_users/configuring-an-ldap-server-as-an-external-identity-provider-for-project_authentication",
@@ -51,7 +50,7 @@ module ForemanThemeSatellite
       'CreatingSCAPcontent' => "#{ForemanThemeSatellite.documentation_root}/managing_security_compliance/configuring_scap_contents_security-compliance",
 
       # Planning
-      'SmartProxies' => "#{ForemanThemeSatellite.documentation_root}/overview_concepts_and_deployment_considerations/major-satellite-components_planning#capsule-Overview_planning",
+      'SmartProxies' => "#{ForemanThemeSatellite.documentation_root}/overview_concepts_and_deployment_considerations/satellite-overview-and-concepts#Major-Satellite-Components_planning",
       'Auditing' => "#{ForemanThemeSatellite.documentation_root}/overview_concepts_and_deployment_considerations/glossary-of-terms-used-in-satellite_planning#Audits",
 
       # Install

data/lib/foreman_theme_satellite/engine.rb

@@ -69,7 +69,6 @@ module ForemanThemeSatellite
         ::ForemanGoogle::GCE.send(:prepend, GCE::ClassMethods) if Foreman::Plugin.installed?("foreman_google")
         UINotifications::RssNotificationsChecker.send :prepend, RssCheckerBranding
         Foreman::Model::Openstack.send :include, Openstack
-        Foreman::Model::Ovirt.send :include, Ovirt
         Realm.send :include, RealmTheme
         ProvisioningTemplate.send :include, Provisioning
 
@@ -137,7 +136,13 @@ module ForemanThemeSatellite
 
   def self.documentation_root
     @documentation_root ||= begin
-      "#{documentation_server}/documentation/en-us/red_hat_satellite/#{documentation_version}/html"
+      "#{unversioned_documentation_root}/#{documentation_version}/html"
+    end
+  end
+
+  def self.unversioned_documentation_root
+    @unversioned_documentation_root ||= begin
+      "#{documentation_server}/documentation/en-us/red_hat_satellite"
     end
   end
 

data/lib/foreman_theme_satellite/foreman_brand.rb

@@ -33,7 +33,6 @@ module ForemanThemeSatellite
     /\b[Ss]mart[- ]?[pP]roxies\b(?!-)/ => 'Capsules',
     /\b[Pp]roxy\b(?!-)/              => 'Capsule',
     /\b[Pp]roxies\b(?!-)/              => 'Capsules',
-    /\b[Oo][Vv]irt\b(?!-)/           => 'RHV',
     /\bFreeIPA\b(?!-)/               => 'Red Hat Identity Management',
     /\b[Oo]pen[Ss]tack\b(?!-)/       => 'Red Hat OpenStack Platform',
     /\b[Kk]atello 4.0\b(?!-)/        => 'Satellite 6.11',

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '15.0.1'.freeze
+  VERSION = '15.2.0'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_theme_satellite",
-  "version": "15.0.1",
+  "version": "15.1.0",
   "description": "Satellite theme =============",
   "main": "index.js",
   "scripts": {

data/webpack/components/fills/UpgradePage/SatelliteUpgradeHelperCard.js

@@ -0,0 +1,33 @@
+import React from 'react';
+
+import { Card, CardBody, CardTitle, CardFooter, Button } from '@patternfly/react-core';
+import { ExternalLinkSquareAltIcon } from '@patternfly/react-icons';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { getUpgradeURL } from 'foremanReact/common/helpers';
+
+const SatelliteUpgradeHelperCard = () => (
+  <Card ouiaId="upgrade-docs-satellite-helper" isFlat>
+    <CardTitle component="h4">{__('Satellite upgrade helper')}</CardTitle>
+    <CardBody>
+      {__('Generate a customized upgrade plan based on your current Satellite environment.' +
+      ' This tool will guide you through the upgrade process and provide additional steps to avoid known issues specific to your upgrade scenario.')}
+    </CardBody>
+    <CardFooter>
+      <Button
+        ouiaId="upgrade-helper-button"
+        component="a"
+        variant="link"
+        icon={<ExternalLinkSquareAltIcon />}
+        iconPosition="right"
+        target="_blank"
+        isInline
+        href={getUpgradeURL('helper')}
+      >
+        {__('Try the Satellite upgrade helper')}
+      </Button>
+    </CardFooter>
+  </Card>
+);
+
+export default SatelliteUpgradeHelperCard;

data/webpack/index.js

@@ -1,5 +1,27 @@
+import React from 'react';
+
 import componentRegistry from 'foremanReact/components/componentRegistry';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { Helmet } from 'react-helmet';
 
+import SatelliteUpgradeHelperCard from './components/fills/UpgradePage/SatelliteUpgradeHelperCard';
+
 // register components for erb mounting
 componentRegistry.register({ name: 'Helmet', type: Helmet });
+
+addGlobalFill(
+  'upgrade-page-additional-docs',
+  'Satellite upgrade helper card',
+  <SatelliteUpgradeHelperCard key="satellite-upgrade-helper-card" />,
+  1000,
+);
+addGlobalFill(
+  'upgrade-page-footer',
+  'Satellite upgrade page footer',
+  {
+    helpDesc: __('If you require assistance or encounter issues, reach out to Red Hat Support or explore the resources available in the Customer Portal for troubleshooting.'),
+    helpLinkText: __('Contact support'),
+  },
+  1000,
+);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 15.0.1
+  version: 15.2.0
 platform: ruby
 authors:
 - Shimon Stein
 - Eric Helms
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,7 +105,6 @@ files:
 - app/controllers/concerns/documentation_controller_branding.rb
 - app/controllers/concerns/provisioning_templates_controller_branding.rb
 - app/helpers/provisioning_templates_helper_branding.rb
-- app/helpers/rhev_helper.rb
 - app/helpers/theme_application_helper.rb
 - app/helpers/theme_css_class_helper.rb
 - app/helpers/theme_discovery_helper.rb
@@ -117,7 +116,6 @@ files:
 - app/models/concerns/distributor_version.rb
 - app/models/concerns/gce.rb
 - app/models/concerns/openstack.rb
-- app/models/concerns/ovirt.rb
 - app/models/concerns/provisioning.rb
 - app/models/concerns/realm_theme.rb
 - app/models/concerns/satellite_packages.rb
@@ -128,15 +126,12 @@ files:
 - app/overrides/layouts/base/theme_react_root.html.erb.deface
 - app/overrides/layouts/base/theme_resources.html.erb.deface
 - app/overrides/layouts/base/theme_style_resources.html.erb.deface
-- app/overrides/rhev.rb
 - app/overrides/satellite_name_override.rb
 - app/services/concerns/setting_registry_branding.rb
 - app/services/foreman_theme_satellite/lifecycle.rb
 - app/services/foreman_theme_satellite/renderer_methods.rb
 - app/views/api/v2/home/status_extensions.json.rabl
 - app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb
-- app/views/foreman_theme_satellite/rhev/_form.erb
-- app/views/foreman_theme_satellite/rhev/_show.html.erb
 - config/initializers/inflections.rb
 - config/initializers/zeitwerk.rb
 - db/migrate/20160404130619_remove_satellite_from_notification_name.rb
@@ -181,6 +176,7 @@ files:
 - locale/zh_CN/LC_MESSAGES/foreman_theme_satellite.mo
 - locale/zh_CN/foreman_theme_satellite.po
 - package.json
+- webpack/components/fills/UpgradePage/SatelliteUpgradeHelperCard.js
 - webpack/index.js
 homepage: https://github.com/RedHatSatellite/foreman_theme_satellite
 licenses:
@@ -201,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: This is a plugin that enables building a theme for Foreman.
 test_files: []

data/app/helpers/rhev_helper.rb

@@ -1,10 +0,0 @@
-module RhevHelper
-  def rhev_deprecation_alert
-    header = _('RHEV integration is deprecated.')
-    text = _('On August 31, 2022, Red Hat Virtualization entered the Maintenance Support Phase. The Maintenance Support Phase runs until August 31, 2024, followed by the Extended Life Phase, which runs until August 31, 2026.')
-    link = link_to(_('More information'), 'https://access.redhat.com/announcements/6960518', target: '_blank', rel: 'noopener')
-    alert = "<strong>#{header}</strong><p>#{text}&nbsp;#{link}</p>"
-
-    content_tag(:div, alert.html_safe, class: 'alert alert-warning')
-  end
-end

data/app/models/concerns/ovirt.rb

@@ -1,8 +0,0 @@
-module Ovirt
-  extend ActiveSupport::Concern
-  included do
-    define_singleton_method :provider_friendly_name do
-      "RHV"
-    end
-  end
-end

data/app/overrides/rhev.rb

@@ -1,14 +0,0 @@
-Deface::Override.new(virtual_path: 'compute_resources/form/_ovirt',
-  name: 'rhev_new',
-  insert_before: "erb[loud]:contains(':url')",
-  partial: 'foreman_theme_satellite/rhev/form')
-
-Deface::Override.new(virtual_path: 'compute_resources/show/_ovirt',
-  name: 'rhev_show',
-  insert_after: 'tr:nth-child(4)',
-  partial: 'foreman_theme_satellite/rhev/show')
-
-Deface::Override.new(virtual_path: 'compute_resources_vms/form/ovirt/_base',
-  name: 'rhev_vm',
-  insert_after: "erb[loud]:contains(':keyboard_layout')",
-  partial: 'foreman_theme_satellite/rhev/form')

data/app/views/foreman_theme_satellite/rhev/_form.erb

@@ -1,8 +0,0 @@
-<div class="clearfix">
-  <div class="form-group ">
-    <label class="col-md-2 control-label">&nbsp;</label>
-    <div class="col-md-8">
-      <%= rhev_deprecation_alert %>
-    </div>
-  </div>
-</div>

data/app/views/foreman_theme_satellite/rhev/_show.html.erb

@@ -1,6 +0,0 @@
-<tr>
-  <td>&nbsp;</td>
-  <td colspan="2">
-    <%= rhev_deprecation_alert %>
-  </td>
-</tr>