foreman_remote_execution 17.2.0 → 18.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e240991349f9cb6bc60f979202f8de2bde03d3d8100c13e701469aa2f8e29a97
-  data.tar.gz: f9936d90d62ce33221969367e5625cdf750c36922855142f460f46b18a8bc925
+  metadata.gz: 4b301e962ec24666ada0b4a297277232ee94dc74a36b86875f4ce2230659c254
+  data.tar.gz: 923c5679450846add2cfba3a6741654e7bfd06f23e9e33b8ad5f19dfd2b6c217
 SHA512:
-  metadata.gz: eaf96768e4b112d387e660cca80d6b9dd360dd1145cf40b5540ea428bdf4bf3482e47591a05d2e2f0bcc05e36808e8163346258f323cc7f7f60917db3b930686
-  data.tar.gz: 56dbf3ac2a8cb8f90c8ae719fc5213c2fbf40588812bf98552fa8bdd967b6d1150632543dfb6992df09050d74813dd3eeb367cc857c3709a921a404b3772c823
+  metadata.gz: 561489f3cee2bf28837084baa1fd3fb8b3a68b8acd632c0337f1b3204dc176acafefb85ecc15d058c464038ec38413a56899ce4ebd2d723596571622cb9c130f
+  data.tar.gz: '0938ab65b49a36d63fb709d905322559305ebd691f83bcf1aee8d81b9cb6cffd83db2fe50381295b7f589d37beddc457a7ee0aef3b8c02819f12008c9f461461'

data/app/controllers/api/v2/foreign_input_sets_controller.rb

@@ -76,6 +76,10 @@ module Api
       def resource_class
         ForeignInputSet
       end
+
+      def allowed_nested_id
+        %w(template_id)
+      end
     end
   end
 end

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/db/seeds.d/60-ssh_proxy_feature.rb

@@ -1,5 +1,5 @@
 f = Feature.where(:name => 'SSH').first_or_create
-raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+raise "Unable to create proxy feature: #{SeedHelper.format_errors(f)}" if f.nil? || f.errors.any?
 
 f = Feature.where(:name => 'Script').first_or_create
-raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+raise "Unable to create proxy feature: #{SeedHelper.format_errors(f)}" if f.nil? || f.errors.any?

data/db/seeds.d/90-bookmarks.rb

@@ -15,6 +15,6 @@ Bookmark.without_auditing do
     b = Bookmark.where(:name => input[:name], :controller => input[:controller]).first || Bookmark.new
     b.attributes = attributes
     b.save
-    raise "Unable to create bookmark: #{format_errors b}" if b.errors.any?
+    raise "Unable to create bookmark: #{SeedHelper.format_errors(b)}" if b.errors.any?
   end
 end

data/db/seeds.d/95-mail_notifications.rb

@@ -18,7 +18,7 @@ notifications.each do |notification|
     created_notification = RexMailNotification.create(notification)
     if created_notification.nil? || created_notification.errors.any?
       raise ::Foreman::Exception.new(N_("Unable to create mail notification: %s"),
-        format_errors(created_notification))
+        SeedHelper.format_errors(created_notification))
     end
   end
 end

data/lib/foreman_remote_execution/plugin.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_remote_execution do
-  requires_foreman '>= 5.0'
+  requires_foreman '>= 5.1'
   register_global_js_file 'global'
   register_gettext
 
@@ -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 = '18.0.0'.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;
@@ -57,6 +55,16 @@ export const STATUS_TITLES = {
   NOT_STARTED: { id: 'N/A', title: __('Scheduled') },
 };
 
+export const TERMINAL_HOST_STATUSES = new Set([
+  'success',
+  'error',
+  'cancelled',
+]);
+
+export const areAllHostsTerminal = results =>
+  results?.length > 0 &&
+  results.every(host => TERMINAL_HOST_STATUSES.has(host.job_status));
+
 export const DATE_OPTIONS = {
   day: 'numeric',
   month: 'short',

data/webpack/JobInvocationDetail/JobInvocationHostTable.js

@@ -42,6 +42,7 @@ import Columns, {
   STATUS_UPPERCASE,
   AWAITING_STATUS_FILTER,
   AUTO_REFRESH_INTERVAL_MS,
+  areAllHostsTerminal,
 } from './JobInvocationConstants';
 import { TemplateInvocation } from './TemplateInvocation';
 import { RowActions } from './TemplateInvocationComponents/TemplateActionButtons';
@@ -196,7 +197,13 @@ const JobInvocationHostTable = ({
             if (thisRequest !== requestIdRef.current) return;
             if (!mountedRef.current) return;
             updateHostsState(data);
-            if (!jobFinishedRef.current) {
+            const hasActiveFilter = !!(
+              currentPollParams.current.search ||
+              currentPollParams.current.awaiting
+            );
+            const pageAllTerminal =
+              !hasActiveFilter && areAllHostsTerminal(data.data?.results);
+            if (!jobFinishedRef.current && !pageAllTerminal) {
               pollTimeoutId.current = setTimeout(
                 () => makeApiCall(currentPollParams.current),
                 AUTO_REFRESH_INTERVAL_MS

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__/JobInvocationHostTablePolling.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 import React from 'react';
 import { render, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
@@ -44,13 +45,28 @@ const hostsResponse = {
       operatingsystem_name: 'RHEL 9',
       hostgroup_id: 1,
       hostgroup_name: 'default',
-      job_status: 'success',
+      job_status: 'running',
       smart_proxy_id: 1,
       smart_proxy_name: 'proxy1',
     },
   ],
 };
 
+const terminalHostsResponse = {
+  ...hostsResponse,
+  results: [{ ...hostsResponse.results[0], job_status: 'success' }],
+};
+
+const mixedHostsResponse = {
+  ...hostsResponse,
+  total: 2,
+  subtotal: 2,
+  results: [
+    { ...hostsResponse.results[0], id: 1, job_status: 'success' },
+    { ...hostsResponse.results[0], id: 2, job_status: 'running' },
+  ],
+};
+
 let apiGetSpy;
 let hostsCalls;
 let pendingCallbacks;
@@ -66,9 +82,9 @@ const flushPendingCallbacks = () => {
   batch.forEach(cb => cb());
 };
 
-const renderTable = (props = {}) => {
+const renderTable = (props = {}, historyEntries = ['/']) => {
   const store = createStore();
-  const history = createMemoryHistory();
+  const history = createMemoryHistory({ initialEntries: historyEntries });
   const Wrapper = createForemanContextWrapper();
 
   const defaultProps = {
@@ -93,16 +109,14 @@ const renderTable = (props = {}) => {
   return { ...result, store, history };
 };
 
-const setupSuccessMock = () => {
+const setupSuccessMock = (response = hostsResponse) => {
   apiGetSpy = jest
     .spyOn(APIActions, 'get')
     .mockImplementation(opts => dispatch => {
       if (opts.key === JOB_INVOCATION_HOSTS) {
         hostsCalls.push(opts);
         if (opts.handleSuccess) {
-          pendingCallbacks.push(() =>
-            opts.handleSuccess({ data: hostsResponse })
-          );
+          pendingCallbacks.push(() => opts.handleSuccess({ data: response }));
         }
       }
     });
@@ -311,6 +325,98 @@ describe('JobInvocationHostTable polling', () => {
     expect(hostsCalls.length).toBeGreaterThan(callsAfterFilterChange);
   });
 
+  it('stops polling when all hosts on the page are terminal', () => {
+    apiGetSpy.mockRestore();
+    setupSuccessMock(terminalHostsResponse);
+
+    renderTable();
+
+    expect(hostsCalls).toHaveLength(1);
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(10000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(1);
+  });
+
+  it('continues polling when at least one host on the page is non-terminal', () => {
+    apiGetSpy.mockRestore();
+    setupSuccessMock(mixedHostsResponse);
+
+    renderTable();
+
+    expect(hostsCalls).toHaveLength(1);
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(5000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(2);
+  });
+
+  it('continues polling when all hosts on the page are terminal but a status filter is active', () => {
+    apiGetSpy.mockRestore();
+    setupSuccessMock(terminalHostsResponse);
+
+    renderTable({ initialFilter: 'success' });
+
+    expect(hostsCalls).toHaveLength(1);
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(5000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(2);
+  });
+
+  it('continues polling when all hosts on the page are terminal but a search query is active', () => {
+    apiGetSpy.mockRestore();
+    setupSuccessMock(terminalHostsResponse);
+
+    renderTable({}, ['/?search=host1']);
+
+    expect(hostsCalls).toHaveLength(1);
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(5000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(2);
+  });
+
   it('sends include_permissions only on the first request', () => {
     renderTable();
 

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