katello 4.14.0 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ce45d5f478e1cbfce9d978a25ac49d78cb24ae72b60df06d0d040f0a9ad22f
-  data.tar.gz: c7051ac4f64ee8815b4df564973146d24254a4af0dbadfc719228ddb1343543b
+  metadata.gz: eb838f1316844984ac6a811415ee7ffd5b91c7e4b968b96de55b0bf3adf1f0b7
+  data.tar.gz: b8158bfab87d2e3cbe687af69e65962a8627bc78516f6f20b190864854eee4e3
 SHA512:
-  metadata.gz: bca7d73c35c724f8f8b19d1b2311f05ea0eb2b1f56ea9c74f9ba61743d85665deca7887ba8f1d218ceb92f08e732a37fb457c9eb16ef5aac2c21e5ed9e1c9fb6
-  data.tar.gz: 9f0018048dd7dd5639ce6665e2aff7dfa040407067efc6c484a4eac6e1c960e21902892cdd446d008eab0afccf06bdd50c9d96d0e4367c0a96b5372da6540981
+  metadata.gz: e2e57134ff21bfaffb6bd31b2954adad011b6cb63991e66a2ca54d08f596b63c061177049402aa9831e8407ef2d7006f0b2d536892757c69e5cc5f716cdff687
+  data.tar.gz: f2badc68f6c7b3638fb076e2cabeca5a60c073fffee6d6a7c6e2f886a906085adc5d54fc5babc44280f00a1a1e5e7a188b25b7de64a359ead41950b9ec289367

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -205,10 +205,22 @@ KT.content = (function () {
           $(this).collapse();
         });
     };
+    populate_repo_status = function () {
+      var ids = [];
+      $.each(KT.repo_status, function (repo_id, status) {
+        if (status.is_running) {
+          ids.push(repo_id);
+          KT.content.draw_syncing(repo_id, status.progress.progress, status.sync_id);
+        }
+      });
+      KT.content.reset_products(KT.repo_status);
+      KT.content_actions.addSyncing(ids);
+    }
 
   return {
     updateProduct: updateProduct,
     updateRepo: updateRepo,
+    populateRepoStatus: populate_repo_status,
     finishRepo: finishRepo,
     select_all: select_all,
     select_none: select_none,
@@ -346,15 +358,7 @@ KT.content_actions = (function () {
   };
 })();
 
-var ids = [];
-$.each(KT.repo_status, function (repo_id, status) {
-  if (status.is_running) {
-    ids.push(repo_id);
-    KT.content.draw_syncing(repo_id, status.progress.progress, status.sync_id);
-  }
-});
-KT.content.reset_products(KT.repo_status);
-KT.content_actions.addSyncing(ids);
+KT.content.populateRepoStatus();
 
 $("#select_all").click(KT.content.select_all);
 $("#select_none").click(KT.content.select_none);

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

@@ -50,6 +50,7 @@ module Katello
     param :id, :number, :desc => N_("organization ID"), :required => true
     def show
       @render_template = 'katello/api/v2/organizations/show'
+      @organization.manifest_expiration_date(cached: false) if params[:force_manifest_expire_cache]
       super
     end
 

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

@@ -5,11 +5,12 @@ module Actions
         def plan(root, relative_path = nil)
           begin
             root.save!
-          rescue ActiveRecord::RecordInvalid
-            if root.is_container_push
+          rescue ActiveRecord::RecordInvalid => e
+            if root.is_container_push && e.message.include?("Container Repository Name") && e.message.include?("conflicts with an existing repository")
               logger.warn("Skipping repository creation as container push repository already exists: #{root.container_push_name}")
               return
             end
+            raise e
           end
           repository = ::Katello::Repository.new(:environment => root.organization.library,
                                       :content_view_version => root.organization.library.default_content_view_version,

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -14,7 +14,11 @@ module Actions
           to_delete = content_view.repository_references.select do |repository_reference|
             repo = repository_reference.root_repository.library_instance
             if delete_href?(repository_reference.repository_href, content_view)
-              tasks << repo.backend_service(smart_proxy).delete_repository(repository_reference)
+              if repo.root.is_container_push?
+                tasks << repo.backend_service(smart_proxy).delete_distributions
+              else
+                tasks << repo.backend_service(smart_proxy).delete_repository(repository_reference)
+              end
               true
             else
               false
@@ -22,7 +26,7 @@ module Actions
           end
           to_delete.each(&:destroy)
 
-          output[:pulp_tasks] = tasks
+          output[:pulp_tasks] = tasks.compact
         end
 
         #migrated composites may have the same RepositoryReference as their component

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -511,17 +511,17 @@ module Katello
         actions = %w(install remove update).freeze
         case action
         when 'install'
-          yum_installable = ::Katello::Rpm.yum_installable_for_host(self).search_for(search).distinct.pluck(:name)
+          yum_installable = ::Katello::Rpm.search_for(search).distinct.pluck(:name)
           if yum_installable.empty?
-            fail N_("No available packages found for search term '%s'. Check the host's content view environments and already-installed packages.") % search
+            fail N_("No available packages found for search term '%s'.") % search
           end
           yum_installable
         when 'remove'
           return [] if search.empty?
 
-          yum_removable = installed_packages.search_for(search).distinct.pluck(:name)
+          yum_removable = ::Katello::InstalledPackage.search_for(search).distinct.pluck(:name)
           if yum_removable.empty?
-            fail N_("Cannot remove package(s): This host does not have any installed packages matching the search term '%s'.") % search
+            fail N_("Cannot remove package(s): No installed packages found for search term '%s'.") % search
           end
           yum_removable
         when 'update'
@@ -536,14 +536,15 @@ module Katello
           end
           pkg_name_archs = installed_packages.search_for(search).distinct.pluck(:name, :arch)
           if pkg_name_archs.empty?
-            fail _("Cannot upgrade packages: No installed packages found for search term '%s'") % search
+            fail _("Cannot upgrade packages: No installed packages found for search term '%s'.") % search
           end
-          upgrades = ::Katello::Rpm.installable_for_hosts([self]).select(:id, :name, :arch, :nvra, :evr).order(evr: :desc).group_by { |i| [i.name, i.arch] }
-          result = pkg_name_archs.map { |name, arch| versions_by_name_arch[[name, arch]] || upgrades[[name, arch]]&.first&.nvra }.compact
-          if result.empty?
-            fail _("No upgradable packages found for search term '%s'. The host may already have the latest version(s) installed.") % search
+          versionless_upgrades = ::Katello::Rpm.where(name: pkg_name_archs.map(&:first)).select(:id, :name, :arch, :evr).order(evr: :desc).group_by { |i| [i.name, i.arch] }
+          # Use versions_by_name_arch if a version is specified, otherwise use the latest version. If using the latest version, upgrade by name only, not by name and arch.
+          pkg_names_and_nvras = pkg_name_archs.map { |name, arch| versions_by_name_arch[[name, arch]] || versionless_upgrades[[name, arch]]&.first&.name }.compact
+          if pkg_names_and_nvras.empty?
+            fail _("No upgradable packages found for search term '%s'.") % search
           end
-          result
+          pkg_names_and_nvras
         else
           fail ::Foreman::Exception.new(N_("package_names_for_job_template: Action must be one of %s"), actions.join(', '))
         end
@@ -554,7 +555,7 @@ module Katello
         actions = %w(install remove update).freeze
         case action
         when 'install'
-          deb_installable = ::Katello::Deb.apt_installable_for_host(self).search_for(search).distinct.pluck(:name)
+          deb_installable = ::Katello::Deb.search_for(search).distinct.pluck(:name)
           if deb_installable.empty?
             fail _("No available debs found for search term '%s'. Check the host's content view environments and already-installed debs.") % search
           end
@@ -562,10 +563,10 @@ module Katello
         when 'remove'
           return [] if search.empty?
 
-          installed_debs.search_for(search).distinct.pluck(:name)
+          ::Katello::InstalledDeb.search_for(search).distinct.pluck(:name)
         when 'update'
           return [] if search.empty?
-          deb_results = installed_debs.search_for(search).distinct.pluck(:name)
+          deb_results = ::Katello::InstalledDeb.search_for(search).distinct.pluck(:name)
           if deb_results.empty?
             fail _("No installed debs found for search term '%s'") % search
           end
@@ -575,10 +576,11 @@ module Katello
         end
       end
 
-      def advisory_ids(search:)
-        ids = ::Katello::Erratum.installable_for_hosts([self]).search_for(search).pluck(:errata_id)
+      def advisory_ids(search:, check_installable_for_host: true)
+        errata_scope = check_installable_for_host ? ::Katello::Erratum.installable_for_hosts([self]) : ::Katello::Erratum
+        ids = errata_scope.search_for(search).pluck(:errata_id)
         if ids.empty?
-          fail _("Cannot install errata: No installable errata found for search term '%s'") % search
+          fail _("Cannot install errata: No errata found for search term '%s'") % search
         end
         ids
       end

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

@@ -158,7 +158,7 @@ module Katello
             { :id => cve.content_view.cp_environment_id(cve.lifecycle_environment) }
           end
         else
-          self.host.organization.default_content_view.cp_environment_id(self.host.organization.library)
+          [{ :id => self.host.organization.default_content_view.cp_environment_id(self.host.organization.library) }]
         end
       end
 

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -15,7 +15,7 @@ foreign_input_sets:
   exclude: action,package
 %>
 
-<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) -%>
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query"), check_installable_for_host: false) -%>
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 

data/app/views/foreman/job_templates/install_errata_by_search_query_-_katello_ansible_default.erb

@@ -12,7 +12,7 @@ template_inputs:
   required: false
 %>
 
-<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) -%>
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query"), check_installable_for_host: false) -%>
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -13,6 +13,7 @@ attributes :generated_for
 attributes :related_cv_count
 attributes :related_composite_cvs
 attributes :filtered? => :filtered
+attributes :needs_publish? => :needs_publish
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s

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

@@ -3,7 +3,6 @@ object @resource
 extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
-attributes :needs_publish? => :needs_publish
 
 node :errors do
   unless @resource.valid?

data/app/views/katello/sync_management/index.html.erb

@@ -8,9 +8,9 @@
       "complete": "<%= escape_javascript(_('Sync complete.')) %>",
       "no_start_time": "<%= escape_javascript(_('No start time currently available.')) %>"
     });
-
-      KT.repo_status = $.parseJSON('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
+      KT.repo_status = JSON.parse('<%= escape_javascript(@repo_status.to_json.html_safe) %>');
       KT.permissions = { "syncable" : <%= any_syncable? %> };
+      KT.content.populateRepoStatus();
   </script>
 <% end -%>
 

data/engines/bastion/app/assets/javascripts/bastion/i18n/i18n.module.js

@@ -5,6 +5,10 @@
  * @description
  *   Module for internationalization.
  */
+var loadAngularJSi18n = new Event('loadAngularJSi18n');
+
 angular.module('Bastion.i18n', [
     'gettext'
 ]);
+
+document.dispatchEvent(loadAngularJSi18n);

data/engines/bastion/vendor/assets/javascripts/bastion/angular-gettext/angular-gettext.js

@@ -1,3 +1,5 @@
+var loadAngularJSgettext = new Event('loadAngularJSgettext');
+
 angular.module('gettext', []);
 angular.module('gettext').constant('gettext', function (str) {
   /*
@@ -342,4 +344,6 @@ angular.module('gettext').factory('gettextPlurals', function () {
       return n != 1 ? 1 : 0;
     }
   };
-});
+});
+
+document.dispatchEvent(loadAngularJSgettext);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js

@@ -39,7 +39,6 @@ angular.module('Bastion.content-hosts').service('ContentHostsModalHelper', ['$ui
             $uibModal.open({
                 templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-errata-modal.html',
                 controller: 'ContentHostsBulkErrataModalController',
-                openedClass: 'bastion',
                 size: 'lg',
                 resolve: {
                     hostIds: this.resolveFunc()

data/lib/katello/version.rb

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

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -20,17 +20,17 @@ const recommendedRepositoriesRHEL = [
   'rhel-8-for-x86_64-appstream-kickstart',
   'rhel-8-for-x86_64-baseos-eus-rpms',
   'rhel-8-for-x86_64-appstream-eus-rpms',
-  'rhel-7-server-rpms',
-  'rhel-7-server-optional-rpms',
-  'rhel-7-server-extras-rpms',
-  'rhel-7-server-kickstart',
+  'rhel-7-server-els-rpms',
+  'rhel-7-server-els-optional-rpms',
 ];
 
 const recommendedRepositoriesSatTools = [
   'satellite-client-6-for-rhel-9-x86_64-rpms',
   'satellite-client-6-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-satellite-client-6-rpms',
-  'rhel-6-server-els-satellite-client-6-rpms',
+  'rhel-7-server-els-satellite-client-6-rpms',
+  'rhel-7-server-els-satellite-6-client-2-rpms',
+  'satellite-6-client-2-for-rhel-8-x86_64-rpms',
+  'satellite-6-client-2-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositoriesMisc = [

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -4,7 +4,7 @@ import { Grid, Col, Row, Tabs, Tab, FormControl, ControlLabel } from 'react-boot
 import { FormattedMessage } from 'react-intl';
 import { Button, Spinner } from 'patternfly-react';
 import { Alert } from '@patternfly/react-core';
-import { propsToCamelCase } from 'foremanReact/common/helpers';
+import { propsToCamelCase, getDocsURL } from 'foremanReact/common/helpers';
 import ForemanModal from 'foremanReact/components/ForemanModal';
 import Slot from 'foremanReact/components/common/Slot';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -12,6 +12,7 @@ import TooltipButton from '../../../components/TooltipButton';
 import { LoadingState } from '../../../components/LoadingState';
 import { Table } from '../../../components/pf3Table';
 
+
 import { columns } from './ManifestHistoryTableSchema';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
@@ -32,7 +33,7 @@ class ManageManifestModal extends Component {
     }
 
     if (prevProps.taskInProgress && !this.props.taskInProgress) {
-      this.props.loadOrganization();
+      this.props.loadOrganization({ force_manifest_expire_cache: true });
       this.props.loadManifestHistory();
     }
 
@@ -111,8 +112,9 @@ class ManageManifestModal extends Component {
       header: __('There is no manifest history to display.'),
       description: __('Import a manifest using the Manifest tab above.'),
       documentation: {
-        label: __('Learn more about adding subscription manifests '),
-        url: 'https://access.redhat.com/solutions/3410771',
+        label: __('Learn more about adding subscription manifests in '),
+        buttonLabel: __('the documentation.'),
+        url: getDocsURL('Managing_Content', 'Managing_Red_Hat_Subscriptions_content-management'),
       },
     });
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -204,7 +204,7 @@ class SubscriptionsPage extends Component {
         description: __('Add subscriptions using the Add Subscriptions button.'),
         action: {
           title: __('Add subscriptions'),
-          url: 'subscriptions/add',
+          url: '/subscriptions/add',
         },
       }
       : {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.14.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4387,103 +4387,55 @@ files:
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
-- locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
-- locale/bn_IN/LC_MESSAGES/katello.mo
 - locale/bn_IN/katello.po
-- locale/ca/LC_MESSAGES/katello.mo
 - locale/ca/katello.po
-- locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
-- locale/cs_CZ/LC_MESSAGES/katello.mo
 - locale/cs_CZ/katello.po
-- locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
-- locale/de_AT/LC_MESSAGES/katello.mo
 - locale/de_AT/katello.po
-- locale/de_DE/LC_MESSAGES/katello.mo
 - locale/de_DE/katello.po
-- locale/el/LC_MESSAGES/katello.mo
 - locale/el/katello.po
-- locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
-- locale/en_GB/LC_MESSAGES/katello.mo
 - locale/en_GB/katello.po
-- locale/en_US/LC_MESSAGES/katello.mo
 - locale/en_US/katello.po
-- locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
-- locale/et_EE/LC_MESSAGES/katello.mo
 - locale/et_EE/katello.po
-- locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
-- locale/gl/LC_MESSAGES/katello.mo
 - locale/gl/katello.po
-- locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
-- locale/he_IL/LC_MESSAGES/katello.mo
 - locale/he_IL/katello.po
-- locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
-- locale/id/LC_MESSAGES/katello.mo
 - locale/id/katello.po
-- locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
-- locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
-- locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
 - locale/katello.pot
-- locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
-- locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
-- locale/ml_IN/LC_MESSAGES/katello.mo
 - locale/ml_IN/katello.po
-- locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
-- locale/nl_NL/LC_MESSAGES/katello.mo
 - locale/nl_NL/katello.po
-- locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
-- locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
-- locale/pl/LC_MESSAGES/katello.mo
 - locale/pl/katello.po
-- locale/pl_PL/LC_MESSAGES/katello.mo
 - locale/pl_PL/katello.po
-- locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
-- locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
-- locale/ro/LC_MESSAGES/katello.mo
 - locale/ro/katello.po
-- locale/ro_RO/LC_MESSAGES/katello.mo
 - locale/ro_RO/katello.po
-- locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
-- locale/sl/LC_MESSAGES/katello.mo
 - locale/sl/katello.po
-- locale/sv_SE/LC_MESSAGES/katello.mo
 - locale/sv_SE/katello.po
-- locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
-- locale/ta_IN/LC_MESSAGES/katello.mo
 - locale/ta_IN/katello.po
-- locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
-- locale/tr/LC_MESSAGES/katello.mo
 - locale/tr/katello.po
 - locale/update-i18n
-- locale/vi/LC_MESSAGES/katello.mo
 - locale/vi/katello.po
-- locale/vi_VN/LC_MESSAGES/katello.mo
 - locale/vi_VN/katello.po
-- locale/zh/LC_MESSAGES/katello.mo
 - locale/zh/katello.po
-- locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
-- locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
 - package.json
 - vendor/assets/images/katello/add2.png