foreman-tasks 2.0.0 → 2.0.1

data/webpack/ForemanTasks/Components/TaskActions/TaskAction.test.js

@@ -1,5 +1,5 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   cancelTaskRequest,
   resumeTaskRequest,
@@ -11,7 +11,7 @@ jest.mock('foremanReact/components/common/table', () => ({
   getTableItemsAction: jest.fn(controller => controller),
 }));
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 
 const task = ['some-id', 'some-name'];
 

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

@@ -1,5 +1,5 @@
 import { sprintf } from 'foremanReact/common/I18n';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import {
   TASKS_RESUME_REQUEST,

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

@@ -3,7 +3,13 @@ import PropTypes from 'prop-types';
 import { Alert, Button } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-const RunningSteps = ({ runningSteps }) => {
+const RunningSteps = ({
+  runningSteps,
+  id,
+  cancelStep,
+  taskReload,
+  taskProgressToggle,
+}) => {
   if (!runningSteps.length) return <span>{__('No running steps')}</span>;
   return (
     <div>
@@ -13,8 +19,12 @@ const RunningSteps = ({ runningSteps }) => {
             <p>
               <Button
                 bsSize="small"
-                data-method="post"
-                href={`/foreman_tasks/tasks/${step.id}/cancel_step`}
+                onClick={() => {
+                  if (!taskReload) {
+                    taskProgressToggle();
+                  }
+                  cancelStep(id, step.id);
+                }}
               >
                 {__('Cancel')}
               </Button>
@@ -46,6 +56,10 @@ const RunningSteps = ({ runningSteps }) => {
 
 RunningSteps.propTypes = {
   runningSteps: PropTypes.array,
+  id: PropTypes.string.isRequired,
+  cancelStep: PropTypes.func.isRequired,
+  taskReload: PropTypes.bool.isRequired,
+  taskProgressToggle: PropTypes.func.isRequired,
 };
 
 RunningSteps.defaultProps = {

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

@@ -11,22 +11,6 @@ import {
 import { ForceUnlockModal, UnlockModal } from '../../TaskActions/UnlockModals';
 
 const Task = props => {
-  const taskProgressToggle = () => {
-    const {
-      timeoutId,
-      refetchTaskDetails,
-      id,
-      loading,
-      taskReloadStop,
-      taskReloadStart,
-    } = props;
-    if (timeoutId) {
-      taskReloadStop(timeoutId);
-    } else {
-      taskReloadStart(timeoutId, refetchTaskDetails, id, loading);
-    }
-  };
-
   const unlockModalActions = useForemanModal({
     id: UNLOCK_MODAL,
   });
@@ -49,6 +33,7 @@ const Task = props => {
     unlockTaskRequest,
     action,
     dynflowEnableConsole,
+    taskProgressToggle,
   } = props;
   const forceUnlock = () => {
     if (!taskReload) {
@@ -86,6 +71,8 @@ const Task = props => {
               bsSize="small"
               href={`/foreman_tasks/dynflow/${externalId}`}
               disabled={!dynflowEnableConsole}
+              rel="noopener noreferrer"
+              target="_blank"
             >
               {__('Dynflow console')}
             </Button>
@@ -167,7 +154,6 @@ Task.propTypes = {
   parentTask: PropTypes.string,
   taskReload: PropTypes.bool,
   taskReloadStop: PropTypes.func,
-  taskReloadStart: PropTypes.func,
   timeoutId: PropTypes.number,
   externalId: PropTypes.string,
   id: PropTypes.string.isRequired,
@@ -186,7 +172,6 @@ Task.defaultProps = {
   parentTask: '',
   taskReload: false,
   taskReloadStop: () => null,
-  taskReloadStart: () => null,
   timeoutId: null,
   externalId: '',
   cancelTaskRequest: () => null,

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

@@ -2,9 +2,16 @@ import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import RunningSteps from '../RunningSteps';
 
+const minProps = {
+  id: 'task-id1',
+  taskReload: true,
+  cancelStep: jest.fn(),
+  taskProgressToggle: jest.fn(),
+};
 const fixtures = {
-  'render without Props': {},
+  'render with min Props': minProps,
   'render with Props': {
+    ...minProps,
     executionPlan: {
       state: 'paused',
       cancellable: false,

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

@@ -33,16 +33,16 @@ describe('Task', () => {
     }));
     const cancelTaskRequest = jest.fn();
     const resumeTaskRequest = jest.fn();
-    const taskReloadStart = jest.fn();
+    const taskProgressToggle = jest.fn();
     const id = 'some-id';
     const action = 'some-action';
     const props = {
       taskReload: false,
-      taskReloadStart,
       id,
       action,
       cancelTaskRequest,
       resumeTaskRequest,
+      taskProgressToggle,
     };
     afterEach(() => {
       jest.clearAllMocks();
@@ -51,20 +51,20 @@ describe('Task', () => {
       const component = mount(<Task {...props} />);
       const reloadButton = component.find('.reload-button').at(0);
       reloadButton.simulate('click');
-      expect(taskReloadStart).toBeCalled();
+      expect(taskProgressToggle).toBeCalled();
     });
     it('resume', () => {
       const component = shallow(<Task {...props} />);
       const resumeButton = component.find('.resume-button').at(0);
       resumeButton.props().onClick();
-      expect(taskReloadStart).toBeCalled();
+      expect(taskProgressToggle).toBeCalled();
       expect(resumeTaskRequest).toBeCalledWith(id, action);
     });
     it('cancel', () => {
       const component = shallow(<Task {...props} />);
       const cancelButton = component.find('.cancel-button').at(0);
       cancelButton.props().onClick();
-      expect(taskReloadStart).toBeCalled();
+      expect(taskProgressToggle).toBeCalled();
       expect(cancelTaskRequest).toBeCalledWith(id, action);
     });
     it('unlock', () => {

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

@@ -55,7 +55,7 @@ exports[`RunningSteps rendering render with Props 1`] = `
 </div>
 `;
 
-exports[`RunningSteps rendering render without Props 1`] = `
+exports[`RunningSteps rendering render with min Props 1`] = `
 <span>
   No running steps
 </span>

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

@@ -33,7 +33,6 @@ exports[`Task rendering render with some Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          onClick={[Function]}
         >
           <span
             className="glyphicon glyphicon-refresh spin"
@@ -49,6 +48,8 @@ exports[`Task rendering render with some Props 1`] = `
           className="dynflow-button"
           disabled={false}
           href="/foreman_tasks/dynflow/"
+          rel="noopener noreferrer"
+          target="_blank"
         >
           Dynflow console
         </Button>
@@ -149,7 +150,6 @@ exports[`Task rendering render with some Props 1`] = `
       startedAt=""
       state="paused"
       taskReload={true}
-      taskReloadStart={[Function]}
       taskReloadStop={[Function]}
       timeoutId={null}
       username=""
@@ -192,7 +192,6 @@ exports[`Task rendering render without Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          onClick={[Function]}
         >
           <span
             className="glyphicon glyphicon-refresh "
@@ -208,6 +207,8 @@ exports[`Task rendering render without Props 1`] = `
           className="dynflow-button"
           disabled={true}
           href="/foreman_tasks/dynflow/"
+          rel="noopener noreferrer"
+          target="_blank"
         >
           Dynflow console
         </Button>
@@ -284,7 +285,6 @@ exports[`Task rendering render without Props 1`] = `
       startedAt=""
       state=""
       taskReload={false}
-      taskReloadStart={[Function]}
       taskReloadStop={[Function]}
       timeoutId={null}
       username=""

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

@@ -20,6 +20,22 @@ class TaskDetails extends Component {
   componentWillUnmount() {
     this.props.taskReloadStop(this.props.timeoutId);
   }
+  taskProgressToggle = () => {
+    const {
+      timeoutId,
+      refetchTaskDetails,
+      id,
+      loading,
+      taskReloadStop,
+      taskReloadStart,
+    } = this.props;
+    if (timeoutId) {
+      taskReloadStop(timeoutId);
+    } else {
+      taskReloadStart(timeoutId, refetchTaskDetails, id, loading);
+    }
+  };
+
   render() {
     const {
       externalId,
@@ -32,6 +48,7 @@ class TaskDetails extends Component {
       failedSteps,
       runningSteps,
       locks,
+      cancelStep,
     } = this.props;
     const id = getTaskID();
     const resumable = executionPlan ? executionPlan.state === 'paused' : false;
@@ -40,12 +57,23 @@ class TaskDetails extends Component {
       <div className="task-details-react well">
         <Tabs defaultActiveKey={1} animation={false} id="task-details-tabs">
           <Tab eventKey={1} title={__('Task')}>
-            <Task {...{ ...this.props, cancellable, resumable, id }} />
+            <Task
+              {...{
+                ...this.props,
+                cancellable,
+                resumable,
+                id,
+                taskProgressToggle: this.taskProgressToggle,
+              }}
+            />
           </Tab>
           <Tab eventKey={2} title={__('Running Steps')}>
             <RunningSteps
-              executionPlan={executionPlan}
               runningSteps={runningSteps}
+              id={id}
+              cancelStep={cancelStep}
+              taskReload={this.props.taskReload}
+              taskProgressToggle={this.taskProgressToggle}
             />
           </Tab>
           <Tab eventKey={3} title={__('Errors')}>
@@ -67,16 +95,18 @@ class TaskDetails extends Component {
 
 TaskDetails.propTypes = {
   label: PropTypes.string,
-  fetchTaskDetails: PropTypes.func,
+  fetchTaskDetails: PropTypes.func.isRequired,
+  runningSteps: PropTypes.array,
+  cancelStep: PropTypes.func.isRequired,
+  taskReload: PropTypes.bool.isRequired,
   ...Task.propTypes,
-  ...RunningSteps.propTypes,
   ...Errors.propTypes,
   ...Locks.propTypes,
   ...Raw.propTypes,
 };
 TaskDetails.defaultProps = {
   label: '',
-  fetchTaskDetails: () => null,
+  runningSteps: [],
   ...Task.defaultProps,
   ...RunningSteps.defaultProps,
   ...Errors.defaultProps,

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

@@ -1,15 +1,25 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   showLoading,
   hideLoading,
 } from 'foremanReact/components/Layout/LayoutActions';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
 import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_REQUEST,
   FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS,
   FOREMAN_TASK_DETAILS_FETCH_TASK_FAILURE,
   FOREMAN_TASK_DETAILS_STOP_POLLING,
   FOREMAN_TASK_DETAILS_START_POLLING,
+  TASK_STEP_CANCEL_REQUEST,
+  TASK_STEP_CANCEL_FAILURE,
+  TASK_STEP_CANCEL_SUCCESS,
 } from './TaskDetailsConstants';
+import {
+  errorToastData,
+  infoToastData,
+  successToastData,
+} from '../common/ToastsHelpers';
 
 export const taskReloadStop = timeoutId => {
   if (timeoutId) {
@@ -98,3 +108,28 @@ const requestFailure = error => ({
   type: FOREMAN_TASK_DETAILS_FETCH_TASK_FAILURE,
   payload: error,
 });
+
+export const cancelStep = (taskId, stepId) => async dispatch => {
+  dispatch({ type: TASK_STEP_CANCEL_REQUEST });
+  dispatch(addToast(infoToastData(`${__('Trying to cancel step')} ${stepId}`)));
+  try {
+    await API.post(
+      `/foreman_tasks/tasks/${taskId}/cancel_step?step_id=${stepId}`
+    );
+    dispatch({ type: TASK_STEP_CANCEL_SUCCESS });
+    dispatch(addToast(successToastData(`${stepId} {__('Step Canceled')}`)));
+  } catch (error) {
+    dispatch({ type: TASK_STEP_CANCEL_FAILURE, payload: error });
+    dispatch(
+      addToast(
+        errorToastData(
+          `${__('Could not cancel step.')} ${__(
+            'Error:'
+          )} ${stepId} ${error.response &&
+            error.response.data &&
+            error.response.data.error}`
+        )
+      )
+    );
+  }
+};

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

@@ -11,3 +11,7 @@ export const FOREMAN_TASK_DETAILS_STOP_POLLING =
   'FOREMAN_TASK_DETAILS_STOP_POLLING';
 export const FOREMAN_TASK_DETAILS_START_POLLING =
   'FOREMAN_TASK_DETAILS_START_POLLING';
+
+export const TASK_STEP_CANCEL_REQUEST = 'TASK_STEP_CANCEL_REQUEST';
+export const TASK_STEP_CANCEL_FAILURE = 'TASK_STEP_CANCEL_FAILURE';
+export const TASK_STEP_CANCEL_SUCCESS = 'TASK_STEP_CANCEL_SUCCESS';

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

@@ -0,0 +1,8 @@
+export const minProps = {
+  cancelStep: jest.fn(),
+  taskReloadStop: jest.fn(),
+  taskReloadStart: jest.fn(),
+  refetchTaskDetails: jest.fn(),
+  fetchTaskDetails: jest.fn(),
+  taskProgressToggle: jest.fn(),
+};

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

@@ -1,9 +1,10 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskDetails from '../TaskDetails';
+import { minProps } from './TaskDetails.fixtures';
 
 const fixtures = {
-  'render without Props': {},
+  'render with min Props': minProps,
 };
 
 delete window.location;

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

@@ -1,19 +1,35 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   taskReloadStop,
   taskReloadStart,
   fetchTaskDetails,
+  cancelStep,
 } from '../TaskDetailsActions';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 
 API.get.mockImplementation(async () => ({ data: 'some-data' }));
+API.post.mockImplementation(async () => ({ data: 'some-data' }));
 
 const fixtures = {
   'should start reload': () => taskReloadStart(1),
   'should stop reload': () => taskReloadStop(2),
   'should fetch-task-details and success': () => fetchTaskDetails(),
+  'should cancelStep and success': () => cancelStep('task-id', 'step-id'),
+
+  'should fetch-task-details and fail': () => {
+    API.get.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return fetchTaskDetails();
+  },
+  'should cancelStep and fail': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return cancelStep('task-id', 'step-id');
+  },
 };
 
 describe('TaskDetails - Actions', () =>

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TaskDetails rendering render without Props 1`] = `
+exports[`TaskDetails rendering render with min Props 1`] = `
 <div
   className="task-details-react well"
 >
@@ -15,6 +15,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
     >
       <Task
         action=""
+        cancelStep={[MockFunction]}
         cancelTaskRequest={[Function]}
         cancellable={false}
         dynflowEnableConsole={false}
@@ -23,7 +24,23 @@ exports[`TaskDetails rendering render without Props 1`] = `
         executionPlan={Object {}}
         externalId=""
         failedSteps={Array []}
-        fetchTaskDetails={[Function]}
+        fetchTaskDetails={
+          [MockFunction] {
+            "calls": Array [
+              Array [
+                "a15dd820-32f1-4ced-9ab7-c0fab8234c47",
+                null,
+                [MockFunction],
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          }
+        }
         hasSubTasks={false}
         help=""
         id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
@@ -33,7 +50,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
         output={Object {}}
         parentTask=""
         progress={0}
-        refetchTaskDetails={[Function]}
+        refetchTaskDetails={[MockFunction]}
         result="error"
         resumable={false}
         resumeTaskRequest={[Function]}
@@ -42,9 +59,10 @@ exports[`TaskDetails rendering render without Props 1`] = `
         startBefore=""
         startedAt=""
         state=""
+        taskProgressToggle={[Function]}
         taskReload={false}
-        taskReloadStart={[Function]}
-        taskReloadStop={[Function]}
+        taskReloadStart={[MockFunction]}
+        taskReloadStop={[MockFunction]}
         timeoutId={null}
         username=""
         usernamePath=""
@@ -55,8 +73,11 @@ exports[`TaskDetails rendering render without Props 1`] = `
       title="Running Steps"
     >
       <RunningSteps
-        executionPlan={Object {}}
+        cancelStep={[MockFunction]}
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         runningSteps={Array []}
+        taskProgressToggle={[Function]}
+        taskReload={false}
       />
     </Tab>
     <Tab