foreman_leapp 4.1.2 → 4.3.0

data/app/controllers/api/v2/preupgrade_report_entries_controller.rb

@@ -5,6 +5,7 @@ module Api
     class PreupgradeReportEntriesController < ::Api::V2::BaseController
       include ApiAuthorizer
       include Foreman::Controller::AutoCompleteSearch
+      include ForemanLeapp::PreupgradeReportEntryBulkRemediate
 
       skip_before_action :store_redirect_to_url, :reset_redirect_to_url, raise: false
       before_action :find_preupgrade_report, if: -> { params[:preupgrade_report_id].present? }
@@ -25,29 +26,23 @@ module Api
         N_('Search autocomplete for preupgrade report entries')
       param :search, String, required: false, desc: N_('Search string')
       param :preupgrade_report_id, :identifier, required: false, desc: N_('ID of the preupgrade report')
+      param :job_invocation_id, :identifier, required: false, desc: N_('ID of the job invocation')
 
+      api :POST, '/preupgrade_report_entries/bulk_remediate',
+        N_('Trigger a remediation job for selected preupgrade report entries')
       api :POST, '/preupgrade_reports/:preupgrade_report_id/preupgrade_report_entries/bulk_remediate',
         N_('Trigger a remediation job for selected preupgrade report entries')
+      param :ids, Array, of: :number, required: false,
+        desc: N_('IDs of fixable preupgrade report entries to remediate')
       param :search, String, required: false, desc: N_('Search string')
       param :excluded_ids, Array, required: false, desc: N_('Array of excluded entry IDs')
       def bulk_remediate
-        entries = filtered_remediation_entries
-        remediation_ids = entries.pluck(:id)
-
-        if remediation_ids.empty?
-          return render json: { error: _('No fixable entries found matching the selection.') },
-            status: :unprocessable_entity
-        end
+        job_id = perform_bulk_remediate
+        return if performed?
 
-        composer = JobInvocationComposer.for_feature(
-          'leapp_remediation_plan',
-          target_host_ids(entries),
-          { 'remediation_ids' => remediation_ids.join(',') }
-        )
-        composer.trigger!
-        job_invocation = composer.job_invocation
-
-        render json: { id: job_invocation.id }
+        render json: { id: job_id }
+      rescue Foreman::Exception => e
+        render_exception(e, status: :unprocessable_entity)
       rescue StandardError => e
         Foreman::Logging.exception('Failed to trigger bulk remediation job', e)
         render json: { error: _('An unexpected error occurred while creating the remediation job.') },
@@ -63,6 +58,12 @@ module Api
       def resource_scope(_options = {})
         scope = if @preupgrade_report
                   @preupgrade_report.preupgrade_report_entries
+                elsif params[:job_invocation_id].present?
+                  PreupgradeReportEntry.where(
+                    preupgrade_report_id: PreupgradeReport.where(
+                      job_invocation_id: params[:job_invocation_id]
+                    ).select(:id)
+                  )
                 else
                   PreupgradeReportEntry
                 end
@@ -82,19 +83,6 @@ module Api
 
       private
 
-      def filtered_remediation_entries
-        combined_search = [params[:search].presence, 'fix_type = command'].compact.join(' AND ')
-        entries = resource_scope.search_for(combined_search)
-        entries = entries.where.not(id: params[:excluded_ids]) if params[:excluded_ids].present?
-        entries
-      end
-
-      def target_host_ids(entries)
-        host_ids = entries.pluck(:host_id).uniq.compact
-        host_ids = [@preupgrade_report.host_id].compact if host_ids.empty? && @preupgrade_report
-        host_ids
-      end
-
       def find_preupgrade_report
         @preupgrade_report = PreupgradeReport
                              .joins(:host)

data/app/controllers/concerns/foreman_leapp/preupgrade_report_entry_bulk_remediate.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module ForemanLeapp
+  module PreupgradeReportEntryBulkRemediate
+    extend ActiveSupport::Concern
+
+    def perform_bulk_remediate
+      entries = filtered_remediation_entries
+      remediation_ids = entries.pluck(:id)
+
+      if remediation_ids.empty?
+        render json: { error: _('No fixable entries found matching the selection.') },
+          status: :unprocessable_entity
+        return
+      end
+
+      composer = JobInvocationComposer.for_feature(
+        'leapp_remediation_plan',
+        target_host_ids(entries),
+        { 'remediation_ids' => remediation_ids.join(',') }
+      )
+      composer.trigger!
+      composer.job_invocation.id
+    end
+
+    private
+
+    def filtered_remediation_entries
+      fixable_remediation_scope(scope_for_bulk_selection)
+    end
+
+    def scope_for_bulk_selection
+      return resource_scope.where(id: params[:ids]) if params[:ids].present?
+
+      unless scoped_to_report_or_job?
+        raise Foreman::Exception,
+          N_('Either ids, preupgrade_report_id or job_invocation_id must be provided')
+      end
+
+      apply_excluded_ids(search_fixable_entries)
+    end
+
+    def scoped_to_report_or_job?
+      @preupgrade_report.present? || params[:job_invocation_id].present?
+    end
+
+    def search_fixable_entries
+      combined_search = [params[:search].presence, 'fix_type = command'].compact.join(' AND ')
+      resource_scope.search_for(combined_search)
+    end
+
+    def apply_excluded_ids(entries)
+      return entries.where.not(id: params[:excluded_ids]) if params[:excluded_ids].present?
+
+      entries
+    end
+
+    def fixable_remediation_scope(scope)
+      scope.search_for('fix_type = command')
+    end
+
+    def target_host_ids(entries)
+      host_ids = entries.pluck(:host_id).uniq.compact
+      return [@preupgrade_report.host_id].compact if host_ids.empty? && @preupgrade_report
+
+      host_ids
+    end
+  end
+end

data/app/lib/actions/foreman_leapp/preupgrade_job.rb

@@ -8,8 +8,7 @@ module Actions
       end
 
       def plan(job_invocation, host, *_args)
-        return unless ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
-                      ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
+        return unless ::Helpers::JobHelper.with_leapp_report(job_invocation)
 
         plan_self(host_id: host.id, job_invocation_id: job_invocation.id)
       end

data/app/lib/helpers/job_helper.rb

@@ -2,7 +2,15 @@
 
 module Helpers
   module JobHelper
+    PREUPGRADE_REPORT_FEATURES = %w[leapp_preupgrade leapp_remediation_plan].freeze
+
     class << self
+      def with_leapp_report(job_invocation)
+        PREUPGRADE_REPORT_FEATURES.any? do |feature|
+          correct_feature?(job_invocation, feature)
+        end
+      end
+
       # Returns true if the given feature is present in the job_invocation's job_features,
       # or if a matching RemoteExecutionFeature exists for the job_template.
       def correct_feature?(job_invocation, feature)

data/app/views/api/v2/job_invocations/leapp_preupgrade_report.json.rabl

@@ -0,0 +1,3 @@
+node(:has_leapp_report) do |invocation|
+  ::Helpers::JobHelper.with_leapp_report(invocation)
+end

data/config/routes.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources :preupgrade_reports, only: %i[index]
-
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v2/,
       constraints: ApiConstraints.new(version: 2, default: true) do
       resources :preupgrade_report_entries, only: %i[index] do
         collection do
           get :auto_complete_search
+          post :bulk_remediate
         end
       end
 

data/lib/foreman_leapp/engine.rb

@@ -23,20 +23,11 @@ module ForemanLeapp
           apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]
           extend_template_helpers ForemanLeapp::TemplateHelper
 
-          extend_page 'job_invocations/show' do |cx|
-            cx.add_pagelet :main_tabs,
-                          partial: 'job_invocations/leapp_preupgrade_report',
-                          name: _('Leapp preupgrade report'),
-                          id: 'leapp_preupgrade_report',
-                          onlyif: proc { |subject|
-                            ::Helpers::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
-                              ::Helpers::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
-                          }
-          end
+          extend_rabl_template 'api/v2/job_invocations/main',
+                               'api/v2/job_invocations/leapp_preupgrade_report'
 
           security_block :foreman_leapp do
-            permission :view_job_invocations, { :preupgrade_reports => %i[index show job_invocation],
-                                                'api/v2/preupgrade_reports' => %i[index show job_invocation] },
+            permission :view_job_invocations, { 'api/v2/preupgrade_reports' => %i[index show job_invocation] },
                                               :resource_type => 'JobInvocation'
           end
 

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '4.1.2'
+  VERSION = '4.3.0'
 end

data/locale/de/foreman_leapp.po

@@ -8,14 +8,14 @@
 # Ettore Atalan <atalanttore@googlemail.com>, 2022
 # Wiederoder <stefanwiederoder@googlemail.com>, 2022
 # Lukas Kallies <github.com@luke-web.de>, 2022
-# Bryan Kearney <bryan.kearney@gmail.com>, 2023
+# Bryan Kearney <bryan.kearney@gmail.com>, 2026
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_leapp 3.2.0\n"
+"Project-Id-Version: foreman_leapp 4.1.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-10-12 12:00+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2023\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2026\n"
 "Language-Team: German (https://app.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,6 +29,12 @@ msgstr ""
 msgid "All"
 msgstr "Alle"
 
+msgid "An unexpected error occurred while creating the remediation job."
+msgstr ""
+
+msgid "Array of excluded entry IDs"
+msgstr ""
+
 msgid "Command"
 msgstr "Befehl"
 
@@ -62,6 +68,9 @@ msgstr "Hinweis"
 msgid "Host"
 msgstr "Host"
 
+msgid "ID of the preupgrade report"
+msgstr ""
+
 msgid "Info"
 msgstr "Info"
 
@@ -83,6 +92,12 @@ msgstr ""
 msgid "List Preupgrade reports for Job invocation"
 msgstr ""
 
+msgid "List all preupgrade report entries"
+msgstr ""
+
+msgid "List entries for a specific preupgrade report"
+msgstr ""
+
 msgid "Low"
 msgstr "Niedrig"
 
@@ -104,10 +119,13 @@ msgstr "Nein"
 msgid "No Preupgrade Report Available"
 msgstr ""
 
-msgid "Preupgrade check with Leapp"
+msgid "No fixable entries found matching the selection."
 msgstr ""
 
-msgid "Preupgrade job"
+msgid "No results found for your search."
+msgstr ""
+
+msgid "Preupgrade check with Leapp"
 msgstr ""
 
 msgid "Remediation plan"
@@ -125,6 +143,12 @@ msgstr "Sanierungsplan mit Leapp ausführen"
 msgid "Run Upgrade"
 msgstr "Aktualisierung ausführen"
 
+msgid "Search autocomplete for preupgrade report entries"
+msgstr ""
+
+msgid "Search string"
+msgstr "Suchbegriff"
+
 msgid "Show Preupgrade report"
 msgstr ""
 
@@ -149,6 +173,15 @@ msgstr ""
 msgid "Title"
 msgstr "Titel"
 
+msgid "Trigger a remediation job for selected preupgrade report entries"
+msgstr ""
+
+msgid "Unknown fix_type value '%s' for search_fix_type"
+msgstr ""
+
+msgid "Unknown search key '%s' for search_yes_no_fields"
+msgstr ""
+
 msgid "Upgrade with Leapp"
 msgstr "Aktualisiere mit Leapp"
 

data/locale/en/foreman_leapp.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_leapp 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2026-03-09 16:32+0100\n"
+"PO-Revision-Date: 2026-09-29 11:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -23,6 +23,12 @@ msgstr ""
 msgid "All"
 msgstr ""
 
+msgid "An unexpected error occurred while creating the remediation job."
+msgstr ""
+
+msgid "Array of excluded entry IDs"
+msgstr ""
+
 msgid "Command"
 msgstr ""
 
@@ -56,6 +62,9 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
+msgid "ID of the preupgrade report"
+msgstr ""
+
 msgid "Info"
 msgstr ""
 
@@ -77,6 +86,12 @@ msgstr ""
 msgid "List Preupgrade reports for Job invocation"
 msgstr ""
 
+msgid "List all preupgrade report entries"
+msgstr ""
+
+msgid "List entries for a specific preupgrade report"
+msgstr ""
+
 msgid "Low"
 msgstr ""
 
@@ -98,10 +113,13 @@ msgstr ""
 msgid "No Preupgrade Report Available"
 msgstr ""
 
-msgid "Preupgrade check with Leapp"
+msgid "No fixable entries found matching the selection."
+msgstr ""
+
+msgid "No results found for your search."
 msgstr ""
 
-msgid "Preupgrade job"
+msgid "Preupgrade check with Leapp"
 msgstr ""
 
 msgid "Remediation plan"
@@ -119,6 +137,12 @@ msgstr ""
 msgid "Run Upgrade"
 msgstr ""
 
+msgid "Search autocomplete for preupgrade report entries"
+msgstr ""
+
+msgid "Search string"
+msgstr ""
+
 msgid "Show Preupgrade report"
 msgstr ""
 
@@ -143,6 +167,15 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
+msgid "Trigger a remediation job for selected preupgrade report entries"
+msgstr ""
+
+msgid "Unknown fix_type value '%s' for search_fix_type"
+msgstr ""
+
+msgid "Unknown search key '%s' for search_yes_no_fields"
+msgstr ""
+
 msgid "Upgrade with Leapp"
 msgstr ""
 

data/locale/foreman_leapp.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_leapp 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-09 16:32+0100\n"
-"PO-Revision-Date: 2026-03-09 16:32+0100\n"
+"POT-Creation-Date: 2026-09-29 11:07+0000\n"
+"PO-Revision-Date: 2026-09-29 11:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,6 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:13
+msgid "List entries for a specific preupgrade report"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:14
+msgid "List all preupgrade report entries"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:16
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:27
+msgid "ID of the preupgrade report"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:25
+msgid "Search autocomplete for preupgrade report entries"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:26
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:31
+msgid "Search string"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:30
+msgid "Trigger a remediation job for selected preupgrade report entries"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:32
+msgid "Array of excluded entry IDs"
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:38
+msgid "No fixable entries found matching the selection."
+msgstr ""
+
+#: ../app/controllers/api/v2/preupgrade_report_entries_controller.rb:53
+msgid "An unexpected error occurred while creating the remediation job."
+msgstr ""
+
 #: ../app/controllers/api/v2/preupgrade_reports_controller.rb:10
 msgid "List Preupgrade reports"
 msgstr ""
@@ -44,8 +82,16 @@ msgstr ""
 msgid "Upgrade with Leapp"
 msgstr ""
 
+#: ../app/models/preupgrade_report_entry.rb:62
+msgid "Unknown search key '%s' for search_yes_no_fields"
+msgstr ""
+
+#: ../app/models/preupgrade_report_entry.rb:75
+msgid "Unknown fix_type value '%s' for search_fix_type"
+msgstr ""
+
 #: ../lib/foreman_leapp/engine.rb:29
-#: ../webpack/components/PreupgradeReportsTable/index.js:159
+#: ../webpack/components/PreupgradeReportsTable/index.js:396
 msgid "Leapp preupgrade report"
 msgstr ""
 
@@ -65,7 +111,7 @@ msgstr ""
 msgid "Run Remediation plan with Leapp"
 msgstr ""
 
-#: ../webpack/components/PreupgradeReports/PreupgradeReports.js:122
+#: ../webpack/components/PreupgradeReports/PreupgradeReports.js:129
 msgid "Could not retrieve data: %(status)s - %(msg)s"
 msgstr ""
 
@@ -77,7 +123,7 @@ msgstr ""
 #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:38
 #: ../webpack/components/PreupgradeReportsList/components/helpers.js:81
 #: ../webpack/components/PreupgradeReportsTable/ReportDetails.js:33
-#: ../webpack/components/PreupgradeReportsTable/index.js:29
+#: ../webpack/components/PreupgradeReportsTable/index.js:135
 msgid "Title"
 msgstr ""
 
@@ -85,13 +131,13 @@ msgstr ""
 #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:13
 #: ../webpack/components/PreupgradeReportsList/components/helpers.js:95
 #: ../webpack/components/PreupgradeReportsTable/ReportDetails.js:40
-#: ../webpack/components/PreupgradeReportsTable/index.js:37
+#: ../webpack/components/PreupgradeReportsTable/index.js:146
 msgid "Risk Factor"
 msgstr ""
 
 #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:21
 #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:12
-#: ../webpack/components/PreupgradeReportsTable/index.js:32
+#: ../webpack/components/PreupgradeReportsTable/index.js:140
 msgid "Host"
 msgstr ""
 
@@ -144,18 +190,19 @@ msgid "Command"
 msgstr ""
 
 #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:42
-#: ../webpack/components/PreupgradeReportsTable/index.js:43
-#: ../webpack/components/PreupgradeReportsTable/index.js:50
+#: ../webpack/components/PreupgradeReportsTable/index.js:153
+#: ../webpack/components/PreupgradeReportsTable/index.js:162
 msgid "Yes"
 msgstr ""
 
 #: ../webpack/components/PreupgradeReports/components/EntriesFilter.js:43
-#: ../webpack/components/PreupgradeReportsTable/index.js:43
-#: ../webpack/components/PreupgradeReportsTable/index.js:53
+#: ../webpack/components/PreupgradeReportsTable/index.js:153
+#: ../webpack/components/PreupgradeReportsTable/index.js:165
 msgid "No"
 msgstr ""
 
 #: ../webpack/components/PreupgradeReports/components/FixSelectedButton.js:12
+#: ../webpack/components/PreupgradeReportsTable/index.js:443
 msgid "Fix Selected"
 msgstr ""
 
@@ -174,24 +221,25 @@ msgid "No Preupgrade Report Available"
 msgstr ""
 
 #: ../webpack/components/PreupgradeReports/components/UpgradeAllButton.js:8
+#: ../webpack/components/PreupgradeReportsTable/index.js:454
 msgid "Run Upgrade"
 msgstr ""
 
 #:
 #: ../webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js:17
-#: ../webpack/components/PreupgradeReportsTable/index.js:49
+#: ../webpack/components/PreupgradeReportsTable/index.js:161
 msgid "This issue inhibits the upgrade."
 msgstr ""
 
 #:
 #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:14
-#: ../webpack/components/PreupgradeReportsTable/index.js:41
+#: ../webpack/components/PreupgradeReportsTable/index.js:152
 msgid "Has Remediation?"
 msgstr ""
 
 #:
 #: ../webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js:15
-#: ../webpack/components/PreupgradeReportsTable/index.js:46
+#: ../webpack/components/PreupgradeReportsTable/index.js:158
 msgid "Inhibitor?"
 msgstr ""
 
@@ -227,12 +275,12 @@ msgstr ""
 msgid "Links"
 msgstr ""
 
-#: ../webpack/components/PreupgradeReportsTable/index.js:180
-msgid "The preupgrade report shows no issues."
+#: ../webpack/components/PreupgradeReportsTable/index.js:483
+msgid "No results found for your search."
 msgstr ""
 
-#: action_names.rb:2
-msgid "Preupgrade job"
+#: ../webpack/components/PreupgradeReportsTable/index.js:484
+msgid "The preupgrade report shows no issues."
 msgstr ""
 
 #: gemspec.rb:4