foreman_remote_execution 16.6.4 → 16.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b021c23fae39af103f3ac3bdb0fd3e208b74fb8ad234f66f7770a5e4dfc78f
-  data.tar.gz: 4fd6498051640caae5cf6e4580d01106883a0f33d486b672a0d77ed49205e52c
+  metadata.gz: 87f61f660cc9bb15e87453747aca6cef5d600d4fd3994d090c5af8a4e48f1b8a
+  data.tar.gz: 16e86afd877b2c2dec48daba1ff05c98822208a9c777d5351a9bf04edbd21322
 SHA512:
-  metadata.gz: bf4e127076278dca8d3ec7d4b86a625a89bb95c4a4c5cd728e9207e8ff3151f983965061498bbfd813c6d9d08f49ec59f9ba2bc06be113f8e721e8f04dfc0285
-  data.tar.gz: 0124e5ae5e0f484269adf05e9e9e3aa10e1262c4c6f635707dee035f217a5206565bc231fa65dee356609ce6e9db332d7c1faf96b8d1b7b3760483171997e5fd
+  metadata.gz: 16a08a5afdbab46351b5fe9eb4fcf55c82ad0a56160585dbedbec48a32e2d47c9f595a8562505d5c97f69141d5e6174c0fcbb6e3fd0df481dd692b6c2b811b91
+  data.tar.gz: f1e886b6f85fc08820986b812d2d959b65c42e49ab411a42df47da1ec5ad077842f472f58e78f635fd71712fdf15a7bf2541d6921fc1d3788ebec9be1bcad995

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

@@ -19,13 +19,16 @@ module Api
 
       api :GET, '/job_invocations/:id', N_('Show job invocation')
       param :id, :identifier, :required => true
-      param :host_status, :bool, required: false, desc: N_('Show Job status for the hosts')
+      param :include_hosts, :bool, :required => false, :default_value => true, :desc => N_('Include hosts and template invocations in the response. Defaults to true for backwards compatibility. Pass false to skip serializing all hosts.')
+      param :host_status, :bool, :required => false, :default_value => false, :desc => N_('Show job status for each host, only applicable when include_hosts is true')
       def show
-        set_hosts_and_template_invocations
+        @pattern_template_invocations = @job_invocation.pattern_template_invocations.includes(:input_values)
         @job_organization = Taxonomy.find_by(id: @job_invocation.task.input[:current_organization_id])
         @job_location = Taxonomy.find_by(id: @job_invocation.task.input[:current_location_id])
-        if params[:host_status] == 'true'
-          set_statuses_and_smart_proxies
+
+        if include_hosts?
+          set_hosts_and_template_invocations
+          set_statuses_and_smart_proxies if Foreman::Cast.to_bool(params[:host_status])
         end
       end
 
@@ -84,13 +87,14 @@ module Api
 
       api :POST, '/job_invocations/', N_('Create a job invocation')
       param_group :job_invocation, :as => :create
+      param :include_hosts, :bool, :required => false, :default_value => true, :desc => N_('Include hosts and template invocations in the response. Defaults to true for backwards compatibility. Pass false to skip serializing all hosts.')
       def create
         composer = JobInvocationComposer.from_api_params(
           job_invocation_params
         )
         composer.trigger!
         @job_invocation = composer.job_invocation
-        @hosts = @job_invocation.targeting.hosts
+        set_hosts_and_template_invocations if include_hosts?
         process_response @job_invocation
       rescue JobInvocationComposer::JobTemplateNotFound, JobInvocationComposer::FeatureNotFound => e
         not_found(error: { message: e.message })
@@ -115,10 +119,10 @@ module Api
       param :id, :identifier, :required => true
       def hosts
         set_hosts_and_template_invocations
-        set_statuses_and_smart_proxies
         @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
         if params[:awaiting]
           @hosts = @hosts.select { |host| @host_statuses[host.id] == 'N/A' }
         end
@@ -298,7 +302,6 @@ module Api
       end
 
       def set_hosts_and_template_invocations
-        @pattern_template_invocations = @job_invocation.pattern_template_invocations.includes(:input_values)
         @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
 
         if params[:search].present?
@@ -310,16 +313,22 @@ module Api
                                                .includes(:input_values)
       end
 
+      def include_hosts?
+        params[:include_hosts].nil? || Foreman::Cast.to_bool(params[:include_hosts])
+      end
+
       def set_statuses_and_smart_proxies
-        template_invocations = @template_invocations.includes(:run_host_job_task).to_a
+        template_invocations = @template_invocations.where(host_id: @hosts.select(:id))
+                                                    .includes(:run_host_job_task).to_a
         hosts = @hosts.to_a
-        @host_statuses = Hash[hosts.map do |host|
-          template_invocation = template_invocations.find { |ti| ti.host_id == 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]
           task = template_invocation.try(:run_host_job_task)
           [host.id, template_invocation_status(task, @job_invocation.task)]
-        end]
-        @smart_proxy_id = Hash[template_invocations.map { |ti| [ti.host_id, ti.smart_proxy_id] }]
-        @smart_proxy_name = Hash[template_invocations.map { |ti| [ti.host_id, ti.smart_proxy_name] }]
+        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
     end
   end

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

@@ -19,12 +19,14 @@ child :targeting do
   attributes :bookmark_id, :bookmark_name, :search_query, :targeting_type, :user_id, :status, :status_label,
     :randomized_ordering
 
-  child @hosts => :hosts do
-    extends 'api/v2/hosts/base'
+  if @hosts
+    child @hosts => :hosts do
+      extends 'api/v2/hosts/base'
 
-    if params[:host_status] == 'true'
-      node :job_status do |host|
-        @host_statuses[host.id]
+      if @host_statuses
+        node :job_status do |host|
+          @host_statuses[host.id]
+        end
       end
     end
   end
@@ -34,12 +36,14 @@ child :task do
   attributes :id, :state, :started_at
 end
 
-child @template_invocations do
-  attributes :template_id, :template_name, :host_id
-  child :input_values do
-    attributes :template_input_name, :template_input_id
-    node :value do |iv|
-      iv.template_input.respond_to?(:hidden_value) && iv.template_input.hidden_value? ? '*' * 5 : iv.value
+if @template_invocations
+  child @template_invocations => :template_invocations do
+    attributes :template_id, :template_name, :host_id
+    child :input_values do
+      attributes :template_input_name, :template_input_id
+      node :value do |iv|
+        iv.template_input.respond_to?(:hidden_value) && iv.template_input.hidden_value? ? '*' * 5 : iv.value
+      end
     end
   end
 end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '16.6.4'.freeze
+  VERSION = '16.7.0'.freeze
 end

data/package.json

@@ -5,9 +5,9 @@
   "scripts": {
     "lint": "tfm-lint --plugin -d /webpack",
     "lint:custom": "eslint ./webpack",
-    "test": "tfm-test --plugin",
-    "test:watch": "tfm-test --plugin --watchAll",
-    "test:current": "tfm-test --plugin --watch",
+    "test": "tfm-test --plugin --config jest.config.js",
+    "test:watch": "tfm-test --plugin --config jest.config.js --watchAll",
+    "test:current": "tfm-test --plugin --config jest.config.js --watch",
     "publish-coverage": "tfm-publish-coverage"
   },
   "repository": {

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

@@ -27,7 +27,10 @@ module Api
           template = ActiveSupport::JSON.decode(@response.body)
           assert_not_empty template
           assert_equal template['job_category'], @invocation.job_category
-          assert_not_empty template['targeting']['hosts']
+          assert_not_nil template['targeting']
+          assert_not_empty template['pattern_template_invocations']
+          assert_not_nil template['targeting']['hosts']
+          assert_not_nil template['template_invocations']
         end
 
         test 'should get invocation detail when taxonomies are set' do
@@ -36,9 +39,17 @@ module Api
           assert_response :success
         end
 
+        test 'should exclude hosts when include_hosts=false' do
+          get :show, params: { :id => @invocation.id, :include_hosts => false }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          assert_nil result['targeting']['hosts']
+          assert_nil result['template_invocations']
+        end
+
         test 'should see only permitted hosts' do
-          @user = FactoryBot.create(:user, admin: false)
-          @invocation.task.update(user: @user)
+          @user = FactoryBot.create(:user, :admin => false)
+          @invocation.task.update(:user => @user)
           setup_user('view', 'job_invocations', nil, @user)
           setup_user('view', 'hosts', 'name ~ nope.example.com', @user)
 
@@ -47,6 +58,29 @@ module Api
           response = ActiveSupport::JSON.decode(@response.body)
           assert_equal response['targeting']['hosts'], []
         end
+
+        test 'should ignore host_status when include_hosts=false' do
+          get :show, params: { :id => @invocation.id, :include_hosts => false, :host_status => true }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          assert_nil result['targeting']['hosts']
+          assert_nil result['template_invocations']
+        end
+
+        test 'should include job_status per host when host_status=true' do
+          invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+          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!
+
+          get :show, params: { :id => invocation.id, :include_hosts => true, :host_status => true }
+          assert_response :success
+          result = ActiveSupport::JSON.decode(@response.body)
+          hosts = result['targeting']['hosts']
+          assert_not_empty hosts
+          assert hosts.all? { |h| h.key?('job_status') }, 'Expected job_status to be present on each host'
+        end
       end
 
       context 'creation' do
@@ -66,6 +100,20 @@ module Api
           assert_response :success
         end
 
+        test 'should include hosts in create response by default' do
+          post :create, params: { job_invocation: @attrs }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_not_nil invocation['targeting']['hosts']
+          assert_response :success
+        end
+
+        test 'should exclude hosts from create response when include_hosts=false' do
+          post :create, params: { job_invocation: @attrs, include_hosts: false }
+          invocation = ActiveSupport::JSON.decode(@response.body)
+          assert_nil invocation['targeting']['hosts']
+          assert_response :success
+        end
+
         test 'should create with description format overridden' do
           @attrs[:description_format] = 'format'
           post :create, params: { job_invocation: @attrs }
@@ -235,6 +283,23 @@ module Api
         end
       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!
+
+          get :hosts, params: { :id => 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
+      end
+
       describe 'raw output' do
         let(:fake_output) do
           (1..5).map do |i|

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/CheckboxesActions.js

@@ -14,6 +14,7 @@ import {
 } from '@patternfly/react-icons';
 import axios from 'axios';
 import { foremanUrl } from 'foremanReact/common/helpers';
+import { usePermissions } from 'foremanReact/common/hooks/Permissions/permissionHooks';
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { addToast } from 'foremanReact/components/ToastsList';
 import PropTypes from 'prop-types';
@@ -24,10 +25,7 @@ import {
   DIRECT_OPEN_HOST_LIMIT,
   templateInvocationPageUrl,
 } from './JobInvocationConstants';
-import {
-  selectHasPermission,
-  selectTaskCancelable,
-} from './JobInvocationSelectors';
+import { selectTaskCancelable } from './JobInvocationSelectors';
 import OpenAllInvocationsModal from './OpenAllInvocationsModal';
 
 /* eslint-disable camelcase */
@@ -115,12 +113,8 @@ export const CheckboxesActions = ({
   const dispatch = useDispatch();
   const [toBeOpened, setToBeOpened] = useState([]);
 
-  const hasCreatePermission = useSelector(
-    selectHasPermission('create_job_invocations')
-  );
-  const hasCancelPermission = useSelector(
-    selectHasPermission('cancel_job_invocations')
-  );
+  const hasCreatePermission = usePermissions(['create_job_invocations']);
+  const hasCancelPermission = usePermissions(['cancel_job_invocations']);
   const jobSearchQuery = `job_invocation.id = ${jobID}`;
   const filterQuery =
     filter && filter !== 'all_statuses'

data/webpack/JobInvocationDetail/JobInvocationActions.js

@@ -19,7 +19,7 @@ export const getJobInvocation = url => dispatch => {
   const fetchData = withInterval(
     get({
       key: JOB_INVOCATION_KEY,
-      params: { include_permissions: true },
+      params: { include_permissions: true, include_hosts: false },
       url,
       handleError: () => {
         dispatch(stopInterval(JOB_INVOCATION_KEY));
@@ -44,6 +44,7 @@ export const updateJob = jobId => dispatch => {
     APIActions.get({
       url,
       key: UPDATE_JOB,
+      params: { include_hosts: false },
     })
   );
 };

data/webpack/JobInvocationDetail/JobInvocationConstants.js

@@ -6,7 +6,6 @@ import { useForemanHostDetailsPageUrl } from 'foremanReact/Root/Context/ForemanC
 import JobStatusIcon from '../react_app/components/RecentJobsCard/JobStatusIcon';
 
 export const JOB_INVOCATION_KEY = 'JOB_INVOCATION_KEY';
-export const CURRENT_PERMISSIONS = 'CURRENT_PERMISSIONS';
 export const UPDATE_JOB = 'UPDATE_JOB';
 export const CANCEL_JOB = 'CANCEL_JOB';
 export const GET_TASK = 'GET_TASK';
@@ -20,9 +19,6 @@ 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 currentPermissionsUrl = foremanUrl(
-  '/api/v2/permissions/current_permissions'
-);
 
 export const showTemplateInvocationUrl = (hostID, jobID) =>
   `/show_template_invocation_by_host/${hostID}/job_invocation/${jobID}`;
@@ -32,6 +28,10 @@ export const templateInvocationPageUrl = (hostID, jobID) =>
   `/job_invocations_detail/${jobID}/host_invocation/${hostID}`;
 
 export const jobInvocationDetailsUrl = id => `/job_invocations/${id}`;
+export const jobInvocationsIndexPath = '/job_invocations';
+export const jobInvocationsNewPath = '/job_invocations/new';
+export const jobInvocationsIndexUrl = foremanUrl(jobInvocationsIndexPath);
+export const jobInvocationsNewUrl = foremanUrl(jobInvocationsNewPath);
 
 export const STATUS = {
   PENDING: 'pending',

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/JobInvocationDetail/JobInvocationEmptyState.js

@@ -0,0 +1,52 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { PageSection, PageSectionVariants } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import ResourceLoadFailedEmptyState from 'foremanReact/components/common/EmptyState/ResourceLoadFailedEmptyState';
+import {
+  jobInvocationsIndexUrl,
+  jobInvocationsNewUrl,
+} from './JobInvocationConstants';
+
+const JobInvocationEmptyState = ({
+  jobInvocationId,
+  httpStatus,
+  errorMessage,
+}) => (
+  <PageSection variant={PageSectionVariants.light}>
+    <ResourceLoadFailedEmptyState
+      resourceLabel={__('job invocation')}
+      resourceId={jobInvocationId}
+      httpStatus={httpStatus}
+      errorMessage={errorMessage}
+      viewPermissions={['view_job_invocations']}
+      requiredPermissions={['view_job_invocations']}
+      primaryAction={{
+        label: __('Go to job invocations'),
+        url: jobInvocationsIndexUrl,
+        ouiaId: 'job-invocation-empty-state-go-to-job-invocations-button',
+      }}
+      secondaryActions={[
+        {
+          label: __('Create a new job invocation'),
+          url: jobInvocationsNewUrl,
+          ouiaId: 'job-invocation-empty-state-create-new-job-invocation-button',
+        },
+      ]}
+      ouiaIdPrefix="job-invocation-empty-state"
+    />
+  </PageSection>
+);
+
+JobInvocationEmptyState.propTypes = {
+  jobInvocationId: PropTypes.string.isRequired,
+  httpStatus: PropTypes.number,
+  errorMessage: PropTypes.string,
+};
+
+JobInvocationEmptyState.defaultProps = {
+  httpStatus: null,
+  errorMessage: null,
+};
+
+export default JobInvocationEmptyState;