foreman_leapp 4.1.2 → 4.3.0

data/test/unit/helpers/job_helper_test.rb

@@ -17,6 +17,26 @@ module Helpers
       FactoryBot.create(:template_invocation, template: job_template, job_invocation: job_invocation)
     end
 
+    describe 'with_leapp_report' do
+      test 'returns true for leapp preupgrade feature on template' do
+        RemoteExecutionFeature.find_by(label: feature_label).update(job_template: job_template)
+        job_invocation.task.stubs(:input).returns({})
+        assert helper.with_leapp_report(job_invocation)
+      end
+
+      test 'returns true for leapp remediation feature on template' do
+        remediation_label = 'leapp_remediation_plan'
+        RemoteExecutionFeature.find_by(label: remediation_label).update(job_template: job_template)
+        job_invocation.task.stubs(:input).returns({})
+        assert helper.with_leapp_report(job_invocation)
+      end
+
+      test 'returns false when no leapp features apply' do
+        job_invocation.task.stubs(:input).returns({ 'job_features' => ['some_other_feature'] })
+        assert_not helper.with_leapp_report(job_invocation)
+      end
+    end
+
     describe 'correct_feature?' do
       test 'returns true when feature is listed in job_features' do
         job_invocation.task.stubs(:input).returns({ 'job_features' => [feature_label] })

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('');
@@ -24,14 +24,15 @@ export const usePreupgradeTableState = (data, isExpanded) => {
   const [expandedRowIds, setExpandedRowIds] = useState(new Set());
 
   // eslint-disable-next-line camelcase
-  const isLeappJob = data?.template_name?.includes('Run preupgrade via Leapp');
+  const isLeappJob = Boolean(data?.has_leapp_report);
   // eslint-disable-next-line camelcase
   const jobStatusLabel = data?.status_label;
 
   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,

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

@@ -49,7 +49,7 @@ const mockJobId = 42;
 const mockReportId = 999;
 const mockJobData = {
   id: mockJobId,
-  template_name: 'Run preupgrade via Leapp',
+  has_leapp_report: true,
 };
 
 const mockEntries = Array.from({ length: 12 }, (_, i) => ({
@@ -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();
@@ -132,12 +168,24 @@ describe('PreupgradeReportsTable', () => {
   });
 
   it('does not render anything for non-Leapp jobs', () => {
-    renderComponent({ id: 55, template_name: 'Standard RHEL Update' });
+    renderComponent({ id: 55, has_leapp_report: false });
     expect(
       screen.queryByText('Leapp preupgrade report')
     ).not.toBeInTheDocument();
   });
 
+  it('renders when has_leapp_report is true (e.g. remediation jobs)', async () => {
+    renderComponent({
+      id: mockJobId,
+      has_leapp_report: true,
+    });
+    expandSection();
+    await waitForTable();
+    expect(
+      screen.getByText('Report Entry 1', { selector: 'td' })
+    ).toBeInTheDocument();
+  });
+
   it('refetches when status_label transitions (e.g. Running → Succeeded)', async () => {
     const store = configureStore({
       reducer: mockReducer,
@@ -390,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();
@@ -407,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],
         },
       })
     );
@@ -570,13 +615,89 @@ describe('PreupgradeReportsTable', () => {
       expect.objectContaining({
         url: expect.stringContaining('/bulk_remediate'),
         params: {
-          search: '',
+          job_invocation_id: mockJobId,
           excluded_ids: [],
         },
       })
     );
   });
 
+  it('keeps Fix Selected enabled on page 1 when select-all is active but fixable rows are only on later pages', async () => {
+    const entriesFixableOnLaterPages = mockEntries.map((entry, index) => {
+      if (index < 5) {
+        return {
+          ...entry,
+          detail: {
+            ...entry.detail,
+            remediations:
+              index === 1
+                ? [{ type: 'hint', context: 'Manual fix only' }]
+                : null,
+          },
+        };
+      }
+
+      if (index === 5) {
+        return {
+          ...entry,
+          detail: {
+            remediations: [{ type: 'command', context: ['echo', 'fix'] }],
+          },
+        };
+      }
+
+      return {
+        ...entry,
+        detail: { ...entry.detail, remediations: null },
+      };
+    });
+
+    const fixableEntryCount = entriesFixableOnLaterPages.filter(entry =>
+      entry.detail?.remediations?.some(r => r.type === 'command')
+    ).length;
+
+    APIActions.get.mockImplementation(({ key, handleSuccess, params }) => {
+      return () => {
+        if (key.includes('GET_LEAPP_REPORT_LIST')) {
+          handleSuccess({ results: [{ id: mockReportId }] });
+        }
+        if (key.includes('GET_LEAPP_REPORT_ENTRIES')) {
+          const page = Number(params?.page ?? 1);
+          const perPage = Number(params?.per_page ?? 5);
+          const start = (page - 1) * perPage;
+          const results = entriesFixableOnLaterPages.slice(start, start + perPage);
+          handleSuccess({
+            id: mockReportId,
+            results,
+            total: entriesFixableOnLaterPages.length,
+            subtotal: entriesFixableOnLaterPages.length,
+          });
+        }
+        if (key.includes('GET_FIXABLE_COUNT')) {
+          handleSuccess({
+            total: fixableEntryCount,
+            subtotal: fixableEntryCount,
+          });
+        }
+        return { type: 'MOCK_API_SUCCESS' };
+      };
+    });
+
+    renderComponent();
+    expandSection();
+    await waitFor(() =>
+      screen.getByText('Report Entry 1', { selector: 'td' })
+    );
+
+    fireEvent.click(screen.getByLabelText('Select all'));
+
+    await waitFor(() =>
+      expect(
+        screen.getByRole('button', { name: 'Fix Selected' })
+      ).not.toBeDisabled()
+    );
+  });
+
   it('fetches fixable count on demand when Select All is clicked', async () => {
     let fixableCountFetched = false;
 

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;
@@ -375,8 +368,8 @@ const PreupgradeReportsTable = ({ data = {} }) => {
     status === STATUS.PENDING ||
     isSubmitting ||
     !hasAnySelection ||
-    // When using select-all, check if any fixable entries exist on current page
-    (areAllRowsSelected() && pagedFixableEntries.length === 0);
+    // Global select-all with zero fixable entries in the report (not per-page)
+    (areAllRowsSelected() && fixableCount === 0);
 
   const isRunUpgradeDisabled =
     status === STATUS.PENDING ||
@@ -416,7 +409,7 @@ const PreupgradeReportsTable = ({ data = {} }) => {
               </ToolbarItem>
             )}
 
-            {reportId && searchProps && (
+            {hasReports && searchProps && (
               <ToolbarItem className="leapp-searchbar-item">
                 <SearchBar
                   data={searchProps}
@@ -547,7 +540,7 @@ PreupgradeReportsTable.propTypes = {
   data: PropTypes.shape({
     id: PropTypes.number,
     // eslint-disable-next-line camelcase
-    template_name: PropTypes.string,
+    has_leapp_report: PropTypes.bool,
     // eslint-disable-next-line camelcase
     status_label: PropTypes.string,
     targeting: PropTypes.shape({

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);