foreman-tasks 2.0.0 → 3.0.2

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

@@ -0,0 +1,8 @@
+export const minProps = {
+  cancelStep: jest.fn(),
+  taskReload: false,
+  taskReloadStop: jest.fn(),
+  taskReloadStart: jest.fn(),
+  taskProgressToggle: jest.fn(),
+  status: 'RESOLVED',
+};

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

@@ -1,9 +1,16 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskDetails from '../TaskDetails';
+import { minProps } from './TaskDetails.fixtures';
 
 const fixtures = {
-  'render without Props': {},
+  'render with loading Props': { ...minProps, isLoading: true },
+  'render with error Props': {
+    ...minProps,
+    status: 'ERROR',
+    APIerror: { message: 'some-error' },
+  },
+  'render with min Props': minProps,
 };
 
 delete window.location;

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

@@ -1,19 +1,19 @@
 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 stop reload': () => taskReloadStop(),
+  'should cancelStep': () => cancelStep('task-id', 'step-id'),
 };
 
 describe('TaskDetails - Actions', () =>

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

@@ -1,6 +1,80 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TaskDetails rendering render without Props 1`] = `
+exports[`TaskDetails rendering render with error Props 1`] = `
+<MessageBox
+  icontype="error-circle-o"
+  key="task-details-error"
+  msg="Could not receive data: some-error"
+/>
+`;
+
+exports[`TaskDetails rendering render with loading Props 1`] = `
+<div
+  className="task-details-react well"
+>
+  <ForwardRef
+    animation={false}
+    defaultActiveKey={1}
+    id="task-details-tabs"
+  >
+    <Tab
+      eventKey={1}
+      title="Task"
+    >
+      <TaskSkeleton />
+    </Tab>
+    <Tab
+      disabled={true}
+      eventKey={2}
+      title="Running Steps"
+    >
+      <RunningSteps
+        cancelStep={[MockFunction]}
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
+        runningSteps={Array []}
+        taskReload={false}
+        taskReloadStart={[MockFunction]}
+      />
+    </Tab>
+    <Tab
+      disabled={true}
+      eventKey={3}
+      title="Errors"
+    >
+      <Errors
+        executionPlan={Object {}}
+        failedSteps={Array []}
+      />
+    </Tab>
+    <Tab
+      disabled={true}
+      eventKey={4}
+      title="Locks"
+    >
+      <Locks
+        locks={Array []}
+      />
+    </Tab>
+    <Tab
+      disabled={true}
+      eventKey={5}
+      title="Raw"
+    >
+      <Raw
+        endedAt=""
+        externalId=""
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
+        input={Array []}
+        label=""
+        output={Object {}}
+        startedAt=""
+      />
+    </Tab>
+  </ForwardRef>
+</div>
+`;
+
+exports[`TaskDetails rendering render with min Props 1`] = `
 <div
   className="task-details-react well"
 >
@@ -15,37 +89,32 @@ exports[`TaskDetails rendering render without Props 1`] = `
     >
       <Task
         action=""
+        canEdit={false}
         cancelTaskRequest={[Function]}
         cancellable={false}
         dynflowEnableConsole={false}
         endedAt=""
-        error={Array []}
-        executionPlan={Object {}}
+        errors={Array []}
         externalId=""
-        failedSteps={Array []}
-        fetchTaskDetails={[Function]}
         hasSubTasks={false}
         help=""
         id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         input={Array []}
         label=""
-        locks={Array []}
         output={Object {}}
         parentTask=""
         progress={0}
-        refetchTaskDetails={[Function]}
         result="error"
         resumable={false}
         resumeTaskRequest={[Function]}
-        runningSteps={Array []}
         startAt=""
         startBefore=""
         startedAt=""
         state=""
+        status="RESOLVED"
+        taskProgressToggle={[Function]}
         taskReload={false}
-        taskReloadStart={[Function]}
-        taskReloadStop={[Function]}
-        timeoutId={null}
+        taskReloadStart={[MockFunction]}
         username=""
         usernamePath=""
       />
@@ -55,8 +124,11 @@ exports[`TaskDetails rendering render without Props 1`] = `
       title="Running Steps"
     >
       <RunningSteps
-        executionPlan={Object {}}
+        cancelStep={[MockFunction]}
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         runningSteps={Array []}
+        taskReload={false}
+        taskReloadStart={[MockFunction]}
       />
     </Tab>
     <Tab

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

@@ -1,43 +1,47 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TaskDetails - Actions should fetch-task-details and success 1`] = `
+exports[`TaskDetails - Actions should cancelStep 1`] = `
 Array [
   Array [
     Object {
-      "type": "FOREMAN_TASK_DETAILS_FETCH_TASK_REQUEST",
+      "payload": Object {
+        "message": Object {
+          "message": "Trying to cancel step step-id",
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
     },
   ],
   Array [
     Object {
-      "payload": "some-data",
-      "type": "FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS",
+      "handleError": [Function],
+      "handleSuccess": [Function],
+      "key": "TASK_STEP_CANCEL",
+      "type": "post-some-type",
+      "url": "foreman/foreman_tasks/tasks/task-id/cancel_step?step_id=step-id",
     },
   ],
+]
+`;
+
+exports[`TaskDetails - Actions should start reload 1`] = `
+Array [
   Array [
     Object {
-      "payload": Object {
-        "timeoutId": 7,
-      },
-      "type": "FOREMAN_TASK_DETAILS_START_POLLING",
+      "handleError": [Function],
+      "handleSuccess": [Function],
+      "interval": 5000,
+      "key": "FOREMAN_TASK_DETAILS",
+      "type": "get-some-type",
+      "url": "foreman/foreman_tasks/api/tasks/1/details?include_permissions",
     },
   ],
 ]
 `;
 
-exports[`TaskDetails - Actions should start reload 1`] = `
-Object {
-  "payload": Object {
-    "timeoutId": 1,
-  },
-  "type": "FOREMAN_TASK_DETAILS_START_POLLING",
-}
-`;
-
 exports[`TaskDetails - Actions should stop reload 1`] = `
 Object {
-  "payload": Object {
-    "timeoutId": 2,
-  },
-  "type": "FOREMAN_TASK_DETAILS_STOP_POLLING",
+  "type": "stop",
 }
 `;

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

@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import TaskDetails from './TaskDetails';
 import * as taskDetailsActions from './TaskDetailsActions';
 import * as taskActions from '../TaskActions';
-import reducer from './TaskDetailsReducer';
 import {
   selectEndedAt,
   selectStartAt,
@@ -32,6 +31,10 @@ import {
   selectParentTask,
   selectExternalId,
   selectDynflowEnableConsole,
+  selectCanEdit,
+  selectStatus,
+  selectAPIError,
+  selectIsLoading,
 } from './TaskDetailsSelectors';
 
 const mapStateToProps = state => ({
@@ -62,11 +65,13 @@ const mapStateToProps = state => ({
   parentTask: selectParentTask(state),
   externalId: selectExternalId(state),
   dynflowEnableConsole: selectDynflowEnableConsole(state),
+  canEdit: selectCanEdit(state),
+  status: selectStatus(state),
+  APIerror: selectAPIError(state),
+  isLoading: selectIsLoading(state),
 });
 
 const mapDispatchToProps = dispatch =>
   bindActionCreators({ ...taskActions, ...taskDetailsActions }, dispatch);
 
-export const reducers = { taskDetails: reducer };
-
 export default connect(mapStateToProps, mapDispatchToProps)(TaskDetails);

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/ScheduledTasksCard/ScheduledTasksCard.scss

@@ -1,15 +1,19 @@
 .scheduled-tasks-card {
   text-align: center;
+
   .scheduled-data {
+    margin-top: 30px;
     padding-right: 15px;
     cursor: pointer;
     font-size: 40px;
     font-weight: 300;
     transition: font-weight 50ms ease-in;
+
     p {
       font-size: 20px;
       margin: 0;
     }
+
     * {
       margin: 10px;
     }

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.js

@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import { Icon, Button, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
+  TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS,
+} from '../../../../TasksDashboardConstants';
+import { queryPropType } from '../../../../TasksDashboardPropTypes';
+
+const tooltip = (
+  <Tooltip id="stopped-tooltip">
+    {__('Other includes all stopped tasks that are cancelled or pending')}
+  </Tooltip>
+);
+
+export const OtherInfo = ({ updateQuery, otherCount, query }) => {
+  const { OTHER } = TASKS_DASHBOARD_AVAILABLE_QUERY_RESULTS;
+  const { STOPPED } = TASKS_DASHBOARD_AVAILABLE_QUERY_STATES;
+  const active = query.state === STOPPED && query.result === OTHER;
+  return (
+    <span className={classNames(active && 'other-active')}>
+      <OverlayTrigger
+        overlay={tooltip}
+        trigger={['hover', 'focus']}
+        placement="bottom"
+      >
+        <span>
+          <Icon type="pf" name="info" />
+          <span>{__('Other:')} </span>
+        </span>
+      </OverlayTrigger>
+      <Button
+        bsStyle="link"
+        onClick={() =>
+          updateQuery({
+            state: STOPPED,
+            result: OTHER,
+          })
+        }
+      >
+        {otherCount}
+      </Button>
+    </span>
+  );
+};
+OtherInfo.propTypes = {
+  updateQuery: PropTypes.func.isRequired,
+  otherCount: PropTypes.number.isRequired,
+  query: queryPropType.isRequired,
+};

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/OtherInfo.test.js

@@ -0,0 +1,14 @@
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+
+import { OtherInfo } from './OtherInfo';
+
+const fixtures = {
+  render: {
+    updateQuery: jest.fn,
+    otherCount: 7,
+    query: { state: 'STOPPED', result: 'OTHER' },
+  },
+};
+
+describe('OtherInfo', () =>
+  testComponentSnapshotsWithFixtures(OtherInfo, fixtures));

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/StoppedTasksCard/StoppedTasksCard.js

@@ -4,8 +4,8 @@ import { Card } from 'patternfly-react';
 import classNames from 'classnames';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
-
-import { StoppedTable } from './StoppedTasksCardHelper';
+import { OtherInfo } from './OtherInfo';
+import { StoppedTable } from './StoppedTasksCardTable';
 import {
   timePropType,
   queryPropType,
@@ -14,7 +14,6 @@ import {
   TASKS_DASHBOARD_AVAILABLE_TIMES,
   TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
 } from '../../../../TasksDashboardConstants';
-import { getQueryValueText } from '../../../../TasksDashboardHelper';
 import './StoppedTasksCard.scss';
 
 const StoppedTasksCard = ({
@@ -44,16 +43,19 @@ const StoppedTasksCard = ({
         {__('Stopped')}
       </Card.Title>
       <Card.Body>
-        <table className="table table-bordered table-striped stopped-table">
-          <thead>
-            <tr>
-              <th />
-              <th>{__('Total')}</th>
-              <th>{getQueryValueText(time)}</th>
-            </tr>
-          </thead>
-          <tbody>{StoppedTable(data, query, time, updateQuery)}</tbody>
-        </table>
+        <React.Fragment>
+          <StoppedTable
+            data={data.results}
+            query={query}
+            time={time}
+            updateQuery={updateQuery}
+          />
+          <OtherInfo
+            updateQuery={updateQuery}
+            otherCount={data.other}
+            query={query}
+          />
+        </React.Fragment>
       </Card.Body>
     </Card>
   );
@@ -66,9 +68,12 @@ const resultPropType = PropTypes.shape({
 
 StoppedTasksCard.propTypes = {
   data: PropTypes.shape({
-    error: resultPropType.isRequired,
-    warning: resultPropType.isRequired,
-    success: resultPropType.isRequired,
+    results: PropTypes.shape({
+      error: resultPropType.isRequired,
+      warning: resultPropType.isRequired,
+      success: resultPropType.isRequired,
+    }),
+    other: PropTypes.number,
   }),
   time: timePropType,
   query: queryPropType,
@@ -78,9 +83,12 @@ StoppedTasksCard.propTypes = {
 
 StoppedTasksCard.defaultProps = {
   data: {
-    error: { total: 0, last: 0 },
-    warning: { total: 0, last: 0 },
-    success: { total: 0, last: 0 },
+    results: {
+      error: { total: 0, last: 0 },
+      warning: { total: 0, last: 0 },
+      success: { total: 0, last: 0 },
+    },
+    other: 0,
   },
   time: TASKS_DASHBOARD_AVAILABLE_TIMES.H24,
   query: {},