foreman-tasks 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 464f9df51dc38a0d63e3e573e462f9f57bc5d091f0bdc0090327229d6b8ecffb
-  data.tar.gz: 5d2f0b357ce12025975c5cd62d2d31637d5cbcff20349e3af89edb213e8c553a
+SHA1:
+  metadata.gz: 25fc44af39850ad061431b4262495b931072731c
+  data.tar.gz: 925eb0edab02549e5a27980b83c2356732eb871d
 SHA512:
-  metadata.gz: df01ce6f12aec5edd07cfe1ba355d86ad130df011be72c559dc100f92e2dabcfae356aa636bc73454393acd52aa02d569fe3addefe6d4940aa2d9ec2289a0a6d
-  data.tar.gz: 2e6da699d36a27a4f5727475e998ee52e07861e0a2eecd8a879a9b17f6b27121a225edb34f66338939c11e9110bb3fd53f0edc090b113fedb983db5bdd8798f6
+  metadata.gz: 1cfa0af234b3c6adc0b80ea15411ce3d7bc9d4e0326d620b0495ae914a2adf628762d49a7f9460573c290b1fad3d4535db3c2024c068c40fbdbfcb8cd186c249
+  data.tar.gz: 11a2abde6bf2eed2ead3d6fef4e6cc1dc9baaa9b828c30afa4938387f9451a1ee25226382d0cb32c6e8c952d833b5197d94a99009142f198c36e93835055eace

data/README.md

@@ -13,6 +13,15 @@ happening/happened in your Foreman instance. A framework for asynchronous tasks
     * [foreman-users](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
     * [foreman-dev](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | -------------- |
+| >= 1.15         | ~> 0.9.0       |
+| >= 1.16         | ~> 0.10.0      |
+| >= 1.17         | ~> 0.11.0      |
+| >= 1.18         | ~> 0.13.0      |
+
 Installation
 ------------
 

data/app/controllers/foreman_tasks/api/recurring_logics_controller.rb

@@ -12,6 +12,7 @@ module ForemanTasks
       before_action :find_resource, :only => %w[show cancel]
 
       api :GET, '/recurring_logics', N_('List recurring logics')
+      param_group :search_and_pagination, ::Api::V2::BaseController
       def index
         @recurring_logics = resource_scope_for_index
       end

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -1,4 +1,5 @@
 module ForemanTasks
+  # rubocop:disable Metrics/ClassLength
   module Api
     class TasksController < ::Api::V2::BaseController
       include ::Foreman::Controller::SmartProxyAuth
@@ -118,7 +119,9 @@ module ForemanTasks
       end
       def index
         scope = resource_scope.search_for(params[:search]).select('DISTINCT foreman_tasks_tasks.*')
-        total = scope.count
+
+        total = resource_scope.count
+        subtotal = scope.count
 
         ordering_params = {
           sort_by: params[:sort_by] || 'started_at',
@@ -128,14 +131,14 @@ module ForemanTasks
 
         pagination_params = {
           page: params[:page] || 1,
-          per_page: params[:per_page] || 20
+          per_page: params[:per_page] || Setting[:entries_per_page] || 20
         }
         scope = pagination_scope(scope, pagination_params)
         results = scope.map { |task| task_hash(task) }
 
         render :json => {
           total: total,
-          subtotal: results.count,
+          subtotal: subtotal,
           page: pagination_params[:page],
           per_page: pagination_params[:per_page],
           sort: {
@@ -264,4 +267,5 @@ module ForemanTasks
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -125,8 +125,17 @@ module ForemanTasks
     end
 
     def filter(scope)
-      scope.search_for(params[:search], :order => params[:order])
+      search = current_taxonomy_search
+      search = [search, params[:search]].select(&:present?).join(' AND ')
+      scope.search_for(search, :order => params[:order])
            .paginate(:page => params[:page], :per_page => params[:per_page]).distinct
     end
+
+    def current_taxonomy_search
+      conditions = []
+      conditions << "organization_id = #{Organization.current.id}" if Organization.current
+      conditions << "location_id = #{Location.current.id}" if Location.current
+      conditions.empty? ? '' : "(#{conditions.join(' AND ')})"
+    end
   end
 end

data/app/lib/actions/base.rb

@@ -1,6 +1,6 @@
 module Actions
   class Base < Dynflow::Action
-    middleware.use ::Actions::Middleware::RailsExecutorWrap if Rails::VERSION::MAJOR > 4
+    middleware.use ::Actions::Middleware::RailsExecutorWrap
 
     def task
       @task ||= ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first!

data/app/lib/actions/middleware/keep_current_taxonomies.rb

@@ -19,6 +19,10 @@ module Actions
         restore_current_taxonomies { pass }
       end
 
+      def hook(*args)
+        restore_current_taxonomies { pass(*args) }
+      end
+
       private
 
       def with_current_taxonomies

data/app/lib/actions/middleware/keep_current_user.rb

@@ -19,6 +19,11 @@ module Actions
         restore_curent_user { pass }
       end
 
+      # Run all execution plan lifecycle hooks as the original user
+      def hook(*args)
+        restore_curent_user { pass(*args) }
+      end
+
       private
 
       def with_current_user

data/app/models/foreman_tasks/recurring_logic.rb

@@ -8,11 +8,7 @@ module ForemanTasks
     belongs_to :triggering
 
     has_many :tasks, :through => :task_group
-    if Rails::VERSION::MAJOR < 4
-      has_many :task_groups, :through => :tasks, :uniq => true
-    else
-      has_many :task_groups, -> { distinct }, :through => :tasks
-    end
+    has_many :task_groups, -> { distinct }, :through => :tasks
 
     scoped_search :on => :id, :complete_value => false, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :max_iteration, :complete_value => false, :rename => :iteration_limit
@@ -28,9 +24,13 @@ module ForemanTasks
     end
 
     def start(action_class, *args)
+      start_after(action_class, Time.zone.now, *args)
+    end
+
+    def start_after(action_class, time, *args)
       self.state = 'active'
       save!
-      trigger_repeat(action_class, *args)
+      trigger_repeat_after(time, action_class, *args)
     end
 
     def trigger_repeat_after(time, action_class, *args)

data/app/models/foreman_tasks/task.rb

@@ -26,18 +26,12 @@ module ForemanTasks
 
     has_many :task_group_members, :dependent => :destroy
     has_many :task_groups, :through => :task_group_members
-    if Rails::VERSION::MAJOR < 4
-      has_many :recurring_logic_task_groups, :through => :task_group_members, :conditions => { :type => 'ForemanTasks::TaskGroups::RecurringLogicTaskGroup' }, :source => :task_group
-      has_many :owners, :through => :locks, :source => :resource, :source_type => 'User',
-                        :conditions => ['foreman_tasks_locks.name = ?', Lock::OWNER_LOCK_NAME]
-    else
-      has_many :recurring_logic_task_groups, -> { where :type => 'ForemanTasks::TaskGroups::RecurringLogicTaskGroup' },
-               :through => :task_group_members, :source => :task_group
-      # in fact, the task has only one owner but Rails don't let you to
-      # specify has_one relation though has_many relation
-      has_many :owners, -> { where(['foreman_tasks_locks.name = ?', Lock::OWNER_LOCK_NAME]) },
-               :through => :locks, :source => :resource, :source_type => 'User'
-    end
+    has_many :recurring_logic_task_groups, -> { where :type => 'ForemanTasks::TaskGroups::RecurringLogicTaskGroup' },
+             :through => :task_group_members, :source => :task_group
+    # in fact, the task has only one owner but Rails don't let you to
+    # specify has_one relation though has_many relation
+    has_many :owners, -> { where(['foreman_tasks_locks.name = ?', Lock::OWNER_LOCK_NAME]) },
+             :through => :locks, :source => :resource, :source_type => 'User'
 
     scoped_search :on => :id, :complete_value => false
     scoped_search :on => :action, :complete_value => false
@@ -48,6 +42,8 @@ module ForemanTasks
     scoped_search :on => :start_at, :complete_value => false
     scoped_search :on => :ended_at, :complete_value => false
     scoped_search :on => :parent_task_id, :complete_value => true
+    scoped_search :relation => :locks,  :on => :resource_id, :complete_value => false, :rename => 'location_id', :ext_method => :search_by_taxonomy, :only_explicit => true
+    scoped_search :relation => :locks,  :on => :resource_id, :complete_value => false, :rename => 'organization_id', :ext_method => :search_by_taxonomy, :only_explicit => true
     scoped_search :relation => :locks,  :on => :resource_type, :complete_value => true, :rename => 'resource_type', :ext_method => :search_by_generic_resource
     scoped_search :relation => :locks,  :on => :resource_id, :complete_value => false, :rename => 'resource_id', :ext_method => :search_by_generic_resource
     scoped_search :relation => :owners,
@@ -141,6 +137,20 @@ module ForemanTasks
       { :conditions => condition, :joins => :locks }
     end
 
+    def self.search_by_taxonomy(key, operator, value)
+      uniq_suffix = SecureRandom.hex(3)
+      resource_type = key == 'location_id' ? 'Location' : 'Organization'
+
+      joins = <<-SQL
+      LEFT JOIN foreman_tasks_locks AS foreman_tasks_locks_taxonomy#{uniq_suffix}
+      ON (foreman_tasks_locks_taxonomy#{uniq_suffix}.task_id = foreman_tasks_tasks.id AND
+          foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_type = '#{resource_type}')
+      SQL
+      # Select only those tasks which either have the correct taxonomy or are not related to any
+      sql = "foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id #{operator} ? OR foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id IS NULL"
+      { :conditions => sanitize_sql_for_conditions([sql, value]), :joins => joins }
+    end
+
     def self.search_by_owner(key, operator, value)
       return { :conditions => '0 = 1' } if value == 'current_user' && User.current.nil?
 
@@ -228,7 +238,7 @@ module ForemanTasks
           part.to_s
         end
       end.join('; ')
-      parts.join(' ')
+      parts.join(' ').strip
     end
 
     protected

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -15,7 +15,7 @@ module ForemanTasks
       self.start_at       = string_to_time(utc_zone, data[:start_at]) if data[:start_at]
       self.start_before   = string_to_time(utc_zone, data[:start_before]) if data[:start_before]
       self.parent_task_id ||= begin
-                                if main_action.present? && main_action.caller_execution_plan_id
+                                if main_action.try(:caller_execution_plan_id)
                                   DynflowTask.where(:external_id => main_action.caller_execution_plan_id).first!.id
                                 end
                               end
@@ -70,7 +70,6 @@ module ForemanTasks
     end
 
     def label
-      return execution_plan_action.input['job_class'] if active_job?
       return main_action.class.name if main_action.present?
       self[:label]
     end
@@ -106,8 +105,12 @@ module ForemanTasks
     def main_action
       return @main_action if defined?(@main_action)
       if active_job?
-        action = execution_plan_action
-        active_job_action(action.input['job_class'], action.input['job_arguments'])
+        args = if execution_plan.delay_record
+                 execution_plan.delay_record.args.first
+               else
+                 execution_plan_action.input
+               end
+        @main_action = active_job_action(args['job_class'], args['job_arguments'])
       else
         @main_action = execution_plan && execution_plan.root_plan_step.try(:action, execution_plan)
       end
@@ -118,7 +121,9 @@ module ForemanTasks
     # humanized_* methods for foreman-tasks integration.
     def active_job_action(klass, args)
       return if klass.blank?
-      klass.constantize.new(*args)
+      if (active_job_class = klass.safe_constantize)
+        active_job_class.new(*args)
+      end
     end
 
     def active_job?
@@ -142,7 +147,7 @@ module ForemanTasks
       method = find_humanize_method_kind(method)
       Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
       if method != :humanized_name && execution_scheduled?
-        return N_('N/A')
+        return
       elsif method == :humanized_name && main_action.nil?
         return N_(label)
       end

data/app/views/foreman_tasks/api/tasks/show.json.rabl

@@ -1,5 +1,5 @@
 object @task if @task
 
-attributes :id, :label, :pending
+attributes :id, :label, :pending, :action
 attributes :username, :started_at, :ended_at, :state, :result, :progress
 attributes :input, :output, :humanized, :cli_example

data/app/views/foreman_tasks/tasks/index.html.erb

@@ -2,20 +2,7 @@
 <% title_actions csv_link, help_button %>
 <% stylesheet 'foreman_tasks/tasks' %>
 
-<script>
-
-var currentTwoPaneTask;
-
-$(document).on('click', ".table-two-pane td.two-pane-link", function(e) {
-  currentTwoPaneTask = $(this).find("a");
-  if(currentTwoPaneTask.length){
-    e.preventDefault();
-    two_pane_open(currentTwoPaneTask);
-  }
-});
-
-</script>
-<table class="<%= table_css_classes('table-fixed table-two-pane') %>">
+<table class="<%= table_css_classes('table-fixed') %>">
   <tr>
     <th class="col-md-4"><%= _("Action") %></th>
     <th class="col-md-1"><%= _("State") %></th>
@@ -26,7 +13,7 @@ $(document).on('click', ".table-two-pane td.two-pane-link", function(e) {
   </tr>
   <% for task in @tasks %>
     <tr>
-      <td class="task-id two-pane-link ellipsis">
+      <td class="task-id ellipsis">
         <%= link_to_if_authorized(format_task_input(task),
                                   hash_for_foreman_tasks_task_path(:id => task)) %>
       </td>

data/app/views/foreman_tasks/tasks/show.html.erb

@@ -1,94 +1,117 @@
 <% stylesheet 'foreman_tasks/tasks' %>
 
-<script>
-  if (typeof taskProgressReloader === 'undefined') {
-    var taskProgressReloader = {
-      timeoutId: null,
-      formId: null,
-      reload: function () {
-        // we need different reload mechanism for two-pane and non-two-pane
-        if (typeof currentTwoPaneTask !== 'undefined') {
-          if($('.two-pane-right').length && $('form#' + taskProgressReloader.formId).length) {
-            taskProgressReloader.timeoutId = null;
-            two_pane_open(currentTwoPaneTask);
+<%= breadcrumbs(
+  items: [
+    {
+      caption: _('Tasks'),
+      url: url_for(foreman_tasks_tasks_path)
+    },
+    {
+      caption: truncate(format_task_input(@task), :length => 50)
+    }
+  ],
+  name_field: 'action',
+  resource_url: foreman_tasks_api_tasks_path,
+  switcher_item_url: foreman_tasks_task_path(:id => ':id')
+) %>
+
+
+<div class="task-details">
+  <script>
+    if (typeof taskProgressReloader === 'undefined') {
+      var taskProgressReloader = {
+        timeoutId: null,
+        formId: null,
+        reload: function () {
+          tfm.tools.showSpinner();
+          taskProgressReloader.timeoutId = null;
+          taskProgressReloader.formId = null;
+
+          $.ajax({
+            type:'GET',
+            url: document.location.href,
+            headers: {"X-Foreman-Layout": "two-pane"},
+            success: function(response){
+              $('#content .task-details').replaceWith($(response));
+            },
+            error: function(response){
+              document.location.reload();
+            },
+            complete: function(){
+              tfm.tools.hideSpinner();
+            }
+          });
+        },
+
+        start: function () {
+          var button = $('.reload-button');
+          if (!taskProgressReloader.timeoutId) {
+            taskProgressReloader.timeoutId = setTimeout(this.reload, 5000);
+            taskProgressReloader.formId = $(button).closest('form')[0].id;
+          }
+          button.html('<span class="glyphicon glyphicon-refresh spin"></span> <%= _('Stop auto-reloading') %>');
+          button.show();
+        },
+
+        stop: function () {
+          if (taskProgressReloader.timeoutId) {
+            clearTimeout(taskProgressReloader.timeoutId);
+          }
+          taskProgressReloader.timeoutId = null;
+          taskProgressReloader.formId = null;
+          var button = $('.reload-button');
+          button.html('<span class="glyphicon glyphicon-refresh"></span> <%= _('Start auto-reloading') %>');
+          button.show();
+        },
+
+        toggle: function () {
+          if (taskProgressReloader.timeoutId) {
+            this.stop();
           } else {
-            taskProgressReloader.stop();
+            this.start();
           }
-        } else {
-          document.location.reload();
         }
-      },
+      };
+    }
 
-      start: function () {
-        var button = $('.reload-button');
-        if (!taskProgressReloader.timeoutId) {
-          taskProgressReloader.timeoutId = setTimeout(this.reload, 5000);
-          taskProgressReloader.formId = $(button).closest('form')[0].id;
+    $(document).ready(function () {
+      $('.modal-submit').click(function(e){
+        if($(this).hasClass('disabled')){
+          e.preventDefault();
         }
-        button.html('<span class="glyphicon glyphicon-refresh spin"></span> <%= _('Stop auto-reloading') %>');
-        button.show();
-      },
+      });
+      $('.disable-unlock').click(function() {
+        var button = $(this).parents('.modal').find('.modal-submit');
 
-      stop: function () {
-        if (taskProgressReloader.timeoutId) {
-          clearTimeout(taskProgressReloader.timeoutId);
+        if($(this).is(':checked')){
+          button.removeClass('disabled')
         }
-        taskProgressReloader.timeoutId = null;
-        taskProgressReloader.formId = null;
-        var button = $('.reload-button');
-        button.html('<span class="glyphicon glyphicon-refresh"></span> <%= _('Start auto-reloading') %>');
-        button.show();
-      },
-
-      toggle: function () {
-        if (taskProgressReloader.timeoutId) {
-          this.stop();
-        } else {
-          this.start();
+        else{
+          button.addClass('disabled')
         }
-      }
-    };
-  }
-
-  $(document).ready(function () {
-    $('.modal-submit').click(function(e){
-      if($(this).hasClass('disabled')){
-        e.preventDefault();
-      }
-    });
-    $('.disable-unlock').click(function() {
-      var button = $(this).parents('.modal').find('.modal-submit');
-
-      if($(this).is(':checked')){
-        button.removeClass('disabled')
-      }
-      else{
-        button.addClass('disabled')
-      }
-    });
+      });
 
-    $('.reload-button').click(function (event) {
-      taskProgressReloader.toggle();
-      event.preventDefault();
-    });
+      $('.reload-button').click(function (event) {
+        taskProgressReloader.toggle();
+        event.preventDefault();
+      });
 
-    $('.reload-button-stop').click(function (event) {
-      taskProgressReloader.stop();
-    });
+      $('.reload-button-stop').click(function (event) {
+        taskProgressReloader.stop();
+      });
 
-    $('ul.nav-tabs a' ).click(function (event) {
+      $('ul.nav-tabs a' ).click(function (event) {
+        taskProgressReloader.stop();
+      });
+
+    <% if @task.state != 'stopped' %>
+      taskProgressReloader.start();
+    <% else %>
       taskProgressReloader.stop();
+    <% end %>
     });
+  </script>
 
-  <% if @task.state != 'stopped' %>
-    taskProgressReloader.start();
-  <% else %>
-    taskProgressReloader.stop();
-  <% end %>
-  });
-</script>
-
-<div class="task-details">
 
   <%= form_for @task, :url => "#" do %>
 

data/foreman-tasks.gemspec

@@ -29,7 +29,7 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency "foreman-tasks-core"
-  s.add_dependency "dynflow", '~> 1.0'
+  s.add_dependency "dynflow", '~> 1.0', '>= 1.0.5'
   s.add_dependency "sinatra" # for Dynflow web console
   s.add_dependency "parse-cron", '~> 0.1.4'
   s.add_dependency "get_process_mem" # for memory polling

data/lib/foreman_tasks.rb

@@ -34,11 +34,7 @@ module ForemanTasks
   end
 
   def self.rails_safe_trigger_task
-    if Rails::VERSION::MAJOR > 4
-      ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-        yield
-      end
-    else
+    ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
       yield
     end
   end

data/lib/foreman_tasks/cleaner.rb

@@ -103,6 +103,7 @@ module ForemanTasks
           delete_remote_tasks(chunk)
         end
       end
+      delete_orphaned_locks
       delete_orphaned_dynflow_tasks
     end
 
@@ -147,6 +148,15 @@ module ForemanTasks
       ForemanTasks.dynflow.world.persistence.delete_execution_plans({ 'uuid' => uuids }, batch_size, @backup_dir)
     end
 
+    def delete_orphaned_locks
+      orphaned_locks = ForemanTasks::Lock.left_outer_joins(:task).where(:'foreman_tasks_tasks.id' => nil)
+      with_noop(orphaned_locks, 'orphaned task locks') do |source, name|
+        with_batches(source, name) do |chunk|
+          ForemanTasks::Lock.where(id: chunk.pluck(:id)).delete_all
+        end
+      end
+    end
+
     def delete_orphaned_dynflow_tasks
       with_noop(orphaned_dynflow_tasks, 'orphaned execution plans') do |source, name|
         with_batches(source, name) do |chunk|

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.13.1'.freeze
+  VERSION = '0.13.2'.freeze
 end

data/locale/action_names.rb

@@ -1,4 +1,5 @@
 # Autogenerated!
-_("Action with sub plans")
+_("Remote action:")
+_("Import Puppet classes")
 _("Import facts")
-_("Import Puppet classes")
+_("Action with sub plans")

data/locale/en/foreman_tasks.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_tasks 0.1.2\n"
+"Project-Id-Version: foreman_tasks 0.2.5\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-03 09:55-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -150,6 +150,9 @@ msgstr ""
 msgid "External Id"
 msgstr ""
 
+msgid "Failed to check on tasks on proxy at %{url}: %{exception}"
+msgstr ""
+
 msgid "Failed to initialize"
 msgstr ""
 
@@ -271,6 +274,9 @@ msgstr ""
 msgid "Parent task"
 msgstr ""
 
+msgid "Proxy task gone missing from the smart proxy"
+msgstr ""
+
 msgid "Raw"
 msgstr ""
 
@@ -289,6 +295,9 @@ msgstr ""
 msgid "Recurring logics"
 msgstr ""
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "Repeat N times"
 msgstr ""
 
@@ -436,9 +445,6 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-msgid "Time in second during which a task has to be started on the proxy"
-msgstr ""
-
 msgid "Time in seconds between retries"
 msgstr ""
 

data/locale/foreman_tasks.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_tasks 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-12 13:50-0400\n"
-"PO-Revision-Date: 2018-03-12 13:50-0400\n"
+"POT-Creation-Date: 2018-06-14 21:03+0200\n"
+"PO-Revision-Date: 2018-06-14 21:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -22,87 +22,87 @@ msgstr ""
 msgid "List recurring logics"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/recurring_logics_controller.rb:19
+#: ../app/controllers/foreman_tasks/api/recurring_logics_controller.rb:20
 msgid "Show recurring logic details"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/recurring_logics_controller.rb:23
+#: ../app/controllers/foreman_tasks/api/recurring_logics_controller.rb:24
 msgid "Cancel recurring logic"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:73
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:74
 msgid "Resume all paused error tasks"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:74
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:75
 msgid "Resume tasks matching search string"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:75
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:76
 msgid "Resume specific tasks by ID"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:110
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:111
 msgid "List tasks"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:111
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:112
 msgid "Search string"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:112
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:113
 msgid "Page number, starting at 1"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:113
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:114
 msgid "Number of results per page to return"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:114
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:115
 msgid "Sort field and order, e.g. 'name DESC'"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:115
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:116
 msgid "Hash version of 'order' param"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:116
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:117
 msgid "Field to sort the results on"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:117
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:118
 msgid "How to order the sorted results (e.g. ASC for ascending)"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:149
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:152
 msgid "Send data to the task from external executor (such as smart_proxy_dynflow)"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:151
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:154
 msgid "UUID of the task"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:152
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:155
 msgid "The ID of the step inside the execution plan to send the event to"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:154
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:157
 msgid "Data to be sent to the action"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:182
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:185
 msgid "User search_params requires user_id to be specified"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:191
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:194
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:198
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:201
 msgid "Task search_params requires task_id to be specified"
 msgstr ""
 
-#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:202
+#: ../app/controllers/foreman_tasks/api/tasks_controller.rb:205
 msgid "Type %s for search_params is not supported"
 msgstr ""
 
@@ -148,8 +148,7 @@ msgstr ""
 
 #: ../app/helpers/foreman_tasks/foreman_tasks_helper.rb:36
 #: ../app/helpers/foreman_tasks/foreman_tasks_helper.rb:45
-#: ../app/models/foreman_tasks/recurring_logic.rb:101
-#: ../app/models/foreman_tasks/task/dynflow_task.rb:110
+#: ../app/models/foreman_tasks/recurring_logic.rb:110
 #: ../app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb:14
 #: ../app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb:14
 msgid "N/A"
@@ -312,7 +311,7 @@ msgstr ""
 msgid "The targets are of different types"
 msgstr ""
 
-#: ../app/lib/actions/foreman/host/import_facts.rb:44 action_names.rb:3
+#: ../app/lib/actions/foreman/host/import_facts.rb:44 action_names.rb:5
 msgid "Import facts"
 msgstr ""
 
@@ -352,7 +351,7 @@ msgstr ""
 msgid "organization"
 msgstr ""
 
-#: ../app/lib/actions/helpers/with_continuous_output.rb:20
+#: ../app/lib/actions/helpers/with_continuous_output.rb:24
 msgid "Failed to initialize"
 msgstr ""
 
@@ -364,31 +363,39 @@ msgstr ""
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr ""
 
-#: ../app/lib/actions/proxy_action.rb:63
+#: ../app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb:68
+msgid "Failed to check on tasks on proxy at %{url}: %{exception}"
+msgstr ""
+
+#: ../app/lib/actions/proxy_action.rb:79
 msgid "The smart proxy task %s failed."
 msgstr ""
 
-#: ../app/lib/actions/proxy_action.rb:77
+#: ../app/lib/actions/proxy_action.rb:90
 msgid "Cancel enforced: the task might be still running on the proxy"
 msgstr ""
 
-#: ../app/lib/actions/proxy_action.rb:87
+#: ../app/lib/actions/proxy_action.rb:100
 msgid "Task aborted: the task might be still running on the proxy"
 msgstr ""
 
-#: ../app/lib/actions/proxy_action.rb:129
+#: ../app/lib/actions/proxy_action.rb:121
+msgid "Proxy task gone missing from the smart proxy"
+msgstr ""
+
+#: ../app/lib/actions/proxy_action.rb:151
 msgid "Initialization error: %s"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:95
+#: ../app/models/foreman_tasks/recurring_logic.rb:104
 msgid "Active"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:97
+#: ../app/models/foreman_tasks/recurring_logic.rb:106
 msgid "Cancelled"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:99
+#: ../app/models/foreman_tasks/recurring_logic.rb:108
 msgid "Finished"
 msgstr ""
 
@@ -456,10 +463,6 @@ msgstr ""
 msgid "Time in seconds between retries"
 msgstr ""
 
-#: ../app/models/setting/foreman_tasks.rb:13
-msgid "Time in second during which a task has to be started on the proxy"
-msgstr ""
-
 #: ../app/views/common/_trigger_form.html.erb:2
 msgid "Schedule"
 msgstr ""
@@ -489,7 +492,7 @@ msgstr ""
 #: ../app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb:12
 #: ../app/views/foreman_tasks/tasks/_errors.html.erb:16
 #: ../app/views/foreman_tasks/tasks/_running_steps.html.erb:19
-#: ../app/views/foreman_tasks/tasks/index.html.erb:20
+#: ../app/views/foreman_tasks/tasks/index.html.erb:7
 msgid "Action"
 msgstr ""
 
@@ -523,7 +526,7 @@ msgstr ""
 #: ../app/views/foreman_tasks/tasks/_running_steps.html.erb:24
 #: ../app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb:5
 #: ../app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb:4
-#: ../app/views/foreman_tasks/tasks/index.html.erb:21
+#: ../app/views/foreman_tasks/tasks/index.html.erb:8
 msgid "State"
 msgstr ""
 
@@ -604,7 +607,7 @@ msgstr ""
 #: ../app/views/foreman_tasks/tasks/_details.html.erb:96
 #: ../app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb:6
 #: ../app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb:5
-#: ../app/views/foreman_tasks/tasks/index.html.erb:22
+#: ../app/views/foreman_tasks/tasks/index.html.erb:9
 msgid "Result"
 msgstr ""
 
@@ -617,12 +620,12 @@ msgid "Execution type"
 msgstr ""
 
 #: ../app/views/foreman_tasks/tasks/_details.html.erb:127
-#: ../app/views/foreman_tasks/tasks/index.html.erb:23
+#: ../app/views/foreman_tasks/tasks/index.html.erb:10
 msgid "Started at"
 msgstr ""
 
 #: ../app/views/foreman_tasks/tasks/_details.html.erb:131
-#: ../app/views/foreman_tasks/tasks/index.html.erb:24
+#: ../app/views/foreman_tasks/tasks/index.html.erb:11
 msgid "Ended at"
 msgstr ""
 
@@ -633,7 +636,7 @@ msgid "Output"
 msgstr ""
 
 #: ../app/views/foreman_tasks/tasks/_details.html.erb:188
-#: ../app/views/foreman_tasks/tasks/show.html.erb:98
+#: ../app/views/foreman_tasks/tasks/show.html.erb:121
 msgid "Errors"
 msgstr ""
 
@@ -720,35 +723,36 @@ msgid "Last start time"
 msgstr ""
 
 #: ../app/views/foreman_tasks/tasks/index.html.erb:1
+#: ../app/views/foreman_tasks/tasks/show.html.erb:6
 #: ../lib/foreman_tasks/engine.rb:48
 msgid "Tasks"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/index.html.erb:25
+#: ../app/views/foreman_tasks/tasks/index.html.erb:12
 msgid "User"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:28
+#: ../app/views/foreman_tasks/tasks/show.html.erb:52
 msgid "Stop auto-reloading"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:39
+#: ../app/views/foreman_tasks/tasks/show.html.erb:63
 msgid "Start auto-reloading"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:96
+#: ../app/views/foreman_tasks/tasks/show.html.erb:119
 msgid "Task"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:97
+#: ../app/views/foreman_tasks/tasks/show.html.erb:120
 msgid "Running Steps"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:99
+#: ../app/views/foreman_tasks/tasks/show.html.erb:122
 msgid "Locks"
 msgstr ""
 
-#: ../app/views/foreman_tasks/tasks/show.html.erb:100
+#: ../app/views/foreman_tasks/tasks/show.html.erb:123
 msgid "Raw"
 msgstr ""
 
@@ -767,5 +771,9 @@ msgid "Recurring Logics"
 msgstr ""
 
 #: action_names.rb:2
+msgid "Remote action:"
+msgstr ""
+
+#: action_names.rb:3
 msgid "Action with sub plans"
 msgstr ""

data/test/controllers/tasks_controller_test.rb

@@ -12,6 +12,54 @@ module ForemanTasks
         :dynflow_task
       end
       # rubocop:enable Naming/AccessorMethodName
+
+      def linked_task(resource)
+        FactoryBot.create(:some_task).tap { |t| ForemanTasks::Lock.link!(resource, t.id) }
+      end
+
+      def in_taxonomy_scope(organization, location = nil)
+        Organization.current = organization
+        Location.current = location unless location.nil?
+        yield organization, location
+        Organization.current = Location.current = nil
+      end
+
+      describe 'taxonomy scoping' do
+        let(:organizations) { (0..1).map { FactoryBot.create(:organization) } }
+        let(:tasks) { organizations.map { |o| linked_task(o) } + [FactoryBot.create(:some_task)] }
+
+        it 'takes other searches into account' do
+          task = tasks.first
+          @controller.stubs(:params).returns(:search => "id = #{task.id}")
+          in_taxonomy_scope(organizations.first) do |_o, _l|
+            results = @controller.send(:filter, ForemanTasks::Task)
+            results.map(&:id).sort.must_equal [task.id]
+          end
+        end
+
+        it 'does not scope by taxonomy if unset' do
+          organizations
+          tasks
+          @controller.send(:current_taxonomy_search).must_equal ''
+          results = @controller.send(:filter, ForemanTasks::Task)
+          results.map(&:id).sort.must_equal tasks.map(&:id).sort
+        end
+
+        it 'scopes by organization if set' do
+          scoped, _, unscoped = tasks
+          in_taxonomy_scope(organizations.first) do |o, _l|
+            @controller.send(:current_taxonomy_search).must_equal "(organization_id = #{o.id})"
+            results = @controller.send(:filter, ForemanTasks::Task)
+            results.map(&:id).sort.must_equal [scoped, unscoped].map(&:id).sort
+          end
+        end
+
+        it 'scopes by org and location if set' do
+          in_taxonomy_scope(organizations.first, FactoryBot.create(:location)) do |o, l|
+            @controller.send(:current_taxonomy_search).must_equal "(organization_id = #{o.id} AND location_id = #{l.id})"
+          end
+        end
+      end
     end
   end
 end

data/test/foreman_tasks_test_helper.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
+require_relative './support/dummy_active_job'
 require_relative './support/dummy_dynflow_action'
+require_relative './support/dummy_recurring_dynflow_action'
 require_relative './support/dummy_proxy_action'
 require_relative './support/dummy_task_group'
 

data/test/support/dummy_active_job.rb

@@ -0,0 +1,7 @@
+module Support
+  class DummyActiveJob < ApplicationJob
+    def humanized_name
+      "Dummy action"
+    end
+  end
+end

data/test/support/dummy_recurring_dynflow_action.rb

@@ -0,0 +1,5 @@
+module Support
+  class DummyRecurringDynflowAction < Actions::EntryAction
+    include Actions::RecurringAction
+  end
+end

data/test/unit/cleaner_test.rb

@@ -39,12 +39,18 @@ class TasksTest < ActiveSupport::TestCase
                            task.started_at = task.ended_at = Time.zone.now
                            task.save
                          end]
+      lock_to_delete = tasks_to_delete.first.locks.create(:name => 'read', :resource => User.current)
+
+      tasks_to_keep = [FactoryBot.create(:dynflow_task, :product_create_task)]
+      lock_to_keep = tasks_to_keep.first.locks.create(:name => 'read', :resource => User.current)
 
-      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :product_create_task)]
       cleaner.expects(:tasks_to_csv)
       cleaner.delete
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty
       ForemanTasks::Task.where(id: tasks_to_keep).must_equal tasks_to_keep
+
+      ForemanTasks::Lock.find_by(id: lock_to_delete.id).must_be_nil
+      ForemanTasks::Lock.find_by(id: lock_to_keep.id).wont_be_nil
     end
 
     it 'supports passing empty filter (just delete all)' do
@@ -76,7 +82,7 @@ class TasksTest < ActiveSupport::TestCase
       w.close
       header, *data = r.readlines.map(&:chomp)
       header.must_equal ForemanTasks::Task.attribute_names.join(',')
-      expected_lines = tasks_to_delete.map { |task| task.attributes.values.join(',') }
+      expected_lines = tasks_to_delete.map { |task| task.attributes.values.to_csv.chomp }
       data.count.must_equal expected_lines.count
       expected_lines.each { |line| data.must_include line }
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty

data/test/unit/recurring_logic_test.rb

@@ -88,6 +88,15 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       recurring_logic.start(::Support::DummyDynflowAction)
     end
 
+    it 'can start at' do
+      recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
+
+      future_time = Time.zone.now + 1.week
+      recurring_logic.start_after(::Support::DummyRecurringDynflowAction, future_time)
+
+      assert_equal future_time.change(:min => future_time.min + 1, :sec => 0), recurring_logic.tasks.first.start_at
+    end
+
     it 'has a task group associated to all tasks that were created as part of the recurring logic' do
       recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
       recurring_logic.save

data/test/unit/task_test.rb

@@ -56,6 +56,15 @@ class TasksTest < ActiveSupport::TestCase
     end
   end
 
+  describe 'active job task' do
+    it 'when scheduled to the future, the label and action is set properly' do
+      job = Support::DummyActiveJob.set(:wait => 12.hours).perform_later
+      task = ForemanTasks::Task.find_by!(:external_id => job.provider_job_id)
+      task.action.must_equal "Dummy action"
+      task.label.must_equal "Support::DummyActiveJob"
+    end
+  end
+
   describe 'task without valid execution plan' do
     let(:task) do
       task = FactoryBot.create(:dynflow_task).tap do |task|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -250,8 +256,10 @@ files:
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
 - test/lib/actions/middleware/keep_current_user_test.rb
+- test/support/dummy_active_job.rb
 - test/support/dummy_dynflow_action.rb
 - test/support/dummy_proxy_action.rb
+- test/support/dummy_recurring_dynflow_action.rb
 - test/support/dummy_task_group.rb
 - test/tasks/generate_task_actions_test.rb
 - test/unit/actions/action_with_sub_plans_test.rb
@@ -286,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
@@ -302,8 +310,10 @@ test_files:
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
 - test/lib/actions/middleware/keep_current_user_test.rb
+- test/support/dummy_active_job.rb
 - test/support/dummy_dynflow_action.rb
 - test/support/dummy_proxy_action.rb
+- test/support/dummy_recurring_dynflow_action.rb
 - test/support/dummy_task_group.rb
 - test/tasks/generate_task_actions_test.rb
 - test/unit/actions/action_with_sub_plans_test.rb