foreman-tasks 8.1.1 → 8.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea7c09f93e56822f799d7183bff19c4faa2f1c39170308c32bde7e6f7dbbc7e
-  data.tar.gz: cc0302fdb82270c60189a84643ae7cc664d514344118ef5e66d31e448c33d786
+  metadata.gz: 6b47d3165d26d95f9799243481ff75c14aaa59ec3966edcf8afe95ee1da77a97
+  data.tar.gz: 2b0eb29411d81b496169b970f0edb93abda50f6a109ee13d21830f918e52e29f
 SHA512:
-  metadata.gz: 50a5504d7b2ff8ef38dec48b1126772f5b5b846660c8eb6dc6957c53556d1467183c42185ee140a7ce519222750811134428f6af2ecd129ea0652010ad67340e
-  data.tar.gz: 5962c5f10d1962c9dd91e44b48e226c35ac4adb675813f0b623850f8ebc3b07c34069cfeeb31a837b1a5a04715ceb47c13bc79f1e297803de74670bb43ee966f
+  metadata.gz: 686ecd66afcaab661bb7916746547dad1a8b33dc9087a2dfd874a87e87d0d426b4fe05f9807337be8fcd13a2861a02dc98c4ae03326df482a7970eed89745fa9
+  data.tar.gz: 4424d6de0469d10129d6c53d5abc190307e497524b6a80a4349be630a383ce1c4fcde172241c64567ea843ba5ef0f804e3c93d7e54ff5f36dd350c12a3ba289a

data/app/lib/actions/check_long_running_tasks.rb

@@ -8,12 +8,10 @@ module Actions
     def plan
       time = Time.now.utc
       cutoff = time - INTERVAL
-      notification = ::ForemanTasks::TasksMailNotification.find_by(name: "long_running_tasks")
-      org_admin_role = Role.find_by(name: 'Organization admin')
-      users = User.left_joins(:roles)
-                  .where(id: UserMailNotification.where(mail_notification_id: notification.id).select(:role_id))
-                  .or(User.where(admin: true))
-                  .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
+      users = User.joins(:mail_notifications)
+                  .where(mail_enabled: true, mail_notifications: { name: 'long_running_tasks' })
+                  .where.not(mail: [nil, ''])
+                  .where(disabled: [nil, false])
 
       query = "state ^ (#{STATES.join(', ')}) AND state_updated_at <= \"#{cutoff}\""
       users.each do |user|
@@ -41,5 +39,9 @@ module Actions
     def humanized_name
       _('Check for long running tasks')
     end
+
+    def rescue_strategy_for_self
+      Dynflow::Action::Rescue::Skip
+    end
   end
 end

data/app/lib/actions/deliver_long_running_tasks_notification.rb

@@ -18,5 +18,9 @@ module Actions
     def humanized_name
       _('Deliver notifications about long running tasks')
     end
+
+    def rescue_strategy_for_self
+      ::Dynflow::Action::Rescue::Skip
+    end
   end
 end

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

@@ -25,6 +25,11 @@ module Actions
         pass(*args)
       end
 
+      def hook(*args)
+        reload_setting_values
+        pass(*args)
+      end
+
       private
 
       def reload_setting_values

data/app/models/foreman_tasks/concerns/user_extensions.rb

@@ -8,6 +8,23 @@ module ForemanTasks
         has_many :tasks, :dependent => :nullify,
                          :class_name => ::ForemanTasks::Task.name
         # rubocop:enable Rails/ReflectionClassName
+
+        before_validation :attach_task_mail_notifications, on: :create
+      end
+
+      def attach_task_mail_notifications
+        org_admin_role = Role.find_by(name: 'Organization admin')
+        admin_role_ids = ([org_admin_role.id] + org_admin_role.cloned_role_ids)
+        role_ids = roles.map(&:id)
+
+        return unless admin || (role_ids & admin_role_ids).any?
+
+        notification = MailNotification.find_by(name: 'long_running_tasks')
+        return if notification.nil?
+
+        if user_mail_notifications.none? { |n| n.mail_notification_id == notification.id }
+          user_mail_notifications.build(mail_notification_id: notification.id, interval: 'Subscribe')
+        end
       end
     end
   end

data/app/views/tasks_mailer/long_tasks.html.erb

@@ -8,11 +8,11 @@
 <div class="dashboard">
   <table>
     <tr>
-      <th>_("ID")</th>
-      <th>_("Action")</th>
-      <th>_("Label")</th>
-      <th>_("State")</th>
-      <th>_("State updated at")</th>
+      <th><%= _("ID") %></th>
+      <th><%= _("Action") %></th>
+      <th><%= _("Label") %></th>
+      <th><%= _("State") %></th>
+      <th><%= _("State updated at") %></th>
     </tr>
     <% @report.tasks.each do |task| %>
       <tr>
@@ -26,4 +26,4 @@
   </table>
 </div>
 
-<%= link_to 'More details', foreman_tasks_tasks_url(search: @report.query) %>
+<%= link_to _('More details'), foreman_tasks_tasks_url(search: @report.query) %>

data/app/views/tasks_mailer/long_tasks.text.erb

@@ -6,11 +6,11 @@
 More details: <%= foreman_tasks_tasks_url(search: @report.query) %>
 
 <% @report.tasks.each do |task| %>
-ID: <%= task.id %>
-Action: <%= task.action %>
-Label: <%= task.label %>
-State: <%= task.state %>
-State updated at: <%= task.state_updated_at %>
-Details: <%= foreman_tasks_task_url(task) %>
+<%= _('ID') %>: <%= task.id %>
+<%= _('Action') %>: <%= task.action %>
+<%= _('Label') %>: <%= task.label %>
+<%= _('State') %>: <%= task.state %>
+<%= _('State updated at') %>: <%= task.state_updated_at %>
+<%= _('Details') %>: <%= foreman_tasks_task_url(task) %>
 
 <% end %>

data/db/seeds.d/95-mail_notifications.rb

@@ -20,5 +20,19 @@ notifications.each do |notification|
       raise ::Foreman::Exception.new(N_("Unable to create mail notification: %s"),
                                      SeedHelper.format_errors(created_notification))
     end
+
+    org_admin_role = Role.find_by(name: 'Organization admin')
+
+    users = User.left_joins(:roles)
+                .joins(:auth_source)
+                .where(admin: true)
+                .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
+                .where.not(auth_source: { name: 'Hidden' })
+    users.each do |user|
+      mail = UserMailNotification.create(mail_notification_id: created_notification.id, user_id: user.id, interval: 'Subscribe')
+      if mail.nil? || mail.errors.any?
+        raise ::Foreman::Exception.new(N_("Unable to enable mail notification to user '%s': %s"), user.login, SeedHelper.format_errors(mail))
+      end
+    end
   end
 end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '8.1.1'.freeze
+  VERSION = '8.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow