foreman-tasks 1.1.3 → 3.0.0

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

@@ -0,0 +1,168 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Col, Button } from 'patternfly-react';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  UNLOCK_MODAL,
+  FORCE_UNLOCK_MODAL,
+} from '../../TaskActions/TaskActionsConstants';
+
+export const TaskButtons = ({
+  canEdit,
+  dynflowEnableConsole,
+  taskReloadStart,
+  taskProgressToggle,
+  taskReload,
+  externalId,
+  id,
+  action,
+  state,
+  resumable,
+  cancellable,
+  hasSubTasks,
+  parentTask,
+  cancelTaskRequest,
+  resumeTaskRequest,
+}) => {
+  const unlockModalActions = useForemanModal({
+    id: UNLOCK_MODAL,
+  });
+  const forceUnlockModalActions = useForemanModal({
+    id: FORCE_UNLOCK_MODAL,
+  });
+  const editActionsTitle = canEdit
+    ? undefined
+    : __('You do not have permission');
+  const dynflowTitle = dynflowEnableConsole
+    ? undefined
+    : `dynflow_enable_console ${__('Setting is off')}`;
+
+  return (
+    <Col xs={12}>
+      <Button
+        className="reload-button"
+        bsSize="small"
+        onClick={taskProgressToggle}
+      >
+        <span
+          className={`glyphicon glyphicon-refresh ${taskReload ? 'spin' : ''}`}
+        />
+        {__(`${taskReload ? 'Stop' : 'Start'}  auto-reloading`)}
+      </Button>
+      <Button
+        className="dynflow-button"
+        bsSize="small"
+        href={`/foreman_tasks/dynflow/${externalId}`}
+        disabled={!dynflowEnableConsole}
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        <span title={dynflowTitle} data-original-title={dynflowTitle}>
+          {__('Dynflow console')}
+        </span>
+      </Button>
+      <Button
+        className="resume-button"
+        bsSize="small"
+        title={editActionsTitle}
+        data-original-title={editActionsTitle}
+        disabled={!canEdit || !resumable}
+        onClick={() => {
+          if (!taskReload) {
+            taskReloadStart(id);
+          }
+          resumeTaskRequest(id, action);
+        }}
+      >
+        {__('Resume')}
+      </Button>
+      <Button
+        className="cancel-button"
+        bsSize="small"
+        title={editActionsTitle}
+        data-original-title={editActionsTitle}
+        disabled={!canEdit || !cancellable}
+        onClick={() => {
+          if (!taskReload) {
+            taskReloadStart(id);
+          }
+          cancelTaskRequest(id, action);
+        }}
+      >
+        {__('Cancel')}
+      </Button>
+      {parentTask && (
+        <Button
+          className="parent-button"
+          bsSize="small"
+          href={`/foreman_tasks/tasks/${parentTask}`}
+        >
+          {__('Parent task')}
+        </Button>
+      )}
+      {hasSubTasks && (
+        <Button
+          className="subtask-button"
+          bsSize="small"
+          href={`/foreman_tasks/tasks/${id}/sub_tasks`}
+        >
+          {__('Sub tasks')}
+        </Button>
+      )}
+      <Button
+        className="unlock-button"
+        bsSize="small"
+        disabled={!canEdit || state !== 'paused'}
+        onClick={unlockModalActions.setModalOpen}
+        title={editActionsTitle}
+        data-original-title={editActionsTitle}
+      >
+        {__('Unlock')}
+      </Button>
+      <Button
+        className="force-unlock-button"
+        bsSize="small"
+        disabled={!canEdit || state === 'stopped'}
+        onClick={forceUnlockModalActions.setModalOpen}
+        title={editActionsTitle}
+        data-original-title={editActionsTitle}
+      >
+        {__('Force Unlock')}
+      </Button>
+    </Col>
+  );
+};
+
+TaskButtons.propTypes = {
+  canEdit: PropTypes.bool,
+  dynflowEnableConsole: PropTypes.bool,
+  taskReloadStart: PropTypes.func.isRequired,
+  taskProgressToggle: PropTypes.func.isRequired,
+  taskReload: PropTypes.bool,
+  externalId: PropTypes.string,
+  id: PropTypes.string.isRequired,
+  action: PropTypes.string,
+  state: PropTypes.string,
+  resumable: PropTypes.bool,
+  cancellable: PropTypes.bool,
+  hasSubTasks: PropTypes.bool,
+  parentTask: PropTypes.string,
+  cancelTaskRequest: PropTypes.func,
+  resumeTaskRequest: PropTypes.func,
+};
+
+TaskButtons.defaultProps = {
+  canEdit: false,
+  dynflowEnableConsole: false,
+  taskReload: false,
+  externalId: '',
+  action: '',
+  state: '',
+  resumable: false,
+  cancellable: false,
+  hasSubTasks: false,
+  parentTask: '',
+  cancelTaskRequest: () => null,
+  resumeTaskRequest: () => null,
+};

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

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Grid, Row, Col, ProgressBar } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
-import ReactHtmlParser from 'react-html-parser';
 
 class TaskInfo extends Component {
   isDelayed = () => {
@@ -59,7 +58,7 @@ class TaskInfo extends Component {
       state,
       help,
       output,
-      error,
+      errors,
       progress,
       username,
       usernamePath,
@@ -171,7 +170,7 @@ class TaskInfo extends Component {
                   <b>{__('Troubleshooting')}</b>
                 </span>
               </p>
-              <p>{ReactHtmlParser(help)}</p>
+              <p dangerouslySetInnerHTML={{ __html: help }} />
             </Col>
           </Row>
         )}
@@ -187,7 +186,7 @@ class TaskInfo extends Component {
             </Col>
           </Row>
         )}
-        {error && error.length > 0 && (
+        {errors && errors.length > 0 && (
           <Row>
             <Col xs={12}>
               <div>
@@ -195,7 +194,7 @@ class TaskInfo extends Component {
                   <b>{__('Errors:')}</b>
                 </span>
               </div>
-              <pre>{error}</pre>
+              <pre>{errors}</pre>
             </Col>
           </Row>
         )}
@@ -213,7 +212,7 @@ TaskInfo.propTypes = {
   startedAt: PropTypes.string,
   state: PropTypes.string,
   help: PropTypes.string,
-  error: PropTypes.array,
+  errors: PropTypes.array,
   progress: PropTypes.number,
   username: PropTypes.string,
   usernamePath: PropTypes.string,
@@ -232,7 +231,7 @@ TaskInfo.defaultProps = {
   startedAt: '',
   state: '',
   help: '',
-  error: [],
+  errors: [],
   progress: 0,
   username: '',
   usernamePath: '',

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

@@ -0,0 +1,48 @@
+import React from 'react';
+import Skeleton from 'react-loading-skeleton';
+import { Grid, Row, Col } from 'patternfly-react';
+
+export const TaskSkeleton = () => {
+  const details = [1, 2, 3, 4, 5, 6];
+  return (
+    <Grid>
+      <br />
+      <Row>
+        <Col>
+          <Skeleton />
+        </Col>
+      </Row>
+      {details.map((items, key) => (
+        <Row key={key}>
+          <Col md={2} sm={6}>
+            <Skeleton />
+          </Col>
+          <Col md={5} sm={6}>
+            <Skeleton />
+          </Col>
+          <Col md={2} sm={6}>
+            <Skeleton />
+          </Col>
+          <Col md={3} sm={6}>
+            <Skeleton />
+          </Col>
+        </Row>
+      ))}
+      <br />
+      <Row>
+        <Col xs={6}>
+          <div className="progress-description">
+            <Skeleton />
+          </div>
+        </Col>
+        <Col xs={3} xsOffset={3} className="progress-label-top-right">
+          <Skeleton />
+        </Col>
+        <Col xs={12}>
+          <Skeleton />
+        </Col>
+      </Row>
+      <br />
+    </Grid>
+  );
+};

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(),
+  taskReloadStart: 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,19 +1,26 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import { STATUS } from 'foremanReact/constants';
 import Task from '../Task';
 
 const fixtures = {
-  'render without Props': { id: 'test' },
+  'render with minimal Props': {
+    id: 'test',
+    taskReloadStart: jest.fn(),
+    taskProgressToggle: jest.fn(),
+  },
   'render with some Props': {
     id: 'test',
     state: 'paused',
     hasSubTasks: true,
-    allowDangerousActions: true,
     dynflowEnableConsole: true,
+    parentTask: 'parent-id',
+    taskReload: true,
+    canEdit: true,
+    status: STATUS.RESOLVED,
+    taskProgressToggle: jest.fn(),
+    taskReloadStart: jest.fn(),
   },
 };
 
-describe('Task', () => {
-  describe('rendering', () =>
-    testComponentSnapshotsWithFixtures(Task, fixtures));
-});
+describe('Task rendering', () =>
+  testComponentSnapshotsWithFixtures(Task, fixtures));

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

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

@@ -1,26 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Task rendering render with some Props 1`] = `
+exports[`Task rendering render with minimal 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"
@@ -31,116 +20,60 @@ exports[`Task rendering render with some Props 1`] = `
       bsClass="row"
       componentClass="div"
     >
-      <Col
-        bsClass="col"
-        componentClass="div"
-        xs={12}
-      >
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="reload-button"
-          disabled={false}
-          hidden={false}
-          onClick={[Function]}
-        >
-          <span
-            className="glyphicon glyphicon-refresh "
-          />
-          Start  auto-reloading
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          disabled={false}
-          href="/foreman_tasks/dynflow/"
-        >
-          Dynflow console
-        </Button>
-        <ResumeButton
-          disabled={true}
-          id="test"
-          name=""
-          onClick={[Function]}
-        />
-        <CancelButton
-          disabled={true}
-          id="test"
-          name=""
-          onClick={[Function]}
-        />
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          disabled={false}
-          href="/foreman_tasks/tasks/test/sub_tasks"
-        >
-          Sub tasks
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          disabled={false}
-          onClick={[Function]}
-        >
-          Unlock
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          disabled={false}
-          onClick={[Function]}
-        >
-          Force Unlock
-        </Button>
-      </Col>
+      <TaskButtons
+        action=""
+        canEdit={false}
+        cancelTaskRequest={[Function]}
+        cancellable={false}
+        dynflowEnableConsole={false}
+        endedAt=""
+        errors={Array []}
+        externalId=""
+        hasSubTasks={false}
+        help=""
+        id="test"
+        output=""
+        parentTask=""
+        progress={0}
+        result="error"
+        resumable={false}
+        resumeTaskRequest={[Function]}
+        startAt=""
+        startBefore=""
+        startedAt=""
+        state=""
+        taskProgressToggle={[MockFunction]}
+        taskReload={false}
+        taskReloadStart={[MockFunction]}
+        username=""
+        usernamePath=""
+      />
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={true}
+      canEdit={false}
       cancelTaskRequest={[Function]}
       cancellable={false}
-      dynflowEnableConsole={true}
+      dynflowEnableConsole={false}
       endedAt=""
-      error={Array []}
+      errors={Array []}
       externalId=""
-      hasSubTasks={true}
+      hasSubTasks={false}
       help=""
       id="test"
       output=""
       parentTask=""
       progress={0}
-      refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
-      showForceUnlockModal={false}
-      showUnlockModal={false}
       startAt=""
       startBefore=""
       startedAt=""
-      state="paused"
+      state=""
+      taskProgressToggle={[MockFunction]}
       taskReload={false}
-      taskReloadStart={[Function]}
-      taskReloadStop={[Function]}
-      timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
+      taskReloadStart={[MockFunction]}
       username=""
       usernamePath=""
     />
@@ -148,27 +81,16 @@ exports[`Task rendering render with some Props 1`] = `
 </Fragment>
 `;
 
-exports[`Task rendering render without Props 1`] = `
+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"
@@ -179,83 +101,62 @@ exports[`Task rendering render without Props 1`] = `
       bsClass="row"
       componentClass="div"
     >
-      <Col
-        bsClass="col"
-        componentClass="div"
-        xs={12}
-      >
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="reload-button"
-          disabled={false}
-          hidden={true}
-          onClick={[Function]}
-        >
-          <span
-            className="glyphicon glyphicon-refresh "
-          />
-          Start  auto-reloading
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          disabled={true}
-          href="/foreman_tasks/dynflow/"
-        >
-          Dynflow console
-        </Button>
-        <ResumeButton
-          disabled={true}
-          id="test"
-          name=""
-          onClick={[Function]}
-        />
-        <CancelButton
-          disabled={true}
-          id="test"
-          name=""
-          onClick={[Function]}
-        />
-      </Col>
+      <TaskButtons
+        action=""
+        canEdit={true}
+        cancelTaskRequest={[Function]}
+        cancellable={false}
+        dynflowEnableConsole={true}
+        endedAt=""
+        errors={Array []}
+        externalId=""
+        hasSubTasks={true}
+        help=""
+        id="test"
+        output=""
+        parentTask="parent-id"
+        progress={0}
+        result="error"
+        resumable={false}
+        resumeTaskRequest={[Function]}
+        startAt=""
+        startBefore=""
+        startedAt=""
+        state="paused"
+        status="RESOLVED"
+        taskProgressToggle={[MockFunction]}
+        taskReload={true}
+        taskReloadStart={[MockFunction]}
+        username=""
+        usernamePath=""
+      />
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={false}
+      canEdit={true}
       cancelTaskRequest={[Function]}
       cancellable={false}
-      dynflowEnableConsole={false}
+      dynflowEnableConsole={true}
       endedAt=""
-      error={Array []}
+      errors={Array []}
       externalId=""
-      hasSubTasks={false}
+      hasSubTasks={true}
       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=""
-      taskReload={false}
-      taskReloadStart={[Function]}
-      taskReloadStop={[Function]}
-      timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
+      state="paused"
+      status="RESOLVED"
+      taskProgressToggle={[MockFunction]}
+      taskReload={true}
+      taskReloadStart={[MockFunction]}
       username=""
       usernamePath=""
     />