foreman-tasks 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1026fe8670d8a41977697a9ff2bd4f04758dca2f18a9bac806dea4856cb4478
-  data.tar.gz: 8ec9ddbfb5a444a525cc27d178ade81c30e5c7c8b4fe0e577aba7d780ed3b37d
+  metadata.gz: 62a10715bd5b194c1cb750c2f100b60a2f3bca155e0df6d303b284cf157a87d9
+  data.tar.gz: fd24e269912731dd0e2cee07e99e694dbf98547cab3a3d3dd89963f87d2dc3b9
 SHA512:
-  metadata.gz: 044b43805dcfd80a9607154d0a8be54b54b8b054923727d79f699dec5a4f355fe84d1533f5049ecc47d65efd3313447a070cc9bd01bea47bbd639f800847375e
-  data.tar.gz: edd5a4f741c2e55eb7d695011e8dc7a017214e0a5b43027035352095ad8132d8ea93a75c5991a97c5ffa05645f970f6d878a5d33ba6f6c75ed7ece1b16af4237
+  metadata.gz: 011ae333df38537c17b1593a06f41828aa600e45d653c4231644b7d86e0a0ea92016de9d36abb067c432eb4e04466bec72e9ceb9f6ad87be3142b9896d7f18e4
+  data.tar.gz: 0c06ac795bc95787682262e42e8330b5b1e10d0923bc68581ba19623be01cac63ab6bab70d67a168a51c61b2f34f383f19c95276eee9fd564fb7a8c32edec16f

data/.travis.yml

@@ -1,4 +1,6 @@
 language: node_js
+cache:
+  npm: false
 node_js:
   - '10'
   - '12'

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

@@ -315,6 +315,10 @@ module ForemanTasks
         @resource_scope ||= ForemanTasks::Task.authorized("#{action_permission}_foreman_tasks")
       end
 
+      def controller_permission
+        'foreman_tasks'
+      end
+
       def action_permission
         case params[:action]
         when 'bulk_search', 'summary', 'details', 'sub_tasks'

data/app/lib/actions/proxy_action.rb

@@ -257,7 +257,7 @@ module Actions
       if failed_proxy_tasks.count < options[:retry_count]
         suspend do |suspended_action|
           @world.clock.ping suspended_action,
-                            Time.zone.now + options[:retry_interval],
+                            Time.now.getlocal + options[:retry_interval],
                             event
         end
       else

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -46,7 +46,8 @@ module ForemanTasks
     end
 
     def progress
-      execution_plan.try(:progress) || 0
+      progress_raw = execution_plan.try(:progress) || 0
+      progress_raw.round(2)
     end
 
     def execution_plan(silence_exception = true)

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

@@ -1,5 +1,7 @@
 object @task if @task
 
+extends 'api/v2/layouts/permissions'
+
 attributes :id, :label, :pending, :action
 attributes :username, :started_at, :ended_at, :state, :result, :progress
 attributes :input, :output, :humanized, :cli_example, :start_at

data/db/migrate/20200611090846_add_task_lock_index_on_resource_type_and_task_id.rb

@@ -2,8 +2,8 @@ class AddTaskLockIndexOnResourceTypeAndTaskId < ActiveRecord::Migration[6.0]
   def change
     add_index :foreman_tasks_locks, [:task_id, :resource_type, :resource_id], name: 'index_tasks_locks_on_task_id_resource_type_and_resource_id'
     # These indexes are not needed as they can be gained from partial index lookups
-    remove_index :foreman_tasks_locks, :task_id
-    remove_index :foreman_tasks_locks, :name
-    remove_index :foreman_tasks_locks, :resource_type
+    [:task_id, :name, :resource_type].each do |index|
+      remove_index :foreman_tasks_locks, index if index_exists?(:foreman_tasks_locks, index)
+    end
   end
 end

data/lib/foreman_tasks/tasks/cleanup.rake

@@ -14,7 +14,7 @@ namespace :foreman_tasks do
       If TASK_SEARCH is set then AFTER, STATES can be set and it's used for cleanup. If TASK_SEARCH is not set then
       the cleanup respects the configuration file and setting AFTER or STATES will throw exception.
     DESC
-    task :run => 'environment' do
+    task :run => ['environment', 'dynflow:client'] do
       options = {}
 
       options[:filter] = ENV['TASK_SEARCH'] if ENV['TASK_SEARCH']
@@ -38,7 +38,7 @@ namespace :foreman_tasks do
     end
 
     desc 'Show the current configuration for auto-cleanup'
-    task :config => 'environment' do
+    task :config => ['environment', 'dynflow:client'] do
       if ForemanTasks::Cleaner.cleanup_settings[:after]
         puts _('The tasks will be deleted after %{after}') % { :after => ForemanTasks::Cleaner.cleanup_settings[:after] }
       else

data/lib/foreman_tasks/tasks/dynflow.rake

@@ -0,0 +1,6 @@
+namespace :dynflow do
+  task :client do
+    ::ForemanTasks.dynflow.config.remote = true
+    ::ForemanTasks.dynflow.initialize!
+  end
+end

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -19,7 +19,7 @@ namespace :foreman_tasks do
     all unsuccessful tasks in the past 60 days. The default TASK_FORMAT is html
     which requires a tar.gz file extension.
   DESC
-  task :export_tasks => :environment do
+  task :export_tasks => [:environment, 'dynflow:client'] do
     deprecated_options = { :tasks => 'TASK_SEARCH',
                            :days => 'TASK_DAYS',
                            :export => 'TASK_FILE' }

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/package.json

@@ -4,6 +4,7 @@
   "description": "Foreman Tasks =============",
   "main": "index.js",
   "scripts": {
+    "foreman-js:link": "./script/npm_link_foreman_js.sh",
     "lint": "tfm-lint --plugin -d /webpack",
     "test": "tfm-test --plugin",
     "test:watch": "tfm-test --plugin --watchAll",

data/script/npm_link_foreman_js.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# This script replace the npm installation of `foreman-js`
+# with your local version. Usefull when developing `foreman-js`
+# Read more about foreman-js: https://github.com/theforeman/foreman-js
+#
+# This script designed to run using `npm run foreman-js:link` in foreman root
+
+set -e
+
+if [[ -z "${FOREMAN_JS_LOCATION}" ]]; then # FOREMAN_JS_LOCATION is empty
+  FOREMAN_JS_LOCATION="../foreman-js"
+  echo "FOREMAN_JS_LOCATION is not defined, using \"${FOREMAN_JS_LOCATION}\" instead"
+elif [ ! -d "${FOREMAN_JS_LOCATION}" ]; then
+  echo "Can't find folder ${FOREMAN_JS_LOCATION}"
+  exit 1
+fi
+
+FOREMAN_JS_LOCATION="../${FOREMAN_JS_LOCATION}"
+FOREMAN_JS_PACKAGES_LOCATION="${FOREMAN_JS_LOCATION}/packages"
+FOREMAN_JS_INSTALL_LOCATION="./node_modules/@theforeman"
+
+set -x
+
+rm -rf $FOREMAN_JS_INSTALL_LOCATION
+ln -s $FOREMAN_JS_PACKAGES_LOCATION $FOREMAN_JS_INSTALL_LOCATION

data/webpack/ForemanTasks/Components/TaskDetails/Components/Task.js

@@ -34,6 +34,7 @@ const Task = props => {
     action,
     dynflowEnableConsole,
     taskProgressToggle,
+    canEdit,
   } = props;
   const forceUnlock = () => {
     if (!taskReload) {
@@ -47,6 +48,12 @@ const Task = props => {
     }
     unlockTaskRequest(id, action);
   };
+  const editActionsTitle = canEdit
+    ? undefined
+    : __('You do not have permission');
+  const dynflowTitle = dynflowEnableConsole
+    ? undefined
+    : `dynflow_enable_console ${__('Setting is off')}`;
   return (
     <React.Fragment>
       <UnlockModal onClick={unlock} />
@@ -74,12 +81,16 @@ const Task = props => {
               rel="noopener noreferrer"
               target="_blank"
             >
-              {__('Dynflow console')}
+              <span title={dynflowTitle} data-original-title={dynflowTitle}>
+                {__('Dynflow console')}
+              </span>
             </Button>
             <Button
               className="resume-button"
               bsSize="small"
-              disabled={!resumable}
+              title={editActionsTitle}
+              data-original-title={editActionsTitle}
+              disabled={!canEdit || !resumable}
               onClick={() => {
                 if (!taskReload) {
                   taskProgressToggle();
@@ -92,7 +103,9 @@ const Task = props => {
             <Button
               className="cancel-button"
               bsSize="small"
-              disabled={!cancellable}
+              title={editActionsTitle}
+              data-original-title={editActionsTitle}
+              disabled={!canEdit || !cancellable}
               onClick={() => {
                 if (!taskReload) {
                   taskProgressToggle();
@@ -123,16 +136,20 @@ const Task = props => {
             <Button
               className="unlock-button"
               bsSize="small"
-              disabled={state !== 'paused'}
+              disabled={!canEdit || state !== 'paused'}
               onClick={unlockModalActions.setModalOpen}
+              title={editActionsTitle}
+              data-original-title={editActionsTitle}
             >
               {__('Unlock')}
             </Button>
             <Button
               className="force-unlock-button"
               bsSize="small"
-              disabled={state === 'stopped'}
+              disabled={!canEdit || state === 'stopped'}
               onClick={forceUnlockModalActions.setModalOpen}
+              title={editActionsTitle}
+              data-original-title={editActionsTitle}
             >
               {__('Force Unlock')}
             </Button>
@@ -160,6 +177,7 @@ Task.propTypes = {
   cancelTaskRequest: PropTypes.func,
   resumeTaskRequest: PropTypes.func,
   dynflowEnableConsole: PropTypes.bool,
+  canEdit: PropTypes.bool,
 };
 
 Task.defaultProps = {
@@ -177,6 +195,7 @@ Task.defaultProps = {
   cancelTaskRequest: () => null,
   resumeTaskRequest: () => null,
   dynflowEnableConsole: false,
+  canEdit: false,
 };
 
 export default Task;

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Task.test.js

@@ -20,6 +20,7 @@ const fixtures = {
     dynflowEnableConsole: true,
     parentTask: 'parent-id',
     taskReload: true,
+    canEdit: true,
   },
 };
 

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap

@@ -51,7 +51,9 @@ exports[`Task rendering render with some Props 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          Dynflow console
+          <span>
+            Dynflow console
+          </span>
         </Button>
         <Button
           active={false}
@@ -129,6 +131,7 @@ exports[`Task rendering render with some Props 1`] = `
     </Row>
     <TaskInfo
       action=""
+      canEdit={true}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={true}
@@ -210,7 +213,12 @@ exports[`Task rendering render without Props 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          Dynflow console
+          <span
+            data-original-title="dynflow_enable_console Setting is off"
+            title="dynflow_enable_console Setting is off"
+          >
+            Dynflow console
+          </span>
         </Button>
         <Button
           active={false}
@@ -219,8 +227,10 @@ exports[`Task rendering render without Props 1`] = `
           bsSize="small"
           bsStyle="default"
           className="resume-button"
+          data-original-title="You do not have permission"
           disabled={true}
           onClick={[Function]}
+          title="You do not have permission"
         >
           Resume
         </Button>
@@ -231,8 +241,10 @@ exports[`Task rendering render without Props 1`] = `
           bsSize="small"
           bsStyle="default"
           className="cancel-button"
+          data-original-title="You do not have permission"
           disabled={true}
           onClick={[Function]}
+          title="You do not have permission"
         >
           Cancel
         </Button>
@@ -243,8 +255,10 @@ exports[`Task rendering render without Props 1`] = `
           bsSize="small"
           bsStyle="default"
           className="unlock-button"
+          data-original-title="You do not have permission"
           disabled={true}
           onClick={[MockFunction]}
+          title="You do not have permission"
         >
           Unlock
         </Button>
@@ -255,8 +269,10 @@ exports[`Task rendering render without Props 1`] = `
           bsSize="small"
           bsStyle="default"
           className="force-unlock-button"
-          disabled={false}
+          data-original-title="You do not have permission"
+          disabled={true}
           onClick={[MockFunction]}
+          title="You do not have permission"
         >
           Force Unlock
         </Button>
@@ -264,6 +280,7 @@ exports[`Task rendering render without Props 1`] = `
     </Row>
     <TaskInfo
       action=""
+      canEdit={false}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={false}

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss

@@ -10,20 +10,6 @@
   .container {
     margin: 0;
   }
-  /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
-
   .spin {
     -webkit-animation: spin 1s infinite linear;
     -moz-animation: spin 1s infinite linear;
@@ -60,4 +46,7 @@
       transform: rotate(360deg);
     }
   }
+  .dynflow-button > span {
+    pointer-events: auto;
+  }
 }

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js

@@ -56,7 +56,9 @@ export const refetchTaskDetails = (id, loading) => dispatch => {
 
 const reloadTasksDetails = async (id, dispatch) => {
   try {
-    const { data } = await API.get(`/foreman_tasks/api/tasks/${id}/details`);
+    const { data } = await API.get(
+      `/foreman_tasks/api/tasks/${id}/details?include_permissions`
+    );
     dispatch(requestSuccess(data));
   } catch (error) {
     dispatch(requestFailure(error));
@@ -83,7 +85,9 @@ const getTasksDetails = async (
   refetchTaskDetailsAction
 ) => {
   try {
-    const { data } = await API.get(`/foreman_tasks/api/tasks/${id}/details`);
+    const { data } = await API.get(
+      `/foreman_tasks/api/tasks/${id}/details?include_permissions`
+    );
     dispatch(requestSuccess(data));
     if (data.state !== 'stopped') {
       dispatch(taskReloadStart(timeoutId, refetchTaskDetailsAction, id));

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -30,7 +30,7 @@ export const selectErrors = state => {
 
 export const selectProgress = state =>
   selectTaskDetails(state).progress
-    ? parseFloat((selectTaskDetails(state).progress * 100).toFixed(2))
+    ? Math.trunc(selectTaskDetails(state).progress * 100)
     : 0;
 
 export const selectUsername = state =>
@@ -77,3 +77,6 @@ export const selectExternalId = state =>
 
 export const selectDynflowEnableConsole = state =>
   selectTaskDetails(state).dynflow_enable_console || false;
+
+export const selectCanEdit = state =>
+  selectTaskDetails(state).can_edit || false;

data/webpack/ForemanTasks/Components/TaskDetails/__tests__/__snapshots__/TaskDetails.test.js.snap

@@ -15,6 +15,7 @@ exports[`TaskDetails rendering render with min Props 1`] = `
     >
       <Task
         action=""
+        canEdit={false}
         cancelStep={[MockFunction]}
         cancelTaskRequest={[Function]}
         cancellable={false}

data/webpack/ForemanTasks/Components/TaskDetails/index.js

@@ -32,6 +32,7 @@ import {
   selectParentTask,
   selectExternalId,
   selectDynflowEnableConsole,
+  selectCanEdit,
 } from './TaskDetailsSelectors';
 
 const mapStateToProps = state => ({
@@ -62,6 +63,7 @@ const mapStateToProps = state => ({
   parentTask: selectParentTask(state),
   externalId: selectExternalId(state),
   dynflowEnableConsole: selectDynflowEnableConsole(state),
+  canEdit: selectCanEdit(state),
 });
 
 const mapDispatchToProps = dispatch =>

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

@@ -27,6 +27,7 @@ export const selectSelectedTasks = state => {
     id: item.id,
     isCancellable: item.availableActions.cancellable,
     isResumable: item.availableActions.resumable,
+    canEdit: item.canEdit,
   }));
 };
 

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModalSelectors.test.js

@@ -22,6 +22,7 @@ const state = {
             id: 1,
             action: 'action1',
             available_actions: { cancellable: true },
+            can_edit: true,
           },
           { id: 2, action: 'action2', available_actions: { resumable: true } },
         ],

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/__snapshots__/ConfirmModalSelectors.test.js.snap

@@ -15,12 +15,14 @@ exports[`TasksDashboard - Selectors should select selectedRowsLen some 1`] = `3`
 exports[`TasksDashboard - Selectors should select selectedTasks 1`] = `
 Array [
   Object {
+    "canEdit": true,
     "id": 1,
     "isCancellable": true,
     "isResumable": undefined,
     "name": "action1",
   },
   Object {
+    "canEdit": undefined,
     "id": 2,
     "isCancellable": undefined,
     "isResumable": true,

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

@@ -63,7 +63,7 @@ export const bulkResumeById = ({
   url,
   parentTaskID,
 }) => async dispatch => {
-  const resumeTasks = selected.filter(task => task.isResumable);
+  const resumeTasks = selected.filter(task => task.isResumable && task.canEdit);
   if (resumeTasks.length < selected.length)
     dispatch(
       addToast(
@@ -87,7 +87,7 @@ export const bulkResumeById = ({
           });
       });
       if (data.resumed) {
-        reloadPage(url, parentTaskID, dispatch);
+        reloadPage(url, parentTaskID)(dispatch);
       }
     } catch (error) {
       handleErrorResume(error, dispatch);
@@ -135,7 +135,9 @@ export const bulkCancelById = ({
   url,
   parentTaskID,
 }) => async dispatch => {
-  const cancelTasks = selected.filter(task => task.isCancellable);
+  const cancelTasks = selected.filter(
+    task => task.isCancellable && task.canEdit
+  );
   if (cancelTasks.length < selected.length)
     dispatch(
       addToast(
@@ -160,7 +162,7 @@ export const bulkCancelById = ({
           });
       });
       if (data.cancelled) {
-        reloadPage(url, parentTaskID, dispatch);
+        reloadPage(url, parentTaskID)(dispatch);
       }
     } catch (error) {
       handleErrorCancel(error, dispatch);
@@ -185,6 +187,18 @@ export const bulkForceCancelById = ({
   parentTaskID,
 }) => async dispatch => {
   const stopTasks = selected.filter(task => task.state !== 'stopped');
+  const authorisedTasks = stopTasks.filter(task => task.canEdit);
+  if (authorisedTasks.length < stopTasks.length)
+    dispatch(
+      addToast(
+        warningToastData(
+          sprintf(
+            'User has no permission for %s task(s)',
+            stopTasks.length - authorisedTasks.length
+          )
+        )
+      )
+    );
   if (stopTasks.length < selected.length)
     dispatch(
       addToast(
@@ -196,10 +210,13 @@ export const bulkForceCancelById = ({
         )
       )
     );
-  if (stopTasks.length > 0) {
+  if (authorisedTasks.length > 0) {
     dispatch({ type: TASKS_FORCE_CANCEL_REQUEST });
     try {
-      const { data } = await bulkByIdRequest(stopTasks, BULK_FORCE_CANCEL_PATH);
+      const { data } = await bulkByIdRequest(
+        authorisedTasks,
+        BULK_FORCE_CANCEL_PATH
+      );
       dispatch({ type: TASKS_FORCE_CANCEL_SUCCESS });
       if (data.stopped_length) {
         dispatch(
@@ -219,7 +236,7 @@ export const bulkForceCancelById = ({
           )
         );
       if (data.stopped_length > 0) {
-        reloadPage(url, parentTaskID, dispatch);
+        reloadPage(url, parentTaskID)(dispatch);
       }
     } catch (error) {
       handleErrorForceCancel(error, dispatch);

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

@@ -22,7 +22,7 @@ import {
 export const getTableItems = url =>
   getTableItemsAction(TASKS_TABLE_ID, getURIQuery(url), getApiPathname(url));
 
-export const reloadPage = (url, parentTaskID, dispatch) => {
+export const reloadPage = (url, parentTaskID) => dispatch => {
   dispatch(getTableItems(url));
   dispatch(fetchTasksSummary(getURIQuery(url).time, parentTaskID));
 };
@@ -34,7 +34,7 @@ export const cancelTask = ({
   parentTaskID,
 }) => async dispatch => {
   await dispatch(cancelTaskRequest(taskId, taskName));
-  reloadPage(url, parentTaskID, dispatch);
+  reloadPage(url, parentTaskID)(dispatch);
 };
 
 export const resumeTask = ({
@@ -44,7 +44,7 @@ export const resumeTask = ({
   parentTaskID,
 }) => async dispatch => {
   await dispatch(resumeTaskRequest(taskId, taskName));
-  reloadPage(url, parentTaskID, dispatch);
+  reloadPage(url, parentTaskID)(dispatch);
 };
 
 export const forceCancelTask = ({

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { getURIsearch } from 'foremanReact/common/urlHelpers';
-import { Spinner } from 'patternfly-react';
+import { Spinner, Button, Icon } from 'patternfly-react';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { getURIQuery } from 'foremanReact/common/helpers';
@@ -63,7 +63,10 @@ const TasksTablePage = ({
         toastNotifications="foreman-tasks-cancel"
         toolbarButtons={
           <React.Fragment>
-            {props.status === STATUS.PENDING && <Spinner size="lg" loading />}
+            <Button onClick={() => props.reloadPage(url, props.parentTaskID)}>
+              <Icon type="fa" name="refresh" /> {__('Refresh Data')}
+            </Button>
+            {props.status === STATUS.PENDING && <Spinner size="md" loading />}
             <ExportButton
               url={getCSVurl(url, uriQuery)}
               title={__('Export All')}
@@ -118,6 +121,7 @@ TasksTablePage.propTypes = {
   openModalAction: PropTypes.func.isRequired,
   showSelectAll: PropTypes.bool,
   unselectAllRows: PropTypes.func.isRequired,
+  reloadPage: PropTypes.func.isRequired,
 };
 
 TasksTablePage.defaultProps = {

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

@@ -39,6 +39,7 @@ export const selectResults = createSelector(
         ...result.available_actions,
         stoppable: result.state !== 'stopped',
       },
+      canEdit: result.can_edit,
     }))
 );
 

data/webpack/ForemanTasks/Components/TasksTable/__tests__/TasksBulkActions.test.js

@@ -18,6 +18,7 @@ jest.mock('foremanReact/redux/API');
 const task = {
   id: 'some-id',
   name: 'some-name',
+  canEdit: true,
 };
 
 const fixtures = {
@@ -140,6 +141,18 @@ const fixtures = {
       url: 'some-url',
       parentTaskID: 'parent',
     }),
+  'handles bulkCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isCancellable: true, canEdit: false }];
+    return bulkCancelById({ selected, url: 'some-url' });
+  },
+  'handles bulkResumeById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkResumeById({ selected, url: 'some-url' });
+  },
+  'handles bulkForceCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
 };
 
 describe('TasksTable bulk actions', () => {

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

@@ -9,6 +9,7 @@ export const minProps = {
   unselectAllRows: jest.fn(),
   selectRow: jest.fn(),
   unselectRow: jest.fn(),
+  reloadPage: jest.fn(),
   selectedRows: [],
   pagination: {
     page: 1,

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

@@ -12,9 +12,10 @@ const history = {
 const fixtures = {
   'render with minimal props': { ...minProps, history },
 
-  'render with Breadcrubs': {
+  'render with Breadcrubs and edit permissions': {
     ...minProps,
     history,
+    results: [{ action: 'a', canEdit: true }],
     getBreadcrumbs: () => ({
       breadcrumbItems: [
         { caption: 'Tasks', url: `/foreman_tasks/tasks` },

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

@@ -30,6 +30,7 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     }
   }
   parentTaskID="some-id"
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",

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

@@ -48,6 +48,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be cancelled",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkCancelBySearch requests 1`] = `
 Array [
   Array [
@@ -155,6 +171,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkForceCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "User has no permission for 1 task(s)",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkForceCancelBySearch requests 1`] = `
 Array [
   Array [
@@ -219,6 +251,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkResumeById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be resumed",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkResumeBySearch requests 1`] = `
 Array [
   Array [

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

@@ -21,6 +21,7 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
       "perPage": 10,
     }
   }
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
+exports[`TasksTablePage rendering render with Breadcrubs and edit permissions 1`] = `
 <div
   className="tasks-table-wrapper"
 >
@@ -69,12 +69,27 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
     toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          <Icon
+            name="refresh"
+            type="fa"
+          />
+           
+          Refresh Data
+        </Button>
         <Spinner
           className=""
           inline={false}
           inverse={false}
           loading={true}
-          size="lg"
+          size="md"
         />
         <ExportButton
           title="Export All"
@@ -112,10 +127,13 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         }
       }
       parentTaskID={null}
+      reloadPage={[MockFunction]}
       results={
         Array [
-          "a",
-          "b",
+          Object {
+            "action": "a",
+            "canEdit": true,
+          },
         ]
       }
       selectPage={[MockFunction]}
@@ -187,12 +205,27 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsStyle="default"
+          disabled={false}
+          onClick={[Function]}
+        >
+          <Icon
+            name="refresh"
+            type="fa"
+          />
+           
+          Refresh Data
+        </Button>
         <Spinner
           className=""
           inline={false}
           inverse={false}
           loading={true}
-          size="lg"
+          size="md"
         />
         <ExportButton
           title="Export All"
@@ -230,6 +263,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       parentTaskID={null}
+      reloadPage={[MockFunction]}
       results={
         Array [
           "a",

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

@@ -7,6 +7,7 @@ exports[`actionCellFormatter render 1`] = `
       "cancellable": true,
     }
   }
+  canEdit={true}
   id="some-id"
   name="some-name"
   taskActions={Object {}}

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

@@ -3,8 +3,10 @@
 exports[`selectionCellFormatter render 1`] = `
 <TableSelectionCell
   checked={true}
+  disabled={true}
   id="selectsome-index"
   label="Select row"
   onChange={[Function]}
+  title="You do not have permission"
 />
 `;

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/actionCellFormatter.test.js

@@ -4,7 +4,7 @@ describe('actionCellFormatter', () => {
   it('render', () => {
     const data = [
       { cancellable: true },
-      { rowData: { action: 'some-name', id: 'some-id' } },
+      { rowData: { action: 'some-name', id: 'some-id', canEdit: true } },
     ];
     expect(actionCellFormatter({})(...data)).toMatchSnapshot();
   });

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/selectionCellFormatter.test.js

@@ -5,7 +5,7 @@ describe('selectionCellFormatter', () => {
     expect(
       selectionCellFormatter(
         { isSelected: () => true },
-        { rowIndex: 'some-index' }
+        { rowIndex: 'some-index', rowData: {} }
       )
     ).toMatchSnapshot();
   });

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

@@ -4,13 +4,16 @@ import { ActionButton } from '../../common/ActionButtons/ActionButton';
 
 export const actionCellFormatter = taskActions => (
   value,
-  { rowData: { action, id } }
+  { rowData: { action, id, canEdit } }
 ) =>
   cellFormatter(
-    <ActionButton
-      id={id}
-      name={action}
-      taskActions={taskActions}
-      availableActions={value}
-    />
+    canEdit && (
+      <ActionButton
+        canEdit={canEdit}
+        id={id}
+        name={action}
+        taskActions={taskActions}
+        availableActions={value}
+      />
+    )
   );

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

@@ -1,9 +1,16 @@
 import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
 import TableSelectionCell from '../Components/TableSelectionCell';
 
 export default (selectionController, additionalData) => (
   <TableSelectionCell
     id={`select${additionalData.rowIndex}`}
+    disabled={!additionalData.rowData.canEdit}
+    title={
+      additionalData.rowData.canEdit
+        ? undefined
+        : __('You do not have permission')
+    }
     checked={selectionController.isSelected(additionalData)}
     onChange={() => selectionController.selectRow(additionalData)}
   />

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js

@@ -4,45 +4,48 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 
 export const ActionButton = ({
+  canEdit,
   id,
   name,
   availableActions: { resumable, cancellable, stoppable },
   taskActions,
 }) => {
   const buttons = [];
-  const isTitle = !(resumable || cancellable || stoppable);
+  const isTitle = canEdit && !(resumable || cancellable || stoppable);
   const title = isTitle ? __('Task cannot be canceled') : undefined;
-  if (resumable) {
-    buttons.push({
-      title: __('Resume'),
-      action: {
-        disabled: !resumable,
-        onClick: () => taskActions.resumeTask(id, name),
-        id: `task-resume-button-${id}`,
-      },
-    });
-  }
-  if (cancellable || (!stoppable && !resumable)) {
-    // Cancel is the default button that should be shown if no task action can be done
-    buttons.push({
-      title: __('Cancel'),
-      action: {
-        disabled: !cancellable,
-        onClick: () => taskActions.cancelTask(id, name),
-        id: `task-cancel-button-${id}`,
-      },
-    });
-  }
+  if (canEdit) {
+    if (resumable) {
+      buttons.push({
+        title: __('Resume'),
+        action: {
+          disabled: !resumable,
+          onClick: () => taskActions.resumeTask(id, name),
+          id: `task-resume-button-${id}`,
+        },
+      });
+    }
+    if (cancellable || (!stoppable && !resumable)) {
+      // Cancel is the default button that should be shown if no task action can be done
+      buttons.push({
+        title: __('Cancel'),
+        action: {
+          disabled: !cancellable,
+          onClick: () => taskActions.cancelTask(id, name),
+          id: `task-cancel-button-${id}`,
+        },
+      });
+    }
 
-  if (stoppable) {
-    buttons.push({
-      title: __('Force Cancel'),
-      action: {
-        disabled: !stoppable,
-        onClick: () => taskActions.forceCancelTask(id, name),
-        id: `task-force-cancel-button-${id}`,
-      },
-    });
+    if (stoppable) {
+      buttons.push({
+        title: __('Force Cancel'),
+        action: {
+          disabled: !stoppable,
+          onClick: () => taskActions.forceCancelTask(id, name),
+          id: `task-force-cancel-button-${id}`,
+        },
+      });
+    }
   }
   return (
     <span title={title}>
@@ -52,6 +55,7 @@ export const ActionButton = ({
 };
 
 ActionButton.propTypes = {
+  canEdit: PropTypes.bool,
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   availableActions: PropTypes.shape({
@@ -65,3 +69,7 @@ ActionButton.propTypes = {
     forceCancelTask: PropTypes.func,
   }).isRequired,
 };
+
+ActionButton.defaultProps = {
+  canEdit: false,
+};

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js

@@ -7,6 +7,7 @@ const resumeTask = jest.fn();
 const cancelTask = jest.fn();
 const forceCancelTask = jest.fn();
 const taskActions = { resumeTask, cancelTask, forceCancelTask };
+const minProps = { canEdit: true, id: 'id', name: 'some-name' };
 const fixtures = {
   'render with cancellable true props': {
     availableActions: {
@@ -14,8 +15,7 @@ const fixtures = {
       resumable: false,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with resumable true props': {
     availableActions: {
@@ -23,8 +23,7 @@ const fixtures = {
       resumable: true,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with stoppable and cancellable true props': {
     availableActions: {
@@ -32,8 +31,7 @@ const fixtures = {
       stoppable: true,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
   },
   'render with cancellable false props': {
     availableActions: {
@@ -41,8 +39,16 @@ const fixtures = {
       resumable: false,
     },
     taskActions,
-    id: 'id',
-    name: 'some-name',
+    ...minProps,
+  },
+  'render with canEdit false': {
+    availableActions: {
+      cancellable: false,
+      resumable: false,
+    },
+    taskActions,
+    ...minProps,
+    canEdit: false,
   },
 };
 
@@ -57,6 +63,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ cancellable: true }}
           taskActions={taskActions}
         />
@@ -69,6 +76,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ resumable: true }}
           taskActions={taskActions}
         />
@@ -81,6 +89,7 @@ describe('ActionButton', () => {
         <ActionButton
           id={id}
           name={name}
+          canEdit
           availableActions={{ stoppable: true }}
           taskActions={taskActions}
         />

data/webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ActionButton.test.js.snap

@@ -1,5 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`ActionButton snapshot test render with canEdit false 1`] = `
+<span>
+  <ActionButtons
+    buttons={Array []}
+  />
+</span>
+`;
+
 exports[`ActionButton snapshot test render with cancellable false props 1`] = `
 <span
   title="Task cannot be canceled"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -270,6 +270,7 @@ files:
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/task_error.rb
 - lib/foreman_tasks/tasks/cleanup.rake
+- lib/foreman_tasks/tasks/dynflow.rake
 - lib/foreman_tasks/tasks/export_tasks.rake
 - lib/foreman_tasks/tasks/generate_task_actions.rake
 - lib/foreman_tasks/test_extensions.rb
@@ -289,6 +290,7 @@ files:
 - locale/zh_CN/LC_MESSAGES/foreman_tasks.mo
 - locale/zh_CN/foreman_tasks.po
 - package.json
+- script/npm_link_foreman_js.sh
 - script/rails
 - script/travis_run_js_tests.sh
 - test/controllers/api/recurring_logics_controller_test.rb
@@ -593,7 +595,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users