foreman_remote_execution 16.6.3 → 16.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd2360fc3d4b48170494112c77f2d07079e94e52c8c6c9b5fcbe2402a690a49
-  data.tar.gz: ef36ba8ac16d062f24ee3fd78954d26c86c51001c3b6c8e85dcc1c9d01667159
+  metadata.gz: 803af8d6f1617172c150d68158d14d6fa9df2e5cc431226c1c0522f679420c7b
+  data.tar.gz: 43b21d05688e374f58999c890d0ed3fedcf8e98d978be053bc52f83701e89292
 SHA512:
-  metadata.gz: 96dcba56a99ca8340051cd788eb0115dde2dbcd8ff7cfce5dc82ca6f3679300cebe0c98e74d1fb9c61a09d0e2293d48140996b717114eda87c414968272dcd07
-  data.tar.gz: 5e33d478ff9bbaaab3edfac6570e378407a9bf501698ad83b31aecfd0b9261293c1d8229d5cd0f014587478a238341af0fb83defdeb5f58b193d21cd8669335a
+  metadata.gz: 9fed722946268e04461455cffe63c27add5a23a5a0e2bbdd698a2d7bd7c94017deb0342650ecaadf92426d64db8e40682f8871ab4a43a7e60e24c1096c230bb0
+  data.tar.gz: c11bfa8d9b1e72d2bb35d11829509923b6fb7babffd98a7782d5c8718adc9628def8739d388be1f5de07c239ba8b852c9de907c8e1b77383c573f460813ccff7

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.6.3'.freeze
+  VERSION = '16.6.5'.freeze
 end

data/test/integration/job_wizard_category_js_test.rb

@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require File.expand_path('../test_plugin_helper', __dir__)
+require 'integration_test_helper'
+require 'securerandom'
+
+class JobWizardCategoryJsTest < IntegrationTestWithJavascript
+  WIZARD_INPUT_NAME_BASE = 'wizard_integration_input'
+  WIZARD_FEATURE_INPUT_NAME_BASE = 'wizard_integration_feature_input'
+
+  setup do
+    unique_suffix = SecureRandom.hex(6)
+    @wizard_input_name = "#{WIZARD_INPUT_NAME_BASE}_#{unique_suffix}"
+    @wizard_feature_input_name = "#{WIZARD_FEATURE_INPUT_NAME_BASE}_#{unique_suffix}"
+    default_template_name = "Integration Default REX Form Template #{unique_suffix}"
+    feature_template_name = "Integration Feature REX Template #{unique_suffix}"
+
+    # Prevent real Dynflow proxy calls in CI while planning jobs.
+    ProxyAPI::ForemanDynflow::DynflowProxy.any_instance.stubs(:tasks_count).returns(0)
+
+    @original_rex_form_template = Setting[:remote_execution_form_job_template]
+    as_admin do
+      @default_job_template = FactoryBot.create(
+        :job_template,
+        :name => default_template_name,
+        :job_category => 'Default Form Category'
+      )
+      @feature_job_template = FactoryBot.create(
+        :job_template,
+        :name => feature_template_name,
+        :job_category => 'Feature Linked Category'
+      )
+      add_plain_template_input!(@default_job_template, :name => @wizard_input_name)
+      add_plain_template_input!(@feature_job_template, :name => @wizard_feature_input_name)
+      Setting[:remote_execution_form_job_template] = @default_job_template.name
+      @remote_execution_feature = FactoryBot.create(
+        :remote_execution_feature,
+        :label => "integration_rex_category_feature_#{unique_suffix}",
+        :name => "Integration REX Category Feature #{unique_suffix}",
+        :job_template => @feature_job_template
+      )
+      @rex_host = FactoryBot.create(:host, :with_execution)
+    end
+  end
+
+  teardown do
+    Setting[:remote_execution_form_job_template] = @original_rex_form_template
+  end
+
+  test 'job wizard shows feature template job category when feature query param is present' do
+    visit new_job_invocation_path(:feature => @remote_execution_feature.label)
+    assert_text 'Category and template', :wait => 30
+    wait_for_ajax
+    assert_selector(:ouia_component_id, 'job_category', :text => 'Feature Linked Category', :wait => 30)
+  end
+
+  test 'job wizard shows default form category when no feature query param' do
+    visit new_job_invocation_path
+    assert_text 'Category and template', :wait => 30
+    wait_for_ajax
+    assert_selector(:ouia_component_id, 'job_category', :text => 'Default Form Category', :wait => 30)
+  end
+
+  test 'job wizard prefills template input from inputs query param' do
+    visit new_job_invocation_path(
+      :inputs => { @wizard_input_name => 'from_query_string' },
+      :search => ''
+    )
+    go_to_target_hosts_and_inputs_step!
+    assert_selector "textarea##{@wizard_input_name}", :wait => 30
+    assert_equal 'from_query_string', find("textarea##{@wizard_input_name}").value
+  end
+
+  test 'job wizard does not prefill template input when inputs query param is omitted' do
+    visit new_job_invocation_path(:search => '')
+    go_to_target_hosts_and_inputs_step!
+    assert_selector "textarea##{@wizard_input_name}", :wait => 30
+    assert_equal '', find("textarea##{@wizard_input_name}").value
+  end
+
+  test 'job wizard prefills template input when feature and inputs query params are present' do
+    visit new_job_invocation_path(
+      :feature => @remote_execution_feature.label,
+      :inputs => { @wizard_feature_input_name => 'feature_and_inputs' },
+      :search => ''
+    )
+    go_to_target_hosts_and_inputs_step!
+    assert_selector "textarea##{@wizard_feature_input_name}", :wait => 30
+    assert_equal 'feature_and_inputs', find("textarea##{@wizard_feature_input_name}").value
+  end
+
+  test 'job wizard run on selected hosts is enabled on review and posts to job invocations API' do
+    posted_to_job_invocations_create = false
+    subscriber = ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |_n, _s, _f, _i, payload|
+      next unless payload[:controller] == 'Api::V2::JobInvocationsController' && payload[:action].to_s == 'create'
+      root = payload[:params]
+      root = root.to_unsafe_h if root.respond_to?(:to_unsafe_h)
+      job_inv = (root[:job_invocation] || root['job_invocation'])
+      next unless job_inv
+      job_inv = job_inv.to_unsafe_h if job_inv.respond_to?(:to_unsafe_h)
+      next unless job_inv['job_template_id'].to_i == @default_job_template.id
+      posted_to_job_invocations_create = true
+    end
+
+    begin
+      visit new_job_invocation_path(:search => "id = #{@rex_host.id}")
+      navigate_job_wizard_to_review_step!
+
+      assert_selector(:ouia_component_id, 'run-on-selected-hosts-footer', :wait => 30)
+      run_on_hosts = find(:ouia_component_id, 'run-on-selected-hosts-footer')
+      assert_not_equal 'true', run_on_hosts[:'aria-disabled'], 'expected run-on-selected-hosts button to be enabled'
+      assert_text 'Run on selected hosts'
+      find(:ouia_component_id, 'run-on-selected-hosts-footer').click
+      wait_for_ajax
+      assert posted_to_job_invocations_create, 'expected Api::V2::JobInvocationsController#create to run'
+      assert_match(%r{\A/job_invocations/\d+\z}, page.current_path)
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+  end
+
+  test 'job wizard create API request sends job_template_id and inputs for default template' do
+    input_value = 'api_payload_default_template'
+    job_inv_params = capture_api_job_invocation_params_during(expected_template_id: @default_job_template.id) do
+      visit new_job_invocation_path(
+        :search => "id = #{@rex_host.id}",
+        :inputs => { @wizard_input_name => input_value }
+      )
+      navigate_job_wizard_to_review_step!
+      find(:ouia_component_id, 'run-on-selected-hosts-footer').click
+      wait_for_ajax
+    end
+
+    assert job_inv_params, 'expected job_invocation key in POST /api/job_invocations'
+    assert job_inv_params[:job_template_id].present?, 'expected job_template_id to be present'
+    assert_equal @default_job_template.id, job_inv_params[:job_template_id].to_i
+    assert job_inv_params[:feature].blank?
+    assert_equal input_value, hash_from_params_object(job_inv_params[:inputs])[@wizard_input_name]
+    job_invocation_id = page.current_path.split('/').last.to_i
+    assert_equal @default_job_template.job_category, JobInvocation.find(job_invocation_id).job_category, 'expected job category to be the default template category'
+  end
+
+  test 'job wizard create API request sends feature label and inputs without job_template_id' do
+    input_value = 'api_payload_feature_template'
+    job_inv_params = capture_api_job_invocation_params_during(expected_feature: @remote_execution_feature.label) do
+      visit new_job_invocation_path(
+        :feature => @remote_execution_feature.label,
+        :search => "id = #{@rex_host.id}",
+        :inputs => { @wizard_feature_input_name => input_value }
+      )
+      navigate_job_wizard_to_review_step!
+      find(:ouia_component_id, 'run-on-selected-hosts-footer').click
+      wait_for_ajax
+    end
+
+    assert job_inv_params, 'expected job_invocation key in POST /api/job_invocations'
+    assert_not job_inv_params[:job_template_id].present?
+    assert_equal @remote_execution_feature.label, job_inv_params[:feature]
+    assert_equal input_value, hash_from_params_object(job_inv_params[:inputs])[@wizard_feature_input_name]
+    job_invocation_id = page.current_path.split('/').last.to_i
+    assert_equal @feature_job_template.job_category, JobInvocation.find(job_invocation_id).job_category, 'expected job category to be the feature template category'
+  end
+
+  private
+
+  def capture_api_job_invocation_params_during(expected_template_id: nil, expected_feature: nil)
+    captured = nil
+    subscriber = ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |_n, _s, _f, _i, payload|
+      next unless payload[:controller] == 'Api::V2::JobInvocationsController' && payload[:action].to_s == 'create'
+      root = payload[:params]
+      root = root.to_unsafe_h if root.respond_to?(:to_unsafe_h)
+      job_inv_params = root[:job_invocation] || root['job_invocation']
+      next unless job_inv_params
+      job_inv_params = job_inv_params.to_unsafe_h if job_inv_params.respond_to?(:to_unsafe_h)
+      job_inv_params = job_inv_params.with_indifferent_access
+      next if expected_template_id && job_inv_params[:job_template_id].to_i != expected_template_id
+      next if expected_feature && job_inv_params[:feature] != expected_feature
+      captured = job_inv_params
+    end
+    begin
+      yield
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+    captured
+  end
+
+  def hash_from_params_object(obj)
+    return {}.with_indifferent_access if obj.blank?
+    h = obj.respond_to?(:to_unsafe_h) ? obj.to_unsafe_h : obj.to_h
+    h.with_indifferent_access
+  end
+
+  def add_plain_template_input!(job_template, name:)
+    job_template.template_inputs << FactoryBot.build(
+      :template_input,
+      :name => name,
+      :input_type => 'user',
+      :value_type => 'plain',
+      :required => false
+    )
+    job_template.save!
+  end
+
+  def job_wizard_click_next!
+    wait_for_ajax
+    button = find(:ouia_component_id, 'next-footer')
+    page.execute_script('arguments[0].scrollIntoView({block: "center"})', button.native)
+    button.click
+    wait_for_ajax
+  end
+
+  def go_to_target_hosts_and_inputs_step!
+    assert_text 'Category and template', :wait => 30
+    wait_for_ajax
+    job_wizard_click_next!
+    assert_text 'Target hosts and inputs', :wait => 30
+    wait_for_ajax
+  end
+
+  def navigate_job_wizard_to_review_step!
+    assert_text 'Category and template', :wait => 30
+    wait_for_ajax
+    job_wizard_click_next!
+    assert_text 'Target hosts and inputs', :wait => 30
+    job_wizard_click_next!
+    assert_text 'Advanced fields', :wait => 30
+    job_wizard_click_next!
+    assert_text 'Immediate execution', :wait => 30
+    job_wizard_click_next!
+    assert_text 'Review details', :wait => 30
+    wait_for_ajax
+  end
+end

data/webpack/JobInvocationDetail/JobInvocationActions.js

@@ -24,6 +24,13 @@ export const getJobInvocation = url => dispatch => {
       handleError: () => {
         dispatch(stopInterval(JOB_INVOCATION_KEY));
       },
+      errorToast: ({ response }) =>
+        // eslint-disable-next-line camelcase
+        response?.data?.error?.full_messages?.[0] ||
+        // eslint-disable-next-line camelcase
+        response?.data?.error?.full_messages ||
+        response?.data?.error?.message ||
+        'Error',
     }),
     1000
   );

data/webpack/JobInvocationDetail/JobInvocationDetail.scss

@@ -61,6 +61,11 @@ section.job-additional-info {
 }
 
 .job-details-table-section {
+  &.table-section {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   section:nth-child(1) {
     padding: 0;
   }

data/webpack/JobWizard/JobWizard.js

@@ -62,10 +62,12 @@ export const JobWizard = ({ rerunData }) => {
     hostGroups: [],
   });
   const [hostsSearchQuery, setHostsSearchQuery] = useState('');
+  const [selectedBookmark, setSelectedBookmark] = useState(null);
   const [fills, setFills] = useState(
     rerunData
       ? {
           search: rerunData?.targeting?.search_query,
+          bookmark_id: rerunData?.targeting?.bookmark_id,
           ...rerunData.inputs,
           ...routerSearch,
         }
@@ -251,6 +253,7 @@ export const JobWizard = ({ rerunData }) => {
     setFills,
     setSelectedTargets,
     setHostsSearchQuery,
+    setSelectedBookmark,
     setJobTemplateID,
     setTemplateValues,
     setAdvancedValues,
@@ -298,6 +301,8 @@ export const JobWizard = ({ rerunData }) => {
           setSelected={setSelectedTargets}
           hostsSearchQuery={hostsSearchQuery}
           setHostsSearchQuery={setHostsSearchQuery}
+          selectedBookmark={selectedBookmark}
+          setSelectedBookmark={setSelectedBookmark}
         />
       ),
       canJumpTo: isTemplate,
@@ -474,6 +479,7 @@ export const JobWizard = ({ rerunData }) => {
       dispatch,
       selectedTargets,
       hostsSearchQuery,
+      selectedBookmark,
       location,
       organization,
       feature,
@@ -507,6 +513,7 @@ JobWizard.propTypes = {
     job_category: PropTypes.string,
     targeting: PropTypes.shape({
       search_query: PropTypes.string,
+      bookmark_id: PropTypes.number,
       targeting_type: PropTypes.string,
       randomized_ordering: PropTypes.bool,
     }),

data/webpack/JobWizard/JobWizardConstants.js

@@ -1,5 +1,6 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
+import { getControllerSearchProps } from 'foremanReact/constants';
 
 export const JOB_TEMPLATES = 'JOB_TEMPLATES';
 export const JOB_CATEGORIES = 'JOB_CATEGORIES';
@@ -61,6 +62,10 @@ export const hostMethods = {
 
 export const hostQuerySearchID = 'mainHostQuery';
 export const hostsController = 'hosts';
+export const hostsSearchProps = getControllerSearchProps(
+  hostsController,
+  hostQuerySearchID
+);
 
 export const dataName = {
   [HOSTS]: 'hosts',

data/webpack/JobWizard/JobWizardSelectors.js

@@ -9,6 +9,8 @@ import {
 } from 'foremanReact/redux/API/APISelectors';
 import { STATUS } from 'foremanReact/constants';
 import { selectRouterLocation } from 'foremanReact/routes/RouterSelector';
+import { BOOKMARKS } from 'foremanReact/components/PF4/Bookmarks/BookmarksConstants';
+import { selectBookmarksResults } from 'foremanReact/components/PF4/Bookmarks/BookmarksSelectors';
 
 import {
   JOB_TEMPLATES,
@@ -134,3 +136,9 @@ export const selectRouterSearch = state => {
   const { search } = selectRouterLocation(state) || {};
   return URI.parseQuery(search);
 };
+
+const HOSTS_CONTROLLER = 'hosts';
+const BOOKMARKS_HOSTS_KEY = `${BOOKMARKS}_${HOSTS_CONTROLLER.toUpperCase()}`;
+
+export const selectHostBookmarks = state =>
+  selectBookmarksResults(state, BOOKMARKS_HOSTS_KEY, HOSTS_CONTROLLER);

data/webpack/JobWizard/__tests__/JobWizardPageRerun.test.js

@@ -3,21 +3,19 @@ import { Provider } from 'react-redux';
 import { render, fireEvent, screen, act } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 
-import * as APIHooks from 'foremanReact/common/hooks/API/APIHooks';
 import * as api from 'foremanReact/redux/API';
 import JobWizardPageRerun from '../JobWizardPageRerun';
 import * as selectors from '../JobWizardSelectors';
-import { testSetup, mockApi, gqlMock, jobInvocation } from './fixtures';
+import {
+  testSetup,
+  mockApi,
+  gqlMock,
+  jobInvocation,
+  bookmarksList,
+} from './fixtures';
 
 const store = testSetup(selectors, api);
 mockApi(api);
-jest.spyOn(APIHooks, 'useAPI');
-APIHooks.useAPI.mockImplementation((action, url) => {
-  if (url === '/ui_job_wizard/job_invocation?id=57') {
-    return { response: jobInvocation, status: 'RESOLVED' };
-  }
-  return {};
-});
 
 describe('Job wizard fill', () => {
   it('fill defaults into fields', async () => {
@@ -76,4 +74,50 @@ describe('Job wizard fill', () => {
       }).value
     ).toBe('6');
   });
+
+  it('fills bookmark on rerun when job used a bookmark', async () => {
+    const bookmark = bookmarksList[0];
+    const jobWithBookmark = {
+      ...jobInvocation,
+      job: {
+        ...jobInvocation.job,
+        targeting: {
+          ...jobInvocation.job.targeting,
+          bookmark_id: bookmark.id,
+          search_query: null,
+        },
+      },
+    };
+
+    selectors.selectRerunJobInvocationResponse.mockImplementation(
+      () => jobWithBookmark
+    );
+
+    render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        <Provider store={store}>
+          <JobWizardPageRerun
+            match={{
+              params: { id: '99' },
+            }}
+          />
+        </Provider>
+      </MockedProvider>
+    );
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Target hosts and inputs'));
+    });
+
+    const hostMethodSelect = screen.getByRole('button', {
+      name: 'host method',
+    });
+    expect(hostMethodSelect.textContent).toContain('Search query');
+
+    expect(screen.queryAllByText(bookmark.query)).toHaveLength(1);
+
+    selectors.selectRerunJobInvocationResponse.mockImplementation(
+      () => jobInvocation
+    );
+  });
 });

data/webpack/JobWizard/__tests__/fixtures.js

@@ -116,6 +116,22 @@ export const jobTemplateResponse = {
   ],
 };
 
+export const bookmarksList = [
+  { id: 19, name: 'my hosts', query: 'name ~ myhost', controller: 'hosts' },
+  {
+    id: 23,
+    name: 'active hosts',
+    query: 'last_report > "1 hour ago"',
+    controller: 'hosts',
+  },
+  {
+    id: 31,
+    name: 'dashboard default',
+    query: 'os = centos',
+    controller: 'dashboard',
+  },
+];
+
 export const jobCategories = ['Services', 'Ansible Commands', 'Puppet'];
 
 export const testSetup = (selectors, api) => {
@@ -176,6 +192,14 @@ export const testSetup = (selectors, api) => {
         subtotal: 3,
       },
     },
+    bookmarksPF4: {
+      hosts: {
+        results: bookmarksList,
+      },
+    },
+    API: {
+      BOOKMARKS_HOSTS: { status: 'RESOLVED', results: [] },
+    },
   });
   return store;
 };

data/webpack/JobWizard/autofill.js

@@ -1,7 +1,14 @@
-import { useEffect } from 'react';
-import { useDispatch } from 'react-redux';
+import { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { get } from 'foremanReact/redux/API';
-import { HOST_IDS, REX_FEATURE } from './JobWizardConstants';
+import { getBookmarks } from 'foremanReact/components/PF4/Bookmarks/BookmarksActions';
+import {
+  HOST_IDS,
+  REX_FEATURE,
+  hostsController,
+  hostsSearchProps,
+} from './JobWizardConstants';
+import { selectHostBookmarks } from './JobWizardSelectors';
 import './JobWizard.scss';
 
 export const useAutoFill = ({
@@ -9,11 +16,28 @@ export const useAutoFill = ({
   setFills,
   setSelectedTargets,
   setHostsSearchQuery,
+  setSelectedBookmark,
   setJobTemplateID,
   setTemplateValues,
   setAdvancedValues,
 }) => {
   const dispatch = useDispatch();
+  const bookmarks = useSelector(selectHostBookmarks);
+  const [pendingBookmarkId, setPendingBookmarkId] = useState(null);
+
+  useEffect(() => {
+    if (pendingBookmarkId === null || bookmarks.length === 0) return;
+    const bookmark = bookmarks.find(bm => bm.id === pendingBookmarkId);
+    if (bookmark) {
+      setSelectedBookmark({
+        id: bookmark.id,
+        name: bookmark.name,
+        query: bookmark.query,
+      });
+      setHostsSearchQuery(bookmark.query);
+    }
+    setPendingBookmarkId(null);
+  }, [bookmarks, pendingBookmarkId, setSelectedBookmark, setHostsSearchQuery]);
 
   useEffect(() => {
     if (Object.keys(fills).length) {
@@ -22,10 +46,12 @@ export const useAutoFill = ({
         search,
         feature,
         template_id: templateID,
+        bookmark_id: bookmarkId,
         ...rest
       } = { ...fills };
       setFills({});
       if (hostIds) {
+        setSelectedBookmark(null);
         const hostSearch = Array.isArray(hostIds)
           ? `id = ${hostIds.join(' or id = ')}`
           : `id = ${hostIds}`;
@@ -52,9 +78,34 @@ export const useAutoFill = ({
           })
         );
       }
-      if ((search || search === '') && !hostIds?.length) {
+      if (bookmarkId) {
+        setSelectedTargets({
+          hosts: [],
+          hostCollections: [],
+          hostGroups: [],
+        });
+        const numericId = Number(bookmarkId);
+        if (bookmarks.length > 0) {
+          const bookmark = bookmarks.find(bm => bm.id === numericId);
+          if (bookmark) {
+            setSelectedBookmark({
+              id: bookmark.id,
+              name: bookmark.name,
+              query: bookmark.query,
+            });
+            setHostsSearchQuery(bookmark.query);
+          }
+        } else {
+          setPendingBookmarkId(numericId);
+          dispatch(
+            getBookmarks(hostsSearchProps.bookmarks.url, hostsController)
+          );
+        }
+      } else if ((search || search === '') && !hostIds?.length) {
         // replace an empty string search with a dummy search query to match all hosts
         // but only if search query was entered (based on presence of :search parameter)
+
+        setSelectedBookmark(null);
         const hostSearch = search === '' ? "name != ''" : search;
         setHostsSearchQuery(hostSearch);
       }
@@ -100,9 +151,11 @@ export const useAutoFill = ({
     setFills,
     setSelectedTargets,
     setHostsSearchQuery,
+    setSelectedBookmark,
     setJobTemplateID,
     setTemplateValues,
     setAdvancedValues,
     dispatch,
+    bookmarks,
   ]);
 };

data/webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js

@@ -125,7 +125,7 @@ describe('AdvancedFields', () => {
     const resourceSelectField = screen.getByLabelText(
       'adv resource select toggle'
     );
-    const searchField = screen.getByPlaceholderText('Filter...');
+    const searchField = screen.getByPlaceholderText('Search');
     const dateField = screen.getByLabelText('adv date datepicker');
     const timeField = screen.getByLabelText('adv date timepicker');
 
@@ -403,6 +403,11 @@ describe('AdvancedFields', () => {
 
       jest.advanceTimersByTime(10000);
     });
-    expect(newStore.getActions()).toMatchSnapshot('resource search');
+    const actions = newStore.getActions();
+    const resourceSearchAction = actions.filter(
+      action => action.key === 'ForemanTasksTask'
+    );
+    expect(resourceSearchAction).toHaveLength(2);
+    expect(String(resourceSearchAction[1].url)).toContain('name=some+search');
   });
 });

data/webpack/JobWizard/steps/HostsAndInputs/HostSearch.js

@@ -1,24 +1,47 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
 import SearchBar from 'foremanReact/components/SearchBar';
-import { getControllerSearchProps } from 'foremanReact/constants';
-import { hostsController, hostQuerySearchID } from '../../JobWizardConstants';
+import { hostQuerySearchID, hostsSearchProps } from '../../JobWizardConstants';
+import { selectHostBookmarks } from '../../JobWizardSelectors';
+
+export const HostSearch = ({ value, setValue, onBookmarkMatch }) => {
+  const bookmarks = useSelector(selectHostBookmarks);
+
+  const handleSearchChange = search => {
+    setValue(search);
+    onBookmarkMatch(null);
+  };
+
+  const handleBookmarkSearch = query => {
+    const matched = bookmarks.find(
+      bookmark => bookmark.query && bookmark.query.trim() === query.trim()
+    );
+    if (matched) {
+      onBookmarkMatch({
+        id: matched.id,
+        name: matched.name,
+        query: matched.query,
+      });
+    } else {
+      onBookmarkMatch(null);
+    }
+  };
 
-export const HostSearch = ({ value, setValue }) => {
-  const props = getControllerSearchProps(hostsController, hostQuerySearchID);
   return (
     <div className="foreman-search-field">
       <SearchBar
         data={{
-          ...props,
+          ...hostsSearchProps,
           autocomplete: {
             id: hostQuerySearchID,
             url: '/hosts/auto_complete_search',
             searchQuery: value,
           },
         }}
-        onSearch={null}
-        onSearchChange={search => setValue(search)}
+        onSearch={handleBookmarkSearch}
+        onSearchChange={handleSearchChange}
+        bookmarksPosition="right"
       />
     </div>
   );
@@ -27,4 +50,5 @@ export const HostSearch = ({ value, setValue }) => {
 HostSearch.propTypes = {
   value: PropTypes.string.isRequired,
   setValue: PropTypes.func.isRequired,
+  onBookmarkMatch: PropTypes.func.isRequired,
 };

data/webpack/JobWizard/steps/HostsAndInputs/__tests__/HostsAndInputs.test.js

@@ -6,7 +6,12 @@ import * as api from 'foremanReact/redux/API';
 import * as routerSelectors from 'foremanReact/routes/RouterSelector';
 import { JobWizard } from '../../../JobWizard';
 import * as selectors from '../../../JobWizardSelectors';
-import { testSetup, mockApi, gqlMock } from '../../../__tests__/fixtures';
+import {
+  testSetup,
+  mockApi,
+  gqlMock,
+  bookmarksList,
+} from '../../../__tests__/fixtures';
 
 const store = testSetup(selectors, api);
 mockApi(api);
@@ -183,6 +188,95 @@ describe('Hosts', () => {
     expect(screen.queryAllByText('os=gnome')).toHaveLength(1);
   });
 
+  it('submits bookmark_id when search matches a bookmark', async () => {
+    const bookmark = bookmarksList[0];
+    routerSelectors.selectRouterLocation.mockImplementation(() => ({
+      search: '',
+    }));
+    const bookmarkStore = testSetup(selectors, api);
+    mockApi(api);
+
+    render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        <Provider store={bookmarkStore}>
+          <JobWizard />
+        </Provider>
+      </MockedProvider>
+    );
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Target hosts and inputs'));
+    });
+    await act(async () => {
+      fireEvent.click(screen.getByRole('button', { name: 'host method' }));
+    });
+    await act(async () => {
+      fireEvent.click(screen.getByText('Search query'));
+    });
+
+    await act(async () => {
+      fireEvent.click(
+        screen.getByRole('button', { name: 'bookmarks dropdown toggle' })
+      );
+    });
+    await act(async () => {
+      fireEvent.click(screen.getByText(bookmark.name));
+    });
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Review details'));
+    });
+    await act(async () => {
+      fireEvent.click(screen.getByText('Submit'));
+    });
+
+    const submitAction = bookmarkStore
+      .getActions()
+      .find(action => action?.key === 'JOB_INVOCATION');
+    expect(submitAction).toBeDefined();
+    const { job_invocation: invocation } = submitAction.params;
+    expect(invocation.bookmark_id).toBe(bookmark.id);
+    expect(invocation.search_query).toBeNull();
+  });
+
+  it('does not submit bookmark_id when search does not match a bookmark', async () => {
+    const customQuery = 'some custom query';
+    routerSelectors.selectRouterLocation.mockImplementation(() => ({
+      search: `search=${encodeURIComponent(customQuery)}`,
+    }));
+    const customStore = testSetup(selectors, api);
+    mockApi(api);
+
+    render(
+      <MockedProvider mocks={gqlMock} addTypename={false}>
+        <Provider store={customStore}>
+          <JobWizard />
+        </Provider>
+      </MockedProvider>
+    );
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Target hosts and inputs'));
+    });
+
+    expect(screen.queryAllByText(customQuery)).toHaveLength(1);
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('Review details'));
+    });
+    await act(async () => {
+      fireEvent.click(screen.getByText('Submit'));
+    });
+
+    const submitAction = customStore
+      .getActions()
+      .find(action => action?.key === 'JOB_INVOCATION');
+    expect(submitAction).toBeDefined();
+    const { job_invocation: invocation } = submitAction.params;
+    expect(invocation.bookmark_id).toBeNull();
+    expect(invocation.search_query).toBe(customQuery);
+  });
+
   it('input fill from url', async () => {
     const inputText = 'test text';
     const advancedInputText = 'test adv text';

data/webpack/JobWizard/steps/HostsAndInputs/index.js

@@ -51,6 +51,7 @@ const HostsAndInputs = ({
   setSelected,
   hostsSearchQuery,
   setHostsSearchQuery,
+  setSelectedBookmark,
 }) => {
   const defaultHostMethod = hostsSearchQuery.length
     ? hostMethods.searchQuery
@@ -132,6 +133,7 @@ const HostsAndInputs = ({
 
   const clearSearch = () => {
     setHostsSearchQuery('');
+    setSelectedBookmark(null);
   };
   const [errorText, setErrorText] = useState(
     __('Please select at least one host')
@@ -156,6 +158,7 @@ const HostsAndInputs = ({
                 className="target-method-select"
                 toggleIcon={<FilterIcon />}
                 fieldId="host_methods"
+                toggleAriaLabel={__('host method')}
                 options={Object.values(hostMethods).filter(method => {
                   if (method === hostMethods.hostCollections && !withKatello) {
                     return false;
@@ -186,6 +189,7 @@ const HostsAndInputs = ({
               <HostSearch
                 setValue={setHostsSearchQuery}
                 value={hostsSearchQuery}
+                onBookmarkMatch={setSelectedBookmark}
               />
             )}
             {hostMethod === hostMethods.hosts && (
@@ -286,6 +290,7 @@ HostsAndInputs.propTypes = {
   setSelected: PropTypes.func.isRequired,
   hostsSearchQuery: PropTypes.string.isRequired,
   setHostsSearchQuery: PropTypes.func.isRequired,
+  setSelectedBookmark: PropTypes.func.isRequired,
 };
 
 export default HostsAndInputs;

data/webpack/JobWizard/steps/Schedule/__tests__/Schedule.test.js

@@ -55,6 +55,8 @@ const store = mockStore({
       subtotal: 3,
     },
   },
+  bookmarksPF4: {},
+  API: {},
 });
 jest.useFakeTimers();
 

data/webpack/JobWizard/submit.js

@@ -2,6 +2,14 @@ import { post } from 'foremanReact/redux/API';
 import { repeatTypes, JOB_INVOCATION } from './JobWizardConstants';
 import { buildHostQuery } from './steps/HostsAndInputs/buildHostQuery';
 
+const hasExplicitTargets = selectedTargets =>
+  selectedTargets.hosts.length > 0 ||
+  selectedTargets.hostCollections.length > 0 ||
+  selectedTargets.hostGroups.length > 0;
+
+const shouldSendBookmark = (selectedBookmark, selectedTargets) =>
+  selectedBookmark && !hasExplicitTargets(selectedTargets);
+
 export const submit = ({
   jobTemplateID,
   templateValues,
@@ -9,6 +17,7 @@ export const submit = ({
   scheduleValue,
   selectedTargets,
   hostsSearchQuery,
+  selectedBookmark,
   location,
   organization,
   feature,
@@ -110,8 +119,12 @@ export const submit = ({
       concurrency_control: {
         concurrency_level: concurrencyLevel,
       },
-      bookmark_id: null,
-      search_query: buildHostQuery(selectedTargets, hostsSearchQuery),
+      bookmark_id: shouldSendBookmark(selectedBookmark, selectedTargets)
+        ? selectedBookmark.id
+        : null,
+      search_query: shouldSendBookmark(selectedBookmark, selectedTargets)
+        ? null
+        : buildHostQuery(selectedTargets, hostsSearchQuery),
       description_format: description,
       execution_timeout_interval: timeoutToKill,
       feature,

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

@@ -14,6 +14,7 @@ exports[`TargetingHostsPage renders 1`] = `
       md={6}
     >
       <SearchBar
+        bookmarksPosition="left"
         data={
           Object {
             "autocomplete": Object {
@@ -31,9 +32,12 @@ exports[`TargetingHostsPage renders 1`] = `
             "controller": "hosts",
           }
         }
+        initialQuery=""
+        name={null}
         onBookmarkClick={[Function]}
-        onChange={[Function]}
         onSearch={[Function]}
+        onSearchChange={[Function]}
+        restrictedSearchQuery={[Function]}
       />
     </Col>
   </Row>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 16.6.3
+  version: 16.6.5
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2026-05-15 00:00:00.000000000 Z
+date: 2026-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -354,6 +354,7 @@ files:
 - test/graphql/queries/job_invocation_query_test.rb
 - test/graphql/queries/job_invocations_query_test.rb
 - test/helpers/remote_execution_helper_test.rb
+- test/integration/job_wizard_category_js_test.rb
 - test/support/remote_execution_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/actions/run_host_job_test.rb
@@ -420,7 +421,6 @@ files:
 - webpack/JobWizard/steps/AdvancedFields/DescriptionField.js
 - webpack/JobWizard/steps/AdvancedFields/Fields.js
 - webpack/JobWizard/steps/AdvancedFields/__tests__/AdvancedFields.test.js
-- webpack/JobWizard/steps/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.js
 - webpack/JobWizard/steps/CategoryAndTemplate/CategoryAndTemplate.test.js
 - webpack/JobWizard/steps/CategoryAndTemplate/index.js
@@ -475,7 +475,6 @@ files:
 - webpack/__mocks__/foremanReact/components/Head/index.js
 - webpack/__mocks__/foremanReact/components/HostDetails/DetailsCard/DefaultLoaderEmptyState.js
 - webpack/__mocks__/foremanReact/components/Pagination.js
-- webpack/__mocks__/foremanReact/components/SearchBar.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js
 - webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/constants.js

data/webpack/JobWizard/steps/AdvancedFields/__tests__/__snapshots__/AdvancedFields.test.js.snap

@@ -1,90 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AdvancedFields search resources action: resource search 1`] = `
-Array [
-  Object {
-    "key": "JOB_CATEGORIES",
-    "type": "get",
-    "url": "/ui_job_wizard/categories",
-  },
-  Object {
-    "key": "HOST_IDS",
-    "params": Object {
-      "search": "id = 105 or id = 37",
-    },
-    "type": "get",
-    "url": "/api/hosts",
-  },
-  Object {
-    "key": "JOB_TEMPLATES",
-    "type": "get",
-    "url": URI {
-      "_deferred_build": true,
-      "_parts": Object {
-        "duplicateQueryParameters": false,
-        "escapeQuerySpace": true,
-        "fragment": null,
-        "hostname": null,
-        "password": null,
-        "path": "foreman/api/v2/job_templates",
-        "port": null,
-        "preventInvalidHostname": false,
-        "protocol": null,
-        "query": "search=job_category%3D%22Ansible+Commands%22&per_page=all",
-        "urn": null,
-        "username": null,
-      },
-      "_string": "",
-    },
-  },
-  Object {
-    "key": "JOB_TEMPLATE",
-    "type": "get",
-    "url": "/ui_job_wizard/template/178",
-  },
-  Object {
-    "key": "ForemanTasksTask",
-    "type": "get",
-    "url": URI {
-      "_deferred_build": true,
-      "_parts": Object {
-        "duplicateQueryParameters": false,
-        "escapeQuerySpace": true,
-        "fragment": null,
-        "hostname": null,
-        "password": null,
-        "path": "/ui_job_wizard/resources",
-        "port": null,
-        "preventInvalidHostname": false,
-        "protocol": null,
-        "query": "resource=ForemanTasks%3A%3ATask",
-        "urn": null,
-        "username": null,
-      },
-      "_string": "",
-    },
-  },
-  Object {
-    "key": "ForemanTasksTask",
-    "type": "get",
-    "url": URI {
-      "_deferred_build": true,
-      "_parts": Object {
-        "duplicateQueryParameters": false,
-        "escapeQuerySpace": true,
-        "fragment": null,
-        "hostname": null,
-        "password": null,
-        "path": "/ui_job_wizard/resources",
-        "port": null,
-        "preventInvalidHostname": false,
-        "protocol": null,
-        "query": "resource=ForemanTasks%3A%3ATask&name=some+search",
-        "urn": null,
-        "username": null,
-      },
-      "_string": "",
-    },
-  },
-]
-`;

data/webpack/__mocks__/foremanReact/components/SearchBar.js

@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const SearchBar = ({ onChange }) => (
-  <input
-    className="foreman-search"
-    onChange={onChange}
-    placeholder="Filter..."
-  />
-);
-export default SearchBar;
-
-SearchBar.propTypes = {
-  onChange: PropTypes.func,
-};
-
-SearchBar.defaultProps = {
-  onChange: () => null,
-};