foreman-tasks 1.1.3 → 1.2.0

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

@@ -8,6 +8,8 @@ import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import createTasksTableSchema from './TasksTableSchema';
 import { updateURlQuery } from './TasksTableHelpers';
+import { RESUME_MODAL, CANCEL_MODAL } from './TasksTableConstants';
+import { FORCE_UNLOCK_MODAL } from '../TaskActions/TaskActionsConstants';
 
 const TasksTable = ({
   getTableItems,
@@ -23,7 +25,7 @@ const TasksTable = ({
   selectRow,
   unselectRow,
   openClickedModal,
-  modalProps,
+  openModal,
   allRowsSelected,
 }) => {
   const { search, pathname } = history.location;
@@ -97,14 +99,21 @@ const TasksTable = ({
       openClickedModal({
         taskId,
         taskName,
-        setModalOpen: modalProps.cancelModal.setModalOpen,
+        setModalOpen: () => openModal(CANCEL_MODAL),
       });
     },
     resumeTask: (taskId, taskName) => {
       openClickedModal({
         taskId,
         taskName,
-        setModalOpen: modalProps.resumeModal.setModalOpen,
+        setModalOpen: () => openModal(RESUME_MODAL),
+      });
+    },
+    forceCancelTask: (taskId, taskName) => {
+      openClickedModal({
+        taskId,
+        taskName,
+        setModalOpen: () => openModal(FORCE_UNLOCK_MODAL),
       });
     },
   };
@@ -151,12 +160,7 @@ TasksTable.propTypes = {
   unselectAllRows: PropTypes.func.isRequired,
   selectRow: PropTypes.func.isRequired,
   unselectRow: PropTypes.func.isRequired,
-  modalProps: PropTypes.shape({
-    cancelSelectedModal: PropTypes.object,
-    resumeSelectedModal: PropTypes.object,
-    cancelModal: PropTypes.object,
-    resumeModal: PropTypes.object,
-  }).isRequired,
+  openModal: PropTypes.func.isRequired,
   allRowsSelected: PropTypes.bool,
 };
 

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

@@ -1,8 +1,6 @@
 import { getURIQuery } from 'foremanReact/common/helpers';
 import { getTableItemsAction } from 'foremanReact/components/common/table';
-import API from 'foremanReact/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
-import { sprintf } from 'foremanReact/common/I18n';
+
 import {
   TASKS_TABLE_ID,
   SELECT_ROWS,
@@ -11,21 +9,15 @@ import {
   UNSELECT_ROWS,
   UPDATE_CLICKED,
   OPEN_SELECT_ALL,
-  TASKS_RESUME_REQUEST,
-  TASKS_RESUME_SUCCESS,
-  TASKS_RESUME_FAILURE,
-  TASKS_CANCEL_REQUEST,
-  TASKS_CANCEL_SUCCESS,
-  TASKS_CANCEL_FAILURE,
+  UPDATE_MODAL,
 } from './TasksTableConstants';
-import { TOAST_TYPES } from '../common/ToastTypesConstants';
 import { getApiPathname } from './TasksTableHelpers';
 import { fetchTasksSummary } from '../TasksDashboard/TasksDashboardActions';
 import {
-  resumeToastInfo,
-  cancelToastInfo,
-  toastDispatch,
-} from './TasksTableActionHelpers';
+  cancelTaskRequest,
+  resumeTaskRequest,
+  forceCancelTaskRequest,
+} from '../TaskActions';
 
 export const getTableItems = url =>
   getTableItemsAction(TASKS_TABLE_ID, getURIQuery(url), getApiPathname(url));
@@ -45,34 +37,6 @@ export const cancelTask = ({
   reloadPage(url, parentTaskID, dispatch);
 };
 
-export const cancelTaskRequest = (id, name) => async dispatch => {
-  dispatch(
-    addToast({
-      type: TOAST_TYPES.INFO,
-      message: sprintf('Trying to cancel %s task', name),
-    })
-  );
-  dispatch({ type: TASKS_CANCEL_REQUEST });
-  try {
-    await API.post(`/foreman_tasks/tasks/${id}/cancel`);
-    dispatch({ type: TASKS_CANCEL_SUCCESS });
-    toastDispatch({
-      type: 'cancelled',
-      name,
-      toastInfo: cancelToastInfo,
-      dispatch,
-    });
-  } catch ({ response }) {
-    dispatch({ type: TASKS_CANCEL_FAILURE, payload: response });
-    toastDispatch({
-      type: 'skipped',
-      name,
-      toastInfo: cancelToastInfo,
-      dispatch,
-    });
-  }
-};
-
 export const resumeTask = ({
   taskId,
   taskName,
@@ -83,27 +47,15 @@ export const resumeTask = ({
   reloadPage(url, parentTaskID, dispatch);
 };
 
-export const resumeTaskRequest = (id, name) => async dispatch => {
-  dispatch({ type: TASKS_RESUME_REQUEST });
-  try {
-    await API.post(`/foreman_tasks/tasks/${id}/resume`);
-
-    dispatch({ type: TASKS_RESUME_SUCCESS });
-    toastDispatch({
-      type: 'resumed',
-      name,
-      toastInfo: resumeToastInfo,
-      dispatch,
-    });
-  } catch ({ response }) {
-    dispatch({ type: TASKS_RESUME_FAILURE, payload: response });
-    toastDispatch({
-      type: 'failed',
-      name,
-      toastInfo: resumeToastInfo,
-      dispatch,
-    });
-  }
+export const forceCancelTask = ({
+  taskId,
+  taskName,
+  url,
+  parentTaskID,
+}) => async dispatch => {
+  await dispatch(forceCancelTaskRequest(taskId, taskName));
+  dispatch(getTableItems(url));
+  dispatch(fetchTasksSummary(getURIQuery(url).time, parentTaskID));
 };
 
 export const selectPage = results => dispatch => {
@@ -141,3 +93,11 @@ export const openClickedModal = ({ taskId, taskName, setModalOpen }) => {
     payload: { clicked: { taskId, taskName } },
   };
 };
+
+export const openModalAction = (modalID, setModalOpen) => {
+  setModalOpen();
+  return {
+    type: UPDATE_MODAL,
+    payload: { modalID },
+  };
+};

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

@@ -8,23 +8,21 @@ export const UNSELECT_ALL_ROWS = 'UNSELECT_ALL_ROWS';
 export const SELECT_ALL_ROWS = 'SELECT_ALL_ROWS';
 export const OPEN_SELECT_ALL = 'OPEN_SELECT_ALL';
 
-export const TASKS_RESUME_REQUEST = 'TASKS_RESUME_REQUEST';
-export const TASKS_RESUME_SUCCESS = 'TASKS_RESUME_SUCCESS';
-export const TASKS_RESUME_FAILURE = 'TASKS_RESUME_FAILURE';
-export const TASKS_CANCEL_REQUEST = 'TASKS_CANCEL_REQUEST';
-export const TASKS_CANCEL_SUCCESS = 'TASKS_CANCEL_SUCCESS';
-export const TASKS_CANCEL_FAILURE = 'TASKS_CANCEL_FAILURE';
-
 export const BULK_CANCEL_PATH = 'bulk_cancel';
 export const BULK_RESUME_PATH = 'bulk_resume';
+export const BULK_FORCE_CANCEL_PATH = 'bulk_stop';
+
+export const CANCEL_MODAL = 'cancelConfirmModal';
+export const RESUME_MODAL = 'resumeConfirmModal';
+export const CANCEL_SELECTED_MODAL = 'cancelSelectedConfirmModal';
+export const RESUME_SELECTED_MODAL = 'resumeSelectedConfirmModal';
+export const CONFIRM_MODAL = 'ConfirmModal';
+export const FORCE_UNLOCK_SELECTED_MODAL = 'forceUnlockSelectedConfirmModal';
 
-export const CANCEL_CONFIRM_MODAL_ID = 'cancelConfirmModal';
-export const RESUME_CONFIRM_MODAL_ID = 'resumeConfirmModal';
-export const CANCEL_SELECTED_CONFIRM_MODAL_ID = 'cancelSelectedConfirmModal';
-export const RESUME_SELECTED_CONFIRM_MODAL_ID = 'resumeSelectedConfirmModal';
 export const UPDATE_CLICKED = 'UPDATE_CLICKED';
+export const UPDATE_MODAL = 'UPDATE_MODAL';
 
 export const TASKS_SEARCH_PROPS = {
   ...getControllerSearchProps('tasks'),
-  controller: 'foreman_tasks/tasks',
+  controller: 'foreman_tasks_tasks',
 };

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

@@ -11,13 +11,13 @@ import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanMod
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
 import { resolveSearchQuery, getCSVurl } from './TasksTableHelpers';
-import { ConfirmationModals } from './Components/ConfirmationModals';
+import ConfirmModal from './Components/ConfirmModal/';
 import {
   TASKS_SEARCH_PROPS,
-  CANCEL_SELECTED_CONFIRM_MODAL_ID,
-  RESUME_SELECTED_CONFIRM_MODAL_ID,
-  RESUME_CONFIRM_MODAL_ID,
-  CANCEL_CONFIRM_MODAL_ID,
+  CANCEL_SELECTED_MODAL,
+  RESUME_SELECTED_MODAL,
+  FORCE_UNLOCK_SELECTED_MODAL,
+  CONFIRM_MODAL,
 } from './TasksTableConstants';
 import { ActionSelectButton } from './Components/ActionSelectButton';
 import './TasksTablePage.scss';
@@ -26,10 +26,11 @@ import { SelectAllAlert } from './Components/SelectAllAlert';
 const TasksTablePage = ({
   getBreadcrumbs,
   history,
-  clicked,
   createHeader,
   selectAllRows,
   showSelectAll,
+  modalID,
+  openModalAction,
   ...props
 }) => {
   const url = history.location.pathname + history.location.search;
@@ -38,83 +39,20 @@ const TasksTablePage = ({
     resolveSearchQuery(searchQuery, history);
   };
 
-  const getSelectedTasks = () => {
-    const selectedIDs = props.results.filter(item =>
-      props.selectedRows.includes(item.id)
-    );
-    return selectedIDs.map(item => ({
-      name: item.action,
-      id: item.id,
-      isCancellable: item.availableActions.cancellable,
-      isResumable: item.availableActions.resumable,
-    }));
-  };
-
-  const modalProps = {
-    cancelSelectedModal: useForemanModal({
-      id: CANCEL_SELECTED_CONFIRM_MODAL_ID,
-    }),
-    resumeSelectedModal: useForemanModal({
-      id: RESUME_SELECTED_CONFIRM_MODAL_ID,
-    }),
-    cancelModal: useForemanModal({ id: CANCEL_CONFIRM_MODAL_ID }),
-    resumeModal: useForemanModal({ id: RESUME_CONFIRM_MODAL_ID }),
-  };
+  const { setModalOpen, setModalClosed } = useForemanModal({
+    id: CONFIRM_MODAL,
+  });
 
-  const {
-    bulkCancelById,
-    bulkCancelBySearch,
-    bulkResumeById,
-    bulkResumeBySearch,
-    cancelTask,
-    resumeTask,
-    parentTaskID,
-  } = props;
-  const tasksActions = {
-    cancelSelectedTasks: () => {
-      props.allRowsSelected
-        ? bulkCancelBySearch({ query: uriQuery, parentTaskID })
-        : bulkCancelById({
-            selected: getSelectedTasks(),
-            url,
-            parentTaskID,
-          });
-    },
-    cancelTask: () => {
-      cancelTask({
-        taskId: clicked.taskId,
-        taskName: clicked.taskName,
-        url,
-        parentTaskID,
-      });
-    },
-    resumeSelectedTasks: () => {
-      props.allRowsSelected
-        ? bulkResumeBySearch({ query: uriQuery, parentTaskID })
-        : bulkResumeById({
-            selected: getSelectedTasks(),
-            url,
-            parentTaskID,
-          });
-    },
-    resumeTask: () => {
-      resumeTask({
-        taskId: clicked.taskId,
-        taskName: clicked.taskName,
-        url,
-        parentTaskID,
-      });
-    },
-  };
+  const openModal = id => openModalAction(id, setModalOpen);
 
   return (
     <div className="tasks-table-wrapper">
-      <ConfirmationModals
-        tasksActions={tasksActions}
-        selectedRowsLen={
-          props.allRowsSelected ? props.itemCount : props.selectedRows.length
-        }
-        modalProps={modalProps}
+      <ConfirmModal
+        id={CONFIRM_MODAL}
+        url={url}
+        parentTaskID={props.parentTaskID}
+        uriQuery={uriQuery}
+        setModalClosed={setModalClosed}
       />
       <PageLayout
         searchable
@@ -132,8 +70,9 @@ const TasksTablePage = ({
             />
             <ActionSelectButton
               disabled={!(props.selectedRows.length || props.allRowsSelected)}
-              onCancel={modalProps.cancelSelectedModal.setModalOpen}
-              onResume={modalProps.resumeSelectedModal.setModalOpen}
+              onCancel={() => openModal(CANCEL_SELECTED_MODAL)}
+              onResume={() => openModal(RESUME_SELECTED_MODAL)}
+              onForceCancel={() => openModal(FORCE_UNLOCK_SELECTED_MODAL)}
             />
           </React.Fragment>
         }
@@ -152,7 +91,7 @@ const TasksTablePage = ({
               allRowsSelected={props.allRowsSelected}
             />
           )}
-          <TasksTable history={history} {...props} modalProps={modalProps} />
+          <TasksTable history={history} {...props} openModal={openModal} />
         </React.Fragment>
       </PageLayout>
     </div>
@@ -172,20 +111,11 @@ TasksTablePage.propTypes = {
   actionName: PropTypes.string,
   status: PropTypes.oneOf(Object.keys(STATUS)),
   history: PropTypes.object.isRequired,
-  cancelTask: PropTypes.func.isRequired,
-  resumeTask: PropTypes.func.isRequired,
-  bulkCancelById: PropTypes.func.isRequired,
-  bulkCancelBySearch: PropTypes.func.isRequired,
-  bulkResumeById: PropTypes.func.isRequired,
-  bulkResumeBySearch: PropTypes.func.isRequired,
   selectedRows: PropTypes.arrayOf(PropTypes.string),
   parentTaskID: PropTypes.string,
   createHeader: PropTypes.func,
-  clicked: PropTypes.shape({
-    taskId: PropTypes.string,
-    taskName: PropTypes.string,
-    parentTaskID: PropTypes.string,
-  }),
+  modalID: PropTypes.string,
+  openModalAction: PropTypes.func.isRequired,
   showSelectAll: PropTypes.bool,
   unselectAllRows: PropTypes.func.isRequired,
 };
@@ -200,9 +130,9 @@ TasksTablePage.defaultProps = {
   status: STATUS.PENDING,
   selectedRows: [],
   parentTaskID: null,
-  clicked: {},
   createHeader: () => __('Tasks'),
   showSelectAll: false,
+  modalID: '',
 };
 
 export default TasksTablePage;

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

@@ -67,7 +67,7 @@ const createTasksTableSchema = (
     sortableColumn('started_at', __('Started at'), 3, sortController, [
       dateCellFormmatter,
     ]),
-    sortableColumn('duration', __('Duration'), 3, sortController, [
+    sortableColumn('duration', __('Duration'), 2, sortController, [
       durationCellFormmatter,
     ]),
     column(
@@ -76,7 +76,7 @@ const createTasksTableSchema = (
       headFormat,
       [actionCellFormatter(taskActions)],
       {
-        className: 'col-md-1',
+        className: 'col-md-2',
       }
     ),
   ];

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

@@ -24,9 +24,6 @@ export const selectActionName = state =>
 export const selectSelectedRows = state =>
   selectTasksTableQuery(state).selectedRows || [];
 
-export const selectClicked = state =>
-  selectTasksTableQuery(state).clicked || {};
-
 export const selectResults = createSelector(
   selectTasksTableContent,
   ({ results }) =>
@@ -38,7 +35,10 @@ export const selectResults = createSelector(
       username: result.username || '',
       state: result.state + (result.frozen ? ` ${__('Disabled')}` : ''),
       duration: getDuration(result.started_at, result.ended_at),
-      availableActions: result.available_actions,
+      availableActions: {
+        ...result.available_actions,
+        stoppable: result.state !== 'stopped',
+      },
     }))
 );
 
@@ -54,3 +54,6 @@ export const selectAllRowsSelected = state =>
 
 export const selectShowSelectAll = state =>
   selectTasksTableQuery(state).showSelectAll;
+
+export const selectModalID = state =>
+  selectTasksTableQuery(state).modalID || '';

data/webpack/ForemanTasks/Components/TasksTable/__tests__/TasksBulkActions.test.js

@@ -5,6 +5,8 @@ import {
   bulkCancelBySearch,
   bulkResumeById,
   bulkResumeBySearch,
+  bulkForceCancelById,
+  bulkForceCancelBySearch,
 } from '../TasksBulkActions';
 
 jest.mock('foremanReact/components/common/table', () => ({
@@ -68,6 +70,28 @@ const fixtures = {
     }));
     return bulkCancelById({ selected, url: 'some-url' });
   },
+
+  'handles bulkForceCancelById requests': () => {
+    const selected = [{ ...task, isCancellable: true }];
+
+    API.post.mockImplementation(() => ({
+      data: {
+        stopped_length: 2,
+        skipped_length: 4,
+      },
+    }));
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
+
+  'handles bulkForceCancelById requests that fail': () => {
+    const selected = [{ ...task, isResumable: true }];
+
+    API.post.mockImplementation(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
+
   'handles bulkCancelById requests that are not cancellable': () => {
     const selected = [{ ...task, isCancellable: false }];
     return bulkCancelById({ selected, url: 'some-url' });
@@ -77,6 +101,11 @@ const fixtures = {
     return bulkResumeById({ selected, url: 'some-url' });
   },
 
+  'handles bulkForceCancelById requests that are stopped': () => {
+    const selected = [{ ...task, isResumable: false, state: 'stopped' }];
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
+
   'handles bulkCancelBySearch requests': () => {
     API.post.mockImplementation(() => ({
       data: {
@@ -105,6 +134,12 @@ const fixtures = {
       parentTaskID: 'parent',
     });
   },
+  'handles bulkForceCancelBySearch requests': () =>
+    bulkForceCancelBySearch({
+      query: { search: {} },
+      url: 'some-url',
+      parentTaskID: 'parent',
+    }),
 };
 
 describe('TasksTable bulk actions', () => {