fix: improve sidebar action layout (#1323)

This commit is contained in:
Carlos Florêncio
2026-06-11 13:44:52 +01:00
committed by GitHub
parent 800d71f3d1
commit 8e4ee65b31
10 changed files with 426 additions and 39 deletions
@@ -1,7 +1,7 @@
"use client";
import Link from "next/link";
import { IconChevronsLeft, IconChevronsRight } from "@tabler/icons-react";
import { IconLayoutSidebarLeftCollapse, IconLayoutSidebarLeftExpand } from "@tabler/icons-react";
import { Button } from "@kandev/ui/button";
import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
import { cn } from "@/lib/utils";
@@ -41,7 +41,7 @@ export function AppSidebarHeader({ collapsed, onToggleCollapse }: AppSidebarHead
onClick={onToggleCollapse}
aria-label="Expand sidebar"
>
<IconChevronsRight className="h-4 w-4" />
<IconLayoutSidebarLeftExpand className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent side="right">Expand sidebar</TooltipContent>
@@ -82,7 +82,7 @@ export function AppSidebarHeader({ collapsed, onToggleCollapse }: AppSidebarHead
onClick={onToggleCollapse}
aria-label="Collapse sidebar"
>
<IconChevronsLeft className="h-4 w-4" />
<IconLayoutSidebarLeftCollapse className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Collapse sidebar</TooltipContent>
@@ -23,6 +23,8 @@ type AppSidebarNavItemProps = {
disabled?: boolean;
/** Optional data-testid placed on the button/link element. */
testId?: string;
/** Optional extra classes for surface-specific spacing. */
className?: string;
};
type TriggerProps = {
@@ -83,6 +85,7 @@ export function AppSidebarNavItem({
exactMatch = false,
disabled = false,
testId,
className,
}: AppSidebarNavItemProps) {
const pathname = usePathname();
const active = isActive ?? isPathActive(pathname, href, exactMatch);
@@ -93,6 +96,7 @@ export function AppSidebarNavItem({
disabled
? "cursor-not-allowed text-foreground/40"
: cn("cursor-pointer", active ? SIDEBAR_ITEM_ACTIVE : SIDEBAR_ITEM_INACTIVE),
className,
);
const inner = (
@@ -6,6 +6,7 @@ const mocks = vi.hoisted(() => ({
routerPush: vi.fn(),
setActiveTask: vi.fn(),
setActiveSession: vi.fn(),
openQuickChat: vi.fn(),
dialogTaskSessionId: null as string | null,
dialogWillNavigate: false,
}));
@@ -35,6 +36,9 @@ let pathname = "/";
vi.mock("@/components/state-provider", () => ({
useAppStore: (selector: (s: typeof state) => unknown) => selector(state),
}));
vi.mock("@/hooks/use-quick-chat-launcher", () => ({
useQuickChatLauncher: () => mocks.openQuickChat,
}));
vi.mock("@/hooks/domains/features/use-feature", () => ({
useFeature: () => officeEnabled,
}));
@@ -79,24 +83,26 @@ const SUBTASK_TESTID = "sidebar-new-subtask";
const OFFICE_DIALOG_TESTID = "office-new-task-dialog";
const REGULAR_DIALOG_TESTID = "regular-task-create-dialog";
describe("AppSidebarNewTaskItem", () => {
beforeEach(() => {
state.workspaces.activeId = "ws-1";
state.kanban.workflowId = "wf-1";
state.kanban.steps = [{ id: "s1", title: "Todo" }];
state.kanban.tasks = [{ id: "t-1", title: "Parent task" }];
state.tasks.activeTaskId = null;
mocks.routerPush.mockClear();
mocks.setActiveTask.mockClear();
mocks.setActiveSession.mockClear();
mocks.dialogTaskSessionId = null;
mocks.dialogWillNavigate = false;
officeEnabled = false;
pathname = "/";
});
function resetTestState() {
state.workspaces.activeId = "ws-1";
state.kanban.workflowId = "wf-1";
state.kanban.steps = [{ id: "s1", title: "Todo" }];
state.kanban.tasks = [{ id: "t-1", title: "Parent task" }];
state.tasks.activeTaskId = null;
mocks.routerPush.mockClear();
mocks.setActiveTask.mockClear();
mocks.setActiveSession.mockClear();
mocks.openQuickChat.mockClear();
mocks.dialogTaskSessionId = null;
mocks.dialogWillNavigate = false;
officeEnabled = false;
pathname = "/";
}
afterEach(() => cleanup());
beforeEach(resetTestState);
afterEach(() => cleanup());
describe("AppSidebarNewTaskItem dialog routing", () => {
it("uses the regular task-create dialog when office is disabled", () => {
officeEnabled = false;
renderItem(false);
@@ -129,6 +135,25 @@ describe("AppSidebarNewTaskItem", () => {
expect(screen.queryByTestId(REGULAR_DIALOG_TESTID)).toBeNull();
expect(screen.queryByTestId(OFFICE_DIALOG_TESTID)).toBeNull();
});
});
describe("AppSidebarNewTaskItem row actions", () => {
it("opens quick chat from the trailing action beside New Task", () => {
renderItem(false);
screen.getByTestId("sidebar-quick-chat-shortcut").click();
expect(mocks.openQuickChat).toHaveBeenCalledOnce();
});
it("hides the quick chat shortcut when the rail is collapsed", () => {
renderItem(true);
expect(screen.queryByTestId("sidebar-quick-chat-shortcut")).toBeNull();
});
it("hides the quick chat shortcut when there is no active workspace", () => {
state.workspaces.activeId = null;
renderItem(false);
expect(screen.queryByTestId("sidebar-quick-chat-shortcut")).toBeNull();
});
it("offers a subtask affordance when a task is active in regular mode", () => {
state.tasks.activeTaskId = "t-1";
@@ -160,7 +185,9 @@ describe("AppSidebarNewTaskItem", () => {
renderItem(true);
expect(screen.queryByTestId(SUBTASK_TESTID)).toBeNull();
});
});
describe("AppSidebarNewTaskItem creation success", () => {
it("focuses the created task after regular sidebar task creation succeeds", () => {
renderItem(false);
screen.getByTestId(REGULAR_DIALOG_TESTID).click();
@@ -3,10 +3,12 @@
import { useCallback, useState } from "react";
import dynamic from "next/dynamic";
import { useRouter } from "next/navigation";
import { IconSquarePlus, IconSubtask } from "@tabler/icons-react";
import { IconMessageCircle, IconSquarePlus, IconSubtask } from "@tabler/icons-react";
import type { Icon as TablerIcon } from "@tabler/icons-react";
import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
import { useAppStore } from "@/components/state-provider";
import { useInOffice } from "@/hooks/use-in-office";
import { useQuickChatLauncher } from "@/hooks/use-quick-chat-launcher";
import { TaskCreateDialog } from "@/components/task-create-dialog";
import { linkToTask } from "@/lib/links";
import type { Task } from "@/lib/types/http";
@@ -25,6 +27,35 @@ type AppSidebarNewTaskItemProps = {
collapsed: boolean;
};
const ONE_ROW_ACTION_INSET_CLASS = "pr-10";
const TWO_ROW_ACTIONS_INSET_CLASS = "pr-16";
type RowActionButtonProps = {
icon: TablerIcon;
label: string;
testId: string;
onClick: () => void;
};
function RowActionButton({ icon: Icon, label, testId, onClick }: RowActionButtonProps) {
return (
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
onClick={onClick}
aria-label={label}
data-testid={testId}
className="flex h-6 w-6 items-center justify-center rounded text-muted-foreground/70 hover:bg-muted hover:text-foreground cursor-pointer"
>
<Icon className="h-3.5 w-3.5" />
</button>
</TooltipTrigger>
<TooltipContent side="right">{label}</TooltipContent>
</Tooltip>
);
}
/**
* "New Task" entry in the sidebar primary nav. Inside Office (an `/office`
* route) it opens the richer "New issue" dialog (projects/assignees/stages);
@@ -52,6 +83,7 @@ export function AppSidebarNewTaskItem({ collapsed }: AppSidebarNewTaskItemProps)
return s.kanban.tasks.find((t) => t.id === id)?.title ?? "";
});
const inOffice = useInOffice();
const handleOpenQuickChat = useQuickChatLauncher(workspaceId);
const [open, setOpen] = useState(false);
const [subtaskOpen, setSubtaskOpen] = useState(false);
@@ -59,7 +91,16 @@ export function AppSidebarNewTaskItem({ collapsed }: AppSidebarNewTaskItemProps)
// dialog for the primary New Task, but subtasks always go through the compact
// NewSubtaskDialog, matching the retired dropdown). It needs an active task
// and the expanded rail to host the trailing button.
const canOpenQuickChat = !collapsed && !!workspaceId;
const canCreateSubtask = !collapsed && !!workspaceId && !!activeTaskId;
let actionInsetClass: string | undefined;
// Keep the label clear of the absolute action cluster:
// pr-10 covers one w-6 button + right-1.5 inset; pr-16 covers two buttons + gap-1.
if (canCreateSubtask) {
actionInsetClass = TWO_ROW_ACTIONS_INSET_CLASS;
} else if (canOpenQuickChat) {
actionInsetClass = ONE_ROW_ACTION_INSET_CLASS;
}
const handleRegularTaskCreated = useCallback(
(
task: Task,
@@ -88,22 +129,25 @@ export function AppSidebarNewTaskItem({ collapsed }: AppSidebarNewTaskItemProps)
collapsed={collapsed}
disabled={!workspaceId}
testId="create-task-button"
className={actionInsetClass}
/>
{canCreateSubtask && (
<Tooltip>
<TooltipTrigger asChild>
<button
type="button"
{canOpenQuickChat && (
<div className="absolute right-1.5 top-1/2 -translate-y-1/2 flex items-center gap-1 sidebar-fade-in">
<RowActionButton
icon={IconMessageCircle}
label="Quick Chat"
testId="sidebar-quick-chat-shortcut"
onClick={handleOpenQuickChat}
/>
{canCreateSubtask && (
<RowActionButton
icon={IconSubtask}
label="New subtask of current task"
testId="sidebar-new-subtask"
onClick={() => setSubtaskOpen(true)}
aria-label="New subtask of current task"
data-testid="sidebar-new-subtask"
className="absolute right-1.5 top-1/2 -translate-y-1/2 flex h-6 w-6 items-center justify-center rounded text-muted-foreground/70 hover:bg-muted hover:text-foreground cursor-pointer"
>
<IconSubtask className="h-3.5 w-3.5" />
</button>
</TooltipTrigger>
<TooltipContent side="right">New subtask of current task</TooltipContent>
</Tooltip>
/>
)}
</div>
)}
</div>
{workspaceId &&
@@ -0,0 +1,79 @@
import { cleanup, render, screen } from "@testing-library/react";
import { TooltipProvider } from "@kandev/ui/tooltip";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
const mocks = vi.hoisted(() => ({
openQuickChat: vi.fn(),
}));
const state = {
workspaces: { activeId: "ws-1" as string | null },
office: { inboxCount: 0 },
};
let inOffice = false;
let pathname = "/";
vi.mock("@/components/state-provider", () => ({
useAppStore: (selector: (s: typeof state) => unknown) => selector(state),
}));
vi.mock("@/hooks/use-in-office", () => ({
useInOffice: () => inOffice,
}));
vi.mock("@/hooks/use-quick-chat-launcher", () => ({
useQuickChatLauncher: () => mocks.openQuickChat,
}));
vi.mock("next/navigation", () => ({
usePathname: () => pathname,
useRouter: () => ({ push: vi.fn() }),
}));
vi.mock("./app-sidebar-new-task-item", () => ({
AppSidebarNewTaskItem: ({ collapsed }: { collapsed: boolean }) => (
<div data-testid="new-task-item" data-collapsed={collapsed ? "true" : "false"} />
),
}));
import { AppSidebarPrimaryNav } from "./app-sidebar-primary-nav";
function renderNav(collapsed: boolean) {
return render(
<TooltipProvider>
<AppSidebarPrimaryNav collapsed={collapsed} />
</TooltipProvider>,
);
}
describe("AppSidebarPrimaryNav", () => {
beforeEach(() => {
state.workspaces.activeId = "ws-1";
state.office.inboxCount = 0;
inOffice = false;
pathname = "/";
mocks.openQuickChat.mockClear();
});
afterEach(() => cleanup());
it("keeps Quick Chat reachable when the sidebar rail is collapsed", () => {
renderNav(true);
screen.getByRole("button", { name: "Quick Chat" }).click();
expect(mocks.openQuickChat).toHaveBeenCalledOnce();
});
it("omits the standalone Quick Chat row while expanded", () => {
renderNav(false);
expect(screen.queryByRole("button", { name: "Quick Chat" })).toBeNull();
});
it("omits Quick Chat when the rail is collapsed but there is no workspace", () => {
state.workspaces.activeId = null;
renderNav(true);
expect(screen.queryByRole("button", { name: "Quick Chat" })).toBeNull();
});
});
@@ -35,7 +35,7 @@ export function AppSidebarPrimaryNav({ collapsed }: AppSidebarPrimaryNavProps) {
collapsed={collapsed}
/>
)}
{workspaceId && (
{workspaceId && collapsed && (
<AppSidebarNavItem
icon={IconMessageCircle}
label="Quick Chat"
@@ -15,6 +15,10 @@ type AppSidebarSectionProps = {
children: React.ReactNode;
/** Optional control rendered between the label and the collapse chevron. */
headerAction?: React.ReactNode;
/** By default header actions render only while the section accordion is open.
* "always" keeps them visible while the accordion is closed, but has no
* effect when the sidebar itself is in collapsed/rail mode. */
headerActionVisibility?: "expanded" | "always";
/** Fills remaining sidebar height when expanded. Parent must be a flex column. */
grow?: boolean;
};
@@ -23,10 +27,19 @@ type SectionHeaderProps = {
label: string;
expanded: boolean;
headerAction?: React.ReactNode;
headerActionVisibility: "expanded" | "always";
onToggle: () => void;
};
function SectionHeader({ label, expanded, headerAction, onToggle }: SectionHeaderProps) {
function SectionHeader({
label,
expanded,
headerAction,
headerActionVisibility,
onToggle,
}: SectionHeaderProps) {
const showHeaderAction = !!headerAction && (expanded || headerActionVisibility === "always");
return (
<div className="group/section flex items-center px-2 h-7 shrink-0">
<button
@@ -37,9 +50,7 @@ function SectionHeader({ label, expanded, headerAction, onToggle }: SectionHeade
>
<span className="text-[11px] font-semibold uppercase tracking-wider truncate">{label}</span>
</button>
{expanded && headerAction && (
<div className="shrink-0 mr-1 flex items-center">{headerAction}</div>
)}
{showHeaderAction && <div className="shrink-0 mr-1 flex items-center">{headerAction}</div>}
<button
type="button"
onClick={onToggle}
@@ -62,6 +73,7 @@ export function AppSidebarSection({
icon: Icon,
children,
headerAction,
headerActionVisibility = "expanded",
grow,
}: AppSidebarSectionProps) {
const expanded = useAppStore((s) => s.appSidebar.sectionExpanded[id] ?? false);
@@ -101,6 +113,7 @@ export function AppSidebarSection({
label={label}
expanded={expanded}
headerAction={headerAction}
headerActionVisibility={headerActionVisibility}
onToggle={handleToggle}
/>
{expanded && (
@@ -116,6 +129,7 @@ export function AppSidebarSection({
label={label}
expanded={expanded}
headerAction={headerAction}
headerActionVisibility={headerActionVisibility}
onToggle={handleToggle}
/>
<CollapsibleContent className="sidebar-section-content">
@@ -0,0 +1,118 @@
import { cleanup, render, screen } from "@testing-library/react";
import { TooltipProvider } from "@kandev/ui/tooltip";
import type { ReactNode } from "react";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
const navigationMock = vi.hoisted(() => ({
pathname: "/",
}));
const collapsibleMock = vi.hoisted(() => ({
open: false,
}));
const linksMock = vi.hoisted(() =>
vi.fn(() => [
{ id: "github", label: "GitHub", href: "/github" },
{ id: "jira", label: "Jira", href: "/jira" },
]),
);
const storeState = {
appSidebar: {
sectionExpanded: {
integrations: false,
},
},
toggleAppSidebarSection: vi.fn(),
setAppSidebarCollapsed: vi.fn(),
};
vi.mock("next/navigation", () => ({
usePathname: () => navigationMock.pathname,
}));
vi.mock("@/components/state-provider", () => ({
useAppStore: (selector: (state: typeof storeState) => unknown) => selector(storeState),
}));
vi.mock("@/components/integrations/integrations-menu", () => ({
useConfiguredIntegrationLinks: linksMock,
}));
vi.mock("@kandev/ui/collapsible", () => ({
Collapsible: ({ children, open }: { children: ReactNode; open?: boolean }) => {
collapsibleMock.open = !!open;
return <div>{children}</div>;
},
CollapsibleContent: ({ children }: { children: ReactNode }) =>
collapsibleMock.open ? <div>{children}</div> : null,
}));
import { IntegrationsSection } from "./integrations-section";
function renderSection() {
return render(
<TooltipProvider>
<IntegrationsSection collapsed={false} />
</TooltipProvider>,
);
}
describe("IntegrationsSection", () => {
beforeEach(() => {
navigationMock.pathname = "/";
storeState.appSidebar.sectionExpanded.integrations = false;
storeState.toggleAppSidebarSection.mockClear();
storeState.setAppSidebarCollapsed.mockClear();
linksMock.mockReturnValue([
{ id: "github", label: "GitHub", href: "/github" },
{ id: "jira", label: "Jira", href: "/jira" },
]);
});
afterEach(() => cleanup());
it("keeps integration shortcuts visible while the section accordion is closed", () => {
linksMock.mockReturnValue([
{ id: "github", label: "GitHub", href: "/github" },
{ id: "gitlab", label: "GitLab", href: "/gitlab" },
{ id: "jira", label: "Jira", href: "/jira" },
{ id: "linear", label: "Linear", href: "/linear" },
{ id: "sentry", label: "Sentry", href: "/sentry" },
]);
renderSection();
const shortcuts = screen.getAllByTestId("integration-header-shortcut");
expect(shortcuts.map((shortcut) => shortcut.getAttribute("aria-label"))).toEqual([
"GitHub",
"GitLab",
"Jira",
"Linear",
]);
expect(shortcuts.map((shortcut) => shortcut.getAttribute("href"))).toEqual([
"/github",
"/gitlab",
"/jira",
"/linear",
]);
expect(screen.queryByRole("link", { name: "Sentry" })).toBeNull();
});
it("limits shortcuts to four integrations and leaves the full list in the expanded section", () => {
storeState.appSidebar.sectionExpanded.integrations = true;
linksMock.mockReturnValue([
{ id: "github", label: "GitHub", href: "/github" },
{ id: "gitlab", label: "GitLab", href: "/gitlab" },
{ id: "jira", label: "Jira", href: "/jira" },
{ id: "linear", label: "Linear", href: "/linear" },
{ id: "sentry", label: "Sentry", href: "/sentry" },
]);
renderSection();
expect(screen.getAllByTestId("integration-header-shortcut")).toHaveLength(4);
expect(screen.getByRole("link", { name: "Sentry" })).toBeTruthy();
});
});
@@ -10,6 +10,7 @@ import {
IconTicket,
} from "@tabler/icons-react";
import type { Icon as TablerIcon } from "@tabler/icons-react";
import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
import { useConfiguredIntegrationLinks } from "@/components/integrations/integrations-menu";
import { cn } from "@/lib/utils";
import {
@@ -30,6 +31,35 @@ const INTEGRATION_ICONS: Record<string, TablerIcon> = {
linear: IconHexagon,
};
const MAX_HEADER_SHORTCUTS = 4;
type ConfiguredIntegrationLink = ReturnType<typeof useConfiguredIntegrationLinks>[number];
function IntegrationHeaderShortcuts({ links }: { links: ConfiguredIntegrationLink[] }) {
return (
<div className="flex items-center gap-0.5">
{links.slice(0, MAX_HEADER_SHORTCUTS).map(({ id, label, href }) => {
const Icon = INTEGRATION_ICONS[id] ?? IconPlugConnected;
return (
<Tooltip key={id}>
<TooltipTrigger asChild>
<Link
href={href}
aria-label={label}
data-testid="integration-header-shortcut"
className="flex h-5 w-5 items-center justify-center rounded text-muted-foreground/70 hover:bg-muted/60 hover:text-foreground cursor-pointer transition-colors"
>
<Icon className="h-3.5 w-3.5" />
</Link>
</TooltipTrigger>
<TooltipContent side="right">{label}</TooltipContent>
</Tooltip>
);
})}
</div>
);
}
export function IntegrationsSection({ collapsed }: IntegrationsSectionProps) {
const pathname = usePathname();
const links = useConfiguredIntegrationLinks();
@@ -42,6 +72,8 @@ export function IntegrationsSection({ collapsed }: IntegrationsSectionProps) {
label="Integrations"
collapsed={collapsed}
icon={IconPlugConnected}
headerAction={<IntegrationHeaderShortcuts links={links} />}
headerActionVisibility="always"
>
{links.map(({ id, label, href }) => {
const Icon = INTEGRATION_ICONS[id] ?? IconPlugConnected;
@@ -0,0 +1,69 @@
import { cleanup, render, screen } from "@testing-library/react";
import { TooltipProvider } from "@kandev/ui/tooltip";
import type { ReactNode } from "react";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
const state = {
appSidebar: {
sectionExpanded: {
tasks: true,
},
},
workspaces: { activeId: "ws-1" as string | null },
kanban: { workflowId: "wf-1" as string | null },
sidebarViews: {
views: [{ id: "all", name: "All tasks" }],
activeViewId: "all",
draft: null,
},
toggleAppSidebarSection: vi.fn(),
setAppSidebarCollapsed: vi.fn(),
setSidebarActiveView: vi.fn(),
};
vi.mock("@/components/state-provider", () => ({
useAppStore: (selector: (s: typeof state) => unknown) => selector(state),
}));
vi.mock("@/components/task/task-session-sidebar", () => ({
TaskSessionSidebar: () => <div data-testid="task-sidebar" />,
}));
vi.mock("@/components/task/sidebar-filter/sidebar-filter-popover", () => ({
SidebarFilterPopover: ({ trigger }: { trigger: ReactNode }) => trigger,
}));
import { TasksSection } from "./tasks-section";
function renderSection() {
return render(
<TooltipProvider>
<TasksSection collapsed={false} />
</TooltipProvider>,
);
}
describe("TasksSection", () => {
beforeEach(() => {
state.appSidebar.sectionExpanded.tasks = true;
state.workspaces.activeId = "ws-1";
state.kanban.workflowId = "wf-1";
state.sidebarViews.views = [{ id: "all", name: "All tasks" }];
state.sidebarViews.activeViewId = "all";
state.sidebarViews.draft = null;
state.toggleAppSidebarSection.mockClear();
state.setAppSidebarCollapsed.mockClear();
state.setSidebarActiveView.mockClear();
});
afterEach(() => cleanup());
it("keeps the tasks view picker inline in the section header", () => {
renderSection();
const picker = screen.getByTestId("tasks-view-picker");
const header = screen.getByRole("button", { name: "Tasks" }).parentElement;
expect(header?.contains(picker)).toBe(true);
});
});