⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
feat(web): persist board filters and polish linear-style filter chips
Andreje3f7f9df98a7
diff --git a/apps/web/src/components/board/board-toolbar.tsx b/apps/web/src/components/board/board-toolbar.tsxnew file mode 100644index 000000000..98f49ad68--- /dev/null+++ b/apps/web/src/components/board/board-toolbar.tsx@@ -0,0 +1,629 @@+import { Filter, PanelsTopLeft, Rows3, X } from "lucide-react";+import type { ReactNode } from "react";+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuGroup,+ DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ DropdownMenuTrigger,+} from "@/components/ui/menu";+import labelColors from "@/constants/label-colors";+import type { BoardFilters } from "@/hooks/use-task-filters";+import { getColumnIcon } from "@/lib/column";+import { getPriorityIcon } from "@/lib/priority";+import type { ProjectWithTasks } from "@/types/project";++type WorkspaceLabel = {+ id: string;+ name: string;+ color: string;+};++type ActiveUsers = {+ members?: Array<{+ userId: string;+ user?: {+ image?: string | null;+ name?: string | null;+ } | null;+ }>;+};++type BoardToolbarProps = {+ project?: ProjectWithTasks | null;+ filters: BoardFilters;+ updateFilter: (+ key: keyof BoardFilters,+ value: BoardFilters[keyof BoardFilters],+ ) => void;+ updateLabelFilter: (labelId: string) => void;+ clearFilters: () => void;+ hasActiveFilters: boolean;+ users?: ActiveUsers;+ workspaceLabels: WorkspaceLabel[];+ viewMode: "board" | "list";+ setViewMode: (mode: "board" | "list") => void;+};++function CheckSlot({ checked }: { checked: boolean }) {+ return (+ <span+ className={`inline-flex size-4 shrink-0 items-center justify-center rounded-[4px] border ${+ checked+ ? "border-primary bg-primary text-primary-foreground"+ : "border-input bg-background"+ }`}+ >+ {checked ? "✓" : null}+ </span>+ );+}++type ActiveFilterChipProps = {+ subject: string;+ operator: string;+ value: ReactNode;+ onClear: () => void;+};++function ActiveFilterChip({+ subject,+ operator,+ value,+ onClear,+}: ActiveFilterChipProps) {+ return (+ <div className="inline-flex h-7 items-center rounded-md border border-border bg-background text-xs shadow-xs">+ <span className="px-2 font-medium text-foreground">{subject}</span>+ <span className="h-full w-px bg-border" />+ <span className="px-2 text-foreground/80">{operator}</span>+ <span className="h-full w-px bg-border" />+ <span className="px-2 text-foreground">{value}</span>+ <span className="h-full w-px bg-border" />+ <button+ className="inline-flex h-full w-7 items-center justify-center rounded-r-md text-foreground/70 hover:bg-accent/70 hover:text-foreground"+ onClick={onClear}+ type="button"+ >+ <X className="h-3.5 w-3.5" />+ </button>+ </div>+ );+}++function StackedIcons({+ items,+ itemClassName,+}: {+ items: Array<{ id: string; node: ReactNode }>;+ itemClassName?: string;+}) {+ if (items.length === 0) return null;++ return (+ <span className="inline-flex items-center -space-x-1.5">+ {items.slice(0, 3).map((item) => (+ <span+ key={item.id}+ className={`inline-flex size-4 items-center justify-center rounded-full bg-background ${itemClassName ?? ""}`}+ >+ {item.node}+ </span>+ ))}+ </span>+ );+}++export default function BoardToolbar({+ project,+ filters,+ updateFilter,+ updateLabelFilter,+ clearFilters,+ hasActiveFilters,+ users,+ workspaceLabels,+ viewMode,+ setViewMode,+}: BoardToolbarProps) {+ const selectedStatusIds = filters.status ?? [];+ const selectedPriorityIds = filters.priority ?? [];+ const selectedAssigneeIds = filters.assignee ?? [];+ const selectedDueDateFilters = filters.dueDate ?? [];++ const getStatusDisplayName = (statusId: string) => {+ const column = project?.columns?.find((col) => col.id === statusId);+ return column?.name || statusId;+ };+ const getStatusIcon = (statusId: string) => {+ const column = project?.columns?.find((col) => col.id === statusId);+ return getColumnIcon(statusId, column?.isFinal);+ };++ const getPriorityDisplayName = (priority: string) =>+ priority.charAt(0).toUpperCase() + priority.slice(1);++ const getAssigneeDisplayName = (userId: string) => {+ const member = users?.members?.find((m) => m.userId === userId);+ return member?.user?.name || "Unknown";+ };+ const getAssigneeAvatar = (userId: string) => {+ const member = users?.members?.find((m) => m.userId === userId);+ return (+ <Avatar className="h-4 w-4">+ <AvatarImage+ src={member?.user?.image ?? ""}+ alt={member?.user?.name || ""}+ />+ <AvatarFallback className="border border-border/30 text-[9px] font-medium">+ {member?.user?.name?.charAt(0).toUpperCase() || "?"}+ </AvatarFallback>+ </Avatar>+ );+ };++ const uniqueLabels = workspaceLabels.reduce(+ (acc: WorkspaceLabel[], label: WorkspaceLabel) => {+ const existing = acc.find(+ (l) => l.name === label.name && l.color === label.color,+ );+ if (!existing) acc.push(label);+ return acc;+ },+ [],+ );++ const isLabelGroupSelected = (label: { name: string; color: string }) => {+ return workspaceLabels+ .filter((l) => l.name === label.name && l.color === label.color)+ .some((l) => filters.labels?.includes(l.id));+ };++ const toggleStatusFilter = (statusId: string) => {+ const exists = selectedStatusIds.includes(statusId);+ const next = exists+ ? selectedStatusIds.filter((id) => id !== statusId)+ : [...selectedStatusIds, statusId];+ updateFilter("status", next.length > 0 ? next : null);+ };++ const togglePriorityFilter = (priority: string) => {+ const exists = selectedPriorityIds.includes(priority);+ const next = exists+ ? selectedPriorityIds.filter((id) => id !== priority)+ : [...selectedPriorityIds, priority];+ updateFilter("priority", next.length > 0 ? next : null);+ };++ const toggleAssigneeFilter = (userId: string) => {+ const exists = selectedAssigneeIds.includes(userId);+ const next = exists+ ? selectedAssigneeIds.filter((id) => id !== userId)+ : [...selectedAssigneeIds, userId];+ updateFilter("assignee", next.length > 0 ? next : null);+ };++ const toggleDueDateFilter = (dueDate: string) => {+ const exists = selectedDueDateFilters.includes(dueDate);+ const next = exists+ ? selectedDueDateFilters.filter((id) => id !== dueDate)+ : [...selectedDueDateFilters, dueDate];+ updateFilter("dueDate", next.length > 0 ? next : null);+ };++ const toggleLabelGroup = (label: { name: string; color: string }) => {+ const matching = workspaceLabels.filter(+ (l) => l.name === label.name && l.color === label.color,+ );+ const anySelected = matching.some((l) => filters.labels?.includes(l.id));++ for (const l of matching) {+ if (+ (anySelected && filters.labels?.includes(l.id)) ||+ (!anySelected && !filters.labels?.includes(l.id))+ ) {+ updateLabelFilter(l.id);+ }+ }+ };++ const clearLabelFilters = () => {+ if (!filters.labels || filters.labels.length === 0) return;+ for (const labelId of filters.labels) updateLabelFilter(labelId);+ };++ return (+ <div className="border-border/80 border-b bg-card/80 backdrop-blur supports-[backdrop-filter]:bg-card/70">+ <div className="flex min-h-10 items-center px-2 py-1.5 md:px-3">+ <div className="flex w-full flex-wrap items-center justify-between gap-2">+ <div className="flex flex-wrap items-center gap-1.5">+ <DropdownMenu>+ <DropdownMenuTrigger+ render={+ <button+ type="button"+ className="inline-flex h-7 items-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-foreground text-xs font-medium outline-none ring-0 hover:bg-accent/60"+ />+ }+ >+ <Filter className="h-3 w-3" />+ Filter+ </DropdownMenuTrigger>+ <DropdownMenuContent className="w-56" align="start">+ <DropdownMenuGroup>+ <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">+ Filter By+ </DropdownMenuLabel>+ </DropdownMenuGroup>+ <DropdownMenuSeparator />++ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="h-8 rounded-md text-sm">+ Status+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-72">+ <div className="grid grid-cols-1 gap-1 p-1">+ <button+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedStatusIds.length === 0+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => updateFilter("status", null)}+ type="button"+ >+ <CheckSlot checked={selectedStatusIds.length === 0} />+ All statuses+ </button>+ {project?.columns?.map((column) => (+ <button+ key={column.id}+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedStatusIds.includes(column.id)+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => toggleStatusFilter(column.id)}+ type="button"+ >+ <CheckSlot+ checked={selectedStatusIds.includes(column.id)}+ />+ <span className="inline-flex h-4 w-4 items-center justify-center">+ {getStatusIcon(column.id)}+ </span>+ <span className="truncate">{column.name}</span>+ </button>+ ))}+ </div>+ </DropdownMenuSubContent>+ </DropdownMenuSub>++ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="h-8 rounded-md text-sm">+ Priority+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-72">+ <div className="grid grid-cols-1 gap-1 p-1">+ <button+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedPriorityIds.length === 0+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => updateFilter("priority", null)}+ type="button"+ >+ <CheckSlot checked={selectedPriorityIds.length === 0} />+ All priorities+ </button>+ {["urgent", "high", "medium", "low"].map((priority) => (+ <button+ key={priority}+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedPriorityIds.includes(priority)+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => togglePriorityFilter(priority)}+ type="button"+ >+ <CheckSlot+ checked={selectedPriorityIds.includes(priority)}+ />+ <span className="inline-flex h-4 w-4 items-center justify-center [&>svg]:h-4 [&>svg]:w-4">+ {getPriorityIcon(priority)}+ </span>+ <span className="truncate capitalize">+ {priority}+ </span>+ </button>+ ))}+ </div>+ </DropdownMenuSubContent>+ </DropdownMenuSub>++ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="h-8 rounded-md text-sm">+ Assignee+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-64">+ <div className="grid grid-cols-1 gap-1 p-1">+ <button+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedAssigneeIds.length === 0+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => updateFilter("assignee", null)}+ type="button"+ >+ <CheckSlot checked={selectedAssigneeIds.length === 0} />+ All assignees+ </button>+ {users?.members?.map((member) => (+ <button+ key={member.userId}+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedAssigneeIds.includes(member.userId)+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => toggleAssigneeFilter(member.userId)}+ type="button"+ >+ <CheckSlot+ checked={selectedAssigneeIds.includes(+ member.userId,+ )}+ />+ <span className="inline-flex items-center gap-2">+ <Avatar className="h-5 w-5">+ <AvatarImage+ src={member.user?.image ?? ""}+ alt={member.user?.name || ""}+ />+ <AvatarFallback className="border border-border/30 text-[10px] font-medium">+ {member.user?.name?.charAt(0).toUpperCase()}+ </AvatarFallback>+ </Avatar>+ <span>{member.user?.name}</span>+ </span>+ </button>+ ))}+ </div>+ </DropdownMenuSubContent>+ </DropdownMenuSub>++ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="h-8 rounded-md text-sm">+ Due date+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-56">+ <div className="grid grid-cols-1 gap-1 p-1">+ <button+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedDueDateFilters.length === 0+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => updateFilter("dueDate", null)}+ type="button"+ >+ <CheckSlot+ checked={selectedDueDateFilters.length === 0}+ />+ All due dates+ </button>+ {["Due this week", "Due next week", "No due date"].map(+ (dueDate) => (+ <button+ key={dueDate}+ className={`inline-flex h-7 items-center gap-1.5 rounded-md px-2 text-left text-xs ${+ selectedDueDateFilters.includes(dueDate)+ ? "bg-accent text-accent-foreground"+ : "text-foreground/90 hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => toggleDueDateFilter(dueDate)}+ type="button"+ >+ <CheckSlot+ checked={selectedDueDateFilters.includes(dueDate)}+ />+ {dueDate}+ </button>+ ),+ )}+ </div>+ </DropdownMenuSubContent>+ </DropdownMenuSub>++ <DropdownMenuSub>+ <DropdownMenuSubTrigger className="h-8 rounded-md text-sm">+ Labels+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-64">+ <DropdownMenuItem+ onClick={clearLabelFilters}+ className="h-8 rounded-md text-sm"+ >+ <CheckSlot+ checked={!filters.labels || filters.labels.length === 0}+ />+ All labels+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ {uniqueLabels.length > 0 ? (+ uniqueLabels.map((label) => (+ <DropdownMenuItem+ key={label.id}+ onClick={() => toggleLabelGroup(label)}+ className="h-8 rounded-md text-sm"+ >+ <CheckSlot checked={isLabelGroupSelected(label)} />+ <span+ className="h-2.5 w-2.5 shrink-0 rounded-full"+ style={{+ backgroundColor:+ labelColors.find((c) => c.value === label.color)+ ?.color || "var(--color-neutral-400)",+ }}+ />+ <span className="flex-1">{label.name}</span>+ </DropdownMenuItem>+ ))+ ) : (+ <DropdownMenuItem+ disabled+ className="h-8 rounded-md text-sm text-muted-foreground"+ >+ No labels available+ </DropdownMenuItem>+ )}+ </DropdownMenuSubContent>+ </DropdownMenuSub>++ {hasActiveFilters && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ onClick={clearFilters}+ className="h-8 rounded-md text-sm text-muted-foreground"+ >+ Clear all filters+ </DropdownMenuItem>+ </>+ )}+ </DropdownMenuContent>+ </DropdownMenu>++ {selectedStatusIds.length > 0 && (+ <ActiveFilterChip+ subject="Status"+ operator="is any of"+ value={+ <span className="inline-flex items-center gap-1.5">+ <StackedIcons+ items={selectedStatusIds.map((statusId) => ({+ id: statusId,+ node: getStatusIcon(statusId),+ }))}+ itemClassName="[&>svg]:h-3.5 [&>svg]:w-3.5"+ />+ <span>+ {selectedStatusIds.length === 1+ ? getStatusDisplayName(selectedStatusIds[0])+ : `${selectedStatusIds.length} selected`}+ </span>+ </span>+ }+ onClear={() => updateFilter("status", null)}+ />+ )}++ {selectedPriorityIds.length > 0 && (+ <ActiveFilterChip+ subject="Priority"+ operator="is any of"+ value={+ <span className="inline-flex items-center gap-1.5">+ <StackedIcons+ items={selectedPriorityIds.map((priority) => ({+ id: priority,+ node: getPriorityIcon(priority),+ }))}+ />+ <span>+ {selectedPriorityIds.length === 1+ ? getPriorityDisplayName(selectedPriorityIds[0])+ : `${selectedPriorityIds.length} selected`}+ </span>+ </span>+ }+ onClear={() => updateFilter("priority", null)}+ />+ )}++ {selectedAssigneeIds.length > 0 && (+ <ActiveFilterChip+ subject="Assignee"+ operator="is any of"+ value={+ <span className="inline-flex items-center gap-1.5">+ <StackedIcons+ items={selectedAssigneeIds.map((userId) => ({+ id: userId,+ node: getAssigneeAvatar(userId),+ }))}+ />+ <span>+ {selectedAssigneeIds.length === 1+ ? getAssigneeDisplayName(selectedAssigneeIds[0])+ : `${selectedAssigneeIds.length} selected`}+ </span>+ </span>+ }+ onClear={() => updateFilter("assignee", null)}+ />+ )}++ {selectedDueDateFilters.length > 0 && (+ <ActiveFilterChip+ subject="Due date"+ operator="is any of"+ value={+ selectedDueDateFilters.length === 1+ ? selectedDueDateFilters[0]+ : `${selectedDueDateFilters.length} selected`+ }+ onClear={() => updateFilter("dueDate", null)}+ />+ )}++ {filters.labels && filters.labels.length > 0 && (+ <ActiveFilterChip+ subject="Labels"+ operator="include any of"+ value={`${filters.labels.length} selected`}+ onClear={clearLabelFilters}+ />+ )}+ </div>++ <div className="inline-flex items-center gap-1">+ <button+ type="button"+ className={`inline-flex h-6 items-center gap-1 rounded-md px-2 text-xs font-medium transition-colors ${+ viewMode === "board"+ ? "bg-accent text-foreground"+ : "text-muted-foreground hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => setViewMode("board")}+ >+ <PanelsTopLeft className="h-3 w-3" />+ Board+ </button>+ <button+ type="button"+ className={`inline-flex h-6 items-center gap-1 rounded-md px-2 text-xs font-medium transition-colors ${+ viewMode === "list"+ ? "bg-accent text-foreground"+ : "text-muted-foreground hover:bg-accent/60 hover:text-foreground"+ }`}+ onClick={() => setViewMode("list")}+ >+ <Rows3 className="h-3 w-3" />+ List+ </button>+ </div>+ </div>+ </div>+ </div>+ );+}diff --git a/apps/web/src/hooks/use-task-filters-with-labels-support.ts b/apps/web/src/hooks/use-task-filters-with-labels-support.tsindex a3e1a8b15..315126256 100644--- a/apps/web/src/hooks/use-task-filters-with-labels-support.ts+++ b/apps/web/src/hooks/use-task-filters-with-labels-support.ts@@ -1,21 +1,74 @@import { useQueryClient } from "@tanstack/react-query";import { addWeeks, endOfWeek, isWithinInterval, startOfWeek } from "date-fns";-import { useCallback, useMemo, useState } from "react";+import { useCallback, useEffect, useMemo, useState } from "react";import type { ProjectWithTasks } from "@/types/project";import type Task from "@/types/task";import type { BoardFilters } from "./use-task-filters";+const DEFAULT_FILTERS: BoardFilters = {+ status: null,+ priority: null,+ assignee: null,+ dueDate: null,+ labels: null,+};++const FILTER_KEYS: Array<keyof BoardFilters> = [+ "status",+ "priority",+ "assignee",+ "dueDate",+ "labels",+];++function normalizeFilters(raw: unknown): BoardFilters {+ if (!raw || typeof raw !== "object") {+ return DEFAULT_FILTERS;+ }++ const candidate = raw as Partial<Record<keyof BoardFilters, unknown>>;+ const normalized = { ...DEFAULT_FILTERS };++ for (const key of FILTER_KEYS) {+ const value = candidate[key];+ if (Array.isArray(value)) {+ const values = value.filter((v): v is string => typeof v === "string");+ normalized[key] = values.length > 0 ? values : null;+ }+ }++ return normalized;+}+export function useTaskFiltersWithLabelsSupport(project: ProjectWithTasks | null | undefined,+ projectId?: string,) {const queryClient = useQueryClient();- const [filters, setFilters] = useState<BoardFilters>({- status: null,- priority: null,- assignee: null,- dueDate: null,- labels: null,- });+ const storageKey = projectId ? `kaneo:board-filters:${projectId}` : null;+ const [filters, setFilters] = useState<BoardFilters>(DEFAULT_FILTERS);++ useEffect(() => {+ if (!storageKey || typeof window === "undefined") return;++ try {+ const stored = window.localStorage.getItem(storageKey);+ if (!stored) {+ setFilters(DEFAULT_FILTERS);+ return;+ }++ const parsed = JSON.parse(stored) as unknown;+ setFilters(normalizeFilters(parsed));+ } catch {+ setFilters(DEFAULT_FILTERS);+ }+ }, [storageKey]);++ useEffect(() => {+ if (!storageKey || typeof window === "undefined") return;+ window.localStorage.setItem(storageKey, JSON.stringify(filters));+ }, [filters, storageKey]);// Helper function to get cached labels for a taskconst getTaskLabels = useCallback(@@ -32,54 +85,68 @@ export function useTaskFiltersWithLabelsSupport(const filterTasks = useCallback((tasks: Task[]): Task[] => {return tasks.filter((task) => {- if (filters.status && task.status !== filters.status) {+ if (+ filters.status &&+ filters.status.length > 0 &&+ !filters.status.includes(task.status)+ ) {return false;}- if (filters.priority && task.priority !== filters.priority) {+ if (+ filters.priority &&+ filters.priority.length > 0 &&+ !filters.priority.includes(task.priority ?? "")+ ) {return false;}- if (filters.assignee && task.userId !== filters.assignee) {+ if (+ filters.assignee &&+ filters.assignee.length > 0 &&+ !filters.assignee.includes(task.userId ?? "")+ ) {return false;}- if (filters.dueDate && task.dueDate) {+ if (filters.dueDate && filters.dueDate.length > 0) {const today = new Date();- const taskDate = new Date(task.dueDate);-- switch (filters.dueDate) {- case "Due this week": {- const weekStart = startOfWeek(today);- const weekEnd = endOfWeek(today);- if (- !isWithinInterval(taskDate, { start: weekStart, end: weekEnd })- ) {- return false;- }- break;+ const taskDate = task.dueDate ? new Date(task.dueDate) : null;++ const matchesAnyDueDate = filters.dueDate.some((dueDateFilter) => {+ if (dueDateFilter === "No due date") {+ return !task.dueDate;+ }++ if (!taskDate) {+ return false;}- case "Due next week": {- const nextWeekStart = startOfWeek(addWeeks(today, 1));- const nextWeekEnd = endOfWeek(addWeeks(today, 1));- if (- !isWithinInterval(taskDate, {++ switch (dueDateFilter) {+ case "Due this week": {+ const weekStart = startOfWeek(today);+ const weekEnd = endOfWeek(today);+ return isWithinInterval(taskDate, {+ start: weekStart,+ end: weekEnd,+ });+ }+ case "Due next week": {+ const nextWeekStart = startOfWeek(addWeeks(today, 1));+ const nextWeekEnd = endOfWeek(addWeeks(today, 1));+ return isWithinInterval(taskDate, {start: nextWeekStart,end: nextWeekEnd,- })- ) {- return false;+ });}- break;- }- case "No due date": {- return false;+ default:+ return false;}- }- }+ });- if (filters.dueDate === "No due date" && task.dueDate) {- return false;+ if (!matchesAnyDueDate) {+ return false;+ }}// Label filtering@@ -116,23 +183,17 @@ export function useTaskFiltersWithLabelsSupport(};}, [project, filterTasks]);- const hasActiveFilters = Object.values(filters).some(- (filter) => filter !== null,+ const hasActiveFilters = Object.values(filters).some((filter) =>+ Array.isArray(filter) ? filter.length > 0 : filter !== null,);const clearFilters = () => {- setFilters({- status: null,- priority: null,- assignee: null,- dueDate: null,- labels: null,- });+ setFilters(DEFAULT_FILTERS);};const updateFilter = (key: keyof BoardFilters,- value: string | string[] | null,+ value: BoardFilters[keyof BoardFilters],) => {setFilters((prev) => ({ ...prev, [key]: value }));};diff --git a/apps/web/src/hooks/use-task-filters.ts b/apps/web/src/hooks/use-task-filters.tsindex 3d78680a6..14e035462 100644--- a/apps/web/src/hooks/use-task-filters.ts+++ b/apps/web/src/hooks/use-task-filters.ts@@ -1,75 +1,144 @@import { addWeeks, endOfWeek, isWithinInterval, startOfWeek } from "date-fns";-import { useState } from "react";+import { useEffect, useState } from "react";import type { ProjectWithTasks } from "@/types/project";import type Task from "@/types/task";export type BoardFilters = {- status: string | null;- priority: string | null;- assignee: string | null;- dueDate: string | null;+ status: string[] | null;+ priority: string[] | null;+ assignee: string[] | null;+ dueDate: string[] | null;labels: string[] | null;};-export function useTaskFilters(project: ProjectWithTasks | null | undefined) {- const [filters, setFilters] = useState<BoardFilters>({- status: null,- priority: null,- assignee: null,- dueDate: null,- labels: null,- });+const DEFAULT_FILTERS: BoardFilters = {+ status: null,+ priority: null,+ assignee: null,+ dueDate: null,+ labels: null,+};++const FILTER_KEYS: Array<keyof BoardFilters> = [+ "status",+ "priority",+ "assignee",+ "dueDate",+ "labels",+];++function normalizeFilters(raw: unknown): BoardFilters {+ if (!raw || typeof raw !== "object") {+ return DEFAULT_FILTERS;+ }++ const candidate = raw as Partial<Record<keyof BoardFilters, unknown>>;+ const normalized = { ...DEFAULT_FILTERS };++ for (const key of FILTER_KEYS) {+ const value = candidate[key];+ if (Array.isArray(value)) {+ const values = value.filter((v): v is string => typeof v === "string");+ normalized[key] = values.length > 0 ? values : null;+ }+ }++ return normalized;+}++export function useTaskFilters(+ project: ProjectWithTasks | null | undefined,+ projectId?: string,+) {+ const storageKey = projectId ? `kaneo:board-filters:${projectId}` : null;+ const [filters, setFilters] = useState<BoardFilters>(DEFAULT_FILTERS);++ useEffect(() => {+ if (!storageKey || typeof window === "undefined") return;++ try {+ const stored = window.localStorage.getItem(storageKey);+ if (!stored) {+ setFilters(DEFAULT_FILTERS);+ return;+ }++ const parsed = JSON.parse(stored) as unknown;+ setFilters(normalizeFilters(parsed));+ } catch {+ setFilters(DEFAULT_FILTERS);+ }+ }, [storageKey]);++ useEffect(() => {+ if (!storageKey || typeof window === "undefined") return;+ window.localStorage.setItem(storageKey, JSON.stringify(filters));+ }, [filters, storageKey]);const filterTasks = (tasks: Task[]): Task[] => {return tasks.filter((task) => {- if (filters.status && task.status !== filters.status) {+ if (+ filters.status &&+ filters.status.length > 0 &&+ !filters.status.includes(task.status)+ ) {return false;}- if (filters.priority && task.priority !== filters.priority) {+ if (+ filters.priority &&+ filters.priority.length > 0 &&+ !filters.priority.includes(task.priority ?? "")+ ) {return false;}- if (filters.assignee && task.userId !== filters.assignee) {+ if (+ filters.assignee &&+ filters.assignee.length > 0 &&+ !filters.assignee.includes(task.userId ?? "")+ ) {return false;}- if (filters.dueDate && task.dueDate) {+ if (filters.dueDate && filters.dueDate.length > 0) {const today = new Date();- const taskDate = new Date(task.dueDate);-- switch (filters.dueDate) {- case "Due this week": {- const weekStart = startOfWeek(today);- const weekEnd = endOfWeek(today);- if (- !isWithinInterval(taskDate, { start: weekStart, end: weekEnd })- ) {- return false;- }- break;+ const taskDate = task.dueDate ? new Date(task.dueDate) : null;++ const matchesAnyDueDate = filters.dueDate.some((dueDateFilter) => {+ if (dueDateFilter === "No due date") {+ return !task.dueDate;+ }++ if (!taskDate) {+ return false;}- case "Due next week": {- const nextWeekStart = startOfWeek(addWeeks(today, 1));- const nextWeekEnd = endOfWeek(addWeeks(today, 1));- if (- !isWithinInterval(taskDate, {++ switch (dueDateFilter) {+ case "Due this week": {+ const weekStart = startOfWeek(today);+ const weekEnd = endOfWeek(today);+ return isWithinInterval(taskDate, {+ start: weekStart,+ end: weekEnd,+ });+ }+ case "Due next week": {+ const nextWeekStart = startOfWeek(addWeeks(today, 1));+ const nextWeekEnd = endOfWeek(addWeeks(today, 1));+ return isWithinInterval(taskDate, {start: nextWeekStart,end: nextWeekEnd,- })- ) {- return false;+ });}- break;- }- case "No due date": {- return false;+ default:+ return false;}- }- }+ });- if (filters.dueDate === "No due date" && task.dueDate) {- return false;+ if (!matchesAnyDueDate) {+ return false;+ }}return true;@@ -92,18 +161,12 @@ export function useTaskFilters(project: ProjectWithTasks | null | undefined) {);const clearFilters = () => {- setFilters({- status: null,- priority: null,- assignee: null,- dueDate: null,- labels: null,- });+ setFilters(DEFAULT_FILTERS);};const updateFilter = (key: keyof BoardFilters,- value: string | string[] | null,+ value: BoardFilters[keyof BoardFilters],) => {setFilters((prev) => ({ ...prev, [key]: value }));};diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsxindex 5372f2958..870b7913c 100644--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/board.tsx@@ -1,40 +1,18 @@import { createFileRoute, useNavigate } from "@tanstack/react-router";-import {- Calendar,- Filter,- Layout,- List,- User,- X,-} from "lucide-react";import { useCallback, useEffect, useState } from "react";+import BoardToolbar from "@/components/board/board-toolbar";import ProjectLayout from "@/components/common/project-layout";import KanbanBoard from "@/components/kanban-board";import ListView from "@/components/list-view";import PageTitle from "@/components/page-title";import CreateTaskModal from "@/components/shared/modals/create-task-modal";import TaskDetailsSheet from "@/components/task/task-details-sheet";-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";-import { Button } from "@/components/ui/button";-import {- DropdownMenu,- DropdownMenuCheckboxItem,- DropdownMenuContent,- DropdownMenuGroup,- DropdownMenuItem,- DropdownMenuLabel,- DropdownMenuSeparator,- DropdownMenuTrigger,-} from "@/components/ui/menu";-import labelColors from "@/constants/label-colors";import { shortcuts } from "@/constants/shortcuts";import useGetLabelsByWorkspace from "@/hooks/queries/label/use-get-labels-by-workspace";import { useGetTasks } from "@/hooks/queries/task/use-get-tasks";import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";import { useTaskFiltersWithLabelsSupport } from "@/hooks/use-task-filters-with-labels-support";-import { getColumnIcon } from "@/lib/column";-import { getPriorityIcon } from "@/lib/priority";import useProjectStore from "@/store/project";import { useUserPreferencesStore } from "@/store/user-preferences";@@ -98,413 +76,33 @@ function RouteComponent() {filteredProject,hasActiveFilters,clearFilters,- } = useTaskFiltersWithLabelsSupport(project);-- // Helper functions to get display names for filters- const getStatusDisplayName = (statusId: string) => {- const column = project?.columns?.find((col) => col.id === statusId);- return column?.name || statusId;- };-- const getPriorityDisplayName = (priority: string) => {- return priority.charAt(0).toUpperCase() + priority.slice(1);- };-- const getAssigneeDisplayName = (userId: string) => {- const member = users?.members?.find((m) => m.userId === userId);- return member?.user?.name || "Unknown";- };-- // Deduplicate workspace labels by name and color combination- const uniqueLabels = workspaceLabels.reduce(- (- acc: { id: string; name: string; color: string }[],- label: { id: string; name: string; color: string },- ) => {- const existing = acc.find(- (l) => l.name === label.name && l.color === label.color,- );- if (!existing) {- acc.push(label);- }- return acc;- },- [],- );-- const isLabelGroupSelected = (label: { name: string; color: string }) => {- return workspaceLabels- .filter(- (l: { name: string; color: string }) =>- l.name === label.name && l.color === label.color,- )- .some((l: { id: string }) => filters.labels?.includes(l.id));- };-- const toggleLabelGroup = (label: { name: string; color: string }) => {- const matchingLabels = workspaceLabels.filter(- (l: { name: string; color: string }) =>- l.name === label.name && l.color === label.color,- );-- const isAnySelected = matchingLabels.some((l: { id: string }) =>- filters.labels?.includes(l.id),- );-- if (isAnySelected) {- for (const l of matchingLabels) {- if (filters.labels?.includes(l.id)) {- updateLabelFilter(l.id);- }- }- } else {- for (const l of matchingLabels) {- if (!filters.labels?.includes(l.id)) {- updateLabelFilter(l.id);- }- }- }- };+ } = useTaskFiltersWithLabelsSupport(project, projectId);return (- <ProjectLayout projectId={projectId} workspaceId={workspaceId}>+ <ProjectLayout+ projectId={projectId}+ workspaceId={workspaceId}+ activeView="board"+ ><PageTitletitle={`${project?.name} — ${viewMode === "board" ? "Board" : "List"}`}hideAppName/><div className="relative flex flex-col h-full min-h-0 overflow-hidden">- <div className="bg-card border-b border-border/80">- <div className="h-10 flex items-center px-4">- <div className="flex items-center justify-between w-full">- <div className="flex items-center gap-2">- {/* Individual Filter Chips */}- {filters.status && (- <Button- variant="secondary"- size="xs"- className="h-7 rounded-md px-2 text-xs font-medium"- >- <span>Status: {getStatusDisplayName(filters.status)}</span>- <Button- variant="ghost"- size="icon"- className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"- onClick={(e) => {- e.stopPropagation();- updateFilter("status", null);- }}- >- <X className="h-2.5 w-2.5" />- </Button>- </Button>- )}-- {filters.priority && (- <Button- variant="secondary"- size="xs"- className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"- >- {getPriorityIcon(filters.priority)}- <span>- Priority: {getPriorityDisplayName(filters.priority)}- </span>- <Button- variant="ghost"- size="icon"- className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"- onClick={(e) => {- e.stopPropagation();- updateFilter("priority", null);- }}- >- <X className="h-2.5 w-2.5" />- </Button>- </Button>- )}-- {filters.assignee && (- <Button- variant="secondary"- size="xs"- className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"- >- <User className="h-3 w-3" />- <span>- Assignee: {getAssigneeDisplayName(filters.assignee)}- </span>- <Button- variant="ghost"- size="icon"- className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"- onClick={(e) => {- e.stopPropagation();- updateFilter("assignee", null);- }}- >- <X className="h-2.5 w-2.5" />- </Button>- </Button>- )}-- {filters.dueDate && (- <Button- variant="secondary"- size="xs"- className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"- >- <Calendar className="h-3 w-3" />- <span>Due: {filters.dueDate}</span>- <Button- variant="ghost"- size="icon"- className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"- onClick={(e) => {- e.stopPropagation();- updateFilter("dueDate", null);- }}- >- <X className="h-2.5 w-2.5" />- </Button>- </Button>- )}-- {filters.labels &&- filters.labels.length > 0 &&- // Group selected labels by name/color and show only unique chips- uniqueLabels- .filter((uniqueLabel) =>- workspaceLabels- .filter(- (l: { name: string; color: string }) =>- l.name === uniqueLabel.name &&- l.color === uniqueLabel.color,- )- .some((l: { id: string }) =>- filters.labels?.includes(l.id),- ),- )- .map((label) => (- <Button- key={`${label.name}-${label.color}`}- variant="secondary"- size="xs"- className="h-7 rounded-md px-2 text-xs font-medium gap-1.5"- >- <span- className="w-2.5 h-2.5 rounded-full flex-shrink-0"- style={{- backgroundColor:- labelColors.find((c) => c.value === label.color)- ?.color || "var(--color-neutral-400)",- }}- />- <span>Label: {label.name}</span>- <Button- variant="ghost"- size="icon"- className="h-4 w-4 p-0 ml-1 hover:bg-destructive hover:text-destructive-foreground"- onClick={(e) => {- e.stopPropagation();- toggleLabelGroup(label);- }}- >- <X className="h-2.5 w-2.5" />- </Button>- </Button>- ))}-- <DropdownMenu>- <DropdownMenuTrigger- render={- <Button- variant="outline"- size="sm"- className="h-8 gap-2 px-3 font-medium text-foreground"- />- }- >- <Filter className="h-3.5 w-3.5" />- Filter- </DropdownMenuTrigger>- <DropdownMenuContent- className="w-80"- align="start"- >- <DropdownMenuItem- disabled- className="h-8 rounded-md border border-border/80 bg-card text-sm text-muted-foreground"- >- Add filter...- </DropdownMenuItem>- <DropdownMenuSeparator />- {hasActiveFilters && (- <>- <DropdownMenuItem- onClick={clearFilters}- className="h-8 text-sm text-muted-foreground"- >- <span>Clear all filters</span>- </DropdownMenuItem>- <DropdownMenuSeparator />- </>- )}- <DropdownMenuGroup>- <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">- Status- </DropdownMenuLabel>- </DropdownMenuGroup>- {project?.columns?.map((column) => (- <DropdownMenuCheckboxItem- key={column.id}- checked={filters.status === column.id}- onCheckedChange={(checked) =>- updateFilter("status", checked ? column.id : null)- }- className="h-8 rounded-md text-sm"- >- {getColumnIcon(column.id, column.isFinal)}- <span>{column.name}</span>- </DropdownMenuCheckboxItem>- ))}-- <DropdownMenuSeparator />- <DropdownMenuGroup>- <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">- Priority- </DropdownMenuLabel>- </DropdownMenuGroup>- {["urgent", "high", "medium", "low"].map((priority) => (- <DropdownMenuCheckboxItem- key={priority}- checked={filters.priority === priority}- onCheckedChange={(checked) =>- updateFilter("priority", checked ? priority : null)- }- className="h-8 rounded-md text-sm [&_svg]:text-sidebar-foreground"- >- {getPriorityIcon(priority)}- <span className="capitalize">{priority}</span>- </DropdownMenuCheckboxItem>- ))}-- <DropdownMenuSeparator />- <DropdownMenuGroup>- <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">- Assignee- </DropdownMenuLabel>- </DropdownMenuGroup>- {users?.members?.map((member) => (- <DropdownMenuCheckboxItem- key={member.userId}- checked={filters.assignee === member.userId}- onCheckedChange={(checked) =>- updateFilter("assignee", checked ? member.userId : null)- }- className="h-8 rounded-md text-sm"- >- <Avatar className="h-6 w-6">- <AvatarImage- src={member.user?.image ?? ""}- alt={member.user?.name || ""}- />- <AvatarFallback className="text-xs font-medium border border-border/30">- {member.user?.name?.charAt(0).toUpperCase()}- </AvatarFallback>- </Avatar>- <span>{member.user?.name}</span>- </DropdownMenuCheckboxItem>- ))}-- <DropdownMenuSeparator />- <DropdownMenuGroup>- <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">- Due date- </DropdownMenuLabel>- </DropdownMenuGroup>- {["Due this week", "Due next week", "No due date"].map(- (dueDate) => (- <DropdownMenuCheckboxItem- key={dueDate}- checked={filters.dueDate === dueDate}- onCheckedChange={(checked) =>- updateFilter("dueDate", checked ? dueDate : null)- }- className="h-8 rounded-md text-sm"- >- <span>{dueDate}</span>- </DropdownMenuCheckboxItem>- ),- )}-- <DropdownMenuSeparator />- <DropdownMenuGroup>- <DropdownMenuLabel className="text-[11px] uppercase tracking-wide">- Labels- </DropdownMenuLabel>- </DropdownMenuGroup>- {uniqueLabels.length > 0 ? (- uniqueLabels.map(- (label: {- id: string;- name: string;- color: string;- }) => (- <DropdownMenuCheckboxItem- key={label.id}- checked={isLabelGroupSelected(label)}- onCheckedChange={() => toggleLabelGroup(label)}- className="h-8 rounded-md text-sm"- >- <span- className="w-3 h-3 rounded-full flex-shrink-0"- style={{- backgroundColor:- labelColors.find((c) => c.value === label.color)- ?.color || "var(--color-neutral-400)",- }}- />- <span>{label.name}</span>- </DropdownMenuCheckboxItem>- ),- )- ) : (- <DropdownMenuItem- disabled- className="h-8 rounded-md text-sm text-muted-foreground"- >- <span>No labels available</span>- </DropdownMenuItem>- )}- </DropdownMenuContent>- </DropdownMenu>-- <div className="inline-flex h-8 items-center gap-0.5 rounded-lg border border-border/80 bg-background p-0.5">- <Button- variant={viewMode === "board" ? "secondary" : "ghost"}- size="sm"- className="h-7 gap-1.5 rounded-md px-3 text-sm font-medium"- onClick={() => setViewMode("board")}- >- <Layout className="h-3.5 w-3.5" />- Board- </Button>- <Button- variant={viewMode === "list" ? "secondary" : "ghost"}- size="sm"- className="h-7 gap-1.5 rounded-md px-3 text-sm font-medium"- onClick={() => setViewMode("list")}- >- <List className="h-3.5 w-3.5" />- List- </Button>- </div>- </div>- </div>- </div>- </div>+ <BoardToolbar+ project={project}+ filters={filters}+ updateFilter={updateFilter}+ updateLabelFilter={updateLabelFilter}+ clearFilters={clearFilters}+ hasActiveFilters={hasActiveFilters}+ users={users}+ workspaceLabels={workspaceLabels}+ viewMode={viewMode}+ setViewMode={setViewMode}+ />- <div className="flex-1 overflow-hidden bg-card h-full">+ <div className="flex h-full flex-1 overflow-hidden bg-background">{filteredProject ? (viewMode === "board" ? (<KanbanBoard project={filteredProject} />