foreman-tasks 1.0.0 → 1.0.1

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

@@ -8,19 +8,17 @@ import {
   SELECT_ROWS,
   UNSELECT_ROWS,
   UNSELECT_ALL_ROWS,
-  TASKS_TABLE_SELECTED_MODAL,
-  CLOSED,
+  UPDATE_CLICKED,
 } from './TasksTableConstants';
 
 const initialState = Immutable({
   selectedRows: [],
-  modalStatus: CLOSED,
 });
 
 export const TasksTableQueryReducer = (state = initialState, action) => {
-  const { type, payload } = action;
+  const { type, payload, response } = action;
   const { subtotal, page, per_page: perPageString, action_name: actionName } =
-    payload || {};
+    response || {};
   const ACTION_TYPES = createTableActionTypes(TASKS_TABLE_ID);
   switch (type) {
     case ACTION_TYPES.SUCCESS:
@@ -42,8 +40,8 @@ export const TasksTableQueryReducer = (state = initialState, action) => {
       );
     case UNSELECT_ALL_ROWS:
       return state.set('selectedRows', []);
-    case TASKS_TABLE_SELECTED_MODAL:
-      return state.set('modalStatus', payload);
+    case UPDATE_CLICKED:
+      return state.set('clicked', payload.clicked);
     default:
       return state;
   }

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

@@ -1,7 +1,7 @@
+import { createSelector } from 'reselect';
 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 || {};
@@ -24,21 +24,23 @@ export const selectActionName = state =>
 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 [];
-  return results.map(result => ({
-    ...result,
-    action: result.action || result.label.replace(/::/g, ' '),
-    username: result.username || '',
-    state: result.state + (result.frozen ? ` ${__('Disabled')}` : ''),
-    duration: getDuration(result.started_at, result.ended_at),
-    availableActions: result.available_actions,
-  }));
-};
+export const selectClicked = state =>
+  selectTasksTableQuery(state).clicked || {};
+
+export const selectResults = createSelector(
+  selectTasksTableContent,
+  ({ results }) =>
+    results.map(result => ({
+      ...result,
+      action:
+        result.action ||
+        (result.label ? result.label.replace(/::/g, ' ') : result.id),
+      username: result.username || '',
+      state: result.state + (result.frozen ? ` ${__('Disabled')}` : ''),
+      duration: getDuration(result.started_at, result.ended_at),
+      availableActions: result.available_actions,
+    }))
+);
 
 export const selectStatus = state => selectTasksTableContent(state).status;
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import { SubTasksPage } from '../SubTasksPage';
 import { minProps } from './TasksTable.fixtures';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import { TasksIndexPage } from '../TasksIndexPage';
 import { minProps } from './TasksTable.fixtures';
 

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

@@ -23,9 +23,13 @@ export const minProps = {
     by: 'q',
     order: 'w',
   },
-  showResumeSelcetedModal: jest.fn(),
-  showCancelSelcetedModal: jest.fn(),
-  hideSelcetedModal: jest.fn(),
+  openClickedModal: jest.fn(),
+  modalProps: {
+    cancelSelectedModal: {},
+    resumeSelectedModal: {},
+    cancelModal: {},
+    resumeModal: {},
+  },
 };
 
 export default {

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import TasksTable from '../TasksTable';
 import fixtures from './TasksTable.fixtures';
 

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

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import { TASKS_TABLE_ID, CANCEL, RESUME } from '../TasksTableConstants';
 import {

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import TasksTablePage from '../TasksTablePage';
 import { minProps } from './TasksTable.fixtures';
 

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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 import {
   TASKS_TABLE_ID,
   TASKS_TABLE_SET_SORT,
@@ -6,8 +6,7 @@ import {
   SELECT_ROWS,
   UNSELECT_ROWS,
   UNSELECT_ALL_ROWS,
-  TASKS_TABLE_SELECTED_MODAL,
-  RESUME,
+  UPDATE_CLICKED,
 } from '../TasksTableConstants';
 import reducer from '../TasksTableReducer';
 
@@ -16,7 +15,7 @@ const fixtures = {
   'should handle TASKS_TABLE_SUCCESS': {
     action: {
       type: `${TASKS_TABLE_ID}_SUCCESS`,
-      payload: {
+      response: {
         subtotal: 120,
         page: 3,
         per_page: 12,
@@ -53,10 +52,10 @@ const fixtures = {
       type: UNSELECT_ALL_ROWS,
     },
   },
-  'should handle TASKS_TABLE_SELECTED_MODAL': {
+  'should handle UPDATE_CLICKED': {
     action: {
-      type: TASKS_TABLE_SELECTED_MODAL,
-      payload: RESUME,
+      type: UPDATE_CLICKED,
+      payload: { clicked: 'task' },
     },
   },
 };

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

@@ -6,7 +6,6 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
   cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
-  hideSelcetedModal={[MockFunction]}
   history={
     Object {
       "location": Object {
@@ -22,6 +21,15 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
       },
     }
   }
+  modalProps={
+    Object {
+      "cancelModal": Object {},
+      "cancelSelectedModal": Object {},
+      "resumeModal": Object {},
+      "resumeSelectedModal": Object {},
+    }
+  }
+  openClickedModal={[MockFunction]}
   pagination={
     Object {
       "page": 1,
@@ -39,8 +47,6 @@ exports[`SubTasksPage rendering render with minimal props 1`] = `
   selectAllRows={[MockFunction]}
   selectRow={[MockFunction]}
   selectedRows={Array []}
-  showCancelSelcetedModal={[MockFunction]}
-  showResumeSelcetedModal={[MockFunction]}
   sort={
     Object {
       "by": "q",

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

@@ -6,7 +6,6 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
   cancelTask={[MockFunction]}
   getBreadcrumbs={[MockFunction]}
   getTableItems={[MockFunction]}
-  hideSelcetedModal={[MockFunction]}
   history={
     Object {
       "location": Object {
@@ -15,6 +14,15 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
     }
   }
   itemCount={2}
+  modalProps={
+    Object {
+      "cancelModal": Object {},
+      "cancelSelectedModal": Object {},
+      "resumeModal": Object {},
+      "resumeSelectedModal": Object {},
+    }
+  }
+  openClickedModal={[MockFunction]}
   pagination={
     Object {
       "page": 1,
@@ -31,8 +39,6 @@ exports[`TasksIndexPage rendering render with minimal props 1`] = `
   selectAllRows={[MockFunction]}
   selectRow={[MockFunction]}
   selectedRows={Array []}
-  showCancelSelcetedModal={[MockFunction]}
-  showResumeSelcetedModal={[MockFunction]}
   sort={
     Object {
       "by": "q",

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

@@ -4,12 +4,40 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
 <div
   className="tasks-table-wrapper"
 >
-  <CancelResumeConfirm
-    action={[Function]}
-    closeModal={[MockFunction]}
-    modalStatus="CLOSED"
-    selected={Array []}
+  <ConfirmationModals
+    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],
+        },
+      }
+    }
     selectedRowsLen={0}
+    tasksActions={
+      Object {
+        "cancelSelectedTasks": [Function],
+        "cancelTask": [Function],
+        "resumeSelectedTasks": [Function],
+        "resumeTask": [Function],
+      }
+    }
   />
   <PageLayout
     beforeToolbarComponent={
@@ -81,7 +109,6 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
-      hideSelcetedModal={[MockFunction]}
       history={
         Object {
           "location": Object {
@@ -90,7 +117,31 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
         }
       }
       itemCount={2}
-      modalStatus="CLOSED"
+      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]}
       pagination={
         Object {
           "page": 1,
@@ -108,8 +159,6 @@ exports[`TasksTablePage rendering render with Breadcrubs 1`] = `
       selectAllRows={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}
-      showCancelSelcetedModal={[MockFunction]}
-      showResumeSelcetedModal={[MockFunction]}
       sort={
         Object {
           "by": "q",
@@ -128,12 +177,40 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
 <div
   className="tasks-table-wrapper"
 >
-  <CancelResumeConfirm
-    action={[Function]}
-    closeModal={[MockFunction]}
-    modalStatus="CLOSED"
-    selected={Array []}
+  <ConfirmationModals
+    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],
+        },
+      }
+    }
     selectedRowsLen={0}
+    tasksActions={
+      Object {
+        "cancelSelectedTasks": [Function],
+        "cancelTask": [Function],
+        "resumeSelectedTasks": [Function],
+        "resumeTask": [Function],
+      }
+    }
   />
   <PageLayout
     beforeToolbarComponent={
@@ -188,7 +265,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
       cancelTask={[MockFunction]}
       error={null}
       getTableItems={[MockFunction]}
-      hideSelcetedModal={[MockFunction]}
       history={
         Object {
           "location": Object {
@@ -197,7 +273,31 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
         }
       }
       itemCount={2}
-      modalStatus="CLOSED"
+      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]}
       pagination={
         Object {
           "page": 1,
@@ -215,8 +315,6 @@ exports[`TasksTablePage rendering render with minimal props 1`] = `
       selectAllRows={[MockFunction]}
       selectRow={[MockFunction]}
       selectedRows={Array []}
-      showCancelSelcetedModal={[MockFunction]}
-      showResumeSelcetedModal={[MockFunction]}
       sort={
         Object {
           "by": "q",

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

@@ -3,7 +3,6 @@
 exports[`TasksTableReducer reducer should handle SELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [
       1,
       2,
@@ -17,19 +16,9 @@ Object {
 }
 `;
 
-exports[`TasksTableReducer reducer should handle TASKS_TABLE_SELECTED_MODAL 1`] = `
-Object {
-  "tasksTableQuery": Object {
-    "modalStatus": "RESUME",
-    "selectedRows": Array [],
-  },
-}
-`;
-
 exports[`TasksTableReducer reducer should handle TASKS_TABLE_SET_PAGINATION 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }
@@ -38,7 +27,6 @@ Object {
 exports[`TasksTableReducer reducer should handle TASKS_TABLE_SET_SORT 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }
@@ -49,7 +37,6 @@ Object {
   "tasksTableQuery": Object {
     "actionName": undefined,
     "itemCount": 120,
-    "modalStatus": "CLOSED",
     "pagination": Object {
       "page": 3,
       "perPage": 12,
@@ -62,7 +49,6 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ALL_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }
@@ -71,7 +57,15 @@ Object {
 exports[`TasksTableReducer reducer should handle UNSELECT_ROWS 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
+    "selectedRows": Array [],
+  },
+}
+`;
+
+exports[`TasksTableReducer reducer should handle UPDATE_CLICKED 1`] = `
+Object {
+  "tasksTableQuery": Object {
+    "clicked": "task",
     "selectedRows": Array [],
   },
 }
@@ -80,7 +74,6 @@ Object {
 exports[`TasksTableReducer reducer should return the initial state 1`] = `
 Object {
   "tasksTableQuery": Object {
-    "modalStatus": "CLOSED",
     "selectedRows": Array [],
   },
 }