foreman_leapp 4.2.0 → 4.3.0

data/locale/fr/foreman_leapp.po

@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Bryan Kearney <bryan.kearney@gmail.com>, 2022
 # Claer <transiblu@claer.hammock.fr>, 2022
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2022
 # 21966816214bc546c1fc8a185e75ca1c, 2022
 # Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023
+# Bryan Kearney <bryan.kearney@gmail.com>, 2026
 # Ondřej Gajdušek, 2026
 #
 msgid ""
@@ -33,10 +33,10 @@ msgid "All"
 msgstr "Tout"
 
 msgid "An unexpected error occurred while creating the remediation job."
-msgstr ""
+msgstr "Une erreur inattendue s'est produite lors de la création de la tâche de correction."
 
 msgid "Array of excluded entry IDs"
-msgstr ""
+msgstr "Tableau des identifiants des entrées exclues"
 
 msgid "Command"
 msgstr "Commande"
@@ -72,7 +72,7 @@ msgid "Host"
 msgstr "Hôte"
 
 msgid "ID of the preupgrade report"
-msgstr ""
+msgstr "ID du rapport de pré-mise à niveau"
 
 msgid "Info"
 msgstr "Info"
@@ -96,10 +96,10 @@ msgid "List Preupgrade reports for Job invocation"
 msgstr "Liste des rapports de pré-mise à niveau pour l'invocation du job"
 
 msgid "List all preupgrade report entries"
-msgstr ""
+msgstr "Liste de toutes les entrées du rapport de pré-mise à niveau"
 
 msgid "List entries for a specific preupgrade report"
-msgstr ""
+msgstr "Liste des entrées pour un rapport de pré-mise à niveau spécifique"
 
 msgid "Low"
 msgstr "Faible"
@@ -123,10 +123,10 @@ msgid "No Preupgrade Report Available"
 msgstr "Aucun rapport de pré-mise à niveau disponible"
 
 msgid "No fixable entries found matching the selection."
-msgstr ""
+msgstr "Aucune entrée corrigible ne correspond à la sélection."
 
 msgid "No results found for your search."
-msgstr ""
+msgstr "Aucun résultat trouvé pour votre recherche."
 
 msgid "Preupgrade check with Leapp"
 msgstr "Contrôle pré-mise à niveau avec Leapp"
@@ -147,10 +147,10 @@ msgid "Run Upgrade"
 msgstr "Mettre à niveau"
 
 msgid "Search autocomplete for preupgrade report entries"
-msgstr ""
+msgstr "Saisie semi-automatique de la recherche pour les entrées du rapport de pré-mise à niveau"
 
 msgid "Search string"
-msgstr ""
+msgstr "Rechercher une chaîne"
 
 msgid "Show Preupgrade report"
 msgstr "Afficher le rapport de pré-mise à niveau"
@@ -177,13 +177,13 @@ msgid "Title"
 msgstr "Titre"
 
 msgid "Trigger a remediation job for selected preupgrade report entries"
-msgstr ""
+msgstr "Déclencher une tâche de correction pour les entrées de rapport de pré-mise à niveau sélectionnées"
 
 msgid "Unknown fix_type value '%s' for search_fix_type"
-msgstr ""
+msgstr "Valeur fix_type inconnue '%s' pour le type de correction de recherche"
 
 msgid "Unknown search key '%s' for search_yes_no_fields"
-msgstr ""
+msgstr "Clé de recherche inconnue '%s' pour les champs de recherche oui/non"
 
 msgid "Upgrade with Leapp"
 msgstr "Mise à niveau avec Leapp"

data/locale/ja/foreman_leapp.po

@@ -8,7 +8,7 @@
 # mhulan <mhulan@redhat.com>, 2022
 # Amit Upadhye <aupadhye@redhat.com>, 2022
 # Bryan Kearney <bryan.kearney@gmail.com>, 2023
-# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023
+# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2026
 # Ondřej Gajdušek, 2026
 #
 msgid ""
@@ -31,10 +31,10 @@ msgid "All"
 msgstr "すべて"
 
 msgid "An unexpected error occurred while creating the remediation job."
-msgstr ""
+msgstr "修復ジョブの作成中に予期せぬエラーが発生しました。"
 
 msgid "Array of excluded entry IDs"
-msgstr ""
+msgstr "除外されたエントリー ID の配列"
 
 msgid "Command"
 msgstr "コマンド"
@@ -70,7 +70,7 @@ msgid "Host"
 msgstr "ホスト"
 
 msgid "ID of the preupgrade report"
-msgstr ""
+msgstr "アップグレード前レポートの ID"
 
 msgid "Info"
 msgstr "情報"
@@ -94,10 +94,10 @@ msgid "List Preupgrade reports for Job invocation"
 msgstr "ジョブ呼び出しの事前アップグレードレポートの一覧表示"
 
 msgid "List all preupgrade report entries"
-msgstr ""
+msgstr "アップグレード前のレポートエントリーをすべてリスト表示する"
 
 msgid "List entries for a specific preupgrade report"
-msgstr ""
+msgstr "特定のアップグレード前レポートのエントリーをリスト表示する"
 
 msgid "Low"
 msgstr "低"
@@ -121,10 +121,10 @@ msgid "No Preupgrade Report Available"
 msgstr "アップグレード前のレポートはありません"
 
 msgid "No fixable entries found matching the selection."
-msgstr ""
+msgstr "選択に一致する修正可能なエントリーが見つかりませんでした。"
 
 msgid "No results found for your search."
-msgstr ""
+msgstr "検索結果が見つかりませんでした。"
 
 msgid "Preupgrade check with Leapp"
 msgstr "Leapp によるアップグレード前のチェック"
@@ -145,10 +145,10 @@ msgid "Run Upgrade"
 msgstr "アップグレードの実行"
 
 msgid "Search autocomplete for preupgrade report entries"
-msgstr ""
+msgstr "アップグレード前レポートのエントリーを自動補完検索する"
 
 msgid "Search string"
-msgstr ""
+msgstr "検索文字列"
 
 msgid "Show Preupgrade report"
 msgstr "アップグレード前のレポートの表示"
@@ -175,13 +175,13 @@ msgid "Title"
 msgstr "タイトル"
 
 msgid "Trigger a remediation job for selected preupgrade report entries"
-msgstr ""
+msgstr "選択したアップグレード前レポートのエントリーに対して修復ジョブをトリガーする"
 
 msgid "Unknown fix_type value '%s' for search_fix_type"
-msgstr ""
+msgstr "search_fix_type の不明な fix_type 値 '%s'"
 
 msgid "Unknown search key '%s' for search_yes_no_fields"
-msgstr ""
+msgstr "search_yes_no_fields の不明な検索キー '%s'"
 
 msgid "Upgrade with Leapp"
 msgstr "Leapp によるアップグレード"

data/locale/ka/foreman_leapp.po

@@ -143,7 +143,7 @@ msgid "Search autocomplete for preupgrade report entries"
 msgstr ""
 
 msgid "Search string"
-msgstr ""
+msgstr "საძებნი სტრიქონი"
 
 msgid "Show Preupgrade report"
 msgstr "განახლებისწინა ანგარიშის ჩვენება"

data/locale/ko/foreman_leapp.po

@@ -5,17 +5,16 @@
 #
 # Translators:
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2022
-# Bryan Kearney <bryan.kearney@gmail.com>, 2022
+# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
+# Bryan Kearney <bryan.kearney@gmail.com>, 2026
 # Ondřej Gajdušek, 2026
-# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 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: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
-"n.nl>, 2026\n"
+"Last-Translator: Ondřej Gajdušek, 2026\n"
 "Language-Team: Korean (https://app.transifex.com/foreman/teams/114/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,10 +29,10 @@ msgid "All"
 msgstr "모두"
 
 msgid "An unexpected error occurred while creating the remediation job."
-msgstr ""
+msgstr "복구 작업을 생성하는 동안 예기치 않은 오류가 발생했습니다."
 
 msgid "Array of excluded entry IDs"
-msgstr ""
+msgstr "제외된 항목 ID 배열"
 
 msgid "Command"
 msgstr "명령어"
@@ -69,7 +68,7 @@ msgid "Host"
 msgstr "호스트 "
 
 msgid "ID of the preupgrade report"
-msgstr ""
+msgstr "업그레이드 전 보고서의 ID"
 
 msgid "Info"
 msgstr "정보 "
@@ -93,10 +92,10 @@ msgid "List Preupgrade reports for Job invocation"
 msgstr "작업 호출을 위한 사전 업그레이드 보고서 목록"
 
 msgid "List all preupgrade report entries"
-msgstr ""
+msgstr "모든 업그레이드 전 보고서 항목 나열"
 
 msgid "List entries for a specific preupgrade report"
-msgstr ""
+msgstr "특정 업그레이드 전 보고서의 항목 나열"
 
 msgid "Low"
 msgstr "낮음"
@@ -120,10 +119,10 @@ msgid "No Preupgrade Report Available"
 msgstr "사전 업그레이드 보고서가 없습니다"
 
 msgid "No fixable entries found matching the selection."
-msgstr ""
+msgstr "선택한 조건과 일치하는 수정 가능한 항목이 없습니다."
 
 msgid "No results found for your search."
-msgstr ""
+msgstr "검색 결과를 찾을 수 없습니다."
 
 msgid "Preupgrade check with Leapp"
 msgstr "Leapp으로 업그레이드 전 확인"
@@ -144,10 +143,10 @@ msgid "Run Upgrade"
 msgstr "업그레이드 실행"
 
 msgid "Search autocomplete for preupgrade report entries"
-msgstr ""
+msgstr "업그레이드 전 보고서 항목 검색 자동 완성"
 
 msgid "Search string"
-msgstr ""
+msgstr "검색 문자열"
 
 msgid "Show Preupgrade report"
 msgstr "사전 업그레이드 보고서 표시"
@@ -174,13 +173,13 @@ msgid "Title"
 msgstr "제목"
 
 msgid "Trigger a remediation job for selected preupgrade report entries"
-msgstr ""
+msgstr "선택한 업그레이드 전 보고서 항목에 대한 복구 작업 시작"
 
 msgid "Unknown fix_type value '%s' for search_fix_type"
-msgstr ""
+msgstr "search_fix_type에 대한 알 수 없는 fix_type 값 '%s'"
 
 msgid "Unknown search key '%s' for search_yes_no_fields"
-msgstr ""
+msgstr "search_yes_no_fields에 대한 알 수 없는 검색 키 '%s'"
 
 msgid "Upgrade with Leapp"
 msgstr "Leapp으로 업그레이드"

data/locale/zh_CN/foreman_leapp.po

@@ -5,8 +5,8 @@
 #
 # Translators:
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
-# Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023
+# Amit Upadhye <aupadhye@redhat.com>, 2026
 # Ondřej Gajdušek, 2026
 #
 msgid ""
@@ -30,10 +30,10 @@ msgid "All"
 msgstr "全部"
 
 msgid "An unexpected error occurred while creating the remediation job."
-msgstr ""
+msgstr "创建补救作业时会出现意外错误。"
 
 msgid "Array of excluded entry IDs"
-msgstr ""
+msgstr "排除的条目 ID 数组"
 
 msgid "Command"
 msgstr "命令"
@@ -69,7 +69,7 @@ msgid "Host"
 msgstr "主机"
 
 msgid "ID of the preupgrade report"
-msgstr ""
+msgstr "预升级报告的 ID"
 
 msgid "Info"
 msgstr "Info"
@@ -93,10 +93,10 @@ msgid "List Preupgrade reports for Job invocation"
 msgstr "列出作业调用的预升级报告"
 
 msgid "List all preupgrade report entries"
-msgstr ""
+msgstr "列出所有预升级报告条目"
 
 msgid "List entries for a specific preupgrade report"
-msgstr ""
+msgstr "列出特定预升级报告的条目"
 
 msgid "Low"
 msgstr "低"
@@ -120,10 +120,10 @@ msgid "No Preupgrade Report Available"
 msgstr "没有可用的预升级报告"
 
 msgid "No fixable entries found matching the selection."
-msgstr ""
+msgstr "未找到与选择匹配的可修复条目。"
 
 msgid "No results found for your search."
-msgstr ""
+msgstr "没有找到您的搜索结果。"
 
 msgid "Preupgrade check with Leapp"
 msgstr "使用 Leapp 的预升级检查"
@@ -144,10 +144,10 @@ msgid "Run Upgrade"
 msgstr "运行升级"
 
 msgid "Search autocomplete for preupgrade report entries"
-msgstr ""
+msgstr "搜索自动补全预升级报告条目"
 
 msgid "Search string"
-msgstr ""
+msgstr "搜索字符串"
 
 msgid "Show Preupgrade report"
 msgstr "显示预升级报告"
@@ -174,13 +174,13 @@ msgid "Title"
 msgstr "提示"
 
 msgid "Trigger a remediation job for selected preupgrade report entries"
-msgstr ""
+msgstr "为所选预升级报告条目触发补救任务"
 
 msgid "Unknown fix_type value '%s' for search_fix_type"
-msgstr ""
+msgstr "search_fix_type 的未知的 fix_type 值 '%s'"
 
 msgid "Unknown search key '%s' for search_yes_no_fields"
-msgstr ""
+msgstr "search_yes_no_fields 的未知搜索键 '%s'"
 
 msgid "Upgrade with Leapp"
 msgstr "使用 Leapp 升级"

data/package.json

@@ -33,7 +33,6 @@
     "@theforeman/vendor-dev": ">= 12.0.1",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
-    "jest-svg-transformer": "^1.0.0",
     "prettier": "^1.19.1"
   }
 }

data/test/functional/api/v2/preupgrade_report_entries_controller_test.rb

@@ -39,6 +39,24 @@ module Api
         assert_response :not_found
       end
 
+      test ':index scopes entries to job_invocation_id across multiple reports' do
+        host2 = FactoryBot.create(:host)
+        report2 = FactoryBot.create(:preupgrade_report, host: host2, job_invocation: @job_invocation)
+        entry2 = FactoryBot.create(:preupgrade_report_entry, host: host2, preupgrade_report: report2)
+
+        other_job = FactoryBot.create(:job_invocation)
+        other_report = FactoryBot.create(:preupgrade_report, host: @host, job_invocation: other_job)
+        FactoryBot.create(:preupgrade_report_entry, host: @host, preupgrade_report: other_report)
+
+        get :index, params: { job_invocation_id: @job_invocation.id }
+        assert_response :success
+
+        ids = JSON.parse(@response.body)['results'].map { |e| e['id'] }
+        assert_includes ids, @entry.id
+        assert_includes ids, entry2.id
+        assert_equal 2, ids.size
+      end
+
       test ':index does not return entries belonging to a different report' do
         other_report = FactoryBot.create(:preupgrade_report, host: @host,
           job_invocation: @job_invocation)
@@ -226,6 +244,19 @@ module Api
           assert_equal @dummy_job.id, json['id']
         end
 
+        test 'remediates only fixable entries when ids are given' do
+          JobInvocationComposer.expects(:for_feature)
+                               .with('leapp_remediation_plan', [@host.id],
+                                 { 'remediation_ids' => @entry2.id.to_s })
+                               .returns(@composer)
+
+          post :bulk_remediate, params: {
+            preupgrade_report_id: @report.id,
+            ids: [@entry2.id, @unfixable.id],
+          }
+          assert_response :success
+        end
+
         test 'respects the excluded_ids parameter' do
           expected_ids = [@entry1.id, @entry3.id].join(',')
 
@@ -240,6 +271,15 @@ module Api
           assert_response :success
         end
 
+        test 'requires report or job scope when not remediating by entry ids' do
+          JobInvocationComposer.expects(:for_feature).never
+
+          post :bulk_remediate
+          assert_response :unprocessable_entity
+          json = ActiveSupport::JSON.decode(response.body)
+          assert_match(/Either ids, preupgrade_report_id or job_invocation_id must be provided/, json['message'])
+        end
+
         test 'returns error if no fixable entries match' do
           JobInvocationComposer.expects(:for_feature).never
 
@@ -251,6 +291,30 @@ module Api
           json = ActiveSupport::JSON.decode(response.body)
           assert_equal 'No fixable entries found matching the selection.', json['error']
         end
+
+        test 'triggers job for fixable entries across all reports for a job invocation' do
+          job_invocation = FactoryBot.create(:job_invocation)
+          host2 = FactoryBot.create(:host)
+          report2 = FactoryBot.create(:preupgrade_report, host: host2, job_invocation: job_invocation)
+          @report.update!(job_invocation: job_invocation)
+
+          fixable_detail = { 'remediations' => [{ 'type' => 'command', 'context' => ['yum', 'update'] }] }
+          entry_host2 = FactoryBot.create(:preupgrade_report_entry,
+            preupgrade_report: report2, host: host2, detail: fixable_detail)
+
+          expected_entry_ids = [@entry1.id, @entry2.id, @entry3.id, entry_host2.id].sort
+
+          JobInvocationComposer.expects(:for_feature)
+                               .with do |feature, host_ids, inputs|
+                                 feature == 'leapp_remediation_plan' &&
+                                   host_ids.sort == [@host.id, host2.id].sort &&
+                                   inputs['remediation_ids'].split(',').map(&:to_i).sort == expected_entry_ids
+                               end
+                               .returns(@composer)
+
+          post :bulk_remediate, params: { job_invocation_id: job_invocation.id }
+          assert_response :success
+        end
       end
     end
     # rubocop:enable Metrics/ClassLength

data/webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js

@@ -12,7 +12,7 @@ export const usePreupgradeTableState = (data, isExpanded) => {
 
   const [status, setStatus] = useState(STATUS.RESOLVED);
   const [error, setError] = useState(null);
-  const [reportId, setReportId] = useState(null);
+  const [hasReports, setHasReports] = useState(false);
   const [rows, setRows] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
   const [searchValue, setSearchValue] = useState('');
@@ -30,8 +30,9 @@ export const usePreupgradeTableState = (data, isExpanded) => {
 
   useEffect(() => {
     const fetchKey = `${data.id}:${jobStatusLabel}`;
-    if (!isLeappJob || !isExpanded || lastFetchedKeyRef.current === fetchKey)
+    if (!isLeappJob || !isExpanded || lastFetchedKeyRef.current === fetchKey) {
       return undefined;
+    }
 
     let ignore = false;
     setStatus(STATUS.PENDING);
@@ -41,22 +42,29 @@ export const usePreupgradeTableState = (data, isExpanded) => {
         key: `GET_LEAPP_REPORT_LIST_${data.id}`,
         url: `/api/v2/job_invocations/${data.id}/preupgrade_reports`,
         handleSuccess: res => {
-          if (ignore) return;
+          if (ignore) {
+            return;
+          }
+
           lastFetchedKeyRef.current = fetchKey;
           const payload = res.data || res;
           const rawResults = payload.results;
           const resultsArray = rawResults ? [].concat(rawResults) : [];
 
-          if (resultsArray[0]?.id) {
-            setReportId(resultsArray[0].id);
+          if (resultsArray.length > 0) {
+            setHasReports(true);
           } else {
+            setHasReports(false);
             setRows([]);
             setTotalCount(0);
             setStatus(STATUS.RESOLVED);
           }
         },
         handleError: err => {
-          if (ignore) return;
+          if (ignore) {
+            return;
+          }
+
           setError(err);
           setStatus(STATUS.ERROR);
         },
@@ -69,10 +77,15 @@ export const usePreupgradeTableState = (data, isExpanded) => {
   }, [isExpanded, data.id, isLeappJob, dispatch, jobStatusLabel]);
 
   useEffect(() => {
-    if (!isLeappJob || !isExpanded || !reportId) return undefined;
+    if (!isLeappJob || !isExpanded || !hasReports || !data.id) {
+      return undefined;
+    }
+
+    const entriesFetchKey = `${data.id}_P${pagination.page}_PP${pagination.perPage}_S${searchValue}_O${sortBy.index}${sortBy.direction}_J${jobStatusLabel}`;
 
-    const entriesFetchKey = `${reportId}_P${pagination.page}_PP${pagination.perPage}_S${searchValue}_O${sortBy.index}${sortBy.direction}_J${jobStatusLabel}`;
-    if (lastEntriesFetchKeyRef.current === entriesFetchKey) return undefined;
+    if (lastEntriesFetchKeyRef.current === entriesFetchKey) {
+      return undefined;
+    }
 
     let ignore = false;
     setStatus(STATUS.PENDING);
@@ -84,15 +97,19 @@ export const usePreupgradeTableState = (data, isExpanded) => {
     dispatch(
       APIActions.get({
         key: `GET_LEAPP_REPORT_ENTRIES_${entriesFetchKey}`,
-        url: `/api/v2/preupgrade_reports/${reportId}/preupgrade_report_entries`,
+        url: '/api/v2/preupgrade_report_entries',
         params: {
           page: pagination.page,
           per_page: pagination.perPage,
+          job_invocation_id: data.id,
           ...(searchValue && { search: searchValue }),
           ...(orderParam && { order: orderParam }),
         },
         handleSuccess: res => {
-          if (ignore) return;
+          if (ignore) {
+            return;
+          }
+
           lastEntriesFetchKeyRef.current = entriesFetchKey;
           const payload = res.data || res;
           const fetchedResults = payload.results;
@@ -102,7 +119,10 @@ export const usePreupgradeTableState = (data, isExpanded) => {
           setExpandedRowIds(new Set());
         },
         handleError: err => {
-          if (ignore) return;
+          if (ignore) {
+            return;
+          }
+
           setError(err);
           setStatus(STATUS.ERROR);
         },
@@ -115,7 +135,8 @@ export const usePreupgradeTableState = (data, isExpanded) => {
   }, [
     isExpanded,
     isLeappJob,
-    reportId,
+    hasReports,
+    data.id,
     searchValue,
     pagination.page,
     pagination.perPage,
@@ -137,8 +158,13 @@ export const usePreupgradeTableState = (data, isExpanded) => {
   const toggleRowExpansion = (id, isOpen) => {
     setExpandedRowIds(prev => {
       const next = new Set(prev);
-      if (isOpen) next.add(id);
-      else next.delete(id);
+
+      if (isOpen) {
+        next.add(id);
+      } else {
+        next.delete(id);
+      }
+
       return next;
     });
   };
@@ -147,7 +173,8 @@ export const usePreupgradeTableState = (data, isExpanded) => {
     isLeappJob,
     status,
     error,
-    reportId,
+    hasReports,
+    jobInvocationId: data.id,
     rows,
     totalCount,
     pagination,