Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delete action in workflows table #802

Merged
merged 3 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion skyvern-frontend/src/components/icons/GarbageIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type Props = {
className: string;
className?: string;
};

function GarbageIcon({ className }: Props) {
Expand Down
33 changes: 6 additions & 27 deletions skyvern-frontend/src/routes/workflows/Workflows.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@ import { useCredentialGetter } from "@/hooks/useCredentialGetter";
import { basicTimeFormat } from "@/util/timeFormat";
import { cn } from "@/util/utils";
import {
CounterClockwiseClockIcon,
Pencil2Icon,
PlayIcon,
PlusIcon,
ReloadIcon,
} from "@radix-ui/react-icons";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { useNavigate, useSearchParams } from "react-router-dom";
import { WorkflowsBetaAlertCard } from "./WorkflowsBetaAlertCard";
import { WorkflowTitle } from "./WorkflowTitle";
import { WorkflowCreateYAMLRequest } from "./types/workflowYamlTypes";
import { stringify as convertToYAML } from "yaml";
import { DeleteWorkflowButton } from "./editor/DeleteWorkflowButton";
import { WorkflowCreateYAMLRequest } from "./types/workflowYamlTypes";
import { WorkflowTitle } from "./WorkflowTitle";

const emptyWorkflowRequest: WorkflowCreateYAMLRequest = {
title: "New Workflow",
Expand Down Expand Up @@ -114,10 +113,6 @@ function Workflows() {
},
});

if (workflows?.length === 0 && workflowsPage === 1) {
return <WorkflowsBetaAlertCard />;
}

function handleRowClick(
event: React.MouseEvent<HTMLTableCellElement>,
workflowPermanentId: string,
Expand Down Expand Up @@ -215,25 +210,6 @@ function Workflows() {
</TableCell>
<TableCell>
<div className="flex justify-end gap-2">
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button
size="icon"
variant="outline"
onClick={(event) => {
handleIconClick(
event,
`/workflows/${workflow.workflow_permanent_id}/runs`,
);
}}
>
<CounterClockwiseClockIcon className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>View Past Runs</TooltipContent>
</Tooltip>
</TooltipProvider>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
Expand Down Expand Up @@ -272,6 +248,9 @@ function Workflows() {
<TooltipContent>Create New Run</TooltipContent>
</Tooltip>
</TooltipProvider>
<DeleteWorkflowButton
id={workflow.workflow_permanent_id}
/>
</div>
</TableCell>
</TableRow>
Expand Down
37 changes: 0 additions & 37 deletions skyvern-frontend/src/routes/workflows/WorkflowsBetaAlertCard.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import { getClient } from "@/api/AxiosClient";
import { GarbageIcon } from "@/components/icons/GarbageIcon";
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogClose,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
import { toast } from "@/components/ui/use-toast";
import { useCredentialGetter } from "@/hooks/useCredentialGetter";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { AxiosError } from "axios";

type Props = {
id: string;
};

function DeleteWorkflowButton({ id }: Props) {
const credentialGetter = useCredentialGetter();
const queryClient = useQueryClient();

const deleteWorkflowMutation = useMutation({
mutationFn: async (id: string) => {
const client = await getClient(credentialGetter);
return client.delete(`/workflows/${id}`);
},
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: ["workflows"],
});
},
onError: (error: AxiosError) => {
toast({
variant: "destructive",
title: "Failed to delete workflow",
description: error.message,
});
},
});

return (
<Dialog>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<DialogTrigger asChild>
<Button size="icon" variant="outline">
<GarbageIcon className="h-4 w-4" />
</Button>
</DialogTrigger>
</TooltipTrigger>
<TooltipContent>Delete Workflow</TooltipContent>
</Tooltip>
</TooltipProvider>
<DialogContent onCloseAutoFocus={(e) => e.preventDefault()}>
<DialogHeader>
<DialogTitle>Are you sure?</DialogTitle>
<DialogDescription>This workflow will be deleted.</DialogDescription>
</DialogHeader>
<DialogFooter>
<DialogClose asChild>
<Button variant="secondary">Cancel</Button>
</DialogClose>
<Button
variant="destructive"
onClick={() => {
deleteWorkflowMutation.mutate(id);
}}
disabled={deleteWorkflowMutation.isPending}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deleteWorkflowMutation.isPending should be deleteWorkflowMutation.isLoading to correctly disable the button during the mutation process.

>
{deleteWorkflowMutation.isPending && (
<ReloadIcon className="mr-2 h-4 w-4 animate-spin" />
)}
Delete
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}

export { DeleteWorkflowButton };
Loading