foreman_leapp 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8841245ebb39f45ba92ea5b955a3398434dc103a860c50f2930019c0ee102a4e
-  data.tar.gz: 9a13e0df52eb412eecff7dfa1adff514670ada9dec259a9e349eef1b5ec9e092
+  metadata.gz: ecb63f3a728352dd6759763bc7d4509a62c94e82ed4f75220779a2287f0584f4
+  data.tar.gz: 2e72adbd90f3b9e5008829add44066a28808c2ab8a6c01d1a5a085337a70e0bb
 SHA512:
-  metadata.gz: 37b092dbdd94f413763b9301c29c552a55cc44a0a0881462fe228d0f1b3510f750145b20eb55b459bc6acf09212b40381657749eaf0590a49024dbd79c9b097a
-  data.tar.gz: f93aca5a49a5c5f76fc36759310c0372f7e56b418ee2bad597461700ba9055544c9bdcb0b5ffab9561eddf7121dc0ad80af0061ee5557944f2d71b2af2927be2
+  metadata.gz: 8b925115f15c6c097bab69fb476eacb476d4cbfb54d1557abd41109720ac0e55d2cab0a155cdbc0aa8a40c0d7f5a303041083b33bac32ad83ec3af8e266b18d4
+  data.tar.gz: 8d92474522623af8c6f1e9fe6e29a93ad991d662dd9b66964b86c6ee1f8d3dcdd63523f272e04cd667d1454131ffbac92990efde2adbd7c7be81118ae43aa1fb

data/Rakefile

@@ -6,21 +6,6 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ForemanLeapp'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 

data/lib/foreman_leapp/engine.rb

@@ -17,7 +17,7 @@ module ForemanLeapp
     initializer 'foreman_leapp.register_plugin', before: :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_leapp do
-          requires_foreman '>= 3.16'
+          requires_foreman '>= 5.0'
           register_gettext
 
           apipie_documented_controllers ["#{ForemanLeapp::Engine.root}/app/controllers/api/v2/*.rb"]

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '3.3.0'
+  VERSION = '4.0.0'
 end

data/webpack/components/PreupgradeReports/PreupgradeReports.js

@@ -1,5 +1,7 @@
 import React, { useState } from 'react';
-import MessageBox from 'foremanReact/components/common/MessageBox';
+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';
@@ -116,10 +118,15 @@ const withLoadingState = Component => componentProps => {
 
   if (!isEmpty(error)) {
     return (
-      <MessageBox
+      <EmptyState
         key="preupgrade-reports-error"
-        icontype="error-circle-o"
-        msg={sprintf(__('Could not retrieve data: %(status)s - %(msg)s'), {
+        variant="xs"
+        icon={
+          <Icon iconSize="lg">
+            <ExclamationCircleIcon />
+          </Icon>
+        }
+        header={sprintf(__('Could not retrieve data: %(status)s - %(msg)s'), {
           status: error.statusText,
           msg: error.errorMsg,
         })}

data/webpack/components/PreupgradeReports/__tests__/PreupgradeReports.fixtures.js

@@ -60,6 +60,49 @@ export const preupgradeReports = [
   },
 ];
 
+export const preupgradeReportsWithFixableEntries = [
+  {
+    hostId: 5,
+    entries: [
+      {
+        title: 'Fixable entry',
+        severity: 'high',
+        id: 100,
+        hostId: 5,
+        hostname: 'host.example.com',
+        flags: [],
+        detail: {
+          remediations: [{ type: 'command', context: ['echo', 'fix'] }],
+        },
+      },
+      {
+        title: 'Not fixable entry',
+        severity: 'low',
+        id: 101,
+        hostId: 5,
+        hostname: 'host.example.com',
+        flags: [],
+      },
+    ],
+  },
+  {
+    hostId: 6,
+    entries: [
+      {
+        title: 'Another fixable entry',
+        severity: 'medium',
+        id: 102,
+        hostId: 6,
+        hostname: 'foo.example.com',
+        flags: [],
+        detail: {
+          remediations: [{ type: 'command', context: ['echo', 'fix2'] }],
+        },
+      },
+    ],
+  },
+];
+
 export const reportsWithRemediations = [
   {
     hostId: 5,

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

@@ -1,54 +1,159 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent, render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import PreupgradeReports from '../PreupgradeReports';
+import {
+  preupgradeReports,
+  preupgradeReportsWithFixableEntries,
+} from './PreupgradeReports.fixtures';
 
-import { preupgradeReports } from './PreupgradeReports.fixtures';
+jest.mock('foremanReact/components/Pagination', () => {
+  const MockPagination = () => <div data-testid="pagination">Pagination</div>;
+  return MockPagination;
+});
+
+jest.mock('../../PreupgradeReportsList/components/images/i_severity-high.svg', () => 'severity-high.svg');
+jest.mock('../../PreupgradeReportsList/components/images/i_severity-med.svg', () => 'severity-med.svg');
+jest.mock('../../PreupgradeReportsList/components/images/i_severity-low.svg', () => 'severity-low.svg');
+
+const mockStore = configureMockStore([]);
 
 const csrfToken = 'xyz';
 const newJobInvocationUrl = '/job_invocations/new';
-const getPreupgradeReports = () => {};
-
-const fixtures = {
-  'should render when loaded with reports': {
-    loading: false,
-    error: {},
-    preupgradeReports,
-    csrfToken,
-    newJobInvocationUrl,
-    getPreupgradeReports,
-    reportsExpected: true,
-  },
-  'should render when loaded without reports': {
-    loading: false,
-    error: {},
-    preupgradeReports: [],
-    csrfToken,
-    newJobInvocationUrl,
-    getPreupgradeReports,
-    reportsExpected: true,
-  },
-  'should render when loading': {
-    loading: true,
-    error: {},
-    preupgradeReports: [],
-    csrfToken,
-    newJobInvocationUrl,
-    getPreupgradeReports,
-    reportsExpected: false,
-  },
-  'should render error': {
-    loading: false,
-    error: {
-      statusText: 'Internal server error',
-      errorMsg: 'Well, this is embarassing',
-    },
-    preupgradeReports: [],
-    csrfToken,
-    newJobInvocationUrl,
-    getPreupgradeReports,
-    reportsExpected: false,
-  },
+
+const defaultProps = {
+  loading: false,
+  error: {},
+  preupgradeReports,
+  csrfToken,
+  newJobInvocationUrl,
+  reportsExpected: true,
 };
 
-describe('PreupgradeReports', () =>
-  testComponentSnapshotsWithFixtures(PreupgradeReports, fixtures));
+const renderComponent = (props = {}) =>
+  render(
+    <Provider store={mockStore({})}>
+      <PreupgradeReports {...defaultProps} {...props} />
+    </Provider>
+  );
+
+const getFixSelectedForm = () =>
+  screen.getByRole('button', { name: 'Fix Selected' }).closest('form');
+
+describe('PreupgradeReports', () => {
+  // withLoadingState wraps content in patternfly-react LoadingState, which
+  // delays showing the spinner by 300ms and always schedules that timeout on
+  // mount — even when loading=false. Without fake timers the timeout fires
+  // after the test unmounts and React logs a setState-on-unmounted warning.
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.runOnlyPendingTimers();
+    jest.useRealTimers();
+  });
+
+  it('renders report entries when loaded with reports', () => {
+    renderComponent();
+
+    expect(screen.getByText('Fix me!')).toBeInTheDocument();
+    expect(screen.getByText('I am broken too')).toBeInTheDocument();
+    expect(screen.getByText('Octocat is not happy')).toBeInTheDocument();
+  });
+
+  it('renders empty state when loaded without reports', () => {
+    renderComponent({ preupgradeReports: [] });
+
+    expect(
+      screen.getByRole('heading', {
+        name: 'No Preupgrade Report Available',
+        level: 5,
+      })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'The preupgrade report could not be generated, check the job details for the reason'
+      )
+    ).toBeInTheDocument();
+  });
+
+  it('renders loading state while data is being fetched', () => {
+    renderComponent({
+      loading: true,
+      preupgradeReports: [],
+      reportsExpected: false,
+    });
+
+    // LoadingState renders nothing until its 300ms timeout elapses.
+    jest.advanceTimersByTime(300);
+
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('heading', {
+        name: 'No Preupgrade Report Available',
+      })
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders error empty state when data retrieval fails', () => {
+    renderComponent({
+      error: {
+        statusText: 'Internal server error',
+        errorMsg: 'Unexpected error',
+      },
+      preupgradeReports: [],
+      reportsExpected: false,
+    });
+
+    expect(
+      screen.getByRole('heading', {
+        name: 'Could not retrieve data: Internal server error - Unexpected error',
+        level: 5,
+      })
+    ).toBeInTheDocument();
+  });
+
+  it('disables Fix Selected when no fixable entries are selected', () => {
+    renderComponent({ preupgradeReports: preupgradeReportsWithFixableEntries });
+
+    expect(screen.getByRole('button', { name: 'Fix Selected' })).toBeDisabled();
+  });
+
+  it('enables Fix Selected and passes selected entry ids when a fixable entry is selected', () => {
+    renderComponent({ preupgradeReports: preupgradeReportsWithFixableEntries });
+
+    const [, fixableEntryCheckbox] = screen.getAllByRole('checkbox');
+
+    fireEvent.click(fixableEntryCheckbox);
+
+    expect(screen.getByRole('button', { name: 'Fix Selected' })).toBeEnabled();
+    expect(
+      getFixSelectedForm().querySelector('input[name="inputs[remediation_ids]"]')
+    ).toHaveValue('100');
+  });
+
+  it('selects all fixable entries when header checkbox is clicked', () => {
+    renderComponent({ preupgradeReports: preupgradeReportsWithFixableEntries });
+
+    const [selectAllCheckbox] = screen.getAllByRole('checkbox');
+
+    fireEvent.click(selectAllCheckbox);
+
+    expect(screen.getByRole('button', { name: 'Fix Selected' })).toBeEnabled();
+
+    const form = getFixSelectedForm();
+
+    expect(
+      form.querySelector('input[name="inputs[remediation_ids]"]')
+    ).toHaveValue('100,102');
+    expect(
+      [...form.querySelectorAll('input[name="host_ids[]"]')].map(
+        input => input.value
+      )
+    ).toEqual(['5', '6']);
+  });
+});

data/webpack/components/PreupgradeReports/components/__snapshots__/NoReports.test.js.snap

@@ -9,6 +9,7 @@ exports[`NoReports should render when reports expected 1`] = `
   icon="warning-triangle-o"
   iconType="pf"
   secondaryActions={Array []}
+  variant="xl"
 />
 `;
 
@@ -21,5 +22,6 @@ exports[`NoReports should render when reports not expected 1`] = `
   icon="in-progress"
   iconType="pf"
   secondaryActions={Array []}
+  variant="xl"
 />
 `;

data/webpack/components/PreupgradeReportsTable/PreupgradeReportsTable.scss

@@ -3,3 +3,12 @@
     white-space: pre-wrap;
   }
 }
+
+.leapp-expanded-tbody {
+  border: 1px solid var(--pf-v5-global--BorderColor--100);
+  box-shadow: var(--pf-v5-global--BoxShadow--sm);
+
+  tr:first-child > td {
+    background-color: var(--pf-v5-global--primary-color--light-background, #e7f1fa);
+  }
+}