foreman_leapp 4.2.0 → 4.3.0

data/webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js

@@ -122,6 +122,42 @@ describe('PreupgradeReportsTable', () => {
   const waitForTable = () =>
     waitFor(() => screen.getByText('Report Entry 1', { selector: 'td' }));
 
+  it('loads entries for the whole job invocation when multiple preupgrade reports exist', async () => {
+    const host2Entry = {
+      id: 501,
+      title: 'Host 2 Issue',
+      hostname: 'host2.example.com',
+      host_id: 202,
+      severity: 'medium',
+      detail: {},
+    };
+
+    APIActions.get.mockImplementation(({ key, handleSuccess, params }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST')) {
+          handleSuccess({ results: [{ id: 1 }, { id: 2 }] });
+        }
+        if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          expect(params.job_invocation_id).toBe(mockJobId);
+          expect(params.search).toBeUndefined();
+          handleSuccess({
+            results: [host2Entry, ...mockEntries],
+            subtotal: mockEntries.length + 1,
+          });
+        }
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+
+    renderComponent();
+    expandSection();
+    await waitFor(() =>
+      expect(
+        screen.getByText('Host 2 Issue', { selector: 'td' })
+      ).toBeInTheDocument()
+    );
+  });
+
   it('renders data', async () => {
     renderComponent();
     expandSection();
@@ -402,7 +438,7 @@ describe('PreupgradeReportsTable', () => {
     );
   });
 
-  it('Fix Selected dispatches APIActions.post with correct feature, host_ids and remediation_ids', async () => {
+  it('Fix Selected dispatches bulk_remediate with fixable entry ids', async () => {
     renderComponent();
     expandSection();
     await waitForTable();
@@ -419,13 +455,10 @@ describe('PreupgradeReportsTable', () => {
 
     expect(APIActions.post).toHaveBeenCalledWith(
       expect.objectContaining({
-        url: expect.stringContaining('/api/job_invocations'),
+        url: expect.stringContaining('/bulk_remediate'),
         params: {
-          job_invocation: {
-            feature: 'leapp_remediation_plan',
-            host_ids: [100],
-            inputs: { remediation_ids: '1' },
-          },
+          job_invocation_id: mockJobId,
+          ids: [1],
         },
       })
     );
@@ -582,7 +615,7 @@ describe('PreupgradeReportsTable', () => {
       expect.objectContaining({
         url: expect.stringContaining('/bulk_remediate'),
         params: {
-          search: '',
+          job_invocation_id: mockJobId,
           excluded_ids: [],
         },
       })

data/webpack/components/PreupgradeReportsTable/index.js

@@ -29,10 +29,16 @@ import { getControllerSearchProps, STATUS } from 'foremanReact/constants';
 import SearchBar from 'foremanReact/components/SearchBar';
 import { APIActions } from 'foremanReact/redux/API';
 import { usePreupgradeTableState } from './PreupgradeReportsTableHelpers';
-import { entryFixable } from '../PreupgradeReports/PreupgradeReportsHelpers';
 import ReportDetails, { renderSeverityLabel } from './ReportDetails';
 import './PreupgradeReportsTable.scss';
 
+const entryWithFixKind = kind => entry =>
+  entry.detail &&
+  entry.detail.remediations &&
+  entry.detail.remediations.some(remediation => remediation.type === kind);
+
+const entryFixable = entryWithFixKind('command');
+
 const isRowFixable = entryFixable;
 
 const submitJobInvocation = (
@@ -89,7 +95,8 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     isLeappJob,
     status,
     error,
-    reportId,
+    hasReports,
+    jobInvocationId,
     rows,
     totalCount,
     pagination,
@@ -113,21 +120,25 @@ const PreupgradeReportsTable = ({ data = {} }) => {
 
   useEffect(() => {
     setFixableCount(null);
-  }, [searchValue, reportId]);
+  }, [searchValue, jobInvocationId]);
 
   const searchProps = useMemo(() => {
-    if (!reportId) return null;
+    if (!hasReports || !jobInvocationId) {
+      return null;
+    }
+
     const baseProps = getControllerSearchProps('preupgrade_report_entries');
+
     return {
       ...baseProps,
       autocomplete: {
         ...baseProps.autocomplete,
         url: foremanUrl(
-          `/api/v2/preupgrade_reports/${reportId}/preupgrade_report_entries/auto_complete_search`
+          `/api/v2/preupgrade_report_entries/auto_complete_search?job_invocation_id=${jobInvocationId}`
         ),
       },
     };
-  }, [reportId]);
+  }, [hasReports, jobInvocationId]);
 
   const columns = useMemo(
     () => ({
@@ -203,9 +214,10 @@ const PreupgradeReportsTable = ({ data = {} }) => {
       if (fixableCount === null) {
         dispatch(
           APIActions.get({
-            key: `GET_FIXABLE_COUNT_${reportId}`,
-            url: `/api/v2/preupgrade_reports/${reportId}/preupgrade_report_entries`,
+            key: `GET_FIXABLE_COUNT_${jobInvocationId}`,
+            url: '/api/v2/preupgrade_report_entries',
             params: {
+              job_invocation_id: jobInvocationId,
               search: [searchValue, 'fix_type = command']
                 .filter(Boolean)
                 .join(' AND '),
@@ -226,7 +238,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
         originalSelectAll(...args);
       }
     },
-    [dispatch, reportId, searchValue, fixableCount, originalSelectAll]
+    [dispatch, jobInvocationId, searchValue, fixableCount, originalSelectAll]
   );
 
   const selectedIds = Array.from(inclusionSet);
@@ -244,19 +256,6 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     [globalHostId]
   );
 
-  const hostIdsForSelected = useMemo(
-    () =>
-      Array.from(
-        new Set(
-          rows
-            .filter(e => selectedIds.includes(e.id))
-            .map(getHostId)
-            .filter(Boolean)
-        )
-      ),
-    [rows, selectedIds, getHostId]
-  );
-
   const allHostIds = useMemo(
     () => Array.from(new Set(rows.map(getHostId).filter(Boolean))),
     [rows, getHostId]
@@ -271,11 +270,14 @@ const PreupgradeReportsTable = ({ data = {} }) => {
         const newDirection = (parts[1] || 'ASC').toLowerCase();
         sortChanged =
           newIndex !== sortBy.index || newDirection !== sortBy.direction;
-        if (sortChanged)
+
+        if (sortChanged) {
           setSortBy({ index: newIndex, direction: newDirection });
+        }
       }
 
       let newPage = pagination.page;
+
       if (sortChanged) {
         newPage = 1;
       } else if (newParams.page !== undefined) {
@@ -300,53 +302,42 @@ const PreupgradeReportsTable = ({ data = {} }) => {
   };
 
   const handleFixSelected = () => {
-    if (areAllRowsSelected() || exclusionSet.size > 0) {
-      setSubmitError(null);
-      setIsSubmitting(true);
-
-      dispatch(
-        APIActions.post({
-          key: `BULK_REMEDIATE_${reportId}`,
-          url: foremanUrl(
-            `/api/v2/preupgrade_reports/${reportId}/preupgrade_report_entries/bulk_remediate`
-          ),
-          params: {
-            search: searchValue,
-            excluded_ids: Array.from(exclusionSet),
-          },
-          handleSuccess: response => {
-            const result = response.data || response;
-            if (result?.id) {
-              window.location.assign(
-                foremanUrl(`/job_invocations/${result.id}`)
-              );
-            } else {
-              setIsSubmitting(false);
-            }
-          },
-          handleError: err => {
-            setSubmitError(err);
-            setIsSubmitting(false);
-          },
-        })
-      );
-    } else {
-      if (selectedIds.length === 0) return;
-
-      const hostIds =
-        hostIdsForSelected.length > 0
-          ? hostIdsForSelected
-          : [globalHostId].filter(Boolean);
-
-      submitJobInvocation(
-        dispatch,
-        setSubmitError,
-        'leapp_remediation_plan',
-        hostIds,
-        selectedIds.join(','),
-        setIsSubmitting
-      );
+    const isBulkSelection = areAllRowsSelected() || exclusionSet.size > 0;
+
+    if (!isBulkSelection && selectedIds.length === 0) {
+      return;
     }
+
+    setSubmitError(null);
+    setIsSubmitting(true);
+
+    dispatch(
+      APIActions.post({
+        key: `BULK_REMEDIATE_${jobInvocationId}`,
+        url: foremanUrl('/api/v2/preupgrade_report_entries/bulk_remediate'),
+        params: {
+          job_invocation_id: jobInvocationId,
+          ...(isBulkSelection
+            ? {
+                ...(searchValue && { search: searchValue }),
+                excluded_ids: Array.from(exclusionSet),
+              }
+            : { ids: selectedIds }),
+        },
+        handleSuccess: response => {
+          const result = response.data || response;
+          if (result?.id) {
+            window.location.assign(foremanUrl(`/job_invocations/${result.id}`));
+          } else {
+            setIsSubmitting(false);
+          }
+        },
+        handleError: err => {
+          setSubmitError(err);
+          setIsSubmitting(false);
+        },
+      })
+    );
   };
 
   const handleRunUpgrade = () => {
@@ -366,7 +357,9 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     [columns]
   );
 
-  if (!isLeappJob) return null;
+  if (!isLeappJob) {
+    return null;
+  }
 
   const hasAnySelection =
     areAllRowsSelected() || exclusionSet.size > 0 || selectedIds.length > 0;
@@ -416,7 +409,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
               </ToolbarItem>
             )}
 
-            {reportId && searchProps && (
+            {hasReports && searchProps && (
               <ToolbarItem className="leapp-searchbar-item">
                 <SearchBar
                   data={searchProps}

data/webpack/index.js

@@ -1,13 +0,0 @@
-import componentRegistry from 'foremanReact/components/componentRegistry';
-
-import injectReducer from 'foremanReact/redux/reducers/registerReducer';
-
-import PreupgradeReports from './components/PreupgradeReports';
-import reducer from './reducer';
-
-componentRegistry.register({
-  name: 'PreupgradeReports',
-  type: PreupgradeReports,
-});
-
-injectReducer('foremanLeapp', reducer);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Foreman Leapp team
 bindir: bin
 cert_chain: []
-date: 2026-10-05 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -57,7 +57,7 @@ files:
 - app/controllers/api/v2/preupgrade_report_entries_controller.rb
 - app/controllers/api/v2/preupgrade_reports_controller.rb
 - app/controllers/concerns/api/v2/api_authorizer.rb
-- app/controllers/preupgrade_reports_controller.rb
+- app/controllers/concerns/foreman_leapp/preupgrade_report_entry_bulk_remediate.rb
 - app/helpers/foreman_leapp/hosts_helper.rb
 - app/helpers/foreman_leapp/template_helper.rb
 - app/lib/actions/foreman_leapp/preupgrade_job.rb
@@ -77,10 +77,6 @@ files:
 - app/views/foreman_leapp/job_templates/leapp_preupgrade.erb
 - app/views/foreman_leapp/job_templates/leapp_remediation.erb
 - app/views/foreman_leapp/job_templates/leapp_upgrade.erb
-- app/views/job_invocations/_leapp_preupgrade_report.html.erb
-- app/views/preupgrade_report_entries/base.json.rabl
-- app/views/preupgrade_reports/index.json.rabl
-- app/views/preupgrade_reports/show.json.rabl
 - config/routes.rb
 - db/migrate/20200320104040_preupgrade_report_entries.rb
 - db/migrate/20200326142259_add_job_id_to_report.rb
@@ -113,7 +109,6 @@ files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/preupgrade_report_entries_controller_test.rb
 - test/functional/api/v2/preupgrade_reports_controller_test.rb
-- test/functional/preupgrade_reports_controller_test.rb
 - test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
 - test/models/preupgrade_report_test.rb
@@ -121,70 +116,13 @@ files:
 - test/unit/actions/preupgrade_job_test.rb
 - test/unit/helpers/job_helper_test.rb
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
-- webpack/components/PreupgradeReports/PreupgradeReports.js
-- webpack/components/PreupgradeReports/PreupgradeReportsActions.js
-- webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js
-- webpack/components/PreupgradeReports/PreupgradeReportsReducer.js
-- webpack/components/PreupgradeReports/PreupgradeReportsSelectors.js
-- webpack/components/PreupgradeReports/__tests__/PreupgradeReports.fixtures.js
-- webpack/components/PreupgradeReports/__tests__/PreupgradeReports.test.js
-- webpack/components/PreupgradeReports/__tests__/PreupgradeReportsHelpers.test.js
-- webpack/components/PreupgradeReports/__tests__/PreupgradeReportsReducer.test.js
-- webpack/components/PreupgradeReports/__tests__/PreupgradeReportsSelectors.test.js
-- webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsHelpers.test.js.snap
-- webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsReducer.test.js.snap
-- webpack/components/PreupgradeReports/__tests__/__snapshots__/PreupgradeReportsSelectors.test.js.snap
-- webpack/components/PreupgradeReports/components/EntriesFilter.js
-- webpack/components/PreupgradeReports/components/EntriesFilter.scss
-- webpack/components/PreupgradeReports/components/EntriesFilter.test.js
-- webpack/components/PreupgradeReports/components/FixSelectedButton.js
-- webpack/components/PreupgradeReports/components/FixSelectedButton.test.js
-- webpack/components/PreupgradeReports/components/NoReports.js
-- webpack/components/PreupgradeReports/components/NoReports.test.js
-- webpack/components/PreupgradeReports/components/UpgradeAllButton.js
-- webpack/components/PreupgradeReports/components/UpgradeAllButton.test.js
-- webpack/components/PreupgradeReports/components/__snapshots__/EntriesFilter.test.js.snap
-- webpack/components/PreupgradeReports/components/__snapshots__/FixSelectedButton.test.js.snap
-- webpack/components/PreupgradeReports/components/__snapshots__/UpgradeAllButton.test.js.snap
-- webpack/components/PreupgradeReports/index.js
-- webpack/components/PreupgradeReportsList/PreupgradeReportList.scss
-- webpack/components/PreupgradeReportsList/__tests__/PreupgradeReportsList.test.js
-- webpack/components/PreupgradeReportsList/components/EmptyInfoItem.js
-- webpack/components/PreupgradeReportsList/components/InfoItem.js
-- webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js
-- webpack/components/PreupgradeReportsList/components/PreupgradeReportEntry.js
-- webpack/components/PreupgradeReportsList/components/PreupgradeReportsListHeader.js
-- webpack/components/PreupgradeReportsList/components/SortableHeaderItem.js
-- webpack/components/PreupgradeReportsList/components/__tests__/EmptyInfoItem.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/InhibitorInfoItem.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/PreupgradeReportEntry.fixtures.js
-- webpack/components/PreupgradeReportsList/components/__tests__/PreupgradeReportEntry.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/PreupgradeReportsListHeader.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/SortableHeaderItem.test.js
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/EmptyInfoItem.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/InhibitorInfoItem.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportEntry.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/PreupgradeReportsListHeader.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/SortableHeaderItem.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/__snapshots__/helpers.test.js.snap
-- webpack/components/PreupgradeReportsList/components/__tests__/helpers.test.js
-- webpack/components/PreupgradeReportsList/components/foreman_leapp.scss
-- webpack/components/PreupgradeReportsList/components/helpers.js
-- webpack/components/PreupgradeReportsList/components/images/i_severity-critical.svg
-- webpack/components/PreupgradeReportsList/components/images/i_severity-high.svg
-- webpack/components/PreupgradeReportsList/components/images/i_severity-low.svg
-- webpack/components/PreupgradeReportsList/components/images/i_severity-med.svg
-- webpack/components/PreupgradeReportsList/index.js
 - webpack/components/PreupgradeReportsTable/PreupgradeReportsTable.scss
 - webpack/components/PreupgradeReportsTable/PreupgradeReportsTableHelpers.js
 - webpack/components/PreupgradeReportsTable/ReportDetails.js
 - webpack/components/PreupgradeReportsTable/__tests__/PreupgradeReportsTable.test.js
 - webpack/components/PreupgradeReportsTable/index.js
-- webpack/consts.js
-- webpack/csrf.js
 - webpack/global_index.js
 - webpack/index.js
-- webpack/reducer.js
 - webpack/testSetup.js
 - webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_leapp
@@ -213,7 +151,6 @@ test_files:
 - test/functional/api/v2/job_invocations_controller_test.rb
 - test/functional/api/v2/preupgrade_report_entries_controller_test.rb
 - test/functional/api/v2/preupgrade_reports_controller_test.rb
-- test/functional/preupgrade_reports_controller_test.rb
 - test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
 - test/models/preupgrade_report_test.rb

data/app/controllers/preupgrade_reports_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class PreupgradeReportsController < ::Api::V2::BaseController
-  include Api::V2::ApiAuthorizer
-
-  def index
-    @preupgrade_reports = resource_scope.includes(:preupgrade_report_entries).search_for(*search_options)
-  end
-
-  private
-
-  # By overriding :path_to_authenticate we can require REX's :view_job_invocations permission
-  def path_to_authenticate
-    Foreman::AccessControl.normalize_path_hash params.slice(:action, :id, :user_id)
-                                                     .merge({ controller: 'job_invocations' })
-  end
-end

data/app/views/job_invocations/_leapp_preupgrade_report.html.erb

@@ -1,11 +0,0 @@
-<% content_for(:javascripts) do %>
-  <%= webpacked_plugins_js_for :foreman_leapp %>
-<% end %>
-<% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :foreman_leapp %>
-<% end %>
-
-<%= react_component('PreupgradeReports', {
-  :url => preupgrade_reports_path(:search => "job_invocation_id = #{@job_invocation.id}"),
-  :newJobInvocationUrl => new_job_invocation_path
-}) %>

data/app/views/preupgrade_report_entries/base.json.rabl

@@ -1,4 +0,0 @@
-object @preupgrade_report_entry
-
-extends "api/v2/preupgrade_report_entries/base"
-attribute :detail

data/app/views/preupgrade_reports/index.json.rabl

@@ -1,3 +0,0 @@
-collection @preupgrade_reports
-
-extends 'preupgrade_reports/show'

data/app/views/preupgrade_reports/show.json.rabl

@@ -1,7 +0,0 @@
-object @preupgrade_report
-
-extends "api/v2/preupgrade_reports/base"
-
-child :preupgrade_report_entries => :entries do
-  extends "preupgrade_report_entries/base"
-end

data/test/functional/preupgrade_reports_controller_test.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_plugin_helper'
-
-class PreupgradeReportsControllerTest < ActionController::TestCase
-  setup do
-    @user = FactoryBot.create(:user, admin: false)
-    @host = FactoryBot.create :host
-    FactoryBot.create :preupgrade_report, host: @host
-  end
-
-  test 'should get :index' do
-    get :index
-    assert_response :success
-    assert_not_empty JSON.parse(@response.body)['results']
-  end
-
-  test 'should get :index with :view_job_invocations & :view_hosts' do
-    setup_user 'view', 'job_invocations', nil, @user
-    setup_user 'view', 'hosts', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :success
-    assert_not_empty JSON.parse(@response.body)['results']
-  end
-
-  test 'should not get :index without :view_job_invocations' do
-    setup_user 'view', 'hosts', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :forbidden
-    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_job_invocations'
-  end
-
-  test 'should not get :index without :view_hosts' do
-    setup_user 'view', 'job_invocations', nil, @user
-    get :index, session: set_session_user(@user)
-    assert_response :forbidden
-    assert_includes JSON.parse(@response.body)['error']['missing_permissions'], 'view_hosts'
-  end
-end

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -1,154 +0,0 @@
-import React, { useState } from 'react';
-import { Icon } from '@patternfly/react-core';
-import { ExclamationCircleIcon } from '@patternfly/react-icons';
-import EmptyState from 'foremanReact/components/common/EmptyState';
-import { LoadingState, Row } from 'patternfly-react';
-import PropTypes from 'prop-types';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-
-import PreupgradeReportsList from '../PreupgradeReportsList';
-import UpgradeAllButton from './components/UpgradeAllButton';
-import EntriesFilter from './components/EntriesFilter';
-import FixSelectedButton from './components/FixSelectedButton';
-
-import {
-  flattenEntries,
-  isEmpty,
-  anyEntriesFixable,
-  filterEntries,
-  idsForInvocationFromEntries,
-  sortEntries,
-  fixableEntries,
-} from './PreupgradeReportsHelpers';
-
-import NoReports from './components/NoReports';
-
-const PreupgradeReports = ({
-  preupgradeReports,
-  csrfToken,
-  newJobInvocationUrl,
-}) => {
-  const [filterType, setFilterType] = useState('title');
-  const [filterValue, setFilterValue] = useState('');
-  const [checked, setChecked] = useState([]);
-  const [sort, setSort] = useState({ attribute: '', order: 'desc' });
-
-  const onFilterValueChange = value => {
-    setFilterValue(value);
-  };
-
-  const onFilterValueClear = () => setFilterValue('');
-
-  const onFilterTypeChange = value => {
-    onFilterValueClear();
-    setFilterType(value);
-  };
-
-  const isSelected = entry => checked.some(item => item.id === entry.id);
-
-  const anySelected = checked.length > 0;
-
-  const toggleSelected = (entry, isEntrySelected) => {
-    if (isEntrySelected) {
-      setChecked(checked.filter(item => item.id !== entry.id));
-    } else {
-      setChecked([entry, ...checked]);
-    }
-  };
-
-  const toggleSelectAll = () => {
-    const allFixable = fixableEntries(preupgradeReports);
-
-    if (checked.length === allFixable.length) {
-      setChecked([]);
-    } else {
-      setChecked(allFixable);
-    }
-  };
-
-  const changeSort = value => {
-    setSort({ ...sort, ...value });
-  };
-
-  return (
-    <React.Fragment>
-      <Row>
-        <div className="col-md-8">
-          <EntriesFilter
-            filterType={filterType}
-            onFilterTypeChange={onFilterTypeChange}
-            filterValue={filterValue}
-            onFilterValueChange={onFilterValueChange}
-          />
-        </div>
-        <div className="col-md-4">
-          <div className="btn-toolbar pull-right">
-            <FixSelectedButton
-              postUrl={newJobInvocationUrl}
-              disabled={!anyEntriesFixable(preupgradeReports) || !anySelected}
-              csrfToken={csrfToken}
-              ids={idsForInvocationFromEntries(checked)}
-            />
-            <UpgradeAllButton
-              postUrl={newJobInvocationUrl}
-              csrfToken={csrfToken}
-              preupgradeReports={preupgradeReports}
-            />
-          </div>
-        </div>
-      </Row>
-      <PreupgradeReportsList
-        allEntries={filterEntries(
-          filterType,
-          filterValue,
-          sortEntries(flattenEntries(preupgradeReports), sort)
-        )}
-        isSelected={isSelected}
-        toggleSelected={toggleSelected}
-        sort={sort}
-        changeSort={changeSort}
-        toggleSelectAll={toggleSelectAll}
-      />
-    </React.Fragment>
-  );
-};
-
-const withLoadingState = Component => componentProps => {
-  const { error, loading, preupgradeReports, reportsExpected } = componentProps;
-
-  if (!isEmpty(error)) {
-    return (
-      <EmptyState
-        key="preupgrade-reports-error"
-        variant="xs"
-        icon={
-          <Icon iconSize="lg">
-            <ExclamationCircleIcon />
-          </Icon>
-        }
-        header={sprintf(__('Could not retrieve data: %(status)s - %(msg)s'), {
-          status: error.statusText,
-          msg: error.errorMsg,
-        })}
-      />
-    );
-  }
-
-  return (
-    <LoadingState loading={loading}>
-      {preupgradeReports.length > 0 ? (
-        <Component {...componentProps} />
-      ) : (
-        <NoReports reportsExpected={reportsExpected} />
-      )}
-    </LoadingState>
-  );
-};
-
-PreupgradeReports.propTypes = {
-  preupgradeReports: PropTypes.array.isRequired,
-  csrfToken: PropTypes.string.isRequired,
-  newJobInvocationUrl: PropTypes.string.isRequired,
-};
-
-export default withLoadingState(PreupgradeReports);