foreman-tasks 1.1.2 → 2.0.2

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

@@ -1,6 +1,15 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import {
+  testComponentSnapshotsWithFixtures,
+  mount,
+  shallow,
+} from '@theforeman/test';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import Task from '../Task';
+import {
+  UNLOCK_MODAL,
+  FORCE_UNLOCK_MODAL,
+} from '../../../TaskActions/TaskActionsConstants';
 
 const fixtures = {
   'render without Props': { id: 'test' },
@@ -8,12 +17,68 @@ const fixtures = {
     id: 'test',
     state: 'paused',
     hasSubTasks: true,
-    allowDangerousActions: true,
     dynflowEnableConsole: true,
+    parentTask: 'parent-id',
+    taskReload: true,
+    canEdit: true,
   },
 };
 
 describe('Task', () => {
   describe('rendering', () =>
     testComponentSnapshotsWithFixtures(Task, fixtures));
+  describe('click test', () => {
+    const setModalOpen = jest.fn();
+    useForemanModal.mockImplementation(id => ({
+      setModalOpen: () => setModalOpen(id),
+    }));
+    const cancelTaskRequest = jest.fn();
+    const resumeTaskRequest = jest.fn();
+    const taskProgressToggle = jest.fn();
+    const id = 'some-id';
+    const action = 'some-action';
+    const props = {
+      taskReload: false,
+      id,
+      action,
+      cancelTaskRequest,
+      resumeTaskRequest,
+      taskProgressToggle,
+    };
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+    it('reload', () => {
+      const component = mount(<Task {...props} />);
+      const reloadButton = component.find('.reload-button').at(0);
+      reloadButton.simulate('click');
+      expect(taskProgressToggle).toBeCalled();
+    });
+    it('resume', () => {
+      const component = shallow(<Task {...props} />);
+      const resumeButton = component.find('.resume-button').at(0);
+      resumeButton.props().onClick();
+      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(taskProgressToggle).toBeCalled();
+      expect(cancelTaskRequest).toBeCalledWith(id, action);
+    });
+    it('unlock', () => {
+      const component = shallow(<Task {...props} />);
+      const unlockButton = component.find('.unlock-button').at(0);
+      unlockButton.props().onClick();
+      expect(setModalOpen).toBeCalledWith({ id: UNLOCK_MODAL });
+    });
+    it('focrce unlock', () => {
+      const component = shallow(<Task {...props} />);
+      const forceUnlockButton = component.find('.force-unlock-button').at(0);
+      forceUnlockButton.props().onClick();
+      expect(setModalOpen).toBeCalledWith({ id: FORCE_UNLOCK_MODAL });
+    });
+  });
 });

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

@@ -41,7 +41,6 @@ const fixtures = {
     help:
       "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved.\nThe recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task.",
     hasSubTasks: false,
-    allowDangerousActions: false,
     locks: [
       {
         name: 'task_owner',

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

@@ -2,25 +2,14 @@
 
 exports[`Task rendering render with some Props 1`] = `
 <Fragment>
-  <ClickConfirmation
-    body="This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-    closeModal={[Function]}
-    confirmAction="Unlock"
-    confirmType="warning"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/unlock"
-    showModal={false}
-    title="Unlock"
+  <UnlockModal
+    id="unlockModal"
+    onClick={[Function]}
   />
-  <ClickConfirmation
-    body="Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck"
-    closeModal={[Function]}
-    confirmAction="Force Unlock"
-    confirmType="danger"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/force_unlock"
-    showModal={false}
-    title="Force Unlock"
+  <ForceUnlockModal
+    id="forceUnlockModal"
+    onClick={[Function]}
+    selectedRowsLen={1}
   />
   <Grid
     bsClass="container"
@@ -44,13 +33,11 @@ exports[`Task rendering render with some Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          hidden={false}
-          onClick={[Function]}
         >
           <span
-            className="glyphicon glyphicon-refresh "
+            className="glyphicon glyphicon-refresh spin"
           />
-          Start  auto-reloading
+          Stop  auto-reloading
         </Button>
         <Button
           active={false}
@@ -58,29 +45,59 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="dynflow-button"
           disabled={false}
           href="/foreman_tasks/dynflow/"
+          rel="noopener noreferrer"
+          target="_blank"
         >
-          Dynflow console
+          <span>
+            Dynflow console
+          </span>
         </Button>
-        <ResumeButton
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="resume-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
-        <CancelButton
+        >
+          Resume
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="cancel-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
+        >
+          Cancel
+        </Button>
         <Button
           active={false}
           block={false}
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="parent-button"
+          disabled={false}
+          href="/foreman_tasks/tasks/parent-id"
+        >
+          Parent task
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="subtask-button"
           disabled={false}
           href="/foreman_tasks/tasks/test/sub_tasks"
         >
@@ -92,8 +109,9 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="unlock-button"
           disabled={false}
-          onClick={[Function]}
+          onClick={[MockFunction]}
         >
           Unlock
         </Button>
@@ -103,8 +121,9 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="force-unlock-button"
           disabled={false}
-          onClick={[Function]}
+          onClick={[MockFunction]}
         >
           Force Unlock
         </Button>
@@ -112,7 +131,7 @@ exports[`Task rendering render with some Props 1`] = `
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={true}
+      canEdit={true}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={true}
@@ -123,24 +142,19 @@ exports[`Task rendering render with some Props 1`] = `
       help=""
       id="test"
       output=""
-      parentTask=""
+      parentTask="parent-id"
       progress={0}
       refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
-      showForceUnlockModal={false}
-      showUnlockModal={false}
       startAt=""
       startBefore=""
       startedAt=""
       state="paused"
-      taskReload={false}
-      taskReloadStart={[Function]}
+      taskReload={true}
       taskReloadStop={[Function]}
       timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
       username=""
       usernamePath=""
     />
@@ -150,25 +164,14 @@ exports[`Task rendering render with some Props 1`] = `
 
 exports[`Task rendering render without Props 1`] = `
 <Fragment>
-  <ClickConfirmation
-    body="This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-    closeModal={[Function]}
-    confirmAction="Unlock"
-    confirmType="warning"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/unlock"
-    showModal={false}
-    title="Unlock"
+  <UnlockModal
+    id="unlockModal"
+    onClick={[Function]}
   />
-  <ClickConfirmation
-    body="Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck"
-    closeModal={[Function]}
-    confirmAction="Force Unlock"
-    confirmType="danger"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/force_unlock"
-    showModal={false}
-    title="Force Unlock"
+  <ForceUnlockModal
+    id="forceUnlockModal"
+    onClick={[Function]}
+    selectedRowsLen={1}
   />
   <Grid
     bsClass="container"
@@ -192,8 +195,6 @@ exports[`Task rendering render without Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          hidden={true}
-          onClick={[Function]}
         >
           <span
             className="glyphicon glyphicon-refresh "
@@ -206,28 +207,80 @@ exports[`Task rendering render without Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="dynflow-button"
           disabled={true}
           href="/foreman_tasks/dynflow/"
+          rel="noopener noreferrer"
+          target="_blank"
         >
-          Dynflow console
+          <span
+            data-original-title="dynflow_enable_console Setting is off"
+            title="dynflow_enable_console Setting is off"
+          >
+            Dynflow console
+          </span>
         </Button>
-        <ResumeButton
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="resume-button"
+          data-original-title="You do not have permission"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
-        <CancelButton
+          title="You do not have permission"
+        >
+          Resume
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="cancel-button"
+          data-original-title="You do not have permission"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
+          title="You do not have permission"
+        >
+          Cancel
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="unlock-button"
+          data-original-title="You do not have permission"
+          disabled={true}
+          onClick={[MockFunction]}
+          title="You do not have permission"
+        >
+          Unlock
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="force-unlock-button"
+          data-original-title="You do not have permission"
+          disabled={true}
+          onClick={[MockFunction]}
+          title="You do not have permission"
+        >
+          Force Unlock
+        </Button>
       </Col>
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={false}
+      canEdit={false}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={false}
@@ -244,18 +297,13 @@ exports[`Task rendering render without Props 1`] = `
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
-      showForceUnlockModal={false}
-      showUnlockModal={false}
       startAt=""
       startBefore=""
       startedAt=""
       state=""
       taskReload={false}
-      taskReloadStart={[Function]}
       taskReloadStop={[Function]}
       timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
       username=""
       usernamePath=""
     />

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,