Merge branch '19302-left-side-panel-changes'

[arvados.git] / src / views / process-panel / process-panel.tsx

diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index d3d8caf2def5b914696740241125e90bd19fcad5..4a6b5fd33344600e1a5e6af1d71e4ecbd09b0a29 100644 (file)
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@ -6,7 +6,7 @@ import { RootState } from "store/store";
 import { connect } from "react-redux";
 import { getProcess, getSubprocesses, Process, getProcessStatus } from "store/processes/process";
 import { Dispatch } from "redux";
-import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions";
+import { openProcessContextMenu } from "store/context-menu/context-menu-actions";
 import { ProcessPanelRootDataProps, ProcessPanelRootActionProps, ProcessPanelRoot } from "./process-panel-root";
 import { getProcessPanelCurrentUuid, ProcessPanel as ProcessPanelState } from "store/process-panel/process-panel";
 import { groupBy } from "lodash";
@@ -19,9 +19,8 @@ import {
     loadNodeJson,
 } from "store/process-panel/process-panel-actions";
 import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } from "store/processes/processes-actions";
-import { navigateToLogCollection, setProcessLogsPanelFilter } from "store/process-logs-panel/process-logs-panel-actions";
+import { navigateToLogCollection, pollProcessLogs, setProcessLogsPanelFilter } from "store/process-logs-panel/process-logs-panel-actions";
 import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
-import { isProcessCancelable } from "store/processes/process";
 
 const mapStateToProps = ({ router, auth, resources, processPanel, processLogsPanel }: RootState): ProcessPanelRootDataProps => {
     const uuid = getProcessPanelCurrentUuid(router) || "";
@@ -52,10 +51,7 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps =>
         );
     },
     onContextMenu: (event, process) => {
-        // dispatch<any>(openProcessContextMenu(event, process));
-        if (process && isProcessCancelable(process)) {
-            dispatch<any>(openRunningProcessContextMenu(event, process));
-        } else if (process) {
+        if (process) {
             dispatch<any>(openProcessContextMenu(event, process));
         }
     },
@@ -72,6 +68,7 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps =>
     loadOutputDefinitions: containerRequest => dispatch<any>(loadOutputDefinitions(containerRequest)),
     updateOutputParams: () => dispatch<any>(updateOutputParams()),
     loadNodeJson: containerRequest => dispatch<any>(loadNodeJson(containerRequest)),
+    pollProcessLogs: processUuid => dispatch<any>(pollProcessLogs(processUuid)),
 });
 
 const getFilters = (processPanel: ProcessPanelState, processes: Process[]) => {