katello 4.6.0.rc1 → 4.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8eb04c88654bdacc69fa01282d4122141a68430d8259cc6f0ec46dcae06367
-  data.tar.gz: 96bc2cd4a26684dae6a71884a3fd745469b30118e723613f2640b8017a1c6b50
+  metadata.gz: c0ba7b81fa3fb7760c23bcc1894d99c7cf37683bcde4b134fc39ecefd51d53ec
+  data.tar.gz: d5f25c7952274b118b9202ff09e4d00df68882a8cf7ab00db0879aea756cd8e9
 SHA512:
-  metadata.gz: 99b345b1016334d1f7277f2eecb3f6ad8f21a90d45582a30367b49441891216b359fb118c61e2c59ec93fa4071b49e6a9c131175b7ba365613c2fb5acece0a4b
-  data.tar.gz: c9523e61da53201364bef634d3960bab1ff7120e648133b168da057bdd5d32c603c44f38e7395097fd2e3960f2451407a7f9444eb4a1382a28ab139452dc0033
+  metadata.gz: 71c53ca934d2b5d33fee3fd0576d7b1296817289e2adab027fbbaf77f6aaf00f6e5c62335661563e820f864f9e14d445bbc05422d2ce331eef9e00066ad8b814
+  data.tar.gz: 68ef597c48b0612ac77e5e05eb1fa3af007563701a3d60aaa71e195e944785d9743f5d1ec2c21b0491b55b0f3d6871acbbe8b8d3926ea2e6867288a4afdae76c

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -313,6 +313,9 @@ module Katello
 
       if params.key?(:environment_id)
         environment = get_content_view_environment("cp_id", params[:environment_id])
+      elsif params.key?(:environments)
+        fail HttpErrors::BadRequest, _('Multiple environments are not supported.') if params['environments'].length > 1
+        environment = get_content_view_environment("cp_id", params['environments'].first['id'])
       elsif params.key?(:organization_id) && !params.key?(:environment_id)
         organization = Organization.current
         environment = organization.library.content_view_environment

data/app/controllers/katello/api/v2/content_views_controller.rb

@@ -66,7 +66,7 @@ module Katello
 
     def index_relation
       content_views = ContentView.readable
-      content_views = content_views.not_generated_for_repository unless Foreman::Cast.to_bool(params[:include_generated])
+      content_views = content_views.ignore_generated unless Foreman::Cast.to_bool(params[:include_generated])
       content_views = content_views.where(:organization_id => @organization.id) if @organization
       content_views = content_views.in_environment(@environment) if @environment
       content_views = ::Foreman::Cast.to_bool(params[:nondefault]) ? content_views.non_default : content_views.default if params[:nondefault]

data/app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb

@@ -10,10 +10,10 @@ module Actions
                                  format: ::Katello::Pulp3::ContentViewVersion::Export::IMPORTABLE)
             action_subject(organization)
             validate_repositories_immediate!(organization) if fail_on_missing_content
-
             content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: destination_server,
                                                                            organization: organization,
-                                                                           create_by_default: true)
+                                                                           create_by_default: true,
+                                                                           format: format)
             repo_ids_in_library = organization.default_content_view_version.repositories.exportable.immediate_or_none.pluck(:id)
             content_view.update!(repository_ids: repo_ids_in_library)
 

data/app/lib/actions/pulp3/orchestration/content_view_version/export_repository.rb

@@ -12,7 +12,8 @@ module Actions
 
             content_view = ::Katello::Pulp3::ContentViewVersion::Export.find_repository_export_view(
                                                                            repository: repository,
-                                                                           create_by_default: true)
+                                                                           create_by_default: true,
+                                                                           format: format)
             content_view.update!(repository_ids: [repository.library_instance_or_self.id])
 
             sequence do

data/app/models/katello/content_view.rb

@@ -88,8 +88,12 @@ module Katello
     scope :non_composite, -> { where(:composite => [nil, false]) }
     scope :generated, -> { where.not(:generated_for => :none) }
     scope :generated_for_repository, -> { where(:generated_for => [:repository_export, :repository_import]) }
-    scope :not_generated_for_repository, -> { where.not(id: generated_for_repository) }
-
+    scope :ignore_generated, -> {
+      where.not(:generated_for => [:repository_export,
+                                   :repository_import,
+                                   :library_export_syncable,
+                                   :repository_export_syncable])
+    }
     scope :generated_for_library, -> { where(:generated_for => [:library_export, :library_import]) }
 
     scoped_search :on => :name, :complete_value => true
@@ -104,7 +108,9 @@ module Katello
       library_export: 1,
       repository_export: 2,
       library_import: 3,
-      repository_import: 4
+      repository_import: 4,
+      library_export_syncable: 5,
+      repository_export_syncable: 6
     }, _prefix: true
 
     set_crud_hooks :content_view

data/app/models/katello/repository.rb

@@ -31,7 +31,7 @@ module Katello
     ANSIBLE_COLLECTION_TYPE = 'ansible_collection'.freeze
     GENERIC_TYPE = 'generic'.freeze
 
-    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE].freeze
+    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE].freeze
 
     define_model_callbacks :sync, :only => :after
 
@@ -341,7 +341,7 @@ module Katello
 
     def published_in_versions
       Katello::ContentViewVersion.with_repositories(self.library_instances_inverse)
-                                 .where(content_view_id: Katello::ContentView.not_generated_for_repository).distinct
+                                 .where(content_view_id: Katello::ContentView.ignore_generated).distinct
     end
 
     def self.errata_with_package_counts(repo)
@@ -668,7 +668,7 @@ module Katello
 
     def self.smart_proxy_syncable
       joins(:content_view_version => :content_view).
-        merge(ContentView.not_generated_for_repository).
+        merge(ContentView.ignore_generated).
         where.not(environment_id: nil)
     end
 

data/app/models/katello/rpm.rb

@@ -17,6 +17,7 @@ module Katello
     scoped_search :on => :evr, :ext_method => :scoped_search_evr, :only_explicit => true
     scoped_search :on => :filename, :complete_value => true
     scoped_search :on => :sourcerpm, :complete_value => true
+    scoped_search :on => :nvra, :complete_value => true
     scoped_search :on => :modular, :complete_value => true, :only_explicit => true
     scoped_search :on => :checksum
 

data/app/services/katello/pulp3/api/generic.rb

@@ -15,10 +15,6 @@ module Katello
         def self.repository_sync_url_class(repository_type)
           repository_type.repo_sync_url_class
         end
-
-        def self.add_remove_content_class
-          fail NotImplementedError
-        end
       end
     end
   end

data/app/services/katello/pulp3/content_view_version/export.rb

@@ -191,21 +191,38 @@ module Katello
 
         def self.find_library_export_view(create_by_default: false,
                                           destination_server:,
-                                          organization:)
+                                          organization:,
+                                          format: IMPORTABLE)
+          if format == IMPORTABLE
+            generated_for = :library_export
+            name = ::Katello::ContentView::EXPORT_LIBRARY
+          else
+            generated_for = :library_export_syncable
+            name = "#{::Katello::ContentView::EXPORT_LIBRARY}-SYNCABLE"
+          end
+
           find_generated_export_view(create_by_default: create_by_default,
                                      destination_server: destination_server,
                                      organization: organization,
-                                     name: ::Katello::ContentView::EXPORT_LIBRARY,
-                                     generated_for: :library_export)
+                                     name: name,
+                                     generated_for: generated_for)
         end
 
         def self.find_repository_export_view(create_by_default: false,
-                                              repository:)
+                                              repository:,
+                                              format: IMPORTABLE)
+          if format == IMPORTABLE
+            generated_for = :repository_export
+            name = "Export-#{repository.label}-#{repository.library_instance_or_self.id}"
+          else
+            generated_for = :repository_export_syncable
+            name = "Export-SYNCABLE-#{repository.label}-#{repository.library_instance_or_self.id}"
+          end
           find_generated_export_view(create_by_default: create_by_default,
                                      destination_server: nil,
                                      organization: repository.organization,
-                                     name: "Export-#{repository.label}-#{repository.library_instance_or_self.id}",
-                                     generated_for: :repository_export)
+                                     name: name,
+                                     generated_for: generated_for)
         end
 
         def self.generate_product_repo_strings(repositories:)

data/app/services/katello/pulp3/repository.rb

@@ -299,7 +299,7 @@ module Katello
           tasks << api.repositories_api.modify(repository_reference.repository_href, remove_content_units: ['*'])
         end
 
-        if options[:mirror]
+        if options[:mirror] && api.class.respond_to?(:add_remove_content_class)
           data = api.class.add_remove_content_class.new(
                     base_version: source_repository.version_href)
 

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -32,7 +32,7 @@ child @lifecycle_environments => :lifecycle_environments do
     end
 
     node :content_views do |env|
-      env.content_views.not_generated_for_repository.map do |content_view|
+      env.content_views.ignore_generated.map do |content_view|
         attributes = {
           :id => content_view.id,
           :label => content_view.label,

data/app/views/katello/api/v2/organizations/show.json.rabl

@@ -29,7 +29,7 @@ node(:content_view_components_count) do
     in_organization(Organization.current)&.
     non_composite&.
     non_default&.
-    not_generated_for_repository&.count
+    ignore_generated&.count
 end
 
 node :library_id do |org|

data/lib/katello/tasks/refresh_repos.rake

@@ -0,0 +1,8 @@
+namespace :katello do
+  desc 'Refresh all repositories in all smart proxies and main server'
+  task :refresh_repos => ["environment", "dynflow:client"] do
+    User.current = User.anonymous_api_admin
+    ::ForemanTasks.async_task(::Actions::BulkAction, ::Actions::Pulp3::Orchestration::Repository::RefreshRepos, SmartProxy.all)
+    puts _("Repos are being refreshed in the background.")
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.6.0.rc1".freeze
+  VERSION = "4.6.0.rc2".freeze
 end

data/webpack/components/extensions/HostDetails/ActionsBar/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { DropdownItem } from '@patternfly/react-core';
-import { CubeIcon } from '@patternfly/react-icons';
+import { CubeIcon, UndoIcon } from '@patternfly/react-icons';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
@@ -13,6 +13,13 @@ const HostActionsBar = () => {
 
   return (
     <>
+      <DropdownItem
+        key="katello-legacy-contenthost-ui"
+        href={foremanUrl(`/content_hosts/${hostDetails?.id}`)}
+        icon={<UndoIcon />}
+      >
+        {__('Legacy content host UI')}
+      </DropdownItem>
       <DropdownItem
         key="katello-change-host-content-source"
         href={foremanUrl(`/change_host_content_source?host_id=${hostDetails?.id}`)}

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard.js

@@ -27,7 +27,7 @@ import { propsToCamelCase } from 'foremanReact/common/helpers';
 import './SystemPurposeCard.scss';
 import SystemPurposeEditModal from './SystemPurposeEditModal';
 import { selectHostDetailsStatus } from '../../HostDetailsSelectors';
-import { hasRequiredPermissions } from '../../hostDetailsHelpers';
+import { hasRequiredPermissions, hostIsNotRegistered } from '../../hostDetailsHelpers';
 
 const SystemPurposeCard = ({ hostDetails }) => {
   const showEditButton = hasRequiredPermissions(['edit_hosts'], hostDetails?.permissions);
@@ -57,6 +57,8 @@ const SystemPurposeCard = ({ hostDetails }) => {
     );
   }
 
+  if (hostIsNotRegistered({ hostDetails })) return null;
+
   return (
     <GridItem rowSpan={1} md={6} lg={4} xl2={3}>
       <Card isHoverable ouiaId="system-purpose-card">

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeCard.test.js

@@ -20,6 +20,7 @@ const baseHostDetails = {
     purpose_usage: 'Production',
     service_level: 'Premium',
     release_version: '8',
+    uuid: '12345',
   },
 };
 

data/webpack/components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard.js

@@ -12,6 +12,7 @@ import {
 } from '@patternfly/react-core';
 import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
 import { TranslatedPlural } from '../../../Table/components/TranslatedPlural';
+import { hostIsNotRegistered } from '../hostDetailsHelpers';
 
 const HostDisks = ({ totalDisks }) => {
   if (!totalDisks) return null;
@@ -32,6 +33,7 @@ HostDisks.defaultProps = {
 };
 
 const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
+  if (hostIsNotRegistered({ hostDetails })) return null;
   const { facts } = hostDetails || {};
   const model = facts?.['virt::host_type'];
   const cpuCount = facts?.['cpu::cpu(s)'];
@@ -46,6 +48,7 @@ const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
       header={__('HW properties')}
       expandable
       isExpandedGlobal={isExpandedGlobal}
+      masonryLayout
     >
       <DescriptionList isHorizontal>
         <DescriptionListGroup>

data/webpack/components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard.js

@@ -11,6 +11,7 @@ const InstalledProductsCard = ({ isExpandedGlobal, hostDetails }) => {
     <CardTemplate
       header={__('Installed products')}
       expandable
+      masonryLayout
       isExpandedGlobal={isExpandedGlobal}
     >
       <List isPlain>

data/webpack/components/extensions/HostDetails/DetailsTabCards/RegistrationCard.js

@@ -62,6 +62,7 @@ const RegistrationCard = ({ isExpandedGlobal, hostDetails }) => {
     <CardTemplate
       header={__('Registration details')}
       expandable
+      masonryLayout
       isExpandedGlobal={isExpandedGlobal}
     >
       <DescriptionList isHorizontal>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.6.0.rc1
+  version: 4.6.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,20 +268,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: pulpcore_client
   requirement: !ruby/object:Gem::Requirement
@@ -4455,6 +4441,7 @@ files:
 - lib/katello/tasks/pulp2to3_migrate_deb_attributes.rake
 - lib/katello/tasks/receptor/extract_orgs.rake
 - lib/katello/tasks/refresh_alternate_content_sources.rake
+- lib/katello/tasks/refresh_repos.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
 - lib/katello/tasks/repository.rake