Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat(web): move task delete into the action group (#1896)

Andrejb20b34fb3781
diff --git a/apps/web/src/components/task/task-actions.tsx b/apps/web/src/components/task/task-actions.tsx
new file mode 100644
index 000000000..0e2563e77
--- /dev/null
+++ b/apps/web/src/components/task/task-actions.tsx
@@ -0,0 +1,83 @@
+import type { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog";
+import { Copy, GitBranch } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import { KbdSequence } from "@/components/ui/kbd";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+import type Task from "@/types/task";
+import TaskDeleteButton from "./task-delete-button";
+import TaskMovePopover from "./task-move-popover";
+
+type TaskActionsProps = {
+ task: Task | undefined;
+ workspaceId: string;
+ canMoveTask: boolean;
+ onCopyLink: () => void;
+ onCopyBranch: () => void;
+ deleteHandle: AlertDialogPrimitive.Handle<unknown>;
+};
+
+export default function TaskActions({
+ task,
+ workspaceId,
+ canMoveTask,
+ onCopyLink,
+ onCopyBranch,
+ deleteHandle,
+}: TaskActionsProps) {
+ const { t } = useTranslation();
+
+ return (
+ <div className="flex *:not-first:rounded-s-none *:not-first:before:rounded-s-none *:not-last:rounded-e-none *:not-last:border-e-0 *:not-last:before:rounded-e-none">
+ {task && canMoveTask && (
+ <TaskMovePopover task={task} workspaceId={workspaceId} />
+ )}
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="outline"
+ size="sm"
+ className="text-foreground"
+ onClick={onCopyLink}
+ >
+ <Copy className="size-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <KbdSequence
+ keys={["Ctrl", "Shift", "C"]}
+ description={t("tasks:properties.copyTaskLink")}
+ separator=""
+ />
+ </TooltipContent>
+ </Tooltip>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="outline"
+ size="sm"
+ className="text-foreground"
+ onClick={onCopyBranch}
+ >
+ <GitBranch className="size-4" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <KbdSequence
+ keys={["Ctrl", "Shift", "G"]}
+ description={t("tasks:properties.copyTaskBranch")}
+ separator=""
+ />
+ </TooltipContent>
+ </Tooltip>
+ {task && <TaskDeleteButton handle={deleteHandle} />}
+ </TooltipProvider>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/task/task-delete-button.test.tsx b/apps/web/src/components/task/task-delete-button.test.tsx
index 4dbd5ac6b..cba304da8 100644
--- a/apps/web/src/components/task/task-delete-button.test.tsx
+++ b/apps/web/src/components/task/task-delete-button.test.tsx
@@ -1,4 +1,5 @@
import {
+ act,
cleanup,
fireEvent,
render,
@@ -13,7 +14,10 @@ import {
it,
vi,
} from "vite-plus/test";
+import { AlertDialogCreateHandle } from "@/components/ui/alert-dialog";
+import { KeyboardShortcutsProvider } from "@/hooks/use-keyboard-shortcuts";
import TaskDeleteButton from "./task-delete-button";
+import TaskDeleteDialog from "./task-delete-dialog";
const mocks = vi.hoisted(() => ({
canDeleteTasks: vi.fn(),
@@ -41,6 +45,36 @@ vi.mock("@/lib/toast", () => ({
toast: { error: mocks.error, success: mocks.success },
}));
+function renderTaskDelete({
+ onDeleted = vi.fn(),
+ shortcutEnabled,
+}: { onDeleted?: () => void; shortcutEnabled?: boolean } = {}) {
+ const handle = AlertDialogCreateHandle();
+ const renderView = (taskId: string) => (
+ <KeyboardShortcutsProvider>
+ <TaskDeleteButton handle={handle} />
+ <TaskDeleteDialog
+ handle={handle}
+ taskId={taskId}
+ onDeleted={onDeleted}
+ shortcutEnabled={shortcutEnabled}
+ />
+ </KeyboardShortcutsProvider>
+ );
+ const { rerender } = render(renderView("task-1"));
+ return {
+ onDeleted,
+ switchTask: (taskId: string) => rerender(renderView(taskId)),
+ };
+}
+
+async function confirmDeletion() {
+ const deleteButtons = await screen.findAllByRole("button", {
+ name: "tasks:delete.action",
+ });
+ fireEvent.click(deleteButtons.at(-1) as HTMLButtonElement);
+}
+
beforeEach(() => {
mocks.canDeleteTasks.mockReturnValue(true);
});
@@ -51,28 +85,28 @@ afterEach(() => {
});
describe("TaskDeleteButton", () => {
- it("is only shown to users with task deletion permission", () => {
+ it("is only available to users with task deletion permission", async () => {
mocks.canDeleteTasks.mockReturnValue(false);
+ renderTaskDelete();
- render(<TaskDeleteButton taskId="task-1" onDeleted={vi.fn()} />);
+ fireEvent.keyDown(document, { key: "Backspace", ctrlKey: true });
expect(
screen.queryByRole("button", { name: "tasks:delete.action" }),
).toBeNull();
+ await waitFor(() =>
+ expect(screen.queryByText("tasks:delete.title")).toBeNull(),
+ );
});
it("deletes after confirmation and reports success", async () => {
- const onDeleted = vi.fn();
mocks.deleteTask.mockResolvedValue({ id: "task-1" });
- render(<TaskDeleteButton taskId="task-1" onDeleted={onDeleted} />);
+ const { onDeleted } = renderTaskDelete();
fireEvent.click(
screen.getByRole("button", { name: "tasks:delete.action" }),
);
- const deleteButtons = await screen.findAllByRole("button", {
- name: "tasks:delete.action",
- });
- fireEvent.click(deleteButtons.at(-1) as HTMLButtonElement);
+ await confirmDeletion();
await waitFor(() =>
expect(mocks.deleteTask).toHaveBeenCalledWith("task-1"),
@@ -81,18 +115,74 @@ describe("TaskDeleteButton", () => {
expect(onDeleted).toHaveBeenCalledTimes(1);
});
+ it("opens the confirmation from the keyboard shortcut", async () => {
+ mocks.deleteTask.mockResolvedValue({ id: "task-1" });
+ renderTaskDelete();
+
+ fireEvent.keyDown(document, { key: "Backspace", ctrlKey: true });
+
+ expect(await screen.findByText("tasks:delete.title")).toBeTruthy();
+ expect(mocks.deleteTask).not.toHaveBeenCalled();
+ });
+
+ it.each([
+ ["an input", () => document.createElement("input")],
+ ["a textarea", () => document.createElement("textarea")],
+ [
+ "the task editor",
+ () => {
+ const editor = document.createElement("div");
+ editor.contentEditable = "true";
+ return editor;
+ },
+ ],
+ ])("ignores the shortcut while typing in %s", async (_, createField) => {
+ renderTaskDelete();
+ const field = createField();
+ document.body.append(field);
+
+ try {
+ field.focus();
+ fireEvent.keyDown(field, { key: "Backspace", ctrlKey: true });
+ await act(async () => {});
+ } finally {
+ field.remove();
+ }
+
+ expect(screen.queryByText("tasks:delete.title")).toBeNull();
+ });
+
+ it("leaves the shortcut off while the view has it disabled", async () => {
+ renderTaskDelete({ shortcutEnabled: false });
+
+ fireEvent.keyDown(document, { key: "Backspace", ctrlKey: true });
+ await act(async () => {});
+
+ expect(screen.queryByText("tasks:delete.title")).toBeNull();
+ });
+
+ it("closes the confirmation when the view switches to another task", async () => {
+ const { switchTask } = renderTaskDelete();
+
+ fireEvent.keyDown(document, { key: "Backspace", ctrlKey: true });
+ expect(await screen.findByText("tasks:delete.title")).toBeTruthy();
+
+ switchTask("task-2");
+
+ await waitFor(() =>
+ expect(screen.queryByText("tasks:delete.title")).toBeNull(),
+ );
+ expect(mocks.deleteTask).not.toHaveBeenCalled();
+ });
+
it("keeps the current view open and reports a failed deletion", async () => {
- const onDeleted = vi.fn();
mocks.deleteTask.mockRejectedValue(new Error("Delete denied"));
- render(<TaskDeleteButton taskId="task-1" onDeleted={onDeleted} />);
+ const { onDeleted } = renderTaskDelete();
fireEvent.click(
screen.getByRole("button", { name: "tasks:delete.action" }),
);
- const deleteButtons = await screen.findAllByRole("button", {
- name: "tasks:delete.action",
- });
- fireEvent.click(deleteButtons.at(-1) as HTMLButtonElement);
+ await confirmDeletion();
await waitFor(() =>
expect(mocks.error).toHaveBeenCalledWith("Delete denied"),
diff --git a/apps/web/src/components/task/task-delete-button.tsx b/apps/web/src/components/task/task-delete-button.tsx
index 5d3dd81ed..a1a4b3f20 100644
--- a/apps/web/src/components/task/task-delete-button.tsx
+++ b/apps/web/src/components/task/task-delete-button.tsx
@@ -1,98 +1,52 @@
+import type { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog";
import { Trash2 } from "lucide-react";
-import { useState } from "react";
import { useTranslation } from "react-i18next";
-import {
- AlertDialog,
- AlertDialogClose,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
- AlertDialogTrigger,
-} from "@/components/ui/alert-dialog";
+import { AlertDialogTrigger } from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
-import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
+import { KbdSequence } from "@/components/ui/kbd";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { shortcuts } from "@/constants/shortcuts";
import { useWorkspacePermission } from "@/hooks/use-workspace-permission";
-import { cn } from "@/lib/cn";
-import { toast } from "@/lib/toast";
type TaskDeleteButtonProps = {
- taskId: string;
- onDeleted: () => void;
- className?: string;
+ handle: AlertDialogPrimitive.Handle<unknown>;
};
-export default function TaskDeleteButton({
- taskId,
- onDeleted,
- className,
-}: TaskDeleteButtonProps) {
+export default function TaskDeleteButton({ handle }: TaskDeleteButtonProps) {
const { t } = useTranslation();
- const [isOpen, setIsOpen] = useState(false);
const { canDeleteTasks, isCheckingPermissions } = useWorkspacePermission();
- const { mutateAsync: deleteTask, isPending } = useDeleteTask();
if (isCheckingPermissions || !canDeleteTasks()) {
return null;
}
- const handleDelete = async () => {
- try {
- await deleteTask(taskId);
- toast.success(t("tasks:delete.success"));
- setIsOpen(false);
- onDeleted();
- } catch (error) {
- toast.error(
- error instanceof Error ? error.message : t("tasks:delete.error"),
- );
- }
- };
-
return (
- <AlertDialog open={isOpen} onOpenChange={setIsOpen}>
- <AlertDialogTrigger
- render={
- <Button
- variant="ghost"
- size="sm"
- aria-label={t("tasks:delete.action")}
- className={cn(
- "text-destructive hover:bg-destructive/10 hover:text-destructive",
- className,
- )}
- />
- }
- >
- <Trash2 className="size-4" />
- <span className="hidden sm:inline">{t("tasks:delete.action")}</span>
- </AlertDialogTrigger>
- <AlertDialogContent>
- <AlertDialogHeader>
- <AlertDialogTitle>{t("tasks:delete.title")}</AlertDialogTitle>
- <AlertDialogDescription>
- {t("tasks:delete.description")}
- </AlertDialogDescription>
- </AlertDialogHeader>
- <AlertDialogFooter>
- <AlertDialogClose
- render={<Button variant="outline" size="sm" disabled={isPending} />}
- >
- {t("common:actions.cancel")}
- </AlertDialogClose>
- <Button
- variant="destructive"
- size="sm"
- disabled={isPending}
- onClick={() => void handleDelete()}
- >
- {isPending
- ? t("common:actions.deleting")
- : t("tasks:delete.action")}
- </Button>
- </AlertDialogFooter>
- </AlertDialogContent>
- </AlertDialog>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <AlertDialogTrigger
+ handle={handle}
+ render={
+ <Button
+ variant="outline"
+ size="sm"
+ aria-label={t("tasks:delete.action")}
+ className="text-foreground hover:text-destructive-foreground"
+ />
+ }
+ >
+ <Trash2 className="size-4" />
+ </AlertDialogTrigger>
+ </TooltipTrigger>
+ <TooltipContent>
+ <span className="flex items-center gap-2">
+ {t("tasks:delete.action")}
+ <KbdSequence keys={[shortcuts.deleteTask.prefix, "⌫"]} separator="" />
+ </span>
+ </TooltipContent>
+ </Tooltip>
);
}
diff --git a/apps/web/src/components/task/task-delete-dialog.tsx b/apps/web/src/components/task/task-delete-dialog.tsx
new file mode 100644
index 000000000..e40c22c09
--- /dev/null
+++ b/apps/web/src/components/task/task-delete-dialog.tsx
@@ -0,0 +1,103 @@
+import type { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog";
+import { useEffect, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import {
+ AlertDialog,
+ AlertDialogClose,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import { shortcuts } from "@/constants/shortcuts";
+import { useDeleteTask } from "@/hooks/mutations/task/use-delete-task";
+import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
+import { useWorkspacePermission } from "@/hooks/use-workspace-permission";
+import { toast } from "@/lib/toast";
+
+type TaskDeleteDialogProps = {
+ handle: AlertDialogPrimitive.Handle<unknown>;
+ taskId: string;
+ onDeleted: () => void;
+ shortcutEnabled?: boolean;
+};
+
+export default function TaskDeleteDialog({
+ handle,
+ taskId,
+ onDeleted,
+ shortcutEnabled = true,
+}: TaskDeleteDialogProps) {
+ const { t } = useTranslation();
+ const { canDeleteTasks, isCheckingPermissions } = useWorkspacePermission();
+ const { mutateAsync: deleteTask, isPending } = useDeleteTask();
+ const canDelete = !isCheckingPermissions && canDeleteTasks();
+
+ const deleteShortcuts = useMemo(
+ () =>
+ canDelete && shortcutEnabled
+ ? {
+ modifierShortcuts: {
+ [shortcuts.deleteTask.prefix]: {
+ [shortcuts.deleteTask.key]: () => handle.open(null),
+ },
+ },
+ }
+ : {},
+ [canDelete, shortcutEnabled, handle],
+ );
+ useRegisterShortcuts(deleteShortcuts);
+
+ useEffect(() => {
+ return () => handle.close();
+ }, [handle, taskId]);
+
+ if (!canDelete) {
+ return null;
+ }
+
+ const handleDelete = async () => {
+ try {
+ await deleteTask(taskId);
+ toast.success(t("tasks:delete.success"));
+ handle.close();
+ onDeleted();
+ } catch (error) {
+ toast.error(
+ error instanceof Error ? error.message : t("tasks:delete.error"),
+ );
+ }
+ };
+
+ return (
+ <AlertDialog handle={handle}>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>{t("tasks:delete.title")}</AlertDialogTitle>
+ <AlertDialogDescription>
+ {t("tasks:delete.description")}
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogClose
+ render={<Button variant="outline" size="sm" disabled={isPending} />}
+ >
+ {t("common:actions.cancel")}
+ </AlertDialogClose>
+ <Button
+ variant="destructive"
+ size="sm"
+ disabled={isPending}
+ onClick={() => void handleDelete()}
+ >
+ {isPending
+ ? t("common:actions.deleting")
+ : t("tasks:delete.action")}
+ </Button>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+}
diff --git a/apps/web/src/components/task/task-details-sheet.tsx b/apps/web/src/components/task/task-details-sheet.tsx
index dc5ea5b69..25a7f9611 100644
--- a/apps/web/src/components/task/task-details-sheet.tsx
+++ b/apps/web/src/components/task/task-details-sheet.tsx
@@ -2,6 +2,7 @@ import { useNavigate } from "@tanstack/react-router";
import { Maximize2, X } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
+import { AlertDialogCreateHandle } from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import { Sheet, SheetContent } from "@/components/ui/sheet";
import {
@@ -12,7 +13,7 @@ import {
} from "@/components/ui/tooltip";
import useGetProject from "@/hooks/queries/project/use-get-project";
import useGetTask from "@/hooks/queries/task/use-get-task";
-import TaskDeleteButton from "./task-delete-button";
+import TaskDeleteDialog from "./task-delete-dialog";
import TaskDetailsContent from "./task-details-content";
import TaskPropertiesSidebar from "./task-properties-sidebar";
@@ -34,6 +35,7 @@ export default function TaskDetailsSheet({
const [currentTaskId, setCurrentTaskId] = useState<string | undefined>(
taskId,
);
+ const [deleteHandle] = useState(() => AlertDialogCreateHandle());
const { data: task } = useGetTask(currentTaskId ?? "");
const { data: project } = useGetProject({ id: projectId, workspaceId });
@@ -76,9 +78,6 @@ export default function TaskDetailsSheet({
</span>
</div>
<div className="flex items-center gap-1">
- {currentTaskId && (
- <TaskDeleteButton taskId={currentTaskId} onDeleted={onClose} />
- )}
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
@@ -107,6 +106,14 @@ export default function TaskDetailsSheet({
</div>
</div>
+ {currentTaskId && (
+ <TaskDeleteDialog
+ handle={deleteHandle}
+ taskId={currentTaskId}
+ onDeleted={onClose}
+ shortcutEnabled={Boolean(taskId)}
+ />
+ )}
<div
className="flex flex-col flex-1 min-h-0 overflow-hidden"
key={currentTaskId}
@@ -117,6 +124,7 @@ export default function TaskDetailsSheet({
workspaceId={workspaceId}
className="w-full bg-sidebar border-b border-border flex flex-col gap-0 overflow-y-auto shrink-0"
compact={true}
+ deleteHandle={deleteHandle}
/>
<div className="flex-1 overflow-y-auto min-h-0">
diff --git a/apps/web/src/components/task/task-move-popover.tsx b/apps/web/src/components/task/task-move-popover.tsx
index fb541174d..ac34ba266 100644
--- a/apps/web/src/components/task/task-move-popover.tsx
+++ b/apps/web/src/components/task/task-move-popover.tsx
@@ -19,20 +19,17 @@ import {
import { useMoveTask } from "@/hooks/mutations/task/use-move-task";
import useGetProjects from "@/hooks/queries/project/use-get-projects";
import { useGetTasks } from "@/hooks/queries/task/use-get-tasks";
-import { cn } from "@/lib/cn";
import { getStatusLabel } from "@/lib/i18n/domain";
import type Task from "@/types/task";
type TaskMovePopoverProps = {
task: Task;
workspaceId: string;
- triggerClassName?: string;
};
export default function TaskMovePopover({
task,
workspaceId,
- triggerClassName,
}: TaskMovePopoverProps) {
const { t } = useTranslation();
const navigate = useNavigate();
@@ -135,7 +132,7 @@ export default function TaskMovePopover({
type="button"
variant="outline"
size="sm"
- className={cn("text-foreground", triggerClassName)}
+ className="text-foreground"
title={t("tasks:move.title")}
aria-label={t("tasks:move.title")}
>
diff --git a/apps/web/src/components/task/task-properties-sidebar.tsx b/apps/web/src/components/task/task-properties-sidebar.tsx
index 8055e35ad..0dc44fd74 100644
--- a/apps/web/src/components/task/task-properties-sidebar.tsx
+++ b/apps/web/src/components/task/task-properties-sidebar.tsx
@@ -1,23 +1,15 @@
+import type { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog";
import {
Calendar,
CalendarClock,
CalendarDays,
CalendarX,
- Copy,
- GitBranch,
Plus,
} from "lucide-react";
import { useTranslation } from "react-i18next";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
-import { KbdSequence } from "@/components/ui/kbd";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
import { useGetColumns } from "@/hooks/queries/column/use-get-columns";
import useGetGiteaIntegration from "@/hooks/queries/gitea-integration/use-get-gitea-integration";
import useGetGithubIntegration from "@/hooks/queries/github-integration/use-get-github-integration";
@@ -27,7 +19,6 @@ import useGetProject from "@/hooks/queries/project/use-get-project";
import useGetProjects from "@/hooks/queries/project/use-get-projects";
import useGetTask from "@/hooks/queries/task/use-get-task";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
-import { cn } from "@/lib/cn";
import { getColumnIcon } from "@/lib/column";
import {
dueDateStatusColors,
@@ -40,10 +31,10 @@ import { getPriorityLabel, getStatusDisplayLabel } from "@/lib/i18n/domain";
import { resolveLabelColor } from "@/lib/label-color";
import { getPriorityIcon } from "@/lib/priority";
import { toast } from "@/lib/toast";
+import TaskActions from "./task-actions";
import TaskAssigneePopover from "./task-assignee-popover";
import TaskDueDatePopover from "./task-due-date-popover";
import TaskLabelsPopover from "./task-labels-popover";
-import TaskMovePopover from "./task-move-popover";
import TaskPriorityPopover from "./task-priority-popover";
import TaskStartDatePopover from "./task-start-date-popover";
import TaskStatusPopover from "./task-status-popover";
@@ -76,6 +67,7 @@ type TaskPropertiesSidebarProps = {
workspaceId: string;
className?: string;
compact?: boolean;
+ deleteHandle: AlertDialogPrimitive.Handle<unknown>;
};
export default function TaskPropertiesSidebar({
@@ -84,6 +76,7 @@ export default function TaskPropertiesSidebar({
workspaceId,
className,
compact = false,
+ deleteHandle,
}: TaskPropertiesSidebarProps) {
const { t } = useTranslation();
const { data: task } = useGetTask(taskId ?? "");
@@ -149,58 +142,14 @@ export default function TaskPropertiesSidebar({
{compact && (
<div className="flex flex-row-reverse gap-2 w-full border-b border-border">
<div className="flex px-3 py-2">
- {task && canMoveTask && (
- <TaskMovePopover
- task={task}
- workspaceId={workspaceId}
- triggerClassName="rounded-e-none border-e-0 before:rounded-e-none"
- />
- )}
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className={cn(
- "text-foreground border-r-0",
- canMoveTask
- ? "rounded-none before:rounded-none"
- : "rounded-e-none before:rounded-e-none",
- )}
- onClick={() => handleCopyTaskLink()}
- >
- <Copy className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "C"]}
- description={t("tasks:properties.copyTaskLink")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className="text-foreground rounded-s-none before:rounded-s-none"
- onClick={() => handleCopyTaskBranch()}
- >
- <GitBranch className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "G"]}
- description={t("tasks:properties.copyTaskBranch")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
+ <TaskActions
+ task={task}
+ workspaceId={workspaceId}
+ canMoveTask={canMoveTask}
+ onCopyLink={handleCopyTaskLink}
+ onCopyBranch={handleCopyTaskBranch}
+ deleteHandle={deleteHandle}
+ />
</div>
<div className="flex flex-row flex-wrap gap-1 items-center p-2 w-full">
@@ -342,58 +291,14 @@ export default function TaskPropertiesSidebar({
{/* Mobile: Compact-style layout */}
<div className="flex flex-row-reverse gap-2 w-full border-b border-border lg:hidden">
<div className="flex px-3 py-2">
- {task && canMoveTask && (
- <TaskMovePopover
- task={task}
- workspaceId={workspaceId}
- triggerClassName="rounded-e-none border-e-0 before:rounded-e-none"
- />
- )}
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className={cn(
- "text-foreground border-r-0",
- canMoveTask
- ? "rounded-none before:rounded-none"
- : "rounded-e-none before:rounded-e-none",
- )}
- onClick={() => handleCopyTaskLink()}
- >
- <Copy className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "C"]}
- description={t("tasks:properties.copyTaskLink")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className="text-foreground rounded-s-none before:rounded-s-none"
- onClick={() => handleCopyTaskBranch()}
- >
- <GitBranch className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "G"]}
- description={t("tasks:properties.copyTaskBranch")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
+ <TaskActions
+ task={task}
+ workspaceId={workspaceId}
+ canMoveTask={canMoveTask}
+ onCopyLink={handleCopyTaskLink}
+ onCopyBranch={handleCopyTaskBranch}
+ deleteHandle={deleteHandle}
+ />
</div>
<div className="flex flex-row flex-wrap gap-1 items-center p-2 w-full">
@@ -535,60 +440,14 @@ export default function TaskPropertiesSidebar({
<p className="text-sm font-medium text-foreground/70 flex-1">
{t("tasks:properties.title")}
</p>
- <div className="flex">
- {task && canMoveTask && (
- <TaskMovePopover
- task={task}
- workspaceId={workspaceId}
- triggerClassName="rounded-e-none border-e-0 before:rounded-e-none"
- />
- )}
- <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className={cn(
- "text-foreground border-r-0",
- canMoveTask
- ? "rounded-none before:rounded-none"
- : "rounded-e-none before:rounded-e-none",
- )}
- onClick={() => handleCopyTaskLink()}
- >
- <Copy className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "C"]}
- description={t("tasks:properties.copyTaskLink")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- <Tooltip>
- <TooltipTrigger asChild>
- <Button
- variant="outline"
- size="sm"
- className="text-foreground rounded-s-none before:rounded-s-none"
- onClick={() => handleCopyTaskBranch()}
- >
- <GitBranch className="size-4" />
- </Button>
- </TooltipTrigger>
- <TooltipContent>
- <KbdSequence
- keys={["Ctrl", "Shift", "G"]}
- description={t("tasks:properties.copyTaskBranch")}
- separator=""
- />
- </TooltipContent>
- </Tooltip>
- </TooltipProvider>
- </div>
+ <TaskActions
+ task={task}
+ workspaceId={workspaceId}
+ canMoveTask={canMoveTask}
+ onCopyLink={handleCopyTaskLink}
+ onCopyBranch={handleCopyTaskBranch}
+ deleteHandle={deleteHandle}
+ />
</div>
<div className="flex flex-col gap-2 px-3 py-3">
diff --git a/apps/web/src/constants/shortcuts.ts b/apps/web/src/constants/shortcuts.ts
index 16c4c26c5..a5585016c 100644
--- a/apps/web/src/constants/shortcuts.ts
+++ b/apps/web/src/constants/shortcuts.ts
@@ -30,6 +30,10 @@ export const shortcuts = {
prefix: "t",
create: "c",
},
+ deleteTask: {
+ prefix: getModifierKeyText(),
+ key: "Backspace",
+ },
view: {
prefix: "v",
board: "b",
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId_.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId_.tsx
index 19e0c9654..45adccc5b 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId_.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId_.tsx
@@ -3,13 +3,14 @@ import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import TaskLayout from "@/components/common/task-layout";
import PageTitle from "@/components/page-title";
-import TaskDeleteButton from "@/components/task/task-delete-button";
+import TaskDeleteDialog from "@/components/task/task-delete-dialog";
import TaskDetailsContent from "@/components/task/task-details-content";
import {
TaskDetailsSkeleton,
TaskPropertiesSidebarSkeleton,
} from "@/components/task/task-page-skeleton";
import TaskPropertiesSidebar from "@/components/task/task-properties-sidebar";
+import { AlertDialogCreateHandle } from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import useGetActivitiesByTaskId from "@/hooks/queries/activity/use-get-activities-by-task-id";
import useGetProject from "@/hooks/queries/project/use-get-project";
@@ -36,6 +37,7 @@ function RouteComponent() {
});
const { isLoading: isActivitiesLoading } = useGetActivitiesByTaskId(taskId);
const [isShikiReady, setIsShikiReady] = useState(false);
+ const [deleteHandle] = useState(() => AlertDialogCreateHandle());
useEffect(() => {
let mounted = true;
@@ -74,11 +76,6 @@ function RouteComponent() {
taskId={taskId}
projectId={projectId}
workspaceId={workspaceId}
- headerActions={
- !isLoading && task ? (
- <TaskDeleteButton taskId={taskId} onDeleted={handleDeleted} />
- ) : null
- }
rightSidebar={
isLoading ? (
<TaskPropertiesSidebarSkeleton className="h-full w-full lg:w-72 xl:w-80 flex flex-col gap-2" />
@@ -88,6 +85,7 @@ function RouteComponent() {
projectId={projectId}
workspaceId={workspaceId}
className="h-full w-full lg:w-72 xl:w-80 flex flex-col gap-2"
+ deleteHandle={deleteHandle}
/>
)
}
@@ -102,6 +100,13 @@ function RouteComponent() {
}
hideAppName
/>
+ {!isLoading && task && (
+ <TaskDeleteDialog
+ handle={deleteHandle}
+ taskId={taskId}
+ onDeleted={handleDeleted}
+ />
+ )}
{isLoading ? (
<TaskDetailsSkeleton />
) : isTaskError || !task ? (