foreman_remote_execution 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85a9cedafe92aa9f2183d1dd5569baa99bd15005b43c26e2ae22ac064b810ee
-  data.tar.gz: ffa0a77c6d12ff977e897933ce9d74072cf5e57495cfbef55a933d1d5f802fd3
+  metadata.gz: d093d837d0009e477549fba4700f3e0090045ba23f8b2c50fb05439fee53e403
+  data.tar.gz: 54dffc56caa3fa1bb72bb159b152d267d2e348b64b57322ea74cdf0ad9289cc1
 SHA512:
-  metadata.gz: d2b5947c13f9831c4312f9ab0af739fb8357cc6f31dbf621021267d906dabd013087a1880a319ea65b59957b91550324fa350ff05789924bbf9aebf61c982693
-  data.tar.gz: 28e4246d181f3f772e929c8fbc0626cbe4dcceff5de718d8d8da0e87b9fc8363a0b16841868f5a0f0e3b2cc9b785c8c072bfda90f059edd24a993927f06bf0c8
+  metadata.gz: e3524503031c73f86a0f3ed0b6c8dd39499f85df47052eca941f455552665b93ff041e5d6df9870cfb95ac1219017a561a483556306905bdc005caf252a5e088
+  data.tar.gz: 537da427406ce7c794d5e589e7e82f8c6fbda33a3a4231129905b69171421f41e98563c0496d9c7cc748f675d200729ec52f4d9067a8f7879972922358a2a868

data/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gemspec :name => 'foreman_remote_execution'
 
+gem 'rubocop', '~> 0.80.0'
 gem 'rubocop-minitest'
 gem 'rubocop-performance'
 gem 'rubocop-rails'

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

@@ -18,7 +18,17 @@ module Api
 
       api :GET, '/job_invocations/:id', N_('Show job invocation')
       param :id, :identifier, :required => true
+      param :host_status, String, required: false, allow_blank: true, desc: N_('Show Job status for the hosts.')
       def show
+        @hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)
+        @template_invocations = @job_invocation.template_invocations
+                                               .where(host: @hosts)
+                                               .includes(:input_values)
+
+        if params[:host_status]
+          template_invocations = @template_invocations.includes(:run_host_job_task).to_a
+          @host_statuses = Hash[template_invocations.map { |ti| [ti.host_id, template_invocation_status(ti)] }]
+        end
       end
 
       def_param_group :job_invocation do
@@ -146,7 +156,7 @@ module Api
       end
 
       def find_host
-        @host = Host.authorized(:view_hosts).find(params['host_id'])
+        @host = @nested_obj.targeting.hosts.authorized(:view_hosts, Host).find(params['host_id'])
       rescue ActiveRecord::RecordNotFound
         not_found({ :error => { :message => (_("Host with id '%{id}' was not found") % { :id => params['host_id'] }) } })
       end
@@ -204,6 +214,17 @@ module Api
       def parent_scope
         resource_class.where(nil)
       end
+
+      def template_invocation_status(template_invocation)
+        task = template_invocation.try(:run_host_job_task)
+        parent_task = @job_invocation.task
+
+        return(parent_task.result == 'cancelled' ? 'cancelled' : 'N/A') if task.nil?
+        return task.state if task.state == 'running' || task.state == 'planned'
+        return 'error' if task.result == 'warning'
+
+        task.result
+      end
     end
   end
 end

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

@@ -26,7 +26,10 @@ module Api
       private
 
       def resource_scope_for_template_invocations
-        @job_invocation.template_invocations.search_for(*search_options)
+        @job_invocation.template_invocations
+                       .includes(:host)
+                       .where(host: Host.authorized(:view_hosts, Host))
+                       .search_for(*search_options)
       end
 
       def find_job_invocation

data/app/helpers/job_invocations_helper.rb

@@ -29,7 +29,7 @@ module JobInvocationsHelper
   end
 
   def preview_hosts(template_invocation)
-    hosts = template_invocation.targeting.hosts.take(20)
+    hosts = template_invocation.targeting.hosts.authorized(:view_hosts, Host).take(20)
     hosts.map do |host|
       collapsed_preview(host) +
         render(:partial => 'job_invocations/user_input',

data/app/helpers/remote_execution_helper.rb

@@ -14,43 +14,35 @@ module RemoteExecutionHelper
   end
 
   def template_invocation_status(task, parent_task)
-    if task.nil?
-      if parent_task.result == 'cancelled'
-        icon_text('warning-triangle-o', _('cancelled'), :kind => 'pficon')
-      else
-        icon_text('question', 'N/A', :kind => 'fa')
-      end
-    elsif task.state == 'running'
-      icon_text('running', _('running'), :kind => 'pficon')
-    elsif task.state == 'planned'
-      icon_text('build', _('planned'), :kind => 'pficon')
-    else
-      case task.result
-        when 'warning', 'error'
-          icon_text('error-circle-o', _('failed'), :kind => 'pficon')
-        when 'cancelled'
-          icon_text('warning-triangle-o', _('cancelled'), :kind => 'pficon')
-        when 'success'
-          icon_text('ok', _('success'), :kind => 'pficon')
-        else
-          task.result
-      end
-    end
+    return(parent_task.result == 'cancelled' ? _('cancelled') : 'N/A') if task.nil?
+    return task.state if task.state == 'running' || task.state == 'planned'
+    return _('error') if task.result == 'warning'
+
+    task.result
   end
 
   def template_invocation_actions(task, host, job_invocation, template_invocation)
+    links = []
     host_task = template_invocation.try(:run_host_job_task)
-    [
-      display_link_if_authorized(_('Host detail'), hash_for_host_path(host).merge(:auth_object => host, :permission => :view_hosts, :authorizer => job_hosts_authorizer)),
-      display_link_if_authorized(_('Rerun on %s') % host.name, hash_for_rerun_job_invocation_path(:id => job_invocation, :host_ids => [ host.id ], :authorizer => job_hosts_authorizer)),
-      if host_task.present?
-        display_link_if_authorized(
-          _('Host task'),
-          hash_for_foreman_tasks_task_path(host_task)
-          .merge(:auth_object => host_task, :permission => :view_foreman_tasks)
-        )
-      end,
-    ]
+
+    if authorized_for(hash_for_host_path(host).merge(auth_object: host, permission: :view_hosts, authorizer: job_hosts_authorizer))
+      links << { title: _('Host detail'),
+                 action: { href: host_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
+    end
+
+    if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))
+      links << { title: (_('Rerun on %s') % host.name),
+                 action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
+                           'data-method': 'get', id: "#{host.name}-actions-rerun" } }
+    end
+
+    if host_task.present? && authorized_for(hash_for_foreman_tasks_task_path(host_task).merge(auth_object: host_task, permission: :view_foreman_tasks))
+      links << { title: _('Host task'),
+                 action: { href: foreman_tasks_task_path(host_task),
+                           'data-method': 'get', id: "#{host.name}-actions-task" } }
+    end
+
+    links
   end
 
   def remote_execution_provider_for(template_invocation)
@@ -237,4 +229,17 @@ module RemoteExecutionHelper
 
     task.execution_plan.actions[1].try(:input).try(:[], 'script')
   end
+
+  def targeting_hosts(job_invocation, hosts)
+    hosts.map do |host|
+      template_invocation = job_invocation.template_invocations.find { |template_inv| template_inv.host_id == host.id }
+      task = template_invocation.try(:run_host_job_task)
+      link_authorized = !task.nil? && authorized_for(hash_for_template_invocation_path(:id => template_invocation).merge(:auth_object => host, :permission => :view_hosts, :authorizer => job_hosts_authorizer))
+
+      { name: host.name,
+        link: link_authorized ? template_invocation_path(:id => template_invocation) : '',
+        status: template_invocation_status(task, job_invocation.task),
+        actions: template_invocation_actions(task, host, job_invocation, template_invocation) }
+    end
+  end
 end

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -49,7 +49,7 @@ module ForemanRemoteExecution
       keys = remote_execution_ssh_keys
       source = 'global'
       if keys.present?
-        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| v || [] }
+        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| [v].flatten.compact }
         params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
       end
       [:remote_execution_ssh_user, :remote_execution_effective_user_method,

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

@@ -19,8 +19,14 @@ child :targeting do
   attributes :bookmark_id, :search_query, :targeting_type, :user_id, :status, :status_label,
     :randomized_ordering
 
-  child :hosts do
+  child @hosts do
     extends 'api/v2/hosts/base'
+
+    if params[:host_status]
+      node :job_status do |host|
+        @host_statuses[host.id]
+      end
+    end
   end
 end
 
@@ -28,7 +34,7 @@ child :task do
   attributes :id, :state
 end
 
-child :template_invocations do
+child @template_invocations do
   attributes :template_id, :template_name
   child :input_values do
     attributes :template_input_name, :template_input_id

data/app/views/job_invocations/_tab_hosts.html.erb

@@ -15,29 +15,9 @@
   <% end %>
   <br>
 
-  <table class="<%= table_css_classes('table-condensed') %>">
-    <thead>
-    <tr>
-      <th><%= sort :name, :as => _('Host') %></th>
-      <th><%= _('Status') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-    </thead>
-
-    <tbody>
-    <% hosts.each do |host| %>
-      <% template_invocation = job_invocation.template_invocations.find { |template_invocation| template_invocation.host_id == host.id } %>
-      <% task = template_invocation.try(:run_host_job_task) %>
-      <tr>
-        <% options = { :host => host, :task => task, :job_invocation => job_invocation, :template_invocation => template_invocation } %>
-        <%= render 'host_name_td', options %>
-        <%= render 'host_status_td', options %>
-        <%= render 'host_actions_td', options %>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-
+  <div id="targeting_hosts">
+    <%= mount_react_component('TargetingHosts', '#targeting_hosts') %>
+  </div>
   <%= will_paginate_with_info @hosts, :container => true %>
 <% else %>
   <div class="alert alert-warning">

data/app/views/job_invocations/show.html.erb

@@ -41,9 +41,3 @@
   <% end %>
   <%= render_tab_content_for(:main_tabs, subject: @job_invocation) %>
 </div>
-
-<script id="job_invocation_refresh" data-refresh-url="<%= job_invocation_path(@job_invocation) %>">
-<% if @auto_refresh %>
-  delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data());
-<% end %>
-</script>

data/app/views/job_invocations/show.json.erb

@@ -0,0 +1,4 @@
+{
+  "autoRefresh": "<%= @auto_refresh %>",
+  "hosts": <%= targeting_hosts(@job_invocation, @hosts).to_json.html_safe %>
+}

data/foreman_remote_execution.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'foreman-tasks', '>= 0.15.1'
 
   s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop', '~> 0.80.0'
   s.add_development_dependency 'rdoc'
 end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '3.3.1'.freeze
+  VERSION = '3.3.2'.freeze
 end

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

@@ -4,7 +4,7 @@ module Api
   module V2
     class JobInvocationsControllerTest < ActionController::TestCase
       setup do
-        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task)
+        @invocation = FactoryBot.create(:job_invocation, :with_template, :with_task, :with_unplanned_host)
         @template = FactoryBot.create(:job_template, :with_input)
 
         # Without this the template in template_invocations and in pattern_template_invocations
@@ -20,18 +20,32 @@ module Api
         assert_response :success
       end
 
-      test 'should get invocation detail' do
-        get :show, params: { :id => @invocation.id }
-        assert_response :success
-        template = ActiveSupport::JSON.decode(@response.body)
-        assert_not_empty template
-        assert_equal template['job_category'], @invocation.job_category
-      end
+      describe 'show' do
+        test 'should get invocation detail' do
+          get :show, params: { :id => @invocation.id }
+          assert_response :success
+          template = ActiveSupport::JSON.decode(@response.body)
+          assert_not_empty template
+          assert_equal template['job_category'], @invocation.job_category
+          assert_not_empty template['targeting']['hosts']
+        end
 
-      test 'should get invocation detail when taxonomies are set' do
-        taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
-        get :show, params: taxonomy_params.merge(:id => @invocation.id)
-        assert_response :success
+        test 'should get invocation detail when taxonomies are set' do
+          taxonomy_params = %w(organization location).reduce({}) { |acc, cur| acc.merge("#{cur}_id" => FactoryBot.create(cur)) }
+          get :show, params: taxonomy_params.merge(:id => @invocation.id)
+          assert_response :success
+        end
+
+        test 'should see only permitted hosts' do
+          @user = FactoryBot.create(:user, admin: false)
+          setup_user('view', 'job_invocations', nil, @user)
+          setup_user('view', 'hosts', 'name ~ nope.example.com', @user)
+
+          get :show, params: { :id => @invocation.id }, session: set_session_user(@user)
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          assert_empty response['targeting']['hosts']
+        end
       end
 
       context 'creation' do
@@ -108,7 +122,7 @@ module Api
       end
 
       describe '#output' do
-        let(:host) { @invocation.template_invocations_hosts.first }
+        let(:host) { @invocation.targeting.hosts.first }
 
         test 'should provide output for delayed task' do
           ForemanTasks::Task.any_instance.expects(:scheduled?).returns(true)
@@ -137,6 +151,12 @@ module Api
           assert_equal result['message'], "Job invocation not found by id '#{invocation_id}'"
           assert_response :missing
         end
+
+        test 'should get output only for host in job invocation' do
+          get :output, params: { job_invocation_id: @invocation.id,
+                                 host_id: FactoryBot.create(:host).id }
+          assert_response :missing
+        end
       end
 
       describe 'raw output' do
@@ -148,7 +168,7 @@ module Api
         let(:fake_task) do
           OpenStruct.new :pending? => false, :main_action => OpenStruct.new(:live_output => fake_output)
         end
-        let(:host) { @invocation.template_invocations_hosts.first }
+        let(:host) { @invocation.targeting.hosts.first }
 
         test 'should provide raw output for a host' do
           JobInvocation.any_instance.expects(:task).returns(OpenStruct.new(:scheduled? => false))
@@ -184,6 +204,12 @@ module Api
           assert_nil result['output']
           assert_response :success
         end
+
+        test 'should get raw output only for host in job invocation' do
+          get :raw_output, params: { job_invocation_id: @invocation.id,
+                                     host_id: FactoryBot.create(:host).id }
+          assert_response :missing
+        end
       end
 
       test 'should cancel a job' do
@@ -232,11 +258,13 @@ module Api
       end
 
       test 'should not raise an exception when reruning failed has no hosts' do
+        @invocation.targeting.hosts.first.destroy
         JobInvocation.any_instance.expects(:generate_description)
         JobInvocationComposer.any_instance
                              .expects(:validate_job_category)
                              .with(@invocation.job_category)
                              .returns(@invocation.job_category)
+
         post :rerun, params: { :id => @invocation.id, :failed_only => true }
         assert_response :success
         result = ActiveSupport::JSON.decode(@response.body)

data/test/unit/concerns/host_extensions_test.rb

@@ -48,6 +48,13 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
     end
 
+    it 'merges ssh key as a string from host parameters and proxies' do
+      key = 'ssh-rsa not-even-a-key something@somewhere.com'
+      host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_keys', :value => key)
+      _(host.host_param('remote_execution_ssh_keys')).must_include key
+      _(host.host_param('remote_execution_ssh_keys')).must_include sshkey
+    end
+
     it 'has ssh keys in the parameters even when no user specified' do
       # this is a case, when using the helper in provisioning templates
       FactoryBot.create(:smart_proxy, :ssh)

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1 @@
+export const translate = s => s;

data/webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const ActionButtons = () => <div />;

data/webpack/__mocks__/foremanReact/constants.js

@@ -0,0 +1,3 @@
+export const STATUS = {
+  ERROR: 'ERROR',
+};

data/webpack/index.js

@@ -1,13 +1,16 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { registerReducer } from 'foremanReact/common/MountingService';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import JobInvocationContainer from './react_app/components/jobInvocations';
+import TargetingHosts from './react_app/components/TargetingHosts';
 import rootReducer from './react_app/redux/reducers';
 
-componentRegistry.register({
-  name: 'JobInvocationContainer',
-  type: JobInvocationContainer,
+const components = [
+  { name: 'JobInvocationContainer', type: JobInvocationContainer },
+  { name: 'TargetingHosts', type: TargetingHosts },
+];
+
+components.forEach(component => {
+  componentRegistry.register(component);
 });
 
 registerReducer('foremanRemoteExecutionReducers', rootReducer);

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

@@ -0,0 +1,52 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { LoadingState, Alert } from 'patternfly-react';
+import { STATUS } from 'foremanReact/constants';
+import HostItem from './components/HostItem';
+
+const TargetingHosts = ({ status, items }) => {
+  if (status === STATUS.ERROR) {
+    return (
+      <Alert type="error">
+        {__(
+          'There was an error while updating the status, try refreshing the page.'
+        )}
+      </Alert>
+    );
+  }
+
+  return (
+    <LoadingState loading={!items.length}>
+      <div>
+        <table className="table table-bordered table-striped table-hover">
+          <thead>
+            <tr>
+              <th>{__('Host')}</th>
+              <th>{__('Status')}</th>
+              <th>{__('Actions')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {items.map(host => (
+              <HostItem
+                key={host.name}
+                name={host.name}
+                link={host.link}
+                status={host.status}
+                actions={host.actions}
+              />
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </LoadingState>
+  );
+};
+
+TargetingHosts.propTypes = {
+  status: PropTypes.string.isRequired,
+  items: PropTypes.array.isRequired,
+};
+
+export default TargetingHosts;

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

@@ -0,0 +1,8 @@
+import { getURI } from 'foremanReact/common/urlHelpers';
+import { get } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+const url = getURI().addQuery('format', 'json');
+export const getData = () =>
+  withInterval(get({ key: TARGETING_HOSTS, url }), 1000);

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

@@ -0,0 +1 @@
+export const TARGETING_HOSTS = 'TARGETING_HOSTS';

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

@@ -0,0 +1,12 @@
+import {
+  selectAPIStatus,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+export const selectItems = state =>
+  selectAPIResponse(state, TARGETING_HOSTS).hosts || [];
+
+export const selectAutoRefresh = state =>
+  selectAPIResponse(state, TARGETING_HOSTS).autoRefresh;
+export const selectStatus = state => selectAPIStatus(state, TARGETING_HOSTS);

data/webpack/react_app/components/TargetingHosts/__tests__/HostItem.test.js

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import HostItem from '../components/HostItem';
+import { HostItemFixtures } from './fixtures';
+
+describe('HostItem', () =>
+  testComponentSnapshotsWithFixtures(HostItem, HostItemFixtures));

data/webpack/react_app/components/TargetingHosts/__tests__/HostStatus.test.js

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import HostStatus from '../components/HostStatus';
+import { HostStatusFixtures } from './fixtures';
+
+describe('HostStatus', () =>
+  testComponentSnapshotsWithFixtures(HostStatus, HostStatusFixtures));

data/webpack/react_app/components/TargetingHosts/__tests__/TargetingHosts.test.js

@@ -0,0 +1,6 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import TargetingHosts from '../TargetingHosts';
+import { TargetingHostsFixtures } from './fixtures';
+
+describe('TargetingHosts', () =>
+  testComponentSnapshotsWithFixtures(TargetingHosts, TargetingHostsFixtures));

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

@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HostItem renders 1`] = `
+<tr
+  id="targeting-host-Host1"
+>
+  <td
+    className="host_name"
+  >
+    <a
+      href="/host1"
+    >
+      Host1
+    </a>
+  </td>
+  <td
+    className="host_status"
+  >
+    <HostStatus
+      status="success"
+    />
+  </td>
+  <td
+    className="host_actions"
+  >
+    <ActionButtons
+      buttons={Array []}
+    />
+  </td>
+</tr>
+`;

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

@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HostStatus renders 1`] = `
+<div>
+  <Icon
+    name="ok"
+    type="pf"
+  />
+   
+  success
+</div>
+`;

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

@@ -0,0 +1,81 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TargetingHosts renders 1`] = `
+<LoadingState
+  additionalClasses=""
+  loading={false}
+  loadingText="Loading"
+  size="lg"
+  timeout={300}
+>
+  <div>
+    <table
+      className="table table-bordered table-striped table-hover"
+    >
+      <thead>
+        <tr>
+          <th>
+            Host
+          </th>
+          <th>
+            Status
+          </th>
+          <th>
+            Actions
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <HostItem
+          actions={Array []}
+          key="host"
+          link="/link"
+          name="host"
+          status="success"
+        />
+      </tbody>
+    </table>
+  </div>
+</LoadingState>
+`;
+
+exports[`TargetingHosts renders with error 1`] = `
+<Alert
+  className=""
+  onDismiss={null}
+  type="error"
+>
+  There was an error while updating the status, try refreshing the page.
+</Alert>
+`;
+
+exports[`TargetingHosts renders with loading 1`] = `
+<LoadingState
+  additionalClasses=""
+  loading={true}
+  loadingText="Loading"
+  size="lg"
+  timeout={300}
+>
+  <div>
+    <table
+      className="table table-bordered table-striped table-hover"
+    >
+      <thead>
+        <tr>
+          <th>
+            Host
+          </th>
+          <th>
+            Status
+          </th>
+          <th>
+            Actions
+          </th>
+        </tr>
+      </thead>
+      <tbody />
+    </table>
+  </div>
+</LoadingState>
+`;

data/webpack/react_app/components/TargetingHosts/__tests__/fixtures.js

@@ -0,0 +1,43 @@
+export const HostItemFixtures = {
+  renders: {
+    name: 'Host1',
+    link: '/host1',
+    status: 'success',
+    actions: [],
+  },
+};
+
+export const HostStatusFixtures = {
+  renders: {
+    status: 'success',
+  },
+};
+
+export const TargetingHostsFixtures = {
+  renders: {
+    status: '',
+    items: [
+      {
+        name: 'host',
+        link: '/link',
+        status: 'success',
+        actions: [],
+      },
+    ],
+  },
+  'renders with error': {
+    status: 'ERROR',
+    items: [
+      {
+        name: 'host',
+        link: '/link',
+        status: 'success',
+        actions: [],
+      },
+    ],
+  },
+  'renders with loading': {
+    status: '',
+    items: [],
+  },
+};

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

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
+import HostStatus from './HostStatus';
+
+const HostItem = ({ name, link, status, actions }) => {
+  const hostLink = link ? (
+    <a href={link}>{name}</a>
+  ) : (
+    <a href="#" className="disabled">
+      {name}
+    </a>
+  );
+
+  return (
+    <tr id={`targeting-host-${name}`}>
+      <td className="host_name">{hostLink}</td>
+      <td className="host_status">
+        <HostStatus status={status} />
+      </td>
+      <td className="host_actions">
+        <ActionButtons buttons={[...actions]} />
+      </td>
+    </tr>
+  );
+};
+
+HostItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  link: PropTypes.string.isRequired,
+  status: PropTypes.string.isRequired,
+  actions: PropTypes.array,
+};
+
+HostItem.defaultProps = {
+  actions: [],
+};
+
+export default HostItem;

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

@@ -0,0 +1,54 @@
+import React from 'react';
+import { Icon } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const HostStatus = ({ status }) => {
+  switch (status) {
+    case 'cancelled':
+      return (
+        <div>
+          <Icon type="pf" name="warning-triangle-o" /> {status}
+        </div>
+      );
+    case 'N/A':
+      return (
+        <div>
+          <Icon type="fa" name="question" /> {status}
+        </div>
+      );
+    case 'running':
+      return (
+        <div>
+          <Icon type="pf" name="running" /> {status}
+        </div>
+      );
+    case 'planned':
+      return (
+        <div>
+          <Icon type="pf" name="build" /> {status}
+        </div>
+      );
+    case 'warning':
+    case 'error':
+      return (
+        <div>
+          <Icon type="pf" name="error-circle-o" /> {__('failed')}
+        </div>
+      );
+    case 'success':
+      return (
+        <div>
+          <Icon type="pf" name="ok" /> {status}
+        </div>
+      );
+    default:
+      return <span>{status}</span>;
+  }
+};
+
+HostStatus.propTypes = {
+  status: PropTypes.string.isRequired,
+};
+
+export default HostStatus;

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

@@ -0,0 +1,37 @@
+import React, { useEffect } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { stopInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
+import TargetingHosts from './TargetingHosts';
+
+import {
+  selectItems,
+  selectStatus,
+  selectAutoRefresh,
+} from './TargetingHostsSelectors';
+import { getData } from './TargetingHostsActions';
+import { TARGETING_HOSTS } from './TargetingHostsConsts';
+
+const WrappedTargetingHosts = () => {
+  const dispatch = useDispatch();
+  const autoRefresh = useSelector(selectAutoRefresh);
+  const items = useSelector(selectItems);
+  const status = useSelector(selectStatus);
+
+  useEffect(() => {
+    dispatch(getData());
+
+    return () => {
+      dispatch(stopInterval(TARGETING_HOSTS));
+    };
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (autoRefresh === 'false') {
+      dispatch(stopInterval(TARGETING_HOSTS));
+    }
+  }, [autoRefresh, dispatch]);
+
+  return <TargetingHosts status={status} items={items} />;
+};
+
+export default WrappedTargetingHosts;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -90,16 +90,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -238,9 +238,6 @@ files:
 - app/views/job_invocations/_card_user_input.html.erb
 - app/views/job_invocations/_description_fields.html.erb
 - app/views/job_invocations/_form.html.erb
-- app/views/job_invocations/_host_actions_td.html.erb
-- app/views/job_invocations/_host_name_td.html.erb
-- app/views/job_invocations/_host_status_td.html.erb
 - app/views/job_invocations/_preview_hosts_list.html.erb
 - app/views/job_invocations/_preview_hosts_modal.html.erb
 - app/views/job_invocations/_rerun_taxonomies.html.erb
@@ -252,7 +249,7 @@ files:
 - app/views/job_invocations/new.html.erb
 - app/views/job_invocations/refresh.js.erb
 - app/views/job_invocations/show.html.erb
-- app/views/job_invocations/show.js.erb
+- app/views/job_invocations/show.json.erb
 - app/views/job_invocations/welcome.html.erb
 - app/views/job_templates/_custom_tab_headers.html.erb
 - app/views/job_templates/_custom_tabs.html.erb
@@ -396,7 +393,24 @@ files:
 - test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_invocation_input_value_test.rb
+- webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
+- webpack/__mocks__/foremanReact/constants.js
 - webpack/index.js
+- webpack/react_app/components/TargetingHosts/TargetingHosts.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsActions.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsConsts.js
+- webpack/react_app/components/TargetingHosts/TargetingHostsSelectors.js
+- webpack/react_app/components/TargetingHosts/__tests__/HostItem.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/HostStatus.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/TargetingHosts.test.js
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostItem.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/HostStatus.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/__snapshots__/TargetingHosts.test.js.snap
+- webpack/react_app/components/TargetingHosts/__tests__/fixtures.js
+- webpack/react_app/components/TargetingHosts/components/HostItem.js
+- webpack/react_app/components/TargetingHosts/components/HostStatus.js
+- webpack/react_app/components/TargetingHosts/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.js
 - webpack/react_app/components/jobInvocations/AggregateStatus/index.test.js
 - webpack/react_app/components/jobInvocations/index.js

data/app/views/job_invocations/_host_actions_td.html.erb

@@ -1,3 +0,0 @@
-<td class="host_actions" id="<%= dom_id(host) %>-actions" data-refresh_required="" data-id="<%= host.id %>">
-  <%= action_buttons(template_invocation_actions(task, host, job_invocation, template_invocation)) %>
-</td>

data/app/views/job_invocations/_host_name_td.html.erb

@@ -1,8 +0,0 @@
-<td class="host_name" id="<%= dom_id(host) %>-name" data-refresh_required="<%= task.nil? ? 'true' : '' %>" data-id="<%= host.id %>">
-  <% if task %>
-    <%= link_to_if_authorized host.name, hash_for_template_invocation_path(:id => template_invocation).merge(:auth_object => host, :permission => :view_hosts, :authorizer => job_hosts_authorizer) %>
-
-  <% else %>
-    <%= host.name %>
-  <% end %>
-</td>

data/app/views/job_invocations/_host_status_td.html.erb

@@ -1 +0,0 @@
-<td class="host_status" id="<%= dom_id(host) %>-status" data-refresh_required="<%= task.nil? || task.pending? ? 'true' : '' %>" data-id="<%= host.id %>"><%= template_invocation_status(task, job_invocation.task) %></td>

data/app/views/job_invocations/show.js.erb

@@ -1,23 +0,0 @@
-$('div#title_action div.btn-group').html('<%= button_group(job_invocation_task_buttons(@job_invocation.task)).html_safe %>');
-<% if params[:hosts_needs_refresh] == 'true' && @job_invocation.resolved? %>
-  var hosts_table = $('div#hosts');
-  hosts_table.html('<%=j render('tab_hosts', :job_invocation => @job_invocation, :hosts => @hosts) %>');
-  hosts_table.data('refresh_required', '');
-<% end %>
-
-<% ['name', 'status', 'actions', 'provider'].each do |attribute| %>
-  <% if params["host_ids_needing_#{attribute}_update"].present? %>
-    var td_element;
-    <% Host.authorized(:view_hosts, Host).where(:id => params["host_ids_needing_#{attribute}_update"]).each do |host| %>
-      <% template_invocation = @job_invocation.template_invocations.find { |template_invocation| template_invocation.host_id == host.id } %>
-      <% task = template_invocation.try(:run_host_job_task) %>
-      <% options = { :host => host, :task => task, :job_invocation => @job_invocation, :template_invocation => template_invocation } %>
-      td_element= $('#<%= dom_id(host) %>-<%= attribute %>');
-      td_element.replaceWith('<%=j render("host_#{attribute}_td", options) %>');
-    <% end %>
-  <% end %>
-<% end %>
-
-<% if @auto_refresh %>
-  delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data());
-<% end %>