foreman_remote_execution 17.0.0 → 17.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c5f9e975897ee24ccf2c91fafe81e998742ec7453ca0e7cf3aea4846962b23
-  data.tar.gz: 20f9ca73d78bd41ce758b3ac39e1e880be6630230eb64d735850a88ae7b9cbec
+  metadata.gz: 248ba991802a19c3ad70d4c93a1a80931065c77f5e075520c01d35d07d3ef4e3
+  data.tar.gz: 83cad360b0893506f1ace4b8c38e60bdab716a74aaa2ff0a741908059f92e56f
 SHA512:
-  metadata.gz: 57609a9b217ab4e7e5e60536a6a4de788b26d46d09f68330ca385fbd4df59d65cabc33581026ba15795aacbfc96b1fe6a97b735e006dfcf0a51188032ea525b9
-  data.tar.gz: 23d742ef78d0f9dc5cc205d541c74a8c3a3472618c4e67a6cb1c5c94c552a2ea6aa601ce38b498f9fae2403227f0efdf44055fefe8cc90df1de86e3c7b6fc96f
+  metadata.gz: d4221e0916237573f00934dac48f0e169cb78ac278ec127b6f57e72cb8982ba12e79624a082986efe878ccbb325dd426ee41dcf0f2a155e08830791e389e3124
+  data.tar.gz: 927fa72b970f31090f729ade6acdbf7b73f33c4ca337af7e3ae4f0dfc998d0f77bc69a6bc32ede1ba3a052a46e98acf38d016277ab0085c75b0bd1edeec93068

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

@@ -117,12 +117,14 @@ module Api
       param_group :search_and_pagination, ::Api::V2::BaseController
       add_scoped_search_description_for(JobInvocation)
       param :id, :identifier, :required => true
+      param :include_permissions, :bool, :required => false, :desc => N_('Include per-host task and permission data in the response')
       def hosts
         set_hosts_and_template_invocations
         @total = @hosts.size
         @hosts = @hosts.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page], :per_page => params[:per_page])
         @subtotal = @hosts.total_entries
         set_statuses_and_smart_proxies
+        set_tasks_and_permissions if Foreman::Cast.to_bool(params[:include_permissions])
         if params[:awaiting]
           @hosts = @hosts.select { |host| @host_statuses[host.id] == 'N/A' }
         end
@@ -321,15 +323,35 @@ module Api
         template_invocations = @template_invocations.where(host_id: @hosts.select(:id))
                                                     .includes(:run_host_job_task).to_a
         hosts = @hosts.to_a
-        template_invocations_by_host_id = template_invocations.index_by(&:host_id)
+        @template_invocations_by_host_id = template_invocations.index_by(&:host_id)
         @host_statuses = hosts.to_h do |host|
-          template_invocation = template_invocations_by_host_id[host.id]
+          template_invocation = @template_invocations_by_host_id[host.id]
           task = template_invocation.try(:run_host_job_task)
           [host.id, template_invocation_status(task, @job_invocation.task)]
         end
         @smart_proxy_id = template_invocations.to_h { |ti| [ti.host_id, ti.smart_proxy_id] }
         @smart_proxy_name = template_invocations.to_h { |ti| [ti.host_id, ti.smart_proxy_name] }
       end
+
+      def set_tasks_and_permissions
+        can_cancel = authorized_for(:permission => :cancel_job_invocations, :auth_object => @job_invocation)
+        can_create = authorized_for(controller: :job_invocations, action: :create)
+        can_execute_on_infra = User.current.can?(:execute_jobs_on_infrastructure_hosts)
+
+        hosts = @hosts.to_a
+        @task_by_host = hosts.to_h do |host|
+          task = @template_invocations_by_host_id[host.id].try(:run_host_job_task)
+          [host.id, task ? { :id => task.id, :cancellable => task.try(:cancellable?) || false } : nil]
+        end
+        @permissions_by_host = hosts.to_h do |host|
+          task = @template_invocations_by_host_id[host.id].try(:run_host_job_task)
+          [host.id, {
+            :view_foreman_tasks => authorized_for(:permission => :view_foreman_tasks, :auth_object => task),
+            :cancel_job_invocations => can_cancel,
+            :execute_jobs => can_create && (!host.infrastructure_host? || can_execute_on_infra),
+          }]
+        end
+      end
     end
   end
 end

data/app/controllers/job_invocations_controller.rb

@@ -149,33 +149,6 @@ class JobInvocationsController < ApplicationController
     render :json => {:job_invocations => job_invocations}
   end
 
-  def list_jobs_hosts
-    @job_invocation = resource_base.find(params[:id])
-    hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
-    hosts = hosts.search_for(params[:search])
-    template_invocations_task_by_hosts = {}
-    hosts.each do |host|
-      template_invocation = @job_invocation.template_invocations.find { |template_inv| template_inv.host_id == host.id }
-      next unless template_invocation
-      template_invocation_task = template_invocation.run_host_job_task
-      template_invocations_task_by_hosts[host.id] =
-        {
-          :host_name => host.name,
-          :id => host.id,
-          :task => template_invocation_task.attributes.merge({cancellable: template_invocation_task.cancellable? }),
-          :permissions => {
-            :view_foreman_tasks => authorized_for(:permission => :view_foreman_tasks, :auth_object => template_invocation_task),
-            :cancel_job_invocations => authorized_for(:permission => :cancel_job_invocations, :auth_object => @job_invocation),
-            :execute_jobs => authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts)),
-          },
-        }
-    end
-
-    render json: {
-      :template_invocations_task_by_hosts => template_invocations_task_by_hosts,
-    }
-  end
-
   private
 
   def action_permission
@@ -186,7 +159,7 @@ class JobInvocationsController < ApplicationController
         'create'
       when 'cancel'
         'cancel'
-      when 'chart', 'preview_job_invocations_per_host', 'list_jobs_hosts'
+      when 'chart', 'preview_job_invocations_per_host'
         'view'
       else
         super

data/app/views/api/v2/job_invocations/hosts.json.rabl

@@ -13,3 +13,11 @@ end
 node :smart_proxy_name do |host|
   @smart_proxy_name[host.id]
 end
+
+node(:task, :if => ->(_host) { @task_by_host }) do |host|
+  @task_by_host[host.id]
+end
+
+node(:permissions, :if => ->(_host) { @permissions_by_host }) do |host|
+  @permissions_by_host[host.id]
+end

data/config/routes.rb

@@ -35,7 +35,6 @@ Rails.application.routes.draw do
       get 'auto_complete_search'
     end
     member do
-      get 'hosts', to: 'job_invocations#list_jobs_hosts'
       post 'cancel'
     end
   end

data/lib/foreman_remote_execution/plugin.rb

@@ -134,9 +134,9 @@ 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, :list_jobs_hosts], :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], :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], :job_invocations => [:list_jobs_hosts],
+    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'
     permission :create_template_invocations, {}, :resource_type => 'TemplateInvocation'
     permission :execute_jobs_on_infrastructure_hosts, {}, :resource_type => 'JobInvocation'

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '17.0.0'.freeze
+  VERSION = '17.1.0'.freeze
 end

data/test/functional/api/v2/job_invocations_controller_test.rb

@@ -284,20 +284,59 @@ module Api
       end
 
       describe '#hosts' do
-        test 'should compute job_status for the paginated subset' do
-          invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
-          2.times { invocation.template_invocations << FactoryBot.create(:template_invocation, :with_task, :with_host, :job_invocation => invocation) }
-          invocation.job_category = invocation.pattern_template_invocations.first.template.job_category
-          invocation.targeting.hosts = invocation.template_invocations.map(&:host)
-          invocation.save!
+        setup do
+          @hosts_invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+          2.times { @hosts_invocation.template_invocations << FactoryBot.create(:template_invocation, :with_task, :with_host, :job_invocation => @hosts_invocation) }
+          @hosts_invocation.job_category = @hosts_invocation.pattern_template_invocations.first.template.job_category
+          @hosts_invocation.targeting.hosts = @hosts_invocation.template_invocations.map(&:host)
+          @hosts_invocation.save!
+        end
 
-          get :hosts, params: { :id => invocation.id, :page => 2, :per_page => 1 }
+        test 'should compute job_status for the paginated subset' do
+          get :hosts, params: { :id => @hosts_invocation.id, :page => 2, :per_page => 1 }
           assert_response :success
           result = ActiveSupport::JSON.decode(@response.body)
           assert_equal 3, result['total']
           assert_equal 1, result['results'].size
           assert_equal(['success'], result['results'].map { |r| r['job_status'] })
         end
+
+        test 'should not include task and permissions without include_permissions' do
+          get :hosts, params: { :id => @hosts_invocation.id }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          result['results'].each do |host|
+            assert_not host.key?('task'), 'Expected task to be absent'
+            assert_not host.key?('permissions'), 'Expected permissions to be absent'
+          end
+        end
+
+        test 'should include task and permissions with include_permissions=true' do
+          get :hosts, params: { :id => @hosts_invocation.id, :include_permissions => true }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          result['results'].each do |host|
+            assert host.key?('task'), 'Expected task to be present'
+            assert host.key?('permissions'), 'Expected permissions to be present'
+            permissions = host['permissions']
+            assert permissions.key?('view_foreman_tasks')
+            assert permissions.key?('cancel_job_invocations')
+            assert permissions.key?('execute_jobs')
+          end
+        end
+
+        test 'should handle hosts with nil task gracefully when include_permissions=true' do
+          invocation = FactoryBot.create(:job_invocation, :with_template, :with_task, :with_unplanned_host)
+          invocation.job_category = invocation.pattern_template_invocations.first.template.job_category
+          invocation.save!
+
+          get :hosts, params: { :id => invocation.id, :include_permissions => true }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          result['results'].each do |host|
+            assert host.key?('permissions'), 'Expected permissions to be present'
+          end
+        end
       end
 
       describe 'raw output' do

data/webpack/JobInvocationDetail/JobInvocationActions.js

@@ -7,10 +7,9 @@ import {
   CHANGE_ENABLED_RECURRING_LOGIC,
   JOB_INVOCATION_KEY,
   STATUS,
+  AUTO_REFRESH_INTERVAL_MS,
 } from './JobInvocationConstants';
 
-const POLL_INTERVAL = 5000;
-
 export const isJobFinished = statusLabel =>
   statusLabel === STATUS.FAILED ||
   statusLabel === STATUS.SUCCEEDED ||
@@ -26,20 +25,27 @@ const createPollState = cancel => ({ timeoutId: null, cancel });
 
 export const getJobInvocation = (url, pollTimeoutRef) => dispatch => {
   let cancelled = false;
+  let isFirstCall = true;
 
   const poll = () => {
     if (cancelled) return;
+    const params = { include_hosts: false };
+    if (isFirstCall) {
+      params.include_permissions = true;
+      isFirstCall = false;
+    }
+
     dispatch(
       APIActions.get({
         key: JOB_INVOCATION_KEY,
-        params: { include_permissions: true, include_hosts: false },
+        params,
         url,
         handleSuccess: ({ data }) => {
           if (cancelled) return;
           // eslint-disable-next-line camelcase
           pollTimeoutRef.current.timeoutId = isJobFinished(data?.status_label)
             ? null
-            : setTimeout(poll, POLL_INTERVAL);
+            : setTimeout(poll, AUTO_REFRESH_INTERVAL_MS);
         },
         handleError: () => {
           if (cancelled) return;

data/webpack/JobInvocationDetail/JobInvocationConstants.js

@@ -15,14 +15,15 @@ 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;
-export const ALL_JOB_HOSTS = 'ALL_JOB_HOSTS';
 export const AWAITING_STATUS_FILTER = '(job_invocation.result = N/A)';
 
 export const AUTO_REFRESH_INTERVAL_MS = 5000;
+export const DEFAULT_CHART_LEGEND_WIDTH = 270;
+export const CLIPBOARD_COPIED_EXIT_DELAY_MS = 1500;
+export const CLIPBOARD_DEFAULT_EXIT_DELAY_MS = 600;
 
 export const showTemplateInvocationUrl = (hostID, jobID) =>
   `/show_template_invocation_by_host/${hostID}/job_invocation/${jobID}`;
-export const LIST_TEMPLATE_INVOCATIONS = 'LIST_TEMPLATE_INVOCATIONS';
 
 export const templateInvocationPageUrl = (hostID, jobID) =>
   `/job_invocations_detail/${jobID}/host_invocation/${hostID}`;

data/webpack/JobInvocationDetail/JobInvocationDetail.scss

@@ -1,5 +1,6 @@
 .job-invocation-detail-flex {
   $chart_size: 105px;
+
   padding-top: 0px;
   padding-left: 10px;
   display: flex;
@@ -92,16 +93,17 @@ section.job-additional-info {
       max-height: 25em;
     }
   }
+
   div.invocation-output {
     display: block;
     padding: 9.5px;
     margin: 0 0 10px;
     font-size: 12px;
     word-break: break-all;
-    word-wrap: break-word;
+    overflow-wrap: break-word;
     color: rgba(255, 255, 255, 1);
     background-color: rgba(47, 47, 47, 1);
-    border: 1px solid #000000;
+    border: 1px solid #000;
     border-radius: 0px;
     font-family: Menlo, Monaco, Consolas, monospace;
 
@@ -127,7 +129,7 @@ section.job-additional-info {
     }
 
     a {
-      color: #ffffff;
+      color: #fff;
     }
 
     a.scroll-link{

data/webpack/JobInvocationDetail/JobInvocationHostTable.js

@@ -39,7 +39,6 @@ import { CheckboxesActions } from './CheckboxesActions';
 import DropdownFilter from './DropdownFilter';
 import Columns, {
   JOB_INVOCATION_HOSTS,
-  LIST_TEMPLATE_INVOCATIONS,
   STATUS_UPPERCASE,
   AWAITING_STATUS_FILTER,
   AUTO_REFRESH_INTERVAL_MS,
@@ -163,11 +162,24 @@ const JobInvocationHostTable = ({
     [initialFilter, urlSearchQuery]
   );
 
+  const [hostPermissions, setHostPermissions] = useState({});
+
   const updateHostsState = useCallback(data => {
     const ids = data.data.results.map(i => i.id);
     setApiResponse(data.data);
     setAllHostsIds(ids);
     setStatus(STATUS_UPPERCASE.RESOLVED);
+
+    const resultsWithPermissions = data.data.results.filter(r => r.permissions);
+    if (resultsWithPermissions.length > 0) {
+      setHostPermissions(prev => {
+        const updated = { ...prev };
+        resultsWithPermissions.forEach(r => {
+          updated[r.id] = { task: r.task, permissions: r.permissions };
+        });
+        return updated;
+      });
+    }
   }, []);
 
   // Call hosts data with params
@@ -229,7 +241,10 @@ const JobInvocationHostTable = ({
         finalParams.search = filterSearch;
       }
 
-      currentPollParams.current = finalParams;
+      finalParams.include_permissions = true;
+
+      currentPollParams.current = { ...finalParams };
+      delete currentPollParams.current.include_permissions;
       clearTimeout(pollTimeoutId.current);
       pollTimeoutId.current = null;
 
@@ -258,20 +273,12 @@ const JobInvocationHostTable = ({
   const initializedRef = useRef(false);
   useEffect(() => {
     if (!initializedRef.current) {
-      dispatch(
-        APIActions.get({
-          key: LIST_TEMPLATE_INVOCATIONS,
-          url: `/job_invocations/${id}/hosts`,
-          params: {},
-        })
-      );
-
       if (initialFilter === '') {
         onFilterUpdate('all_statuses');
       }
       initializedRef.current = true;
     }
-  }, [dispatch, id, initialFilter, onFilterUpdate]);
+  }, [initialFilter, onFilterUpdate]);
 
   useEffect(() => {
     const filterChanged = initialFilter !== prevFilter.current;
@@ -506,7 +513,12 @@ const JobInvocationHostTable = ({
                     <Td key={k}>{columns[k].wrapper(result)}</Td>
                   ))}
                   <Td isActionCell>
-                    <RowActions hostID={result.id} jobID={id} />
+                    <RowActions
+                      hostID={result.id}
+                      jobID={id}
+                      task={hostPermissions[result.id]?.task}
+                      permissions={hostPermissions[result.id]?.permissions}
+                    />
                   </Td>
                 </Tr>
                 <Tr

data/webpack/JobInvocationDetail/JobInvocationSelectors.js

@@ -6,7 +6,6 @@ import {
 import {
   JOB_INVOCATION_KEY,
   GET_TEMPLATE_INVOCATION,
-  LIST_TEMPLATE_INVOCATIONS,
 } from './JobInvocationConstants';
 
 export const selectItems = state =>
@@ -20,7 +19,3 @@ export const selectTemplateInvocation = hostID => state =>
 
 export const selectTemplateInvocationStatus = hostID => state =>
   selectAPIStatus(state, `${GET_TEMPLATE_INVOCATION}_${hostID}`);
-
-export const selectTemplateInvocationList = state =>
-  selectAPIResponse(state, LIST_TEMPLATE_INVOCATIONS)
-    ?.template_invocations_task_by_hosts;

data/webpack/JobInvocationDetail/JobInvocationSystemStatusChart.js

@@ -23,7 +23,10 @@ import {
   global_palette_blue_300 as inProgressColor,
   global_palette_green_500 as successedColor,
 } from '@patternfly/react-tokens';
-import { STATUS_TITLES } from './JobInvocationConstants';
+import {
+  STATUS_TITLES,
+  DEFAULT_CHART_LEGEND_WIDTH,
+} from './JobInvocationConstants';
 import './JobInvocationDetail.scss';
 
 const JobInvocationSystemStatusChart = ({
@@ -52,7 +55,7 @@ const JobInvocationSystemStatusChart = ({
     return '0';
   };
   const chartSize = 105;
-  const [legendWidth, setLegendWidth] = useState(270);
+  const [legendWidth, setLegendWidth] = useState(DEFAULT_CHART_LEGEND_WIDTH);
 
   // Calculates chart legend width based on its content
   useEffect(() => {

data/webpack/JobInvocationDetail/TemplateInvocation.js

@@ -12,6 +12,8 @@ import {
   templateInvocationPageUrl,
   GET_TEMPLATE_INVOCATION,
   AUTO_REFRESH_INTERVAL_MS,
+  CLIPBOARD_COPIED_EXIT_DELAY_MS,
+  CLIPBOARD_DEFAULT_EXIT_DELAY_MS,
 } from './JobInvocationConstants';
 import {
   selectTemplateInvocationStatus,
@@ -42,7 +44,11 @@ const CopyToClipboard = ({ fullOutput }) => {
       textId="code-content"
       aria-label="Copy to clipboard"
       onClick={e => onClick(e, fullOutput)}
-      exitDelay={copied ? 1500 : 600}
+      exitDelay={
+        copied
+          ? CLIPBOARD_COPIED_EXIT_DELAY_MS
+          : CLIPBOARD_DEFAULT_EXIT_DELAY_MS
+      }
       maxWidth="110px"
       variant="plain"
       onTooltipHidden={() => setCopied(false)}

data/webpack/JobInvocationDetail/TemplateInvocationComponents/OutputCodeBlock.js

@@ -7,6 +7,7 @@ import React, {
 import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { MS_PER_SECOND } from 'foremanReact/constants';
 
 export const OutputCodeBlock = ({ code, showOutputType, scrollElement }) => {
   let lineCounter = 0;
@@ -122,7 +123,7 @@ export const OutputCodeBlock = ({ code, showOutputType, scrollElement }) => {
         <div key={index} className={`line ${line.output_type}`}>
           <span
             className="counter"
-            title={new Date(line.timestamp * 1000).toISOString()}
+            title={new Date(line.timestamp * MS_PER_SECOND).toISOString()}
           >
             {lineCounter.toString().padStart(4, '\u00A0')}:{' '}
           </span>

data/webpack/JobInvocationDetail/TemplateInvocationComponents/TemplateActionButtons.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { Flex, FlexItem, Button } from '@patternfly/react-core';
 import { ActionsColumn } from '@patternfly/react-table';
 import { APIActions } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/components/ToastsList';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { selectTemplateInvocationList } from '../JobInvocationSelectors';
 import './index.scss';
 
 const actions = ({
@@ -81,11 +80,9 @@ const actions = ({
   },
 });
 
-export const RowActions = ({ hostID, jobID }) => {
+export const RowActions = ({ hostID, jobID, task, permissions }) => {
   const dispatch = useDispatch();
-  const response = useSelector(selectTemplateInvocationList)?.[hostID];
-  if (!response?.permissions) return null;
-  const { task, permissions } = response;
+  if (!permissions) return null;
   const { id: taskID, cancellable: taskCancellable } = task || {};
   const getActions = actions({
     taskID,
@@ -216,4 +213,18 @@ TemplateActionButtons.defaultProps = {
 RowActions.propTypes = {
   hostID: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   jobID: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  task: PropTypes.shape({
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    cancellable: PropTypes.bool,
+  }),
+  permissions: PropTypes.shape({
+    view_foreman_tasks: PropTypes.bool,
+    cancel_job_invocations: PropTypes.bool,
+    execute_jobs: PropTypes.bool,
+  }),
+};
+
+RowActions.defaultProps = {
+  task: null,
+  permissions: null,
 };

data/webpack/JobInvocationDetail/TemplateInvocationComponents/index.scss

@@ -1,5 +1,4 @@
 .jobs-table-action-item a {
-
     color: inherit;
     text-decoration: none;
 

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

@@ -311,6 +311,39 @@ describe('JobInvocationHostTable polling', () => {
     expect(hostsCalls.length).toBeGreaterThan(callsAfterFilterChange);
   });
 
+  it('sends include_permissions only on the first request', () => {
+    renderTable();
+
+    expect(hostsCalls).toHaveLength(1);
+    expect(hostsCalls[0].params.include_permissions).toBe(true);
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(5000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(2);
+    expect(hostsCalls[1].params.include_permissions).toBeUndefined();
+
+    act(() => {
+      jest.advanceTimersByTime(5000);
+    });
+
+    act(() => {
+      flushPendingCallbacks();
+    });
+
+    expect(hostsCalls).toHaveLength(3);
+    expect(hostsCalls[2].params.include_permissions).toBeUndefined();
+  });
+
   it('stops polling on API error', () => {
     apiGetSpy.mockRestore();
     setupErrorMock();

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

@@ -5,7 +5,10 @@ import {
   getJobInvocation,
   stopJobInvocationPolling,
 } from '../JobInvocationActions';
-import { JOB_INVOCATION_KEY } from '../JobInvocationConstants';
+import {
+  JOB_INVOCATION_KEY,
+  AUTO_REFRESH_INTERVAL_MS,
+} from '../JobInvocationConstants';
 
 jest.useFakeTimers();
 
@@ -66,22 +69,24 @@ describe('job invocation polling', () => {
     store.dispatch(getJobInvocation(url, ref));
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
 
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
     expect(apiGetSpy).toHaveBeenCalledTimes(2);
   });
 
-  it('includes include_permissions=true in every poll call', () => {
+  it('does not include include_permissions on subsequent poll calls', () => {
     setupGetMock(runningData);
     const store = makeStore();
 
     store.dispatch(getJobInvocation(url, ref));
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(2);
     expect(apiGetSpy.mock.calls[1][0].params).toMatchObject({
       include_hosts: false,
-      include_permissions: true,
     });
+    expect(apiGetSpy.mock.calls[1][0].params).not.toHaveProperty(
+      'include_permissions'
+    );
   });
 
   it('stops polling when job succeeds', () => {
@@ -91,7 +96,7 @@ describe('job invocation polling', () => {
     store.dispatch(getJobInvocation(url, ref));
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
 
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
   });
 
@@ -100,7 +105,7 @@ describe('job invocation polling', () => {
     const store = makeStore();
 
     store.dispatch(getJobInvocation(url, ref));
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
   });
@@ -110,7 +115,7 @@ describe('job invocation polling', () => {
     const store = makeStore();
 
     store.dispatch(getJobInvocation(url, ref));
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
   });
@@ -125,7 +130,7 @@ describe('job invocation polling', () => {
     const store = makeStore();
 
     store.dispatch(getJobInvocation(url, ref));
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
   });
@@ -138,7 +143,7 @@ describe('job invocation polling', () => {
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
 
     stopJobInvocationPolling(ref);
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(1);
   });
@@ -154,7 +159,7 @@ describe('job invocation polling', () => {
     store.dispatch(getJobInvocation(url, ref));
     expect(apiGetSpy).toHaveBeenCalledTimes(2);
 
-    jest.advanceTimersByTime(5000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS);
 
     // Only the second poll chain fires (first was cancelled)
     expect(apiGetSpy).toHaveBeenCalledTimes(3);
@@ -165,7 +170,7 @@ describe('job invocation polling', () => {
     const store = makeStore();
 
     store.dispatch(getJobInvocation(url, ref));
-    jest.advanceTimersByTime(15000);
+    jest.advanceTimersByTime(AUTO_REFRESH_INTERVAL_MS * 3);
 
     expect(apiGetSpy).toHaveBeenCalledTimes(4);
   });

data/webpack/JobInvocationDetail/index.js

@@ -54,6 +54,11 @@ const JobInvocationDetailPage = ({
   } = items;
   const finished = isJobFinished(statusLabel);
   const pollTimeoutRef = useRef({ timeoutId: null, cancel: () => {} });
+  const permissionsRef = useRef(null);
+  if (items.permissions && !permissionsRef.current) {
+    permissionsRef.current = items.permissions;
+  }
+  const permissions = items.permissions || permissionsRef.current;
   const jobInvocationApiStatus = useSelector(state =>
     selectAPIStatus(state, JOB_INVOCATION_KEY)
   );
@@ -87,6 +92,11 @@ const JobInvocationDetailPage = ({
     };
   }, [dispatch, id]);
 
+  const dataWithPermissions = useMemo(() => ({ ...items, permissions }), [
+    items,
+    permissions,
+  ]);
+
   const apiFailed = jobInvocationApiStatus === API_STATUS.ERROR;
 
   const backendErrorMessage = useMemo(() => {
@@ -143,7 +153,10 @@ const JobInvocationDetailPage = ({
         breadcrumbOptions={breadcrumbOptions}
         toolbarButtons={
           items.id !== undefined && (
-            <JobInvocationToolbarButtons jobId={id} data={items} />
+            <JobInvocationToolbarButtons
+              jobId={id}
+              data={dataWithPermissions}
+            />
           )
         }
         searchable={false}

data/webpack/JobWizard/JobWizard.js

@@ -18,6 +18,7 @@ import {
   WIZARD_TITLES,
   SCHEDULE_TYPES,
   initialScheduleState,
+  STARTS_ERROR_CHECK_INTERVAL_MS,
 } from './JobWizardConstants';
 import {
   selectTemplateError,
@@ -237,7 +238,10 @@ export const JobWizard = ({ rerunData }) => {
       }
     };
     updateStartsError();
-    const interval = setInterval(updateStartsError, 5000);
+    const interval = setInterval(
+      updateStartsError,
+      STARTS_ERROR_CHECK_INTERVAL_MS
+    );
 
     return () => {
       interval && clearInterval(interval);

data/webpack/JobWizard/JobWizard.scss

@@ -1,5 +1,6 @@
 .job-wizard {
   font-size: var(--pf-v5-global--FontSize--md);
+
   .wizard-title {
     margin-bottom: 25px;
   }
@@ -15,6 +16,7 @@
       var(--pf-v5-cwizard__toggle--ZIndex) + 1
     ); // So the select box can be shown above the wizard footer and navigation toggle
   }
+
   .pf-v5-c-wizard__main-body {
     @media (max-width: 600px) {
       max-width: 100%;
@@ -41,6 +43,7 @@
     .pf-v5-c-chip-group.pf-m-category {
       margin-bottom: 10px;
     }
+
     .pf-v5-c-select__toggle-typeahead {
       border: 0px;
     }
@@ -50,62 +53,76 @@
         flex-wrap: nowrap;
       }
     }
+
     .foreman-search-field {
       width: 100%;
     }
   }
+
   input[type='radio'],
   input[type='checkbox'] {
     margin: 0;
   }
+
   .schedule-tab {
     #repeat-on-weekly {
       display: grid;
       grid-template-columns: repeat(7, 1fr);
     }
+
     .pf-v5-l-grid {
       gap: var(--pf-v5-cform--GridGap);
     }
+
     #repeat-on-hourly {
       max-height: 300px;
       overflow: scroll;
     }
+
     .schedule-radio label {
       width: 100%;
     }
+
     .schedule-radio input {
       align-self: center;
     }
+
     .schedule-radio-repeat-text {
       width: 100px;
       display: inline-block;
       margin-right: 5px;
       align-self: center;
     }
+
     .schedule-radio-title {
       width: 80px;
       display: inline-block;
       align-self: center;
     }
+
     .schedule-radio-occurences {
       display: inline-block;
       align-self: center;
     }
+
     .schedule-radio-wrapper {
       display: flex;
     }
   }
+
   .future-schedule-tab {
     .clear-datetime-button {
       margin-left: 10px;
       align-self: center;
       font-size: var(--pf-v5-global--FontSize--md);
     }
+
     .pf-v5-c-form__group-control {
       display: flex;
       flex-wrap: wrap;
     }
   }
+
   .pf-v5-c-date-picker {
     vertical-align: top;
   }
@@ -119,10 +136,12 @@
     // overwriting bootstrap/_forms.scss margin: 4px 0 0;
     margin: 0;
   }
+
   textarea {
     min-height: 40px;
     min-width: 100px;
   }
+
   .pf-v5-c-modal-box {
     width: auto;
   }
@@ -132,9 +151,11 @@
       margin-left: 10px;
     }
   }
+
   .pf-v5-c-radio__body {
     font-size: var(--pf-v5-cradio__label--FontSize);
   }
+
   .reset-default {
     padding-bottom: 0;
   }

data/webpack/JobWizard/JobWizardConstants.js

@@ -1,6 +1,9 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
-import { getControllerSearchProps } from 'foremanReact/constants';
+import {
+  getControllerSearchProps,
+  MS_PER_SECOND,
+} from 'foremanReact/constants';
 
 export const JOB_TEMPLATES = 'JOB_TEMPLATES';
 export const JOB_CATEGORIES = 'JOB_CATEGORIES';
@@ -78,3 +81,9 @@ export const HOST_IDS = 'HOST_IDS';
 export const REX_FEATURE = 'REX_FEATURE';
 
 export const JOB_API_KEY = 'JOB_API_KEY';
+
+export const SUNDAY_BASE_YEAR = 2017;
+export const DEFAULT_MINUTE_OPTIONS = [0, 15, 30, 45];
+export const STARTS_ERROR_CHECK_INTERVAL_MS = 5000;
+export const DATE_PADDING_SLICE = -2;
+export const DEBOUNCE_INPUT_MS = MS_PER_SECOND;

data/webpack/JobWizard/steps/Schedule/RepeatHour.js

@@ -12,13 +12,15 @@ import {
   SelectVariant,
 } from '@patternfly/react-core/deprecated';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { MINUTES_PER_HOUR } from 'foremanReact/constants';
 import { helpLabel } from '../form/FormHelpers';
+import { DEFAULT_MINUTE_OPTIONS } from '../../JobWizardConstants';
 
 export const RepeatHour = ({ repeatData, setRepeatData }) => {
   const isValidMinute = newMinute =>
     Number.isInteger(parseInt(newMinute, 10)) &&
     newMinute >= 0 &&
-    newMinute < 60;
+    newMinute < MINUTES_PER_HOUR;
 
   const { minute } = repeatData;
   useEffect(() => {
@@ -27,7 +29,7 @@ export const RepeatHour = ({ repeatData, setRepeatData }) => {
     }
   }, [minute, setRepeatData]);
   const [minuteOpen, setMinuteOpen] = useState(false);
-  const [options, setOptions] = useState([0, 15, 30, 45]);
+  const [options, setOptions] = useState(DEFAULT_MINUTE_OPTIONS);
   const [isAlertOpen, setIsAlertOpen] = useState(false);
   return (
     <FormGroup

data/webpack/JobWizard/steps/Schedule/RepeatWeek.js

@@ -2,15 +2,17 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { FormGroup, Checkbox } from '@patternfly/react-core';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
+import { DAYS_PER_WEEK } from 'foremanReact/constants';
 import { RepeatDaily } from './RepeatDaily';
 import { noop } from '../../../helpers';
+import { SUNDAY_BASE_YEAR } from '../../JobWizardConstants';
 
 export const getWeekDays = () => {
   const locale = documentLocale().replace(/-/g, '_');
-  const baseDate = new Date(Date.UTC(2017, 0, 1)); // just a Sunday
+  const baseDate = new Date(Date.UTC(SUNDAY_BASE_YEAR, 0, 1)); // just a Sunday
   const weekDays = [];
   const formatOptions = { weekday: 'short', timeZone: 'UTC' };
-  for (let i = 0; i < 7; i++) {
+  for (let i = 0; i < DAYS_PER_WEEK; i++) {
     try {
       weekDays.push(baseDate.toLocaleDateString(locale, formatOptions));
     } catch {

data/webpack/JobWizard/steps/Schedule/ScheduleRecurring.js

@@ -12,6 +12,7 @@ import {
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { MS_PER_MINUTE } from 'foremanReact/constants';
 import { RepeatOn } from './RepeatOn';
 import { SCHEDULE_TYPES } from '../../JobWizardConstants';
 import { PurposeField } from './PurposeField';
@@ -114,7 +115,7 @@ export const ScheduleRecurring = ({
                   setScheduleValue(current => ({
                     ...current,
                     startsAt: new Date(
-                      new Date().getTime() + 60000
+                      new Date().getTime() + MS_PER_MINUTE
                     ).toISOString(), // 1 minute in the future
                     isFuture: true,
                   }))

data/webpack/JobWizard/steps/Schedule/ScheduleType.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Form, FormGroup, Radio, Divider } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { MS_PER_MINUTE } from 'foremanReact/constants';
 import {
   WIZARD_TITLES,
   SCHEDULE_TYPES,
@@ -49,7 +50,9 @@ export const ScheduleType = ({
           onChange={() => {
             setScheduleValue(current => ({
               ...current,
-              startsAt: new Date(new Date().getTime() + 60000).toISOString(), // 1 minute in the future
+              startsAt: new Date(
+                new Date().getTime() + MS_PER_MINUTE
+              ).toISOString(), // 1 minute in the future
               scheduleType: SCHEDULE_TYPES.FUTURE,
               repeatType: repeatTypes.noRepeat,
             }));

data/webpack/JobWizard/steps/form/DateTimePicker.js

@@ -7,13 +7,19 @@ import {
 } from '@patternfly/react-core';
 import { debounce } from 'lodash';
 import { translate as __, documentLocale } from 'foremanReact/common/I18n';
+import {
+  DATE_PADDING_SLICE,
+  DEBOUNCE_INPUT_MS,
+} from '../../JobWizardConstants';
 
 const formatDateTime = d =>
   `${d.getFullYear()}-${`0${d.getMonth() + 1}`.slice(
-    -2
-  )}-${`0${d.getDate()}`.slice(-2)} ${`0${d.getHours()}`.slice(
-    -2
-  )}:${`0${d.getMinutes()}`.slice(-2)}:${`0${d.getSeconds()}`.slice(-2)}`;
+    DATE_PADDING_SLICE
+  )}-${`0${d.getDate()}`.slice(DATE_PADDING_SLICE)} ${`0${d.getHours()}`.slice(
+    DATE_PADDING_SLICE
+  )}:${`0${d.getMinutes()}`.slice(
+    DATE_PADDING_SLICE
+  )}:${`0${d.getSeconds()}`.slice(DATE_PADDING_SLICE)}`;
 
 export const DateTimePicker = ({
   dateTime,
@@ -103,7 +109,7 @@ export const DateTimePicker = ({
         aria-label={`${ariaLabel} datepicker`}
         value={formattedDate}
         placeholder="yyyy/mm/dd"
-        onChange={debounce(onDateChange, 1000, {
+        onChange={debounce(onDateChange, DEBOUNCE_INPUT_MS, {
           leading: false,
           trailing: true,
         })}
@@ -123,7 +129,7 @@ export const DateTimePicker = ({
         time={dateTime ? dateObject.toString() : ''}
         inputProps={dateTime ? {} : { value: '' }}
         placeholder={includeSeconds ? 'hh:mm:ss' : 'hh:mm'}
-        onChange={debounce(onTimeChange, 1000, {
+        onChange={debounce(onTimeChange, DEBOUNCE_INPUT_MS, {
           leading: false,
           trailing: true,
         })}

data/webpack/JobWizard/steps/form/FormHelpers.js

@@ -8,16 +8,17 @@ export const helpLabel = (text, id) => {
   if (!text) return null;
   return (
     <Popover id={`${id}-help`} bodyContent={text} aria-label="help-text">
-      <button
-        type="button"
+      <Button
+        ouiaId={`${id}-help-button`}
+        variant="plain"
         aria-label={__('open-help-tooltip-button')}
         onClick={e => e.preventDefault()}
-        className="pf-v5-c-form__group-label-help"
+        isInline
       >
         <Icon isInline>
           <HelpIcon />
         </Icon>
-      </button>
+      </Button>
     </Popover>
   );
 };

data/webpack/react_app/components/FeaturesDropdown/index.scss

@@ -1,7 +1,9 @@
 #schedule-a-job-dropdown ul.pf-v5-c-dropdown__menu {
   padding-left: 0;
+
   li {
     display: unset;
+
     a {
       font-size: 16px;
       color: var(--pf-v5-cdropdown__menu-item--Color);

data/webpack/react_app/components/TargetingHosts/TargetingHostsLabelsRow.scss

@@ -3,24 +3,28 @@
 .tasks-labels-row {
   margin: 0;
   padding: 10px;
+
   .title {
     font-weight: 600;
     font-size: 13px;
   }
+
   .label {
     font-size: 100%;
-
     margin-left: 5px;
     margin-right: 5px;
+
     a {
       padding-left: 10px;
     }
   }
+
   .pficon-close {
     color: $color-pf-white;
   }
+
   .compound-label-pf {
-    margin-left: 0;
     margin: 10px;
+    margin-left: 0;
   }
 }

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

@@ -25,7 +25,7 @@ exports[`TargetingHostsPage renders 1`] = `
             },
             "bookmarks": Object {
               "canCreate": true,
-              "documentationUrl": "4.1.5Searching",
+              "documentationUrl": "/links/manual/4.1.5Searching",
               "id": "targeting_hosts_search",
               "url": "/api/bookmarks",
             },

data/webpack/react_app/components/TargetingHosts/index.js

@@ -7,6 +7,7 @@ import {
   withInterval,
   stopInterval,
 } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { MS_PER_SECOND } from 'foremanReact/constants';
 
 import {
   selectItems,
@@ -100,7 +101,7 @@ const WrappedTargetingHosts = () => {
             dispatch(stopInterval(TARGETING_HOSTS));
           },
         }),
-        1000
+        MS_PER_SECOND
       ),
     [dispatch]
   );

data/webpack/react_app/redux/actions/jobInvocations/index.js

@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import API from 'foremanReact/API';
+import { HTTP_STATUS_CODES, MS_PER_SECOND } from 'foremanReact/constants';
 
 import {
   JOB_INVOCATIONS_GET_JOB_INVOCATIONS,
@@ -7,7 +8,7 @@ import {
   JOB_INVOCATIONS_JOB_FINISHED,
 } from '../../consts';
 
-const defaultJobInvocationsPollingInterval = 1000;
+const defaultJobInvocationsPollingInterval = MS_PER_SECOND;
 const jobInvocationsInterval =
   process.env.JOB_INVOCATIONS_POLLING || defaultJobInvocationsPollingInterval;
 
@@ -32,7 +33,7 @@ const getJobInvocations = url => async (dispatch, getState) => {
   }
 
   function onGetJobInvocationsFailed(error) {
-    if (error.response.status === 401) {
+    if (error.response.status === HTTP_STATUS_CODES.UNAUTHORIZED) {
       window.location.replace('/users/login');
     }
   }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 17.0.0
+  version: 17.1.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2026-08-03 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -485,7 +485,6 @@ files:
 - webpack/__mocks__/foremanReact/components/Pagination.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
-- webpack/__mocks__/foremanReact/constants.js
 - webpack/__mocks__/foremanReact/history.js
 - webpack/__mocks__/foremanReact/redux/API/APIActions.js
 - webpack/__mocks__/foremanReact/redux/API/APIConstants.js

data/webpack/__mocks__/foremanReact/constants.js

@@ -1,25 +0,0 @@
-export const STATUS = {
-  PENDING: 'PENDING',
-  RESOLVED: 'RESOLVED',
-  ERROR: 'ERROR',
-};
-
-export const getControllerSearchProps = (
-  controller,
-  id = 'searchBar',
-  canCreate = true
-) => ({
-  controller,
-  autocomplete: {
-    id,
-    searchQuery: '',
-    url: `${controller}/auto_complete_search`,
-    useKeyShortcuts: true,
-  },
-  bookmarks: {
-    id,
-    url: '/api/bookmarks',
-    canCreate,
-    documentationUrl: `4.1.5Searching`,
-  },
-});