foreman-tasks 0.17.6 → 1.2.0

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

@@ -1,9 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksTableReducer reducer should handle OPEN_SELECT_ALL 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "selectedRows": Array [],
+    "showSelectAll": true,
+  },
+}
+`;
+
+exports[`TasksTableReducer reducer should handle SELECT_ALL_ROWS 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "allRowsSelected": true,
+    "selectedRows": Array [],
+  },
+}
+`;
+
 exports[`TasksTableReducer reducer should handle SELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [
       1,
       2,
@@ -17,19 +34,9 @@ Object {
 }
 `;
 
-exports[`TasksTableReducer reducer should handle TASKS_TABLE_SELECTED_MODAL 1`] = `
-Object {
-  "tasksTableQuery": Object {
-    "modalStatus": "RESUME",
-    "selectedRows": Array [],
-  },
-}
-`;
-
 exports[`TasksTableReducer reducer should handle TASKS_TABLE_SET_PAGINATION 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }
@@ -38,7 +45,6 @@ Object {
 exports[`TasksTableReducer reducer should handle TASKS_TABLE_SET_SORT 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }
@@ -49,7 +55,6 @@ Object {
   "tasksTableQuery": Object {
     "actionName": undefined,
     "itemCount": 120,
-    "modalStatus": "CLOSED",
     "pagination": Object {
       "page": 3,
       "perPage": 12,
@@ -62,8 +67,9 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ALL_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
+    "allRowsSelected": false,
     "selectedRows": Array [],
+    "showSelectAll": false,
   },
 }
 `;
@@ -71,7 +77,29 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
+    "selectedRows": Array [],
+  },
+}
+`;
+
+exports[`TasksTableReducer reducer should handle UNSELECT_ROWS with all rows selected 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "allRowsSelected": false,
+    "selectedRows": Array [
+      3,
+      4,
+      5,
+    ],
+    "showSelectAll": false,
+  },
+}
+`;
+
+exports[`TasksTableReducer reducer should handle UPDATE_CLICKED 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "clicked": "task",
     "selectedRows": Array [],
   },
 }
@@ -80,7 +108,6 @@ Object {
 exports[`TasksTableReducer reducer should return the initial state 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }

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

@@ -4,7 +4,7 @@ describe('selectionHeaderCellFormatter', () => {
   it('render', () => {
     expect(
       selectionHeaderCellFormatter(
-        { allRowsSelected: () => true },
+        { allPageSelected: () => true },
         'some-label'
       )
     ).toMatchSnapshot();

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

@@ -4,7 +4,7 @@ import TableSelectionHeaderCell from '../Components/TableSelectionHeaderCell';
 export default (selectionController, label) => (
   <TableSelectionHeaderCell
     label={label}
-    checked={selectionController.allRowsSelected()}
-    onChange={() => selectionController.selectAllRows()}
+    checked={selectionController.allPageSelected()}
+    onChange={selectionController.selectPage}
   />
 );

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

@@ -2,7 +2,8 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import TasksTablePage from './TasksTablePage';
 import reducer from './TasksTableReducer';
-import * as actions from './TasksTableActions';
+import * as tableActions from './TasksTableActions';
+import * as bulkActions from './TasksBulkActions';
 import {
   selectStatus,
   selectError,
@@ -12,7 +13,9 @@ import {
   selectSort,
   selectActionName,
   selectSelectedRows,
-  selectModalStatus,
+  selectAllRowsSelected,
+  selectShowSelectAll,
+  selectModalID,
 } from './TasksTableSelectors';
 
 const mapStateToProps = state => ({
@@ -24,9 +27,13 @@ const mapStateToProps = state => ({
   itemCount: selectItemCount(state),
   actionName: selectActionName(state),
   selectedRows: selectSelectedRows(state),
-  modalStatus: selectModalStatus(state),
+  allRowsSelected: selectAllRowsSelected(state),
+  showSelectAll: selectShowSelectAll(state),
+  modalID: selectModalID(state),
 });
-const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({ ...tableActions, ...bulkActions }, dispatch);
 
 export const reducers = { tasksTable: reducer };
 

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

@@ -1,27 +1,53 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CancelButton } from './CancelButton';
-import { ResumeButton } from './ResumeButton';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 
-export const ActionButton = ({ id, name, availableActions, taskActions }) => {
-  const isResume = availableActions.resumable;
-  if (isResume) {
-    return (
-      <ResumeButton
-        id={id}
-        name={name}
-        onClick={taskActions.resume}
-        disabled={false}
-      />
-    );
+export const ActionButton = ({
+  id,
+  name,
+  availableActions: { resumable, cancellable, stoppable },
+  taskActions,
+}) => {
+  const buttons = [];
+  const isTitle = !(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 (stoppable) {
+    buttons.push({
+      title: __('Force Cancel'),
+      action: {
+        disabled: !stoppable,
+        onClick: () => taskActions.forceCancelTask(id, name),
+        id: `task-force-cancel-button-${id}`,
+      },
+    });
   }
   return (
-    <CancelButton
-      id={id}
-      name={name}
-      disabled={!availableActions.cancellable}
-      onClick={taskActions.cancel}
-    />
+    <span title={title}>
+      <ActionButtons buttons={buttons} />
+    </span>
   );
 };
 
@@ -31,9 +57,11 @@ ActionButton.propTypes = {
   availableActions: PropTypes.shape({
     cancellable: PropTypes.bool,
     resumable: PropTypes.bool,
+    stoppable: PropTypes.bool,
   }).isRequired,
   taskActions: PropTypes.shape({
-    cancel: PropTypes.func,
-    resume: PropTypes.func,
+    cancelTask: PropTypes.func,
+    resumeTask: PropTypes.func,
+    forceCancelTask: PropTypes.func,
   }).isRequired,
 };

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

@@ -1,17 +1,19 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import React from 'react';
+import { testComponentSnapshotsWithFixtures, shallow } from '@theforeman/test';
 
 import { ActionButton } from './ActionButton';
 
+const resumeTask = jest.fn();
+const cancelTask = jest.fn();
+const forceCancelTask = jest.fn();
+const taskActions = { resumeTask, cancelTask, forceCancelTask };
 const fixtures = {
   'render with cancellable true props': {
     availableActions: {
       cancellable: true,
       resumable: false,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
-    },
+    taskActions,
     id: 'id',
     name: 'some-name',
   },
@@ -20,10 +22,16 @@ const fixtures = {
       cancellable: false,
       resumable: true,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
+    taskActions,
+    id: 'id',
+    name: 'some-name',
+  },
+  'render with stoppable and cancellable true props': {
+    availableActions: {
+      cancellable: true,
+      stoppable: true,
     },
+    taskActions,
     id: 'id',
     name: 'some-name',
   },
@@ -32,14 +40,53 @@ const fixtures = {
       cancellable: false,
       resumable: false,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
-    },
+    taskActions,
     id: 'id',
     name: 'some-name',
   },
 };
 
-describe('ActionButton', () =>
-  testComponentSnapshotsWithFixtures(ActionButton, fixtures));
+describe('ActionButton', () => {
+  describe('snapshot test', () =>
+    testComponentSnapshotsWithFixtures(ActionButton, fixtures));
+  describe('click test', () => {
+    const id = 'some-id';
+    const name = 'some-name';
+    it('cancel', () => {
+      const component = shallow(
+        <ActionButton
+          id={id}
+          name={name}
+          availableActions={{ cancellable: true }}
+          taskActions={taskActions}
+        />
+      ).children();
+      component.props().buttons[0].action.onClick();
+      expect(cancelTask).toHaveBeenCalledWith(id, name);
+    });
+    it('resume', () => {
+      const component = shallow(
+        <ActionButton
+          id={id}
+          name={name}
+          availableActions={{ resumable: true }}
+          taskActions={taskActions}
+        />
+      ).children();
+      component.props().buttons[0].action.onClick();
+      expect(resumeTask).toHaveBeenCalledWith(id, name);
+    });
+    it('force cancel', () => {
+      const component = shallow(
+        <ActionButton
+          id={id}
+          name={name}
+          availableActions={{ stoppable: true }}
+          taskActions={taskActions}
+        />
+      ).children();
+      component.props().buttons[0].action.onClick();
+      expect(cancelTask).toHaveBeenCalledWith(id, name);
+    });
+  });
+});

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

@@ -1,28 +1,87 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ActionButton render with cancellable false props 1`] = `
-<CancelButton
-  disabled={true}
-  id="id"
-  name="some-name"
-  onClick={[MockFunction]}
-/>
+exports[`ActionButton snapshot test render with cancellable false props 1`] = `
+<span
+  title="Task cannot be canceled"
+>
+  <ActionButtons
+    buttons={
+      Array [
+        Object {
+          "action": Object {
+            "disabled": true,
+            "id": "task-cancel-button-id",
+            "onClick": [Function],
+          },
+          "title": "Cancel",
+        },
+      ]
+    }
+  />
+</span>
 `;
 
-exports[`ActionButton render with cancellable true props 1`] = `
-<CancelButton
-  disabled={false}
-  id="id"
-  name="some-name"
-  onClick={[MockFunction]}
-/>
+exports[`ActionButton snapshot test render with cancellable true props 1`] = `
+<span>
+  <ActionButtons
+    buttons={
+      Array [
+        Object {
+          "action": Object {
+            "disabled": false,
+            "id": "task-cancel-button-id",
+            "onClick": [Function],
+          },
+          "title": "Cancel",
+        },
+      ]
+    }
+  />
+</span>
 `;
 
-exports[`ActionButton render with resumable true props 1`] = `
-<ResumeButton
-  disabled={false}
-  id="id"
-  name="some-name"
-  onClick={[MockFunction]}
-/>
+exports[`ActionButton snapshot test render with resumable true props 1`] = `
+<span>
+  <ActionButtons
+    buttons={
+      Array [
+        Object {
+          "action": Object {
+            "disabled": false,
+            "id": "task-resume-button-id",
+            "onClick": [Function],
+          },
+          "title": "Resume",
+        },
+      ]
+    }
+  />
+</span>
+`;
+
+exports[`ActionButton snapshot test render with stoppable and cancellable true props 1`] = `
+<span>
+  <ActionButtons
+    buttons={
+      Array [
+        Object {
+          "action": Object {
+            "disabled": false,
+            "id": "task-cancel-button-id",
+            "onClick": [Function],
+          },
+          "title": "Cancel",
+        },
+        Object {
+          "action": Object {
+            "disabled": false,
+            "id": "task-force-cancel-button-id",
+            "onClick": [Function],
+          },
+          "title": "Force Cancel",
+        },
+      ]
+    }
+  />
+</span>
 `;