foreman-tasks 1.1.3 → 1.2.0

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/Task.test.js

@@ -1,6 +1,15 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
+import React from 'react';
+import {
+  testComponentSnapshotsWithFixtures,
+  mount,
+  shallow,
+} from '@theforeman/test';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import Task from '../Task';
+import {
+  UNLOCK_MODAL,
+  FORCE_UNLOCK_MODAL,
+} from '../../../TaskActions/TaskActionsConstants';
 
 const fixtures = {
   'render without Props': { id: 'test' },
@@ -8,12 +17,67 @@ const fixtures = {
     id: 'test',
     state: 'paused',
     hasSubTasks: true,
-    allowDangerousActions: true,
     dynflowEnableConsole: true,
+    parentTask: 'parent-id',
+    taskReload: true,
   },
 };
 
 describe('Task', () => {
   describe('rendering', () =>
     testComponentSnapshotsWithFixtures(Task, fixtures));
+  describe('click test', () => {
+    const setModalOpen = jest.fn();
+    useForemanModal.mockImplementation(id => ({
+      setModalOpen: () => setModalOpen(id),
+    }));
+    const cancelTaskRequest = jest.fn();
+    const resumeTaskRequest = jest.fn();
+    const taskReloadStart = jest.fn();
+    const id = 'some-id';
+    const action = 'some-action';
+    const props = {
+      taskReload: false,
+      taskReloadStart,
+      id,
+      action,
+      cancelTaskRequest,
+      resumeTaskRequest,
+    };
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+    it('reload', () => {
+      const component = mount(<Task {...props} />);
+      const reloadButton = component.find('.reload-button').at(0);
+      reloadButton.simulate('click');
+      expect(taskReloadStart).toBeCalled();
+    });
+    it('resume', () => {
+      const component = shallow(<Task {...props} />);
+      const resumeButton = component.find('.resume-button').at(0);
+      resumeButton.props().onClick();
+      expect(taskReloadStart).toBeCalled();
+      expect(resumeTaskRequest).toBeCalledWith(id, action);
+    });
+    it('cancel', () => {
+      const component = shallow(<Task {...props} />);
+      const cancelButton = component.find('.cancel-button').at(0);
+      cancelButton.props().onClick();
+      expect(taskReloadStart).toBeCalled();
+      expect(cancelTaskRequest).toBeCalledWith(id, action);
+    });
+    it('unlock', () => {
+      const component = shallow(<Task {...props} />);
+      const unlockButton = component.find('.unlock-button').at(0);
+      unlockButton.props().onClick();
+      expect(setModalOpen).toBeCalledWith({ id: UNLOCK_MODAL });
+    });
+    it('focrce unlock', () => {
+      const component = shallow(<Task {...props} />);
+      const forceUnlockButton = component.find('.force-unlock-button').at(0);
+      forceUnlockButton.props().onClick();
+      expect(setModalOpen).toBeCalledWith({ id: FORCE_UNLOCK_MODAL });
+    });
+  });
 });

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/TaskInfo.test.js

@@ -41,7 +41,6 @@ const fixtures = {
     help:
       "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved.\nThe recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task.",
     hasSubTasks: false,
-    allowDangerousActions: false,
     locks: [
       {
         name: 'task_owner',

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap

@@ -2,25 +2,14 @@
 
 exports[`Task rendering render with some Props 1`] = `
 <Fragment>
-  <ClickConfirmation
-    body="This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-    closeModal={[Function]}
-    confirmAction="Unlock"
-    confirmType="warning"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/unlock"
-    showModal={false}
-    title="Unlock"
+  <UnlockModal
+    id="unlockModal"
+    onClick={[Function]}
   />
-  <ClickConfirmation
-    body="Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck"
-    closeModal={[Function]}
-    confirmAction="Force Unlock"
-    confirmType="danger"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/force_unlock"
-    showModal={false}
-    title="Force Unlock"
+  <ForceUnlockModal
+    id="forceUnlockModal"
+    onClick={[Function]}
+    selectedRowsLen={1}
   />
   <Grid
     bsClass="container"
@@ -44,13 +33,12 @@ exports[`Task rendering render with some Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          hidden={false}
           onClick={[Function]}
         >
           <span
-            className="glyphicon glyphicon-refresh "
+            className="glyphicon glyphicon-refresh spin"
           />
-          Start  auto-reloading
+          Stop  auto-reloading
         </Button>
         <Button
           active={false}
@@ -58,29 +46,55 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="dynflow-button"
           disabled={false}
           href="/foreman_tasks/dynflow/"
         >
           Dynflow console
         </Button>
-        <ResumeButton
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="resume-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
-        <CancelButton
+        >
+          Resume
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="cancel-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
+        >
+          Cancel
+        </Button>
         <Button
           active={false}
           block={false}
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="parent-button"
+          disabled={false}
+          href="/foreman_tasks/tasks/parent-id"
+        >
+          Parent task
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="subtask-button"
           disabled={false}
           href="/foreman_tasks/tasks/test/sub_tasks"
         >
@@ -92,8 +106,9 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="unlock-button"
           disabled={false}
-          onClick={[Function]}
+          onClick={[MockFunction]}
         >
           Unlock
         </Button>
@@ -103,8 +118,9 @@ exports[`Task rendering render with some Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="force-unlock-button"
           disabled={false}
-          onClick={[Function]}
+          onClick={[MockFunction]}
         >
           Force Unlock
         </Button>
@@ -112,7 +128,6 @@ exports[`Task rendering render with some Props 1`] = `
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={true}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={true}
@@ -123,24 +138,20 @@ exports[`Task rendering render with some Props 1`] = `
       help=""
       id="test"
       output=""
-      parentTask=""
+      parentTask="parent-id"
       progress={0}
       refetchTaskDetails={[Function]}
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
-      showForceUnlockModal={false}
-      showUnlockModal={false}
       startAt=""
       startBefore=""
       startedAt=""
       state="paused"
-      taskReload={false}
+      taskReload={true}
       taskReloadStart={[Function]}
       taskReloadStop={[Function]}
       timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
       username=""
       usernamePath=""
     />
@@ -150,25 +161,14 @@ exports[`Task rendering render with some Props 1`] = `
 
 exports[`Task rendering render without Props 1`] = `
 <Fragment>
-  <ClickConfirmation
-    body="This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-    closeModal={[Function]}
-    confirmAction="Unlock"
-    confirmType="warning"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/unlock"
-    showModal={false}
-    title="Unlock"
+  <UnlockModal
+    id="unlockModal"
+    onClick={[Function]}
   />
-  <ClickConfirmation
-    body="Resources will be unlocked and will not prevent other tasks from being run. As the task might be still running, it should be avoided to use this unless you are really sure the task got stuck"
-    closeModal={[Function]}
-    confirmAction="Force Unlock"
-    confirmType="danger"
-    confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-    path="/foreman_tasks/tasks/test/force_unlock"
-    showModal={false}
-    title="Force Unlock"
+  <ForceUnlockModal
+    id="forceUnlockModal"
+    onClick={[Function]}
+    selectedRowsLen={1}
   />
   <Grid
     bsClass="container"
@@ -192,7 +192,6 @@ exports[`Task rendering render without Props 1`] = `
           bsStyle="default"
           className="reload-button"
           disabled={false}
-          hidden={true}
           onClick={[Function]}
         >
           <span
@@ -206,28 +205,64 @@ exports[`Task rendering render without Props 1`] = `
           bsClass="btn"
           bsSize="small"
           bsStyle="default"
+          className="dynflow-button"
           disabled={true}
           href="/foreman_tasks/dynflow/"
         >
           Dynflow console
         </Button>
-        <ResumeButton
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="resume-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
-        <CancelButton
+        >
+          Resume
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="cancel-button"
           disabled={true}
-          id="test"
-          name=""
           onClick={[Function]}
-        />
+        >
+          Cancel
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="unlock-button"
+          disabled={true}
+          onClick={[MockFunction]}
+        >
+          Unlock
+        </Button>
+        <Button
+          active={false}
+          block={false}
+          bsClass="btn"
+          bsSize="small"
+          bsStyle="default"
+          className="force-unlock-button"
+          disabled={false}
+          onClick={[MockFunction]}
+        >
+          Force Unlock
+        </Button>
       </Col>
     </Row>
     <TaskInfo
       action=""
-      allowDangerousActions={false}
       cancelTaskRequest={[Function]}
       cancellable={false}
       dynflowEnableConsole={false}
@@ -244,8 +279,6 @@ exports[`Task rendering render without Props 1`] = `
       result="error"
       resumable={false}
       resumeTaskRequest={[Function]}
-      showForceUnlockModal={false}
-      showUnlockModal={false}
       startAt=""
       startBefore=""
       startedAt=""
@@ -254,8 +287,6 @@ exports[`Task rendering render without Props 1`] = `
       taskReloadStart={[Function]}
       taskReloadStop={[Function]}
       timeoutId={null}
-      toggleForceUnlockModal={[Function]}
-      toggleUnlockModal={[Function]}
       username=""
       usernamePath=""
     />

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsActions.js

@@ -9,13 +9,7 @@ import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_FAILURE,
   FOREMAN_TASK_DETAILS_STOP_POLLING,
   FOREMAN_TASK_DETAILS_START_POLLING,
-  FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL,
-  FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL,
 } from './TaskDetailsConstants';
-import {
-  cancelTaskRequest,
-  resumeTaskRequest,
-} from '../TasksTable/TasksTableActions';
 
 export const taskReloadStop = timeoutId => {
   if (timeoutId) {
@@ -104,12 +98,3 @@ const requestFailure = error => ({
   type: FOREMAN_TASK_DETAILS_FETCH_TASK_FAILURE,
   payload: error,
 });
-
-export const toggleUnlockModal = () => ({
-  type: FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL,
-});
-export const toggleForceUnlockModal = () => ({
-  type: FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL,
-});
-
-export { cancelTaskRequest, resumeTaskRequest };

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsConstants.js

@@ -11,8 +11,3 @@ export const FOREMAN_TASK_DETAILS_STOP_POLLING =
   'FOREMAN_TASK_DETAILS_STOP_POLLING';
 export const FOREMAN_TASK_DETAILS_START_POLLING =
   'FOREMAN_TASK_DETAILS_START_POLLING';
-
-export const FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL =
-  'FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL';
-export const FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL =
-  'FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL';

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsReducer.js

@@ -4,8 +4,6 @@ import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS,
   FOREMAN_TASK_DETAILS_STOP_POLLING,
   FOREMAN_TASK_DETAILS_START_POLLING,
-  FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL,
-  FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL,
 } from './TaskDetailsConstants';
 
 const initialState = Immutable({});
@@ -34,10 +32,6 @@ export default (state = initialState, action) => {
     case FOREMAN_TASK_DETAILS_START_POLLING:
       clearTimeout(state.timeoutId);
       return state.merge({ taskReload: true, timeoutId: payload.timeoutId });
-    case FOREMAN_TASK_DETAILS_TOGGLE_UNLOCK_MODAL:
-      return state.set('showUnlockModal', !state.showUnlockModal);
-    case FOREMAN_TASK_DETAILS_TOGGLE_FORCE_UNLOCK_MODAL:
-      return state.set('showForceUnlockModal', !state.showForceUnlockModal);
     default:
       return state;
   }

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -52,9 +52,6 @@ export const selectHelp = state => selectTaskDetails(state).help || null;
 export const selectHasSubTasks = state =>
   selectTaskDetails(state).has_sub_tasks || false;
 
-export const selectAllowDangerousActions = state =>
-  selectTaskDetails(state).allowDangerousActions || false;
-
 export const selectLocks = state => selectTaskDetails(state).locks || [];
 
 export const selectUsernamePath = state =>
@@ -75,12 +72,6 @@ export const selectTaskReload = state =>
 export const selectParentTask = state =>
   selectTaskDetails(state).parent_task_id || '';
 
-export const selectShowUnlockModal = state =>
-  selectTaskDetails(state).showUnlockModal || false;
-
-export const selectShowForceUnlockModal = state =>
-  selectTaskDetails(state).showForceUnlockModal || false;
-
 export const selectExternalId = state =>
   selectTaskDetails(state).external_id || null;