foreman-tasks 1.0.1 → 2.0.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={
@@ -45,7 +21,8 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         history={
           Object {
             "location": Object {
-              "search": "",
+              "pathname": "/foreman_tasks/tasks",
+              "search": "?action=\\"some-name\\"",
             },
           }
         }
@@ -69,6 +46,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         ],
       }
     }
+    header="Tasks"
     onSearch={[Function]}
     searchProps={
       Object {
@@ -83,7 +61,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "documentationUrl": "4.1.5Searching",
           "url": "/api/bookmarks",
         },
-        "controller": "tasks",
+        "controller": "foreman_tasks_tasks",
       }
     }
     searchQuery="a=b"
@@ -91,57 +69,42 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
     toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Spinner
+          className=""
+          inline={false}
+          inverse={false}
+          loading={true}
+          size="lg"
+        />
         <ExportButton
           title="Export All"
-          url="/foreman_tasks/tasks.csv?include_permissions=true"
+          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
         />
         <ActionSelectButton
           disabled={true}
-          onCancel={[MockFunction]}
-          onResume={[MockFunction]}
+          onCancel={[Function]}
+          onForceCancel={[Function]}
+          onResume={[Function]}
         />
       </React.Fragment>
     }
   >
     <TasksTable
       actionName=""
-      actionSelected={[MockFunction]}
-      cancelTask={[MockFunction]}
+      allRowsSelected={false}
       error={null}
       getTableItems={[MockFunction]}
       history={
         Object {
           "location": Object {
-            "search": "",
+            "pathname": "/foreman_tasks/tasks",
+            "search": "?action=\\"some-name\\"",
           },
         }
       }
       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,
@@ -155,8 +118,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "b",
         ]
       }
-      resumeTask={[MockFunction]}
-      selectAllRows={[MockFunction]}
+      selectPage={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}
       sort={
@@ -165,7 +127,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
           "order": "w",
         }
       }
-      status="RESOLVED"
+      status="PENDING"
       unselectAllRows={[MockFunction]}
       unselectRow={[MockFunction]}
     />
@@ -177,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={
@@ -218,13 +156,15 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         history={
           Object {
             "location": Object {
-              "search": "",
+              "pathname": "/foreman_tasks/tasks",
+              "search": "?action=\\"some-name\\"",
             },
           }
         }
         parentTaskID={null}
       />
     }
+    header="Tasks"
     onSearch={[Function]}
     searchProps={
       Object {
@@ -239,7 +179,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "documentationUrl": "4.1.5Searching",
           "url": "/api/bookmarks",
         },
-        "controller": "tasks",
+        "controller": "foreman_tasks_tasks",
       }
     }
     searchQuery="a=b"
@@ -247,57 +187,42 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     toastNotifications="foreman-tasks-cancel"
     toolbarButtons={
       <React.Fragment>
+        <Spinner
+          className=""
+          inline={false}
+          inverse={false}
+          loading={true}
+          size="lg"
+        />
         <ExportButton
           title="Export All"
-          url="/foreman_tasks/tasks.csv?include_permissions=true"
+          url="/foreman_tasks/tasks.csv?action=%22some-name%22&state=stopped"
         />
         <ActionSelectButton
           disabled={true}
-          onCancel={[MockFunction]}
-          onResume={[MockFunction]}
+          onCancel={[Function]}
+          onForceCancel={[Function]}
+          onResume={[Function]}
         />
       </React.Fragment>
     }
   >
     <TasksTable
       actionName=""
-      actionSelected={[MockFunction]}
-      cancelTask={[MockFunction]}
+      allRowsSelected={false}
       error={null}
       getTableItems={[MockFunction]}
       history={
         Object {
           "location": Object {
-            "search": "",
+            "pathname": "/foreman_tasks/tasks",
+            "search": "?action=\\"some-name\\"",
           },
         }
       }
       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,
@@ -311,8 +236,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "b",
         ]
       }
-      resumeTask={[MockFunction]}
-      selectAllRows={[MockFunction]}
+      selectPage={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}
       sort={
@@ -321,7 +245,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
           "order": "w",
         }
       }
-      status="RESOLVED"
+      status="PENDING"
       unselectAllRows={[MockFunction]}
       unselectRow={[MockFunction]}
     />

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

@@ -1,5 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksTableReducer reducer should handle OPEN_SELECT_ALL 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "selectedRows": Array [],
+    "showSelectAll": true,
+  },
+}
+`;
+
+exports[`TasksTableReducer reducer should handle SELECT_ALL_ROWS 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "allRowsSelected": true,
+    "selectedRows": Array [],
+  },
+}
+`;
+
 exports[`TasksTableReducer reducer should handle SELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
@@ -49,7 +67,9 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ALL_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
+    "allRowsSelected": false,
     "selectedRows": Array [],
+    "showSelectAll": false,
   },
 }
 `;
@@ -62,6 +82,20 @@ Object {
 }
 `;
 
+exports[`TasksTableReducer reducer should handle UNSELECT_ROWS with all rows selected 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "allRowsSelected": false,
+    "selectedRows": Array [
+      3,
+      4,
+      5,
+    ],
+    "showSelectAll": false,
+  },
+}
+`;
+
 exports[`TasksTableReducer reducer should handle UPDATE_CLICKED 1`] = `
 Object {
   "tasksTableQuery": Object {

data/webpack/ForemanTasks/Components/TasksTable/formatters/__test__/selectionHeaderCellFormatter.test.js

@@ -4,7 +4,7 @@ describe('selectionHeaderCellFormatter', () => {
   it('render', () => {
     expect(
       selectionHeaderCellFormatter(
-        { allRowsSelected: () => true },
+        { allPageSelected: () => true },
         'some-label'
       )
     ).toMatchSnapshot();

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

@@ -4,7 +4,7 @@ import TableSelectionHeaderCell from '../Components/TableSelectionHeaderCell';
 export default (selectionController, label) => (
   <TableSelectionHeaderCell
     label={label}
-    checked={selectionController.allRowsSelected()}
-    onChange={() => selectionController.selectAllRows()}
+    checked={selectionController.allPageSelected()}
+    onChange={selectionController.selectPage}
   />
 );

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

@@ -2,7 +2,8 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import TasksTablePage from './TasksTablePage';
 import reducer from './TasksTableReducer';
-import * as actions from './TasksTableActions';
+import * as tableActions from './TasksTableActions';
+import * as bulkActions from './TasksBulkActions';
 import {
   selectStatus,
   selectError,
@@ -12,7 +13,9 @@ import {
   selectSort,
   selectActionName,
   selectSelectedRows,
-  selectClicked,
+  selectAllRowsSelected,
+  selectShowSelectAll,
+  selectModalID,
 } from './TasksTableSelectors';
 
 const mapStateToProps = state => ({
@@ -24,10 +27,13 @@ const mapStateToProps = state => ({
   itemCount: selectItemCount(state),
   actionName: selectActionName(state),
   selectedRows: selectSelectedRows(state),
-  clicked: selectClicked(state),
+  allRowsSelected: selectAllRowsSelected(state),
+  showSelectAll: selectShowSelectAll(state),
+  modalID: selectModalID(state),
 });
 
-const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({ ...tableActions, ...bulkActions }, dispatch);
 
 export const reducers = { tasksTable: reducer };
 

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js

@@ -1,27 +1,53 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CancelButton } from './CancelButton';
-import { ResumeButton } from './ResumeButton';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { ActionButtons } from 'foremanReact/components/common/ActionButtons/ActionButtons';
 
-export const ActionButton = ({ id, name, availableActions, taskActions }) => {
-  const isResume = availableActions.resumable;
-  if (isResume) {
-    return (
-      <ResumeButton
-        id={id}
-        name={name}
-        onClick={taskActions.resumeTask}
-        disabled={false}
-      />
-    );
+export const ActionButton = ({
+  id,
+  name,
+  availableActions: { resumable, cancellable, stoppable },
+  taskActions,
+}) => {
+  const buttons = [];
+  const isTitle = !(resumable || cancellable || stoppable);
+  const title = isTitle ? __('Task cannot be canceled') : undefined;
+  if (resumable) {
+    buttons.push({
+      title: __('Resume'),
+      action: {
+        disabled: !resumable,
+        onClick: () => taskActions.resumeTask(id, name),
+        id: `task-resume-button-${id}`,
+      },
+    });
+  }
+  if (cancellable || (!stoppable && !resumable)) {
+    // Cancel is the default button that should be shown if no task action can be done
+    buttons.push({
+      title: __('Cancel'),
+      action: {
+        disabled: !cancellable,
+        onClick: () => taskActions.cancelTask(id, name),
+        id: `task-cancel-button-${id}`,
+      },
+    });
+  }
+
+  if (stoppable) {
+    buttons.push({
+      title: __('Force Cancel'),
+      action: {
+        disabled: !stoppable,
+        onClick: () => taskActions.forceCancelTask(id, name),
+        id: `task-force-cancel-button-${id}`,
+      },
+    });
   }
   return (
-    <CancelButton
-      id={id}
-      name={name}
-      disabled={!availableActions.cancellable}
-      onClick={taskActions.cancelTask}
-    />
+    <span title={title}>
+      <ActionButtons buttons={buttons} />
+    </span>
   );
 };
 
@@ -31,9 +57,11 @@ ActionButton.propTypes = {
   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,
 };