foreman-tasks 0.17.1 → 0.17.2

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

@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ActionSelectButton renders with minimal props 1`] = `
+<DropdownButton
+  disabled={false}
+  id="selcted-action-type"
+  title="Select Action"
+>
+  <MenuItem
+    bsClass="dropdown"
+    disabled={false}
+    divider={false}
+    eventKey="1"
+    header={false}
+    onClick={[MockFunction]}
+    title="Cancel selected tasks"
+  >
+    Cancel Selected
+  </MenuItem>
+  <MenuItem
+    bsClass="dropdown"
+    disabled={false}
+    divider={false}
+    eventKey="2"
+    header={false}
+    onClick={[MockFunction]}
+    title="Resume selected tasks"
+  >
+    Resume Selected
+  </MenuItem>
+</DropdownButton>
+`;

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

@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CancelResumeConfirm renders CANCEL modal 1`] = `
+<ActionConfirmation
+  abortAction="No"
+  closeModal={[Function]}
+  confirmAction="Yes"
+  message="This will stop 3 tasks, putting them in the canceled state.  Are you sure?"
+  onClick={[Function]}
+  showModal={true}
+  title="Cancel Selected Tasks"
+/>
+`;
+
+exports[`CancelResumeConfirm renders CLOSED modal 1`] = `
+<ActionConfirmation
+  abortAction="No"
+  closeModal={[Function]}
+  confirmAction="Yes"
+  message="This will resume 3 tasks, putting them in the running state.  Are you sure?"
+  onClick={[Function]}
+  showModal={false}
+  title="Resume Selected Tasks"
+/>
+`;
+
+exports[`CancelResumeConfirm renders RESUME modal 1`] = `
+<ActionConfirmation
+  abortAction="No"
+  closeModal={[Function]}
+  confirmAction="Yes"
+  message="This will resume 3 tasks, putting them in the running state.  Are you sure?"
+  onClick={[Function]}
+  showModal={true}
+  title="Resume Selected Tasks"
+/>
+`;

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

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TableSelectionCell renders TableSelectionCell 1`] = `
+<TableSelectionCell
+  className=""
+>
+  <TableCheckbox
+    checked={true}
+    id="some id"
+    label="some label"
+    onChange={[MockFunction]}
+  />
+</TableSelectionCell>
+`;

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

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TableSelectionHeaderCell renders TableSelectionHeaderCell 1`] = `
+<TableSelectionHeading
+  aria-label="some label"
+  className=""
+>
+  <TableCheckbox
+    checked={true}
+    id="some id"
+    label="some label"
+    onChange={[MockFunction]}
+  />
+</TableSelectionHeading>
+`;

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

@@ -19,6 +19,11 @@ const TasksTable = ({
   pagination,
   cancelTask,
   resumeTask,
+  selectedRows,
+  selectAllRows,
+  unselectAllRows,
+  selectRow,
+  unselectRow,
 }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
@@ -27,6 +32,22 @@ const TasksTable = ({
     getTableItems(url);
   }, [history.location.search]);
 
+  const getSelectionController = () => {
+    const checkAllRowsSelected = () => results.length === selectedRows.length;
+    return {
+      allRowsSelected: () => checkAllRowsSelected(),
+      selectAllRows: () => {
+        if (checkAllRowsSelected()) unselectAllRows();
+        else selectAllRows(results);
+      },
+      selectRow: ({ rowData: { id } }) => {
+        if (selectedRows.includes(id)) unselectRow(id);
+        else selectRow(id);
+      },
+      isSelected: ({ rowData }) => selectedRows.includes(rowData.id),
+    };
+  };
+
   if (status === STATUS.ERROR) {
     return (
       <MessageBox
@@ -76,7 +97,8 @@ const TasksTable = ({
           setSortHistory,
           uriQuery.sort_by,
           uriQuery.sort_order,
-          taskActions
+          taskActions,
+          getSelectionController()
         )}
         rows={results}
       />
@@ -105,6 +127,11 @@ TasksTable.propTypes = {
   history: PropTypes.object.isRequired,
   cancelTask: PropTypes.func.isRequired,
   resumeTask: PropTypes.func.isRequired,
+  selectedRows: PropTypes.array,
+  selectAllRows: PropTypes.func.isRequired,
+  unselectAllRows: PropTypes.func.isRequired,
+  selectRow: PropTypes.func.isRequired,
+  unselectRow: PropTypes.func.isRequired,
 };
 
 TasksTable.defaultProps = {
@@ -114,6 +141,7 @@ TasksTable.defaultProps = {
     page: 1,
     perPage: 20,
   },
+  selectedRows: [],
 };
 
 export default TasksTable;

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

@@ -3,7 +3,16 @@ import { getTableItemsAction } from 'foremanReact/components/common/table';
 import API from 'foremanReact/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { TASKS_TABLE_ID } from './TasksTableConstants';
+import {
+  TASKS_TABLE_ID,
+  SELECT_ROWS,
+  UNSELECT_ALL_ROWS,
+  UNSELECT_ROWS,
+  TASKS_TABLE_SELECTED_MODAL,
+  CLOSED,
+  RESUME,
+  CANCEL,
+} from './TasksTableConstants';
 import { getApiPathname } from './TasksTableHelpers';
 import { fetchTasksSummary } from '../TasksDashboard/TasksDashboardActions';
 
@@ -28,14 +37,14 @@ export const cancelTaskRequest = (id, name) => async dispatch => {
     dispatch(
       addToast({
         type: 'success',
-        message: `"${name}" ${__('task cancelled')}`,
+        message: `"${name}" ${__('Task cancelled')}`,
       })
     );
   } catch ({ response }) {
     dispatch(
       addToast({
         type: 'error',
-        message: `"${name}" ${__('task cannot be cancelled at the moment.')}`,
+        message: `"${name}" ${__('Task cannot be cancelled at the moment.')}`,
       })
     );
   }
@@ -65,3 +74,69 @@ export const resumeTaskRequest = (id, name) => async dispatch => {
     );
   }
 };
+
+export const selectAllRows = results => ({
+  type: SELECT_ROWS,
+  payload: results.map(row => row.id),
+});
+
+export const unselectAllRows = () => ({
+  type: UNSELECT_ALL_ROWS,
+});
+
+export const selectRow = id => ({
+  type: SELECT_ROWS,
+  payload: [id],
+});
+
+export const unselectRow = id => ({
+  type: UNSELECT_ROWS,
+  payload: id,
+});
+
+export const actionSelected = (actionType, selected, url) => async dispatch => {
+  let notAllActionable = false;
+  let someActionable = false;
+  const promises = selected.map(task => {
+    if (actionType === RESUME && task.isResumeble) {
+      someActionable = true;
+      return dispatch(resumeTaskRequest(task.id, task.name, url));
+    } else if (actionType === CANCEL && task.isCancelleble) {
+      someActionable = true;
+      return dispatch(cancelTaskRequest(task.id, task.name, url));
+    }
+    notAllActionable = true;
+    return null;
+  });
+  if (notAllActionable)
+    dispatch(
+      addToast({
+        type: 'warning',
+        message: __(
+          `Not all the selected tasks can be ${
+            actionType === RESUME ? 'resumed' : 'canceled'
+          }`
+        ),
+      })
+    );
+  if (someActionable) {
+    await Promise.all(promises);
+    dispatch(getTableItems(url));
+    dispatch(fetchTasksSummary(getURIQuery(url).time));
+  }
+};
+
+export const showCancelSelcetedModal = () => ({
+  type: TASKS_TABLE_SELECTED_MODAL,
+  payload: CANCEL,
+});
+
+export const showResumeSelcetedModal = () => ({
+  type: TASKS_TABLE_SELECTED_MODAL,
+  payload: RESUME,
+});
+
+export const hideSelcetedModal = () => ({
+  type: TASKS_TABLE_SELECTED_MODAL,
+  payload: CLOSED,
+});

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

@@ -1,5 +1,16 @@
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 export const TASKS_TABLE_ID = 'TASKS_TABLE';
+export const TASKS_CONTROLLER = 'tasks';
+export const TASKS_SUCCESS = 'TASKS_SUCCESS';
+export const TASKS_REQUEST = 'TASKS_REQUEST';
+export const TASKS_FAILURE = 'TASKS_FAILURE';
+export const SELECT_ROWS = 'SELECT_ROWS';
+export const UNSELECT_ROWS = 'UNSELECT_ROWS';
+export const UNSELECT_ALL_ROWS = 'UNSELECT_ALL_ROWS';
+export const CANCEL = 'CANCEL';
+export const RESUME = 'RESUME';
+export const CLOSED = 'CLOSED';
 
+export const TASKS_TABLE_SELECTED_MODAL = 'TASKS_TABLE_SELECTED_MODAL';
 export const TASKS_SEARCH_PROPS = getControllerSearchProps('tasks');

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

@@ -3,13 +3,21 @@ import PropTypes from 'prop-types';
 import { getURIsearch } from 'foremanReact/common/urlHelpers';
 import { Spinner } from 'patternfly-react';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import ExportButton from 'foremanReact/routes/common/PageLayout/components/ExportButton/ExportButton';
 import { STATUS } from 'foremanReact/constants';
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
 import { resolveSearchQuery, addSearchToURL } from './TasksTableHelpers';
-import { TASKS_SEARCH_PROPS } from './TasksTableConstants';
+import { CancelResumeConfirm } from './Components/CancelResumeConfirm';
+import {
+  TASKS_SEARCH_PROPS,
+  RESUME,
+  CANCEL,
+  CLOSED,
+} from './TasksTableConstants';
+import { ActionSelectButton } from './Components/ActionSelectButton';
 import './TasksTablePage.scss';
 
 const TasksTablePage = ({ getBreadcrumbs, history, ...props }) => {
@@ -20,8 +28,31 @@ const TasksTablePage = ({ getBreadcrumbs, history, ...props }) => {
     props.getTableItems(url);
   };
 
+  const getSelected = () => {
+    const selected = props.results.filter(item =>
+      props.selectedRows.includes(item.id)
+    );
+    return selected.map(item => ({
+      name: item.action,
+      id: item.id,
+      isCancelleble: item.availableActions.cancellable,
+      isResumeble: item.availableActions.resumable,
+    }));
+  };
+
+  const TaskSelectedAction = (id, name) => {
+    props.actionSelected(id, name, url);
+  };
+
   return (
     <div className="tasks-table-wrapper">
+      <CancelResumeConfirm
+        closeModal={props.hideSelcetedModal}
+        action={TaskSelectedAction}
+        selected={getSelected()}
+        modalStatus={props.modalStatus}
+        selectedRowsLen={props.selectedRows.length}
+      />
       <PageLayout
         searchable
         searchProps={TASKS_SEARCH_PROPS}
@@ -33,6 +64,12 @@ const TasksTablePage = ({ getBreadcrumbs, history, ...props }) => {
             {props.status === STATUS.PENDING && <Spinner size="lg" loading />}
             <ExportButton
               url={addSearchToURL('/foreman_tasks/tasks.csv', uriQuery)}
+              title={__('Export All')}
+            />
+            <ActionSelectButton
+              disabled={props.selectedRows.length < 1}
+              onCancel={props.showCancelSelcetedModal}
+              onResume={props.showResumeSelcetedModal}
             />
           </React.Fragment>
         }
@@ -46,18 +83,27 @@ const TasksTablePage = ({ getBreadcrumbs, history, ...props }) => {
 };
 
 TasksTablePage.propTypes = {
+  results: PropTypes.array.isRequired,
   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,
+  selectedRows: PropTypes.arrayOf(PropTypes.string),
+  showResumeSelcetedModal: PropTypes.func.isRequired,
+  showCancelSelcetedModal: PropTypes.func.isRequired,
+  hideSelcetedModal: PropTypes.func.isRequired,
+  modalStatus: PropTypes.oneOf([CANCEL, RESUME, CLOSED]),
 };
 
 TasksTablePage.defaultProps = {
   actionName: '',
   isSubTask: false,
   status: STATUS.PENDING,
+  selectedRows: [],
+  modalStatus: CLOSED,
 };
 
 export default TasksTablePage;

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

@@ -1,19 +1,26 @@
 import Immutable from 'seamless-immutable';
 import { combineReducers } from 'redux';
+import { union } from 'lodash';
 import { createTableReducer } from 'foremanReact/components/common/table';
 import createTableActionTypes from 'foremanReact/components/common/table/actionsHelpers/actionTypeCreator';
-import { TASKS_TABLE_ID } from './TasksTableConstants';
+import {
+  TASKS_TABLE_ID,
+  SELECT_ROWS,
+  UNSELECT_ROWS,
+  UNSELECT_ALL_ROWS,
+  TASKS_TABLE_SELECTED_MODAL,
+  CLOSED,
+} from './TasksTableConstants';
 
-export const TasksTableQueryReducer = (state = {}, action) => {
-  const {
-    type,
-    payload: {
-      subtotal,
-      page,
-      per_page: perPageString,
-      action_name: actionName,
-    } = {},
-  } = action;
+const initialState = Immutable({
+  selectedRows: [],
+  modalStatus: CLOSED,
+});
+
+export const TasksTableQueryReducer = (state = initialState, action) => {
+  const { type, payload } = action;
+  const { subtotal, page, per_page: perPageString, action_name: actionName } =
+    payload || {};
   const ACTION_TYPES = createTableActionTypes(TASKS_TABLE_ID);
   switch (type) {
     case ACTION_TYPES.SUCCESS:
@@ -24,7 +31,19 @@ export const TasksTableQueryReducer = (state = {}, action) => {
           page: Number(page),
           perPage: Number(perPageString),
         },
+        selectedRows: [],
       });
+    case SELECT_ROWS:
+      return state.set('selectedRows', union(payload, state.selectedRows));
+    case UNSELECT_ROWS:
+      return state.set(
+        'selectedRows',
+        state.selectedRows.filter(row => row !== payload)
+      );
+    case UNSELECT_ALL_ROWS:
+      return state.set('selectedRows', []);
+    case TASKS_TABLE_SELECTED_MODAL:
+      return state.set('modalStatus', payload);
     default:
       return state;
   }

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

@@ -6,11 +6,13 @@ import {
 } from 'foremanReact/components/common/table';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
-  dateCellFormmatter,
-  actionCellFormatter,
+  selectionHeaderCellFormatter,
+  selectionCellFormatter,
   actionNameCellFormatter,
   durationCellFormmatter,
-} from './TaskTableFormmatters';
+  actionCellFormatter,
+  dateCellFormmatter,
+} from './formatters';
 
 const headFormat = [headerFormatterWithProps];
 const cellFormat = [cellFormatter];
@@ -25,7 +27,14 @@ const cellFormat = [cellFormatter];
  * @param  {function} cancelTask       A function to run when the cancel cell is clicked
  * @return {Array}
  */
-const createTasksTableSchema = (setSort, by, order, taskActions) => {
+
+const createTasksTableSchema = (
+  setSort,
+  by,
+  order,
+  taskActions,
+  selectionController
+) => {
   const sortController = {
     apply: setSort,
     property: by,
@@ -33,6 +42,15 @@ const createTasksTableSchema = (setSort, by, order, taskActions) => {
   };
 
   return [
+    column(
+      'select',
+      'Select all rows',
+      [label => selectionHeaderCellFormatter(selectionController, label)],
+      [
+        (value, additionalData) =>
+          selectionCellFormatter(selectionController, additionalData),
+      ]
+    ),
     column(
       'action',
       __('Action'),
@@ -53,7 +71,7 @@ const createTasksTableSchema = (setSort, by, order, taskActions) => {
       durationCellFormmatter,
     ]),
     column(
-      'available_actions',
+      'availableActions',
       __('Operation'),
       headFormat,
       [actionCellFormatter(taskActions)],