foreman_remote_execution 16.6.4 → 16.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b021c23fae39af103f3ac3bdb0fd3e208b74fb8ad234f66f7770a5e4dfc78f
-  data.tar.gz: 4fd6498051640caae5cf6e4580d01106883a0f33d486b672a0d77ed49205e52c
+  metadata.gz: 803af8d6f1617172c150d68158d14d6fa9df2e5cc431226c1c0522f679420c7b
+  data.tar.gz: 43b21d05688e374f58999c890d0ed3fedcf8e98d978be053bc52f83701e89292
 SHA512:
-  metadata.gz: bf4e127076278dca8d3ec7d4b86a625a89bb95c4a4c5cd728e9207e8ff3151f983965061498bbfd813c6d9d08f49ec59f9ba2bc06be113f8e721e8f04dfc0285
-  data.tar.gz: 0124e5ae5e0f484269adf05e9e9e3aa10e1262c4c6f635707dee035f217a5206565bc231fa65dee356609ce6e9db332d7c1faf96b8d1b7b3760483171997e5fd
+  metadata.gz: 9fed722946268e04461455cffe63c27add5a23a5a0e2bbdd698a2d7bd7c94017deb0342650ecaadf92426d64db8e40682f8871ab4a43a7e60e24c1096c230bb0
+  data.tar.gz: c11bfa8d9b1e72d2bb35d11829509923b6fb7babffd98a7782d5c8718adc9628def8739d388be1f5de07c239ba8b852c9de907c8e1b77383c573f460813ccff7

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.6.4'.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/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;
   }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 16.6.4
+  version: 16.6.5
 platform: ruby
 authors:
 - Foreman Remote Execution team
 bindir: bin
 cert_chain: []
-date: 2026-06-02 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