foreman-tasks 1.1.3 → 1.2.0

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

@@ -4,12 +4,6 @@ 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(),
@@ -27,12 +21,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__/__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,
@@ -47,7 +36,6 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
       "b",
     ]
   }
-  resumeTask={[MockFunction]}
   selectAllRows={[MockFunction]}
   selectPage={[MockFunction]}
   selectRow={[MockFunction]}

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

@@ -69,6 +69,113 @@ 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 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 [

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,15 +12,9 @@ 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,
@@ -38,7 +27,6 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
       "b",
     ]
   }
-  resumeTask={[MockFunction]}
   selectAllRows={[MockFunction]}
   selectPage={[MockFunction]}
   selectRow={[MockFunction]}

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

@@ -1,131 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TasksTable actions should cancelTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": undefined,
-      "type": "TASKS_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution task has to be cancellable",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`TasksTable actions should cancelTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was cancelled",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`TasksTable actions should resumeTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": undefined,
-      "type": "TASKS_RESUME_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution could not be resumed",
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
+exports[`TasksTable actions handles openClickedModal 1`] = `
+Object {
+  "payload": Object {
+    "clicked": Object {
+      "taskId": "some-id",
+      "taskName": "some-name",
+    },
+  },
+  "type": "UPDATE_CLICKED",
+}
 `;
 
-exports[`TasksTable actions should resumeTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_RESUME_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was resumed",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
+exports[`TasksTable actions handles openModalAction 1`] = `
+Object {
+  "payload": Object {
+    "modalID": "some-modal-id",
+  },
+  "type": "UPDATE_MODAL",
+}
 `;
 
 exports[`TasksTable actions should selectPage and succeed 1`] = `

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

@@ -4,40 +4,16 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
 <div
   className="tasks-table-wrapper"
 >
-  <ConfirmationModals
-    modalProps={
+  <Connect(ConfirmModal)
+    id="ConfirmModal"
+    parentTaskID={null}
+    setModalClosed={[MockFunction]}
+    uriQuery={
       Object {
-        "cancelModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "cancelSelectedModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "resumeModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "resumeSelectedModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-      }
-    }
-    selectedRowsLen={0}
-    tasksActions={
-      Object {
-        "cancelSelectedTasks": [Function],
-        "cancelTask": [Function],
-        "resumeSelectedTasks": [Function],
-        "resumeTask": [Function],
+        "state": "stopped",
       }
     }
+    url="/foreman_tasks/tasks?action=\\"some-name\\""
   />
   <PageLayout
     beforeToolbarComponent={
@@ -85,7 +61,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "documentationUrl": "4.1.5Searching",
           "url": "/api/bookmarks",
         },
-        "controller": "foreman_tasks/tasks",
+        "controller": "foreman_tasks_tasks",
       }
     }
     searchQuery="a=b"
@@ -106,8 +82,9 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         />
         <ActionSelectButton
           disabled={true}
-          onCancel={[MockFunction]}
-          onResume={[MockFunction]}
+          onCancel={[Function]}
+          onForceCancel={[Function]}
+          onResume={[Function]}
         />
       </React.Fragment>
     }
@@ -115,11 +92,6 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
     <TasksTable
       actionName=""
       allRowsSelected={false}
-      bulkCancelById={[MockFunction]}
-      bulkCancelBySearch={[MockFunction]}
-      bulkResumeById={[MockFunction]}
-      bulkResumeBySearch={[MockFunction]}
-      cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
       history={
@@ -131,31 +103,8 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         }
       }
       itemCount={2}
-      modalProps={
-        Object {
-          "cancelModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "cancelSelectedModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "resumeModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "resumeSelectedModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-        }
-      }
       openClickedModal={[MockFunction]}
+      openModal={[Function]}
       pagination={
         Object {
           "page": 1,
@@ -169,7 +118,6 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "b",
         ]
       }
-      resumeTask={[MockFunction]}
       selectPage={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}
@@ -191,40 +139,16 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
 <div
   className="tasks-table-wrapper"
 >
-  <ConfirmationModals
-    modalProps={
+  <Connect(ConfirmModal)
+    id="ConfirmModal"
+    parentTaskID={null}
+    setModalClosed={[MockFunction]}
+    uriQuery={
       Object {
-        "cancelModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "cancelSelectedModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "resumeModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-        "resumeSelectedModal": Object {
-          "modalOpen": true,
-          "setModalClosed": [MockFunction],
-          "setModalOpen": [MockFunction],
-        },
-      }
-    }
-    selectedRowsLen={0}
-    tasksActions={
-      Object {
-        "cancelSelectedTasks": [Function],
-        "cancelTask": [Function],
-        "resumeSelectedTasks": [Function],
-        "resumeTask": [Function],
+        "state": "stopped",
       }
     }
+    url="/foreman_tasks/tasks?action=\\"some-name\\""
   />
   <PageLayout
     beforeToolbarComponent={
@@ -255,7 +179,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "documentationUrl": "4.1.5Searching",
           "url": "/api/bookmarks",
         },
-        "controller": "foreman_tasks/tasks",
+        "controller": "foreman_tasks_tasks",
       }
     }
     searchQuery="a=b"
@@ -276,8 +200,9 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         />
         <ActionSelectButton
           disabled={true}
-          onCancel={[MockFunction]}
-          onResume={[MockFunction]}
+          onCancel={[Function]}
+          onForceCancel={[Function]}
+          onResume={[Function]}
         />
       </React.Fragment>
     }
@@ -285,11 +210,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     <TasksTable
       actionName=""
       allRowsSelected={false}
-      bulkCancelById={[MockFunction]}
-      bulkCancelBySearch={[MockFunction]}
-      bulkResumeById={[MockFunction]}
-      bulkResumeBySearch={[MockFunction]}
-      cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
       history={
@@ -301,31 +221,8 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       itemCount={2}
-      modalProps={
-        Object {
-          "cancelModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "cancelSelectedModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "resumeModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-          "resumeSelectedModal": Object {
-            "modalOpen": true,
-            "setModalClosed": [MockFunction],
-            "setModalOpen": [MockFunction],
-          },
-        }
-      }
       openClickedModal={[MockFunction]}
+      openModal={[Function]}
       pagination={
         Object {
           "page": 1,
@@ -339,7 +236,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "b",
         ]
       }
-      resumeTask={[MockFunction]}
       selectPage={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}