foreman-tasks 1.1.2 → 2.0.2

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss

@@ -10,20 +10,6 @@
   .container {
     margin: 0;
   }
-  /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
-
   .spin {
     -webkit-animation: spin 1s infinite linear;
     -moz-animation: spin 1s infinite linear;
@@ -60,4 +46,7 @@
       transform: rotate(360deg);
     }
   }
+  .dynflow-button > span {
+    pointer-events: auto;
+  }
 }

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

@@ -1,21 +1,25 @@
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   showLoading,
   hideLoading,
 } from 'foremanReact/components/Layout/LayoutActions';
+import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
 import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_REQUEST,
   FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS,
   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,
+  TASK_STEP_CANCEL_REQUEST,
+  TASK_STEP_CANCEL_FAILURE,
+  TASK_STEP_CANCEL_SUCCESS,
 } from './TaskDetailsConstants';
 import {
-  cancelTaskRequest,
-  resumeTaskRequest,
-} from '../TasksTable/TasksTableActions';
+  errorToastData,
+  infoToastData,
+  successToastData,
+} from '../common/ToastsHelpers';
 
 export const taskReloadStop = timeoutId => {
   if (timeoutId) {
@@ -52,7 +56,9 @@ export const refetchTaskDetails = (id, loading) => dispatch => {
 
 const reloadTasksDetails = async (id, dispatch) => {
   try {
-    const { data } = await API.get(`/foreman_tasks/api/tasks/${id}/details`);
+    const { data } = await API.get(
+      `/foreman_tasks/api/tasks/${id}/details?include_permissions`
+    );
     dispatch(requestSuccess(data));
   } catch (error) {
     dispatch(requestFailure(error));
@@ -79,7 +85,9 @@ const getTasksDetails = async (
   refetchTaskDetailsAction
 ) => {
   try {
-    const { data } = await API.get(`/foreman_tasks/api/tasks/${id}/details`);
+    const { data } = await API.get(
+      `/foreman_tasks/api/tasks/${id}/details?include_permissions`
+    );
     dispatch(requestSuccess(data));
     if (data.state !== 'stopped') {
       dispatch(taskReloadStart(timeoutId, refetchTaskDetailsAction, id));
@@ -105,11 +113,27 @@ const requestFailure = error => ({
   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 };
+export const cancelStep = (taskId, stepId) => async dispatch => {
+  dispatch({ type: TASK_STEP_CANCEL_REQUEST });
+  dispatch(addToast(infoToastData(`${__('Trying to cancel step')} ${stepId}`)));
+  try {
+    await API.post(
+      `/foreman_tasks/tasks/${taskId}/cancel_step?step_id=${stepId}`
+    );
+    dispatch({ type: TASK_STEP_CANCEL_SUCCESS });
+    dispatch(addToast(successToastData(`${stepId} {__('Step Canceled')}`)));
+  } catch (error) {
+    dispatch({ type: TASK_STEP_CANCEL_FAILURE, payload: error });
+    dispatch(
+      addToast(
+        errorToastData(
+          `${__('Could not cancel step.')} ${__(
+            'Error:'
+          )} ${stepId} ${error.response &&
+            error.response.data &&
+            error.response.data.error}`
+        )
+      )
+    );
+  }
+};

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

@@ -12,7 +12,6 @@ export const 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';
+export const TASK_STEP_CANCEL_REQUEST = 'TASK_STEP_CANCEL_REQUEST';
+export const TASK_STEP_CANCEL_FAILURE = 'TASK_STEP_CANCEL_FAILURE';
+export const TASK_STEP_CANCEL_SUCCESS = 'TASK_STEP_CANCEL_SUCCESS';

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

@@ -30,7 +30,7 @@ export const selectErrors = state => {
 
 export const selectProgress = state =>
   selectTaskDetails(state).progress
-    ? parseFloat((selectTaskDetails(state).progress * 100).toFixed(2))
+    ? Math.trunc(selectTaskDetails(state).progress * 100)
     : 0;
 
 export const selectUsername = state =>
@@ -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,14 +72,11 @@ 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;
 
 export const selectDynflowEnableConsole = state =>
   selectTaskDetails(state).dynflow_enable_console || false;
+
+export const selectCanEdit = state =>
+  selectTaskDetails(state).can_edit || false;

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

@@ -1 +1,6 @@
-export const getTaskID = () => window.location.pathname.split('/').slice(-1)[0];
+// Get Task ID from URL. Split url by '/', filter non-empty values and get Task ID.
+export const getTaskID = () =>
+  window.location.pathname
+    .split('/')
+    .filter(i => i)
+    .slice(-1)[0];

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

@@ -0,0 +1,8 @@
+export const minProps = {
+  cancelStep: jest.fn(),
+  taskReloadStop: jest.fn(),
+  taskReloadStart: jest.fn(),
+  refetchTaskDetails: jest.fn(),
+  fetchTaskDetails: jest.fn(),
+  taskProgressToggle: jest.fn(),
+};

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

@@ -1,11 +1,17 @@
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskDetails from '../TaskDetails';
+import { minProps } from './TaskDetails.fixtures';
 
 const fixtures = {
-  'render without Props': {},
+  'render with min Props': minProps,
 };
 
+delete window.location;
+window.location = new URL(
+  'https://foreman.com/foreman_tasks/tasks/a15dd820-32f1-4ced-9ab7-c0fab8234c47/'
+);
+
 describe('TaskDetails', () => {
   describe('rendering', () =>
     testComponentSnapshotsWithFixtures(TaskDetails, fixtures));

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

@@ -1,19 +1,35 @@
 import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import API from 'foremanReact/API';
+import { API } from 'foremanReact/redux/API';
 import {
   taskReloadStop,
   taskReloadStart,
   fetchTaskDetails,
+  cancelStep,
 } from '../TaskDetailsActions';
 
-jest.mock('foremanReact/API');
+jest.mock('foremanReact/redux/API');
 
 API.get.mockImplementation(async () => ({ data: 'some-data' }));
+API.post.mockImplementation(async () => ({ data: 'some-data' }));
 
 const fixtures = {
   'should start reload': () => taskReloadStart(1),
   'should stop reload': () => taskReloadStop(2),
   'should fetch-task-details and success': () => fetchTaskDetails(),
+  'should cancelStep and success': () => cancelStep('task-id', 'step-id'),
+
+  'should fetch-task-details and fail': () => {
+    API.get.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return fetchTaskDetails();
+  },
+  'should cancelStep and fail': () => {
+    API.post.mockImplementationOnce(() =>
+      Promise.reject(new Error('Network Error'))
+    );
+    return cancelStep('task-id', 'step-id');
+  },
 };
 
 describe('TaskDetails - Actions', () =>

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TaskDetails rendering render without Props 1`] = `
+exports[`TaskDetails rendering render with min Props 1`] = `
 <div
   className="task-details-react well"
 >
@@ -15,7 +15,8 @@ exports[`TaskDetails rendering render without Props 1`] = `
     >
       <Task
         action=""
-        allowDangerousActions={false}
+        canEdit={false}
+        cancelStep={[MockFunction]}
         cancelTaskRequest={[Function]}
         cancellable={false}
         dynflowEnableConsole={false}
@@ -24,33 +25,46 @@ exports[`TaskDetails rendering render without Props 1`] = `
         executionPlan={Object {}}
         externalId=""
         failedSteps={Array []}
-        fetchTaskDetails={[Function]}
+        fetchTaskDetails={
+          [MockFunction] {
+            "calls": Array [
+              Array [
+                "a15dd820-32f1-4ced-9ab7-c0fab8234c47",
+                null,
+                [MockFunction],
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          }
+        }
         hasSubTasks={false}
         help=""
-        id=""
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         input={Array []}
         label=""
         locks={Array []}
         output={Object {}}
         parentTask=""
         progress={0}
-        refetchTaskDetails={[Function]}
+        refetchTaskDetails={[MockFunction]}
         result="error"
         resumable={false}
         resumeTaskRequest={[Function]}
         runningSteps={Array []}
-        showForceUnlockModal={false}
-        showUnlockModal={false}
         startAt=""
         startBefore=""
         startedAt=""
         state=""
+        taskProgressToggle={[Function]}
         taskReload={false}
-        taskReloadStart={[Function]}
-        taskReloadStop={[Function]}
+        taskReloadStart={[MockFunction]}
+        taskReloadStop={[MockFunction]}
         timeoutId={null}
-        toggleForceUnlockModal={[Function]}
-        toggleUnlockModal={[Function]}
         username=""
         usernamePath=""
       />
@@ -60,8 +74,11 @@ exports[`TaskDetails rendering render without Props 1`] = `
       title="Running Steps"
     >
       <RunningSteps
-        executionPlan={Object {}}
+        cancelStep={[MockFunction]}
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         runningSteps={Array []}
+        taskProgressToggle={[Function]}
+        taskReload={false}
       />
     </Tab>
     <Tab
@@ -88,7 +105,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
       <Raw
         endedAt=""
         externalId=""
-        id=""
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         input={Array []}
         label=""
         output={Object {}}

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

@@ -1,5 +1,96 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`TaskDetails - Actions should cancelStep and fail 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASK_STEP_CANCEL_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Trying to cancel step step-id",
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "payload": [Error: Network Error],
+      "type": "TASK_STEP_CANCEL_FAILURE",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Could not cancel step. Error: step-id undefined",
+          "type": "error",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TaskDetails - Actions should cancelStep and success 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "TASK_STEP_CANCEL_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "Trying to cancel step step-id",
+          "type": "info",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+  Array [
+    Object {
+      "type": "TASK_STEP_CANCEL_SUCCESS",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "message": Object {
+          "message": "step-id {__('Step Canceled')}",
+          "type": "success",
+        },
+      },
+      "type": "TOASTS_ADD",
+    },
+  ],
+]
+`;
+
+exports[`TaskDetails - Actions should fetch-task-details and fail 1`] = `
+Array [
+  Array [
+    Object {
+      "type": "FOREMAN_TASK_DETAILS_FETCH_TASK_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": [Error: Network Error],
+      "type": "FOREMAN_TASK_DETAILS_FETCH_TASK_FAILURE",
+    },
+  ],
+]
+`;
+
 exports[`TaskDetails - Actions should fetch-task-details and success 1`] = `
 Array [
   Array [