foreman-tasks 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e04f597cdb4a8e79251fa3ccb6a9d975f1b2c180406dbaf269430a9f21e5c62
-  data.tar.gz: 639f76c6744729b1b8622534a255d6ffc38404cdac75b02b73667076574eb998
+  metadata.gz: e81942c1beade63bde5e4efc461d3c9b607c90782efdd05c247942cab3b81a99
+  data.tar.gz: 2ca06d362cfe353dc4df8959907b48de6da7e741a409e4ea9cf039ee5664d11b
 SHA512:
-  metadata.gz: 3c45cb1e7ba0ab92d308bbc4fb7e5bc32063ab78c66dc7f6c4e136d6dc5aecbbc83c095e43280796afff44f407f1abbe8ac9ab2e73087aa2df0a1f09e63a44bc
-  data.tar.gz: 85327d35ba3de74c3ce82b86907530e330d22d9db343005114b0d4c646f598c3913cc9bdfae9d3092a023366c302e2225f53e7ff2a1f537433902c0fc10d317e
+  metadata.gz: 3441d249f033e4e83de8649d041c19d2a0012006f5a37d364ccfaa341000b86c5ba638b89a5a3f54c0452f6d2a84e2da0b59cd7e0065372081da44b84774a64c
+  data.tar.gz: aeb244156e659b82173c111d7e7764eb7ba9df41bbdc5f6980565aa0d86658a19d97fcf357b204bf8ba99878d466e977a18f153dfafffb760d315034d68a7bb3

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -12,16 +12,7 @@ module ForemanTasks
 
     def index
       params[:order] ||= 'started_at DESC'
-      respond_to do |format|
-        format.html do
-          @tasks = filter(resource_base)
-          render :index, layout: !request.xhr?
-        end
-        format.csv do
-          @tasks = filter(resource_base, 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'])
-        end
-      end
+      respond_with_tasks resource_base
     end
 
     def summary
@@ -29,9 +20,9 @@ module ForemanTasks
     end
 
     def sub_tasks
-      task   = resource_base.find(params[:id])
-      @tasks = filter(task.sub_tasks)
-      render :index
+      # @task is used when rendering breadcrumbs
+      @task = resource_base.find(params[:id])
+      respond_with_tasks @task.sub_tasks
     end
 
     def cancel_step
@@ -103,6 +94,19 @@ module ForemanTasks
 
     private
 
+    def respond_with_tasks(scope)
+      respond_to do |format|
+        format.html do
+          @tasks = filter(scope)
+          render :index, layout: !request.xhr?
+        end
+        format.csv do
+          @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'])
+        end
+      end
+    end
+
     def restrict_dangerous_actions
       render_403 unless Setting['dynflow_allow_dangerous_actions']
     end

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -122,6 +122,26 @@ module ForemanTasks
       render :partial => 'common/trigger_form', :locals => { :f => f, :triggering => triggering }
     end
 
+    def task_breadcrumb_item(task, active = false)
+      item = { :caption => format_task_input(task) }
+      item[:url] = url_for(foreman_tasks_task_path(task.id)) unless active
+      item
+    end
+
+    def index_breadcrumb_item
+      item = { :caption => _('Tasks') }
+      item[:url] = foreman_tasks_tasks_url if action_name != 'index'
+      item
+    end
+
+    def breadcrumb_items
+      items = [index_breadcrumb_item]
+      return items if action_name == 'index'
+      items << task_breadcrumb_item(@task, action_name == 'show')
+      items << { :caption => _('Sub tasks') } if action_name == 'sub_tasks'
+      items
+    end
+
     private
 
     def future_mode_fieldset(f, triggering)

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

@@ -10,6 +10,9 @@
       yo: 'ya'
   }.to_json) %>
 <% end %>
+<% content_for(:breadcrumbs) do %>
+  <% breadcrumbs(:items => breadcrumb_items) %>
+<% end %>
 
 <% title _("Tasks") %>
 <% title_actions csv_link, help_button %>

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

@@ -1,15 +1,7 @@
 <% stylesheet 'foreman_tasks/tasks' %>
 
 <%= breadcrumbs(
-  items: [
-    {
-      caption: _('Tasks'),
-      url: url_for(foreman_tasks_tasks_path)
-    },
-    {
-      caption: format_task_input(@task)
-    }
-  ],
+  items: breadcrumb_items,
   name_field: 'action',
   resource_url: foreman_tasks_api_tasks_path,
   switcher_item_url: foreman_tasks_task_path(:id => ':id')

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -244,6 +244,7 @@ namespace :foreman_tasks do
 
     tasks = ForemanTasks::Task.search_for(filter)
 
+    puts _("Exporting all tasks matching filter #{filter}")
     puts _("Gathering #{tasks.count} tasks.")
     if format == 'html'
       Dir.mktmpdir('task-export') do |tmp_dir|
@@ -255,7 +256,6 @@ namespace :foreman_tasks do
         tasks.each_with_index do |task, count|
           File.open(File.join(tmp_dir, "#{task.id}.html"), 'w') { |file| file.write(PageHelper.pagify(renderer.render_task(task))) }
           puts "#{count + 1}/#{total}"
-          count += 1
         end
 
         File.open(File.join(tmp_dir, 'index.html'), 'w') { |file| file.write(PageHelper.pagify(PageHelper.generate_index(tasks))) }

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.15.7'.freeze
+  VERSION = '0.15.8'.freeze
 end

data/test/controllers/tasks_controller_test.rb

@@ -67,6 +67,17 @@ module ForemanTasks
                           session: set_session_user(User.current)
           assert_response :not_found
         end
+
+        it 'supports csv export' do
+          parent = FactoryBot.create(:some_task, :action => 'Some action')
+          child = FactoryBot.create(:some_task, :action => 'Child action')
+          child.parent_task_id = parent.id
+          child.save!
+          get(:sub_tasks, params: { id: parent.id, format: :csv }, session: set_session_user)
+          assert_response :success
+          assert_equal 2, response.body.lines.size
+          assert_include response.body.lines[1], 'Child action'
+        end
       end
 
       describe 'taxonomy scoping' do

data/test/helpers/foreman_tasks/foreman_tasks_helper_test.rb

@@ -0,0 +1,39 @@
+require 'foreman_tasks_test_helper'
+
+module ForemanTasks
+  class ForemanTasksHelperTest < ActionView::TestCase
+    describe 'breadcrumb items' do
+      before do
+        self.class.send(:include, ForemanTasks::TasksHelper)
+      end
+
+      it 'prepares items for index correctly' do
+        stubs(:action_name).returns('index')
+        items = breadcrumb_items
+        items.count.must_equal 1
+        items.first[:caption].must_equal 'Tasks'
+        items.first[:url].must_be_nil
+      end
+
+      it 'prepares items for show correctly' do
+        @task = FactoryBot.build(:dynflow_task, :user_create_task)
+        @task.action = 'A task'
+        stubs(:action_name).returns('show')
+        items = breadcrumb_items
+        items.map { |i| i[:caption] }.must_equal ['Tasks', 'A task']
+        items.last[:url].must_be_nil
+      end
+
+      it 'prepares items for sub tasks correctly' do
+        @task = FactoryBot.build(:dynflow_task, :user_create_task)
+        child = FactoryBot.build(:dynflow_task, :user_create_task)
+        @task.sub_tasks = [child]
+        @task.action = 'A task'
+        stubs(:action_name).returns('sub_tasks')
+        items = breadcrumb_items
+        items.map { |i| i[:caption] }.must_equal ['Tasks', 'A task', 'Sub tasks']
+        items.last[:url].must_be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -279,6 +279,7 @@ files:
 - test/factories/triggering_factory.rb
 - test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb
@@ -429,8 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
@@ -447,6 +447,7 @@ test_files:
 - test/factories/triggering_factory.rb
 - test/foreman_tasks_core_test_helper.rb
 - test/foreman_tasks_test_helper.rb
+- test/helpers/foreman_tasks/foreman_tasks_helper_test.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
 - test/lib/actions/middleware/keep_current_request_id_test.rb
 - test/lib/actions/middleware/keep_current_taxonomies_test.rb