foreman_remote_execution 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837b065cbfe503343d7eedfb734f5a8d83ca1b5d358f990cc9741d9658b1f4dd
-  data.tar.gz: 4ff9c2ad68f54faf3cca998b8cb54f74e75dfc3408dbbbfc527a82e88eaa7226
+  metadata.gz: a9ac5ddf16b74dec2deb0b11e6235c5074efd9ff22c69df60095998965785eb6
+  data.tar.gz: d3a6b6783e5dfe9905e6267b36289c3f2a56274dfc9500cec2947241ad8968da
 SHA512:
-  metadata.gz: 9ccb9cd8c75c9e92d69fb22c6024ee242d2917f1410448f781aa0a561505a4e63faa72b9908355ed3672af55a1c4a0bbbeee928e8281388f873bd555093d72ed
-  data.tar.gz: afadfd61e5a6bc01c1c60496e6a26b5fd5e0e2fd7a4ecaa21895480bbc9455924d0ac12109ed7a71106a7536759d0eaa69033f1f695f34399f3f9bbb862b51f0
+  metadata.gz: 39cb455b52d5d6290a6a79d3cd0f48fa9c52f9666a3f8f07b3d4e36c996bc2b16cf4657535f6b80d6be502a3a4c9a4f858821fd0ed94ea54bc4990c0efe430e7
+  data.tar.gz: 6c052042b3e9e3d829018dc78967e94aedfbd59db2745c9fe93048404729c9e01e14224c44064f7c294cf8fbb471be9dd9a455681339e4de69f378ddab9e3b3f

data/app/assets/stylesheets/foreman_remote_execution/foreman_remote_execution.css

@@ -0,0 +1,4 @@
+/*
+ *= require_self
+ *= require_tree .
+ */

data/app/assets/stylesheets/foreman_remote_execution/{modal_window.css.scss → modal_window.scss}

@@ -1,4 +1,4 @@
-div.modal-body {
+#previewHostsModal div.modal-body {
   overflow-y: auto;
   max-height: 500px;
 }

data/app/models/job_invocation_composer.rb

@@ -203,7 +203,7 @@ class JobInvocationComposer
       base = { :user_id => User.current.id }
       if @host_ids
         search_query = @host_ids.empty? ? 'name ^ ()' : Targeting.build_query_from_hosts(@host_ids)
-        base.merge(:search_query => search_query, :targeting_type => job_invocation.targeting.targeting_type)
+        base.merge(:search_query => search_query).merge(job_invocation.targeting.attributes.slice('targeting_type', 'randomized_ordering'))
       else
         base.merge job_invocation.targeting.attributes.slice('search_query', 'bookmark_id', 'targeting_type', 'randomized_ordering')
       end
@@ -332,7 +332,7 @@ class JobInvocationComposer
   # rubocop:disable Metrics/AbcSize
   def compose
     job_invocation.job_category = validate_job_category(params[:job_category])
-    job_invocation.job_category ||= available_job_categories.first if @set_defaults
+    job_invocation.job_category ||= resolve_job_category(available_job_categories.first) { |tempate| template.job_category } if @set_defaults
     job_invocation.remote_execution_feature_id = params[:remote_execution_feature_id]
     job_invocation.targeting = build_targeting
     job_invocation.triggering = build_triggering
@@ -428,6 +428,16 @@ class JobInvocationComposer
     (templates_for_provider(provider_type) & selected_job_templates).first
   end
 
+  def resolve_job_category(default_category)
+    resolve_for_composer(default_category) { |form_template| form_template.job_category }
+  end
+
+  def resolve_job_template(provider_templates)
+    resolve_for_composer(provider_templates.first) do |form_template|
+      provider_templates.include?(form_template) ? form_template : provider_templates.first
+    end
+  end
+
   def displayed_search_query
     if @search_query.present?
       @search_query
@@ -562,4 +572,16 @@ class JobInvocationComposer
   def validate_host_ids(ids)
     Host.authorized(Targeting::RESOLVE_PERMISSION, Host).where(:id => ids).pluck(:id)
   end
+
+  def resolve_for_composer(default_value, &block)
+    setting_value = Setting['remote_execution_form_job_template']
+    return default_value unless setting_value
+    form_template = JobTemplate.find_by :name => setting_value
+    return default_value unless form_template
+    if block_given?
+      yield form_template
+    else
+      form_template
+    end
+  end
 end

data/app/models/setting/remote_execution.rb

@@ -1,6 +1,6 @@
 class Setting::RemoteExecution < Setting
 
-  ::Setting::BLANK_ATTRS.concat %w{remote_execution_ssh_password remote_execution_ssh_key_passphrase remote_execution_sudo_password remote_execution_cockpit_url}
+  ::Setting::BLANK_ATTRS.concat %w{remote_execution_ssh_password remote_execution_ssh_key_passphrase remote_execution_sudo_password remote_execution_cockpit_url remote_execution_form_job_template}
 
   # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
   def self.default_settings
@@ -66,7 +66,13 @@ class Setting::RemoteExecution < Setting
                N_('Where to find the Cockpit instance for the Web Console button.  By default, no button is shown.'),
                nil,
                N_('Cockpit URL'),
-               nil)
+               nil),
+      self.set('remote_execution_form_job_template',
+               N_('Choose a job template that is pre-selected in job invocation form'),
+               'Run Command - SSH Default',
+               _('Form Job Template'),
+               nil,
+               { :collection => proc { Hash[JobTemplate.unscoped.map { |template| [template.name, template.name] }] } })
     ]
   end
   # rubocop:enable AbcSize

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

@@ -16,7 +16,7 @@
     <%= f.fields_for 'providers' do |providers_fields| %>
       <%= providers_fields.fields_for provider_type do |provider_type_fields| %>
         <% templates_for_provider = @composer.templates_for_provider(provider_type) %>
-        <% selected_templates_per_provider[provider_type] = @composer.preselected_template_for_provider(provider_type) || templates_for_provider.first %>
+        <% selected_templates_per_provider[provider_type] = @composer.preselected_template_for_provider(provider_type) || @composer.resolve_job_template(templates_for_provider) %>
 
         <%= selectable_f provider_type_fields, 'job_template_id', templates_for_provider.map { |t| [t.name, t.id] },
                          { :selected => selected_templates_per_provider[provider_type].try(:id) },
@@ -33,7 +33,7 @@
       <% end %>
     </span>
     <%= selectable_f targeting_fields, :bookmark_id, @composer.available_bookmarks.map { |b| [b.name, b.id] }, :selected => @composer.targeting.bookmark_id, :include_blank => true %>
-    <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5 %>
+    <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5, :class => 'autocomplete-input form-control', :'data-url' => auto_complete_search_hosts_path %>
 
     <div class="form-group ">
       <label class="col-md-2 control-label"><%= _('Resolves to') %></label>

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

@@ -1,4 +1,4 @@
-<% stylesheet 'foreman_remote_execution/modal_window' %>
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 
 <!-- modal window -->
 <div class="modal fade" id="previewHostsModal" role="dialog" aria-hidden="true" data-url="<%= preview_hosts_job_invocations_path %>">

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

@@ -1,4 +1,4 @@
 <% javascript 'foreman_remote_execution/template_invocation' %>
-<% stylesheet 'foreman_remote_execution/template_invocation' %>
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% title _('Job invocation') %>
 <%= render :partial => 'form' %>

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

@@ -1,5 +1,5 @@
 <% title @job_invocation.description %>
-<% stylesheet 'foreman_remote_execution/job_invocations' %>
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% javascript 'charts', 'foreman_remote_execution/template_invocation' %>
 <%= javascript_include_tag *webpack_asset_paths('foreman_remote_execution', :extension => 'js'), "data-turbolinks-track" => true, 'defer' => 'defer' %>
 

data/app/views/job_templates/_import_job_template_modal.html.erb

@@ -1,4 +1,4 @@
-<% stylesheet 'foreman_remote_execution/modal_window' %>
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 
 <!-- modal window -->
 <div class="modal fade" id="importJobTemplateModal" role="dialog" aria-hidden="true">

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

@@ -9,7 +9,7 @@
                :items => items)
 %>
 
-<% stylesheet 'foreman_remote_execution/template_invocation' %>
+<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% javascript 'foreman_remote_execution/template_invocation' %>
 
 <div id="title_action">

data/lib/foreman_remote_execution/engine.rb

@@ -38,6 +38,8 @@ module ForemanRemoteExecution
 
         apipie_documented_controllers ["#{ForemanRemoteExecution::Engine.root}/app/controllers/api/v2/*.rb"]
 
+        automatic_assets(false)
+
         # Add permissions
         security_block :foreman_remote_execution do
           permission :view_job_templates, { :job_templates => [:index, :show, :revision, :auto_complete_search, :auto_complete_job_category, :preview, :export],
@@ -130,10 +132,12 @@ module ForemanRemoteExecution
     # content twice.
     assets_to_precompile =
       Dir.chdir(root) do
-        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last.gsub(/\.scss\Z/, '')
+        Dir['app/assets/javascripts/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last
         end
       end
+    assets_to_precompile += %w(foreman_remote_execution/foreman_remote_execution.css)
+
     initializer 'foreman_remote_execution.assets.precompile' do |app|
       app.config.assets.precompile += assets_to_precompile
     end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/test/unit/job_invocation_composer_test.rb

@@ -811,5 +811,55 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
       assert created.targeting.resolved?
       assert_equal job_invocation.template_invocations_host_ids, created.targeting.host_ids
     end
+
+    it 'takes randomized_ordering from the original job invocation when rerunning failed' do
+      job_invocation.targeting.randomized_ordering = true
+      job_invocation.targeting.save!
+      host_ids = job_invocation.targeting.hosts.pluck(:id)
+      composer = JobInvocationComposer.from_job_invocation(job_invocation, :host_ids => host_ids)
+      assert composer.job_invocation.targeting.randomized_ordering
+    end
+  end
+
+  describe '#resolve_job_category and #resolve job_templates' do
+    let(:setting_template) { as_admin { FactoryBot.create(:job_template, :name => 'trying setting', :job_category => 'fluff') } }
+    let(:other_template) { as_admin { FactoryBot.create(:job_template, :name => 'trying something', :job_category => 'fluff') } }
+    let(:second_template) { as_admin { FactoryBot.create(:job_template, :name => 'second template', :job_category => 'fluff') } }
+    let(:params) { { :host_ids => nil, :targeting => { :targeting_type => "static_query", :bookmark_id => nil }, :job_template_id => setting_template.id } }
+    let(:composer) { JobInvocationComposer.from_api_params(params) }
+
+    context 'with template in setting present' do
+      before do
+        FactoryBot.create(
+          :setting,
+          :name => 'remote_execution_form_job_template',
+          :category => 'Setting::RemoteExecution',
+          :value => setting_template.name
+        )
+      end
+
+      it 'should resolve category to the setting value' do
+        assert_equal setting_template.job_category, composer.resolve_job_category('foo')
+      end
+
+      it 'should resolve template to the setting value' do
+        assert_equal setting_template, composer.resolve_job_template([other_template, setting_template])
+      end
+
+      it 'should respect provider templates when resolving templates' do
+        assert_equal other_template, composer.resolve_job_template([other_template])
+      end
+    end
+
+    context 'with template in setting absent' do
+      it 'should resolve category to the default value' do
+        category = 'foo'
+        assert_equal category, composer.resolve_job_category(category)
+      end
+
+      it 'should resolve template to the first in category' do
+        assert_equal other_template, composer.resolve_job_template([other_template, second_template])
+      end
+    end
   end
 end

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

@@ -7,6 +7,8 @@ import DonutChart from 'foremanReact/components/common/charts/DonutChart';
 import AggregateStatus from './AggregateStatus/index.js';
 import * as JobInvocationActions from '../../redux/actions/jobInvocations';
 
+const colIndexOfMaxValue = columns => columns.reduce((iMax, x, i, arr) => (x[1] > arr[iMax][1] ? i : iMax), 0);
+
 class JobInvocationContainer extends React.Component {
   componentDidMount() {
     const { startJobInvocationsPolling, data: { url } } = this.props;
@@ -16,10 +18,12 @@ class JobInvocationContainer extends React.Component {
 
   render() {
     const { jobInvocations, statuses } = this.props;
+    const iMax = colIndexOfMaxValue(jobInvocations);
 
     return (
       <div id="job_invocations_chart_container">
-        <DonutChart data={Immutable.asMutable(jobInvocations)} />
+        <DonutChart data={Immutable.asMutable(jobInvocations)}
+                    title={{type: 'percent', secondary: (jobInvocations[iMax] || [])[0]}}/>
         <AggregateStatus statuses={statuses} />
       </div>
     );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -147,9 +147,10 @@ files:
 - app/assets/javascripts/foreman_remote_execution/job_templates.js
 - app/assets/javascripts/foreman_remote_execution/template_input.js
 - app/assets/javascripts/foreman_remote_execution/template_invocation.js
-- app/assets/stylesheets/foreman_remote_execution/job_invocations.css.scss
-- app/assets/stylesheets/foreman_remote_execution/modal_window.css.scss
-- app/assets/stylesheets/foreman_remote_execution/template_invocation.css.scss
+- app/assets/stylesheets/foreman_remote_execution/foreman_remote_execution.css
+- app/assets/stylesheets/foreman_remote_execution/job_invocations.scss
+- app/assets/stylesheets/foreman_remote_execution/modal_window.scss
+- app/assets/stylesheets/foreman_remote_execution/template_invocation.scss
 - app/controllers/api/v2/foreign_input_sets_controller.rb
 - app/controllers/api/v2/job_invocations_controller.rb
 - app/controllers/api/v2/job_templates_controller.rb