Fixes #39352 - Job inv page ignores remote_execution_job_invocation_report_template setting

Author: kmalyjur

webpack/JobInvocationDetail/JobInvocationToolbarButtons.js

@@ -62,16 +62,43 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
   useEffect(() => {
     dispatch(
       get({
-        key: GET_REPORT_TEMPLATES,
-        url: '/api/report_templates',
-        handleSuccess: ({ data: { results } }) => {
-          setReportTemplateJobId(
-            results.find(result => result.name === 'Job - Invocation Report')
-              ?.id
+        key: 'GET_REPORT_TEMPLATE_SETTING',
+        url: '/api/settings/remote_execution_job_invocation_report_template',
+        handleSuccess: ({ data: { value } }) => {
+          dispatch(
+            get({
+              key: GET_REPORT_TEMPLATES,
+              url: '/api/report_templates',
+              params: {
+                search: `name="${value}"`,
+                per_page: 1,
+              },
+              handleSuccess: ({ data: { results } }) => {
+                setReportTemplateJobId(results[0]?.id);
+              },
+              handleError: () => {
+                setReportTemplateJobId(undefined);
+              },
+            })
           );
         },
         handleError: () => {
-          setReportTemplateJobId(undefined);
+          dispatch(
+            get({
+              key: GET_REPORT_TEMPLATES,
+              url: '/api/report_templates',
+              params: {
+                search: 'name="Job - Invocation Report"',
+                per_page: 1,
+              },
+              handleSuccess: ({ data: { results } }) => {
+                setReportTemplateJobId(results[0]?.id);
+              },
+              handleError: () => {
+                setReportTemplateJobId(undefined);
+              },
+            })
+          );
         },
       })
     );

webpack/JobInvocationDetail/__tests__/MainInformation.test.js

@@ -34,9 +34,12 @@ jest.spyOn(api, 'get');
 // Mock toLocaleString to always use UTC timezone for consistent test results
 const originalToLocaleString = Date.prototype.toLocaleString;
 beforeAll(() => {
-  // eslint-disable-next-line no-extend-native
-  Date.prototype.toLocaleString = function (locale, options) {
-    return originalToLocaleString.call(this, locale, { ...options, timeZone: 'UTC' });
+  // eslint-disable-next-line no-extend-native, func-names
+  Date.prototype.toLocaleString = function(locale, options) {
+    return originalToLocaleString.call(this, locale, {
+      ...options,
+      timeZone: 'UTC',
+    });
   };
 });
 afterAll(() => {
@@ -76,7 +79,12 @@ const initialStateScheduled = {
 };
 
 api.get.mockImplementation(({ handleSuccess, ...action }) => {
-  if (action.key === 'GET_REPORT_TEMPLATES') {
+  if (action.key === 'GET_REPORT_TEMPLATE_SETTING') {
+    handleSuccess &&
+      handleSuccess({
+        data: { value: 'Job - Invocation Report' },
+      });
+  } else if (action.key === 'GET_REPORT_TEMPLATES') {
     handleSuccess &&
       handleSuccess({
         data: mockReportTemplatesResponse,
@@ -229,7 +237,15 @@ describe('JobInvocationDetailPage', () => {
     );
 
     const expectedActions = [
-      { key: GET_REPORT_TEMPLATES, url: '/api/report_templates' },
+      {
+        key: GET_REPORT_TEMPLATES,
+        url: '/api/report_templates',
+        params: { search: 'name="Job - Invocation Report"', per_page: 1 },
+      },
+      {
+        key: 'GET_REPORT_TEMPLATE_SETTING',
+        url: '/api/settings/remote_execution_job_invocation_report_template',
+      },
       {
         key: JOB_INVOCATION_KEY,
         url: `/api/job_invocations/${jobId}?host_status=true`,
@@ -278,6 +294,9 @@ describe('JobInvocationDetailPage', () => {
         if (expectedAction.url) {
           expect(actualActions[index].url).toEqual(expectedAction.url);
         }
+        if (expectedAction.params) {
+          expect(actualActions[index].params).toEqual(expectedAction.params);
+        }
       }
     });
   });