foreman_remote_execution 16.2.1 → 16.2.3

data/webpack/JobInvocationDetail/OpenAllInvocationsModal.js

@@ -7,10 +7,6 @@ import {
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import React from 'react';
-import {
-  templateInvocationPageUrl,
-  MAX_HOSTS_API_SIZE,
-} from './JobInvocationConstants';
 
 export const PopupAlert = ({ setShowAlert }) => (
   <Alert
@@ -25,21 +21,35 @@ export const PopupAlert = ({ setShowAlert }) => (
 
 const OpenAllInvocationsModal = ({
   failedCount,
-  failedHosts,
   isOpen,
   isOpenFailed,
-  jobID,
   onClose,
-  setShowAlert,
   selectedIds,
+  confirmCallback,
 }) => {
-  const modalText = isOpenFailed ? 'failed' : 'selected';
+  const modalText = () => {
+    if (isOpenFailed) return 'failed';
+    if (selectedIds.length > 0) return 'selected';
+    return 'current page';
+  };
 
-  const openLink = url => {
-    const newWin = window.open(url);
-    if (!newWin || newWin.closed || typeof newWin.closed === 'undefined') {
-      setShowAlert(true);
+  const selectedText = () => {
+    if (isOpenFailed) {
+      return (
+        <>
+          {__('The number of failed invocations is:')} <b>{failedCount}</b>
+        </>
+      );
     }
+    if (selectedIds.length > 0) {
+      return (
+        <>
+          {__('The number of selected invocations is:')}{' '}
+          <b>{selectedIds.length}</b>
+        </>
+      );
+    }
+    return <></>;
   };
 
   return (
@@ -48,7 +58,7 @@ const OpenAllInvocationsModal = ({
       isOpen={isOpen}
       onClose={onClose}
       ouiaId="template-invocation-new-tab-modal"
-      title={sprintf(__('Open all %s invocations in new tabs'), modalText)}
+      title={sprintf(__('Open all %s invocations in new tabs'), modalText())}
       titleIconVariant="warning"
       width={590}
       actions={[
@@ -57,16 +67,7 @@ const OpenAllInvocationsModal = ({
           key="confirm"
           variant="primary"
           onClick={() => {
-            const hostsToOpen = isOpenFailed
-              ? failedHosts
-              : selectedIds.map(id => ({ id }));
-
-            hostsToOpen
-              .slice(0, MAX_HOSTS_API_SIZE)
-              .forEach(({ id }) =>
-                openLink(templateInvocationPageUrl(id, jobID), '_blank')
-              );
-
+            confirmCallback();
             onClose();
           }}
         >
@@ -84,30 +85,24 @@ const OpenAllInvocationsModal = ({
     >
       {sprintf(
         __('Are you sure you want to open all %s invocations in new tabs?'),
-        modalText
+        modalText()
       )}
       <br />
-      {__('This will open a new tab for each invocation. The maximum is 100.')}
-      <br />
-      {sprintf(__('The number of %s invocations is:'), modalText)}{' '}
-      <b>{isOpenFailed ? failedCount : selectedIds.length}</b>
+      {selectedText()}
     </Modal>
   );
 };
 
 OpenAllInvocationsModal.propTypes = {
   failedCount: PropTypes.number.isRequired,
-  failedHosts: PropTypes.array,
   isOpen: PropTypes.bool.isRequired,
   isOpenFailed: PropTypes.bool,
-  jobID: PropTypes.string.isRequired,
   onClose: PropTypes.func.isRequired,
-  setShowAlert: PropTypes.func.isRequired,
   selectedIds: PropTypes.array.isRequired,
+  confirmCallback: PropTypes.func.isRequired,
 };
 
 OpenAllInvocationsModal.defaultProps = {
-  failedHosts: [],
   isOpenFailed: false,
 };
 

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

@@ -83,6 +83,7 @@ jest.mock('../JobInvocationHostTable.js', () => () => (
 const reportTemplateJobId = mockReportTemplatesResponse.results[0].id;
 
 const mockStore = configureMockStore([thunk]);
+const props = { history: { push: jest.fn() } };
 
 describe('JobInvocationDetailPage', () => {
   it('renders main information', async () => {
@@ -91,7 +92,10 @@ describe('JobInvocationDetailPage', () => {
 
     const { container } = render(
       <Provider store={store}>
-        <JobInvocationDetailPage match={{ params: { id: `${jobId}` } }} />
+        <JobInvocationDetailPage
+          match={{ params: { id: `${jobId}` } }}
+          {...props}
+        />
       </Provider>
     );
 
@@ -185,6 +189,7 @@ describe('JobInvocationDetailPage', () => {
       <Provider store={store}>
         <JobInvocationDetailPage
           match={{ params: { id: `${jobInvocationDataScheduled.id}` } }}
+          {...props}
         />
       </Provider>
     );
@@ -201,7 +206,10 @@ describe('JobInvocationDetailPage', () => {
     const store = mockStore(jobInvocationDataRecurring);
     render(
       <Provider store={store}>
-        <JobInvocationDetailPage match={{ params: { id: `${jobId}` } }} />
+        <JobInvocationDetailPage
+          match={{ params: { id: `${jobId}` } }}
+          {...props}
+        />
       </Provider>
     );
 

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

@@ -32,6 +32,29 @@ selectors.selectTaskCancelable.mockImplementation(() => true);
 const mockStore = configureStore([]);
 const store = mockStore({});
 
+const allJobs = [
+  {
+    id: 1,
+    job_status: 'error',
+  },
+  {
+    id: 2,
+    job_status: 'error',
+  },
+  {
+    id: 3,
+    job_status: 'error',
+  },
+  {
+    id: 4,
+    job_status: 'error',
+  },
+  {
+    id: 5,
+    job_status: 'error',
+  },
+];
+
 describe('TableToolbarActions', () => {
   const jobID = '42';
   let openSpy;
@@ -58,8 +81,9 @@ describe('TableToolbarActions', () => {
         <Provider store={store}>
           <CheckboxesActions
             selectedIds={selectedIds}
-            failedCount={0}
             jobID={jobID}
+            allJobs={allJobs}
+            setShowAlert={jest.fn()}
           />
         </Provider>
       );
@@ -76,8 +100,9 @@ describe('TableToolbarActions', () => {
         <Provider store={store}>
           <CheckboxesActions
             selectedIds={selectedIds}
-            failedCount={0}
             jobID={jobID}
+            allJobs={allJobs}
+            setShowAlert={jest.fn()}
           />
         </Provider>
       );
@@ -94,47 +119,52 @@ describe('TableToolbarActions', () => {
     test('shows alert when popups are blocked', async () => {
       openSpy.mockReturnValue(null);
       const selectedIds = [1, 2];
+      const setShowMock = jest.fn();
       render(
         <Provider store={store}>
           <CheckboxesActions
             selectedIds={selectedIds}
-            failedCount={0}
             jobID={jobID}
+            allJobs={allJobs}
+            setShowAlert={setShowMock}
           />
         </Provider>
       );
       fireEvent.click(
         screen.getByLabelText(/open all template invocations in new tab/i)
       );
-      expect(
-        await screen.findByText(/Popups are blocked by your browser/)
-      ).toBeInTheDocument();
+      expect(setShowMock).toHaveBeenCalledWith(true);
     });
   });
 
   describe('Opening failed in new tabs', () => {
     test('opens links when results length is less than or equal to 3', async () => {
-      const failedHosts = [{ id: 301 }, { id: 302 }];
-      useAPI.mockReturnValue({
-        response: { results: failedHosts },
-        status: 'success',
-      });
       render(
         <Provider store={store}>
-          <CheckboxesActions selectedIds={[]} failedCount={2} jobID={jobID} />
+          <CheckboxesActions
+            selectedIds={[]}
+            jobID={jobID}
+            allJobs={allJobs.slice(0, 2)}
+            setShowAlert={jest.fn()}
+          />
         </Provider>
       );
       fireEvent.click(screen.getByLabelText(/actions dropdown toggle/i));
       fireEvent.click(await screen.findByText(/open all failed runs/i));
       await waitFor(() => {
-        expect(openSpy).toHaveBeenCalledTimes(failedHosts.length);
+        expect(openSpy).toHaveBeenCalledTimes(2);
       });
     });
 
     test('shows modal when results length is greater than 3', async () => {
       render(
         <Provider store={store}>
-          <CheckboxesActions selectedIds={[]} failedCount={4} jobID={jobID} />
+          <CheckboxesActions
+            selectedIds={[]}
+            jobID={jobID}
+            allJobs={allJobs}
+            setShowAlert={jest.fn()}
+          />
         </Provider>
       );
       fireEvent.click(screen.getByLabelText(/actions dropdown toggle/i));
@@ -145,21 +175,6 @@ describe('TableToolbarActions', () => {
         })
       ).toBeInTheDocument();
     });
-
-    test('calls useApi with skip: true when failedCount is 0', () => {
-      render(
-        <Provider store={store}>
-          <CheckboxesActions selectedIds={[]} failedCount={0} jobID={jobID} />
-        </Provider>
-      );
-      expect(useAPI).toHaveBeenCalledWith(
-        'get',
-        foremanUrl(`/api/job_invocations/${jobID}/hosts`),
-        expect.objectContaining({
-          skip: true,
-        })
-      );
-    });
   });
 
   describe('PopupAlert', () => {
@@ -188,8 +203,9 @@ describe('TableToolbarActions', () => {
           <CheckboxesActions
             bulkParams="(id ^ (101, 102, 103))"
             selectedIds={selectedIds}
-            failedCount={1}
             jobID={jobID}
+            allJobs={allJobs}
+            setShowAlert={jest.fn()}
           />
         </Provider>
       );

data/webpack/JobInvocationDetail/index.js

@@ -35,12 +35,12 @@ const JobInvocationDetailPage = ({
   match: {
     params: { id },
   },
+  history,
 }) => {
   const dispatch = useDispatch();
   const items = useSelector(selectItems);
   const {
     description,
-    failed = 0,
     status_label: statusLabel,
     task,
     start_at: startAt,
@@ -95,6 +95,16 @@ const JobInvocationDetailPage = ({
       : STATUS_UPPERCASE.RESOLVED;
 
   const breadcrumbOptions = {
+    isSwitchable: true,
+    onSwitcherItemClick: (e, href) => {
+      e.preventDefault();
+      history.push(href);
+    },
+    resource: {
+      nameField: 'description',
+      resourceUrl: '/api/v2/job_invocations',
+      switcherItemUrl: '/job_invocations/:id',
+    },
     breadcrumbItems: [
       { caption: __('Jobs'), url: `/job_invocations` },
       {
@@ -182,7 +192,7 @@ const JobInvocationDetailPage = ({
           <JobInvocationHostTable
             id={id}
             targeting={targeting}
-            failedCount={failed}
+            finished={finished}
             autoRefresh={autoRefresh}
             initialFilter={selectedFilter}
             statusLabel={statusLabel}
@@ -200,6 +210,7 @@ JobInvocationDetailPage.propTypes = {
       id: PropTypes.string.isRequired,
     }),
   }).isRequired,
+  history: PropTypes.object.isRequired,
 };
 
 export default JobInvocationDetailPage;

data/webpack/react_app/components/RegistrationExtension/RexInterface.js

@@ -2,32 +2,18 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import LabelIcon from 'foremanReact/components/common/LabelIcon';
 
-import { FormGroup, TextInput, Popover, Icon } from '@patternfly/react-core';
-
-import { HelpIcon } from '@patternfly/react-icons';
+import { FormGroup, TextInput } from '@patternfly/react-core';
 
 const RexInterface = ({ isLoading, onChange }) => (
   <FormGroup
     label={__('Remote Execution Interface')}
     fieldId="reg_rex_interface"
     labelIcon={
-      <Popover
-        bodyContent={
-          <div>
-            {__('Identifier of the Host interface for Remote execution')}
-          </div>
-        }
-      >
-        <button
-          className="pf-v5-cform__group-label-help"
-          onClick={e => e.preventDefault()}
-        >
-          <Icon isInline>
-            <HelpIcon />
-          </Icon>
-        </button>
-      </Popover>
+      <LabelIcon
+        text={__('Identifier of the Host interface for Remote execution')}
+      />
     }
   >
     <TextInput

data/webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js

@@ -1,9 +1,25 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import React from 'react';
+import { screen, fireEvent, render, act } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
 import RexInterface from '../RexInterface';
 
 const fixtures = {
   renders: { isLoading: false, onChange: () => {} },
 };
 
-describe('RexInterface', () =>
-  testComponentSnapshotsWithFixtures(RexInterface, fixtures));
+describe('RexInterface', () => {
+  it('should render label with help icon and popover instructions', async () => {
+    jest.useFakeTimers();
+    render(<RexInterface {...fixtures.renders} />);
+    await act(async () => {
+      await fireEvent.click(screen.getByRole('button'));
+
+      jest.advanceTimersByTime(500);
+    });
+
+    expect(screen.getByText('Remote Execution Interface')).toBeInTheDocument();
+    expect(
+      screen.getByText('Identifier of the Host interface for Remote execution')
+    ).toBeInTheDocument();
+  });
+});

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 16.2.1
+  version: 16.2.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -551,7 +551,6 @@ files:
 - webpack/react_app/components/RegistrationExtension/RexInterface.js
 - webpack/react_app/components/RegistrationExtension/RexPull.js
 - webpack/react_app/components/RegistrationExtension/__tests__/RexInterface.test.js
-- webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap
 - webpack/react_app/components/TargetingHosts/TargetingHosts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
 - webpack/react_app/components/TargetingHosts/TargetingHostsHelpers.js

data/webpack/react_app/components/RegistrationExtension/__tests__/__snapshots__/RexInterface.test.js.snap

@@ -1,36 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`RexInterface renders 1`] = `
-<FormGroup
-  fieldId="reg_rex_interface"
-  label="Remote Execution Interface"
-  labelIcon={
-    <Popover
-      bodyContent={
-        <div>
-          Identifier of the Host interface for Remote execution
-        </div>
-      }
-    >
-      <button
-        className="pf-v5-cform__group-label-help"
-        onClick={[Function]}
-      >
-        <Icon
-          isInline={true}
-        >
-          <HelpIcon />
-        </Icon>
-      </button>
-    </Popover>
-  }
->
-  <TextInput
-    id="reg_rex_interface_input"
-    isDisabled={false}
-    onBlur={[Function]}
-    ouiaId="reg_rex_interface_input"
-    type="text"
-  />
-</FormGroup>
-`;