Two Human Interaction Block Fixes (#3940)

This commit is contained in:
Jonathan Dobson
2025-11-07 12:33:18 -05:00
committed by GitHub
parent f291e95f96
commit 900f301c25
3 changed files with 10 additions and 6 deletions

View File

@@ -51,3 +51,7 @@ export function statusIsRunningOrQueued({
}): boolean { }): boolean {
return status === Status.Queued || status === Status.Running; return status === Status.Queued || status === Status.Running;
} }
export function statusIsCancellable({ status }: { status: Status }): boolean {
return statusIsNotFinalized({ status });
}

View File

@@ -33,7 +33,7 @@ import {
} from "@radix-ui/react-icons"; } from "@radix-ui/react-icons";
import { useMutation, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQueryClient } from "@tanstack/react-query";
import { Link, Outlet, useSearchParams } from "react-router-dom"; import { Link, Outlet, useSearchParams } from "react-router-dom";
import { statusIsFinalized, statusIsRunningOrQueued } from "../tasks/types"; import { statusIsCancellable, statusIsFinalized } from "../tasks/types";
import { useWorkflowRunWithWorkflowQuery } from "./hooks/useWorkflowRunWithWorkflowQuery"; import { useWorkflowRunWithWorkflowQuery } from "./hooks/useWorkflowRunWithWorkflowQuery";
import { WorkflowRunTimeline } from "./workflowRun/WorkflowRunTimeline"; import { WorkflowRunTimeline } from "./workflowRun/WorkflowRunTimeline";
import { useWorkflowRunTimelineQuery } from "./hooks/useWorkflowRunTimelineQuery"; import { useWorkflowRunTimelineQuery } from "./hooks/useWorkflowRunTimelineQuery";
@@ -142,8 +142,8 @@ function WorkflowRun() {
}, },
}); });
const workflowRunIsRunningOrQueued = const workflowRunIsCancellable =
workflowRun && statusIsRunningOrQueued(workflowRun); workflowRun && statusIsCancellable(workflowRun);
const workflowRunIsFinalized = workflowRun && statusIsFinalized(workflowRun); const workflowRunIsFinalized = workflowRun && statusIsFinalized(workflowRun);
const selection = findActiveItem( const selection = findActiveItem(
@@ -362,7 +362,7 @@ function WorkflowRun() {
Edit Edit
</Link> </Link>
</Button> </Button>
{workflowRunIsRunningOrQueued && ( {workflowRunIsCancellable && (
<Dialog> <Dialog>
<DialogTrigger asChild> <DialogTrigger asChild>
<Button variant="destructive">Cancel</Button> <Button variant="destructive">Cancel</Button>

View File

@@ -16,7 +16,7 @@ import {
DialogTitle, DialogTitle,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { toast } from "@/components/ui/use-toast"; import { toast } from "@/components/ui/use-toast";
import { useWorkflowRunQuery } from "../hooks/useWorkflowRunQuery"; import { useWorkflowRunWithWorkflowQuery } from "../hooks/useWorkflowRunWithWorkflowQuery";
import { WorkflowRunBlock } from "../types/workflowRunTypes"; import { WorkflowRunBlock } from "../types/workflowRunTypes";
interface Props { interface Props {
@@ -26,7 +26,7 @@ interface Props {
export function WorkflowRunHumanInteraction({ workflowRunBlock }: Props) { export function WorkflowRunHumanInteraction({ workflowRunBlock }: Props) {
const credentialGetter = useCredentialGetter(); const credentialGetter = useCredentialGetter();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const { data: workflowRun } = useWorkflowRunQuery(); const { data: workflowRun } = useWorkflowRunWithWorkflowQuery();
const isPaused = const isPaused =
workflowRun && workflowRun.status === WorkflowRunStatus.Paused; workflowRun && workflowRun.status === WorkflowRunStatus.Paused;