foreman-tasks 1.1.3 → 3.0.0

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/TasksTable/index.js

@@ -13,9 +13,9 @@ import {
   selectSort,
   selectActionName,
   selectSelectedRows,
-  selectClicked,
   selectAllRowsSelected,
   selectShowSelectAll,
+  selectModalID,
 } from './TasksTableSelectors';
 
 const mapStateToProps = state => ({
@@ -27,9 +27,9 @@ const mapStateToProps = state => ({
   itemCount: selectItemCount(state),
   actionName: selectActionName(state),
   selectedRows: selectSelectedRows(state),
-  clicked: selectClicked(state),
   allRowsSelected: selectAllRowsSelected(state),
   showSelectAll: selectShowSelectAll(state),
+  modalID: selectModalID(state),
 });
 
 const mapDispatchToProps = dispatch =>

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

@@ -1,39 +1,75 @@
 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.resumeTask}
-        disabled={false}
-      />
-    );
+export const ActionButton = ({
+  canEdit,
+  id,
+  name,
+  availableActions: { resumable, cancellable, stoppable },
+  taskActions,
+}) => {
+  const buttons = [];
+  const isTitle = canEdit && !(resumable || cancellable || stoppable);
+  const title = isTitle ? __('Task cannot be canceled') : undefined;
+  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}`,
+        },
+      });
+    }
   }
   return (
-    <CancelButton
-      id={id}
-      name={name}
-      disabled={!availableActions.cancellable}
-      onClick={taskActions.cancelTask}
-    />
+    <span title={title}>
+      <ActionButtons buttons={buttons} />
+    </span>
   );
 };
 
 ActionButton.propTypes = {
+  canEdit: PropTypes.bool,
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   availableActions: PropTypes.shape({
     cancellable: PropTypes.bool,
     resumable: PropTypes.bool,
+    stoppable: PropTypes.bool,
   }).isRequired,
   taskActions: PropTypes.shape({
     cancelTask: PropTypes.func,
     resumeTask: PropTypes.func,
+    forceCancelTask: PropTypes.func,
   }).isRequired,
 };
+
+ActionButton.defaultProps = {
+  canEdit: false,
+};

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

@@ -1,45 +1,101 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+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 minProps = { canEdit: true, id: 'id', name: 'some-name' };
 const fixtures = {
   'render with cancellable true props': {
     availableActions: {
       cancellable: true,
       resumable: false,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
-    },
-    id: 'id',
-    name: 'some-name',
+    taskActions,
+    ...minProps,
   },
   'render with resumable true props': {
     availableActions: {
       cancellable: false,
       resumable: true,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
+    taskActions,
+    ...minProps,
+  },
+  'render with stoppable and cancellable true props': {
+    availableActions: {
+      cancellable: true,
+      stoppable: true,
     },
-    id: 'id',
-    name: 'some-name',
+    taskActions,
+    ...minProps,
   },
   'render with cancellable false props': {
     availableActions: {
       cancellable: false,
       resumable: false,
     },
-    taskActions: {
-      cancel: jest.fn(),
-      resume: jest.fn(),
+    taskActions,
+    ...minProps,
+  },
+  'render with canEdit false': {
+    availableActions: {
+      cancellable: false,
+      resumable: false,
     },
-    id: 'id',
-    name: 'some-name',
+    taskActions,
+    ...minProps,
+    canEdit: false,
   },
 };
 
-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}
+          canEdit
+          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}
+          canEdit
+          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}
+          canEdit
+          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,95 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ActionButton render with cancellable false props 1`] = `
-<CancelButton
-  disabled={true}
-  id="id"
-  name="some-name"
-  onClick={[Function]}
-/>
+exports[`ActionButton snapshot test render with canEdit false 1`] = `
+<span>
+  <ActionButtons
+    buttons={Array []}
+  />
+</span>
 `;
 
-exports[`ActionButton render with cancellable true props 1`] = `
-<CancelButton
-  disabled={false}
-  id="id"
-  name="some-name"
-  onClick={[Function]}
-/>
+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 resumable true props 1`] = `
-<ResumeButton
-  disabled={false}
-  id="id"
-  name="some-name"
-  onClick={[Function]}
-/>
+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 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>
 `;

data/webpack/ForemanTasks/Components/common/ClickConfirmation/ClickConfirmation.scss

@@ -0,0 +1,9 @@
+.confirmation-check {
+  margin-top: 1em;
+  input {
+    vertical-align: text-top;
+  }
+  span {
+    vertical-align: middle;
+  }
+}