foreman-tasks 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51f734a6c321d30bd6c3aa93499d9924b93435cadfd48bf129452758ed88338
-  data.tar.gz: ffd67ecf17550277bf7bcbc86f8fb98a1ac566c1d386350ff4ed1aa97ffad9e3
+  metadata.gz: 6442bb42dbd73e86c09da30b7b10651a055108a43169ec9aa99b6ee9afe67cc4
+  data.tar.gz: b65ed0dbeac486d6cfce23e4af226a1c87289284d4c4962482e6f74ad4f24a36
 SHA512:
-  metadata.gz: 68b31fa072fbf39a1bd93184dfd6a0588270f897ba4a546d79a4f25be2e5815473eedf9a2975eb57c5344a024f7581e8427f39219af00cf6478ce0697b9fb403
-  data.tar.gz: b531f627380fc77b93c930b6b22051b60e4adad8861cc137cbedfee30237e05fa70a1226b1651b4e7268bd618816a3256ba8b2993a27b5bf04771c3f73c776da
+  metadata.gz: 7f1f2cc08a2d6a1d312c302d27f965ce9bcf5c1dafb8de0d63299952f598478a1b9c5637f2b940e840d31836ec4a6a236cf176de53d25e980001efa41871dd7e
+  data.tar.gz: 671329ba2b9539fd586d82092e77458b482a445e34c4cbed18d9d9e9854b4573a59f7e475aa7ae2ec41f1959938020a376a4adf2f48e09747023109fb518d1ae

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

@@ -75,11 +75,16 @@ module ForemanTasks
       end
 
       api :POST, '/tasks/bulk_resume', N_('Resume all paused error tasks')
+      desc <<~DOC
+        Resumes all selected resumable tasks. If neither a search query nor an
+        explicit list of task IDs is provided, it tries to resume all tasks in
+        paused state with result error.
+      DOC
       param :search, String, :desc => N_('Resume tasks matching search string')
       param :task_ids, Array, :desc => N_('Resume specific tasks by ID')
       def bulk_resume
         if params[:search].nil? && params[:task_ids].nil?
-          raise BadRequest, _('Please provide at least one of search or task_ids parameters in the request')
+          params[:search] = 'state = paused and result = error'
         end
         resumed = []
         failed = []
@@ -109,9 +114,14 @@ module ForemanTasks
         }
       end
 
-      api :POST, '/tasks/bulk_cancel', N_('Cancel all cancellable tasks')
+      api :POST, '/tasks/bulk_cancel', N_('Cancel selected cancellable tasks')
+      desc <<~DOC
+        Cancels all selected cancellable tasks. Requires a search query or an
+        explicit list of task IDs to be provided.
+      DOC
       param :search, String, :desc => N_('Cancel tasks matching search string')
       param :task_ids, Array, :desc => N_('Cancel specific tasks by ID')
+      error :bad_request, 'Returned if neither search nor task_ids parameter is provided.'
       def bulk_cancel
         if params[:search].nil? && params[:task_ids].nil?
           raise BadRequest, _('Please provide at least one of search or task_ids parameters in the request')
@@ -130,9 +140,14 @@ module ForemanTasks
         }
       end
 
-      api :POST, '/tasks/bulk_stop', N_('Stop all stoppable tasks')
+      api :POST, '/tasks/bulk_stop', N_('Stop selected stoppable tasks')
+      desc <<~DOC
+        Stops all selected tasks which are not already stopped. Requires a
+        search query or an explicit list of task IDs to be provided.
+      DOC
       param :search, String, :desc => N_('Stop tasks matching search string')
       param :task_ids, Array, :desc => N_('Stop specific tasks by ID')
+      error :bad_request, 'Returned if neither search nor task_ids parameter is provided.'
       def bulk_stop
         if params[:search].nil? && params[:task_ids].nil?
           raise BadRequest, _('Please provide at least one of search or task_ids parameters in the request')

data/app/models/foreman_tasks/recurring_logic.rb

@@ -31,12 +31,12 @@ module ForemanTasks
         if value
           task.update!(:start_at => next_occurrence_time) if task.start_at < Time.zone.now
           update(:state => 'active')
-        else
-          update(:state => 'disabled')
         end
-      else
+      elsif value
         raise RecurringLogicCancelledException
       end
+
+      update(:state => 'disabled') unless value
     end
 
     def enabled?

data/app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb

@@ -11,7 +11,7 @@
       <td class="ellipsis"><%= link_to task.humanized[:action], defined?(main_app) ? main_app.foreman_tasks_task_path(task.id) : foreman_tasks_task_path(task.id) %></td>
       <td><%= task.state %></td>
       <td><%= task.result %></td>
-      <td><%= task.started_at ? (_(date_time_relative(task.started_at))) : _('N/A') %></td>
+      <td><%= task.started_at ? date_time_relative(task.started_at) : _('N/A') %></td>
     </tr>
   <% end %>
 </table>

data/app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb

@@ -11,7 +11,7 @@
       <td><%= result.state %></td>
       <td><%= result.result %></td>
       <td><%= link_to result.count, main_app.foreman_tasks_tasks_path(:search => "state=#{result.state}&result=#{result.result}") %></td>
-      <td><%= result.started_at ? (_(date_time_relative(result.started_at))) : _('N/A') %></td>
+      <td><%= result.started_at ? date_time_relative(result.started_at) : _('N/A') %></td>
     </tr>
   <% end %>
 </table>

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/test/unit/recurring_logic_test.rb

@@ -148,6 +148,12 @@ class RecurringLogicsTest < ActiveSupport::TestCase
         assert ForemanTasks.dynflow.world.persistence.load_delayed_plan(task.execution_plan.id).frozen
       end
 
+      it 'handles if the task has been deleted' do
+        logic.tasks.find_by(:state => 'scheduled').destroy
+        logic.update!(:enabled => false)
+        assert_equal 'disabled', logic.state
+      end
+
       it 'properly re-enables on disable' do
         logic.update!(:enabled => false)
         logic.update!(:enabled => true)

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/__snapshots__/actionNameCellFormatter.test.js.snap

@@ -4,6 +4,8 @@ exports[`actionNameCellFormatter render 1`] = `
 <a
   href="/some-url/some-id"
 >
-  action-name
+  <EllipisWithTooltip>
+    action-name
+  </EllipisWithTooltip>
 </a>
 `;

data/webpack/ForemanTasks/Components/TasksTable/formatters/actionNameCellFormatter.js

@@ -1,5 +1,10 @@
 import React from 'react';
 import { cellFormatter } from 'foremanReact/components/common/table';
+import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 
 export const actionNameCellFormatter = url => (value, { rowData: { id } }) =>
-  cellFormatter(<a href={`/${url}/${id}`}>{value}</a>);
+  cellFormatter(
+    <a href={`/${url}/${id}`}>
+      <EllipsisWithTooltip>{value}</EllipsisWithTooltip>
+    </a>
+  );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow