foreman-tasks 1.0.1 → 1.1.0

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

@@ -1,15 +1,12 @@
 import { getControllerSearchProps } from 'foremanReact/constants';
 
 export const TASKS_TABLE_ID = 'TASKS_TABLE';
-export const TASKS_CONTROLLER = 'tasks';
-export const TASKS_SUCCESS = 'TASKS_SUCCESS';
-export const TASKS_REQUEST = 'TASKS_REQUEST';
-export const TASKS_FAILURE = 'TASKS_FAILURE';
 export const SELECT_ROWS = 'SELECT_ROWS';
 export const UNSELECT_ROWS = 'UNSELECT_ROWS';
 export const UNSELECT_ALL_ROWS = 'UNSELECT_ALL_ROWS';
-export const CANCEL = 'CANCEL';
-export const RESUME = 'RESUME';
+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 CANCEL_CONFIRM_MODAL_ID = 'cancelConfirmModal';
 export const RESUME_CONFIRM_MODAL_ID = 'resumeConfirmModal';
@@ -17,4 +14,7 @@ export const CANCEL_SELECTED_CONFIRM_MODAL_ID = 'cancelSelectedConfirmModal';
 export const RESUME_SELECTED_CONFIRM_MODAL_ID = 'resumeSelectedConfirmModal';
 export const UPDATE_CLICKED = 'UPDATE_CLICKED';
 
-export const TASKS_SEARCH_PROPS = getControllerSearchProps('tasks');
+export const TASKS_SEARCH_PROPS = {
+  ...getControllerSearchProps('tasks'),
+  controller: 'foreman_tasks/tasks'
+};

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

@@ -14,8 +14,6 @@ import { resolveSearchQuery, addSearchToURL } from './TasksTableHelpers';
 import { ConfirmationModals } from './Components/ConfirmationModals';
 import {
   TASKS_SEARCH_PROPS,
-  RESUME,
-  CANCEL,
   CANCEL_SELECTED_CONFIRM_MODAL_ID,
   RESUME_SELECTED_CONFIRM_MODAL_ID,
   RESUME_CONFIRM_MODAL_ID,
@@ -24,23 +22,22 @@ import {
 import { ActionSelectButton } from './Components/ActionSelectButton';
 import './TasksTablePage.scss';
 
-const TasksTablePage = ({ getBreadcrumbs, history, clicked, ...props }) => {
+const TasksTablePage = ({ getBreadcrumbs, history, clicked, createHeader, ...props }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
   const onSearch = searchQuery => {
     resolveSearchQuery(searchQuery, history);
-    props.getTableItems(url);
   };
 
-  const getSelected = () => {
-    const selected = props.results.filter(item =>
+  const getSelectedTasks = () => {
+    const selectedIDs = props.results.filter(item =>
       props.selectedRows.includes(item.id)
     );
-    return selected.map(item => ({
+    return selectedIDs.map(item => ({
       name: item.action,
       id: item.id,
-      isCancelleble: item.availableActions.cancellable,
-      isResumeble: item.availableActions.resumable,
+      isCancellable: item.availableActions.cancellable,
+      isResumable: item.availableActions.resumable,
     }));
   };
 
@@ -55,30 +52,38 @@ const TasksTablePage = ({ getBreadcrumbs, history, clicked, ...props }) => {
     resumeModal: useForemanModal({ id: RESUME_CONFIRM_MODAL_ID }),
   };
 
+  const {
+    bulkCancel,
+    bulkResume,
+    cancelTask,
+    resumeTask,
+    parentTaskID,
+  } = props;
   const tasksActions = {
     cancelSelectedTasks: () => {
-      props.actionSelected(CANCEL, getSelected(), url, props.parentTaskID);
+      bulkCancel({ selected: getSelectedTasks(), url, parentTaskID });
     },
     cancelTask: () => {
-      props.cancelTask(
-        clicked.taskId,
-        clicked.taskName,
+      cancelTask({
+        taskId: clicked.taskId,
+        taskName: clicked.taskName,
         url,
-        props.parentTaskID
-      );
+        parentTaskID,
+      });
     },
     resumeSelectedTasks: () => {
-      props.actionSelected(RESUME, getSelected(), url, props.parentTaskID);
+      bulkResume({ selected: getSelectedTasks(), url, parentTaskID });
     },
     resumeTask: () => {
-      props.resumeTask(
-        clicked.taskId,
-        clicked.taskName,
+      resumeTask({
+        taskId: clicked.taskId,
+        taskName: clicked.taskName,
         url,
-        props.parentTaskID
-      );
+        parentTaskID,
+      });
     },
   };
+
   return (
     <div className="tasks-table-wrapper">
       <ConfirmationModals
@@ -90,6 +95,7 @@ const TasksTablePage = ({ getBreadcrumbs, history, clicked, ...props }) => {
         searchable
         searchProps={TASKS_SEARCH_PROPS}
         onSearch={onSearch}
+        header={createHeader(props.actionName)}
         breadcrumbOptions={getBreadcrumbs(props.actionName)}
         toastNotifications="foreman-tasks-cancel"
         toolbarButtons={
@@ -124,11 +130,13 @@ TasksTablePage.propTypes = {
   actionName: PropTypes.string,
   status: PropTypes.oneOf(Object.keys(STATUS)),
   history: PropTypes.object.isRequired,
-  actionSelected: PropTypes.func.isRequired,
   cancelTask: PropTypes.func.isRequired,
   resumeTask: PropTypes.func.isRequired,
+  bulkCancel: PropTypes.func.isRequired,
+  bulkResume: PropTypes.func.isRequired,
   selectedRows: PropTypes.arrayOf(PropTypes.string),
   parentTaskID: PropTypes.string,
+  createHeader: PropTypes.func,
   clicked: PropTypes.shape({
     taskId: PropTypes.string,
     taskName: PropTypes.string,
@@ -142,6 +150,7 @@ TasksTablePage.defaultProps = {
   selectedRows: [],
   parentTaskID: null,
   clicked: {},
+  createHeader: () => __('Tasks'),
 };
 
 export default TasksTablePage;

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

@@ -6,7 +6,8 @@ export const minProps = {
   itemCount: 2,
   cancelTask: jest.fn(),
   resumeTask: jest.fn(),
-  actionSelected: jest.fn(),
+  bulkCancel: jest.fn(),
+  bulkResume: jest.fn(),
   selectAllRows: jest.fn(),
   unselectAllRows: jest.fn(),
   selectRow: jest.fn(),

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

@@ -1,13 +1,14 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
-import { TASKS_TABLE_ID, CANCEL, RESUME } from '../TasksTableConstants';
+import { TASKS_TABLE_ID } from '../TasksTableConstants';
 import {
   getTableItems,
   cancelTask,
   cancelTaskRequest,
   resumeTask,
   resumeTaskRequest,
-  actionSelected,
+  bulkCancel,
+  bulkResume,
 } from '../TasksTableActions';
 
 jest.mock('foremanReact/components/common/table', () => ({
@@ -18,10 +19,20 @@ jest.mock('foremanReact/API');
 
 API.post.mockImplementation(() => ({ data: 'some-data' }));
 
+const taskInfo = {
+  taskId: 'some-id',
+  taskName: 'some-name',
+};
+
+const task = {
+  id: 'some-id',
+  name: 'some-name',
+};
+
 const fixtures = {
-  'should cancelTask': () => cancelTask('some-id', 'some-name', 'some-url'),
+  'should cancelTask': () => cancelTask({ ...taskInfo, url: 'some-url' }),
   'should cancelTaskRequest and succeed': () =>
-    cancelTaskRequest('some-id', 'some-name', 'some-url'),
+    cancelTaskRequest('some-id', 'some-name'),
   'should cancelTaskRequest and fail': () => {
     API.post.mockImplementation(() =>
       Promise.reject(new Error('Network Error'))
@@ -29,60 +40,47 @@ const fixtures = {
     return cancelTaskRequest('some-id', 'some-name');
   },
 
-  'should resumeTask': () => resumeTask('some-id', 'some-name', 'some-url'),
+  'should resumeTask': () => resumeTask({ ...taskInfo, url: 'some-url' }),
   'should resumeTaskRequest and succeed': () => {
     API.post.mockImplementation(() => ({ data: 'some-data' }));
-    return resumeTaskRequest('some-id', 'some-name', 'some-url');
+    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', 'some-url');
+    return resumeTaskRequest('some-id', 'some-name');
   },
-  'should actionSelected CANCEL not cancelleble': () => {
-    const selected = [
-      {
-        id: '',
-        name: '',
-        isResumeble: false,
-        isCancelleble: false,
-      },
-    ];
-    return actionSelected(CANCEL, selected, 'some-url');
+  'handles bulkResume requests that fail': () => {
+    const selected = [{ ...task, isResumable: true, isCancellable: false }];
+
+    API.post.mockImplementation(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return bulkResume({ selected, url: 'some-url' });
   },
-  'should actionSelected CANCEL cancelleble': () => {
-    const selected = [
-      {
-        id: '',
-        name: '',
-        isResumeble: false,
-        isCancelleble: true,
+  'handles resumable bulkResume requests': () => {
+    const selected = [{ ...task, isResumable: true, isCancellable: false }];
+
+    API.post.mockImplementation(() => ({
+      data: {
+        resumed: [{ action: 'I am resumed' }],
+        failed: [{ action: 'I am failed' }],
       },
-    ];
-    return actionSelected(CANCEL, selected, 'some-url');
+    }));
+    return bulkResume({ selected, url: 'some-url' });
   },
-  'should actionSelected RESUME not resumable': () => {
-    const selected = [
-      {
-        id: '',
-        name: '',
-        isResumeble: false,
-        isCancelleble: false,
-      },
-    ];
-    return actionSelected(RESUME, selected, 'some-url');
+  'handles bulkCancel requests': () => {
+    const selected = [{ ...task, isResumable: false, isCancellable: true }];
+    return bulkCancel({ selected, url: 'some-url' });
   },
-  'should actionSelected RESUME resumable': () => {
-    const selected = [
-      {
-        id: '',
-        name: '',
-        isResumeble: true,
-        isCancelleble: false,
-      },
-    ];
-    return actionSelected(RESUME, selected, 'some-url');
+  'handles bulkCancel requests that are not cancellable': () => {
+    const selected = [{ ...task, isResumable: false, isCancellable: false }];
+    return bulkCancel({ selected, url: 'some-url' });
+  },
+  'handles bulkResume requests that are not resumable': () => {
+    const selected = [{ ...task, isResumable: false, isCancellable: false }];
+    return bulkResume({ selected, url: 'some-url' });
   },
 };
 describe('TasksTable actions', () => {

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

@@ -2,8 +2,10 @@
 
 exports[`SubTasksPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
-  actionSelected={[MockFunction]}
+  bulkCancel={[MockFunction]}
+  bulkResume={[MockFunction]}
   cancelTask={[MockFunction]}
+  createHeader={[Function]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
   history={

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

@@ -2,7 +2,8 @@
 
 exports[`TasksIndexPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
-  actionSelected={[MockFunction]}
+  bulkCancel={[MockFunction]}
+  bulkResume={[MockFunction]}
   cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TasksTable actions should actionSelected CANCEL cancelleble 1`] = `
+exports[`TasksTable actions handles bulkCancel requests 1`] = `
 Array [
   Array [
     [Function],
@@ -14,7 +14,7 @@ Array [
 ]
 `;
 
-exports[`TasksTable actions should actionSelected CANCEL not cancelleble 1`] = `
+exports[`TasksTable actions handles bulkCancel requests that are not cancellable 1`] = `
 Array [
   Array [
     Object {
@@ -30,7 +30,7 @@ Array [
 ]
 `;
 
-exports[`TasksTable actions should actionSelected RESUME not resumable 1`] = `
+exports[`TasksTable actions handles bulkResume requests that are not resumable 1`] = `
 Array [
   Array [
     Object {
@@ -46,10 +46,66 @@ Array [
 ]
 `;
 
-exports[`TasksTable actions should actionSelected RESUME resumable 1`] = `
+exports[`TasksTable actions handles bulkResume requests that fail 1`] = `
 Array [
   Array [
-    [Function],
+    Object {
+      "type": "TASKS_RESUME_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "error": [Error: Network Error],
+      "type": "TASKS_RESUME_FAILURE",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Cannot resume tasks at the moment Error: Network Error",
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable actions handles resumable bulkResume requests 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASKS_RESUME_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "type": "TASKS_RESUME_SUCCESS",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "I am resumed Task execution was resumed",
+          "type": "success",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "I am failed Task execution could not be resumed",
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
   ],
   Array [
     "TASKS_TABLE",

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

@@ -69,6 +69,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         ],
       }
     }
+    header="Tasks"
     onSearch={[Function]}
     searchProps={
       Object {
@@ -105,7 +106,8 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
   >
     <TasksTable
       actionName=""
-      actionSelected={[MockFunction]}
+      bulkCancel={[MockFunction]}
+      bulkResume={[MockFunction]}
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
@@ -225,6 +227,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         parentTaskID={null}
       />
     }
+    header="Tasks"
     onSearch={[Function]}
     searchProps={
       Object {
@@ -261,7 +264,8 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
   >
     <TasksTable
       actionName=""
-      actionSelected={[MockFunction]}
+      bulkCancel={[MockFunction]}
+      bulkResume={[MockFunction]}
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
+  name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
-  name: dynflow
+  name: foreman-tasks-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: get_process_mem
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="