foreman_remote_execution 16.0.5 → 16.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0af6a4d6d568edd8bf5d878940d19f72d3f2b2ad2c67e767cd7764e2287ba3f
-  data.tar.gz: 5b7f5b64a90c38b6b65df711be7bf93c586c73400386c96c6ae280285b4a9349
+  metadata.gz: 8150a0940b1cf9352e24f99f5083c36fb7bf42aefdfd99406eaeb191c109ec55
+  data.tar.gz: 673400df79bdee44cb8eccbcb72ce654963dca2f1e94f015d8ffcbdcb625a710
 SHA512:
-  metadata.gz: 408d5714fba95e7213fa42c2510021231cd2d5c61b7ecc502a0d76c96ca80f97758e03928da5a1c1acc9547fe4fcbfbe2f836991954b78a09cbe7b6ef0644e95
-  data.tar.gz: c0468bdebd334affe636a1aa34dff3689707084a0d0f141b05c0a09428f6700aa48b1a43b2e9e61262d8bd8968ab4c22b3d1ab68ad48cf8527b930989fac8994
+  metadata.gz: f812d26367d5f24535531150d58aa224967f47db0651b6de2bb267ba5d037608665ec380e5b3d96003796a81f3b9f4c376d2e7de4365bdca4719ea012828a98b
+  data.tar.gz: 102ef1de3d1f874fb70ac04cde6fb1f91ecb4980198c25d29afb23a9e3f3e28a2b98ec5e1bbb69a7271e3639a31277e4dd1828848c322fc0989e69c4e263c17a

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

@@ -134,16 +134,43 @@ module Api
         render :json => host_output(@nested_obj, @host, :raw => true)
       end
 
-      api :POST, '/job_invocations/:id/cancel', N_('Cancel job invocation')
+      api :POST, '/job_invocations/:id/cancel', N_('Cancel job invocation or matching tasks only')
       param :id, :identifier, :required => true
       param :force, :bool
+      param :search, String, :desc => N_('Search query to cancel tasks only on matching hosts. If not provided, the whole job invocation will be cancelled.')
       def cancel
-        if @job_invocation.task.cancellable?
-          result = @job_invocation.cancel(params.fetch('force', false))
-          render :json => { :cancelled => result, :id => @job_invocation.id }
+        force = params.fetch('force', false)
+        search = params[:search]
+
+        if search.present?
+          begin
+            hosts_scope = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
+            matching_hosts = hosts_scope.search_for(search)
+            tasks_to_process = @job_invocation.template_invocations
+                                              .where(host_id: matching_hosts.select(:id))
+                                              .includes(:run_host_job_task)
+
+            cancelled, skipped = tasks_to_process.partition { |ti| ti.run_host_job_task&.cancellable? }
+            cancelled.each do |ti|
+              if force
+                ti.run_host_job_task.abort
+              else
+                ti.run_host_job_task.cancel
+              end
+            end
+            render json: {
+              total: tasks_to_process.size,
+              cancelled: cancelled.map(&:run_host_job_task_id),
+              skipped: skipped.map(&:run_host_job_task_id),
+            }
+          rescue StandardError => e
+            render json: { error: { message: "Failed to cancel tasks on hosts: #{e.message}" } }, status: :unprocessable_entity
+          end
+        elsif @job_invocation.task.cancellable?
+          result = @job_invocation.cancel(force)
+          render json: { cancelled: result, id: @job_invocation.id }
         else
-          render :json => { :message => _('The job could not be cancelled.') },
-            :status => :unprocessable_entity
+          render json: { message: _('The job could not be cancelled.') }, status: :unprocessable_entity
         end
       end
 

data/app/helpers/remote_execution_helper.rb

@@ -99,7 +99,7 @@ module RemoteExecutionHelper
         :disabled => !task.cancellable?,
         :method => :post)
     end
-    buttons << link_to(_('New UI'), new_job_invocation_detail_path(:id => job_invocation.id),
+    buttons << link_to(_('New UI'), job_invocation_path(:id => job_invocation.id),
       class: 'btn btn-default',
       title: _('Switch to the new job invocation detail UI'))
 

data/config/routes.rb

@@ -22,11 +22,12 @@ Rails.application.routes.draw do
   match 'job_invocations/:id/rerun', to: 'react#index', :via => [:get], as: 'rerun_job_invocation'
   match 'old/job_invocations/new', to: 'job_invocations#new', via: [:get], as: 'form_new_job_invocation'
   match 'old/job_invocations/:id/rerun', to: 'job_invocations#rerun', via: [:get, :post], as: 'form_rerun_job_invocation'
-  match 'experimental/job_invocations_detail/:id', to: 'react#index', :via => [:get], as: 'new_job_invocation_detail'
+  get 'job_invocations/:id', to: 'react#index', as: 'job_invocation'
+  get 'legacy/job_invocations/:id', to: 'job_invocations#show', as: 'legacy_job_invocation'
   match 'job_invocations_detail/:id/host_invocation/:host_id', to: 'react#index', :via => [:get], as: 'new_job_invocation_detail_by_host'
   get 'show_template_invocation_by_host/:host_id/job_invocation/:id', to: 'template_invocations#show_template_invocation_by_host'
 
-  resources :job_invocations, :only => [:create, :show, :index] do
+  resources :job_invocations, :only => [:create, :index] do
     collection do
       get 'preview_job_invocations_per_host'
       post 'refresh'

data/lib/foreman_remote_execution/plugin.rb

@@ -195,12 +195,6 @@ Foreman::Plugin.register :foreman_remote_execution do
     parent: :monitor_menu,
     after: :audits
 
-  menu :labs_menu, :job_invocations_detail,
-    url_hash: { controller: :job_invocations, action: :show },
-    caption: N_('Job invocations detail'),
-    parent: :lab_features_menu,
-    url: '/experimental/job_invocations_detail/1'
-
   register_custom_status HostStatus::ExecutionStatus
   # add dashboard widget
   # widget 'foreman_remote_execution_widget', name: N_('Foreman plugin template widget'), sizex: 4, sizey: 1

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.0.5'.freeze
+  VERSION = '16.1.0'.freeze
 end

data/webpack/JobInvocationDetail/CheckboxesActions.js

@@ -1,6 +1,7 @@
-/* eslint-disable camelcase */
+/* eslint-disable max-lines */
 import {
   Button,
+  Divider,
   Dropdown,
   DropdownItem,
   DropdownList,
@@ -11,20 +12,97 @@ import {
   EllipsisVIcon,
   OutlinedWindowRestoreIcon,
 } from '@patternfly/react-icons';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import axios from 'axios';
 import { foremanUrl } from 'foremanReact/common/helpers';
 import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import { addToast } from 'foremanReact/components/ToastsList';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+
 import {
-  templateInvocationPageUrl,
-  MAX_HOSTS_API_SIZE,
   DIRECT_OPEN_HOST_LIMIT,
+  MAX_HOSTS_API_SIZE,
+  templateInvocationPageUrl,
 } from './JobInvocationConstants';
-import { selectHasPermission, selectItems } from './JobInvocationSelectors';
+import {
+  selectHasPermission,
+  selectItems,
+  selectTaskCancelable,
+} from './JobInvocationSelectors';
 import OpenAllInvocationsModal, { PopupAlert } from './OpenAllInvocationsModal';
 
+/* eslint-disable camelcase */
+const ActionsKebab = ({
+  selectedIds,
+  failedCount,
+  isTaskCancelable,
+  hasCancelPermission,
+  handleTaskAction,
+  handleOpenHosts,
+  isDropdownOpen,
+  setIsDropdownOpen,
+}) => {
+  const dropdownItems = [
+    <DropdownItem
+      ouiaId="cancel-host-dropdown-item"
+      onClick={() => handleTaskAction('cancel')}
+      key="cancel"
+      component="button"
+      isDisabled={
+        selectedIds.length === 0 || !isTaskCancelable || !hasCancelPermission
+      }
+    >
+      {__('Cancel selected')}
+    </DropdownItem>,
+    <DropdownItem
+      ouiaId="abort-host-dropdown-item"
+      onClick={() => handleTaskAction('abort')}
+      key="abort"
+      component="button"
+      isDisabled={
+        selectedIds.length === 0 || !isTaskCancelable || !hasCancelPermission
+      }
+    >
+      {__('Abort selected')}
+    </DropdownItem>,
+    <Divider component="li" key="separator" />,
+    <DropdownItem
+      ouiaId="open-failed-dropdown-item"
+      key="open-failed"
+      onClick={() => handleOpenHosts('failed')}
+      isDisabled={failedCount === 0}
+    >
+      {sprintf(__('Open all failed runs (%s)'), failedCount)}
+    </DropdownItem>,
+  ];
+
+  return (
+    <Dropdown
+      isOpen={isDropdownOpen}
+      onOpenChange={setIsDropdownOpen}
+      onSelect={() => setIsDropdownOpen(false)}
+      ouiaId="actions-kebab"
+      shouldFocusToggleOnSelect
+      toggle={toggleRef => (
+        <MenuToggle
+          aria-label="actions dropdown toggle"
+          id="toggle-kebab"
+          isExpanded={isDropdownOpen}
+          onClick={() => setIsDropdownOpen(prev => !prev)}
+          ref={toggleRef}
+          variant="plain"
+        >
+          <EllipsisVIcon />
+        </MenuToggle>
+      )}
+    >
+      <DropdownList>{dropdownItems}</DropdownList>
+    </Dropdown>
+  );
+};
+
 export const CheckboxesActions = ({
   selectedIds,
   failedCount,
@@ -35,9 +113,16 @@ export const CheckboxesActions = ({
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [showAlert, setShowAlert] = useState(false);
   const [isOpenFailed, setIsOpenFailed] = useState(false);
-  const hasPermission = useSelector(
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const isTaskCancelable = useSelector(selectTaskCancelable);
+  const dispatch = useDispatch();
+
+  const hasCreatePermission = useSelector(
     selectHasPermission('create_job_invocations')
   );
+  const hasCancelPermission = useSelector(
+    selectHasPermission('cancel_job_invocations')
+  );
   const jobSearchQuery = useSelector(selectItems)?.targeting?.search_query;
   const filterQuery =
     filter && filter !== 'all_statuses'
@@ -89,43 +174,64 @@ export const CheckboxesActions = ({
     setIsModalOpen(true);
   };
 
-  const ActionsKebab = () => {
-    const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
-
-    const dropdownItems = [
-      <DropdownItem
-        ouiaId="open-failed-dropdown-item"
-        key="open-failed"
-        onClick={() => handleOpenHosts('failed')}
-        isDisabled={failedCount === 0}
-      >
-        {sprintf(__('Open all failed runs (%s)'), failedCount)}
-      </DropdownItem>,
-    ];
-
-    return (
-      <Dropdown
-        isOpen={isDropdownOpen}
-        onOpenChange={setIsDropdownOpen}
-        onSelect={() => setIsDropdownOpen(false)}
-        ouiaId="actions-kebab"
-        shouldFocusToggleOnSelect
-        toggle={toggleRef => (
-          <MenuToggle
-            aria-label="actions dropdown toggle"
-            id="toggle-kebab"
-            isExpanded={isDropdownOpen}
-            onClick={() => setIsDropdownOpen(prev => !prev)}
-            ref={toggleRef}
-            variant="plain"
-          >
-            <EllipsisVIcon />
-          </MenuToggle>
-        )}
-      >
-        <DropdownList>{dropdownItems}</DropdownList>
-      </Dropdown>
+  const cancelJobTasks = (search, action) => async () => {
+    dispatch(
+      addToast({
+        key: `cancel-job-info`,
+        type: 'info',
+        message: sprintf(__('Trying to %s the task'), action),
+      })
     );
+
+    try {
+      const response = await axios.post(
+        `/api/v2/job_invocations/${jobID}/cancel`,
+        {
+          search,
+          force: action !== 'cancel',
+        }
+      );
+
+      const cancelledTasks = response.data?.cancelled;
+      const pastTenseAction =
+        action === 'cancel' ? __('cancelled') : __('aborted');
+
+      if (cancelledTasks && cancelledTasks.length > 0) {
+        const idList = cancelledTasks.join(', ');
+        dispatch(
+          addToast({
+            key: `success-tasks-cancelled`,
+            type: 'success',
+            message: sprintf(
+              __('%s task(s) successfully %s: %s'),
+              cancelledTasks.length,
+              pastTenseAction,
+              idList
+            ),
+          })
+        );
+      } else {
+        dispatch(
+          addToast({
+            key: `warn-no-tasks-cancelled-${Date.now()}`,
+            type: 'warning',
+            message: sprintf(__('Task(s) were not %s'), pastTenseAction),
+          })
+        );
+      }
+    } catch (error) {
+      dispatch(
+        addToast({
+          key: `error-cancelling-tasks`,
+          type: 'danger',
+          message: error.response?.data?.error || __('An error occurred.'),
+        })
+      );
+    }
+  };
+
+  const handleTaskAction = action => {
+    dispatch(cancelJobTasks(combinedQuery, action));
   };
 
   const OpenAllButton = () => (
@@ -153,7 +259,7 @@ export const CheckboxesActions = ({
         `/job_invocations/${jobID}/rerun?search=(${jobSearchQuery}) AND (${combinedQuery})`
       )}
       // eslint-disable-next-line camelcase
-      isDisabled={selectedIds.length === 0 || !hasPermission}
+      isDisabled={selectedIds.length === 0 || !hasCreatePermission}
       isInline
       ouiaId="template-invocation-rerun-selected-button"
       variant="secondary"
@@ -166,7 +272,16 @@ export const CheckboxesActions = ({
     <>
       <OpenAllButton />
       <RerunSelectedButton />
-      <ActionsKebab />
+      <ActionsKebab
+        selectedIds={selectedIds}
+        failedCount={failedCount}
+        isTaskCancelable={isTaskCancelable}
+        hasCancelPermission={hasCancelPermission}
+        handleTaskAction={handleTaskAction}
+        handleOpenHosts={handleOpenHosts}
+        isDropdownOpen={isDropdownOpen}
+        setIsDropdownOpen={setIsDropdownOpen}
+      />
       {showAlert && <PopupAlert setShowAlert={setShowAlert} />}
       <OpenAllInvocationsModal
         isOpen={isModalOpen}
@@ -182,6 +297,22 @@ export const CheckboxesActions = ({
   );
 };
 
+ActionsKebab.propTypes = {
+  selectedIds: PropTypes.array.isRequired,
+  failedCount: PropTypes.number.isRequired,
+  isTaskCancelable: PropTypes.bool,
+  hasCancelPermission: PropTypes.bool,
+  handleTaskAction: PropTypes.func.isRequired,
+  handleOpenHosts: PropTypes.func.isRequired,
+  isDropdownOpen: PropTypes.bool.isRequired,
+  setIsDropdownOpen: PropTypes.func.isRequired,
+};
+
+ActionsKebab.defaultProps = {
+  isTaskCancelable: false,
+  hasCancelPermission: false,
+};
+
 CheckboxesActions.propTypes = {
   selectedIds: PropTypes.array.isRequired,
   failedCount: PropTypes.number.isRequired,

data/webpack/JobInvocationDetail/JobInvocationConstants.js

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import React from 'react';
-import { foremanUrl } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
 import { useForemanHostDetailsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
 import JobStatusIcon from '../react_app/components/RecentJobsCard/JobStatusIcon';
 
@@ -31,8 +31,7 @@ export const LIST_TEMPLATE_INVOCATIONS = 'LIST_TEMPLATE_INVOCATIONS';
 export const templateInvocationPageUrl = (hostID, jobID) =>
   `/job_invocations_detail/${jobID}/host_invocation/${hostID}`;
 
-export const jobInvocationDetailsUrl = id =>
-  `/experimental/job_invocations_detail/${id}`;
+export const jobInvocationDetailsUrl = id => `/job_invocations/${id}`;
 
 export const STATUS = {
   PENDING: 'pending',

data/webpack/JobInvocationDetail/JobInvocationToolbarButtons.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Button, Split, SplitItem } from '@patternfly/react-core';
+import { UndoIcon } from '@patternfly/react-icons';
 import {
   Dropdown,
   DropdownItem,
@@ -189,7 +190,8 @@ const JobInvocationToolbarButtons = ({ jobId, data }) => {
     <DropdownSeparator ouiaId="dropdown-separator-2" key="separator-2" />,
     <DropdownItem
       ouiaId="legacy-ui-dropdown-item"
-      href={`/job_invocations/${jobId}`}
+      icon={<UndoIcon />}
+      href={`/legacy/job_invocations/${jobId}`}
       key="legacy-ui"
     >
       {__('Legacy UI')}

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

@@ -96,9 +96,7 @@ describe('JobInvocationDetailPage', () => {
     );
 
     expect(screen.getByText('Description')).toBeInTheDocument();
-    expect(
-      container.querySelector('.chart-donut .pf-v5-c-chart')
-    ).toBeInTheDocument();
+    expect(container.querySelector('.chart-donut')).toBeInTheDocument();
     expect(screen.getByText('2/6')).toBeInTheDocument();
     expect(screen.getByText('Systems')).toBeInTheDocument();
     expect(screen.getByText('System status')).toBeInTheDocument();
@@ -178,7 +176,7 @@ describe('JobInvocationDetailPage', () => {
         .getByText('Legacy UI')
         .closest('a')
         .getAttribute('href')
-    ).toEqual(`/job_invocations/${jobId}`);
+    ).toEqual(`/legacy/job_invocations/${jobId}`);
   });
 
   it('shows scheduled date', async () => {

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

@@ -1,16 +1,20 @@
+import '@testing-library/jest-dom/extend-expect';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import axios from 'axios';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 import React from 'react';
 import { Provider } from 'react-redux';
 import configureStore from 'redux-mock-store';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
-import '@testing-library/jest-dom/extend-expect';
-import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+
 import { CheckboxesActions } from '../CheckboxesActions';
 import * as selectors from '../JobInvocationSelectors';
 import { PopupAlert } from '../OpenAllInvocationsModal';
 
+jest.mock('axios');
 jest.mock('foremanReact/common/hooks/API/APIHooks');
-
 jest.mock('../JobInvocationSelectors');
+
 jest.mock('../JobInvocationConstants', () => ({
   ...jest.requireActual('../JobInvocationConstants'),
   templateInvocationPageUrl: jest.fn(
@@ -18,18 +22,15 @@ jest.mock('../JobInvocationConstants', () => ({
   ),
   DIRECT_OPEN_HOST_LIMIT: 3,
 }));
+
 selectors.selectItems.mockImplementation(() => ({
   targeting: { search_query: 'name~*' },
 }));
-selectors.selectHasPermission.mockImplementation(() => () => () => true);
+selectors.selectHasPermission.mockImplementation(() => () => true);
+selectors.selectTaskCancelable.mockImplementation(() => true);
+
 const mockStore = configureStore([]);
-const store = mockStore({
-  templateInvocation: {
-    permissions: {
-      execute_jobs: true,
-    },
-  },
-});
+const store = mockStore({});
 
 describe('TableToolbarActions', () => {
   const jobID = '42';
@@ -38,6 +39,7 @@ describe('TableToolbarActions', () => {
   beforeEach(() => {
     openSpy = jest.spyOn(window, 'open').mockImplementation(jest.fn());
     useAPI.mockClear();
+    axios.post.mockResolvedValue({ data: {} });
     useAPI.mockReturnValue({
       response: null,
       status: 'initial',
@@ -68,7 +70,7 @@ describe('TableToolbarActions', () => {
       expect(openSpy).toHaveBeenCalledTimes(selectedIds.length);
     });
 
-    test('shows modal when results length is greater than 3', () => {
+    test('shows modal when results length is greater than 3', async () => {
       const selectedIds = [1, 2, 3, 4];
       render(
         <Provider store={store}>
@@ -83,13 +85,13 @@ describe('TableToolbarActions', () => {
         screen.getByLabelText(/open all template invocations in new tab/i)
       );
       expect(
-        screen.getByRole('heading', {
-          name: /open all %s invocations in new tabs \+ selected/i,
+        await screen.findByRole('heading', {
+          name: /open all.*invocations in new tabs \+ selected/i,
         })
       ).toBeInTheDocument();
     });
 
-    test('shows alert when popups are blocked', () => {
+    test('shows alert when popups are blocked', async () => {
       openSpy.mockReturnValue(null);
       const selectedIds = [1, 2];
       render(
@@ -105,7 +107,7 @@ describe('TableToolbarActions', () => {
         screen.getByLabelText(/open all template invocations in new tab/i)
       );
       expect(
-        screen.getByText(/Popups are blocked by your browser/)
+        await screen.findByText(/Popups are blocked by your browser/)
       ).toBeInTheDocument();
     });
   });
@@ -123,23 +125,23 @@ describe('TableToolbarActions', () => {
         </Provider>
       );
       fireEvent.click(screen.getByLabelText(/actions dropdown toggle/i));
-      fireEvent.click(screen.getByText(/open all failed runs/i));
+      fireEvent.click(await screen.findByText(/open all failed runs/i));
       await waitFor(() => {
         expect(openSpy).toHaveBeenCalledTimes(failedHosts.length);
       });
     });
 
-    test('shows modal when results length is greater than 3', () => {
+    test('shows modal when results length is greater than 3', async () => {
       render(
         <Provider store={store}>
           <CheckboxesActions selectedIds={[]} failedCount={4} jobID={jobID} />
         </Provider>
       );
       fireEvent.click(screen.getByLabelText(/actions dropdown toggle/i));
-      fireEvent.click(screen.getByText(/open all failed runs/i));
+      fireEvent.click(await screen.findByText(/open all failed runs/i));
       expect(
-        screen.getByRole('heading', {
-          name: /open all %s invocations in new tabs \+ failed/i,
+        await screen.findByRole('heading', {
+          name: /open all.*invocations in new tabs \+ failed/i,
         })
       ).toBeInTheDocument();
     });
@@ -152,7 +154,7 @@ describe('TableToolbarActions', () => {
       );
       expect(useAPI).toHaveBeenCalledWith(
         'get',
-        `foreman/api/job_invocations/${jobID}/hosts`,
+        foremanUrl(`/api/job_invocations/${jobID}/hosts`),
         expect.objectContaining({
           skip: true,
         })
@@ -193,9 +195,9 @@ describe('TableToolbarActions', () => {
       );
       const rerunLink = screen.getByRole('link', { name: /rerun/i });
       expect(rerunLink).toBeEnabled();
-      const expectedSearchParams = new URLSearchParams();
-      selectedIds.forEach(id => expectedSearchParams.append('host_ids[]', id));
-      const expectedHref = `foreman/job_invocations/42/rerun?search=(name~*) AND ((id ^ (101, 102, 103)))`;
+      const expectedHref = foremanUrl(
+        `/job_invocations/42/rerun?search=(name~*) AND ((id ^ (101, 102, 103)))`
+      );
       expect(rerunLink).toHaveAttribute('href', expectedHref);
     });
   });

data/webpack/JobInvocationDetail/index.js

@@ -5,32 +5,31 @@ import {
   PageSectionVariants,
   Skeleton,
 } from '@patternfly/react-core';
-import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import React, { useEffect, useState } from 'react';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
-import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { useDispatch, useSelector } from 'react-redux';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
-import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
 import PropTypes from 'prop-types';
-import React, { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import SkeletonLoader from 'foremanReact/components/common/SkeletonLoader';
+import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
 
 import { JobAdditionInfo } from './JobAdditionInfo';
+import JobInvocationHostTable from './JobInvocationHostTable';
+import JobInvocationOverview from './JobInvocationOverview';
+import JobInvocationSystemStatusChart from './JobInvocationSystemStatusChart';
+import JobInvocationToolbarButtons from './JobInvocationToolbarButtons';
 import { getJobInvocation, getTask } from './JobInvocationActions';
+import './JobInvocationDetail.scss';
 import {
   CURRENT_PERMISSIONS,
-  currentPermissionsUrl,
   DATE_OPTIONS,
   JOB_INVOCATION_KEY,
   STATUS,
   STATUS_UPPERCASE,
+  currentPermissionsUrl,
 } from './JobInvocationConstants';
-import JobInvocationHostTable from './JobInvocationHostTable';
-import JobInvocationOverview from './JobInvocationOverview';
 import { selectItems } from './JobInvocationSelectors';
-import JobInvocationSystemStatusChart from './JobInvocationSystemStatusChart';
-import JobInvocationToolbarButtons from './JobInvocationToolbarButtons';
-
-import './JobInvocationDetail.scss';
 
 const JobInvocationDetailPage = ({
   match: {

data/webpack/Routes/routes.js

@@ -16,7 +16,7 @@ const ForemanREXRoutes = [
     render: props => <JobWizardPageRerun {...props} />,
   },
   {
-    path: '/experimental/job_invocations_detail/:id',
+    path: '/job_invocations/:id',
     exact: true,
     render: props => <JobInvocationDetailPage {...props} />,
   },

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 16.0.5
+  version: 16.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface