foreman-tasks 12.0.0 → 12.1.0

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

@@ -24,7 +24,11 @@ import {
   toastDispatch,
 } from './TaskActionHelpers';
 
-export const cancelTaskRequest = (id, name) => async dispatch => {
+export const cancelTaskRequest = (
+  id,
+  name,
+  reloadPage = null
+) => async dispatch => {
   dispatch(addToast(infoToastData(sprintf('Trying to cancel %s task', name))));
   dispatch({ type: TASKS_CANCEL_REQUEST });
   try {
@@ -36,6 +40,9 @@ export const cancelTaskRequest = (id, name) => async dispatch => {
       toastInfo: cancelToastInfo,
       dispatch,
     });
+    if (reloadPage) {
+      reloadPage();
+    }
   } catch (error) {
     dispatch({ type: TASKS_CANCEL_FAILURE, payload: error });
     toastDispatch({
@@ -47,7 +54,11 @@ export const cancelTaskRequest = (id, name) => async dispatch => {
   }
 };
 
-export const resumeTaskRequest = (id, name) => async dispatch => {
+export const resumeTaskRequest = (
+  id,
+  name,
+  reloadPage = null
+) => async dispatch => {
   dispatch({ type: TASKS_RESUME_REQUEST });
   try {
     await API.post(`/foreman_tasks/tasks/${id}/resume`);
@@ -59,6 +70,9 @@ export const resumeTaskRequest = (id, name) => async dispatch => {
       toastInfo: resumeToastInfo,
       dispatch,
     });
+    if (reloadPage) {
+      reloadPage();
+    }
   } catch (error) {
     dispatch({ type: TASKS_RESUME_FAILURE, payload: error });
     toastDispatch({
@@ -70,7 +84,11 @@ export const resumeTaskRequest = (id, name) => async dispatch => {
   }
 };
 
-export const forceCancelTaskRequest = (id, name) => async dispatch => {
+export const forceCancelTaskRequest = (
+  id,
+  name,
+  reloadPage = null
+) => async dispatch => {
   dispatch({ type: TASKS_FORCE_CANCEL_REQUEST });
   try {
     await API.post(`/foreman_tasks/tasks/${id}/force_unlock`);
@@ -81,6 +99,9 @@ export const forceCancelTaskRequest = (id, name) => async dispatch => {
       toastInfo: forceCancelToastInfo,
       dispatch,
     });
+    if (reloadPage) {
+      reloadPage();
+    }
   } catch ({ response }) {
     dispatch({ type: TASKS_FORCE_CANCEL_FAILURE });
     toastDispatch({

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

@@ -55,7 +55,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -114,7 +114,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -167,7 +167,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date={null}
         defaultValue="N/A"
       />
@@ -359,7 +359,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date=""
         defaultValue="N/A"
       />
@@ -418,7 +418,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date=""
         defaultValue="N/A"
       />
@@ -469,7 +469,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <_default
+      <RelativeDateTime
         date=""
         defaultValue="N/A"
       />

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

@@ -5,6 +5,15 @@ import {
   cancelStep,
 } from '../TaskDetailsActions';
 
+jest.mock('foremanReact/components/ToastsList', () => ({
+  addToast: toast => ({
+    type: 'TOASTS_ADD',
+    payload: {
+      message: toast,
+    },
+  }),
+}));
+
 const fixtures = {
   'should start reload': () => taskReloadStart(1),
   'should stop reload': () => taskReloadStop(),

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

@@ -15,11 +15,13 @@ Array [
   ],
   Array [
     Object {
-      "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",
+      "payload": Object {
+        "handleError": [Function],
+        "handleSuccess": [Function],
+        "key": "TASK_STEP_CANCEL",
+        "url": "/foreman_tasks/tasks/task-id/cancel_step?step_id=step-id",
+      },
+      "type": "API_POST",
     },
   ],
 ]
@@ -29,12 +31,14 @@ exports[`TaskDetails - Actions should start reload 1`] = `
 Array [
   Array [
     Object {
-      "handleError": [Function],
-      "handleSuccess": [Function],
       "interval": 5000,
-      "key": "FOREMAN_TASK_DETAILS",
-      "type": "get-some-type",
-      "url": "foreman/foreman_tasks/api/tasks/1/details?include_permissions",
+      "payload": Object {
+        "handleError": [Function],
+        "handleSuccess": [Function],
+        "key": "FOREMAN_TASK_DETAILS",
+        "url": "/foreman_tasks/api/tasks/1/details?include_permissions",
+      },
+      "type": "API_GET",
     },
   ],
 ]
@@ -42,6 +46,7 @@ Array [
 
 exports[`TaskDetails - Actions should stop reload 1`] = `
 Object {
-  "type": "stop",
+  "key": "FOREMAN_TASK_DETAILS",
+  "type": "STOP_INTERVAL",
 }
 `;

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/TasksTimeRow.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Row } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -10,14 +9,14 @@ import TimeDropDown from './Components/TimeDropDown/TimeDropDown';
 import './TasksTimeRow.scss';
 
 const TasksTimeRow = ({ time, updateTime }) => (
-  <Row className="tasks-time-row">
+  <div className="tasks-time-row">
     <span className="time-label">{__('With focus on last')}</span>
     <TimeDropDown
       id="tasks-dashboard-time-period-dropdown"
       selectedTime={time}
       onChange={updateTime}
     />
-  </Row>
+  </div>
 );
 
 TasksTimeRow.propTypes = {

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/__snapshots__/TasksTimeRow.test.js.snap

@@ -1,10 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TasksTimeRow render with minimal props 1`] = `
-<Row
-  bsClass="row"
+<div
   className="tasks-time-row"
-  componentClass="div"
 >
   <span
     className="time-label"
@@ -17,14 +15,12 @@ exports[`TasksTimeRow render with minimal props 1`] = `
     onChange={[Function]}
     selectedTime="H24"
   />
-</Row>
+</div>
 `;
 
 exports[`TasksTimeRow render with props 1`] = `
-<Row
-  bsClass="row"
+<div
   className="tasks-time-row"
-  componentClass="div"
 >
   <span
     className="time-label"
@@ -37,5 +33,5 @@ exports[`TasksTimeRow render with props 1`] = `
     onChange={[MockFunction]}
     selectedTime="WEEK"
   />
-</Row>
+</div>
 `;

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Grid } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
 
 import TasksTimeRow from './Components/TasksTimeRow/TasksTimeRow';
@@ -26,7 +25,6 @@ class TasksDashboard extends React.Component {
       time: query.time,
       query,
     });
-
     // dont fetch if time is going to be changed
     if (!query.time || query.time === time) {
       fetchTasksSummary(time, parentTaskID);
@@ -47,7 +45,7 @@ class TasksDashboard extends React.Component {
       updateQuery(labelQuery, this.props.history);
     };
     return (
-      <Grid fluid className="tasks-dashboard-grid">
+      <div className="tasks-dashboard-grid">
         <TasksTimeRow time={time} updateTime={updateTime} />
         <TasksCardsGrid
           time={time}
@@ -56,7 +54,7 @@ class TasksDashboard extends React.Component {
           updateQuery={updateQueryHistory}
         />
         <TasksLabelsRow query={query} updateQuery={updateQueryHistory} />
-      </Grid>
+      </div>
     );
   }
 }

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

@@ -14,9 +14,6 @@
 
 .tasks-dashboard-grid {
   min-height: 200px;
-  background-color: #f5f5f5;
-  margin: 5px -60px 20px -60px;
-  padding: 20px 50px;
 
   .row > div {
     @include create-tasks-dashboard-column(12, 0);

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

@@ -1,11 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TasksDashboard rendering render without Props 1`] = `
-<Grid
-  bsClass="container"
+<div
   className="tasks-dashboard-grid"
-  componentClass="div"
-  fluid={true}
 >
   <TasksTimeRow
     time="H24"
@@ -50,5 +47,5 @@ exports[`TasksDashboard rendering render without Props 1`] = `
     query={Object {}}
     updateQuery={[Function]}
   />
-</Grid>
+</div>
 `;

data/webpack/ForemanTasks/Components/{common/ActionButtons/ActionButton.js → TasksTable/Components/CellActionButton.js}

@@ -2,13 +2,21 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
+import {
+  RESUME_MODAL,
+  CANCEL_MODAL,
+  FORCE_UNLOCK_MODAL,
+} from '../TasksTableConstants';
 
-export const ActionButton = ({
-  canEdit,
+export const CellActionButton = ({
   id,
-  name,
-  availableActions: { resumable, cancellable, stoppable },
-  taskActions,
+  action,
+  canEdit,
+  resumable,
+  cancellable,
+  stoppable,
+  setClickedTask,
+  openModal,
 }) => {
   const buttons = [];
   const isTitle = canEdit && !(resumable || cancellable || stoppable);
@@ -19,7 +27,10 @@ export const ActionButton = ({
         title: __('Resume'),
         action: {
           disabled: !resumable,
-          onClick: () => taskActions.resumeTask(id, name),
+          onClick: () => {
+            setClickedTask({ id, action });
+            openModal(RESUME_MODAL);
+          },
           id: `task-resume-button-${id}`,
         },
       });
@@ -30,7 +41,10 @@ export const ActionButton = ({
         title: __('Cancel'),
         action: {
           disabled: !cancellable,
-          onClick: () => taskActions.cancelTask(id, name),
+          onClick: () => {
+            setClickedTask({ id, action });
+            openModal(CANCEL_MODAL);
+          },
           id: `task-cancel-button-${id}`,
         },
       });
@@ -41,7 +55,10 @@ export const ActionButton = ({
         title: __('Force Cancel'),
         action: {
           disabled: !stoppable,
-          onClick: () => taskActions.forceCancelTask(id, name),
+          onClick: () => {
+            setClickedTask({ id, action });
+            openModal(FORCE_UNLOCK_MODAL);
+          },
           id: `task-force-cancel-button-${id}`,
         },
       });
@@ -54,22 +71,20 @@ export const ActionButton = ({
   );
 };
 
-ActionButton.propTypes = {
+CellActionButton.propTypes = {
   canEdit: PropTypes.bool,
   id: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  availableActions: PropTypes.shape({
-    cancellable: PropTypes.bool,
-    resumable: PropTypes.bool,
-    stoppable: PropTypes.bool,
-  }).isRequired,
-  taskActions: PropTypes.shape({
-    cancelTask: PropTypes.func,
-    resumeTask: PropTypes.func,
-    forceCancelTask: PropTypes.func,
-  }).isRequired,
+  action: PropTypes.string.isRequired,
+  resumable: PropTypes.bool,
+  cancellable: PropTypes.bool,
+  stoppable: PropTypes.bool,
+  setClickedTask: PropTypes.func.isRequired,
+  openModal: PropTypes.func.isRequired,
 };
 
-ActionButton.defaultProps = {
+CellActionButton.defaultProps = {
   canEdit: false,
+  resumable: false,
+  cancellable: false,
+  stoppable: false,
 };

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/index.test.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { Provider } from 'react-redux';
@@ -12,10 +13,11 @@ import {
   ForceUnlockSelectedModal,
 } from '../index';
 
-// Mock the action creators
-jest.mock('../../../TasksTableActions', () => ({
-  cancelTask: jest.fn(() => ({ type: 'CANCEL_TASK' })),
-  resumeTask: jest.fn(() => ({ type: 'RESUME_TASK' })),
+// Mock TaskActions: return a sync thunk so dispatch doesn't receive a Promise
+jest.mock('../../../../TaskActions', () => ({
+  cancelTaskRequest: jest.fn(() => () => ({ type: 'MOCK_CANCEL' })),
+  resumeTaskRequest: jest.fn(() => () => ({ type: 'MOCK_RESUME' })),
+  forceCancelTaskRequest: jest.fn(() => () => ({ type: 'MOCK_FORCE_CANCEL' })),
 }));
 
 jest.mock('../../../TasksBulkActions', () => ({
@@ -23,29 +25,14 @@ jest.mock('../../../TasksBulkActions', () => ({
   bulkCancelById: jest.fn(() => ({ type: 'BULK_CANCEL_BY_ID' })),
   bulkResumeBySearch: jest.fn(() => ({ type: 'BULK_RESUME_BY_SEARCH' })),
   bulkResumeById: jest.fn(() => ({ type: 'BULK_RESUME_BY_ID' })),
-  bulkForceUnlockBySearch: jest.fn(() => ({
+  bulkForceCancelBySearch: jest.fn(() => ({
     type: 'BULK_FORCE_UNLOCK_BY_SEARCH',
   })),
-  bulkForceUnlockById: jest.fn(() => ({ type: 'BULK_FORCE_UNLOCK_BY_ID' })),
+  bulkForceCancelById: jest.fn(() => ({ type: 'BULK_FORCE_UNLOCK_BY_ID' })),
 }));
 
-// Mock the selectors
-jest.mock('../ConfirmModalSelectors', () => ({
-  selectClicked: jest.fn(() => ({ taskId: '123', taskName: 'Test Task' })),
-  selectSelectedTasks: jest.fn(() => [
-    { id: 1, name: 'Task 1' },
-    { id: 2, name: 'Task 2' },
-  ]),
-  selectSelectedRowsLen: jest.fn(() => 2),
-}));
-
-jest.mock('../../../TasksTableSelectors', () => ({
-  selectAllRowsSelected: jest.fn(() => false),
-}));
-
-// Create a mock store
-const createMockStore = (initialState = {}) => {
-  return configureStore({
+const createMockStore = (initialState = {}) =>
+  configureStore({
     reducer: {
       foremanTasks: (state = initialState, action) => state,
     },
@@ -53,19 +40,32 @@ const createMockStore = (initialState = {}) => {
       foremanTasks: initialState,
     },
   });
-};
 
 // Test wrapper component
 const TestWrapper = ({ children, store }) => (
   <Provider store={store}>{children}</Provider>
 );
+TestWrapper.propTypes = {
+  children: PropTypes.node.isRequired,
+  store: PropTypes.object.isRequired,
+};
+
+const defaultSelectAllOptions = {
+  selectedCount: 2,
+  areAllRowsSelected: () => false,
+  selectedResults: [
+    { id: 1, name: 'Task 1' },
+    { id: 2, name: 'Task 2' },
+  ],
+};
 
 describe('ConfirmModal Components', () => {
   const defaultProps = {
+    reloadPage: jest.fn(),
     isModalOpen: true,
     setIsModalOpen: jest.fn(),
-    url: '/api/tasks',
-    parentTaskID: 'parent-123',
+    taskId: '123',
+    taskName: 'Test Task',
   };
 
   const mockStore = createMockStore();
@@ -185,7 +185,8 @@ describe('ConfirmModal Components', () => {
   describe('CancelSelectedModal', () => {
     const selectedProps = {
       ...defaultProps,
-      uriQuery: { search: 'test' },
+      uriQuery: 'search=test',
+      selectAllOptions: defaultSelectAllOptions,
     };
 
     it('renders with correct title and content', () => {
@@ -245,7 +246,8 @@ describe('ConfirmModal Components', () => {
   describe('ResumeSelectedModal', () => {
     const selectedProps = {
       ...defaultProps,
-      uriQuery: { search: 'test' },
+      uriQuery: 'search=test',
+      selectAllOptions: defaultSelectAllOptions,
     };
 
     it('renders with correct title and content', () => {
@@ -321,7 +323,8 @@ describe('ConfirmModal Components', () => {
   describe('ForceUnlockSelectedModal', () => {
     const selectedProps = {
       ...defaultProps,
-      uriQuery: { search: 'test' },
+      uriQuery: 'search=test',
+      selectAllOptions: defaultSelectAllOptions,
     };
 
     it('renders with correct title and content', () => {

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/createBulkTaskModal.js

@@ -1,12 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useSelector } from 'react-redux';
 import { sprintf } from 'foremanReact/common/I18n';
-import {
-  selectSelectedTasks,
-  selectSelectedRowsLen,
-} from './ConfirmModalSelectors';
-import { selectAllRowsSelected } from '../../TasksTableSelectors';
 import { GenericConfirmModal } from './GenericConfirmModal';
 
 export const createBulkTaskModal = ({
@@ -20,22 +14,23 @@ export const createBulkTaskModal = ({
   const BulkTaskModal = ({
     isModalOpen,
     setIsModalOpen,
-    url,
     uriQuery,
     parentTaskID,
+    selectAllOptions,
+    reloadPage,
   }) => {
-    const allRowsSelected = useSelector(selectAllRowsSelected);
-    const selectedTasks = useSelector(selectSelectedTasks);
-    const selectedRowsLen = useSelector(selectSelectedRowsLen);
-
+    const {
+      selectedCount = 0,
+      areAllRowsSelected = () => false,
+      selectedResults = [],
+    } = selectAllOptions;
+    const allRowsSelected = areAllRowsSelected();
+    const selectedTasks = selectedResults;
+    const selectedRowsLen = selectedCount;
     const handleConfirm = () =>
       allRowsSelected
         ? bulkActionBySearch({ query: uriQuery, parentTaskID })
-        : bulkActionById({
-            selected: selectedTasks,
-            url,
-            parentTaskID,
-          });
+        : bulkActionById({ selected: selectedTasks, reloadPage });
 
     return (
       <GenericConfirmModal
@@ -53,9 +48,10 @@ export const createBulkTaskModal = ({
   BulkTaskModal.propTypes = {
     isModalOpen: PropTypes.bool.isRequired,
     setIsModalOpen: PropTypes.func.isRequired,
-    url: PropTypes.string.isRequired,
-    uriQuery: PropTypes.object,
+    uriQuery: PropTypes.string,
     parentTaskID: PropTypes.string,
+    selectAllOptions: PropTypes.object.isRequired,
+    reloadPage: PropTypes.func.isRequired,
   };
 
   BulkTaskModal.defaultProps = {

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/createTaskModal.js

@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useSelector } from 'react-redux';
 import { sprintf } from 'foremanReact/common/I18n';
-import { selectClicked } from './ConfirmModalSelectors';
 import { GenericConfirmModal } from './GenericConfirmModal';
 
 export const createTaskModal = ({
@@ -12,16 +10,14 @@ export const createTaskModal = ({
   confirmButtonVariant = 'primary',
   ouiaIdPrefix,
 }) => {
-  const TaskModal = ({ isModalOpen, setIsModalOpen, url, parentTaskID }) => {
-    const { taskId, taskName } = useSelector(selectClicked);
-
-    const handleConfirm = () =>
-      actionCreator({
-        taskId,
-        taskName,
-        url,
-        parentTaskID,
-      });
+  const TaskModal = ({
+    isModalOpen,
+    setIsModalOpen,
+    reloadPage,
+    taskId,
+    taskName,
+  }) => {
+    const handleConfirm = () => actionCreator(taskId, taskName, reloadPage);
 
     return (
       <GenericConfirmModal
@@ -39,12 +35,14 @@ export const createTaskModal = ({
   TaskModal.propTypes = {
     isModalOpen: PropTypes.bool.isRequired,
     setIsModalOpen: PropTypes.func.isRequired,
-    url: PropTypes.string.isRequired,
-    parentTaskID: PropTypes.string,
+    reloadPage: PropTypes.func.isRequired,
+    taskId: PropTypes.string,
+    taskName: PropTypes.string,
   };
 
   TaskModal.defaultProps = {
-    parentTaskID: null,
+    taskId: null,
+    taskName: null,
   };
 
   return TaskModal;

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

@@ -2,10 +2,10 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { createTaskModal } from './createTaskModal';
 import { createBulkTaskModal } from './createBulkTaskModal';
 import {
-  cancelTask,
-  forceCancelTask,
-  resumeTask,
-} from '../../TasksTableActions';
+  cancelTaskRequest,
+  resumeTaskRequest,
+  forceCancelTaskRequest,
+} from '../../../TaskActions';
 import {
   bulkCancelBySearch,
   bulkCancelById,
@@ -16,7 +16,7 @@ import {
 } from '../../TasksBulkActions';
 
 export const CancelModal = createTaskModal({
-  actionCreator: cancelTask,
+  actionCreator: cancelTaskRequest,
   title: __('Cancel Task'),
   messageTemplate: __(
     'This will cancel task "%(taskName)s", putting it in the stopped state. Are you sure?'
@@ -37,7 +37,7 @@ export const CancelSelectedModal = createBulkTaskModal({
 });
 
 export const ForceUnlockModal = createTaskModal({
-  actionCreator: forceCancelTask,
+  actionCreator: forceCancelTaskRequest,
   title: __('Force Unlock Task'),
   messageTemplate: __(
     'This will force unlock task "%(taskName)s". This may cause harm and should be used with caution. Are you sure?'
@@ -58,7 +58,7 @@ export const ForceUnlockSelectedModal = createBulkTaskModal({
 });
 
 export const ResumeModal = createTaskModal({
-  actionCreator: resumeTask,
+  actionCreator: resumeTaskRequest,
   title: __('Resume Task'),
   messageTemplate: __(
     'This will resume task "%(taskName)s", putting it in the running state. Are you sure?'