foreman-tasks 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 619dcecc5e332cffdf42333007062050274669c3f4e9c312e99ef7ea5c34bf4c
-  data.tar.gz: 9af4ff95aff9ceaefc7b0cf18cfa63aea31636771b76ad32b87b20e847ef0edf
+  metadata.gz: 95c9f8364b129d0fcaccad4e7f8673deb1ff18ab1d5e47b74f2c85fe366af7a3
+  data.tar.gz: c36bb9f6aedcab3dc1c590797c09b470dd3097c0295a00f9e61dd1b695a011dd
 SHA512:
-  metadata.gz: f9e7f4627493ff41d015766564442406357820b4f29a678eb47d26d41f540926c9ddd0050e569ca6e08a555c18b995a9e4c0daf8d32167619c1ce408689bc38e
-  data.tar.gz: 9a758f517b217ae729c3442aeb0d8808bad99b29cbe329e2ab833473a99152d24734109780cb195f8ed92f3db5bee3ec3ceac607f8e62ee7274d28a051371280
+  metadata.gz: 453f74187dd7bc334ff64dfc0544a317dd60b06e23c83057577a8f346f70281f2a8b71749d200f5edbb09c810f8ec241965a2a5311a7fb849d26166f14a391ae
+  data.tar.gz: 3a256485bd5f4c92a39cad572c8b402105c0fb5768c173390ea33e75fbfc590899e8c73f455c157f69d48328308e8c88da0a14038f07d659fd8cd46597943d21

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

@@ -0,0 +1,3 @@
+/*
+ *= require foreman_tasks/trigger_form.js
+ */

data/app/assets/stylesheets/foreman_tasks/{application.css.scss → foreman_tasks.css}

@@ -11,8 +11,3 @@
  *= require_self
  *= require_tree .
  */
-
-div.form-group div.trigger_fields {
-  margin-top: 15px;
-}
-

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

@@ -37,6 +37,8 @@ module ForemanTasks
         parent_task = resource_scope.find(params[:id])
         filtered_scope = parent_task.sub_tasks
         action_name = { "action_name" => parent_task.action }
+
+        filtered_scope = DashboardTableFilter.new(filtered_scope, params).scope
         render :json => action_name.merge(tasks_list(filtered_scope))
       end
 
@@ -253,6 +255,10 @@ module ForemanTasks
         task_hash
       end
 
+      def resource_class
+        @resource_class ||= ForemanTasks::Task
+      end
+
       def find_task
         @task = resource_scope.find(params[:id])
       end
@@ -261,10 +267,6 @@ module ForemanTasks
         @resource_scope ||= ForemanTasks::Task.authorized("#{action_permission}_foreman_tasks")
       end
 
-      def resource_class
-        @resource_class ||= ForemanTasks::Task
-      end
-
       def action_permission
         case params[:action]
         when 'bulk_search', 'summary', 'details', 'sub_tasks'

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -20,6 +20,11 @@ module ForemanTasks
       render json: Task::Summarizer.new(Task.where(:id => scope), params[:recent_timeframe].to_i).summary
     end
 
+    def summary_sub_tasks
+      filtered_scope = resource_base.find(params[:id]).sub_tasks
+      render :json => Task::Summarizer.new(filtered_scope, params[:recent_timeframe].to_i).summary
+    end
+
     def sub_tasks
       # @task is used when rendering breadcrumbs
       @task = resource_base.find(params[:id])
@@ -108,7 +113,7 @@ module ForemanTasks
 
     def action_permission
       case params[:action]
-      when 'sub_tasks', 'summary'
+      when 'sub_tasks', 'summary', 'summary_sub_tasks'
         :view
       when 'resume', 'unlock', 'force_unlock', 'cancel_step', 'cancel', 'abort'
         :edit

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

@@ -0,0 +1,14 @@
+module ForemanTasks
+  module Concerns
+    module UserExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        # rubocop:disable Rails/ReflectionClassName
+        has_many :tasks, :dependent => :nullify,
+                         :class_name => ::ForemanTasks::Task.name
+        # rubocop:enable Rails/ReflectionClassName
+      end
+    end
+  end
+end

data/app/views/common/_trigger_form.html.erb

@@ -1,8 +1,8 @@
 <div class="form-group ">
   <label class="col-md-2 control-label"><%= _('Schedule') %></label>
   <div class="col-md-6">
-    <% javascript 'foreman_tasks/trigger_form' %>
-    <% stylesheet 'foreman_tasks/trigger_form' %>
+    <% javascript 'foreman_tasks/foreman_tasks' %>
+    <% stylesheet 'foreman_tasks/foreman_tasks' %>
 
     <%= javascript_tag do %>
       $(function() { trigger_form_selector_binds('<%= f.options[:html][:id] %>','<%= f.object_name %>') });

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

@@ -1,4 +1,4 @@
-<% stylesheet 'foreman_tasks/tasks' %>
+<% stylesheet 'foreman_tasks/foreman_tasks' %>
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :'foreman-tasks' %>
 <% end %>

data/config/routes.rb

@@ -12,6 +12,7 @@ Foreman::Application.routes.draw do
       collection do
         get 'auto_complete_search'
         get '/summary/:recent_timeframe', action: 'summary'
+        get '/summary/:id/sub_tasks/:recent_timeframe', action: 'summary_sub_tasks'
       end
       member do
         post :abort
@@ -49,6 +50,7 @@ Foreman::Application.routes.draw do
           post :bulk_search
           post :bulk_resume
           get :summary
+          get '/summary/:id/sub_tasks/', action: 'summary_sub_tasks'
           post :callback
         end
       end

data/lib/foreman_tasks/engine.rb

@@ -14,15 +14,8 @@ module ForemanTasks
                                                                                                        end
     end
 
-    # Precompile any JS or CSS files under app/assets/
-    # If requiring files from each other, list them explicitly here to avoid precompiling the same
-    # content twice.
-    assets_to_precompile =
-      Dir.chdir(root) do
-        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last
-        end
-      end
+    assets_to_precompile = %w[foreman_tasks/foreman_tasks.css
+                              foreman_tasks/foreman_tasks.js]
 
     initializer 'foreman_tasks.assets.precompile' do |app|
       app.config.assets.precompile += assets_to_precompile
@@ -56,9 +49,9 @@ module ForemanTasks
              :last     => true
 
         security_block :foreman_tasks do |_map|
-          permission :view_foreman_tasks, { :'foreman_tasks/tasks' => [:auto_complete_search, :sub_tasks, :index, :summary, :show],
+          permission :view_foreman_tasks, { :'foreman_tasks/tasks' => [:auto_complete_search, :sub_tasks, :index, :summary, :summary_sub_tasks, :show],
                                             :'foreman_tasks/react' => [:index],
-                                            :'foreman_tasks/api/tasks' => [:bulk_search, :show, :index, :summary, :details, :sub_tasks] }, :resource_type => ForemanTasks::Task.name
+                                            :'foreman_tasks/api/tasks' => [:bulk_search, :show, :index, :summary, :summary_sub_tasks, :details, :sub_tasks] }, :resource_type => ForemanTasks::Task.name
           permission :edit_foreman_tasks, { :'foreman_tasks/tasks' => [:resume, :unlock, :force_unlock, :cancel_step, :cancel, :abort],
                                             :'foreman_tasks/api/tasks' => [:bulk_resume] }, :resource_type => ForemanTasks::Task.name
 
@@ -149,6 +142,7 @@ module ForemanTasks
       ForemanTasks.dynflow.eager_load_actions! if ForemanTasks.dynflow.initialized?
 
       Authorizer.send(:prepend, AuthorizerExt)
+      User.send(:include, ForemanTasks::Concerns::UserExtensions)
     end
 
     rake_tasks do

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.17.2'.freeze
+  VERSION = '0.17.3'.freeze
 end

data/test/unit/task_test.rb

@@ -95,6 +95,14 @@ class TasksTest < ActiveSupport::TestCase
     end
   end
 
+  describe 'users' do
+    test 'users can be deleted even if they have tasks assigned' do
+      user = FactoryBot.create(:user)
+      FactoryBot.create(:some_task, :user => user)
+      user.destroy!
+    end
+  end
+
   describe 'state_updated_at' do
     it 'updates the state_updated_at when the state changes' do
       task = FactoryBot.create(:some_task)

data/webpack/ForemanTasks/Components/TasksDashboard/TasksDashboard.js

@@ -14,7 +14,12 @@ import './TasksDashboard.scss';
 
 class TasksDashboard extends React.Component {
   componentDidMount() {
-    const { time, initializeDashboard, fetchTasksSummary } = this.props;
+    const {
+      time,
+      initializeDashboard,
+      fetchTasksSummary,
+      parentTaskID,
+    } = this.props;
     const query = getQueryFromUrl();
 
     initializeDashboard({
@@ -24,15 +29,15 @@ class TasksDashboard extends React.Component {
 
     // dont fetch if time is going to be changed
     if (!query.time || query.time === time) {
-      fetchTasksSummary(time);
+      fetchTasksSummary(time, parentTaskID);
     }
   }
 
   componentDidUpdate(prevProps) {
-    const { time, fetchTasksSummary } = this.props;
+    const { time, fetchTasksSummary, parentTaskID } = this.props;
 
     if (time !== prevProps.time) {
-      fetchTasksSummary(time);
+      fetchTasksSummary(time, parentTaskID);
     }
   }
 
@@ -65,6 +70,7 @@ TasksDashboard.propTypes = {
   updateQuery: PropTypes.func,
   fetchTasksSummary: PropTypes.func,
   history: PropTypes.object.isRequired,
+  parentTaskID: PropTypes.string,
 };
 
 TasksDashboard.defaultProps = {
@@ -75,6 +81,7 @@ TasksDashboard.defaultProps = {
   updateTime: noop,
   updateQuery: noop,
   fetchTasksSummary: noop,
+  parentTaskID: '',
 };
 
 export default TasksDashboard;

data/webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardActions.js

@@ -32,13 +32,15 @@ export const updateQuery = (query, history) => (dispatch, getState) => {
   });
 };
 
-export const fetchTasksSummary = time => async dispatch => {
+export const fetchTasksSummary = (time, parentTaskID) => async dispatch => {
   try {
     dispatch(startRequest());
 
     const hours = timeToHoursNumber(time);
-
-    const { data } = await API.get(`/foreman_tasks/tasks/summary/${hours}`);
+    const url = parentTaskID
+      ? `/foreman_tasks/tasks/summary/${parentTaskID}/sub_tasks/${hours}`
+      : `/foreman_tasks/tasks/summary/${hours}`;
+    const { data } = await API.get(url);
 
     return dispatch(requestSuccess(data));
   } catch (error) {

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/TaskDashboard.fixtures.js

@@ -0,0 +1,93 @@
+export const correctTime = 'H24';
+export const wrongTime = 'H25';
+export const parentTaskID = 7;
+export const taskSummary = {
+  tasksSummary: {
+    running: {
+      recent: 0,
+      total: 3,
+    },
+    paused: {
+      recent: 0,
+      total: 54,
+    },
+    stopped: {
+      recent: 0,
+      total: 768,
+      by_result: {
+        success: {
+          recent: 0,
+          total: 532,
+        },
+        error: {
+          recent: 0,
+          total: 121,
+        },
+        warning: {
+          recent: 0,
+          total: 10,
+        },
+        cancelled: {
+          recent: 0,
+          total: 105,
+        },
+      },
+    },
+    scheduled: {
+      recent: 0,
+      total: 7,
+    },
+  },
+};
+
+export const subtaskSummary = {
+  tasksSummary: {
+    running: {
+      recent: 0,
+      total: 3,
+    },
+    paused: {
+      recent: 0,
+      total: 7,
+    },
+    stopped: {
+      recent: 0,
+      total: 0,
+      by_result: {
+        success: {
+          recent: 0,
+          total: 0,
+        },
+        error: {
+          recent: 0,
+          total: 0,
+        },
+        warning: {
+          recent: 0,
+          total: 0,
+        },
+        cancelled: {
+          recent: 0,
+          total: 0,
+        },
+      },
+    },
+    scheduled: {
+      recent: 0,
+      total: 7,
+    },
+  },
+};
+
+export const apiGetMock = async path => {
+  if (path === `/foreman_tasks/tasks/summary/${correctTime}`) {
+    return { data: taskSummary };
+  } else if (
+    path ===
+    `/foreman_tasks/tasks/summary/${parentTaskID}/sub_tasks/${correctTime}`
+  ) {
+    return { data: subtaskSummary };
+  }
+
+  throw new Error('wrong time');
+};

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardActions.test.js

@@ -7,21 +7,18 @@ import {
   updateQuery,
   fetchTasksSummary,
 } from '../TasksDashboardActions';
+import {
+  correctTime,
+  wrongTime,
+  parentTaskID,
+  apiGetMock,
+} from './TaskDashboard.fixtures';
 
 jest.mock('foremanReact/API');
 jest.mock('../TasksDashboardHelper');
 
-const correctTime = 'H24';
-const wrongTime = 'H25';
-
 timeToHoursNumber.mockImplementation(arg => arg);
-API.get.mockImplementation(async path => {
-  if (path === `/foreman_tasks/tasks/summary/${correctTime}`) {
-    return { data: 'some-data' };
-  }
-
-  throw new Error('wrong time');
-});
+API.get.mockImplementation(apiGetMock);
 
 const fixtures = {
   'should initialize-dashboard': () =>
@@ -30,6 +27,8 @@ const fixtures = {
   'should update-query': () => updateQuery('some-query'),
   'should fetch-tasks-summary and success': () =>
     fetchTasksSummary(correctTime),
+  'should fetch-tasks-summary for subtasks and success': () =>
+    fetchTasksSummary(correctTime, parentTaskID),
   'should fetch-tasks-summary and fail': () => fetchTasksSummary(wrongTime),
 };
 

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/{TasksDashboardSelectors.test..js → TasksDashboardSelectors.test.js}

@@ -7,36 +7,38 @@ import {
 } from '../TasksDashboardSelectors';
 
 const state = {
-  tasksDashboard: {
-    time: 'some-time',
-    query: 'some-query',
-    tasksSummary: {
-      running: {
-        recent: 3,
-        total: 8,
-      },
-      paused: {
-        recent: 2,
-        total: 9,
-      },
-      stopped: {
-        by_result: {
-          error: {
-            total: 9,
-            recent: 1,
-          },
-          warning: {
-            total: 8,
-            recent: 2,
-          },
-          success: {
-            total: 7,
-            recent: 3,
+  foremanTasks: {
+    tasksDashboard: {
+      time: 'some-time',
+      query: 'some-query',
+      tasksSummary: {
+        running: {
+          recent: 3,
+          total: 8,
+        },
+        paused: {
+          recent: 2,
+          total: 9,
+        },
+        stopped: {
+          by_result: {
+            error: {
+              total: 9,
+              recent: 1,
+            },
+            warning: {
+              total: 8,
+              recent: 2,
+            },
+            success: {
+              total: 7,
+              recent: 3,
+            },
           },
         },
-      },
-      scheduled: {
-        total: 6,
+        scheduled: {
+          total: 6,
+        },
       },
     },
   },

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap

@@ -25,7 +25,97 @@ Array [
   ],
   Array [
     Object {
-      "payload": "some-data",
+      "payload": Object {
+        "tasksSummary": Object {
+          "paused": Object {
+            "recent": 0,
+            "total": 54,
+          },
+          "running": Object {
+            "recent": 0,
+            "total": 3,
+          },
+          "scheduled": Object {
+            "recent": 0,
+            "total": 7,
+          },
+          "stopped": Object {
+            "by_result": Object {
+              "cancelled": Object {
+                "recent": 0,
+                "total": 105,
+              },
+              "error": Object {
+                "recent": 0,
+                "total": 121,
+              },
+              "success": Object {
+                "recent": 0,
+                "total": 532,
+              },
+              "warning": Object {
+                "recent": 0,
+                "total": 10,
+              },
+            },
+            "recent": 0,
+            "total": 768,
+          },
+        },
+      },
+      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
+    },
+  ],
+]
+`;
+
+exports[`TasksDashboard - Actions should fetch-tasks-summary for subtasks and success 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "tasksSummary": Object {
+          "paused": Object {
+            "recent": 0,
+            "total": 7,
+          },
+          "running": Object {
+            "recent": 0,
+            "total": 3,
+          },
+          "scheduled": Object {
+            "recent": 0,
+            "total": 7,
+          },
+          "stopped": Object {
+            "by_result": Object {
+              "cancelled": Object {
+                "recent": 0,
+                "total": 0,
+              },
+              "error": Object {
+                "recent": 0,
+                "total": 0,
+              },
+              "success": Object {
+                "recent": 0,
+                "total": 0,
+              },
+              "warning": Object {
+                "recent": 0,
+                "total": 0,
+              },
+            },
+            "recent": 0,
+            "total": 0,
+          },
+        },
+      },
       "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
     },
   ],

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap

@@ -0,0 +1,103 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TasksDashboard - Selectors should select query 1`] = `"some-query"`;
+
+exports[`TasksDashboard - Selectors should select query when state is empty 1`] = `Object {}`;
+
+exports[`TasksDashboard - Selectors should select tasks-dashboard 1`] = `
+Object {
+  "query": "some-query",
+  "tasksSummary": Object {
+    "paused": Object {
+      "recent": 2,
+      "total": 9,
+    },
+    "running": Object {
+      "recent": 3,
+      "total": 8,
+    },
+    "scheduled": Object {
+      "total": 6,
+    },
+    "stopped": Object {
+      "by_result": Object {
+        "error": Object {
+          "recent": 1,
+          "total": 9,
+        },
+        "success": Object {
+          "recent": 3,
+          "total": 7,
+        },
+        "warning": Object {
+          "recent": 2,
+          "total": 8,
+        },
+      },
+    },
+  },
+  "time": "some-time",
+}
+`;
+
+exports[`TasksDashboard - Selectors should select tasks-dashboard when state is empty 1`] = `Object {}`;
+
+exports[`TasksDashboard - Selectors should select tasks-summary 1`] = `
+Object {
+  "paused": Object {
+    "last": 2,
+    "older": 7,
+  },
+  "running": Object {
+    "last": 3,
+    "older": 5,
+  },
+  "scheduled": 6,
+  "stopped": Object {
+    "error": Object {
+      "last": 1,
+      "total": 9,
+    },
+    "success": Object {
+      "last": 3,
+      "total": 7,
+    },
+    "warning": Object {
+      "last": 2,
+      "total": 8,
+    },
+  },
+}
+`;
+
+exports[`TasksDashboard - Selectors should select tasks-summary when state is empty 1`] = `
+Object {
+  "paused": Object {
+    "last": 0,
+    "older": 0,
+  },
+  "running": Object {
+    "last": 0,
+    "older": 0,
+  },
+  "scheduled": 0,
+  "stopped": Object {
+    "error": Object {
+      "last": 0,
+      "total": 0,
+    },
+    "success": Object {
+      "last": 0,
+      "total": 0,
+    },
+    "warning": Object {
+      "last": 0,
+      "total": 0,
+    },
+  },
+}
+`;
+
+exports[`TasksDashboard - Selectors should select time 1`] = `"some-time"`;
+
+exports[`TasksDashboard - Selectors should select time when state is empty 1`] = `"H24"`;

data/webpack/ForemanTasks/Components/TasksTable/SubTasksPage.js

@@ -4,17 +4,24 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import TasksTablePage from './';
 
 export const SubTasksPage = props => {
+  const parentTaskID = props.match.params.id;
   const getBreadcrumbs = actionName => ({
     breadcrumbItems: [
       { caption: __('Tasks'), url: `/foreman_tasks/tasks` },
       {
         caption: actionName,
-        url: `/foreman_tasks/tasks/${props.match.params.id}`,
+        url: `/foreman_tasks/tasks/${parentTaskID}`,
       },
       { caption: __('Sub tasks') },
     ],
   });
-  return <TasksTablePage getBreadcrumbs={getBreadcrumbs} {...props} />;
+  return (
+    <TasksTablePage
+      getBreadcrumbs={getBreadcrumbs}
+      parentTaskID={parentTaskID}
+      {...props}
+    />
+  );
 };
 
 SubTasksPage.propTypes = {

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

@@ -24,6 +24,7 @@ const TasksTable = ({
   unselectAllRows,
   selectRow,
   unselectRow,
+  parentTaskID,
 }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
@@ -82,10 +83,10 @@ const TasksTable = ({
 
   const taskActions = {
     cancel: (id, name) => {
-      cancelTask(id, name, url);
+      cancelTask(id, name, url, parentTaskID);
     },
     resume: (id, name) => {
-      resumeTask(id, name, url);
+      resumeTask(id, name, url, parentTaskID);
     },
   };
 
@@ -132,6 +133,7 @@ TasksTable.propTypes = {
   unselectAllRows: PropTypes.func.isRequired,
   selectRow: PropTypes.func.isRequired,
   unselectRow: PropTypes.func.isRequired,
+  parentTaskID: PropTypes.string,
 };
 
 TasksTable.defaultProps = {
@@ -142,6 +144,7 @@ TasksTable.defaultProps = {
     perPage: 20,
   },
   selectedRows: [],
+  parentTaskID: null,
 };
 
 export default TasksTable;

data/webpack/ForemanTasks/Components/TasksTable/TasksTableActions.js

@@ -19,10 +19,10 @@ import { fetchTasksSummary } from '../TasksDashboard/TasksDashboardActions';
 export const getTableItems = url =>
   getTableItemsAction(TASKS_TABLE_ID, getURIQuery(url), getApiPathname(url));
 
-export const cancelTask = (id, name, url) => async dispatch => {
+export const cancelTask = (id, name, url, parentTaskID) => async dispatch => {
   await dispatch(cancelTaskRequest(id, name));
   dispatch(getTableItems(url));
-  dispatch(fetchTasksSummary(getURIQuery(url).time));
+  dispatch(fetchTasksSummary(getURIQuery(url).time, parentTaskID));
 };
 
 export const cancelTaskRequest = (id, name) => async dispatch => {
@@ -50,10 +50,10 @@ export const cancelTaskRequest = (id, name) => async dispatch => {
   }
 };
 
-export const resumeTask = (id, name, url) => async dispatch => {
+export const resumeTask = (id, name, url, parentTaskID) => async dispatch => {
   await dispatch(resumeTaskRequest(id, name));
   dispatch(getTableItems(url));
-  dispatch(fetchTasksSummary(getURIQuery(url).time));
+  dispatch(fetchTasksSummary(getURIQuery(url).time), parentTaskID);
 };
 
 export const resumeTaskRequest = (id, name) => async dispatch => {

data/webpack/ForemanTasks/Components/TasksTable/TasksTablePage.js

@@ -74,7 +74,9 @@ const TasksTablePage = ({ getBreadcrumbs, history, ...props }) => {
           </React.Fragment>
         }
         searchQuery={getURIsearch()}
-        beforeToolbarComponent={<TasksDashboard history={history} />}
+        beforeToolbarComponent={
+          <TasksDashboard history={history} parentTaskID={props.parentTaskID} />
+        }
       >
         <TasksTable history={history} {...props} />
       </PageLayout>
@@ -87,7 +89,6 @@ TasksTablePage.propTypes = {
   getTableItems: PropTypes.func.isRequired,
   getBreadcrumbs: PropTypes.func.isRequired,
   actionName: PropTypes.string,
-  isSubTask: PropTypes.bool,
   status: PropTypes.oneOf(Object.keys(STATUS)),
   history: PropTypes.object.isRequired,
   actionSelected: PropTypes.func.isRequired,
@@ -96,14 +97,15 @@ TasksTablePage.propTypes = {
   showCancelSelcetedModal: PropTypes.func.isRequired,
   hideSelcetedModal: PropTypes.func.isRequired,
   modalStatus: PropTypes.oneOf([CANCEL, RESUME, CLOSED]),
+  parentTaskID: PropTypes.string,
 };
 
 TasksTablePage.defaultProps = {
   actionName: '',
-  isSubTask: false,
   status: STATUS.PENDING,
   selectedRows: [],
   modalStatus: CLOSED,
+  parentTaskID: null,
 };
 
 export default TasksTablePage;

data/webpack/ForemanTasks/Components/TasksTable/TasksTableSelectors.js

@@ -32,6 +32,7 @@ export const selectResults = state => {
   if (!results) return [];
   return results.map(result => ({
     ...result,
+    action: result.action || result.label.replace(/::/g, ' '),
     username: result.username || '',
     state: result.state + (result.frozen ? ` ${__('Disabled')}` : ''),
     duration: getDuration(result.started_at, result.ended_at),

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/SubTasksPage.test.js.snap

@@ -28,6 +28,7 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
       "perPage": 10,
     }
   }
+  parentTaskID="some-id"
   results={
     Array [
       "a",

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTableActions.test.js.snap

@@ -138,6 +138,7 @@ Array [
   ],
   Array [
     [Function],
+    undefined,
   ],
 ]
 `;

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTablePage.test.js.snap

@@ -21,6 +21,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
             },
           }
         }
+        parentTaskID={null}
       />
     }
     breadcrumbOptions={
@@ -88,7 +89,6 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           },
         }
       }
-      isSubTask={false}
       itemCount={2}
       modalStatus="CLOSED"
       pagination={
@@ -97,6 +97,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "perPage": 10,
         }
       }
+      parentTaskID={null}
       results={
         Array [
           "a",
@@ -144,6 +145,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
             },
           }
         }
+        parentTaskID={null}
       />
     }
     onSearch={[Function]}
@@ -194,7 +196,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           },
         }
       }
-      isSubTask={false}
       itemCount={2}
       modalStatus="CLOSED"
       pagination={
@@ -203,6 +204,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "perPage": 10,
         }
       }
+      parentTaskID={null}
       results={
         Array [
           "a",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -123,9 +123,10 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- app/assets/javascripts/foreman_tasks/foreman_tasks.js
 - app/assets/javascripts/foreman_tasks/trigger_form.js
-- app/assets/stylesheets/foreman_tasks/application.css.scss
-- app/assets/stylesheets/foreman_tasks/tasks.css.scss
+- app/assets/stylesheets/foreman_tasks/foreman_tasks.css
+- app/assets/stylesheets/foreman_tasks/tasks.scss
 - app/assets/stylesheets/foreman_tasks/trigger_form.css
 - app/controllers/foreman_tasks/api/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/api/tasks_controller.rb
@@ -166,6 +167,7 @@ files:
 - app/models/foreman_tasks/concerns/action_subject.rb
 - app/models/foreman_tasks/concerns/action_triggering.rb
 - app/models/foreman_tasks/concerns/host_action_subject.rb
+- app/models/foreman_tasks/concerns/user_extensions.rb
 - app/models/foreman_tasks/lock.rb
 - app/models/foreman_tasks/recurring_logic.rb
 - app/models/foreman_tasks/recurring_logic_cancelled_exception.rb
@@ -406,14 +408,16 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardPropTypes.js
 - webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardReducer.js
 - webpack/ForemanTasks/Components/TasksDashboard/TasksDashboardSelectors.js
+- webpack/ForemanTasks/Components/TasksDashboard/__tests__/TaskDashboard.fixtures.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboard.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardActions.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardHelper.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardReducer.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test..js
+- webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboard.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardReducer.test.js.snap
+- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionConfirmation.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionSelectButton.js