Merge branch 'master' into #15165-running-a-process-from-workflow-section-doesnt...

[arvados-workbench2.git] / src / store / process-panel / process-panel-actions.ts

diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts
index f1f74f6d63b60208dfdd60891eda92d48055a9ed..da917f71f70f275aa25e96e3d4861b6b3b9011be 100644 (file)
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@ -8,7 +8,7 @@ import { Dispatch } from 'redux';
 import { ProcessStatus } from '~/store/processes/process';
 import { RootState } from '~/store/store';
 import { ServiceRepository } from "~/services/services";
-import { navigateToCollection, navigateToWorkflows } from '~/store/navigation/navigation-action';
+import { navigateTo, navigateToWorkflows } from '~/store/navigation/navigation-action';
 import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 import { SnackbarKind } from '../snackbar/snackbar-actions';
 import { showWorkflowDetails } from '~/store/workflow-panel/workflow-panel-actions';
@@ -26,14 +26,13 @@ export const loadProcessPanel = (uuid: string) =>
     (dispatch: Dispatch) => {
         dispatch<any>(loadProcess(uuid));
         dispatch(initProcessPanelFilters);
-        dispatch<any>(showWorkflowDetails(uuid));
     };
 
 export const navigateToOutput = (uuid: string) =>
     async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         try {
             await services.collectionService.get(uuid);
-            dispatch<any>(navigateToCollection(uuid));
+            dispatch<any>(navigateTo(uuid));
         } catch {
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This collection does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR }));
         }
@@ -42,6 +41,7 @@ export const navigateToOutput = (uuid: string) =>
 export const openWorkflow = (uuid: string) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch<any>(navigateToWorkflows);
+        dispatch<any>(showWorkflowDetails(uuid));
     };
 
 export const initProcessPanelFilters = procesPanelActions.SET_PROCESS_PANEL_FILTERS([