katello 4.14.0.rc2 → 4.14.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82407c5c5f59353d0e535980acdf1e885159503324fdfc3ddb14fee9dbe8369
-  data.tar.gz: cb93598ca6c89f41ffa97661955c5a16ab7457431ab8ed20fba22e39c4a5f5eb
+  metadata.gz: 59babbb3cb7836e9eb0567c1dea29d720eaa3b96968f4d078eeaf98d4e3177a1
+  data.tar.gz: d57019bdcc781e11d389669b393f5ea8a8b144f09a6f87dbddac773a346b3257
 SHA512:
-  metadata.gz: be8629757389e83723b4db3f6c816473df09f009e73ef34ce6c710e33468c62939710f3bf2392797f146ca45b0d26f2540c2e8696e688ddf8ba7f927d2d2efd2
-  data.tar.gz: f57e816ce94d26a0f98b3974d6c21936754805177b07f05f076adb953de0c9b21b3453834c9a2e8c1e8eb02539bd1102fc653bdfa8ecc2ab86819eef0ed4ab6c
+  metadata.gz: 0f668a837bd14561a7da7712b31b9f59df257276ea8b96224e9ca4bbd655cd799ae47474d98f7cb60a716765c41db9837730ead8499671799316bf24c2baf3ad
+  data.tar.gz: 726e63b52258f087bcbf640d8a01c398e23a683fec281aeddfc3b2ac97383eff599d593f78ac638c3d4443e60b55f45de132966cab505ad0de3f07cdb87521f9

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

@@ -65,7 +65,7 @@ KT.common = (function() {
             }
         },
         spinner_path : function() {
-          return "/assets/spinner.gif";
+          return document.querySelector('#sync_toggle_cont').dataset.spinnerAssetPath;
         },
         to_human_readable_bytes : function(bytes) {
             var sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'],

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

@@ -386,7 +386,7 @@ $("#sync_product_form")
   });
 
 $("#sync_toggle").change(function () {
-  var img = "<img  src='" + KT.common.spinner_path() + "'>";
+  var img = "<img src='" + KT.common.spinner_path() + "'>";
   $("#sync_toggle_cont").append(img);
   if ($(this).is(":checked")) {
     KT.content.showOnlySyncing();

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

@@ -100,8 +100,8 @@ module Katello
       else
         query = query.paginate(paginate_options)
       end
-      page = params[:page] || 1
-      per_page = params[:per_page] || Setting[:entries_per_page]
+      page = metadata_page # from Foreman Api::V2::BaseController
+      per_page = metadata_per_page
       query = (total.zero? || subtotal.zero?) ? blank_query : query
 
       if options[:csv]

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

@@ -1,6 +1,7 @@
 module Katello
   class Api::V2::HostPackagesController < Api::V2::ApiController
     include Katello::Concerns::FilteredAutoCompleteSearch
+    include Katello::Concerns::Api::V2::RepositoryContentController
 
     UPGRADABLE = "upgradable".freeze
     UP_TO_DATE = "up-to-date".freeze
@@ -8,7 +9,7 @@ module Katello
 
     before_action :require_packages_or_groups, :only => [:install, :remove]
     before_action :require_packages_only, :only => [:upgrade]
-    before_action :find_editable_host_with_facet, :except => :index
+    before_action :find_editable_host_with_facet, :except => [:index, :installed_packages]
     before_action :find_host, :only => :index
 
     resource_description do
@@ -21,6 +22,20 @@ module Katello
       param :groups, Array, :desc => N_("List of package group names (Deprecated)"), :required => false
     end
 
+    api :GET, "/host_packages/installed_packages", N_("Return a list of installed packages distinct by name")
+    param_group :search, ::Katello::Api::V2::ApiController
+    def installed_packages
+      _sort_by, _sort_order, options = sort_options
+      sort_by = 'name'
+      sort_order = 'asc'
+
+      options[:select] = "DISTINCT ON (#{::Katello::InstalledPackage.table_name}.name) #{::Katello::InstalledPackage.table_name}.id, #{::Katello::InstalledPackage.table_name}.name"
+      final_relation = ::Katello::InstalledPackage.all
+
+      result = scoped_search(final_relation, sort_by, sort_order, options)
+      respond_for_index(:collection => result, :template => "installed_packages")
+    end
+
     api :GET, "/hosts/:host_id/packages", N_("List packages installed on the host")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     param :include_latest_upgradable, :boolean, :desc => N_("Also include the latest upgradable package version for each host package")

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

@@ -6,7 +6,7 @@ module Katello
     param :ids, Array, :desc => N_("List of repository ids"), :required => true
     def destroy_repositories
       deletion_authorized_repositories = @repositories.deletable
-      unpromoted_repos = Setting.find_by(name: 'delete_repo_across_cv')&.value ? deletion_authorized_repositories : deletion_authorized_repositories.reject { |repo| repo.promoted? && repo.content_views.generated_for_none.exists? }
+      unpromoted_repos = Setting[:delete_repo_across_cv] ? deletion_authorized_repositories : deletion_authorized_repositories.reject { |repo| repo.promoted? && repo.content_views.generated_for_none.exists? }
       unpromoted_repos_non_last_affected_repo = unpromoted_repos.reject { |repo| repo.filters.any? { |filter| filter.repositories.size == 1 } }
       messages1 = format_bulk_action_messages(
           :success    => "",
@@ -36,7 +36,7 @@ module Katello
         task = async_task(::Actions::BulkAction,
                           ::Actions::Katello::Repository::Destroy,
                           unpromoted_repos_non_last_affected_repo,
-                          remove_from_content_view_versions: Setting.find_by(name: 'delete_repo_across_cv')&.value
+                          remove_from_content_view_versions: Setting[:delete_repo_across_cv]
         )
       else
         status = 400

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

@@ -498,7 +498,7 @@ module Katello
       end
 
       def package_names_for_job_template(action:, search:, versions: nil)
-        if self.operatingsystem.family == 'Debian'
+        if self&.operatingsystem&.family == 'Debian'
           deb_names_for_job_template(action: action, search: search)
         else
           yum_names_for_job_template(action: action, search: search, versions: versions)

data/app/views/katello/api/v2/host_packages/installed_packages.json.rabl

@@ -0,0 +1,6 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+child @collection[:results] => :results do |_results|
+  attributes :name, :id
+end

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

@@ -21,7 +21,7 @@
       </a>
     </div>
   <% end %>
-  <div id="sync_toggle_cont" class="fl table-action">
+  <div id="sync_toggle_cont" class="fl table-action" data-spinner-asset-path="<%= asset_path('spinner.gif') %>">
     <input id="sync_toggle" type="checkbox"/>
     <label for="sync_toggle">
       <%= _('Active only') %>

data/config/routes/overrides.rb

@@ -80,6 +80,7 @@ Foreman::Application.routes.draw do
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/bulk/change_content_source' => 'hosts_bulk_actions#change_content_source', :via => :put
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
+            match '/host_packages/installed_packages' => 'host_packages#installed_packages', :via => :get
           end
 
           resources :packages, :only => [:index], :controller => :host_packages do

data/lib/katello/permission_creator.rb

@@ -279,7 +279,8 @@ module Katello
                                                         :repo_errata,
                                                         :repo_compare_errata,
                                                         :repo_compare_packages],
-                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search]
+                           'katello/api/v2/repository_sets' => [:index, :show, :available_repositories, :auto_complete_search],
+                           'katello/api/v2/host_packages' => [:installed_packages]
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :readable

data/lib/katello/version.rb

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

data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js

@@ -73,6 +73,14 @@ const katelloPackageRemoveParams = ({ hostname, packageName }) =>
     feature: REX_FEATURES.KATELLO_PACKAGE_REMOVE,
   });
 
+const katelloPackagesRemoveParams = ({ hostname, search, descriptionFormat }) =>
+  baseParams({
+    hostname,
+    inputs: { [PACKAGES_SEARCH_QUERY]: search },
+    feature: REX_FEATURES.KATELLO_PACKAGES_REMOVE_BY_SEARCH,
+    descriptionFormat,
+  });
+
 const katelloPackageRemoveBySearchParams = ({
   hostname, hostSearch, search, descriptionFormat,
 }) =>
@@ -209,6 +217,16 @@ export const removePackage = ({ hostname, packageName }) => post({
   errorToast,
 });
 
+// Used by packages wizard
+export const removePackages = ({ hostname, search, descriptionFormat }) => post({
+  type: API_OPERATIONS.POST,
+  key: REX_JOB_INVOCATIONS_KEY,
+  url: foremanApi.getApiUrl('/job_invocations'),
+  params: katelloPackagesRemoveParams({ hostname, search, descriptionFormat }),
+  handleSuccess: showRexToast,
+  errorToast,
+});
+
 export const removePackagesBySearch = ({
   hostname, hostSearch, search, descriptionFormat,
 }) => post({

data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js

@@ -188,9 +188,13 @@ const RepositorySetsTab = () => {
     lifecycleEnvironmentLibrary,
     contentView,
     lifecycleEnvironment,
+    contentViewEnvironments = [],
   } = contentFacet;
   const { name: contentViewName } = contentView ?? {};
   const { name: lifecycleEnvironmentName } = lifecycleEnvironment ?? {};
+  const multiEnvHost = contentViewEnvironments.length > 1;
+  const contentViewEnvironmentNames =
+    contentViewEnvironments.map(({ candlepin_name: candlepinName }) => candlepinName).join(', ');
   const nonLibraryHost = contentViewDefault === false ||
     lifecycleEnvironmentLibrary === false;
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
@@ -497,7 +501,8 @@ const RepositorySetsTab = () => {
     </Split>
   ) : null;
 
-  const hostEnvText = 'the "{contentViewName}" content view and "{lifecycleEnvironmentName}" environment';
+  const hostEnvText = multiEnvHost ? 'the host\'s content view environments: {contentViewEnvironmentNames}'
+    : 'the "{contentViewName}" content view and "{lifecycleEnvironmentName}" lifecycle environment';
 
   const alertText = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
     `Showing only repositories in ${hostEnvText}.` :
@@ -531,6 +536,7 @@ const RepositorySetsTab = () => {
                   values={{
                     contentViewName,
                     lifecycleEnvironmentName,
+                    contentViewEnvironmentNames,
                   }}
                 />
               }

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -255,6 +255,94 @@ test('Can upgrade a package via customized remote execution', async (done) => {
   assertNockRequest(statusScope, done);
 });
 
+test('Can remove a package via remote execution', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(hostPackages)
+    .query(defaultQuery)
+    .reply(200, { ...mockPackagesData, results: [firstPackage] });
+
+  const removeScope = nockInstance
+    .post(jobInvocations, {
+      job_invocation: {
+        inputs: {
+          package: firstPackage.name,
+        },
+        search_query: `name ^ (${hostname})`,
+        feature: REX_FEATURES.KATELLO_PACKAGE_REMOVE,
+      },
+    })
+    .reply(201);
+
+  const {
+    getByText,
+    getAllByText,
+    getByLabelText,
+  } = renderWithRedux(<PackagesTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackage.name)[0]).toBeInTheDocument());
+
+  const kebabDropdown = getByLabelText('Actions');
+  kebabDropdown.click();
+
+  const rexAction = getByText('Remove');
+  await patientlyWaitFor(() => expect(rexAction).toBeInTheDocument());
+  fireEvent.click(rexAction);
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(removeScope, done);
+});
+
+test('Can bulk remove a package via remote execution', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(hostPackages)
+    .query(defaultQuery)
+    .reply(200, mockPackagesData);
+
+  const removeScope = nockInstance
+    .post(jobInvocations, {
+      job_invocation: {
+        inputs: {
+          [PACKAGES_SEARCH_QUERY]: `id ^ (${firstPackage.id},${secondPackage.id})`,
+        },
+        search_query: `name ^ (${hostname})`,
+        feature: REX_FEATURES.KATELLO_PACKAGES_REMOVE_BY_SEARCH,
+        description_format: 'Remove package(s) chrony, coreutils',
+      },
+    })
+    .reply(201);
+
+  const {
+    getByText,
+    getAllByText,
+    getByRole,
+    getByLabelText,
+  } = renderWithRedux(<PackagesTab />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackage.name)[0]).toBeInTheDocument());
+
+  getByRole('checkbox', { name: 'Select row 0' }).click();
+  expect(getByLabelText('Select row 0').checked).toEqual(true);
+  getByRole('checkbox', { name: 'Select row 1' }).click();
+  expect(getByLabelText('Select row 1').checked).toEqual(true);
+
+  const kebabDropdown = getByRole('button', { name: 'bulk_actions' });
+  await patientlyWaitFor(() => expect(kebabDropdown).toBeInTheDocument());
+  fireEvent.click(kebabDropdown);
+
+  const rexAction = getByText('Remove');
+  await patientlyWaitFor(() => expect(rexAction).toBeInTheDocument());
+  fireEvent.click(rexAction);
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(removeScope, done);
+});
+
 test('Can bulk upgrade via remote execution', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
 

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

@@ -93,7 +93,7 @@ const BulkPackagesTable = ({
     name: {
       title: __('Package'),
       wrapper: ({ name, id }) => (
-        <a target="_blank" href={`/packages/${id}`} rel="noreferrer">{name}</a>
+        <a target="_blank" href={tableType === 'remove' ? `/packages?search=${name}` : `/packages/${id}`} rel="noreferrer">{name}</a>
       ),
       isSorted: true,
       weight: 50,

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

@@ -12,7 +12,7 @@ import HostReview from '../HostReview';
 import { BulkPackagesReview, dropdownOptions } from './04_Review';
 import { BulkPackagesUpgradeTable, BulkPackagesInstallTable, BulkPackagesRemoveTable } from './02_BulkPackagesTable';
 import { BulkPackagesReviewFooter } from './04_ReviewFooter';
-import katelloApi from '../../../../../services/api';
+import katelloApi, { foremanApi } from '../../../../../services/api';
 
 export const UPGRADE_ALL = 'upgradeAll';
 export const UPGRADE = 'upgrade';
@@ -53,8 +53,13 @@ export const useHostsBulkSelect = ({ initialSelectedHosts, modalIsOpen }) => {
   };
 };
 
-export const getPackagesUrl = selectedAction =>
-  `${katelloApi.getApiUrl('/packages/thindex')}?per_page=7&include_permissions=true&packages_restrict_upgradable=${selectedAction === 'upgrade'}`;
+export const getPackagesUrl = (selectedAction) => {
+  if (selectedAction === REMOVE) {
+    return `${foremanApi.getApiUrl('/hosts/host_packages/installed_packages')}?per_page=7&include_permissions=true`;
+  }
+
+  return `${katelloApi.getApiUrl('/packages/thindex')}?per_page=7&include_permissions=true&packages_restrict_upgradable=${selectedAction === 'upgrade'}`;
+};
 
 const BulkPackagesWizard = () => {
   const { modalOpen, setModalClosed: closeModal } = useForemanModal({ id: 'bulk-packages-wizard' });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.14.0.rc2
+  version: 4.14.0.rc3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,28 +86,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 9.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: 9.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 13.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 14.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 13.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -1567,6 +1579,7 @@ files:
 - app/views/katello/api/v2/host_module_streams/index.json.rabl
 - app/views/katello/api/v2/host_packages/base.json.rabl
 - app/views/katello/api/v2/host_packages/index.json.rabl
+- app/views/katello/api/v2/host_packages/installed_packages.json.rabl
 - app/views/katello/api/v2/host_subscriptions/available_release_versions.json.rabl
 - app/views/katello/api/v2/host_subscriptions/events.json.rabl
 - app/views/katello/api/v2/host_subscriptions/index.json.rabl
@@ -4374,55 +4387,103 @@ 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