foreman-tasks 0.17.0 → 0.17.1

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTableReducer.test.js.snap

@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TasksTablePaginationReducer reducer should handle TASKS_TABLE_SET_PAGINATION 1`] = `
+Object {
+  "tasksTableQuery": Object {},
+}
+`;
+
+exports[`TasksTablePaginationReducer reducer should handle TASKS_TABLE_SET_SORT 1`] = `
+Object {
+  "tasksTableQuery": Object {},
+}
+`;
+
+exports[`TasksTablePaginationReducer reducer should handle TASKS_TABLE_SUCCESS 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "actionName": undefined,
+    "itemCount": 120,
+    "pagination": Object {
+      "page": 3,
+      "perPage": 12,
+    },
+  },
+}
+`;
+
+exports[`TasksTablePaginationReducer reducer should return the initial state 1`] = `
+Object {
+  "tasksTableQuery": Object {},
+}
+`;

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

@@ -0,0 +1,32 @@
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import TasksTablePage from './TasksTablePage';
+import reducer from './TasksTableReducer';
+import * as actions from './TasksTableActions';
+import {
+  selectStatus,
+  selectError,
+  selectResults,
+  selectPagitation,
+  selectItemCount,
+  selectSort,
+  selectActionName,
+} from './TasksTableSelectors';
+
+const mapStateToProps = state => ({
+  status: selectStatus(state),
+  error: selectError(state),
+  sort: selectSort(state),
+  results: selectResults(state),
+  pagination: selectPagitation(state),
+  itemCount: selectItemCount(state),
+  actionName: selectActionName(state),
+});
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+export const reducers = { tasksTable: reducer };
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TasksTablePage);

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { CancelButton } from './CancelButton';
+import { ResumeButton } from './ResumeButton';
+
+export const ActionButton = ({ id, name, availableActions, taskActions }) => {
+  const isResume = availableActions.resumable;
+  if (isResume) {
+    return (
+      <ResumeButton
+        id={id}
+        name={name}
+        onClick={taskActions.resume}
+        disabled={false}
+      />
+    );
+  }
+  return (
+    <CancelButton
+      id={id}
+      name={name}
+      disabled={!availableActions.cancellable}
+      onClick={taskActions.cancel}
+    />
+  );
+};
+
+ActionButton.propTypes = {
+  id: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  availableActions: PropTypes.shape({
+    cancellable: PropTypes.bool,
+    resumable: PropTypes.bool,
+  }).isRequired,
+  taskActions: PropTypes.shape({
+    cancel: PropTypes.func,
+    resume: PropTypes.func,
+  }).isRequired,
+};

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js

@@ -0,0 +1,45 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import { ActionButton } from './ActionButton';
+
+const fixtures = {
+  'render with cancellable true props': {
+    availableActions: {
+      cancellable: true,
+      resumable: false,
+    },
+    taskActions: {
+      cancel: jest.fn(),
+      resume: jest.fn(),
+    },
+    id: 'id',
+    name: 'some-name',
+  },
+  'render with resumable true props': {
+    availableActions: {
+      cancellable: false,
+      resumable: true,
+    },
+    taskActions: {
+      cancel: jest.fn(),
+      resume: jest.fn(),
+    },
+    id: 'id',
+    name: 'some-name',
+  },
+  'render with cancellable false props': {
+    availableActions: {
+      cancellable: false,
+      resumable: false,
+    },
+    taskActions: {
+      cancel: jest.fn(),
+      resume: jest.fn(),
+    },
+    id: 'id',
+    name: 'some-name',
+  },
+};
+
+describe('ActionButton', () =>
+  testComponentSnapshotsWithFixtures(ActionButton, fixtures));

data/webpack/ForemanTasks/Components/common/ActionButtons/CancelButton.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Button } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+export const CancelButton = ({ id, name, disabled, onClick }) => (
+  <Button bsSize="small" onClick={() => onClick(id, name)} disabled={disabled}>
+    {__('Cancel')}
+  </Button>
+);
+
+CancelButton.propTypes = {
+  id: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  disabled: PropTypes.bool,
+  onClick: PropTypes.func,
+};
+
+CancelButton.defaultProps = {
+  disabled: false,
+  onClick: noop,
+};

data/webpack/ForemanTasks/Components/common/ActionButtons/CancelButton.test.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { shallow } from 'enzyme';
+import { CancelButton } from './CancelButton';
+
+const fixtures = {
+  'render with minimal props': {
+    id: 'some-id',
+    name: 'some-name',
+  },
+};
+
+describe('CancelButton', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(CancelButton, fixtures));
+  describe('should use id and name on click', () => {
+    const onClick = jest.fn();
+    const id = 'some-id';
+    const name = 'some-name';
+    const component = shallow(
+      <CancelButton id={id} name={name} onClick={onClick} />
+    );
+    component.find('Button').simulate('click');
+
+    expect(onClick).toHaveBeenCalledWith(id, name);
+  });
+});

data/webpack/ForemanTasks/Components/common/ActionButtons/ResumeButton.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Button } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+export const ResumeButton = ({ id, name, disabled, onClick }) => (
+  <Button bsSize="small" onClick={() => onClick(id, name)} disabled={disabled}>
+    {__('Resume')}
+  </Button>
+);
+
+ResumeButton.propTypes = {
+  id: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  onClick: PropTypes.func,
+  disabled: PropTypes.bool,
+};
+
+ResumeButton.defaultProps = {
+  disabled: false,
+  onClick: noop,
+};

data/webpack/ForemanTasks/Components/common/ActionButtons/ResumeButton.test.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { shallow } from 'enzyme';
+import { ResumeButton } from './ResumeButton';
+
+const fixtures = {
+  'render with minimal props': {
+    id: 'some-id',
+    name: 'some-name',
+  },
+};
+
+describe('ResumeButton', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(ResumeButton, fixtures));
+  describe('should use id and name on click', () => {
+    const onClick = jest.fn();
+    const id = 'some-id';
+    const name = 'some-name';
+    const component = shallow(
+      <ResumeButton id={id} name={name} onClick={onClick} />
+    );
+    component.find('Button').simulate('click');
+
+    expect(onClick).toHaveBeenCalledWith(id, name);
+  });
+});

data/webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ActionButton.test.js.snap

@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ActionButton render with cancellable false props 1`] = `
+<CancelButton
+  disabled={true}
+  id="id"
+  name="some-name"
+  onClick={[MockFunction]}
+/>
+`;
+
+exports[`ActionButton render with cancellable true props 1`] = `
+<CancelButton
+  disabled={false}
+  id="id"
+  name="some-name"
+  onClick={[MockFunction]}
+/>
+`;
+
+exports[`ActionButton render with resumable true props 1`] = `
+<ResumeButton
+  disabled={false}
+  id="id"
+  name="some-name"
+  onClick={[MockFunction]}
+/>
+`;

data/webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/CancelButton.test.js.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CancelButton rendering render with minimal props 1`] = `
+<Button
+  active={false}
+  block={false}
+  bsClass="btn"
+  bsSize="small"
+  bsStyle="default"
+  disabled={false}
+  onClick={[Function]}
+>
+  Cancel
+</Button>
+`;

data/webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ResumeButton.test.js.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ResumeButton rendering render with minimal props 1`] = `
+<Button
+  active={false}
+  block={false}
+  bsClass="btn"
+  bsSize="small"
+  bsStyle="default"
+  disabled={false}
+  onClick={[Function]}
+>
+  Resume
+</Button>
+`;

data/webpack/ForemanTasks/ForemanTasks.js

@@ -1,26 +1,10 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
-import { LinkContainer } from 'react-router-bootstrap';
-import { ButtonGroup, Button } from 'patternfly-react';
-
-import routes from './Routes/ForemanTasksRoutes';
 import ForemanTasksRouter from './Routes/ForemanTasksRouter';
 
 const ForemanTasks = () => (
   <BrowserRouter>
-    <div>
-      <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
-        <ButtonGroup bsSize="large">
-          <LinkContainer to={routes.indexTasks.path}>
-            <Button bsStyle="link">index-tasks-page</Button>
-          </LinkContainer>
-          <LinkContainer to={routes.showTask.path.replace(':id', 'some-id')}>
-            <Button bsStyle="link">show-task-page</Button>
-          </LinkContainer>
-        </ButtonGroup>
-      </div>
-      <ForemanTasksRouter />
-    </div>
+    <ForemanTasksRouter />
   </BrowserRouter>
 );
 

data/webpack/ForemanTasks/ForemanTasksReducers.js

@@ -1,11 +1,13 @@
 import { combineReducers } from 'redux';
 import { reducers as tasksDashboardReducers } from './Components/TasksDashboard';
 import { reducers as taskDetailsReducers } from './Components/TaskDetails';
+import { reducers as tasksTableReducers } from './Components/TasksTable';
 
 const reducers = {
   foremanTasks: combineReducers({
     ...tasksDashboardReducers,
     ...taskDetailsReducers,
+    ...tasksTableReducers,
   }),
 };
 

data/webpack/ForemanTasks/Routes/ForemanTasksRouter.test.js

@@ -15,7 +15,11 @@ jest.mock('./ForemanTasksRoutes', () => ({
 }));
 
 const fixtures = {
-  'render without Props': {},
+  'render without Props': {
+    history: {
+      push: jest.fn(),
+    },
+  },
 };
 
 describe('ForemanTasksRouter', () =>

data/webpack/ForemanTasks/Routes/ForemanTasksRoutes.js

@@ -1,12 +1,18 @@
 import React from 'react';
-import IndexTasks from './IndexTasks';
+import { TasksIndexPage } from '../Components/TasksTable/TasksIndexPage';
+import { SubTasksPage } from '../Components/TasksTable/SubTasksPage';
 import ShowTask from './ShowTask';
 
 const ForemanTasksRoutes = {
   indexTasks: {
-    path: '/foreman_tasks/ex_tasks',
+    path: '/foreman_tasks/tasks',
     exact: true,
-    render: props => <IndexTasks {...props} />,
+    render: props => <TasksIndexPage {...props} />,
+  },
+  subTasks: {
+    path: '/foreman_tasks/tasks/:id/sub_tasks',
+    exact: true,
+    render: props => <SubTasksPage {...props} />,
   },
   showTask: {
     path: '/foreman_tasks/ex_tasks/:id',

data/webpack/ForemanTasks/Routes/ForemanTasksRoutes.test.js

@@ -7,7 +7,7 @@ import ForemanTasksRoutes from './ForemanTasksRoutes';
 describe('ForemanTasksRoutes', () => {
   it('should create routes', () => {
     Object.entries(ForemanTasksRoutes).forEach(([key, Route]) => {
-      const component = shallow(<Route.render some="props" />);
+      const component = shallow(<Route.render history={{}} some="props" />);
       Route.renderResult = toJson(component);
     });
 

data/webpack/ForemanTasks/Routes/ShowTask/__tests__/ShowTask.test.js

@@ -3,7 +3,11 @@ import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
 import ShowTask from '../ShowTask';
 
 const fixtures = {
-  'render without Props': {},
+  'render without Props': {
+    history: {
+      push: jest.fn(),
+    },
+  },
 };
 
 describe('ShowTask', () =>

data/webpack/ForemanTasks/Routes/__snapshots__/ForemanTasksRoutes.test.js.snap

@@ -4,9 +4,10 @@ exports[`ForemanTasksRoutes should create routes 1`] = `
 Object {
   "indexTasks": Object {
     "exact": true,
-    "path": "/foreman_tasks/ex_tasks",
+    "path": "/foreman_tasks/tasks",
     "render": [Function],
-    "renderResult": <IndexTasks
+    "renderResult": <TasksIndexPage
+      history={Object {}}
       some="props"
     />,
   },
@@ -14,6 +15,21 @@ Object {
     "path": "/foreman_tasks/ex_tasks/:id",
     "render": [Function],
     "renderResult": <ShowTask
+      history={Object {}}
+      some="props"
+    />,
+  },
+  "subTasks": Object {
+    "exact": true,
+    "path": "/foreman_tasks/tasks/:id/sub_tasks",
+    "render": [Function],
+    "renderResult": <SubTasksPage
+      history={Object {}}
+      match={
+        Object {
+          "params": Object {},
+        }
+      }
       some="props"
     />,
   },