foreman-tasks 2.0.0 → 3.0.2

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/__snapshots__/TasksCardsGrid.test.js.snap

@@ -57,17 +57,20 @@ exports[`TasksCardsGrid render with minimal props 1`] = `
         className=""
         data={
           Object {
-            "error": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "success": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "warning": Object {
-              "last": 0,
-              "total": 0,
+            "other": 0,
+            "results": Object {
+              "error": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "success": Object {
+                "last": 0,
+                "total": 0,
+              },
+              "warning": Object {
+                "last": 0,
+                "total": 0,
+              },
             },
           }
         }

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

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { timeToHoursNumber, resolveQuery } from './TasksDashboardHelper';
 import {
   FOREMAN_TASKS_DASHBOARD_INIT,

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

@@ -11,6 +11,7 @@ export const TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS = {
   ERROR: 'error',
   WARNING: 'warning',
   SUCCESS: 'success',
+  OTHER: 'other',
 };
 
 export const TASKS_DASHBOARD_AVAILABLE_QUERY_MODES = {
@@ -44,6 +45,7 @@ export const TASKS_DASHBOARD_QUERY_VALUES_TEXT = {
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.ERROR]: __('error'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.WARNING]: __('warning'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.SUCCESS]: __('success'),
+  [TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS.OTHER]: __('other'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.LAST]: __('last'),
   [TASKS_DASHBOARD_AVAILABLE_QUERY_MODES.OLDER]: __('older'),
   [TASKS_DASHBOARD_AVAILABLE_TIMES.H24]: __('24h'),

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

@@ -12,6 +12,9 @@ export const selectTime = state =>
 
 export const selectQuery = state => selectTasksDashboard(state).query || {};
 
+export const calcStoppedOther = data =>
+  (data?.cancelled?.total || 0) + (data?.pending?.total || 0);
+
 export const selectTasksSummary = state => {
   const { running, paused, stopped, scheduled } =
     selectTasksDashboard(state).tasksSummary || TASKS_SUMMARY_ZERO;
@@ -26,18 +29,21 @@ export const selectTasksSummary = state => {
       older: paused.total - paused.recent,
     },
     stopped: {
-      error: {
-        total: stopped.by_result.error.total,
-        last: stopped.by_result.error.recent,
-      },
-      warning: {
-        total: stopped.by_result.warning.total,
-        last: stopped.by_result.warning.recent,
-      },
-      success: {
-        total: stopped.by_result.success.total,
-        last: stopped.by_result.success.recent,
+      results: {
+        error: {
+          total: stopped.by_result.error.total,
+          last: stopped.by_result.error.recent,
+        },
+        warning: {
+          total: stopped.by_result.warning.total,
+          last: stopped.by_result.warning.recent,
+        },
+        success: {
+          total: stopped.by_result.success.total,
+          last: stopped.by_result.success.recent,
+        },
       },
+      other: calcStoppedOther(stopped.by_result),
     },
     scheduled: scheduled.total,
   };

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

@@ -1,5 +1,5 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { timeToHoursNumber } from '../TasksDashboardHelper';
 import {
   initializeDashboard,
@@ -14,7 +14,7 @@ import {
   apiGetMock,
 } from './TaskDashboard.fixtures';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 jest.mock('../TasksDashboardHelper');
 
 timeToHoursNumber.mockImplementation(arg => arg);

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

@@ -4,8 +4,32 @@ import {
   selectTime,
   selectQuery,
   selectTasksSummary,
+  calcStoppedOther,
 } from '../TasksDashboardSelectors';
 
+const stoppedResult = {
+  error: {
+    total: 9,
+    recent: 1,
+  },
+  warning: {
+    total: 8,
+    recent: 2,
+  },
+  success: {
+    total: 7,
+    recent: 3,
+  },
+  cancelled: {
+    total: 5,
+    recent: 3,
+  },
+  pending: {
+    total: 11,
+    recent: 4,
+  },
+};
+
 const state = {
   foremanTasks: {
     tasksDashboard: {
@@ -21,20 +45,7 @@ const state = {
           total: 9,
         },
         stopped: {
-          by_result: {
-            error: {
-              total: 9,
-              recent: 1,
-            },
-            warning: {
-              total: 8,
-              recent: 2,
-            },
-            success: {
-              total: 7,
-              recent: 3,
-            },
-          },
+          by_result: stoppedResult,
         },
         scheduled: {
           total: 6,
@@ -55,6 +66,7 @@ const fixtures = {
   'should select tasks-summary': () => selectTasksSummary(state),
   'should select tasks-summary when state is empty': () =>
     selectTasksSummary({}),
+  'should calcStoppedOther': () => calcStoppedOther(stoppedResult),
 };
 
 describe('TasksDashboard - Selectors', () =>

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

@@ -24,17 +24,20 @@ exports[`TasksDashboard rendering render without Props 1`] = `
         },
         "scheduled": 0,
         "stopped": Object {
-          "error": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "success": Object {
-            "last": 0,
-            "total": 0,
-          },
-          "warning": Object {
-            "last": 0,
-            "total": 0,
+          "other": 0,
+          "results": Object {
+            "error": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "success": Object {
+              "last": 0,
+              "total": 0,
+            },
+            "warning": Object {
+              "last": 0,
+              "total": 0,
+            },
           },
         },
       }

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

@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksDashboard - Selectors should calcStoppedOther 1`] = `16`;
+
 exports[`TasksDashboard - Selectors should select query 1`] = `"some-query"`;
 
 exports[`TasksDashboard - Selectors should select query when state is empty 1`] = `Object {}`;
@@ -21,10 +23,18 @@ Object {
     },
     "stopped": Object {
       "by_result": Object {
+        "cancelled": Object {
+          "recent": 3,
+          "total": 5,
+        },
         "error": Object {
           "recent": 1,
           "total": 9,
         },
+        "pending": Object {
+          "recent": 4,
+          "total": 11,
+        },
         "success": Object {
           "recent": 3,
           "total": 7,
@@ -54,17 +64,20 @@ Object {
   },
   "scheduled": 6,
   "stopped": Object {
-    "error": Object {
-      "last": 1,
-      "total": 9,
-    },
-    "success": Object {
-      "last": 3,
-      "total": 7,
-    },
-    "warning": Object {
-      "last": 2,
-      "total": 8,
+    "other": 16,
+    "results": Object {
+      "error": Object {
+        "last": 1,
+        "total": 9,
+      },
+      "success": Object {
+        "last": 3,
+        "total": 7,
+      },
+      "warning": Object {
+        "last": 2,
+        "total": 8,
+      },
     },
   },
 }
@@ -82,17 +95,20 @@ Object {
   },
   "scheduled": 0,
   "stopped": Object {
-    "error": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "success": Object {
-      "last": 0,
-      "total": 0,
-    },
-    "warning": Object {
-      "last": 0,
-      "total": 0,
+    "other": 0,
+    "results": Object {
+      "error": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "success": Object {
+        "last": 0,
+        "total": 0,
+      },
+      "warning": Object {
+        "last": 0,
+        "total": 0,
+      },
     },
   },
 }

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

@@ -1,4 +1,4 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import {
@@ -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';
@@ -60,10 +60,12 @@ const TasksTablePage = ({
         onSearch={onSearch}
         header={createHeader(props.actionName)}
         breadcrumbOptions={getBreadcrumbs(props.actionName)}
-        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 +120,7 @@ TasksTablePage.propTypes = {
   openModalAction: PropTypes.func.isRequired,
   showSelectAll: PropTypes.bool,
   unselectAllRows: PropTypes.func.isRequired,
+  reloadPage: PropTypes.func.isRequired,
 };
 
 TasksTablePage.defaultProps = {