foreman-tasks 1.1.2 → 2.0.2

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

@@ -1,21 +1,24 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   bulkCancelById,
   bulkCancelBySearch,
   bulkResumeById,
   bulkResumeBySearch,
+  bulkForceCancelById,
+  bulkForceCancelBySearch,
 } from '../TasksBulkActions';
 
 jest.mock('foremanReact/components/common/table', () => ({
   getTableItemsAction: jest.fn(controller => controller),
 }));
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 
 const task = {
   id: 'some-id',
   name: 'some-name',
+  canEdit: true,
 };
 
 const fixtures = {
@@ -68,6 +71,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 +102,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 +135,24 @@ const fixtures = {
       parentTaskID: 'parent',
     });
   },
+  'handles bulkForceCancelBySearch requests': () =>
+    bulkForceCancelBySearch({
+      query: { search: {} },
+      url: 'some-url',
+      parentTaskID: 'parent',
+    }),
+  'handles bulkCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isCancellable: true, canEdit: false }];
+    return bulkCancelById({ selected, url: 'some-url' });
+  },
+  'handles bulkResumeById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkResumeById({ selected, url: 'some-url' });
+  },
+  'handles bulkForceCancelById requests with canEdit false': () => {
+    const selected = [{ ...task, isResumable: false, canEdit: false }];
+    return bulkForceCancelById({ selected, url: 'some-url' });
+  },
 };
 
 describe('TasksTable bulk actions', () => {

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

@@ -4,17 +4,12 @@ export const minProps = {
   getTableItems: jest.fn(),
   getBreadcrumbs: jest.fn(),
   itemCount: 2,
-  cancelTask: jest.fn(),
-  resumeTask: jest.fn(),
-  bulkResumeById: jest.fn(),
-  bulkCancelById: jest.fn(),
-  bulkResumeBySearch: jest.fn(),
-  bulkCancelBySearch: jest.fn(),
   selectPage: jest.fn(),
   selectAllRows: jest.fn(),
   unselectAllRows: jest.fn(),
   selectRow: jest.fn(),
   unselectRow: jest.fn(),
+  reloadPage: jest.fn(),
   selectedRows: [],
   pagination: {
     page: 1,
@@ -27,12 +22,8 @@ export const minProps = {
     order: 'w',
   },
   openClickedModal: jest.fn(),
-  modalProps: {
-    cancelSelectedModal: {},
-    resumeSelectedModal: {},
-    cancelModal: {},
-    resumeModal: {},
-  },
+  openModalAction: jest.fn(),
+  openModal: jest.fn(),
 };
 
 export default {

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

@@ -2,51 +2,31 @@ import {
   testActionSnapshotWithFixtures,
   IntegrationTestHelper,
 } from '@theforeman/test';
-import API from 'foremanReact/API';
 import { TASKS_TABLE_ID } from '../TasksTableConstants';
 import {
   getTableItems,
   cancelTask,
-  cancelTaskRequest,
   resumeTask,
-  resumeTaskRequest,
+  forceCancelTask,
   selectPage,
+  openClickedModal,
+  openModalAction,
 } from '../TasksTableActions';
 
 jest.mock('foremanReact/components/common/table', () => ({
   getTableItemsAction: jest.fn(controller => controller),
 }));
 
-jest.mock('foremanReact/API');
-
-API.post.mockImplementation(() => ({ data: 'some-data' }));
-
 const taskInfo = {
   taskId: 'some-id',
   taskName: 'some-name',
 };
 
 const fixtures = {
-  'should cancelTaskRequest and succeed': () =>
-    cancelTaskRequest('some-id', 'some-name'),
-  'should cancelTaskRequest and fail': () => {
-    API.post.mockImplementation(() =>
-      Promise.reject(new Error('Network Error'))
-    );
-    return cancelTaskRequest('some-id', 'some-name');
-  },
-
-  'should resumeTaskRequest and succeed': () => {
-    API.post.mockImplementation(() => ({ data: 'some-data' }));
-    return resumeTaskRequest('some-id', 'some-name');
-  },
-  'should resumeTaskRequest and fail': () => {
-    API.post.mockImplementation(() =>
-      Promise.reject(new Error('Network Error'))
-    );
-    return resumeTaskRequest('some-id', 'some-name');
-  },
   'should selectPage and succeed': () => selectPage([{ id: 'some-id' }]),
+  'handles openClickedModal': () =>
+    openClickedModal({ ...taskInfo, setModalOpen: jest.fn() }),
+  'handles openModalAction': () => openModalAction('some-modal-id', jest.fn()),
 };
 describe('TasksTable actions', () => {
   it('getTableItems should reuse common/table/getTableItemsAction', () => {
@@ -65,5 +45,21 @@ describe('TasksTable actions', () => {
     await IntegrationTestHelper.flushAllPromises();
     expect(dispatch.mock.calls).toHaveLength(3);
   });
+  it('should forceCancelTask', async () => {
+    const dispatch = jest.fn();
+    forceCancelTask({ ...taskInfo, url: 'some-url' })(dispatch);
+    await IntegrationTestHelper.flushAllPromises();
+    expect(dispatch.mock.calls).toHaveLength(3);
+  });
+  it('openClickedModal opens modal', () => {
+    const setModalOpen = jest.fn();
+    openClickedModal({ ...taskInfo, setModalOpen });
+    expect(setModalOpen).toHaveBeenCalled();
+  });
+  it('openModalAction opens modal', () => {
+    const setModalOpen = jest.fn();
+    openModalAction('some-modal-id', setModalOpen);
+    expect(setModalOpen).toHaveBeenCalled();
+  });
   testActionSnapshotWithFixtures(fixtures);
 });

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

@@ -12,9 +12,10 @@ const history = {
 const fixtures = {
   'render with minimal props': { ...minProps, history },
 
-  'render with Breadcrubs': {
+  'render with Breadcrubs and edit permissions': {
     ...minProps,
     history,
+    results: [{ action: 'a', canEdit: true }],
     getBreadcrumbs: () => ({
       breadcrumbItems: [
         { caption: 'Tasks', url: `/foreman_tasks/tasks` },

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

@@ -2,11 +2,6 @@
 
 exports[`SubTasksPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
-  bulkCancelById={[MockFunction]}
-  bulkCancelBySearch={[MockFunction]}
-  bulkResumeById={[MockFunction]}
-  bulkResumeBySearch={[MockFunction]}
-  cancelTask={[MockFunction]}
   createHeader={[Function]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
@@ -25,15 +20,9 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
       },
     }
   }
-  modalProps={
-    Object {
-      "cancelModal": Object {},
-      "cancelSelectedModal": Object {},
-      "resumeModal": Object {},
-      "resumeSelectedModal": Object {},
-    }
-  }
   openClickedModal={[MockFunction]}
+  openModal={[MockFunction]}
+  openModalAction={[MockFunction]}
   pagination={
     Object {
       "page": 1,
@@ -41,13 +30,13 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     }
   }
   parentTaskID="some-id"
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",
       "b",
     ]
   }
-  resumeTask={[MockFunction]}
   selectAllRows={[MockFunction]}
   selectPage={[MockFunction]}
   selectRow={[MockFunction]}

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

@@ -48,6 +48,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be cancelled",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkCancelBySearch requests 1`] = `
 Array [
   Array [
@@ -69,6 +85,129 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkForceCancelById requests 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASKS_FORCE_CANCEL_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "type": "TASKS_FORCE_CANCEL_SUCCESS",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "2 task(s) cancelled with force",
+          "type": "success",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "4 task(s) are already stopped",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    "TASKS_TABLE",
+  ],
+  Array [
+    [Function],
+  ],
+]
+`;
+
+exports[`TasksTable bulk actions handles bulkForceCancelById requests that are stopped 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "1 task(s) are already stopped",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable bulk actions handles bulkForceCancelById requests that fail 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASKS_FORCE_CANCEL_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "error": [Error: Network Error],
+      "type": "TASKS_FORCE_CANCEL_FAILURE",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Cannot force cancel tasks at the moment Error: Network Error",
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable bulk actions handles bulkForceCancelById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "User has no permission for 1 task(s)",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable bulk actions handles bulkForceCancelBySearch requests 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASKS_FORCE_CANCEL_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Canceling with force selected tasks, this might take a while",
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkResumeById requests that are not resumable 1`] = `
 Array [
   Array [
@@ -112,6 +251,22 @@ Array [
 ]
 `;
 
+exports[`TasksTable bulk actions handles bulkResumeById requests with canEdit false 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be resumed",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
 exports[`TasksTable bulk actions handles bulkResumeBySearch requests 1`] = `
 Array [
   Array [

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

@@ -2,11 +2,6 @@
 
 exports[`TasksIndexPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
-  bulkCancelById={[MockFunction]}
-  bulkCancelBySearch={[MockFunction]}
-  bulkResumeById={[MockFunction]}
-  bulkResumeBySearch={[MockFunction]}
-  cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
   history={
@@ -17,28 +12,22 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
     }
   }
   itemCount={2}
-  modalProps={
-    Object {
-      "cancelModal": Object {},
-      "cancelSelectedModal": Object {},
-      "resumeModal": Object {},
-      "resumeSelectedModal": Object {},
-    }
-  }
   openClickedModal={[MockFunction]}
+  openModal={[MockFunction]}
+  openModalAction={[MockFunction]}
   pagination={
     Object {
       "page": 1,
       "perPage": 10,
     }
   }
+  reloadPage={[MockFunction]}
   results={
     Array [
       "a",
       "b",
     ]
   }
-  resumeTask={[MockFunction]}
   selectAllRows={[MockFunction]}
   selectPage={[MockFunction]}
   selectRow={[MockFunction]}