foreman-tasks 0.17.1 → 0.17.2

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

@@ -1,6 +1,7 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 import { selectForemanTasks } from '../../ForemanTasksSelectors';
 import { getDuration } from './TasksTableHelpers';
+import { CLOSED } from './TasksTableConstants';
 
 export const selectTasksTable = state =>
   selectForemanTasks(state).tasksTable || {};
@@ -20,6 +21,12 @@ export const selectItemCount = state =>
 export const selectActionName = state =>
   selectTasksTableQuery(state).actionName || '';
 
+export const selectSelectedRows = state =>
+  selectTasksTableQuery(state).selectedRows || [];
+
+export const selectModalStatus = state =>
+  selectTasksTableQuery(state).modalStatus || CLOSED;
+
 export const selectResults = state => {
   const { results } = selectTasksTableContent(state);
   if (!results) return [];
@@ -28,6 +35,7 @@ export const selectResults = state => {
     username: result.username || '',
     state: result.state + (result.frozen ? ` ${__('Disabled')}` : ''),
     duration: getDuration(result.started_at, result.ended_at),
+    availableActions: result.available_actions,
   }));
 };
 

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

@@ -6,18 +6,26 @@ export const minProps = {
   itemCount: 2,
   cancelTask: jest.fn(),
   resumeTask: jest.fn(),
+  actionSelected: jest.fn(),
+  selectAllRows: jest.fn(),
+  unselectAllRows: jest.fn(),
+  selectRow: jest.fn(),
+  unselectRow: jest.fn(),
+  selectedRows: [],
   pagination: {
     page: 1,
     perPage: 10,
   },
   history: { location: { search: '' } },
-  location: { pathname: '' },
   status: STATUS.RESOLVED,
   results: ['a', 'b'],
   sort: {
     by: 'q',
     order: 'w',
   },
+  showResumeSelcetedModal: jest.fn(),
+  showCancelSelcetedModal: jest.fn(),
+  hideSelcetedModal: jest.fn(),
 };
 
 export default {

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

@@ -1,12 +1,13 @@
 import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
 import API from 'foremanReact/API';
-import { TASKS_TABLE_ID } from '../TasksTableConstants';
+import { TASKS_TABLE_ID, CANCEL, RESUME } from '../TasksTableConstants';
 import {
   getTableItems,
   cancelTask,
   cancelTaskRequest,
   resumeTask,
   resumeTaskRequest,
+  actionSelected,
 } from '../TasksTableActions';
 
 jest.mock('foremanReact/components/common/table', () => ({
@@ -39,6 +40,50 @@ const fixtures = {
     );
     return resumeTaskRequest('some-id', 'some-name', 'some-url');
   },
+  'should actionSelected CANCEL not cancelleble': () => {
+    const selected = [
+      {
+        id: '',
+        name: '',
+        isResumeble: false,
+        isCancelleble: false,
+      },
+    ];
+    return actionSelected(CANCEL, selected, 'some-url');
+  },
+  'should actionSelected CANCEL cancelleble': () => {
+    const selected = [
+      {
+        id: '',
+        name: '',
+        isResumeble: false,
+        isCancelleble: true,
+      },
+    ];
+    return actionSelected(CANCEL, selected, 'some-url');
+  },
+  'should actionSelected RESUME not resumable': () => {
+    const selected = [
+      {
+        id: '',
+        name: '',
+        isResumeble: false,
+        isCancelleble: false,
+      },
+    ];
+    return actionSelected(RESUME, selected, 'some-url');
+  },
+  'should actionSelected RESUME resumable': () => {
+    const selected = [
+      {
+        id: '',
+        name: '',
+        isResumeble: true,
+        isCancelleble: false,
+      },
+    ];
+    return actionSelected(RESUME, selected, 'some-url');
+  },
 };
 describe('TasksTable actions', () => {
   it('getTableItems should reuse common/table/getTableItemsAction', () => {

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

@@ -3,6 +3,11 @@ import {
   TASKS_TABLE_ID,
   TASKS_TABLE_SET_SORT,
   TASKS_TABLE_SET_PAGINATION,
+  SELECT_ROWS,
+  UNSELECT_ROWS,
+  UNSELECT_ALL_ROWS,
+  TASKS_TABLE_SELECTED_MODAL,
+  RESUME,
 } from '../TasksTableConstants';
 import reducer from '../TasksTableReducer';
 
@@ -31,7 +36,30 @@ const fixtures = {
       payload: { page: 4, perPage: 7 },
     },
   },
+  'should handle SELECT_ROWS': {
+    action: {
+      type: SELECT_ROWS,
+      payload: [1, 2, 3, 4, 5, 6, 7],
+    },
+  },
+  'should handle UNSELECT_ROWS': {
+    action: {
+      type: UNSELECT_ROWS,
+      payload: 4,
+    },
+  },
+  'should handle UNSELECT_ALL_ROWS': {
+    action: {
+      type: UNSELECT_ALL_ROWS,
+    },
+  },
+  'should handle TASKS_TABLE_SELECTED_MODAL': {
+    action: {
+      type: TASKS_TABLE_SELECTED_MODAL,
+      payload: RESUME,
+    },
+  },
 };
 
-describe('TasksTablePaginationReducer reducer', () =>
+describe('TasksTableReducer reducer', () =>
   testReducerSnapshotWithFixtures(reducer, fixtures));

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

@@ -2,9 +2,11 @@
 
 exports[`SubTasksPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
+  actionSelected={[MockFunction]}
   cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
+  hideSelcetedModal={[MockFunction]}
   history={
     Object {
       "location": Object {
@@ -13,11 +15,6 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     }
   }
   itemCount={2}
-  location={
-    Object {
-      "pathname": "",
-    }
-  }
   match={
     Object {
       "params": Object {
@@ -38,6 +35,11 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     ]
   }
   resumeTask={[MockFunction]}
+  selectAllRows={[MockFunction]}
+  selectRow={[MockFunction]}
+  selectedRows={Array []}
+  showCancelSelcetedModal={[MockFunction]}
+  showResumeSelcetedModal={[MockFunction]}
   sort={
     Object {
       "by": "q",
@@ -45,5 +47,7 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
     }
   }
   status="RESOLVED"
+  unselectAllRows={[MockFunction]}
+  unselectRow={[MockFunction]}
 />
 `;

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

@@ -2,9 +2,11 @@
 
 exports[`TasksIndexPage rendering render with minimal props 1`] = `
 <Connect(TasksTablePage)
+  actionSelected={[MockFunction]}
   cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
+  hideSelcetedModal={[MockFunction]}
   history={
     Object {
       "location": Object {
@@ -13,11 +15,6 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
     }
   }
   itemCount={2}
-  location={
-    Object {
-      "pathname": "",
-    }
-  }
   pagination={
     Object {
       "page": 1,
@@ -31,6 +28,11 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
     ]
   }
   resumeTask={[MockFunction]}
+  selectAllRows={[MockFunction]}
+  selectRow={[MockFunction]}
+  selectedRows={Array []}
+  showCancelSelcetedModal={[MockFunction]}
+  showResumeSelcetedModal={[MockFunction]}
   sort={
     Object {
       "by": "q",
@@ -38,5 +40,7 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
     }
   }
   status="RESOLVED"
+  unselectAllRows={[MockFunction]}
+  unselectRow={[MockFunction]}
 />
 `;

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

@@ -1,5 +1,79 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TasksTable actions should actionSelected CANCEL cancelleble 1`] = `
+Array [
+  Array [
+    [Function],
+  ],
+  Array [
+    "TASKS_TABLE",
+  ],
+  Array [
+    [Function],
+  ],
+]
+`;
+
+exports[`TasksTable actions should actionSelected CANCEL not cancelleble 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be canceled",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable actions should actionSelected RESUME not resumable 1`] = `
+Array [
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Not all the selected tasks can be resumed",
+          "type": "warning",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TasksTable actions should actionSelected RESUME resumable 1`] = `
+Array [
+  Array [
+    [Function],
+  ],
+  Array [
+    "TASKS_TABLE",
+  ],
+  Array [
+    [Function],
+  ],
+]
+`;
+
+exports[`TasksTable actions should cancelTask 1`] = `
+Array [
+  Array [
+    [Function],
+  ],
+  Array [
+    "TASKS_TABLE",
+  ],
+  Array [
+    [Function],
+  ],
+]
+`;
+
 exports[`TasksTable actions should cancelTaskRequest and fail 1`] = `
 Array [
   Array [
@@ -17,7 +91,7 @@ Array [
     Object {
       "payload": Object {
         "message": Object {
-          "message": "\\"some-name\\" task cannot be cancelled at the moment.",
+          "message": "\\"some-name\\" Task cannot be cancelled at the moment.",
           "type": "error",
         },
       },
@@ -44,7 +118,7 @@ Array [
     Object {
       "payload": Object {
         "message": Object {
-          "message": "\\"some-name\\" task cancelled",
+          "message": "\\"some-name\\" Task cancelled",
           "type": "success",
         },
       },
@@ -54,7 +128,7 @@ Array [
 ]
 `;
 
-exports[`TasksTable actions should cancelTask 1`] = `
+exports[`TasksTable actions should resumeTask 1`] = `
 Array [
   Array [
     [Function],
@@ -99,17 +173,3 @@ Array [
   ],
 ]
 `;
-
-exports[`TasksTable actions should resumeTask 1`] = `
-Array [
-  Array [
-    [Function],
-  ],
-  Array [
-    "TASKS_TABLE",
-  ],
-  Array [
-    [Function],
-  ],
-]
-`;

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

@@ -4,6 +4,13 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
 <div
   className="tasks-table-wrapper"
 >
+  <CancelResumeConfirm
+    action={[Function]}
+    closeModal={[MockFunction]}
+    modalStatus="CLOSED"
+    selected={Array []}
+    selectedRowsLen={0}
+  />
   <PageLayout
     beforeToolbarComponent={
       <Connect(TasksDashboard)
@@ -56,16 +63,24 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
     toolbarButtons={
       <React.Fragment>
         <ExportButton
+          title="Export All"
           url="/foreman_tasks/tasks.csv?include_permissions=true"
         />
+        <ActionSelectButton
+          disabled={true}
+          onCancel={[MockFunction]}
+          onResume={[MockFunction]}
+        />
       </React.Fragment>
     }
   >
     <TasksTable
       actionName=""
+      actionSelected={[MockFunction]}
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
+      hideSelcetedModal={[MockFunction]}
       history={
         Object {
           "location": Object {
@@ -75,11 +90,7 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
       }
       isSubTask={false}
       itemCount={2}
-      location={
-        Object {
-          "pathname": "",
-        }
-      }
+      modalStatus="CLOSED"
       pagination={
         Object {
           "page": 1,
@@ -93,6 +104,11 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         ]
       }
       resumeTask={[MockFunction]}
+      selectAllRows={[MockFunction]}
+      selectRow={[MockFunction]}
+      selectedRows={Array []}
+      showCancelSelcetedModal={[MockFunction]}
+      showResumeSelcetedModal={[MockFunction]}
       sort={
         Object {
           "by": "q",
@@ -100,6 +116,8 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         }
       }
       status="RESOLVED"
+      unselectAllRows={[MockFunction]}
+      unselectRow={[MockFunction]}
     />
   </PageLayout>
 </div>
@@ -109,6 +127,13 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
 <div
   className="tasks-table-wrapper"
 >
+  <CancelResumeConfirm
+    action={[Function]}
+    closeModal={[MockFunction]}
+    modalStatus="CLOSED"
+    selected={Array []}
+    selectedRowsLen={0}
+  />
   <PageLayout
     beforeToolbarComponent={
       <Connect(TasksDashboard)
@@ -144,16 +169,24 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
     toolbarButtons={
       <React.Fragment>
         <ExportButton
+          title="Export All"
           url="/foreman_tasks/tasks.csv?include_permissions=true"
         />
+        <ActionSelectButton
+          disabled={true}
+          onCancel={[MockFunction]}
+          onResume={[MockFunction]}
+        />
       </React.Fragment>
     }
   >
     <TasksTable
       actionName=""
+      actionSelected={[MockFunction]}
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
+      hideSelcetedModal={[MockFunction]}
       history={
         Object {
           "location": Object {
@@ -163,11 +196,7 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
       }
       isSubTask={false}
       itemCount={2}
-      location={
-        Object {
-          "pathname": "",
-        }
-      }
+      modalStatus="CLOSED"
       pagination={
         Object {
           "page": 1,
@@ -181,6 +210,11 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         ]
       }
       resumeTask={[MockFunction]}
+      selectAllRows={[MockFunction]}
+      selectRow={[MockFunction]}
+      selectedRows={Array []}
+      showCancelSelcetedModal={[MockFunction]}
+      showResumeSelcetedModal={[MockFunction]}
       sort={
         Object {
           "by": "q",
@@ -188,6 +222,8 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       status="RESOLVED"
+      unselectAllRows={[MockFunction]}
+      unselectRow={[MockFunction]}
     />
   </PageLayout>
 </div>