20382: removed openRunningContextMenu and related code Arvados-DCO-1.1-Signed-off...

diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 18845ace76e1092a099f55437f02b418a3b4b186..464314877ff645328d838f2ddbbb1e4cd2a99ec7 100644 (file)
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -215,31 +215,12 @@ export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>, pro
                 description: res.description,
                 outputUuid: res.outputUuid || "",
                 workflowUuid: res.properties.template_uuid || "",
-                menuKind: ContextMenuKind.PROCESS_RESOURCE,
+                menuKind: isProcessCancelable(process) ? ContextMenuKind.RUNNING_PROCESS_RESOURCE : ContextMenuKind.PROCESS_RESOURCE
             })
         );
     }
 };
 
-export const openRunningProcessContextMenu =
-    (event: React.MouseEvent<HTMLElement>, process: Process) => (dispatch: Dispatch, getState: () => RootState) => {
-        const res = getResource<ProcessResource>(process.containerRequest.uuid)(getState().resources);
-        if (res) {
-            dispatch<any>(
-                openContextMenu(event, {
-                    uuid: res.uuid,
-                    ownerUuid: res.ownerUuid,
-                    kind: ResourceKind.PROCESS,
-                    name: res.name,
-                    description: res.description,
-                    outputUuid: res.outputUuid || "",
-                    workflowUuid: res.properties.template_uuid || "",
-                    menuKind: ContextMenuKind.RUNNING_PROCESS_RESOURCE,
-                })
-            );
-        }
-    };
-
 export const openPermissionEditContextMenu =
     (event: React.MouseEvent<HTMLElement>, link: LinkResource) => (dispatch: Dispatch, getState: () => RootState) => {
         if (link) {

diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index 7d85518d2d217050dfbbe6a0e7d6f0c92576f10a..6db875f2b281d98a1af0c8a3b769850d802f1611 100644 (file)
--- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -122,8 +122,8 @@ export const runningProcessResourceActionSet = [
         {
             name: "CANCEL",
             icon: StopIcon,
-            execute: (dispatch, resource) => {
-                dispatch(cancelRunningWorkflow(resource.uuid));
+            execute: (dispatch, resources) => {
+                dispatch(cancelRunningWorkflow(resources[0].uuid));
             },
         },
     ],

diff --git a/src/views/all-processes-panel/all-processes-panel.tsx b/src/views/all-processes-panel/all-processes-panel.tsx
index 6d612e752de7d1ecc96e76c79f748045ee1cff42..ee53f99c3fe94e39c4fa2da096d8e7175d774223 100644 (file)
--- a/src/views/all-processes-panel/all-processes-panel.tsx
+++ b/src/views/all-processes-panel/all-processes-panel.tsx
@@ -22,14 +22,14 @@ import {
     ResourceCreatedAtDate,
 } from "views-components/data-explorer/renderers";
 import { ProcessIcon } from "components/icon/icon";
-import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions";
+import { openProcessContextMenu } from "store/context-menu/context-menu-actions";
 import { loadDetailsPanel } from "store/details-panel/details-panel-action";
 import { navigateTo } from "store/navigation/navigation-action";
 import { ContainerRequestResource, ContainerRequestState } from "models/container-request";
 import { RootState } from "store/store";
 import { createTree } from "models/tree";
 import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from "store/resource-type-filters/resource-type-filters";
-import { getProcess, isProcessCancelable } from "store/processes/process";
+import { getProcess } from "store/processes/process";
 import { ResourcesState } from "store/resources/resources";
 
 type CssRules = "toolbar" | "button" | "root";
@@ -132,9 +132,7 @@ export const AllProcessesPanel = withStyles(styles)(
         class extends React.Component<AllProcessesPanelProps> {
             handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
                 const process = getProcess(resourceUuid)(this.props.resources);
-                if (process && isProcessCancelable(process)) {
-                    this.props.dispatch<any>(openRunningProcessContextMenu(event, process));
-                } else if (process) {
+                if (process) {
                     this.props.dispatch<any>(openProcessContextMenu(event, process));
                 }
                 this.props.dispatch<any>(loadDetailsPanel(resourceUuid));

diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index 6c1d4a71165fd30217b4ff64f1d0ff4fe1a3fc4e..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,7 +19,6 @@ import {
     loadNodeJson,
 } from "store/process-panel/process-panel-actions";
 import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } from "store/processes/processes-actions";
-import { isProcessCancelable } from "store/processes/process";
 import { navigateToLogCollection, pollProcessLogs, setProcessLogsPanelFilter } from "store/process-logs-panel/process-logs-panel-actions";
 import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
 
@@ -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));
         }
     },

diff --git a/src/views/subprocess-panel/subprocess-panel.tsx b/src/views/subprocess-panel/subprocess-panel.tsx
index 9ab069b6ca2fa19e352489dda3661787f784913c..0aa02d52701824b52d4f9611ebf2d5b49beee131 100644 (file)
--- a/src/views/subprocess-panel/subprocess-panel.tsx
+++ b/src/views/subprocess-panel/subprocess-panel.tsx
@@ -4,20 +4,17 @@
 
 import { Dispatch } from "redux";
 import { connect } from "react-redux";
-import { openProcessContextMenu, openRunningProcessContextMenu } from "store/context-menu/context-menu-actions";
+import { openProcessContextMenu } from "store/context-menu/context-menu-actions";
 import { SubprocessPanelRoot, SubprocessPanelActionProps, SubprocessPanelDataProps } from "views/subprocess-panel/subprocess-panel-root";
 import { RootState } from "store/store";
 import { navigateTo } from "store/navigation/navigation-action";
 import { loadDetailsPanel } from "store/details-panel/details-panel-action";
 import { getProcess } from "store/processes/process";
-import { isProcessCancelable } from "store/processes/process";
 
 const mapDispatchToProps = (dispatch: Dispatch): SubprocessPanelActionProps => ({
     onContextMenu: (event, resourceUuid, resources) => {
         const process = getProcess(resourceUuid)(resources);
-        if (process && isProcessCancelable(process)) {
-            dispatch<any>(openRunningProcessContextMenu(event, process));
-        } else if (process) {
+        if (process) {
             dispatch<any>(openProcessContextMenu(event, process));
         }
     },