foreman-tasks 0.17.6 → 1.2.0

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

@@ -32,9 +32,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       sm={6}
     >
       <span>
-        <EllipisWithTooltip>
-          Monitor Event Queue
-        </EllipisWithTooltip>
+        Monitor Event Queue
       </span>
     </Col>
     <Col
@@ -56,7 +54,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -115,7 +113,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date="2019-06-17 16:04:09 +0300"
         defaultValue="N/A"
       />
@@ -168,7 +166,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date={null}
         defaultValue="N/A"
       />
@@ -294,9 +292,7 @@ exports[`TaskInfo rendering render with Props 1`] = `
       </p>
       <p>
         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.
-        <br />
-        The recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task.
-        <br />
+The recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task.
       </p>
     </Col>
   </Row>
@@ -335,9 +331,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       sm={6}
     >
       <span>
-        <EllipisWithTooltip>
-          N/A
-        </EllipisWithTooltip>
+        N/A
       </span>
     </Col>
     <Col
@@ -359,7 +353,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />
@@ -418,7 +412,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />
@@ -469,7 +463,7 @@ exports[`TaskInfo rendering render without Props 1`] = `
       md={3}
       sm={6}
     >
-      <Component
+      <_default
         date=""
         defaultValue="N/A"
       />

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

@@ -1,5 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 import TaskDetails from './TaskDetails';
 
-storiesOf('TaskDetails', module).add('TaskDetails', () => <TaskDetails />);
+export default {
+  title: 'TaskDetails',
+  component: TaskDetails,
+};
+
+export const Basic = () => <TaskDetails />;

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) {
@@ -66,10 +60,10 @@ export const fetchTaskDetails = (
   id,
   timeoutId,
   refetchTaskDetailsAction
-) => dispatch => {
+) => async dispatch => {
   showLoading();
   dispatch(startRequest());
-  getTasksDetails(id, dispatch, timeoutId, refetchTaskDetailsAction);
+  await getTasksDetails(id, dispatch, timeoutId, refetchTaskDetailsAction);
 };
 
 const getTasksDetails = async (
@@ -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,11 +72,8 @@ 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;

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.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TaskDetails from '../TaskDetails';
 
@@ -6,6 +6,11 @@ const fixtures = {
   'render without Props': {},
 };
 
+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,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import API from 'foremanReact/API';
 import {
   taskReloadStop,

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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   FOREMAN_TASK_DETAILS_FETCH_TASK_SUCCESS,

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

@@ -15,9 +15,9 @@ exports[`TaskDetails rendering render without Props 1`] = `
     >
       <Task
         action=""
-        allowDangerousActions={false}
         cancelTaskRequest={[Function]}
         cancellable={false}
+        dynflowEnableConsole={false}
         endedAt=""
         error={Array []}
         executionPlan={Object {}}
@@ -26,7 +26,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
         fetchTaskDetails={[Function]}
         hasSubTasks={false}
         help=""
-        id=""
+        id="a15dd820-32f1-4ced-9ab7-c0fab8234c47"
         input={Array []}
         label=""
         locks={Array []}
@@ -38,8 +38,6 @@ exports[`TaskDetails rendering render without Props 1`] = `
         resumable={false}
         resumeTaskRequest={[Function]}
         runningSteps={Array []}
-        showForceUnlockModal={false}
-        showUnlockModal={false}
         startAt=""
         startBefore=""
         startedAt=""
@@ -48,8 +46,6 @@ exports[`TaskDetails rendering render without Props 1`] = `
         taskReloadStart={[Function]}
         taskReloadStop={[Function]}
         timeoutId={null}
-        toggleForceUnlockModal={[Function]}
-        toggleUnlockModal={[Function]}
         username=""
         usernamePath=""
       />
@@ -87,7 +83,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__/integration.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import API from 'foremanReact/API';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
 import TaskDetails, { reducers } from '../index';
 import { selectForemanTasks } from '../../../ForemanTasksSelectors';
@@ -15,6 +15,10 @@ describe('TaskDetails integration test', () => {
     const expectedIntervalId = 1;
     jest.useFakeTimers();
     setInterval.mockImplementation(() => expectedIntervalId);
+    delete window.location;
+    window.location = new URL(
+      'https://foreman.com/foreman_tasks/tasks/a15dd820-32f1-4ced-9ab7-c0fab8234c47/'
+    );
   });
   it('should flow', async () => {
     window.location.reload = jest.fn();

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

@@ -1,7 +1,8 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import TaskDetails from './TaskDetails';
-import * as actions from './TaskDetailsActions';
+import * as taskDetailsActions from './TaskDetailsActions';
+import * as taskActions from '../TaskActions';
 import reducer from './TaskDetailsReducer';
 import {
   selectEndedAt,
@@ -22,7 +23,6 @@ import {
   selectFailedSteps,
   selectRunningSteps,
   selectHasSubTasks,
-  selectAllowDangerousActions,
   selectUsernamePath,
   selectAction,
   selectState,
@@ -30,9 +30,8 @@ import {
   selectTimeoutId,
   selectTaskReload,
   selectParentTask,
-  selectShowUnlockModal,
-  selectShowForceUnlockModal,
   selectExternalId,
+  selectDynflowEnableConsole,
 } from './TaskDetailsSelectors';
 
 const mapStateToProps = state => ({
@@ -53,7 +52,6 @@ const mapStateToProps = state => ({
   runningSteps: selectRunningSteps(state),
   help: selectHelp(state),
   hasSubTasks: selectHasSubTasks(state),
-  allowDangerousActions: selectAllowDangerousActions(state),
   locks: selectLocks(state),
   usernamePath: selectUsernamePath(state),
   action: selectAction(state),
@@ -62,12 +60,12 @@ const mapStateToProps = state => ({
   timeoutId: selectTimeoutId(state),
   taskReload: selectTaskReload(state),
   parentTask: selectParentTask(state),
-  showUnlockModal: selectShowUnlockModal(state),
-  showForceUnlockModal: selectShowForceUnlockModal(state),
   externalId: selectExternalId(state),
+  dynflowEnableConsole: selectDynflowEnableConsole(state),
 });
 
-const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+const mapDispatchToProps = dispatch =>
+  bindActionCreators({ ...taskActions, ...taskDetailsActions }, dispatch);
 
 export const reducers = { taskDetails: reducer };
 

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.stories.js

@@ -1,7 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs, number, select } from '@storybook/addon-knobs';
-import { action } from '@storybook/addon-actions';
+import { action, number, select } from '@theforeman/stories';
 import { withCardsDecorator } from '../../../../../../../stories/decorators';
 
 import {
@@ -11,41 +9,47 @@ import {
 } from '../../../../TasksDashboardConstants';
 import PausedTasksCard from './PausedTasksCard';
 
-storiesOf('TasksDashboard/TasksCardsGrid', module)
-  .addDecorator(withKnobs)
-  .addDecorator(withCardsDecorator)
-  .add('PausedTasksCard', () => {
-    const selectTime = select(
-      'time',
-      TASKS_DASHBOARD_AVAILABLE_TIMES,
-      PausedTasksCard.defaultProps.time
-    );
+export default {
+  title: 'TasksDashboard/TasksCardsGrid/Cards/PausedTasksCard',
+  component: PausedTasksCard,
+  decorators: [withCardsDecorator],
+  parameters: {
+    centered: { disable: true },
+  },
+};
 
-    const selectMode = select(
-      'mode',
-      { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
-      'none'
-    );
-    return (
-      <PausedTasksCard
-        data={{
-          last: number('data.last', 3),
-          older: number('data.older', 5),
-        }}
-        time={selectTime}
-        query={{
-          state: select(
-            'query.state',
-            {
-              ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
-              NONE: null,
-            },
-            TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED
-          ),
-          mode: selectMode,
-          time: selectTime,
-        }}
-        updateQuery={action('updateQuery')}
-      />
-    );
-  });
+export const Basic = () => {
+  const selectTime = select(
+    'time',
+    TASKS_DASHBOARD_AVAILABLE_TIMES,
+    PausedTasksCard.defaultProps.time
+  );
+
+  const selectMode = select(
+    'mode',
+    { ...TASKS_DASHBOARD_AVAILABLE_QUERY_MODES, NONE: 'none', TOTAL: null },
+    'none'
+  );
+  return (
+    <PausedTasksCard
+      data={{
+        last: number('data.last', 3),
+        older: number('data.older', 5),
+      }}
+      time={selectTime}
+      query={{
+        state: select(
+          'query.state',
+          {
+            ...TASKS_DASHBOARD_AVAILABLE_QUERY_STATES,
+            NONE: null,
+          },
+          TASKS_DASHBOARD_AVAILABLE_QUERY_STATES.PAUSED
+        ),
+        mode: selectMode,
+        time: selectTime,
+      }}
+      updateQuery={action('updateQuery')}
+    />
+  );
+};

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksCardsGrid/Components/PausedTasksCard/PausedTasksCard.test.js

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