katello 4.14.0.rc3 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59babbb3cb7836e9eb0567c1dea29d720eaa3b96968f4d078eeaf98d4e3177a1
-  data.tar.gz: d57019bdcc781e11d389669b393f5ea8a8b144f09a6f87dbddac773a346b3257
+  metadata.gz: 21ce45d5f478e1cbfce9d978a25ac49d78cb24ae72b60df06d0d040f0a9ad22f
+  data.tar.gz: c7051ac4f64ee8815b4df564973146d24254a4af0dbadfc719228ddb1343543b
 SHA512:
-  metadata.gz: 0f668a837bd14561a7da7712b31b9f59df257276ea8b96224e9ca4bbd655cd799ae47474d98f7cb60a716765c41db9837730ead8499671799316bf24c2baf3ad
-  data.tar.gz: 726e63b52258f087bcbf640d8a01c398e23a683fec281aeddfc3b2ac97383eff599d593f78ac638c3d4443e60b55f45de132966cab505ad0de3f07cdb87521f9
+  metadata.gz: bca7d73c35c724f8f8b19d1b2311f05ea0eb2b1f56ea9c74f9ba61743d85665deca7887ba8f1d218ceb92f08e732a37fb457c9eb16ef5aac2c21e5ed9e1c9fb6
+  data.tar.gz: 9f0018048dd7dd5639ce6665e2aff7dfa040407067efc6c484a4eac6e1c960e21902892cdd446d008eab0afccf06bdd50c9d96d0e4367c0a96b5372da6540981

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

@@ -332,9 +332,9 @@ module Katello
         end
       elsif params.key?(:organization_id) && !params.key?(:environment_id) && !params.key?(:environments)
         organization = Organization.current
-        environments = organization.library.content_view_environment
+        environments = [organization.library.content_view_environment]
       elsif User.current.default_organization.present?
-        environments = User.current.default_organization.library.content_view_environment
+        environments = [User.current.default_organization.library.content_view_environment]
       else
         fail HttpErrors::NotFound, _("User '%s' did not specify an organization ID and does not have a default organization.") % current_user.login
       end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -2,6 +2,7 @@ module Actions
   module Katello
     module CapsuleContent
       class Sync < ::Actions::EntryAction
+        middleware.do_not_use Dynflow::Middleware::Common::Transaction
         include ::Actions::ObservableAction
         def resource_locks
           :link

data/app/lib/actions/katello/repository/create_root.rb

@@ -3,11 +3,18 @@ module Actions
     module Repository
       class CreateRoot < Actions::EntryAction
         def plan(root, relative_path = nil)
-          root.save!
+          begin
+            root.save!
+          rescue ActiveRecord::RecordInvalid
+            if root.is_container_push
+              logger.warn("Skipping repository creation as container push repository already exists: #{root.container_push_name}")
+              return
+            end
+          end
           repository = ::Katello::Repository.new(:environment => root.organization.library,
                                       :content_view_version => root.organization.library.default_content_view_version,
                                       :root => root)
-          repository.container_repository_name = relative_path
+          repository.container_repository_name = relative_path if root.docker? && root.is_container_push
           repository.relative_path = relative_path || repository.custom_repo_path
           repository.save!
 

data/app/models/katello/glue/pulp/repos.rb

@@ -137,10 +137,10 @@ module Katello
 
         # Container push may concurrently call root add several times before the db can update.
         if repo_param[:is_container_push]
-          RootRepository.create_or_find_by!(repo_param)
-        else
-          RootRepository.new(repo_param)
+          root = RootRepository.find_by(repo_param)
+          return root if root
         end
+        RootRepository.new(repo_param)
       end
     end
   end

data/app/models/katello/host/info_provider.rb

@@ -35,8 +35,11 @@ module Katello
       end
 
       def content_view_info(content_view_environment)
+        return {} if content_view_environment.blank?
+
         content_view = content_view_environment.content_view
         return {} if content_view.blank?
+
         {
           'label' => content_view.try(:label),
           'latest-version' => content_view.try(:latest_version),

data/app/models/katello/repository.rb

@@ -272,8 +272,10 @@ module Katello
       self.content_view_version.content_view
     end
 
+    # Skip setting container name if the repository is not container type or
+    # if it's a library instance of a container-push repo, indicating that the container name is set by the user.
     def skip_container_name?
-      self.library_instance? && self.root.docker? && self.root.is_container_push
+      !self.root.docker? || (self.root.is_container_push && self.library_instance?)
     end
 
     def library_instance?

data/db/migrate/20240729192228_add_convert2rhel_to_host_facets.rb

@@ -4,6 +4,6 @@ class AddConvert2rhelToHostFacets < ActiveRecord::Migration[6.1]
   end
 
   def down
-    remove_column :subscription_facets, :convert2rhel_through_foreman
+    remove_column :katello_subscription_facets, :convert2rhel_through_foreman
   end
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/new/views/new-content-credential.html

@@ -9,7 +9,7 @@
           ng-upload="uploadContent(content)"
           upload-options-enable-rails-csrf>
 
-      <div bst-form-group label="{{ 'Name' | translate }}">
+      <div bst-form-group label="{{ 'Name *' | translate }}">
         <input id="name"
                name="name"
                ng-model="contentCredential.name"
@@ -28,7 +28,7 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'Content Credential Contents' | translate }}">
+      <div bst-form-group label="{{ 'Content Credential Contents *' | translate }}">
         <textarea name="content"
                   ng-model="contentCredential.pastedContent"
                   tabindex="1"
@@ -36,7 +36,7 @@
                   style="font-family: monospace"
                   rows="15"
                   placeholder="{{ 'Paste contents of Content Credential' | translate }}"
-                  required>
+                  >
         </textarea>
       </div>
 

data/lib/katello/permission_creator.rb

@@ -51,6 +51,11 @@ module Katello
     end
 
     def capsule_content_permissions
+      @plugin.permission :view_smart_proxies,
+                         {
+                           'katello/api/v2/capsules' => [:index, :show]
+                         },
+                         :resource_type => "SmartProxy"
       @plugin.permission :manage_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
@@ -62,7 +67,7 @@ module Katello
       @plugin.permission :view_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:counts, :lifecycle_environments, :available_lifecycle_environments, :sync_status],
-                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content],
+                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content, :index],
                            'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => "SmartProxy"

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.14.0.rc3".freeze
+  VERSION = "4.14.0".freeze
 end

data/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/02_BulkErrataTable.js

@@ -148,8 +148,6 @@ const BulkErrataTable = () => {
         showCheckboxes
         apiUrl={ERRATA_URL}
         apiOptions={apiOptions}
-        headerText={__('Errata')}
-        header={null}
         controller="errata"
         customSearchProps={customSearchProps}
         creatable={false}

data/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/02_BulkPackagesTable.js

@@ -133,8 +133,6 @@ const BulkPackagesTable = ({
         showCheckboxes
         apiUrl={PACKAGES_URL}
         apiOptions={apiOptions}
-        headerText={__('Packages')}
-        header={null}
         controller="packages"
         customSearchProps={customSearchProps}
         creatable={false}

data/webpack/components/extensions/Hosts/BulkActions/HostReview.js

@@ -122,8 +122,6 @@ const HostReview = ({
         showCheckboxes
         apiUrl={HOSTS_API_PATH}
         apiOptions={apiOptions}
-        headerText={__('Hosts')}
-        header={null}
         controller="hosts"
         creatable={false}
         replacementResponse={response}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.14.0.rc3
+  version: 4.14.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -5451,9 +5451,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key: