fix: back button on execution detail screen (#190)

Signed-off-by: Pianist038801 <steven@union.ai>

Co-authored-by: Pianist038801 <steven@union.ai>

src/components/Executions/ExecutionDetails/ExecutionDetailsAppBarContent.tsx

@@ -11,6 +11,8 @@ import { interactiveTextDisabledColor } from 'components/Theme/constants';
 import { Execution } from 'models/Execution/types';
 import * as React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
+import { history } from 'routes/history';
+import { Routes } from 'routes/routes';
 import { ExecutionInputsOutputsModal } from '../ExecutionInputsOutputsModal';
 import { ExecutionStatusBadge } from '../ExecutionStatusBadge';
 import { TerminateExecutionButton } from '../TerminateExecution/TerminateExecutionButton';
@@ -79,12 +81,20 @@ export const ExecutionDetailsAppBarContent: React.FC<{
  const { domain, name, project } = execution.id;
  const { phase } = execution.closure;
  const sourceId = getExecutionSourceId(execution);
- const { backLink = getExecutionBackLink(execution) } = useLocationState();
+ const {
+ backLink: originalBackLink = getExecutionBackLink(execution)
+ } = useLocationState();
  const isRunning = executionIsRunning(execution);
  const isTerminal = executionIsTerminal(execution);
  const onClickShowInputsOutputs = () => setShowInputsOutputs(true);
  const onClickRelaunch = () => setShowRelaunchForm(true);
  const onCloseRelaunch = () => setShowRelaunchForm(false);
+ const fromExecutionNav = new URLSearchParams(history.location.search).get(
+ 'fromExecutionNav'
+ );
+ const backLink = fromExecutionNav
+ ? Routes.ProjectDetails.sections.executions.makeUrl(project, domain)
+ : originalBackLink;
 
  let modalContent: JSX.Element | null = null;
  if (showInputsOutputs) {

src/components/Executions/Tables/WorkflowExecutionLink.tsx

@@ -4,17 +4,25 @@ import { WorkflowExecutionIdentifier } from 'models/Execution/types';
 import * as React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { Routes } from 'routes/routes';
+import { history } from 'routes/history';
 
 /** A simple component to render a link to a specific WorkflowExecution */
 export const WorkflowExecutionLink: React.FC<{
  className?: string;
  id: WorkflowExecutionIdentifier;
 }> = ({ className, id }) => {
  const commonStyles = useCommonStyles();
+ const {
+ location: { pathname }
+ } = history;
+ const fromExecutionNav = pathname.split('/').pop() === 'executions';
+
  return (
  <RouterLink
  className={classnames(commonStyles.primaryLink, className)}
- to={Routes.ExecutionDetails.makeUrl(id)}
+ to={`${Routes.ExecutionDetails.makeUrl(id)}${
+ fromExecutionNav ? '?fromExecutionNav=true' : ''
+ }`}
  >
  {id.name}
  </RouterLink>