foreman_leapp 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0a9fdcb091a6edc60464a8d1819a45e5ef2ca0e21f9a2d5a6d68cb322e0ab5
-  data.tar.gz: 5a44eb7a911be46ee9fc7c9fc5b9f2ec0e42c774a633dd35ea060a97bb336388
+  metadata.gz: 2b21b7465db5f87cfccd517c018e30bb3aa5f6c7878cbef6e314c981b5c21870
+  data.tar.gz: dd0f2a71a7d5c5858aa3c6336d4d92fafb6ebd3c890404265262491ce2311057
 SHA512:
-  metadata.gz: bb41f56f9d47d45699583927cb72bac902ed25b6e910342ed03d044dc3b8434821d7b28b0d93147f6c0bc7dd68d9b33286394cdba00aa70b7a74f88f786f87a0
-  data.tar.gz: 16ba388d07310604677c9a833554efc5efa92a097954a0aee81f9accbbc753d855e12eacc68a742e7c375ff06e9da169ce06b012ab6b19d92fc325eb70a4448e
+  metadata.gz: c6e3d0c62affb53415a88dc5fd5ab55f44a9a3dfa601964a8fdf85bf7264f6a3e41622e63f8a213547197f7f23b5bcb139ed3f034df27ac25e564c915c0a622e
+  data.tar.gz: 021af94cf62a318c7aadace3ed71f8171862f2820a5f7d67dcd800ffc8d52ef0caeb4df53be11a8a7bad4c722db43486095e1f10184234f7c8b84c873a8764da

data/app/assets/javascripts/foreman_leapp/locale/de/foreman_leapp.js

@@ -6,7 +6,7 @@
         "Project-Id-Version": "foreman_leapp 4.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2022-10-12 12:00+0000",
-        "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2023",
+        "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2026",
         "Language-Team": "German (https://app.transifex.com/foreman/teams/114/de/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -141,7 +141,7 @@
         ""
       ],
       "Search string": [
-        ""
+        "Suchbegriff"
       ],
       "Show Preupgrade report": [
         ""

data/app/assets/javascripts/foreman_leapp/locale/en/foreman_leapp.js

@@ -5,7 +5,7 @@
       "": {
         "Project-Id-Version": "foreman_leapp 1.0.0",
         "Report-Msgid-Bugs-To": "",
-        "PO-Revision-Date": "2026-09-22 17:30+0000",
+        "PO-Revision-Date": "2026-09-29 11:07+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
         "Language-Team": "LANGUAGE <LL@li.org>",
         "Language": "",

data/app/assets/javascripts/foreman_leapp/locale/fr/foreman_leapp.js

@@ -24,10 +24,10 @@
         "Tout"
       ],
       "An unexpected error occurred while creating the remediation job.": [
-        ""
+        "Une erreur inattendue s'est produite lors de la création de la tâche de correction."
       ],
       "Array of excluded entry IDs": [
-        ""
+        "Tableau des identifiants des entrées exclues"
       ],
       "Command": [
         "Commande"
@@ -63,7 +63,7 @@
         "Hôte"
       ],
       "ID of the preupgrade report": [
-        ""
+        "ID du rapport de pré-mise à niveau"
       ],
       "Info": [
         "Info"
@@ -87,10 +87,10 @@
         "Liste des rapports de pré-mise à niveau pour l'invocation du job"
       ],
       "List all preupgrade report entries": [
-        ""
+        "Liste de toutes les entrées du rapport de pré-mise à niveau"
       ],
       "List entries for a specific preupgrade report": [
-        ""
+        "Liste des entrées pour un rapport de pré-mise à niveau spécifique"
       ],
       "Low": [
         "Faible"
@@ -114,10 +114,10 @@
         "Aucun rapport de pré-mise à niveau disponible"
       ],
       "No fixable entries found matching the selection.": [
-        ""
+        "Aucune entrée corrigible ne correspond à la sélection."
       ],
       "No results found for your search.": [
-        ""
+        "Aucun résultat trouvé pour votre recherche."
       ],
       "Preupgrade check with Leapp": [
         "Contrôle pré-mise à niveau avec Leapp"
@@ -138,10 +138,10 @@
         "Mettre à niveau"
       ],
       "Search autocomplete for preupgrade report entries": [
-        ""
+        "Saisie semi-automatique de la recherche pour les entrées du rapport de pré-mise à niveau"
       ],
       "Search string": [
-        ""
+        "Rechercher une chaîne"
       ],
       "Show Preupgrade report": [
         "Afficher le rapport de pré-mise à niveau"
@@ -168,13 +168,13 @@
         "Titre"
       ],
       "Trigger a remediation job for selected preupgrade report entries": [
-        ""
+        "Déclencher une tâche de correction pour les entrées de rapport de pré-mise à niveau sélectionnées"
       ],
       "Unknown fix_type value '%s' for search_fix_type": [
-        ""
+        "Valeur fix_type inconnue '%s' pour le type de correction de recherche"
       ],
       "Unknown search key '%s' for search_yes_no_fields": [
-        ""
+        "Clé de recherche inconnue '%s' pour les champs de recherche oui/non"
       ],
       "Upgrade with Leapp": [
         "Mise à niveau avec Leapp"

data/app/assets/javascripts/foreman_leapp/locale/ja/foreman_leapp.js

@@ -24,10 +24,10 @@
         "すべて"
       ],
       "An unexpected error occurred while creating the remediation job.": [
-        ""
+        "修復ジョブの作成中に予期せぬエラーが発生しました。"
       ],
       "Array of excluded entry IDs": [
-        ""
+        "除外されたエントリー ID の配列"
       ],
       "Command": [
         "コマンド"
@@ -63,7 +63,7 @@
         "ホスト"
       ],
       "ID of the preupgrade report": [
-        ""
+        "アップグレード前レポートの ID"
       ],
       "Info": [
         "情報"
@@ -87,10 +87,10 @@
         "ジョブ呼び出しの事前アップグレードレポートの一覧表示"
       ],
       "List all preupgrade report entries": [
-        ""
+        "アップグレード前のレポートエントリーをすべてリスト表示する"
       ],
       "List entries for a specific preupgrade report": [
-        ""
+        "特定のアップグレード前レポートのエントリーをリスト表示する"
       ],
       "Low": [
         "低"
@@ -114,10 +114,10 @@
         "アップグレード前のレポートはありません"
       ],
       "No fixable entries found matching the selection.": [
-        ""
+        "選択に一致する修正可能なエントリーが見つかりませんでした。"
       ],
       "No results found for your search.": [
-        ""
+        "検索結果が見つかりませんでした。"
       ],
       "Preupgrade check with Leapp": [
         "Leapp によるアップグレード前のチェック"
@@ -138,10 +138,10 @@
         "アップグレードの実行"
       ],
       "Search autocomplete for preupgrade report entries": [
-        ""
+        "アップグレード前レポートのエントリーを自動補完検索する"
       ],
       "Search string": [
-        ""
+        "検索文字列"
       ],
       "Show Preupgrade report": [
         "アップグレード前のレポートの表示"
@@ -168,13 +168,13 @@
         "タイトル"
       ],
       "Trigger a remediation job for selected preupgrade report entries": [
-        ""
+        "選択したアップグレード前レポートのエントリーに対して修復ジョブをトリガーする"
       ],
       "Unknown fix_type value '%s' for search_fix_type": [
-        ""
+        "search_fix_type の不明な fix_type 値 '%s'"
       ],
       "Unknown search key '%s' for search_yes_no_fields": [
-        ""
+        "search_yes_no_fields の不明な検索キー '%s'"
       ],
       "Upgrade with Leapp": [
         "Leapp によるアップグレード"

data/app/assets/javascripts/foreman_leapp/locale/ka/foreman_leapp.js

@@ -141,7 +141,7 @@
         ""
       ],
       "Search string": [
-        ""
+        "საძებნი სტრიქონი"
       ],
       "Show Preupgrade report": [
         "განახლებისწინა ანგარიშის ჩვენება"

data/app/assets/javascripts/foreman_leapp/locale/ko/foreman_leapp.js

@@ -6,7 +6,7 @@
         "Project-Id-Version": "foreman_leapp 4.1.2",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2022-10-12 12:00+0000",
-        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2026",
+        "Last-Translator": "Ondřej Gajdušek, 2026",
         "Language-Team": "Korean (https://app.transifex.com/foreman/teams/114/ko/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -24,10 +24,10 @@
         "모두"
       ],
       "An unexpected error occurred while creating the remediation job.": [
-        ""
+        "복구 작업을 생성하는 동안 예기치 않은 오류가 발생했습니다."
       ],
       "Array of excluded entry IDs": [
-        ""
+        "제외된 항목 ID 배열"
       ],
       "Command": [
         "명령어"
@@ -63,7 +63,7 @@
         "호스트 "
       ],
       "ID of the preupgrade report": [
-        ""
+        "업그레이드 전 보고서의 ID"
       ],
       "Info": [
         "정보 "
@@ -87,10 +87,10 @@
         "작업 호출을 위한 사전 업그레이드 보고서 목록"
       ],
       "List all preupgrade report entries": [
-        ""
+        "모든 업그레이드 전 보고서 항목 나열"
       ],
       "List entries for a specific preupgrade report": [
-        ""
+        "특정 업그레이드 전 보고서의 항목 나열"
       ],
       "Low": [
         "낮음"
@@ -114,10 +114,10 @@
         "사전 업그레이드 보고서가 없습니다"
       ],
       "No fixable entries found matching the selection.": [
-        ""
+        "선택한 조건과 일치하는 수정 가능한 항목이 없습니다."
       ],
       "No results found for your search.": [
-        ""
+        "검색 결과를 찾을 수 없습니다."
       ],
       "Preupgrade check with Leapp": [
         "Leapp으로 업그레이드 전 확인"
@@ -138,10 +138,10 @@
         "업그레이드 실행"
       ],
       "Search autocomplete for preupgrade report entries": [
-        ""
+        "업그레이드 전 보고서 항목 검색 자동 완성"
       ],
       "Search string": [
-        ""
+        "검색 문자열"
       ],
       "Show Preupgrade report": [
         "사전 업그레이드 보고서 표시"
@@ -168,13 +168,13 @@
         "제목"
       ],
       "Trigger a remediation job for selected preupgrade report entries": [
-        ""
+        "선택한 업그레이드 전 보고서 항목에 대한 복구 작업 시작"
       ],
       "Unknown fix_type value '%s' for search_fix_type": [
-        ""
+        "search_fix_type에 대한 알 수 없는 fix_type 값 '%s'"
       ],
       "Unknown search key '%s' for search_yes_no_fields": [
-        ""
+        "search_yes_no_fields에 대한 알 수 없는 검색 키 '%s'"
       ],
       "Upgrade with Leapp": [
         "Leapp으로 업그레이드"

data/app/assets/javascripts/foreman_leapp/locale/zh_CN/foreman_leapp.js

@@ -24,10 +24,10 @@
         "全部"
       ],
       "An unexpected error occurred while creating the remediation job.": [
-        ""
+        "创建补救作业时会出现意外错误。"
       ],
       "Array of excluded entry IDs": [
-        ""
+        "排除的条目 ID 数组"
       ],
       "Command": [
         "命令"
@@ -63,7 +63,7 @@
         "主机"
       ],
       "ID of the preupgrade report": [
-        ""
+        "预升级报告的 ID"
       ],
       "Info": [
         "Info"
@@ -87,10 +87,10 @@
         "列出作业调用的预升级报告"
       ],
       "List all preupgrade report entries": [
-        ""
+        "列出所有预升级报告条目"
       ],
       "List entries for a specific preupgrade report": [
-        ""
+        "列出特定预升级报告的条目"
       ],
       "Low": [
         "低"
@@ -114,10 +114,10 @@
         "没有可用的预升级报告"
       ],
       "No fixable entries found matching the selection.": [
-        ""
+        "未找到与选择匹配的可修复条目。"
       ],
       "No results found for your search.": [
-        ""
+        "没有找到您的搜索结果。"
       ],
       "Preupgrade check with Leapp": [
         "使用 Leapp 的预升级检查"
@@ -138,10 +138,10 @@
         "运行升级"
       ],
       "Search autocomplete for preupgrade report entries": [
-        ""
+        "搜索自动补全预升级报告条目"
       ],
       "Search string": [
-        ""
+        "搜索字符串"
       ],
       "Show Preupgrade report": [
         "显示预升级报告"
@@ -168,13 +168,13 @@
         "提示"
       ],
       "Trigger a remediation job for selected preupgrade report entries": [
-        ""
+        "为所选预升级报告条目触发补救任务"
       ],
       "Unknown fix_type value '%s' for search_fix_type": [
-        ""
+        "search_fix_type 的未知的 fix_type 值 '%s'"
       ],
       "Unknown search key '%s' for search_yes_no_fields": [
-        ""
+        "search_yes_no_fields 的未知搜索键 '%s'"
       ],
       "Upgrade with Leapp": [
         "使用 Leapp 升级"

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/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

@@ -26,19 +26,8 @@ module ForemanLeapp
           extend_rabl_template 'api/v2/job_invocations/main',
                                'api/v2/job_invocations/leapp_preupgrade_report'
 
-          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.with_leapp_report(subject)
-                          }
-          end
-
           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.2.0'
+  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 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"
@@ -147,7 +147,7 @@ msgid "Search autocomplete for preupgrade report entries"
 msgstr ""
 
 msgid "Search string"
-msgstr ""
+msgstr "Suchbegriff"
 
 msgid "Show Preupgrade report"
 msgstr ""

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-09-22 17:30+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"

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-09-22 17:30+0000\n"
-"PO-Revision-Date: 2026-09-22 17:30+0000\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"