foreman-tasks 4.1.5 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6602d0bac71ecbcf69cecc38a00ab4ef145832318576aadcda9a1eda9fed543b
-  data.tar.gz: 4b04eef7b87ba5542fd89576671e2bcf90d81ebad475adcc797dfc916bc30f1a
+  metadata.gz: fa2189368cc093a6ca613ca1b91add99bc3689b2cb22cd0c04a3718821b5f27f
+  data.tar.gz: f7e82294bbbb76fe6576b6c2de9e55c16342962f711a8e5c9070787be304a87c
 SHA512:
-  metadata.gz: 96c669db27581e60652ece6e49fe9bfa1db1d1313b0c89a9a8c9124c897d2c73b9bb7ab5db47045a26651cabdb745779cfcdad45375ea606190774b00544bd8e
-  data.tar.gz: cb9100d6621dbda92e4c25c5e87df96ee2fefd6de1dc556ce44031ee45732cd545671624a51864e38d8c5a177b302d843f897d98de7f4f7b68d5484c84bdf7f4
+  metadata.gz: f20e5fba4dbc2401a4fed1f5eb68961ccc7095071fc309316ad14392b9209141e96aa2372eb7bb5db0e7f829ef08727ff2e232e53de86baa8385183ddb722252
+  data.tar.gz: 534ac74d1c8010ac25330562a6bdb713beacc413d2c681ee72f865727741cfb17e04d9dda2c0ea8ab7bde2f7f2e08f54fa4266e25686ca9d1f38c5309b24b94c

data/.github/workflows/ruby_tests.yml

@@ -72,5 +72,4 @@ jobs:
       - name: Run plugin tests
         run: |
           bundle exec rake test:foreman_tasks
-          bundle exec rake test:foreman_tasks_core
           bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb"

data/.rubocop.yml

@@ -46,10 +46,6 @@ Style/SymbolArray:
 Style/FormatString:
   Enabled: false
 
-Rails/Present:
-  Exclude:
-    - lib/foreman_tasks_core/**/*
-
 Rails/FilePath:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -11,7 +11,6 @@
 # Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'foreman-tasks-core.gemspec'
     - 'foreman-tasks.gemspec'
 
 # Offense count: 1
@@ -37,7 +36,6 @@ Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'app/controllers/foreman_tasks/recurring_logics_controller.rb'
     - 'app/lib/actions/recurring_action.rb'
-    - 'lib/foreman_tasks_core/otp_manager.rb'
 
 # Offense count: 11
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.

data/README.md

@@ -6,7 +6,8 @@ happening/happened in your Foreman instance. A framework for asynchronous tasks
 
 * Website: [TheForeman.org](http://theforeman.org)
 * ServerFault tag: [Foreman](http://serverfault.com/questions/tagged/foreman)
-* Issues: [foreman-tasks Redmine](http://projects.theforeman.org/projects/foreman-tasks)
+* Issues: [Foreman-tasks Redmine](http://projects.theforeman.org/projects/foreman-tasks)
+* Manual: [Foreman-tasks Manual](https://www.theforeman.org/plugins/foreman_tasks/0.8/index.html)
 * Wiki: [Foreman wiki](http://projects.theforeman.org/projects/foreman/wiki/About)
 * Community and support: #theforeman for general support, #theforeman-dev for development chat in [Freenode](irc.freenode.net)
 * Mailing lists:
@@ -25,6 +26,7 @@ happening/happened in your Foreman instance. A framework for asynchronous tasks
 | >= 1.22         | ~> 0.15.0      |
 | >= 2.0          | ~> 1.0.0       |
 | >= 2.1          | ~> 2.0.0       |
+| >= 2.6          | ~> 5.2.0       |
 
 Installation
 ------------
@@ -154,9 +156,9 @@ rails root directory. See `-h` for more details and options
 Tasks cleanup
 -------------
 
-Although, the history of tasks has an auditing value, some kinds of
-tasks can grow up in number quite soon. Therefore there is a mechanism
-how to clean the tasks, using a rake command. When running without
+Although the history of tasks has an auditing value, some kinds of
+tasks can rapidly increase. Therefore, there is a mechanism for
+cleaning up the tasks using a rake command. When running without
 any arguments, the tasks are deleted based on the default parameters
 defined in the code.
 
@@ -179,7 +181,7 @@ override the default configuration inside the configuration
 ```
 :foreman-tasks:
   :cleanup:
-# the period after witch to delete all the tasks (by default all tasks are not being deleted after some period)
+# the period after which to delete all the tasks (by default, all tasks are not deleted after some period)
     :after: 365d
 # per action settings to override the default defined in the actions (cleanup_after method)
     :actions:
@@ -194,7 +196,7 @@ to specify the search criteria for the cleanup manually:
 * `TASK_SEARCH`: scoped search filter (example: 'label =
   "Actions::Foreman::Host::ImportFacts"')
 * `AFTER`: delete tasks created after `AFTER` period. Expected format
-  is a number followed by the time unit (`s`, `h`, `m`, `y`), such as
+  is a number followed by the time unit (`s`, `h`, `d`, `m`, `y`), such as
   `10d` for 10 days (applicable only when the `TASK_SEARCH` option is
   specified)
 * `STATES`: comma separated list of task states to touch with the

data/app/assets/javascripts/foreman_tasks/trigger_form.js

@@ -8,6 +8,7 @@ function trigger_form_selector_binds(form_name, form_object_name) {
       form.find('fieldset.trigger_mode_form#trigger_mode_' + type).hide();
     });
     form.find('fieldset.trigger_mode_form#trigger_mode_' + $(this).val()).show();
+    disable_hidden_start_field($(this).val(), form)
   });
 
   input_type_selector.on('change', function () {
@@ -39,3 +40,9 @@ function trigger_form_selector_binds(form_name, form_object_name) {
     };
   });
 };
+
+function disable_hidden_start_field(clicked, form) {
+  ["future", "recurring"].forEach(function(type) {
+    form.find('.trigger_mode_form#trigger_mode_' + type + ' #triggering_start_at_raw').prop('disabled', type !== clicked);
+  });
+};

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

@@ -320,7 +320,7 @@ module ForemanTasks
       end
 
       def find_task
-        @task = resource_scope.find(params[:id])
+        @task = resource_scope.with_duration.find(params[:id])
       end
 
       def resource_scope(_options = {})
@@ -330,7 +330,7 @@ module ForemanTasks
       end
 
       def resource_scope_for_index(*args)
-        super.select("DISTINCT foreman_tasks_tasks.*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration")
+        super.with_duration.distinct
       end
 
       def controller_permission

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -99,8 +99,8 @@ module ForemanTasks
     private
 
     def respond_with_tasks(scope)
-      @tasks = filter(scope, paginate: false)
-      csv_response(@tasks, [:id, :action, :state, :result, 'started_at.in_time_zone', 'ended_at.in_time_zone', :username], ['Id', 'Action', 'State', 'Result', 'Started At', 'Ended At', 'User'])
+      @tasks = filter(scope, paginate: false).with_duration
+      csv_response(@tasks, [:id, :action, :state, :result, 'started_at.in_time_zone', 'ended_at.in_time_zone', :duration, :username], ['Id', 'Action', 'State', 'Result', 'Started At', 'Ended At', 'Duration', 'User'])
     end
 
     def controller_permission

data/app/graphql/mutations/recurring_logics/cancel.rb

@@ -0,0 +1,27 @@
+module Mutations
+  module RecurringLogics
+    class Cancel < BaseMutation
+      graphql_name 'CancelRecurringLogic'
+      description 'Cancels recurring logic and all its active tasks'
+      resource_class ::ForemanTasks::RecurringLogic
+
+      argument :id, ID, required: true
+
+      field :errors, [Types::AttributeError], null: false
+      field :recurring_logic, Types::RecurringLogic, null: true
+
+      def resolve(id:)
+        recurring_logic = load_object_by(id: id)
+        authorize!(recurring_logic, :edit)
+        task_errors = []
+        begin
+          recurring_logic.cancel
+        rescue => e
+          task_errors = [{ path: ['tasks'], message: "There has been an error when canceling one of the tasks: #{e}" }]
+        end
+        errors = recurring_logic.errors.any? ? map_errors_to_path(recurring_logic) : []
+        { recurring_logic: recurring_logic, errors: (errors + task_errors) }
+      end
+    end
+  end
+end

data/app/graphql/types/recurring_logic.rb

@@ -0,0 +1,21 @@
+module Types
+  class RecurringLogic < Types::BaseObject
+    description 'A Recurring Logic'
+    model_class ::ForemanTasks::RecurringLogic
+
+    include ::Types::Concerns::MetaField
+
+    global_id_field :id
+    field :cron_line, String
+    field :end_time, GraphQL::Types::ISO8601DateTime
+    field :max_iteration, Integer
+    field :iteration, Integer
+    field :state, String
+    field :purpose, String
+    belongs_to :triggering, Types::Triggering
+
+    def self.graphql_definition
+      super.tap { |type| type.instance_variable_set(:@name, 'ForemanTasks::RecurringLogic') }
+    end
+  end
+end

data/app/graphql/types/task.rb

@@ -0,0 +1,25 @@
+module Types
+  class Task < Types::BaseObject
+    description 'A Task'
+    model_class ::ForemanTasks::Task
+
+    global_id_field :id
+    field :type, String
+    field :label, String
+    field :started_at, GraphQL::Types::ISO8601DateTime
+    field :ended_at, GraphQL::Types::ISO8601DateTime
+    field :state, String
+    field :result, String
+    field :external_id, String
+    field :parent_task_id, String
+    field :start_at, GraphQL::Types::ISO8601DateTime
+    field :start_before, GraphQL::Types::ISO8601DateTime
+    field :action, String
+    field :user_id, Integer
+    field :state_updated_at, GraphQL::Types::ISO8601DateTime
+
+    def self.graphql_definition
+      super.tap { |type| type.instance_variable_set(:@name, 'ForemanTasks::Task') }
+    end
+  end
+end

data/app/graphql/types/triggering.rb

@@ -0,0 +1,16 @@
+module Types
+  class Triggering < Types::BaseObject
+    description 'A Task Triggering'
+    model_class ::ForemanTasks::Triggering
+
+    global_id_field :id
+    field :mode, String
+    field :start_at, GraphQL::Types::ISO8601DateTime
+    field :start_before, GraphQL::Types::ISO8601DateTime
+    field :recurring_logic, Types::RecurringLogic
+
+    def self.graphql_definition
+      super.tap { |type| type.instance_variable_set(:@name, 'ForemanTasks::Triggering') }
+    end
+  end
+end

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -141,7 +141,10 @@ module ForemanTasks
         weekly_fieldset(f, triggering),
         time_picker_fieldset(f, triggering),
       ]
-
+      tags << text_f(f, :start_at_raw, :label => _('Start at'), :placeholder => 'YYYY-mm-dd HH:MM')
+      tags << text_f(f, :purpose,
+                     :label => _('Purpose'),
+                     :label_help => N_('A special label for tracking a recurring job. There can be only one active job with a given purpose at a time.'))
       content_tag(:fieldset, nil, :id => 'trigger_mode_recurring', :class => "trigger_mode_form #{'hidden' unless triggering.recurring?}") do
         tags.join.html_safe
       end

data/app/lib/actions/helpers/with_continuous_output.rb

@@ -8,7 +8,7 @@ module Actions
       end
 
       def continuous_output
-        continuous_output = ::ForemanTasksCore::ContinuousOutput.new
+        continuous_output = ::ForemanTasks::ContinuousOutput.new
         continuous_output_providers.each do |continous_output_provider|
           continous_output_provider.fill_continuous_output(continuous_output)
         end

data/app/lib/actions/proxy_action.rb

@@ -29,10 +29,10 @@ module Actions
       default_connection_options.each do |key, value|
         options[:connection_options][key] = value unless options[:connection_options].key?(key)
       end
-      plan_self(options.merge(:proxy_url => proxy.url, :proxy_action_name => klass.to_s, :proxy_version => proxy_version(proxy)))
+      plan_self(options.merge(:proxy_url => proxy.url, :proxy_action_name => klass.to_s))
       # Just saving the RemoteTask is enough when using batch triggering
       # It will be picked up by the ProxyBatchTriggering middleware
-      if input[:use_batch_triggering] && with_batch_triggering?(input[:proxy_version])
+      if input[:use_batch_triggering] && input.dig(:connection_options, :proxy_batch_triggering)
         prepare_remote_task.save!
       end
     end
@@ -193,11 +193,6 @@ module Actions
         :proxy_batch_triggering => Setting['foreman_tasks_proxy_batch_trigger'] || false }
     end
 
-    def with_batch_triggering?(proxy_version)
-      ((proxy_version[:major] == 1 && proxy_version[:minor] > 20) || proxy_version[:major] > 1) &&
-        input.fetch(:connection_options, {}).fetch(:proxy_batch_triggering, false)
-    end
-
     def clean_remote_task(*_args)
       remote_task.destroy! if remote_task
     end
@@ -222,11 +217,6 @@ module Actions
                          .try(:fetch, 'output', {}) || {}
     end
 
-    def proxy_version(proxy)
-      match = proxy.statuses[:version].version['version'].match(/(\d+)\.(\d+)\.(\d+)/)
-      { :major => match[1].to_i, :minor => match[2].to_i, :patch => match[3].to_i }
-    end
-
     def failed_proxy_tasks
       metadata[:failed_proxy_tasks] ||= []
     end

data/app/lib/actions/trigger_proxy_batch.rb

@@ -0,0 +1,79 @@
+module Actions
+  # This action plans proxy tasks in batches.
+  # It needs to be manually notified about the next batch being available by sending a TriggerNextBatch event.
+  #
+  # The ProxyAction needs to be planned with `:use_batch_triggering => true` to activate the feature
+  class TriggerProxyBatch < Base
+    TriggerNextBatch = Algebrick.type do
+      fields! batches: Integer
+    end
+    TriggerLastBatch = Algebrick.atom
+
+    def run(event = nil)
+      case event
+      when nil
+        if output[:planned_count]
+          check_finish
+        else
+          init_counts and suspend
+        end
+      when TriggerNextBatch
+        trigger_remote_tasks_batches(event.batches) and suspend
+      when TriggerLastBatch
+        trigger_remote_tasks_batch and on_finish
+      when ::Dynflow::Action::Skip
+        # do nothing
+      end
+    end
+
+    def trigger_remote_tasks_batches(amount = 1)
+      amount.times { trigger_remote_tasks_batch }
+    end
+
+    def trigger_remote_tasks_batch
+      # Find the tasks in batches, order them by proxy_url so we get all tasks
+      # to a certain proxy "close to each other"
+      batch = remote_tasks.pending.order(:proxy_url, :id).first(batch_size)
+      # Group the tasks by operation, in theory there should be only one operation
+      batch.group_by(&:operation).each do |operation, group|
+        ForemanTasks::RemoteTask.batch_trigger(operation, group)
+      end
+      output[:planned_count] += batch.size
+    rescue => e
+      action_logger.warn "Could not trigger task on the smart proxy: #{e.message}"
+      batch.each { |remote_task| remote_task.update_from_batch_trigger({}) }
+      output[:failed_count] += batch.size
+    end
+
+    def init_counts
+      output[:planned_count] = 0
+      output[:failed_count] = 0
+    end
+
+    def check_finish
+      if output[:planned_count] + output[:failed_count] + batch_size >= input[:total_count]
+        trigger_remote_tasks_batch and on_finish
+      else
+        suspend
+      end
+    end
+
+    def done?
+      output[:planned_count] + output[:failed_count] >= input[:total_count]
+    end
+
+    def remote_tasks
+      task.remote_sub_tasks
+    end
+
+    def on_finish
+      # nothing for now
+    end
+
+    private
+
+    def batch_size
+      input[:batch_size] || Setting['foreman_tasks_proxy_batch_size']
+    end
+  end
+end

data/app/models/foreman_tasks/recurring_logic.rb

@@ -4,6 +4,8 @@ module ForemanTasks
   class RecurringLogic < ApplicationRecord
     include Authorizable
 
+    graphql_type '::Types::RecurringLogic'
+
     belongs_to :task_group
     belongs_to :triggering
 
@@ -15,6 +17,9 @@ module ForemanTasks
     scoped_search :on => :iteration, :complete_value => false
     scoped_search :on => :cron_line, :complete_value => true
     scoped_search :on => :state, :complete_value => true
+    scoped_search :on => :purpose, :complete_value => true
+
+    validate :valid_purpose
 
     before_create do
       task_group.save
@@ -167,6 +172,7 @@ module ForemanTasks
       ::ForemanTasks::RecurringLogic.new_from_cronline(cronline).tap do |manager|
         manager.end_time = triggering.end_time if triggering.end_time_limited.present?
         manager.max_iteration = triggering.max_iteration if triggering.max_iteration.present?
+        manager.purpose = triggering.purpose if triggering.purpose.present?
         manager.triggering = triggering
       end
     end
@@ -187,5 +193,9 @@ module ForemanTasks
                      end
       hash.select { |key, _| allowed_keys.include? key }
     end
+
+    def valid_purpose?
+      !(purpose.present? && self.class.where(:purpose => purpose, :state => %w[active disabled]).any?)
+    end
   end
 end

data/app/models/foreman_tasks/remote_task.rb

@@ -16,7 +16,7 @@ module ForemanTasks
     # Triggers a task on the proxy "the old way"
     def trigger(proxy_action_name, input)
       response = begin
-                   proxy.trigger_task(proxy_action_name, input).merge('result' => 'success')
+                   proxy.launch_tasks('single', :action_class => proxy_action_name, :action_input => input)
                  rescue RestClient::Exception => e
                    logger.warn "Could not trigger task on the smart proxy: #{e.message}"
                    {}
@@ -31,28 +31,12 @@ module ForemanTasks
           acc.merge(remote_task.execution_plan_id => { :action_input => remote_task.proxy_input,
                                                        :action_class => remote_task.proxy_action_name })
         end
-        safe_batch_trigger(operation, group, input_hash)
+        results = remote_tasks.first.proxy.launch_tasks(operation, input_hash)
+        remote_tasks.each { |remote_task| remote_task.update_from_batch_trigger results[remote_task.execution_plan_id] }
       end
       remote_tasks
     end
 
-    # Attempt to trigger the tasks using the new API and fall back to the old one
-    # if it fails
-    def self.safe_batch_trigger(operation, remote_tasks, input_hash)
-      results = remote_tasks.first.proxy.launch_tasks(operation, input_hash)
-      remote_tasks.each { |remote_task| remote_task.update_from_batch_trigger results[remote_task.execution_plan_id] }
-    rescue RestClient::NotFound
-      fallback_batch_trigger remote_tasks, input_hash
-    end
-
-    # Trigger the tasks one-by-one using the old API
-    def self.fallback_batch_trigger(remote_tasks, input_hash)
-      remote_tasks.each do |remote_task|
-        task_data = input_hash[remote_task.execution_plan_id]
-        remote_task.trigger(task_data[:action_class], task_data[:action_input])
-      end
-    end
-
     def update_from_batch_trigger(data)
       if data['result'] == 'success'
         self.remote_task_id = data['task_id']

data/app/models/foreman_tasks/task.rb

@@ -5,6 +5,8 @@ module ForemanTasks
     include Authorizable
     extend Search
 
+    graphql_type '::Types::Task'
+
     def check_permissions_after_save
       # there's no create_tasks permission, tasks are created as a result of internal actions, in such case we
       # don't do authorization, that should have been performed on wrapping action level
@@ -76,6 +78,7 @@ module ForemanTasks
                                  :"foreman_tasks_links.resource_type" => resource.class.name)
            end)
     scope :for_action_types, (->(action_types) { where('foreman_tasks_tasks.label IN (?)', Array(action_types)) })
+    scope :with_duration, -> { select("foreman_tasks_tasks.*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration") }
 
     apipie :class, "A class representing #{model_name.human} object" do
       name 'Task'
@@ -255,6 +258,32 @@ module ForemanTasks
       main_action.continuous_output.raw_outputs
     end
 
+    def self.latest_tasks_by_resource_ids(label, resource_type, resource_ids)
+      tasks = arel_table
+      links = ForemanTasks::Link.arel_table
+      started_at = tasks[:started_at]
+      resource_id = links[:resource_id]
+
+      base_combined_table = tasks
+                            .join(links).on(tasks[:id].eq(links[:task_id]))
+                            .where(tasks[:label].eq(label)
+                                                .and(links[:resource_type].eq(resource_type))
+                                                .and(links[:resource_id].in(resource_ids)))
+
+      grouped = base_combined_table.project(
+        started_at.maximum.as('started_at_max'),
+        resource_id
+      ).group(resource_id).order(resource_id).as('grouped')
+
+      max_per_resource_id = tasks
+                            .join(links).on(tasks[:id].eq(links[:task_id]))
+                            .join(grouped).on(grouped[:started_at_max].eq(started_at).and(grouped[:resource_id].eq(resource_id)))
+                            .distinct
+                            .project(tasks[Arel.star], grouped[:resource_id])
+
+      find_by_sql(max_per_resource_id.to_sql).index_by(&:resource_id)
+    end
+
     protected
 
     def generate_id

data/app/models/foreman_tasks/triggering.rb

@@ -2,9 +2,11 @@ module ForemanTasks
   class Triggering < ApplicationRecord
     PARAMS = [:start_at_raw, :start_before_raw, :max_iteration, :input_type,
               :cronline, :days, :days_of_week, :time, :end_time_limited,
-              :end_time].freeze
+              :end_time, :purpose].freeze
     attr_accessor(*PARAMS)
 
+    graphql_type '::Types::Triggering'
+
     before_save do
       if future?
         parse_start_at!
@@ -28,7 +30,7 @@ module ForemanTasks
     validates :input_type, :if => :recurring?,
                            :inclusion => { :in => ALLOWED_INPUT_TYPES,
                                            :message => _('%{value} is not allowed input type') }
-    validates :start_at_raw, format: { :with => TIME_REGEXP, :if => :future?,
+    validates :start_at_raw, format: { :with => TIME_REGEXP, :if => ->(triggering) { triggering.future? || (triggering.recurring? && triggering.start_at_raw) },
                                        :message => _('%{value} is wrong format') }
     validates :start_before_raw, format: { :with => TIME_REGEXP, :if => :future?,
                                            :message => _('%{value} is wrong format'), :allow_blank => true }
@@ -68,7 +70,7 @@ module ForemanTasks
                              delay_options,
                              *args
       when :recurring
-        recurring_logic.start(action, *args)
+        recurring_logic.start_after(action, delay_options[:start_at] || Time.zone.now, *args)
       end
     end
 
@@ -92,7 +94,13 @@ module ForemanTasks
     end
 
     def parse_start_at!
-      self.start_at ||= Time.zone.parse(start_at_raw)
+      self.start_at ||= Time.zone.parse(start_at_raw) if start_at_raw.present?
+    end
+
+    def parse_start_at
+      self.start_at ||= Time.zone.parse(start_at_raw) if start_at_raw.present?
+    rescue ArgumentError
+      errors.add(:start_at, _('is not a valid format'))
     end
 
     def parse_start_before!
@@ -102,7 +110,9 @@ module ForemanTasks
     private
 
     def can_start_recurring
+      parse_start_at
       errors.add(:input_type, _('No task could be started')) unless recurring_logic.valid?
+      errors.add(:purpose, _('Active or disabled recurring logic with purpose %s already exists') % recurring_logic.purpose) unless recurring_logic.valid_purpose?
       errors.add(:cronline, _('%s is not valid format of cron line') % cronline) unless recurring_logic.valid_cronline?
     end
 

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

@@ -3,6 +3,6 @@ object @task if @task
 extends 'api/v2/layouts/permissions'
 
 attributes :id, :label, :pending, :action
-attributes :username, :started_at, :ended_at, :state, :result, :progress
+attributes :username, :started_at, :ended_at, :duration, :state, :result, :progress
 attributes :input, :output, :humanized, :cli_example, :start_at
 node(:available_actions) { |t| { cancellable: t.execution_plan&.cancellable?, resumable: t.resumable? } }

data/app/views/foreman_tasks/layouts/react.html.erb

@@ -6,7 +6,6 @@
 <% end %>
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
   <%= react_component('ForemanTasks') %>

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

@@ -8,9 +8,9 @@
 <% if authorized_for(:permission => :edit_recurring_logics, :auth_object => @recurring_logics) %>
   <% title_actions link_to(_('Clear Cancelled'),
               clear_cancelled_foreman_tasks_recurring_logics_path,
-              class:  ['btn', 'btn-sm', 'btn-danger'],                  
+              class:  ['btn', 'btn-sm', 'btn-danger'],
               :'data-toggle' => "modal",
-              :'data-target' => "#clear_modal") 
+              :'data-target' => "#clear_modal")
               %>
 
   <div class="modal fade" id="clear_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
@@ -47,6 +47,7 @@
     <th><%= N_("Iteration limit") %></th>
     <th><%= N_("Repeat until") %></th>
     <th><%= N_("State") %></th>
+    <th><%= N_("Purpose") %></th>
     <th/>
   </thead>
   <% @recurring_logics.each do |recurring_logic| %>
@@ -61,6 +62,7 @@
       <td><%= format_recurring_logic_limit recurring_logic.max_iteration %></td>
       <td><%= format_recurring_logic_limit recurring_logic.end_time.try(:in_time_zone) %></td>
       <td><%= recurring_logic_state(recurring_logic) %></td>
+      <td><%= recurring_logic.purpose %></td>
       <td><%= recurring_logic_action_buttons(recurring_logic) %></td>
     </tr>
   <% end %>

data/app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb

@@ -36,4 +36,12 @@
     <th><%= N_("State") %></th>
     <td><%= recurring_logic_state(recurring_logic) %></td>
   </tr>
+  <tr>
+    <th><%= N_("Purpose") %></th>
+    <td><%= recurring_logic.purpose %></td>
+  </tr>
+  <tr>
+    <th><%= N_("Task count") %></th>
+    <td><%= link_to(task_group.tasks.count, foreman_tasks_tasks_url(:search => "task_group.id = #{task_group.id}")) %></td>
+  </tr>
 </table>

data/db/migrate/20210720115251_add_purpose_to_recurring_logic.rb

@@ -0,0 +1,6 @@
+class AddPurposeToRecurringLogic < ActiveRecord::Migration[6.0]
+  def change
+    add_column :foreman_tasks_recurring_logics, :purpose, :string
+    add_index :foreman_tasks_recurring_logics, :purpose, unique: true, where: "state IN ('active', 'disabled')"
+  end
+end