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): implement board search functionality and integrate with task filters

Andrejaa5d86ac18e0
diff --git a/apps/web/src/components/common/project-layout.tsx b/apps/web/src/components/common/project-layout.tsx
index fa4916dfc..6be94a896 100644
--- a/apps/web/src/components/common/project-layout.tsx
+++ b/apps/web/src/components/common/project-layout.tsx
@@ -5,7 +5,6 @@ import MobileProjectNav from "@/components/common/header/mobile-project-nav";
import ProjectCrumbSelect from "@/components/common/header/project-crumb-select";
import WorkspaceCrumbSelect from "@/components/common/header/workspace-crumb-select";
import Layout from "@/components/common/layout";
-import NotificationDropdown from "@/components/notification/notification-dropdown";
import CreateProjectModal from "@/components/shared/modals/create-project-modal";
import { Button } from "@/components/ui/button";
import { KbdSequence } from "@/components/ui/kbd";
@@ -18,8 +17,6 @@ import {
} from "@/components/ui/tooltip";
import { shortcuts } from "@/constants/shortcuts";
import useGetProject from "@/hooks/queries/project/use-get-project";
-import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
-import { authClient } from "@/lib/auth-client";
import { cn } from "@/lib/cn";
type ProjectLayoutProps = {
@@ -41,7 +38,6 @@ export default function ProjectLayout({
}: ProjectLayoutProps) {
const navigate = useNavigate();
const location = useLocation();
- const { data: workspace } = useActiveWorkspace();
const { data: project } = useGetProject({ id: projectId, workspaceId });
const [isCreateProjectModalOpen, setIsCreateProjectModalOpen] =
useState(false);
@@ -64,17 +60,6 @@ export default function ProjectLayout({
});
};
- const handleWorkspaceSwitch = async (nextWorkspaceId: string) => {
- await authClient.organization.setActive({
- organizationId: nextWorkspaceId,
- });
-
- navigate({
- to: "/dashboard/workspace/$workspaceId",
- params: { workspaceId: nextWorkspaceId },
- });
- };
-
const handleProjectSwitch = (nextProjectId: string) => {
const isBacklog = resolvedView === "backlog";
@@ -170,7 +155,6 @@ export default function ProjectLayout({
</div>
<div className="flex shrink-0 items-center gap-1.5">
- <NotificationDropdown />
{headerActions}
</div>
</div>
diff --git a/apps/web/src/components/common/workspace-layout.tsx b/apps/web/src/components/common/workspace-layout.tsx
index 0045bb430..db0e9d827 100644
--- a/apps/web/src/components/common/workspace-layout.tsx
+++ b/apps/web/src/components/common/workspace-layout.tsx
@@ -1,6 +1,5 @@
import type { ReactNode } from "react";
import Layout from "@/components/common/layout";
-import NotificationDropdown from "@/components/notification/notification-dropdown";
import {
Breadcrumb,
BreadcrumbItem,
@@ -79,7 +78,6 @@ export default function WorkspaceLayout({
</Breadcrumb>
</div>
<div className={`${cn("flex items-center gap-1.5", className)}`}>
- <NotificationDropdown />
{headerActions}
</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.ts
index 315126256..5c58a5dfd 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
@@ -43,6 +43,7 @@ function normalizeFilters(raw: unknown): BoardFilters {
export function useTaskFiltersWithLabelsSupport(
project: ProjectWithTasks | null | undefined,
projectId?: string,
+ textQuery?: string,
) {
const queryClient = useQueryClient();
const storageKey = projectId ? `kaneo:board-filters:${projectId}` : null;
@@ -84,7 +85,21 @@ export function useTaskFiltersWithLabelsSupport(
const filterTasks = useCallback(
(tasks: Task[]): Task[] => {
+ const normalizedTextQuery = textQuery?.trim().toLowerCase();
+
return tasks.filter((task) => {
+ if (normalizedTextQuery) {
+ const title = task.title?.toLowerCase() ?? "";
+ const description = task.description?.toLowerCase() ?? "";
+ const matchesText =
+ title.includes(normalizedTextQuery) ||
+ description.includes(normalizedTextQuery);
+
+ if (!matchesText) {
+ return false;
+ }
+ }
+
if (
filters.status &&
filters.status.length > 0 &&
@@ -167,7 +182,7 @@ export function useTaskFiltersWithLabelsSupport(
return true;
});
},
- [filters, getTaskLabels],
+ [filters, getTaskLabels, textQuery],
);
const filteredProject = useMemo(() => {
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.tsx
index 870b7913c..34a82bebf 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,4 +1,5 @@
import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { Search } from "lucide-react";
import { useCallback, useEffect, useState } from "react";
import BoardToolbar from "@/components/board/board-toolbar";
import ProjectLayout from "@/components/common/project-layout";
@@ -7,6 +8,7 @@ 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 { Input } from "@/components/ui/input";
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";
@@ -37,6 +39,11 @@ function RouteComponent() {
const { project, setProject } = useProjectStore();
const { viewMode, setViewMode } = useUserPreferencesStore();
const [isTaskModalOpen, setIsTaskModalOpen] = useState(false);
+ const [boardSearchQuery, setBoardSearchQuery] = useState("");
+ const [isBoardSearchMounted, setIsBoardSearchMounted] = useState(false);
+ const [isBoardSearchVisible, setIsBoardSearchVisible] = useState(false);
+ const [boardSearchInput, setBoardSearchInput] =
+ useState<HTMLInputElement | null>(null);
const { data: users } = useGetActiveWorkspaceUsers(workspaceId);
const { data: workspaceLabels = [] } = useGetLabelsByWorkspace(workspaceId);
@@ -69,6 +76,36 @@ function RouteComponent() {
}
}, [data, setProject]);
+ const openBoardSearch = useCallback(() => {
+ setIsBoardSearchMounted(true);
+ window.requestAnimationFrame(() => setIsBoardSearchVisible(true));
+ }, []);
+
+ const closeBoardSearch = useCallback(() => {
+ setIsBoardSearchVisible(false);
+ window.setTimeout(() => setIsBoardSearchMounted(false), 180);
+ }, []);
+
+ useEffect(() => {
+ const onKeyDown = (event: KeyboardEvent) => {
+ const isFindShortcut =
+ (event.metaKey || event.ctrlKey) && event.key.toLowerCase() === "f";
+
+ if (!isFindShortcut) return;
+
+ event.preventDefault();
+ openBoardSearch();
+ };
+
+ window.addEventListener("keydown", onKeyDown);
+ return () => window.removeEventListener("keydown", onKeyDown);
+ }, [openBoardSearch]);
+
+ useEffect(() => {
+ if (!isBoardSearchMounted) return;
+ window.requestAnimationFrame(() => boardSearchInput?.focus());
+ }, [isBoardSearchMounted, boardSearchInput]);
+
const {
filters,
updateFilter,
@@ -76,13 +113,43 @@ function RouteComponent() {
filteredProject,
hasActiveFilters,
clearFilters,
- } = useTaskFiltersWithLabelsSupport(project, projectId);
+ } = useTaskFiltersWithLabelsSupport(project, projectId, boardSearchQuery);
+
+ const boardHeaderSearch = isBoardSearchMounted ? (
+ <div
+ className={`relative w-[240px] origin-top transition-all duration-180 ease-out ${
+ isBoardSearchVisible
+ ? "translate-y-0 scale-y-100 opacity-100"
+ : "pointer-events-none -translate-y-1 scale-y-95 opacity-0"
+ }`}
+ >
+ <Search className="-translate-y-1/2 pointer-events-none absolute top-1/2 left-2.5 h-3.5 w-3.5 text-muted-foreground" />
+ <Input
+ ref={setBoardSearchInput}
+ value={boardSearchQuery}
+ onChange={(event) => setBoardSearchQuery(event.target.value)}
+ onKeyDown={(event) => {
+ if (event.key === "Escape" && !boardSearchQuery.trim()) {
+ closeBoardSearch();
+ }
+ }}
+ onBlur={() => {
+ if (!boardSearchQuery.trim()) {
+ closeBoardSearch();
+ }
+ }}
+ placeholder="Search tickets..."
+ className="h-7.5 [&_[data-slot=input]]:h-7 [&_[data-slot=input]]:leading-7 [&_[data-slot=input]]:pl-8 [&_[data-slot=input]]:text-xs [&_[data-slot=input]]:placeholder:text-xs [&_[data-slot=input]]:placeholder:leading-7"
+ />
+ </div>
+ ) : null;
return (
<ProjectLayout
projectId={projectId}
workspaceId={workspaceId}
activeView="board"
+ headerActions={boardHeaderSearch}
>
<PageTitle
title={`${project?.name} — ${viewMode === "board" ? "Board" : "List"}`}