foreman_leapp 3.1.0 → 3.3.0

data/webpack/components/PreupgradeReportsTable/index.js

@@ -0,0 +1,237 @@
+import PropTypes from 'prop-types';
+import React, { useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import { ExpandableSection, Tooltip } from '@patternfly/react-core';
+import { ExpandableRowContent, Tbody, Td, Tr } from '@patternfly/react-table';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Table } from 'foremanReact/components/PF4/TableIndexPage/Table/Table';
+import { getColumnHelpers } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
+import { APIActions } from 'foremanReact/redux/API';
+import { STATUS } from 'foremanReact/constants';
+import { entriesPage } from '../PreupgradeReports/PreupgradeReportsHelpers';
+import ReportDetails, { renderSeverityLabel } from './ReportDetails';
+
+const PreupgradeReportsTable = ({ data = {} }) => {
+  const [error, setError] = useState(null);
+
+  const [isReportExpanded, setIsReportExpanded] = useState(false); // Outer expansion state (Leapp Report Section)
+  const [pagination, setPagination] = useState({ page: 1, perPage: 5 });
+  const [reportData, setReportData] = useState(null);
+  const [status, setStatus] = useState(STATUS.RESOLVED);
+  const [expandedRowIds, setExpandedRowIds] = useState(new Set()); // Inner table expansion state (Rows)
+
+  const dispatch = useDispatch();
+  // eslint-disable-next-line camelcase
+  const isLeappJob = data?.template_name?.includes('Run preupgrade via Leapp');
+
+  const columns = {
+    title: {
+      title: __('Title'),
+    },
+    host: {
+      title: __('Host'),
+      wrapper: entry =>
+        entry.hostname || (reportData && reportData.hostname) || '-',
+    },
+    risk_factor: {
+      title: __('Risk Factor'),
+      wrapper: ({ severity }) => renderSeverityLabel(severity),
+    },
+    has_remediation: {
+      title: __('Has Remediation?'),
+      wrapper: entry =>
+        entry.detail && entry.detail.remediations ? __('Yes') : __('No'),
+    },
+    inhibitor: {
+      title: __('Inhibitor?'),
+      wrapper: entry =>
+        entry.flags && entry.flags.some(flag => flag === 'inhibitor') ? (
+          <Tooltip content={__('This issue inhibits the upgrade.')}>
+            <span>{__('Yes')}</span>
+          </Tooltip>
+        ) : (
+          __('No')
+        ),
+    },
+  };
+
+  useEffect(() => {
+    let isMounted = true;
+    if (!isLeappJob || !isReportExpanded || reportData) {
+      return undefined;
+    }
+    setStatus(STATUS.PENDING);
+
+    dispatch(
+      APIActions.get({
+        key: `GET_LEAPP_REPORT_LIST_${data.id}`,
+        url: `/api/job_invocations/${data.id}/preupgrade_reports`,
+        handleSuccess: listResponse => {
+          if (!isMounted) return;
+          const listPayload = listResponse.data || listResponse;
+          const summary = listPayload.results?.[0];
+          if (summary?.id) {
+            dispatch(
+              APIActions.get({
+                key: `GET_LEAPP_REPORT_DETAIL_${summary.id}`,
+                url: `/api/preupgrade_reports/${summary.id}`,
+                handleSuccess: detailResponse => {
+                  if (isMounted) {
+                    const detailPayload = detailResponse.data || detailResponse;
+                    setReportData(detailPayload);
+                    setStatus(STATUS.RESOLVED);
+                  }
+                },
+                handleError: err => {
+                  if (isMounted) {
+                    setError(err);
+                    setStatus(STATUS.ERROR);
+                  }
+                },
+              })
+            );
+          } else if (isMounted) {
+            setReportData({});
+            setStatus(STATUS.RESOLVED);
+          }
+        },
+        handleError: err => {
+          if (isMounted) {
+            setError(err);
+            setStatus(STATUS.ERROR);
+          }
+        },
+      })
+    );
+
+    return () => {
+      isMounted = false;
+    };
+  }, [isReportExpanded, data.id, isLeappJob, reportData, dispatch]);
+
+  // eslint-disable-next-line camelcase
+  const entries = reportData?.preupgrade_report_entries || [];
+  const pagedEntries = entriesPage(entries, pagination);
+
+  const handleParamsChange = newParams => {
+    setPagination(prev => ({
+      ...prev,
+      page: newParams.page || prev.page,
+      perPage: newParams.per_page || prev.perPage,
+    }));
+    setExpandedRowIds(new Set());
+  };
+
+  const toggleRowExpansion = (id, isExpanding) => {
+    setExpandedRowIds(prev => {
+      const newSet = new Set(prev);
+      if (isExpanding) {
+        newSet.add(id);
+      } else {
+        newSet.delete(id);
+      }
+      return newSet;
+    });
+  };
+
+  const areAllRowsExpanded =
+    pagedEntries.length > 0 &&
+    pagedEntries.every(entry => expandedRowIds.has(entry.id));
+
+  const onExpandAll = () => {
+    setExpandedRowIds(() => {
+      if (areAllRowsExpanded) {
+        return new Set();
+      }
+      return new Set(pagedEntries.map(e => e.id));
+    });
+  };
+
+  const [columnKeys, keysToColumnNames] = getColumnHelpers(columns);
+
+  if (!isLeappJob) return null;
+
+  return (
+    <ExpandableSection
+      className="leapp-report-section"
+      isExpanded={isReportExpanded}
+      onToggle={(_event, val) => setIsReportExpanded(val)}
+      toggleText={__('Leapp preupgrade report')}
+    >
+      <Table
+        ouiaId="leapp-report-table"
+        columns={columns}
+        isEmbedded
+        params={{
+          page: pagination.page,
+          perPage: pagination.perPage,
+          order: '',
+        }}
+        results={pagedEntries}
+        itemCount={entries.length}
+        url=""
+        isPending={status === STATUS.PENDING}
+        errorMessage={
+          status === STATUS.ERROR && error?.message ? error.message : null
+        }
+        showCheckboxes={false}
+        refreshData={() => {}}
+        isDeleteable={false}
+        emptyMessage={__('The preupgrade report shows no issues.')}
+        setParams={handleParamsChange}
+        childrenOutsideTbody
+        onExpandAll={onExpandAll}
+        // Inverted per PatternFly implementation to ensure correct toggle icon state
+        areAllRowsExpanded={!areAllRowsExpanded}
+      >
+        {pagedEntries.map((entry, rowIndex) => {
+          const isRowExpanded = expandedRowIds.has(entry.id);
+          return (
+            <Tbody key={entry.id} isExpanded={isRowExpanded}>
+              <Tr ouiaId={`table-row-${rowIndex}`}>
+                <Td
+                  expand={{
+                    rowIndex,
+                    isExpanded: isRowExpanded,
+                    onToggle: (_event, _rowIndex, isOpen) =>
+                      toggleRowExpansion(entry.id, isOpen),
+                  }}
+                />
+                {columnKeys.map(key => (
+                  <Td key={key} dataLabel={keysToColumnNames[key]}>
+                    {columns[key].wrapper
+                      ? columns[key].wrapper(entry)
+                      : entry[key]}
+                  </Td>
+                ))}
+              </Tr>
+              <Tr
+                isExpanded={isRowExpanded}
+                ouiaId={`table-row-details-${rowIndex}`}
+              >
+                <Td colSpan={columnKeys.length + 1}>
+                  <ExpandableRowContent>
+                    {isRowExpanded && <ReportDetails entry={entry} />}
+                  </ExpandableRowContent>
+                </Td>
+              </Tr>
+            </Tbody>
+          );
+        })}
+      </Table>
+    </ExpandableSection>
+  );
+};
+
+PreupgradeReportsTable.propTypes = {
+  data: PropTypes.shape({
+    id: PropTypes.number,
+    template_name: PropTypes.string,
+  }),
+};
+
+PreupgradeReportsTable.defaultProps = {
+  data: {},
+};
+
+export default PreupgradeReportsTable;

data/webpack/global_index.js

@@ -0,0 +1,10 @@
+import React from 'react';
+import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
+import PreupgradeReportsTable from './components/PreupgradeReportsTable';
+
+addGlobalFill(
+  'job-invocation-additional-info',
+  'leapp-preupgrade-report-fill',
+  <PreupgradeReportsTable key="leapp-report-fill" />,
+  100
+);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Foreman Leapp team
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2026-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -130,10 +130,6 @@ files:
 - test/unit/actions/preupgrade_job_test.rb
 - test/unit/helpers/job_helper_test.rb
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
-- webpack/__mocks__/foremanReact/common/I18n.js
-- webpack/__mocks__/foremanReact/components/Pagination.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState.js
-- webpack/__mocks__/foremanReact/components/common/MessageBox.js
 - webpack/components/PreupgradeReports/PreupgradeReports.js
 - webpack/components/PreupgradeReports/PreupgradeReportsActions.js
 - webpack/components/PreupgradeReports/PreupgradeReportsHelpers.js
@@ -164,7 +160,6 @@ files:
 - webpack/components/PreupgradeReports/index.js
 - webpack/components/PreupgradeReportsList/PreupgradeReportList.scss
 - webpack/components/PreupgradeReportsList/__tests__/PreupgradeReportsList.test.js
-- webpack/components/PreupgradeReportsList/__tests__/__snapshots__/PreupgradeReportsList.test.js.snap
 - webpack/components/PreupgradeReportsList/components/EmptyInfoItem.js
 - webpack/components/PreupgradeReportsList/components/InfoItem.js
 - webpack/components/PreupgradeReportsList/components/InhibitorInfoItem.js
@@ -191,8 +186,13 @@ files:
 - 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/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
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
 test_files:

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -1,2 +0,0 @@
-export const translate = val => val;
-export const sprintf = val => val;

data/webpack/__mocks__/foremanReact/components/Pagination.js

@@ -1,2 +0,0 @@
-const Pagination = () => jest.fn();
-export default Pagination;

data/webpack/__mocks__/foremanReact/components/common/EmptyState.js

@@ -1 +0,0 @@
-export const EmptyStatePattern = () => jest.fn();

data/webpack/__mocks__/foremanReact/components/common/MessageBox.js

@@ -1,2 +0,0 @@
-const MessageBox = () => jest.fn();
-export default MessageBox;

data/webpack/components/PreupgradeReportsList/__tests__/__snapshots__/PreupgradeReportsList.test.js.snap

@@ -1,135 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PreupgradeReportsList should render 1`] = `
-<ListView
-  className=""
-  id="preupgrade-report-entries-list-view"
->
-  <PreupgradeReportsListHeader
-    changeSort={[Function]}
-    sort={
-      Object {
-        "attribute": "",
-        "order": "asc",
-      }
-    }
-    toggleSelectAll={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "Too severe to talk about",
-        "title": "Fix me!",
-      }
-    }
-    isEntrySelected={false}
-    key="0"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "medium",
-        "title": "I am broken too",
-      }
-    }
-    isEntrySelected={false}
-    key="1"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "high",
-        "title": "Octocat is not happy",
-      }
-    }
-    isEntrySelected={false}
-    key="2"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "low",
-        "title": "Not enough credits",
-      }
-    }
-    isEntrySelected={false}
-    key="3"
-    toggleSelected={[Function]}
-  />
-  <Pagination
-    itemCount={4}
-    onChange={[Function]}
-    viewType="list"
-  />
-</ListView>
-`;
-
-exports[`PreupgradeReportsList should render when working 1`] = `
-<ListView
-  className=""
-  id="preupgrade-report-entries-list-view"
->
-  <PreupgradeReportsListHeader
-    changeSort={[Function]}
-    sort={
-      Object {
-        "attribute": "",
-        "order": "asc",
-      }
-    }
-    toggleSelectAll={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "Too severe to talk about",
-        "title": "Fix me!",
-      }
-    }
-    isEntrySelected={false}
-    key="0"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "medium",
-        "title": "I am broken too",
-      }
-    }
-    isEntrySelected={false}
-    key="1"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "high",
-        "title": "Octocat is not happy",
-      }
-    }
-    isEntrySelected={false}
-    key="2"
-    toggleSelected={[Function]}
-  />
-  <PreupgradeReportEntry
-    entry={
-      Object {
-        "severity": "low",
-        "title": "Not enough credits",
-      }
-    }
-    isEntrySelected={false}
-    key="3"
-    toggleSelected={[Function]}
-  />
-  <Pagination
-    itemCount={4}
-    onChange={[Function]}
-    viewType="list"
-  />
-</ListView>
-`;