foreman_remote_execution 1.5.0 → 1.5.1

data/app/helpers/job_invocations_helper.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal:true
+
+module JobInvocationsHelper
+  def minicard(icon, number, text)
+    content_tag(:div, :class => 'card-pf card-pf-accented
+                card-pf-aggregate-status card-pf-aggregate-status-mini') do
+      content_tag(:h2, :class => 'card-pf-title', :style => 'line-height: 1.1') do
+        icon_text(icon, '', :kind => 'pficon') +
+        content_tag(:span, number, :class =>'card-pf-aggregate-status-count') +
+        text
+      end
+    end
+  end
+
+  def job_invocation_task_buttons(task)
+    job_invocation = task.task_groups.find { |group| group.class == JobInvocationTaskGroup }.job_invocation
+    buttons = []
+    if authorized_for(hash_for_new_job_invocation_path)
+      buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
+                         :class => 'btn btn-default',
+                         :title => _('Rerun the job'))
+    end
+    if authorized_for(hash_for_new_job_invocation_path)
+      buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
+                         :class => 'btn btn-default',
+                         :disabled => task.sub_tasks.none? { |sub_task| task_failed?(sub_task) },
+                         :title => _('Rerun on failed hosts'))
+    end
+    if authorized_for(:permission => :view_foreman_tasks, :auth_object => task)
+      buttons << link_to(_('Job Task'), foreman_tasks_task_path(task),
+                         :class => 'btn btn-default',
+                         :title => _('See the last task details'))
+    end
+    if authorized_for(:permission => :edit_foreman_tasks, :auth_object => task)
+      buttons << link_to(_('Cancel Job'), cancel_foreman_tasks_task_path(task),
+                         :class => 'btn btn-danger',
+                         :title => _('Try to cancel the job'),
+                         :disabled => !task.cancellable?,
+                         :method => :post)
+    end
+    buttons
+  end
+
+  def job_invocations_buttons
+    [
+      documentation_button_rex('3.2ExecutingaJob'),
+      display_link_if_authorized(_('Run Job'), hash_for_new_job_invocation_path)
+    ]
+  end
+
+  def template_name_and_provider_link(template)
+    template_name = content_tag(:strong, template.name)
+    provider = template.provider.humanized_name
+    link_content = template_name + ' - ' + provider + ' ' +
+      icon_text('edit', '', :kind => 'pficon')
+    link_to_if_authorized(link_content,
+                          hash_for_edit_job_template_path(:id => template.id))
+  end
+
+  def preview_hosts(template_invocation)
+    hosts = template_invocation.targeting.hosts.take(20)
+    hosts.map do |host|
+      collapsed_preview(host) +
+        render(:partial => 'job_invocations/user_input',
+               :locals => { :template_invocation => template_invocation,
+                            :target => host })
+    end.reduce(:+)
+  end
+
+  def collapsed_preview(target)
+    title = target.try(:name) || 'N/A'
+    content_tag(:h5,
+                :class => "expander collapsed out",
+                :data => { :toggle => 'collapse',
+                           :target => "#preview_#{target.id}" }) do
+      content_tag(:span, '', :class => 'caret') + title
+    end
+  end
+end

data/app/helpers/remote_execution_helper.rb

@@ -8,47 +8,10 @@ module RemoteExecutionHelper
     TemplateInput::TYPES.map { |key, name| [ _(name), key ] }
   end
 
-  def job_invocation_chart(invocation)
-    options = { :class => 'statistics-pie small', :expandable => true, :border => 0, :show_title => true }
-
-    if invocation.task
-      # Request precise subtask counts only if the task is stopped
-      report = invocation.progress_report
-      flot_pie_chart('status', job_invocation_status(invocation, report[:progress]),
-                     [{:label => _('Success'),   :data => report[:success],   :color => '#5CB85C'},
-                      {:label => _('Failed'),    :data => report[:failed],    :color => '#D9534F'},
-                      {:label => _('Pending'),   :data => report[:pending],   :color => '#DEDEDE'},
-                      {:label => _('Cancelled'), :data => report[:cancelled], :color => '#B7312D'}],
-                     options)
-    else
-      content_tag(:h4, job_invocation_status(invocation))
-    end
-  end
-
   def job_hosts_authorizer
     @job_hosts_authorizer ||= Authorizer.new(User.current, :collection => @hosts)
   end
 
-  def job_invocation_status(invocation, percent = nil, verbose = true)
-    case invocation.status
-      when HostStatus::ExecutionStatus::QUEUED
-        if verbose && invocation.task
-          _('queued to start executing in %{time}') % {:time => time_ago_in_words(invocation.task.start_at) }
-        else
-          _('queued')
-        end
-      when HostStatus::ExecutionStatus::RUNNING
-        percent ||= invocation.progress_report[:progress]
-        _('running %{percent}%%') % {:percent => percent}
-      when HostStatus::ExecutionStatus::OK
-        _('succeeded')
-      when HostStatus::ExecutionStatus::ERROR
-        _('failed')
-      else
-        _('unknown status')
-    end
-  end
-
   def host_counter(label, count)
     content_tag(:div, :class => 'host_counter') do
       content_tag(:div, label, :class => 'header') + content_tag(:div, count.to_s, :class => 'count')
@@ -77,9 +40,17 @@ module RemoteExecutionHelper
   end
 
   def template_invocation_actions(task, host, job_invocation, template_invocation)
+    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
     ]
   end
 
@@ -99,7 +70,6 @@ module RemoteExecutionHelper
     job_invocation = task.task_groups.find { |group| group.class == JobInvocationTaskGroup }.job_invocation
     task_authorizer = Authorizer.new(User.current, :collection => [task])
     buttons = []
-    buttons << link_to(_('Refresh'), {}, :class => 'btn btn-default', :title => _('Refresh this page'))
     if authorized_for(hash_for_new_job_invocation_path)
       buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
                          :class => 'btn btn-default',
@@ -130,6 +100,7 @@ module RemoteExecutionHelper
     end
     return buttons
   end
+
   # rubocop:enable Metrics/AbcSize
 
   def template_invocation_task_buttons(task, invocation)
@@ -151,7 +122,7 @@ module RemoteExecutionHelper
                          :disabled => !task.cancellable?,
                          :method => :post)
     end
-    return buttons
+    buttons
   end
 
   def link_to_invocation_task_if_authorized(invocation)
@@ -200,17 +171,6 @@ module RemoteExecutionHelper
     end
   end
 
-  def job_invocation_active_tab(tab, params)
-    active = 'active'
-    inactive = ''
-    hosts_tab_active = params[:page].present? || params[:search].present? || params[:order].present?
-    if hosts_tab_active
-      tab == :hosts ? active : inactive
-    else
-      tab == :overview ? active : inactive
-    end
-  end
-
   def time_in_words_span(time)
     if time.nil?
       _('N/A')

data/app/models/job_invocation.rb

@@ -230,6 +230,10 @@ class JobInvocation < ApplicationRecord
     task.send(method)
   end
 
+  def finished?
+    !task.pending?
+  end
+
   private
 
   def failed_template_invocations

data/app/models/remote_execution_provider.rb

@@ -72,5 +72,9 @@ class RemoteExecutionProvider
     def host_setting(host, setting)
       host.params[setting.to_s] || Setting[setting]
     end
+
+    def ssh_password(_host) end
+
+    def ssh_key_passphrase(_host) end
   end
 end

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

@@ -0,0 +1,11 @@
+<div id="job-invocation-chart">
+  <div class="card-pf card-pf-accented card-pf-aggregate-status">
+    <h2 style="height: 18px;" class="card-pf-title">
+      <a href="#"><%= _('Results') %></a>
+    </h2>
+    <div class="card-pf-body">
+      <div id='status_chart'>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,32 @@
+<% if job_invocation.concurrency_level || job_invocation.time_span ||
+    (job_invocation.task && (job_invocation.task.delayed? || job_invocation.task.recurring?)) ||
+    job_invocation.execution_timeout_interval.present? %>
+<div class="card-pf card-pf-accented">
+  <div class="card-pf-title">
+    <h2 style="height: 18px;" class="card-pf-title">
+      <%= _('Schedule') %>
+    </h2>
+  </div>
+  <div class="card-pf-body">
+    <p>
+    <ul>
+      <% if job_invocation.concurrency_level %>
+        <li><b><%= _("Concurrency level limited to") %></b>: <%= job_invocation.concurrency_level %> <%= _('tasks at a time') %><br></li>
+      <% end %>
+      <% if job_invocation.time_span %>
+        <li><b><%= _("Set to distribute over") %></b>: <%= job_invocation.time_span %> <%= _('seconds') %><br></li>
+      <% end %>
+      <% if job_invocation.start_before %>
+        <li><b><%= _("Scheduled to start before") %></b>: <%= job_invocation.start_before %><br></li>
+      <% end %>
+      <% if job_invocation.task && (job_invocation.task.delayed? || job_invocation.task.recurring?) %>
+        <li><b><%= _("Scheduled to start at") %></b>: <%= job_invocation.task.start_at.try(:in_time_zone) %><br></li>
+      <% end %>
+      <% if job_invocation.execution_timeout_interval.present? %>
+        <li><b><%= _("Timeout to kill after") %></b>: <%= job_invocation.execution_timeout_interval %> <%= _('seconds') %><br></li>
+      <% end %>
+    </ul>
+    </p>
+  </div>
+</div>
+<% end %>

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

@@ -0,0 +1,33 @@
+<% template_invocations = job_invocation.pattern_template_invocations %>
+<div class="card-pf card-pf-accented">
+  <div class="card-pf-title">
+    <h2 style="height: 18px;" class="card-pf-title">
+      <%= _('Target hosts') %>
+    </h2>
+  </div>
+  <div class="card-pf-body">
+    <p>
+    <% if job_invocation.bookmark.present? %>
+      <%= _('Bookmark') %> <%= job_invocation.bookmark.name %><br>
+    <% else %>
+      <%= _('Manual selection') %>
+    <% end %>
+    <%= _('using ') %>
+    <strong><%= _(Targeting::TYPES[job_invocation.targeting.targeting_type]).downcase %></strong>
+    <pre><%= job_invocation.targeting.search_query %></pre>
+    </p>
+  </div>
+  <div class='card-pf-footer'>
+    <p>
+    <%= _('Evaluated at:') %> <%= job_invocation.targeting.resolved_at %><br>
+    <% if template_invocations.size > 1 %>
+      <% template_invocations.each do |template_invocation| %>
+        <%= host_counter template_invocation.template.provider.humanized_name,
+          ForemanTasks::Task::DynflowTask.
+          for_action(Actions::RemoteExecution::RunHostJob).
+          for_resource(template_invocation).uniq.size %>
+      <% end %>
+    <% end %>
+    </p>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<div class="card-pf card-pf-accented">
+  <div class="card-pf-title">
+    <h2 style="height: 18px;" class="card-pf-title">
+      <%= _('User Inputs') %>
+    </h2>
+  </div>
+  <div class="card-pf-body">
+    <p>
+    <ul>
+      <% template_invocation.input_values.joins(:template_input).each do |input_value| %>
+        <li><b><%= input_value.template_input.name %></b>: <%= trunc_with_tooltip(input_value.value, 255) %></li>
+      <% end %>
+    </ul>
+    </p>
+  </div>
+</div>

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

@@ -38,7 +38,7 @@
     </tbody>
   </table>
 
-  <%= will_paginate_with_info @hosts %>
+  <%= will_paginate_with_info @hosts, :container => true %>
 <% else %>
   <div class="alert alert-warning">
     <%=

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

@@ -1,59 +1,29 @@
-<div id="status_chart">
-  <%= job_invocation_chart(job_invocation) %>
-</div>
-
-<div class="col-md-6 infoblock">
-  <h4><%= _('Target hosts') %></h4>
-  <% if job_invocation.bookmark.present? %>
-    <%= _('Bookmark') %> <%= job_invocation.bookmark.name %><br>
-  <% else %>
-    <%= _('Manual selection') %>
-  <% end %>
-  <%= 'using ' + _(Targeting::TYPES[job_invocation.targeting.targeting_type]) %>
-  <pre><%= job_invocation.targeting.search_query %></pre>
-
-  <%= _('Evaluated at:') %> <%= job_invocation.targeting.resolved_at %><br>
-  <% if job_invocation.pattern_template_invocations.size > 1 %>
-    <% job_invocation.pattern_template_invocations.each do |template_invocation| %>
-      <%= host_counter template_invocation.template.provider.humanized_name, ForemanTasks::Task::DynflowTask.for_action(Actions::RemoteExecution::RunHostJob).for_resource(template_invocation).uniq.size %>
-    <% end %>
-  <% end %>
-  <%= host_counter(_('Total hosts'), job_invocation.total_hosts_count) %>
-</div>
-
-<div class="col-md-6 infoblock">
-  <h4><%= _('Providers and templates') %></h4>
-  <% job_invocation.pattern_template_invocations.each do |template_invocation| %>
-    <h5>
-      <b><%= template_invocation.template.name %></b> <%= 'through' %> <%= template_invocation.template.provider.humanized_name %>
-    </h5>
-    <% target = template_invocation.targeting.hosts.with_os.first || template_invocation.targeting.hosts.first %>
-    <%= _('Preview for target %s') % target.try(:name) || 'N/A' %>
-
-    <%= preview_box(template_invocation, target) %>
-
+<% template_invocations = job_invocation.pattern_template_invocations %>
+<div class='row'>
+  <div class="col-xs-6 col-sm-6 col-md-6">
+    <%= render :partial => 'card_results' %>
+    <%= render :partial => 'card_schedule', :locals => { :job_invocation => job_invocation } %>
+  </div>
+  <div class='col-xs-12 col-sm-6 col-md-6'>
+  <%= render :partial => 'card_target_hosts', :locals => { :job_invocation => job_invocation } %>
+  <% template_invocations.each do |template_invocation| %>
+    <%= minicard('user', template_invocation.effective_user || Setting[:remote_execution_effective_user],
+                 template_invocation.template.name + ' ' + _('effective user')) %>
+    <%= minicard('cluster', job_invocation.total_hosts_count, _('Total hosts')) %>
     <% if template_invocation.input_values.present? %>
-      <%= _('following user inputs were provided') %>
-      <ul>
-        <% template_invocation.input_values.joins(:template_input).each do |input_value| %>
-          <li><b><%= input_value.template_input.name %></b>: <%= trunc_with_tooltip(input_value.value, 255) %></li>
-        <% end %>
-      </ul>
-    <% end %>
-    <% if template_invocation.effective_user %>
-      <b><%= _("Effective user") %></b>: <%= template_invocation.effective_user %><br>
-    <% end %>
-    <% if job_invocation.concurrency_level %>
-      <b><%= _("Concurrency level limited to") %></b>: <%= job_invocation.concurrency_level %> <%= _('tasks at a time') %><br>
-    <% end %>
-    <% if job_invocation.time_span %>
-      <b><%= _("Set to distribute over") %></b>: <%= job_invocation.time_span %> <%= _('seconds') %><br>
-    <% end %>
-    <% if job_invocation.task && (job_invocation.task.delayed? || job_invocation.task.recurring?) %>
-      <b><%= _("Scheduled to start at") %></b>: <%= job_invocation.task.start_at.try(:in_time_zone) %><br>
-    <% end %>
-    <% unless job_invocation.execution_timeout_interval.nil? %>
-      <b><%= _("Timeout to kill after") %></b>: <%= job_invocation.execution_timeout_interval %> <%= _('seconds') %><br>
+      <%= render :partial => 'card_user_input', :locals => { :template_invocation => template_invocation } %>
     <% end %>
   <% end %>
+  </div>
 </div>
+<hr/>
+<% if job_invocation.resolved? %>
+  <div id="hosts" data-refresh_required="<%= job_invocation.resolved? ? '' : 'true' %>">
+    <%= render :partial => 'tab_hosts', :locals => { :job_invocation => job_invocation, :hosts => hosts } %>
+  </div>
+<% else %>
+  <div class="alert alert-warning">
+    <%= _("The dynamic query '#{job_invocation.targeting.search_query}' was not resolved yet. The list of hosts to which it would resolve now can be seen") %>
+    <%= link_to('here.', hosts_url(:search => job_invocation.targeting.search_query)) %>
+  </div>
+<% end %>

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

@@ -0,0 +1,20 @@
+<div class='row'>
+  <div class="col-xs-6 col-sm-12 col-md-12">
+    <div class="card-pf">
+      <div class="card-pf-heading">
+        <h2 style="height: 18px;" class="card-pf-title">
+          <%= _('Providers and templates') %>
+        </h2>
+      </div>
+      <div class="card-pf-body">
+        <p>
+        <% template_invocation = job_invocation.pattern_template_invocations.first %>
+        <h5>
+          <%= template_name_and_provider_link(template_invocation.template) %>
+        </h5>
+        <%= preview_hosts(template_invocation) %>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,21 @@
+<div id='preview_<%= target.id %>' class='collapse out'>
+  <%= preview_box(template_invocation, target) %>
+  <% if template_invocation.input_values.present? %>
+    <table class='<%= table_css_classes %>'>
+      <thead>
+        <tr>
+          <th><%= _('User input') %></th>
+          <th><%= _('Value') %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% template_invocation.input_values.joins(:template_input).each do |input_value| %>
+        <tr>
+          <td><b><%= input_value.template_input.name %></b></td>
+          <td><%= input_value.value %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% end %>
+</div>