foreman-tasks 2.0.3 → 3.0.0

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

@@ -6,7 +6,7 @@ const minProps = {
   id: 'task-id1',
   taskReload: true,
   cancelStep: jest.fn(),
-  taskProgressToggle: jest.fn(),
+  taskReloadStart: jest.fn(),
 };
 const fixtures = {
   'render with min Props': minProps,

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

@@ -1,18 +1,13 @@
-import React from 'react';
-import {
-  testComponentSnapshotsWithFixtures,
-  mount,
-  shallow,
-} from '@theforeman/test';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { STATUS } from 'foremanReact/constants';
 import Task from '../Task';
-import {
-  UNLOCK_MODAL,
-  FORCE_UNLOCK_MODAL,
-} from '../../../TaskActions/TaskActionsConstants';
 
 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',
@@ -21,64 +16,11 @@ const fixtures = {
     parentTask: 'parent-id',
     taskReload: true,
     canEdit: true,
+    status: STATUS.RESOLVED,
+    taskProgressToggle: jest.fn(),
+    taskReloadStart: jest.fn(),
   },
 };
 
-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 });
-    });
-  });
-});
+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__/__snapshots__/Task.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Task rendering render with some Props 1`] = `
+exports[`Task rendering render with minimal Props 1`] = `
 <Fragment>
   <UnlockModal
     id="unlockModal"
@@ -20,141 +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}
-        >
-          <span
-            className="glyphicon glyphicon-refresh spin"
-          />
-          Stop  auto-reloading
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="dynflow-button"
-          disabled={false}
-          href="/foreman_tasks/dynflow/"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          <span>
-            Dynflow console
-          </span>
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="resume-button"
-          disabled={true}
-          onClick={[Function]}
-        >
-          Resume
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="cancel-button"
-          disabled={true}
-          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"
-        >
-          Sub tasks
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="unlock-button"
-          disabled={false}
-          onClick={[MockFunction]}
-        >
-          Unlock
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="force-unlock-button"
-          disabled={false}
-          onClick={[MockFunction]}
-        >
-          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=""
-      canEdit={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="parent-id"
+      parentTask=""
       progress={0}
-      refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
       startAt=""
       startBefore=""
       startedAt=""
-      state="paused"
-      taskReload={true}
-      taskReloadStop={[Function]}
-      timeoutId={null}
+      state=""
+      taskProgressToggle={[MockFunction]}
+      taskReload={false}
+      taskReloadStart={[MockFunction]}
       username=""
       usernamePath=""
     />
@@ -162,7 +81,7 @@ 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>
   <UnlockModal
     id="unlockModal"
@@ -182,128 +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}
-        >
-          <span
-            className="glyphicon glyphicon-refresh "
-          />
-          Start  auto-reloading
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="dynflow-button"
-          disabled={true}
-          href="/foreman_tasks/dynflow/"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          <span
-            data-original-title="dynflow_enable_console Setting is off"
-            title="dynflow_enable_console Setting is off"
-          >
-            Dynflow console
-          </span>
-        </Button>
-        <Button
-          active={false}
-          block={false}
-          bsClass="btn"
-          bsSize="small"
-          bsStyle="default"
-          className="resume-button"
-          data-original-title="You do not have permission"
-          disabled={true}
-          onClick={[Function]}
-          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}
-          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>
+      <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=""
-      canEdit={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]}
       startAt=""
       startBefore=""
       startedAt=""
-      state=""
-      taskReload={false}
-      taskReloadStop={[Function]}
-      timeoutId={null}
+      state="paused"
+      status="RESOLVED"
+      taskProgressToggle={[MockFunction]}
+      taskReload={true}
+      taskReloadStart={[MockFunction]}
       username=""
       usernamePath=""
     />