foreman_remote_execution 17.2.0 → 17.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e240991349f9cb6bc60f979202f8de2bde03d3d8100c13e701469aa2f8e29a97
-  data.tar.gz: f9936d90d62ce33221969367e5625cdf750c36922855142f460f46b18a8bc925
+  metadata.gz: b2273dcbf9a1bd18e838f9312d802e752f181723049c543895e2ba9bbe47309b
+  data.tar.gz: 4be8496d42f9abcd54116d8e0dc09669d0e8c67674341e9672601450dc77a57a
 SHA512:
-  metadata.gz: eaf96768e4b112d387e660cca80d6b9dd360dd1145cf40b5540ea428bdf4bf3482e47591a05d2e2f0bcc05e36808e8163346258f323cc7f7f60917db3b930686
-  data.tar.gz: 56dbf3ac2a8cb8f90c8ae719fc5213c2fbf40588812bf98552fa8bdd967b6d1150632543dfb6992df09050d74813dd3eeb367cc857c3709a921a404b3772c823
+  metadata.gz: 0656e10eb461a75898d1359ab6c03f5e10a6bbac18e03bac8ca804afd06f1050dc6bb6fb8a05ca0ced9a725dc4cd6b6202e164fca9a0ecf74179708aaa05d955
+  data.tar.gz: 76bfdccd452647bbdd56866eb6175c1efbb1efde242ef416a23902e429b1be6099e3a1f00ae9ddd1f2e956a21cb28baf099e31934ab501e112532934fdc7eadd

data/app/controllers/job_invocations_controller.rb

@@ -2,6 +2,7 @@ class JobInvocationsController < ApplicationController
   include ::Foreman::Controller::AutoCompleteSearch
   include ::ForemanTasks::Concerns::Parameters::Triggering
   include ::JobInvocationsChartHelper
+  include RemoteExecutionHelper
 
   def new
     return @composer = prepare_composer if params[:feature].present?
@@ -110,6 +111,20 @@ class JobInvocationsController < ApplicationController
     render :partial => 'job_invocations/preview_hosts_list'
   end
 
+  def report
+    @job_invocation = resource_base.find(params[:id])
+    template = job_report_template
+    unless template
+      return not_found(_('Report template not found or not configured properly'))
+    end
+
+    unless ReportTemplate.authorized(:generate_report_templates).find_by(:id => template.id)
+      return render_403(_('Missing permissions to generate report templates'))
+    end
+
+    redirect_to generate_report_template_path(template, job_report_template_parameters(@job_invocation, template))
+  end
+
   def cancel
     @job_invocation = resource_base.find(params[:id])
     result = @job_invocation.cancel(params[:force])
@@ -159,7 +174,7 @@ class JobInvocationsController < ApplicationController
         'create'
       when 'cancel'
         'cancel'
-      when 'chart', 'preview_job_invocations_per_host'
+      when 'chart', 'preview_job_invocations_per_host', 'report'
         'view'
       else
         super

data/config/routes.rb

@@ -36,6 +36,7 @@ Rails.application.routes.draw do
     end
     member do
       post 'cancel'
+      get 'report'
     end
   end
 
@@ -70,7 +71,7 @@ Rails.application.routes.draw do
           get 'hosts'
           post 'cancel'
           post 'rerun'
-          get  'template_invocations', :to => 'template_invocations#template_invocations'
+          get 'template_invocations', :to => 'template_invocations#template_invocations'
           get 'outputs'
           post 'outputs'
         end

data/lib/foreman_remote_execution/plugin.rb

@@ -143,7 +143,7 @@ Foreman::Plugin.register :foreman_remote_execution do
     permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
     permission :create_job_invocations, { :job_invocations => [:new, :create, :legacy_create, :refresh, :rerun, :preview_hosts],
                                           'api/v2/job_invocations' => [:create, :rerun] }, :resource_type => 'JobInvocation'
-    permission :view_job_invocations, { :job_invocations => [:index, :chart, :show, :auto_complete_search, :preview_job_invocations_per_host], :template_invocations => [:show, :show_template_invocation_by_host],
+    permission :view_job_invocations, { :job_invocations => [:index, :chart, :show, :auto_complete_search, :preview_job_invocations_per_host, :report], :template_invocations => [:show, :show_template_invocation_by_host],
                                         'api/v2/job_invocations' => [:index, :show, :output, :raw_output, :outputs, :hosts] }, :resource_type => 'JobInvocation'
     permission :view_template_invocations, { :template_invocations => [:show, :template_invocation_preview, :show_template_invocation_by_host],
                                             'api/v2/template_invocations' => [:template_invocations], :ui_job_wizard => [:job_invocation] }, :resource_type => 'TemplateInvocation'

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '17.2.0'.freeze
+  VERSION = '17.2.1'.freeze
 end

data/test/functional/job_invocations_controller_test.rb

@@ -60,6 +60,90 @@ class JobInvocationsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  context '#report' do
+    setup do
+      @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+      @report_template = FactoryBot.create(:report_template, :name => 'Job - Invocation Report', :template => '<%= "report output" %>')
+      @report_template.template_inputs.create!(:name => 'job_id', :input_type => 'user')
+      Setting['remote_execution_job_invocation_report_template'] = @report_template.name
+    end
+
+    test 'should redirect to report generation page' do
+      get :report, params: { :id => @invocation.id }, session: set_session_user
+      template_input = @report_template.template_inputs.where(name: 'job_id').first
+      expected_params = {
+        report_template_report: {
+          input_values: {
+            "#{template_input.id}": {
+              value: @invocation.id,
+            },
+          },
+        },
+      }
+      assert_redirected_to generate_report_template_path(@report_template, expected_params)
+    end
+
+    test 'should redirect to report generation page with custom template name' do
+      custom_template = FactoryBot.create(:report_template, :name => 'My Custom Job Report', :template => '<%= "custom report" %>')
+      custom_template.template_inputs.create!(:name => 'job_id', :input_type => 'user')
+      Setting['remote_execution_job_invocation_report_template'] = custom_template.name
+
+      get :report, params: { :id => @invocation.id }, session: set_session_user
+      template_input = custom_template.template_inputs.where(name: 'job_id').first
+      expected_params = {
+        report_template_report: {
+          input_values: {
+            "#{template_input.id}": {
+              value: @invocation.id,
+            },
+          },
+        },
+      }
+      assert_redirected_to generate_report_template_path(custom_template, expected_params)
+    end
+
+    test 'should return 404 when report template is not configured' do
+      Setting['remote_execution_job_invocation_report_template'] = 'Nonexistent Template'
+      get :report, params: { :id => @invocation.id }, session: set_session_user
+      assert_response :not_found
+    end
+
+    test 'should deny access when user lacks generate_report_templates permission' do
+      user = FactoryBot.create(:user, :admin => false)
+      @report_template.organizations = user.organizations
+      @report_template.locations = user.locations
+      setup_user('view', 'job_invocations', nil, user)
+      setup_user('view', 'hosts', nil, user)
+      setup_user('view', 'report_templates', nil, user)
+
+      get :report, params: { :id => @invocation.id }, session: set_session_user(user)
+      assert_response :forbidden
+    end
+
+    test 'should redirect when user has generate_report_templates permission' do
+      user = FactoryBot.create(:user, :admin => false)
+      @report_template.organizations = user.organizations
+      @report_template.locations = user.locations
+      setup_user('view', 'job_invocations', nil, user)
+      setup_user('view', 'hosts', nil, user)
+      setup_user('view', 'report_templates', nil, user)
+      setup_user('generate', 'report_templates', nil, user)
+
+      get :report, params: { :id => @invocation.id }, session: set_session_user(user)
+      template_input = @report_template.template_inputs.where(name: 'job_id').first
+      expected_params = {
+        report_template_report: {
+          input_values: {
+            "#{template_input.id}": {
+              value: @invocation.id,
+            },
+          },
+        },
+      }
+      assert_redirected_to generate_report_template_path(@report_template, expected_params)
+    end
+  end
+
   context 'restricted access' do
     setup do
       @admin = users(:admin)

data/webpack/JobInvocationDetail/JobInvocationConstants.js

@@ -10,8 +10,6 @@ export const CANCEL_JOB = 'CANCEL_JOB';
 export const GET_TEMPLATE_INVOCATIONS = 'GET_TEMPLATE_INVOCATIONS';
 export const CHANGE_ENABLED_RECURRING_LOGIC = 'CHANGE_ENABLED_RECURRING_LOGIC';
 export const CANCEL_RECURRING_LOGIC = 'CANCEL_RECURRING_LOGIC';
-export const GET_REPORT_TEMPLATES = 'GET_REPORT_TEMPLATES';
-export const GET_REPORT_TEMPLATE_INPUTS = 'GET_REPORT_TEMPLATE_INPUTS';
 export const JOB_INVOCATION_HOSTS = 'JOB_INVOCATION_HOSTS';
 export const GET_TEMPLATE_INVOCATION = 'GET_TEMPLATE_INVOCATION';
 export const DIRECT_OPEN_HOST_LIMIT = 3;

data/webpack/JobInvocationDetail/JobInvocationToolbarButtons.js

@@ -1,6 +1,5 @@
-/* eslint-disable max-lines */
 import PropTypes from 'prop-types';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Button, Split, SplitItem } from '@patternfly/react-core';
 import { UndoIcon } from '@patternfly/react-icons';
@@ -14,17 +13,12 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
 import { usePermissions } from 'foremanReact/common/hooks/Permissions/permissionHooks';
-import { get } from 'foremanReact/redux/API';
 import {
   cancelJob,
   cancelRecurringLogic,
   enableRecurringLogic,
 } from './JobInvocationActions';
-import {
-  STATUS,
-  GET_REPORT_TEMPLATES,
-  GET_REPORT_TEMPLATE_INPUTS,
-} from './JobInvocationConstants';
+import { STATUS } from './JobInvocationConstants';
 import { selectTaskCancelable } from './JobInvocationSelectors';
 
 const JobInvocationToolbarButtons = ({ jobId, data }) => {
@@ -43,26 +37,13 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
     'generate_report_templates',
   ]);
   const [isActionOpen, setIsActionOpen] = useState(false);
-  const [reportTemplateJobId, setReportTemplateJobId] = useState(undefined);
-  const [templateInputId, setTemplateInputId] = useState(undefined);
   const dispatch = useDispatch();
-  const reportHref = useMemo(() => {
-    if (reportTemplateJobId === undefined || templateInputId === undefined) {
-      return undefined;
-    }
-    const queryParams = new URLSearchParams({
-      [`report_template_report[input_values][${templateInputId}][value]`]: jobId,
-    });
-    return foremanUrl(
-      `/templates/report_templates/${reportTemplateJobId}/generate?${queryParams.toString()}`
-    );
-  }, [jobId, reportTemplateJobId, templateInputId]);
+  const reportHref = foremanUrl(`/job_invocations/${jobId}/report`);
 
   const isCreateReportDisabled =
     !canGenerateReportTemplates ||
     task?.state === STATUS.RUNNING ||
-    task?.state === STATUS.PENDING ||
-    reportHref === undefined;
+    task?.state === STATUS.PENDING;
 
   const onActionFocus = useCallback(() => {
     const element = document.getElementById(
@@ -78,58 +59,6 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
   }, [onActionFocus]);
   const onActionToggle = useCallback((_event, val) => setIsActionOpen(val), []);
 
-  useEffect(() => {
-    let isMounted = true;
-    dispatch(
-      get({
-        key: GET_REPORT_TEMPLATES,
-        url: '/api/report_templates',
-        handleSuccess: ({ data: { results } }) => {
-          if (isMounted) {
-            setReportTemplateJobId(
-              results.find(result => result.name === 'Job - Invocation Report')
-                ?.id
-            );
-          }
-        },
-        handleError: () => {
-          if (isMounted) {
-            setReportTemplateJobId(undefined);
-          }
-        },
-      })
-    );
-    return () => {
-      isMounted = false;
-    };
-  }, [dispatch]);
-  useEffect(() => {
-    let isMounted = true;
-    if (reportTemplateJobId !== undefined) {
-      dispatch(
-        get({
-          key: GET_REPORT_TEMPLATE_INPUTS,
-          url: `/api/templates/${reportTemplateJobId}/template_inputs`,
-          handleSuccess: ({ data: { results } }) => {
-            if (isMounted) {
-              setTemplateInputId(
-                results.find(result => result.name === 'job_id')?.id
-              );
-            }
-          },
-          handleError: () => {
-            if (isMounted) {
-              setTemplateInputId(undefined);
-            }
-          },
-        })
-      );
-    }
-    return () => {
-      isMounted = false;
-    };
-  }, [dispatch, reportTemplateJobId]);
-
   const recurrenceDropdownItems = useMemo(
     () =>
       recurrence
@@ -262,7 +191,7 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
             variant="control"
             isDisabled={!canCreateJobInvocations}
           >
-            {__(`Rerun all`)}
+            {__('Rerun all')}
           </Button>,
         ]}
         splitButtonVariant="action"
@@ -279,12 +208,11 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
           <Button
             component="a"
             ouiaId="button-create-report"
-            className="button-create-report"
             href={reportHref}
             variant="secondary"
             isDisabled={isCreateReportDisabled}
           >
-            {__(`Create report`)}
+            {__('Create report')}
           </Button>
         </SplitItem>
         <SplitItem>

data/webpack/JobInvocationDetail/__tests__/MainInformation.test.js

@@ -15,8 +15,6 @@ import {
   jobInvocationData,
   jobInvocationDataScheduled,
   jobInvocationDataRecurring,
-  mockReportTemplatesResponse,
-  mockReportTemplateInputsResponse,
 } from './fixtures';
 import {
   cancelJob,
@@ -28,8 +26,6 @@ import {
   CANCEL_JOB,
   CANCEL_RECURRING_LOGIC,
   CHANGE_ENABLED_RECURRING_LOGIC,
-  GET_REPORT_TEMPLATES,
-  GET_REPORT_TEMPLATE_INPUTS,
   JOB_INVOCATION_KEY,
 } from '../JobInvocationConstants';
 
@@ -83,23 +79,9 @@ jest.mock('foremanReact/routes/common/PageLayout/PageLayout', () =>
 );
 
 const setupApiMocks = () => {
-  api.get.mockImplementation(({ handleSuccess, key, ...action }) => {
-    if (key === GET_REPORT_TEMPLATES) {
-      if (handleSuccess) {
-        handleSuccess({
-          data: mockReportTemplatesResponse,
-        });
-      }
-    } else if (key === GET_REPORT_TEMPLATE_INPUTS) {
-      if (handleSuccess) {
-        handleSuccess({
-          data: mockReportTemplateInputsResponse,
-        });
-      }
-    }
-
-    return { type: 'get', key, ...action };
-  });
+  api.get.mockImplementation(({ handleSuccess, key, ...action }) =>
+    ({ type: 'get', key, ...action })
+  );
   APIActions.post.mockImplementation(payload => ({ type: 'post', ...payload }));
   APIActions.put.mockImplementation(payload => ({ type: 'put', ...payload }));
 };
@@ -131,8 +113,6 @@ jest.mock('../JobInvocationHostTable.js', () => () => (
   <div data-testid="mock-table">Mock Table</div>
 ));
 
-const reportTemplateJobId = mockReportTemplatesResponse.results[0].id;
-
 const defaultHistory = { push: jest.fn() };
 
 const renderJobInvocationDetailPage = (
@@ -235,9 +215,7 @@ describe('JobInvocationDetailPage', () => {
 
     // checks the global actions and if they link to the correct url
     expect(screen.getByText('Create report').getAttribute('href')).toEqual(
-      foremanUrl(
-        `/templates/report_templates/${mockReportTemplatesResponse.results[0].id}/generate?report_template_report%5Binput_values%5D%5B${mockReportTemplateInputsResponse.results[0].id}%5D%5Bvalue%5D=${jobId}`
-      )
+      foremanUrl(`/job_invocations/${jobId}/report`)
     );
     expect(screen.getByText('Rerun all').getAttribute('href')).toEqual(
       foremanUrl(`/job_invocations/${jobId}/rerun`)
@@ -319,19 +297,6 @@ describe('JobInvocationDetailPage', () => {
       { jobId }
     );
 
-    expect(api.get).toHaveBeenCalledWith(
-      expect.objectContaining({
-        key: GET_REPORT_TEMPLATES,
-        url: '/api/report_templates',
-      })
-    );
-    expect(api.get).toHaveBeenCalledWith(
-      expect.objectContaining({
-        key: GET_REPORT_TEMPLATE_INPUTS,
-        url: `/api/templates/${reportTemplateJobId}/template_inputs`,
-      })
-    );
-
     api.get.mockClear();
     APIActions.post.mockClear();
     APIActions.put.mockClear();

data/webpack/JobInvocationDetail/__tests__/fixtures.js

@@ -140,14 +140,6 @@ export const mockPermissionsData = {
   edit_recurring_logics: true,
 };
 
-export const mockReportTemplatesResponse = {
-  results: [{ id: '12', name: 'Job - Invocation Report' }],
-};
-
-export const mockReportTemplateInputsResponse = {
-  results: [{ id: '34', name: 'job_id' }],
-};
-
 const templateInvocationID = 157;
 
 export const jobInvocationOutput = [

data/webpack/JobWizard/Footer.js

@@ -22,6 +22,19 @@ export const Footer = ({ canSubmit, onSave }) => {
             activeStep && activeStep.enableNext !== undefined
               ? activeStep.enableNext
               : true;
+          const isReviewStep = activeStep.name === WIZARD_TITLES.review;
+          const canSkipToReview = canSubmit && !isReviewStep;
+          const skipToReviewTooltip = () => {
+            if (canSkipToReview) {
+              return __('Skip to review step');
+            }
+            if (isReviewStep) {
+              return __('Already on the review step');
+            }
+            return __(
+              'Fill all required fields in all the steps to start the job'
+            );
+          };
 
           return (
             <>
@@ -32,9 +45,7 @@ export const Footer = ({ canSubmit, onSave }) => {
                 onClick={onNext}
                 isDisabled={!isValid || isSubmitting}
               >
-                {activeStep.name === WIZARD_TITLES.review
-                  ? __('Submit')
-                  : __('Next')}
+                {isReviewStep ? __('Submit') : __('Next')}
               </Button>
               <Button
                 ouiaId="back-footer"
@@ -68,22 +79,14 @@ export const Footer = ({ canSubmit, onSave }) => {
                 </Button>
               </Tooltip>
               <Tooltip
-                content={
-                  <div>
-                    {canSubmit
-                      ? __('Skip to review step')
-                      : __(
-                          'Fill all required fields in all the steps to start the job'
-                        )}
-                  </div>
-                }
+                content={<div>{skipToReviewTooltip()}</div>}
                 triggerRef={tooltipSkipTo}
               >
                 <Button
                   ouiaId="skip-to-review-footer"
                   variant="tertiary"
                   onClick={() => goToStepByName(WIZARD_TITLES.review)}
-                  isAriaDisabled={!canSubmit}
+                  isAriaDisabled={!canSkipToReview}
                   isDisabled={isSubmitting}
                   ref={tooltipSkipTo}
                 >

data/webpack/JobWizard/__tests__/Footer.test.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { render, fireEvent, screen, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { Wizard } from '@patternfly/react-core/deprecated';
+import configureMockStore from 'redux-mock-store';
+import { Footer } from '../Footer';
+import { WIZARD_TITLES } from '../JobWizardConstants';
+
+const store = configureMockStore([])({ API: {} });
+
+const renderFooterWizard = ({ canSubmit = true, startAtStep = 1 } = {}) =>
+  render(
+    <Provider store={store}>
+      <Wizard
+        steps={[
+          {
+            name: WIZARD_TITLES.categoryAndTemplate,
+            component: <div>category step</div>,
+          },
+          {
+            name: WIZARD_TITLES.review,
+            component: <div>review step</div>,
+          },
+        ]}
+        startAtStep={startAtStep}
+        footer={<Footer canSubmit={canSubmit} onSave={jest.fn()} />}
+      />
+    </Provider>
+  );
+
+describe('Job wizard footer', () => {
+  it('enables Skip to review when required fields are filled', () => {
+    renderFooterWizard({ canSubmit: true });
+
+    expect(screen.getByText('Skip to review')).not.toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
+
+  it('disables Skip to review when required fields are missing', () => {
+    renderFooterWizard({ canSubmit: false });
+
+    expect(screen.getByText('Skip to review')).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
+
+  it('disables Skip to review on the review step', async () => {
+    renderFooterWizard({ canSubmit: true });
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Skip to review'));
+    });
+
+    expect(screen.getByText('Submit')).toBeInTheDocument();
+    expect(screen.getByText('Skip to review')).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
+});

data/webpack/JobWizard/__tests__/integration.test.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { mount } from '@theforeman/test';
-import { render, fireEvent, screen, act } from '@testing-library/react';
+import { render, screen, within, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
 import { MockedProvider } from '@apollo/client/testing';
 import * as api from 'foremanReact/redux/API';
 import { JobWizard } from '../JobWizard';
@@ -17,17 +18,55 @@ import {
 
 const store = testSetup(selectors, api);
 
+const renderJobWizard = ({ withGql = false } = {}) => {
+  const wizard = (
+    <Provider store={store}>
+      <JobWizard />
+    </Provider>
+  );
+
+  if (withGql) {
+    return render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        {wizard}
+      </MockedProvider>
+    );
+  }
+
+  return render(wizard);
+};
+
+const getWizardNavigation = () =>
+  screen.getByRole('navigation', { name: 'Run Job steps' });
+
+const getWizardStep = stepName =>
+  within(getWizardNavigation()).getByRole('button', { name: stepName });
+
+const getDisabledWizardSteps = () =>
+  within(getWizardNavigation())
+    .getAllByRole('button')
+    .filter(button => button.getAttribute('aria-disabled') === 'true');
+
+const expectDispatchedGet = expected => {
+  expect(store.getActions()).toEqual(
+    expect.arrayContaining([expect.objectContaining({ type: 'get', ...expected })])
+  );
+};
+
 describe('Job wizard fill', () => {
   beforeEach(() => {
+    store.clearActions();
     jest.spyOn(selectors, 'selectRouterSearch');
     selectors.selectRouterSearch.mockImplementation(() => ({
       'host_ids[]': ['105', '37'],
     }));
   });
+
   afterEach(() => {
     selectors.selectRouterSearch.mockRestore();
   });
-  it('should select template', async () => {
+
+  it('selects a template and enables wizard steps', async () => {
     api.get.mockImplementation(({ handleSuccess, ...action }) => {
       if (action.key === 'JOB_CATEGORIES') {
         handleSuccess &&
@@ -54,74 +93,80 @@ describe('Job wizard fill', () => {
     selectors.selectJobTemplate.mockRestore();
     jest.spyOn(selectors, 'selectJobTemplate');
     selectors.selectJobTemplate.mockImplementation(() => ({}));
-    const wrapper = mount(
-      <Provider store={store}>
-        <JobWizard />
-      </Provider>
-    );
-    expect(
-      wrapper.find('.pf-v5-c-wizard__nav-link.pf-m-disabled')
-    ).toHaveLength(5);
+
+    renderJobWizard();
+
+    expect(getDisabledWizardSteps()).toHaveLength(5);
+    expect(getWizardStep(WIZARD_TITLES.categoryAndTemplate)).toBeInTheDocument();
+
+    expectDispatchedGet({
+      key: 'JOB_CATEGORIES',
+      url: '/ui_job_wizard/categories',
+    });
+    expectDispatchedGet({
+      key: 'HOST_IDS',
+      params: { search: 'id = 105 or id = 37' },
+      url: '/api/hosts',
+    });
+    expectDispatchedGet({
+      key: 'JOB_TEMPLATES',
+    });
+
     selectors.selectJobCategoriesStatus.mockImplementation(() => 'RESOLVED');
-    expect(store.getActions()).toMatchSnapshot('initial');
     selectors.selectJobTemplate.mockRestore();
     jest.spyOn(selectors, 'selectJobTemplate');
     selectors.selectJobTemplate.mockImplementation(() => jobTemplate);
-    wrapper
-      .find('.pf-v5-c-button.pf-v5-c-select__toggle-button')
-      .simulate('click');
-    await act(async () => {
-      await wrapper
-        .find('.pf-v5-c-select__menu-item')
-        .first()
-        .simulate('click');
+
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Job template toggle' })
+    );
+    await userEvent.click(screen.getByText(jobTemplate.job_template.name));
+
+    expect(store.getActions().at(-1)).toEqual(
+      expect.objectContaining({
+        key: 'JOB_TEMPLATE',
+        type: 'get',
+        url: '/ui_job_wizard/template/178',
+      })
+    );
+
+    await waitFor(() => {
+      expect(getDisabledWizardSteps()).toHaveLength(0);
     });
-    expect(store.getActions().slice(-1)).toMatchSnapshot('select template');
-    wrapper.update();
-    expect(
-      wrapper.find('.pf-v5-c-wizard__nav-link.pf-m-disabled')
-    ).toHaveLength(0);
   });
 
-  it('have all steps', async () => {
+  it('renders all wizard steps and navigates between them', async () => {
     selectors.selectJobCategoriesStatus.mockImplementation(() => null);
     selectors.selectJobTemplates.mockRestore();
     selectors.selectJobCategories.mockRestore();
     mockApi(api);
 
-    render(
-      <MockedProvider mocks={gqlMock} addTypename={false}>
-        <Provider store={store}>
-          <JobWizard />
-        </Provider>
-      </MockedProvider>
-    );
+    renderJobWizard({ withGql: true });
+
     const steps = [
       WIZARD_TITLES.hostsAndInputs,
       WIZARD_TITLES.categoryAndTemplate,
       WIZARD_TITLES.advanced,
       WIZARD_TITLES.review,
     ];
-    // eslint-disable-next-line no-unused-vars
-    for await (const step of steps) {
-      const stepSelector = screen.getByText(step);
-      const stepTitle = screen.getAllByText(step);
-      expect(stepTitle).toHaveLength(1);
-      await act(async () => {
-        await fireEvent.click(stepSelector);
-      });
-      const stepTitles = screen.getAllByText(step);
-      expect(stepTitles).toHaveLength(3);
+
+    for (const step of steps) {
+      expect(screen.getAllByText(step)).toHaveLength(1);
+
+      await userEvent.click(getWizardStep(step));
+
+      expect(screen.getAllByText(step)).toHaveLength(3);
     }
-    const step = WIZARD_TITLES.typeOfExecution;
-    const stepTitle = screen.getAllByText(step);
-    expect(stepTitle).toHaveLength(1);
-    expect(screen.queryAllByText('Select the type of execution')).toHaveLength(
-      0
-    );
-    await act(async () => {
-      await fireEvent.click(stepTitle[0]);
-    });
-    expect(screen.getAllByText('Select the type of execution')).toHaveLength(1);
+
+    expect(screen.getAllByText(WIZARD_TITLES.typeOfExecution)).toHaveLength(1);
+    expect(
+      screen.queryByText('Select the type of execution')
+    ).not.toBeInTheDocument();
+
+    await userEvent.click(getWizardStep(WIZARD_TITLES.typeOfExecution));
+
+    expect(
+      screen.getByText('Select the type of execution')
+    ).toBeInTheDocument();
   });
 });

data/webpack/react_app/components/TargetingHosts/__tests__/HostItem.test.js

@@ -1,6 +1,76 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
 import HostItem from '../components/HostItem';
 import { HostItemFixtures } from './fixtures';
 
-describe('HostItem', () =>
-  testComponentSnapshotsWithFixtures(HostItem, HostItemFixtures));
+jest.unmock('foremanReact/components/common/ActionButtons/ActionButtons');
+
+const renderHostItem = props =>
+  render(
+    <table>
+      <tbody>
+        <HostItem {...props} />
+      </tbody>
+    </table>
+  );
+
+describe('HostItem', () => {
+  it('renders the host name as a link with the provided URL', () => {
+    renderHostItem(HostItemFixtures.renders);
+
+    expect(screen.getByRole('link', { name: 'Host1' })).toHaveAttribute(
+      'href',
+      '/host1'
+    );
+  });
+
+  it('renders the host status', () => {
+    renderHostItem(HostItemFixtures.renders);
+
+    expect(screen.getByText('Succeeded')).toBeInTheDocument();
+  });
+
+  it('renders no action buttons when actions are empty', () => {
+    renderHostItem(HostItemFixtures.renders);
+
+    expect(screen.queryByRole('button')).not.toBeInTheDocument();
+  });
+
+  it('renders a disabled link when link is not provided', () => {
+    renderHostItem({
+      ...HostItemFixtures.renders,
+      link: '',
+    });
+
+    expect(screen.getByRole('link', { name: 'Host1' })).toHaveAttribute(
+      'href',
+      '#'
+    );
+  });
+
+  it('renders action buttons and calls action on click', async () => {
+    const onClick = jest.fn();
+
+    renderHostItem({
+      ...HostItemFixtures.renders,
+      actions: [{ title: 'View output', action: { onClick } }],
+    });
+
+    await userEvent.click(
+      screen.getByRole('button', { name: 'View output' })
+    );
+
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders failed status text for error status', () => {
+    renderHostItem({
+      ...HostItemFixtures.renders,
+      status: 'error',
+    });
+
+    expect(screen.getByText('Failed')).toBeInTheDocument();
+  });
+});

data/webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js

@@ -1,43 +1,76 @@
 import React from 'react';
-import { shallow } from '@theforeman/test';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
 import AggregateStatus from './index';
 
-jest.unmock('./index.js');
+const defaultStatuses = {
+  success: 19,
+  failed: 20,
+  pending: 3,
+  cancelled: 31,
+};
+
+const renderAggregateStatus = ({
+  statuses = defaultStatuses,
+  chartFilter = jest.fn(),
+} = {}) => {
+  const view = render(
+    <AggregateStatus statuses={statuses} chartFilter={chartFilter} />
+  );
+
+  return { chartFilter, ...view };
+};
 
 describe('AggregateStatus', () => {
-  describe('has no data', () => {
-    it('renders cards with no data', () => {
-      const chartNumbers = shallow(
-        <AggregateStatus statuses={{}} chartFilter={_x => {}} />
-      );
-      const success = chartNumbers.find('#success_count').text();
-      const failed = chartNumbers.find('#failed_count').text();
-      const pending = chartNumbers.find('#pending_count').text();
-      const cancelled = chartNumbers.find('#cancelled_count').text();
-      expect(success).toBe('');
-      expect(failed).toBe('');
-      expect(cancelled).toBe('');
-      expect(pending).toBe('');
-    });
-
-    it('renders cards with props passed', () => {
-      const statuses = {
-        success: 19,
-        failed: 20,
-        cancelled: 31,
-        pending: 3,
-      };
-      const chartNumbers = shallow(
-        <AggregateStatus statuses={statuses} chartFilter={_x => {}} />
-      );
-      const success = chartNumbers.find('#success_count').text();
-      const failed = chartNumbers.find('#failed_count').text();
-      const pending = chartNumbers.find('#pending_count').text();
-      const cancelled = chartNumbers.find('#cancelled_count').text();
-      expect(success).toBe(statuses.success.toString());
-      expect(failed).toBe(statuses.failed.toString());
-      expect(cancelled).toBe(statuses.cancelled.toString());
-      expect(pending).toBe(statuses.pending.toString());
-    });
+  it('renders status notifications without counts when statuses are empty', () => {
+    const { container } = renderAggregateStatus({ statuses: {} });
+
+    expect(container.textContent.trim()).toBe('');
+  });
+
+  it('renders status counts from props', () => {
+    renderAggregateStatus();
+
+    expect(screen.getByText('19')).toBeInTheDocument();
+    expect(screen.getByText('20')).toBeInTheDocument();
+    expect(screen.getByText('3')).toBeInTheDocument();
+    expect(screen.getByText('31')).toBeInTheDocument();
+  });
+
+  it('calls chartFilter with success when the success count is clicked', async () => {
+    const { chartFilter } = renderAggregateStatus();
+
+    await userEvent.click(screen.getByText('19'));
+
+    expect(chartFilter).toHaveBeenCalledTimes(1);
+    expect(chartFilter).toHaveBeenCalledWith('success');
+  });
+
+  it('calls chartFilter with failed when the failed count is clicked', async () => {
+    const { chartFilter } = renderAggregateStatus();
+
+    await userEvent.click(screen.getByText('20'));
+
+    expect(chartFilter).toHaveBeenCalledTimes(1);
+    expect(chartFilter).toHaveBeenCalledWith('failed');
+  });
+
+  it('calls chartFilter with pending when the pending count is clicked', async () => {
+    const { chartFilter } = renderAggregateStatus();
+
+    await userEvent.click(screen.getByText('3'));
+
+    expect(chartFilter).toHaveBeenCalledTimes(1);
+    expect(chartFilter).toHaveBeenCalledWith('pending');
+  });
+
+  it('calls chartFilter with cancelled when the cancelled count is clicked', async () => {
+    const { chartFilter } = renderAggregateStatus();
+
+    await userEvent.click(screen.getByText('31'));
+
+    expect(chartFilter).toHaveBeenCalledTimes(1);
+    expect(chartFilter).toHaveBeenCalledWith('cancelled');
   });
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 17.2.0
+  version: 17.2.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2026-08-24 00:00:00.000000000 Z
+date: 2026-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -417,8 +417,8 @@ files:
 - webpack/JobWizard/JobWizardSelectors.js
 - webpack/JobWizard/PermissionDenied.js
 - webpack/JobWizard/StartsErrorAlert.js
+- webpack/JobWizard/__tests__/Footer.test.js
 - webpack/JobWizard/__tests__/JobWizardPageRerun.test.js
-- webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap
 - webpack/JobWizard/__tests__/fixtures.js
 - webpack/JobWizard/__tests__/integration.test.js
 - webpack/JobWizard/__tests__/validation.test.js
@@ -525,7 +525,6 @@ files:
 - webpack/react_app/components/TargetingHosts/__tests__/TargetingHosts.test.js
 - webpack/react_app/components/TargetingHosts/__tests__/TargetingHostsPage.test.js
 - webpack/react_app/components/TargetingHosts/__tests__/TargetingHostsSelectors.test.js
-- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostItem.test.js.snap
 - webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostStatus.test.js.snap
 - webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHosts.test.js.snap
 - webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHostsPage.test.js.snap

data/webpack/JobWizard/__tests__/__snapshots__/integration.test.js.snap

@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Job wizard fill should select template: initial 1`] = `
-Array [
-  Object {
-    "key": "JOB_CATEGORIES",
-    "type": "get",
-    "url": "/ui_job_wizard/categories",
-  },
-  Object {
-    "key": "HOST_IDS",
-    "params": Object {
-      "search": "id = 105 or id = 37",
-    },
-    "type": "get",
-    "url": "/api/hosts",
-  },
-  Object {
-    "key": "JOB_TEMPLATES",
-    "type": "get",
-    "url": URI {
-      "_deferred_build": true,
-      "_parts": Object {
-        "duplicateQueryParameters": false,
-        "escapeQuerySpace": true,
-        "fragment": null,
-        "hostname": null,
-        "password": null,
-        "path": "foreman/api/v2/job_templates",
-        "port": null,
-        "preventInvalidHostname": false,
-        "protocol": null,
-        "query": "search=job_category%3D%22Ansible+Commands%22&per_page=all",
-        "urn": null,
-        "username": null,
-      },
-      "_string": "",
-    },
-  },
-]
-`;
-
-exports[`Job wizard fill should select template: select template 1`] = `
-Array [
-  Object {
-    "key": "JOB_TEMPLATE",
-    "type": "get",
-    "url": "/ui_job_wizard/template/178",
-  },
-]
-`;

data/webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostItem.test.js.snap

@@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`HostItem renders 1`] = `
-<tr
-  id="targeting-host-Host1"
->
-  <td
-    className="host_name"
-  >
-    <a
-      href="/host1"
-    >
-      Host1
-    </a>
-  </td>
-  <td
-    className="host_status"
-  >
-    <HostStatus
-      status="success"
-    />
-  </td>
-  <td
-    className="host_actions"
-  >
-    <ActionButtons
-      buttons={Array []}
-    />
-  </td>
-</tr>
-`;