webpack/ForemanTasks/Components/TaskDetails/index.js in foreman-tasks-1.1.3 vs webpack/ForemanTasks/Components/TaskDetails/index.js in foreman-tasks-1.2.0

@@ -1,9 +1,10 @@
 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,
   selectStartAt,
   selectStartBefore,
@@ -20,20 +21,17 @@
   selectLabel,
   selectExecutionPlan,
   selectFailedSteps,
   selectRunningSteps,
   selectHasSubTasks,
-  selectAllowDangerousActions,
   selectUsernamePath,
   selectAction,
   selectState,
   selectResult,
   selectTimeoutId,
   selectTaskReload,
   selectParentTask,
-  selectShowUnlockModal,
-  selectShowForceUnlockModal,
   selectExternalId,
   selectDynflowEnableConsole,
 } from './TaskDetailsSelectors';
 
 const mapStateToProps = state => ({
@@ -52,25 +50,23 @@
   executionPlan: selectExecutionPlan(state),
   failedSteps: selectFailedSteps(state),
   runningSteps: selectRunningSteps(state),
   help: selectHelp(state),
   hasSubTasks: selectHasSubTasks(state),
-  allowDangerousActions: selectAllowDangerousActions(state),
   locks: selectLocks(state),
   usernamePath: selectUsernamePath(state),
   action: selectAction(state),
   state: selectState(state),
   result: selectResult(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 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(TaskDetails);