@@ -418,7 +380,7 @@ export function SearchSheet({ open, onOpenChange }: SearchSheetProps) {
) : isLoading ? (
diff --git a/components/project/activity/activity-feed.tsx b/components/project/activity/activity-feed.tsx
index be2ed1d..890580e 100644
--- a/components/project/activity/activity-feed.tsx
+++ b/components/project/activity/activity-feed.tsx
@@ -2,17 +2,11 @@
import { useInfiniteQuery } from "@tanstack/react-query";
import { formatDistanceToNow } from "date-fns";
-import {
- ActivityIcon,
- PencilIcon,
- PlusCircleIcon,
- TrashIcon,
-} from "lucide-react";
+import { ActivityIcon } from "lucide-react";
import { useParams } from "next/navigation";
import { useMemo } from "react";
import Markdown from "react-markdown";
import { Spinner, SpinnerWithSpacing } from "@/components/core/loaders";
-import { UserAvatar } from "@/components/core/user-avatar";
import { Button } from "@/components/ui/button";
import type { ActivityWithActor } from "@/drizzle/types";
import { generateObjectDiffMessage } from "@/lib/activity/message";
@@ -21,104 +15,87 @@ import { useTRPCClient } from "@/trpc/client";
const ACTIVITIES_LIMIT = 25;
-export function ActivityItem({
- item,
- isLast,
-}: {
- item: ActivityWithActor;
- isLast: boolean;
-}) {
+function getActionConfig(action: string) {
+ switch (action) {
+ case "created":
+ return {
+ label: "Created",
+ bgColor: "bg-emerald-100 dark:bg-emerald-900/50",
+ textColor: "text-emerald-600 dark:text-emerald-400",
+ };
+ case "updated":
+ return {
+ label: "Updated",
+ bgColor: "bg-blue-100 dark:bg-blue-900/50",
+ textColor: "text-blue-600 dark:text-blue-400",
+ };
+ case "deleted":
+ return {
+ label: "Deleted",
+ bgColor: "bg-red-100 dark:bg-red-900/50",
+ textColor: "text-red-600 dark:text-red-400",
+ };
+ default:
+ return {
+ label: action,
+ bgColor: "bg-muted",
+ textColor: "text-muted-foreground",
+ };
+ }
+}
+
+export function ActivityItem({ item }: { item: ActivityWithActor }) {
+ const actionConfig = getActionConfig(item.action);
+
return (
-
-
- {!isLast ? (
+
+
+
+
+ {item.actor.firstName}
+
- ) : null}
-
-
- {item.actor ? (
-
-
-
- ) : null}
+ className={`text-xs font-medium px-2 py-0.5 rounded ${actionConfig.bgColor} ${actionConfig.textColor}`}
+ >
+ {actionConfig.label}
+
+
+ {formatDistanceToNow(new Date(item.createdAt), {
+ addSuffix: true,
+ })}
+
+
-
- {item.action === "created" ? (
-
- ) : null}
- {item.action === "updated" ? (
-
- ) : null}
- {item.action === "deleted" ? (
-
-
-
- ) : null}
-
-
-
-
-
- {item.actor.firstName}
-
-
- {formatDistanceToNow(new Date(item.createdAt), {
- addSuffix: true,
- })}
-
-
-
-
(
-
- {children}
-
- ),
- strong: ({ children }) => (
-
- {children}
-
- ),
- ul: ({ children }) => (
-
- ),
- li: ({ children }) => (
-
- {children}
-
- ),
- }}
- >
- {generateObjectDiffMessage(item)}
-
-
-
+
+
(
+ {children}
+ ),
+ strong: ({ children }) => (
+
+ {children}
+
+ ),
+ ul: ({ children }) => (
+
+ ),
+ li: ({ children }) => (
+
+
+ {children}
+
+ ),
+ }}
+ >
+ {generateObjectDiffMessage(item)}
+
-
+
);
}
@@ -147,66 +124,62 @@ export function ActivityFeed() {
},
});
- const allActivities = useMemo(
- () => activitiesData?.pages.flat() ?? [],
- [activitiesData],
- );
+ const activities = useMemo(() => {
+ return activitiesData?.pages.flat() ?? [];
+ }, [activitiesData]);
if (isPending) {
return
;
}
return (
-
- {allActivities.length ? (
+
+ {activities.length ? (
<>
-
- {allActivities.map((activityItem, activityItemIdx) => (
-
+
+ {activities.map((activityItem, index) => (
+
+
+ {index < activities.length - 1 && (
+
+ )}
+
))}
-
- {!isFetchingNextPage && (
-
- {hasNextPage ? (
-
- ) : (
-
-
-
You've reached the end
-
-
- )}
-
- )}
- {isFetchingNextPage && (
-
+
+
+
+ {isFetchingNextPage ? (
-
- )}
+ ) : hasNextPage ? (
+
+ ) : (
+
+ End of activity
+
+ )}
+
-
-
-
No activity yet
-
- Project activity will appear here as you and your team make
- changes
-
+
+
+
+ No activity yet
+
+
+ Activity will appear here as you and your team make changes to this
+ project.
+
)}
diff --git a/components/ui/collapsible.tsx b/components/ui/collapsible.tsx
deleted file mode 100644
index 9fa4894..0000000
--- a/components/ui/collapsible.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-"use client"
-
-import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
-
-const Collapsible = CollapsiblePrimitive.Root
-
-const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
-
-const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
-
-export { Collapsible, CollapsibleTrigger, CollapsibleContent }
diff --git a/lib/activity/message.ts b/lib/activity/message.ts
index a065e50..976341c 100644
--- a/lib/activity/message.ts
+++ b/lib/activity/message.ts
@@ -140,6 +140,7 @@ export function generateObjectDiffMessage(item: ActivityWithActor) {
"repeatRule",
"creatorId",
"id",
+ "metadata",
];
for (const key in oldValue) {
diff --git a/lib/search/helpers.ts b/lib/search/helpers.ts
deleted file mode 100644
index 1e6c381..0000000
--- a/lib/search/helpers.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import {
- type calendarEvent,
- post,
- project,
- type task,
- taskList,
-} from "@/drizzle/schema";
-import type { Database } from "@/drizzle/types";
-import { runAndLogError } from "@/lib/error";
-import type { SearchService } from "@/lib/search";
-import { eq } from "drizzle-orm";
-
-export async function getProjectForIndexing(
- db: Database,
- projectId: number,
-): Promise
{
- return await db.query.project.findFirst({
- where: eq(project.id, projectId),
- });
-}
-
-export async function getTaskListWithProject(
- db: Database,
- taskListId: number,
-): Promise<
- | (typeof taskList.$inferSelect & { project: typeof project.$inferSelect })
- | undefined
-> {
- const result = await db.query.taskList.findFirst({
- where: eq(taskList.id, taskListId),
- with: { project: true },
- });
-
- if (!result?.project) return undefined;
- return result as typeof taskList.$inferSelect & {
- project: typeof project.$inferSelect;
- };
-}
-
-export async function indexProject(
- search: SearchService,
- projectData: typeof project.$inferSelect,
-) {
- await runAndLogError("indexing project for search", async () => {
- await search.indexProject(projectData);
- });
-}
-
-export async function indexTaskList(
- search: SearchService,
- taskListData: typeof taskList.$inferSelect,
- projectData: typeof project.$inferSelect,
-) {
- await runAndLogError("indexing task list for search", async () => {
- await search.indexTaskList(taskListData, projectData);
- });
-}
-
-export async function indexTaskListWithProjectFetch(
- db: Database,
- search: SearchService,
- taskListData: typeof taskList.$inferSelect,
-) {
- await runAndLogError("indexing task list for search", async () => {
- const projectData = await getProjectForIndexing(db, taskListData.projectId);
- if (projectData) {
- await search.indexTaskList(taskListData, projectData);
- }
- });
-}
-
-export async function indexTask(
- search: SearchService,
- taskData: typeof task.$inferSelect,
- taskListData: typeof taskList.$inferSelect,
- projectData: typeof project.$inferSelect,
-) {
- await runAndLogError("indexing task for search", async () => {
- await search.indexTask(taskData, taskListData, projectData);
- });
-}
-
-export async function indexTaskWithDataFetch(
- db: Database,
- search: SearchService,
- taskData: typeof task.$inferSelect,
-) {
- await runAndLogError("indexing task for search", async () => {
- const taskListWithProject = await getTaskListWithProject(
- db,
- taskData.taskListId,
- );
- if (taskListWithProject) {
- await search.indexTask(
- taskData,
- taskListWithProject,
- taskListWithProject.project,
- );
- }
- });
-}
-
-export async function indexEvent(
- search: SearchService,
- eventData: typeof calendarEvent.$inferSelect,
- projectData: typeof project.$inferSelect,
-) {
- await runAndLogError("indexing event for search", async () => {
- await search.indexEvent(eventData, projectData);
- });
-}
-
-export async function deleteSearchItem(
- search: SearchService,
- itemId: string,
- itemType: string,
-) {
- await runAndLogError(`removing ${itemType} from search index`, async () => {
- await search.deleteItem(itemId);
- });
-}
-
-export async function deleteProjectSearchItems(
- search: SearchService,
- projectId: number,
-) {
- await runAndLogError(
- "removing project-related content from search index",
- async () => {
- await search.deleteByProject(projectId);
- },
- );
-}
-
-export async function indexEventWithProjectFetch(
- db: Database,
- search: SearchService,
- eventData: typeof calendarEvent.$inferSelect,
-) {
- await runAndLogError("indexing event for search", async () => {
- const projectData = await getProjectForIndexing(db, eventData.projectId);
- if (projectData) {
- await search.indexEvent(eventData, projectData);
- }
- });
-}
-
-export async function indexPost(
- search: SearchService,
- postData: typeof post.$inferSelect,
- projectData: typeof project.$inferSelect,
-) {
- await runAndLogError("indexing post for search", async () => {
- await search.indexPost(postData, projectData);
- });
-}
-
-export async function indexPostWithProjectFetch(
- db: Database,
- search: SearchService,
- postData: typeof post.$inferSelect,
-) {
- await runAndLogError("indexing post for search", async () => {
- const projectData = await getProjectForIndexing(db, postData.projectId);
- if (projectData) {
- await search.indexPost(postData, projectData);
- }
- });
-}
diff --git a/lib/search/index.ts b/lib/search/index.ts
deleted file mode 100644
index 9595f78..0000000
--- a/lib/search/index.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-import { Search } from "@upstash/search";
-import type { calendarEvent, post, project, task, taskList } from "@/drizzle/schema";
-
-const client = Search.fromEnv();
-
-export interface SearchableItem {
- id: string;
- type: "project" | "task" | "tasklist" | "event" | "post";
- title: string;
- description?: string;
- projectId?: number;
- projectName?: string;
- url: string;
- createdAt: Date;
- dueDate?: Date;
- status?: string;
- metadata?: Record;
-}
-
-export class SearchService {
- private index: ReturnType;
- private tenant: string;
- private orgSlug: string;
-
- constructor(tenant: string, orgSlug: string) {
- if (!tenant) {
- throw new Error("Tenant ID is required for SearchService");
- }
- if (!orgSlug) {
- throw new Error("Organization slug is required for SearchService");
- }
- this.tenant = tenant;
- this.orgSlug = orgSlug;
- this.index = client.index(`manage-${tenant}`);
- }
-
- private truncateContentObject(
- contentObj: Record,
- ): Record {
- // Calculate the size of the entire content object
- const contentStr = JSON.stringify(contentObj);
- if (contentStr.length <= 4000) {
- // Leave buffer for JSON overhead
- return contentObj;
- }
-
- // If too large, aggressively truncate the description
- const result = { ...contentObj };
- if (result.description && typeof result.description === "string") {
- // Calculate approximate overhead from other fields
- const { description, ...otherFields } = result;
- const overhead = JSON.stringify(otherFields).length;
-
- // Leave space for description field structure and buffer
- const maxDescLength = Math.max(100, 3500 - overhead);
-
- if (description.length > maxDescLength) {
- result.description = `${description.substring(0, maxDescLength - 3)}...`;
- }
- }
-
- return result;
- }
-
- async indexProject(projectData: typeof project.$inferSelect) {
- const index = this.index;
- const searchableItem: SearchableItem = {
- id: `project-${projectData.id}`,
- type: "project",
- title: projectData.name,
- description: projectData.description || undefined,
- projectId: projectData.id,
- url: `/${this.orgSlug}/projects/${projectData.id}`,
- createdAt: projectData.createdAt,
- dueDate: projectData.dueDate || undefined,
- status: projectData.status,
- metadata: {
- createdByUser: projectData.createdByUser,
- },
- };
-
- const content = this.truncateContentObject({
- title: searchableItem.title,
- description: searchableItem.description || "",
- type: searchableItem.type,
- status: searchableItem.status || "",
- projectId: searchableItem.projectId,
- });
-
- await index.upsert({
- id: searchableItem.id,
- content,
- metadata: {
- url: searchableItem.url,
- createdAt: searchableItem.createdAt.toISOString(),
- dueDate: searchableItem.dueDate?.toISOString(),
- createdByUser: searchableItem.metadata?.createdByUser,
- },
- });
- }
-
- async indexTask(
- taskData: typeof task.$inferSelect,
- taskListData: typeof taskList.$inferSelect,
- projectData: typeof project.$inferSelect,
- ) {
- const index = this.index;
- const searchableItem: SearchableItem = {
- id: `task-${taskData.id}`,
- type: "task",
- title: taskData.name,
- description: taskData.description || undefined,
- projectId: projectData.id,
- projectName: projectData.name,
- url: `/${this.orgSlug}/projects/${projectData.id}/tasklists/${taskListData.id}?task=${taskData.id}`,
- createdAt: taskData.createdAt,
- dueDate: taskData.dueDate || undefined,
- status: taskData.status,
- metadata: {
- taskListId: taskData.taskListId,
- taskListName: taskListData.name,
- projectName: projectData.name,
- createdByUser: taskData.createdByUser,
- assignedToUser: taskData.assignedToUser,
- },
- };
-
- const content = this.truncateContentObject({
- title: searchableItem.title,
- description: searchableItem.description || "",
- type: searchableItem.type,
- status: searchableItem.status || "",
- projectName: searchableItem.projectName || "",
- projectId: searchableItem.projectId,
- });
-
- await index.upsert({
- id: searchableItem.id,
- content,
- metadata: {
- url: searchableItem.url,
- createdAt: searchableItem.createdAt.toISOString(),
- dueDate: searchableItem.dueDate?.toISOString(),
- taskListId: searchableItem.metadata?.taskListId,
- taskListName: searchableItem.metadata?.taskListName,
- createdByUser: searchableItem.metadata?.createdByUser,
- assignedToUser: searchableItem.metadata?.assignedToUser,
- },
- });
- }
-
- async indexTaskList(
- taskListData: typeof taskList.$inferSelect,
- projectData: typeof project.$inferSelect,
- ) {
- const index = this.index;
- const searchableItem: SearchableItem = {
- id: `tasklist-${taskListData.id}`,
- type: "tasklist",
- title: taskListData.name,
- description: taskListData.description || undefined,
- projectId: projectData.id,
- projectName: projectData.name,
- url: `/${this.orgSlug}/projects/${projectData.id}/tasklists/${taskListData.id}`,
- createdAt: taskListData.createdAt,
- dueDate: taskListData.dueDate || undefined,
- status: taskListData.status,
- metadata: {
- projectName: projectData.name,
- createdByUser: taskListData.createdByUser,
- },
- };
-
- const content = this.truncateContentObject({
- title: searchableItem.title,
- description: searchableItem.description || "",
- type: searchableItem.type,
- status: searchableItem.status || "",
- projectName: searchableItem.projectName || "",
- projectId: searchableItem.projectId,
- });
-
- await index.upsert({
- id: searchableItem.id,
- content,
- metadata: {
- url: searchableItem.url,
- createdAt: searchableItem.createdAt.toISOString(),
- dueDate: searchableItem.dueDate?.toISOString(),
- createdByUser: searchableItem.metadata?.createdByUser,
- },
- });
- }
-
- async indexEvent(
- eventData: typeof calendarEvent.$inferSelect,
- projectData: typeof project.$inferSelect,
- ) {
- const index = this.index;
- const searchableItem: SearchableItem = {
- id: `event-${eventData.id}`,
- type: "event",
- title: eventData.name,
- description: eventData.description || undefined,
- projectId: projectData.id,
- projectName: projectData.name,
- url: `/${this.orgSlug}/projects/${projectData.id}/events?event=${eventData.id}`,
- createdAt: eventData.createdAt,
- metadata: {
- projectName: projectData.name,
- start: eventData.start.toISOString(),
- end: eventData.end?.toISOString(),
- allDay: eventData.allDay,
- createdByUser: eventData.createdByUser,
- },
- };
-
- const content = this.truncateContentObject({
- title: searchableItem.title,
- description: searchableItem.description || "",
- type: searchableItem.type,
- projectName: searchableItem.projectName || "",
- projectId: searchableItem.projectId,
- });
-
- await index.upsert({
- id: searchableItem.id,
- content,
- metadata: {
- url: searchableItem.url,
- createdAt: searchableItem.createdAt.toISOString(),
- start: searchableItem.metadata?.start,
- end: searchableItem.metadata?.end,
- allDay: searchableItem.metadata?.allDay,
- createdByUser: searchableItem.metadata?.createdByUser,
- },
- });
- }
-
- async indexPost(
- postData: typeof post.$inferSelect,
- projectData: typeof project.$inferSelect,
- ) {
- const index = this.index;
- const searchableItem: SearchableItem = {
- id: `post-${postData.id}`,
- type: "post",
- title: postData.title,
- description: postData.content || undefined,
- projectId: projectData.id,
- projectName: projectData.name,
- url: `/${this.orgSlug}/projects/${projectData.id}/posts`,
- createdAt: postData.createdAt,
- metadata: {
- projectName: projectData.name,
- category: postData.category,
- isDraft: postData.isDraft,
- publishedAt: postData.publishedAt?.toISOString(),
- createdByUser: postData.createdByUser,
- },
- };
-
- const content = this.truncateContentObject({
- title: searchableItem.title,
- description: searchableItem.description || "",
- type: searchableItem.type,
- category: postData.category,
- projectName: searchableItem.projectName || "",
- projectId: searchableItem.projectId,
- });
-
- await index.upsert({
- id: searchableItem.id,
- content,
- metadata: {
- url: searchableItem.url,
- createdAt: searchableItem.createdAt.toISOString(),
- category: searchableItem.metadata?.category,
- isDraft: searchableItem.metadata?.isDraft,
- publishedAt: searchableItem.metadata?.publishedAt,
- createdByUser: searchableItem.metadata?.createdByUser,
- },
- });
- }
-
- async search(
- query: string,
- options?: {
- type?: "project" | "task" | "tasklist" | "event" | "post";
- projectId?: number;
- status?: string;
- limit?: number;
- },
- ) {
- const searchOptions: {
- query: string;
- limit: number;
- reranking: boolean;
- filter?: string;
- } = {
- query,
- limit: options?.limit || 20,
- reranking: true,
- };
-
- const filters: string[] = [];
-
- if (options?.type) {
- const allowedTypes = ["project", "task", "tasklist", "event", "post"] as const;
- if (allowedTypes.includes(options.type)) {
- filters.push(`type = '${options.type}'`);
- }
- }
-
- if (options?.projectId) {
- filters.push(`projectId = ${options.projectId}`);
- }
-
- if (options?.status) {
- filters.push(`status = '${options.status}'`);
- }
-
- if (filters.length > 0) {
- searchOptions.filter = filters.join(" AND ");
- }
-
- const results = await this.index.search(searchOptions);
-
- return results.map(
- (result: {
- id: string;
- score: number;
- content?: {
- title?: string;
- description?: string;
- type?: string;
- status?: string;
- projectName?: string;
- projectId?: number;
- };
- metadata?: {
- url?: string;
- createdAt?: string;
- dueDate?: string;
- createdByUser?: string;
- assignedToUser?: string;
- taskListId?: number;
- taskListName?: string;
- };
- }) => ({
- id: result.id,
- title: result.content?.title || "",
- description: result.content?.description || "",
- type: (result.content?.type || "") as
- | "project"
- | "task"
- | "tasklist"
- | "event"
- | "post",
- status: result.content?.status || "",
- projectName: result.content?.projectName || "",
- url: result.metadata?.url || "",
- projectId: result.content?.projectId || 0,
- score: result.score,
- createdAt: result.metadata?.createdAt
- ? new Date(result.metadata.createdAt)
- : new Date(),
- dueDate: result.metadata?.dueDate
- ? new Date(result.metadata.dueDate)
- : undefined,
- }),
- );
- }
-
- async deleteItem(id: string) {
- await this.index.delete(id);
- }
-
- async deleteByProject(projectId: number) {
- const projectItems = await this.search("", { projectId, limit: 1000 });
- for (const item of projectItems) {
- await this.deleteItem(item.id);
- }
- }
-
- async deleteTenantIndex() {
- try {
- await this.index.deleteIndex();
- } catch (error) {
- console.log(
- `Index for tenant ${this.tenant} does not exist or already deleted`,
- error,
- );
- }
- }
-
- async clearIndex() {
- try {
- await this.index.reset();
- } catch (error) {
- console.log(
- `Index for tenant ${this.tenant} could not be cleared:`,
- error,
- );
- }
- }
-}
diff --git a/package.json b/package.json
index 6e014ff..a10c623 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,8 @@
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
- "@headlessui/react": "^2.2.0",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
- "@radix-ui/react-collapsible": "^1.1.2",
"@radix-ui/react-context-menu": "^2.2.1",
"@radix-ui/react-dialog": "^1.1.10",
"@radix-ui/react-dropdown-menu": "^2.1.4",
@@ -51,8 +49,6 @@
"@trpc/tanstack-react-query": "^11.0.2",
"@turbowire/react": "^0.1.0",
"@turbowire/serverless": "^0.2.0",
- "@upstash/redis": "^1.35.3",
- "@upstash/search": "^0.1.5",
"@upstash/workflow": "^0.2.16",
"@vercel/analytics": "^1.5.0",
"autoprefixer": "10.4.14",
@@ -67,7 +63,6 @@
"dotenv": "^16.4.7",
"drizzle-orm": "^0.44.6",
"es-toolkit": "^1.39.8",
- "eslint-config-next": "16.0.3",
"ical-generator": "^8.0.1",
"lucide-react": "^0.503.0",
"mime-types": "^2.1.35",
@@ -86,7 +81,6 @@
"resend": "6.3.0-canary.4",
"rrule": "^2.8.1",
"sharp": "^0.33.4",
- "slugify": "^1.6.6",
"sonner": "^1.7.4",
"superjson": "^2.2.2",
"svix": "^1.64.0",
@@ -94,8 +88,7 @@
"tailwindcss": "3.3.2",
"tailwindcss-animate": "^1.0.7",
"use-debounce": "^10.0.2",
- "zod": "^4.1.12",
- "zod-validation-error": "^5.0.0"
+ "zod": "^4.1.12"
},
"devDependencies": {
"@aws-sdk/s3-request-presigner": "^3.623.0",
diff --git a/trpc/init.ts b/trpc/init.ts
index 31cb39c..f368c31 100644
--- a/trpc/init.ts
+++ b/trpc/init.ts
@@ -2,7 +2,6 @@ import { auth } from "@clerk/nextjs/server";
import { initTRPC, TRPCError } from "@trpc/server";
import superjson from "superjson";
import { ZodError } from "zod";
-import { SearchService } from "@/lib/search";
import { database } from "@/lib/utils/useDatabase";
import { getOwner, getTimezone } from "@/lib/utils/useOwner";
@@ -61,7 +60,6 @@ export const protectedProcedure = t.procedure.use(async ({ ctx, next }) => {
const { orgId, userId } = await getOwner();
const isOrgAdmin = !orgId ? true : has({ role: "org:admin" });
- const search = new SearchService(ctx.ownerId, ctx.orgSlug);
return next({
ctx: {
@@ -69,7 +67,6 @@ export const protectedProcedure = t.procedure.use(async ({ ctx, next }) => {
sessionId,
userId,
orgId,
- search,
isOrgAdmin,
},
});
diff --git a/trpc/routers/events.ts b/trpc/routers/events.ts
index b23f080..63dd42f 100644
--- a/trpc/routers/events.ts
+++ b/trpc/routers/events.ts
@@ -17,10 +17,6 @@ import { z } from "zod";
import { calendarEvent } from "@/drizzle/schema";
import { logActivity } from "@/lib/activity";
import { canEditProject, canViewProject } from "@/lib/permissions";
-import {
- deleteSearchItem,
- indexEventWithProjectFetch,
-} from "@/lib/search/helpers";
import { toEndOfDay, toStartOfDay, toTimeZone, toUTC } from "@/lib/utils/date";
import { sendMentionNotifications } from "@/lib/utils/mentionNotifications";
import {
@@ -177,8 +173,6 @@ export const eventsRouter = createTRPCRouter({
projectId: event[0].projectId,
oldValue: event[0],
});
-
- await deleteSearchItem(ctx.search, `event-${id}`, "event");
}
return event[0];
@@ -306,20 +300,15 @@ export const eventsRouter = createTRPCRouter({
newValue: updatedEvent[0],
});
- if (updatedEvent?.[0]) {
- await indexEventWithProjectFetch(ctx.db, ctx.search, updatedEvent[0]);
-
- // Send mention notifications if description was updated
- if (description) {
- await sendMentionNotifications(description, {
- type: "event",
- entityName: name,
- entityId: id,
- projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (updatedEvent?.[0] && description) {
+ await sendMentionNotifications(description, {
+ type: "event",
+ entityName: name,
+ entityId: id,
+ projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
} else {
const newEvent = await ctx.db
@@ -340,20 +329,15 @@ export const eventsRouter = createTRPCRouter({
newValue: newEvent[0],
});
- if (newEvent?.[0]) {
- await indexEventWithProjectFetch(ctx.db, ctx.search, newEvent[0]);
-
- // Send mention notifications if description was provided
- if (description) {
- await sendMentionNotifications(description, {
- type: "event",
- entityName: name,
- entityId: eventId,
- projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (newEvent?.[0] && description) {
+ await sendMentionNotifications(description, {
+ type: "event",
+ entityName: name,
+ entityId: eventId,
+ projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
}
@@ -428,8 +412,6 @@ export const eventsRouter = createTRPCRouter({
newValue: newEvent[0],
});
- await indexEventWithProjectFetch(ctx.db, ctx.search, newEvent[0]);
-
if (event.description) {
await sendMentionNotifications(event.description, {
type: "event",
diff --git a/trpc/routers/posts.ts b/trpc/routers/posts.ts
index e75cbe6..6022bbd 100644
--- a/trpc/routers/posts.ts
+++ b/trpc/routers/posts.ts
@@ -4,10 +4,6 @@ import { z } from "zod";
import { post } from "@/drizzle/schema";
import { logActivity } from "@/lib/activity";
import { canEditProject, canViewProject } from "@/lib/permissions";
-import {
- deleteSearchItem,
- indexPostWithProjectFetch,
-} from "@/lib/search/helpers";
import { sendMentionNotifications } from "@/lib/utils/mentionNotifications";
import { createTRPCRouter, protectedProcedure } from "../init";
@@ -178,8 +174,6 @@ export const postsRouter = createTRPCRouter({
projectId: deletedPost[0].projectId,
oldValue,
});
-
- await deleteSearchItem(ctx.search, `post-${id}`, "post");
}
return deletedPost[0];
@@ -268,19 +262,15 @@ export const postsRouter = createTRPCRouter({
newValue,
});
- if (updatedPost?.[0] && !isDraft) {
- await indexPostWithProjectFetch(ctx.db, ctx.search, updatedPost[0]);
-
- if (content) {
- await sendMentionNotifications(content, {
- type: "post",
- entityName: title,
- entityId: id,
- projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (updatedPost?.[0] && !isDraft && content) {
+ await sendMentionNotifications(content, {
+ type: "post",
+ entityName: title,
+ entityId: id,
+ projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
} else {
const newPost = await ctx.db
@@ -303,19 +293,15 @@ export const postsRouter = createTRPCRouter({
newValue,
});
- if (newPost?.[0] && !isDraft) {
- await indexPostWithProjectFetch(ctx.db, ctx.search, newPost[0]);
-
- if (content) {
- await sendMentionNotifications(content, {
- type: "post",
- entityName: title,
- entityId: postId,
- projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (newPost?.[0] && !isDraft && content) {
+ await sendMentionNotifications(content, {
+ type: "post",
+ entityName: title,
+ entityId: postId,
+ projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
}
diff --git a/trpc/routers/projects.ts b/trpc/routers/projects.ts
index 6908901..3d8916f 100644
--- a/trpc/routers/projects.ts
+++ b/trpc/routers/projects.ts
@@ -13,11 +13,6 @@ import {
canViewProject,
checkProjectPermission,
} from "@/lib/permissions";
-import {
- deleteProjectSearchItems,
- deleteSearchItem,
- indexProject,
-} from "@/lib/search/helpers";
import { sendMentionNotifications } from "@/lib/utils/mentionNotifications";
import { createTRPCRouter, protectedProcedure } from "../init";
@@ -31,7 +26,6 @@ export const projectsRouter = createTRPCRouter({
}),
)
.mutation(async ({ ctx, input }) => {
- // Check if user is in an organization and if they're an admin
if (ctx.orgId && !ctx.isOrgAdmin) {
throw new TRPCError({
code: "FORBIDDEN",
@@ -59,7 +53,6 @@ export const projectsRouter = createTRPCRouter({
projectId: newProject?.[0].id,
});
- // Grant editor permission to the project creator
if (newProject?.[0]) {
await ctx.db.insert(projectPermission).values({
projectId: newProject[0].id,
@@ -68,10 +61,6 @@ export const projectsRouter = createTRPCRouter({
createdByUser: ctx.userId,
});
- // Index the project for search
- await indexProject(ctx.search, newProject[0]);
-
- // Send mention notifications if description was provided
if (input.description) {
await sendMentionNotifications(input.description, {
type: "project",
@@ -146,12 +135,6 @@ export const projectsRouter = createTRPCRouter({
projectId: +input.id,
});
- // Re-index the updated project for search
- if (updatedProject?.[0]) {
- await indexProject(ctx.search, updatedProject[0]);
- }
-
- // Send mention notifications if description was updated
if ("description" in input && input.description && currentProject) {
await sendMentionNotifications(input.description, {
type: "project",
@@ -192,12 +175,6 @@ export const projectsRouter = createTRPCRouter({
oldValue: deletedProject[0],
});
- // Remove project from search index
- await deleteSearchItem(ctx.search, `project-${input.id}`, "project");
-
- // Also remove all related content from search (tasks, tasklists, events)
- await deleteProjectSearchItems(ctx.search, input.id);
-
return deletedProject[0];
}),
getProjectById: protectedProcedure
@@ -225,14 +202,12 @@ export const projectsRouter = createTRPCRouter({
throw new Error(`Project with id ${input.id} not found`);
}
- // Get the user's permission for this project
const userRole = await checkProjectPermission(
ctx.db,
input.id,
ctx.userId,
);
- // Compute canEdit in-memory to avoid redundant DB query
const canEdit =
ctx.isOrgAdmin ||
userRole === "editor" ||
@@ -276,7 +251,7 @@ export const projectsRouter = createTRPCRouter({
return comments.map((commentItem) => ({
...commentItem,
replyCount: countByRoomId.get(`comment-${commentItem.id}`) ?? 0,
- replies: [], // Always empty, loaded on demand
+ replies: [],
}));
}),
addComment: protectedProcedure
diff --git a/trpc/routers/search.ts b/trpc/routers/search.ts
index 2c6a762..c52a5e3 100644
--- a/trpc/routers/search.ts
+++ b/trpc/routers/search.ts
@@ -1,10 +1,25 @@
-import { eq } from "drizzle-orm";
+import { and, eq, ilike, inArray, or } from "drizzle-orm";
import { z } from "zod";
-import { post, project } from "@/drizzle/schema";
-import { runAndLogError } from "@/lib/error";
+import {
+ calendarEvent,
+ post,
+ project,
+ task,
+ taskList,
+} from "@/drizzle/schema";
import { getUserProjectIds } from "@/lib/permissions";
import { createTRPCRouter, protectedProcedure } from "../init";
+interface SearchResult {
+ id: string;
+ title: string;
+ description: string;
+ type: "project" | "task" | "tasklist" | "event" | "post";
+ status: string;
+ projectId: number;
+ projectName: string;
+}
+
export const searchRouter = createTRPCRouter({
searchQuery: protectedProcedure
.input(
@@ -19,141 +34,267 @@ export const searchRouter = createTRPCRouter({
}),
)
.query(async ({ input, ctx }) => {
- // Get projects the user has access to via permissions
- const userProjectIds = await getUserProjectIds(ctx.db, ctx.userId);
-
- // Get projects the user created (for backward compatibility)
- const createdProjects = await ctx.db.query.project.findMany({
- where: eq(project.createdByUser, ctx.userId),
- columns: { id: true },
- });
- const createdProjectIds = createdProjects.map((p) => p.id);
-
- // Combine both sets of project IDs
- const accessibleProjectIds = [
- ...new Set([...userProjectIds, ...createdProjectIds]),
- ];
-
- // If user has no accessible projects, return empty results
+ let accessibleProjectIds: number[];
+
+ if (ctx.isOrgAdmin) {
+ const allProjects = await ctx.db.query.project.findMany({
+ columns: { id: true },
+ });
+ accessibleProjectIds = allProjects.map((p) => p.id);
+ } else {
+ const userProjectIds = await getUserProjectIds(ctx.db, ctx.userId);
+
+ const createdProjects = await ctx.db.query.project.findMany({
+ where: eq(project.createdByUser, ctx.userId),
+ columns: { id: true },
+ });
+ const createdProjectIds = createdProjects.map((p) => p.id);
+
+ accessibleProjectIds = [
+ ...new Set([...userProjectIds, ...createdProjectIds]),
+ ];
+ }
+
if (accessibleProjectIds.length === 0) {
return [];
}
- const results = await ctx.search.search(input.query, {
- type: input.type,
- projectId: input.projectId,
- status: input.status,
- limit: input.limit,
- });
-
- // Filter results to only include content from accessible projects
- const filteredResults = results.filter((result) => {
- // For project search results, check if the project ID is accessible
- if (result.type === "project") {
- return accessibleProjectIds.includes(result.projectId);
+ const searchPattern = `%${input.query.trim()}%`;
+ const results: SearchResult[] = [];
+
+ const shouldSearchType = (type: string) =>
+ !input.type || input.type === type;
+
+ const matchesProjectFilter = (projectId: number) =>
+ !input.projectId || input.projectId === projectId;
+
+ const matchesStatusFilter = (status: string) =>
+ !input.status || input.status === status;
+
+ if (shouldSearchType("project")) {
+ const projectResults = await ctx.db
+ .select({
+ id: project.id,
+ name: project.name,
+ description: project.description,
+ status: project.status,
+ })
+ .from(project)
+ .where(
+ and(
+ inArray(project.id, accessibleProjectIds),
+ or(
+ ilike(project.name, searchPattern),
+ ilike(project.description, searchPattern),
+ ),
+ ),
+ )
+ .limit(input.limit);
+
+ for (const p of projectResults) {
+ if (matchesProjectFilter(p.id) && matchesStatusFilter(p.status)) {
+ results.push({
+ id: `project-${p.id}`,
+ title: p.name,
+ description: p.description || "",
+ type: "project",
+ status: p.status,
+ projectId: p.id,
+ projectName: p.name,
+ });
+ }
}
+ }
- // For tasks, tasklists, events, and posts, check if their project is accessible
- return (
- result.projectId && accessibleProjectIds.includes(result.projectId)
- );
- });
+ if (shouldSearchType("task")) {
+ const taskResults = await ctx.db
+ .select({
+ id: task.id,
+ name: task.name,
+ description: task.description,
+ status: task.status,
+ projectId: taskList.projectId,
+ projectName: project.name,
+ })
+ .from(task)
+ .innerJoin(taskList, eq(task.taskListId, taskList.id))
+ .innerJoin(project, eq(taskList.projectId, project.id))
+ .where(
+ and(
+ inArray(taskList.projectId, accessibleProjectIds),
+ or(
+ ilike(task.name, searchPattern),
+ ilike(task.description, searchPattern),
+ ),
+ ),
+ )
+ .limit(input.limit);
- return filteredResults;
- }),
+ for (const t of taskResults) {
+ if (matchesProjectFilter(t.projectId) && matchesStatusFilter(t.status)) {
+ results.push({
+ id: `task-${t.id}`,
+ title: t.name,
+ description: t.description || "",
+ type: "task",
+ status: t.status,
+ projectId: t.projectId,
+ projectName: t.projectName,
+ });
+ }
+ }
+ }
+
+ if (shouldSearchType("tasklist")) {
+ const taskListResults = await ctx.db
+ .select({
+ id: taskList.id,
+ name: taskList.name,
+ description: taskList.description,
+ status: taskList.status,
+ projectId: taskList.projectId,
+ projectName: project.name,
+ })
+ .from(taskList)
+ .innerJoin(project, eq(taskList.projectId, project.id))
+ .where(
+ and(
+ inArray(taskList.projectId, accessibleProjectIds),
+ or(
+ ilike(taskList.name, searchPattern),
+ ilike(taskList.description, searchPattern),
+ ),
+ ),
+ )
+ .limit(input.limit);
- indexAllContent: protectedProcedure.mutation(async ({ ctx }) => {
- // Only org admins can reindex all content
- if (!ctx.isOrgAdmin) {
- throw new Error("Only organization admins can reindex content");
- }
-
- await ctx.search.clearIndex();
-
- const projects = await ctx.db.query.project.findMany();
-
- await Promise.allSettled(
- projects.map((project) =>
- runAndLogError(`indexing project ${project.id}`, async () => {
- await ctx.search.indexProject(project);
- }),
- ),
- );
-
- const taskLists = await ctx.db.query.taskList.findMany({
- with: {
- project: true,
- },
- });
-
- await Promise.allSettled(
- taskLists.map((taskList) =>
- runAndLogError(`indexing task list ${taskList.id}`, async () => {
- await ctx.search.indexTaskList(taskList, taskList.project);
- }),
- ),
- );
-
- const tasks = await ctx.db.query.task.findMany({
- with: {
- taskList: {
- with: {
- project: true,
- },
- },
- },
- });
-
- await Promise.allSettled(
- tasks.map((task) =>
- runAndLogError(`indexing task ${task.id}`, async () => {
- await ctx.search.indexTask(
- task,
- task.taskList,
- task.taskList.project,
- );
- }),
- ),
- );
-
- const events = await ctx.db.query.calendarEvent.findMany({
- with: {
- project: true,
- },
- });
-
- await Promise.allSettled(
- events.map((event) =>
- runAndLogError(`indexing event ${event.id}`, async () => {
- await ctx.search.indexEvent(event, event.project);
- }),
- ),
- );
-
- const posts = await ctx.db.query.post.findMany({
- where: eq(post.isDraft, false),
- with: {
- project: true,
- },
- });
-
- await Promise.allSettled(
- posts.map((postItem) =>
- runAndLogError(`indexing post ${postItem.id}`, async () => {
- await ctx.search.indexPost(postItem, postItem.project);
- }),
- ),
- );
-
- return {
- success: true,
- indexed: {
- projects: projects.length,
- taskLists: taskLists.length,
- tasks: tasks.length,
- events: events.length,
- posts: posts.length,
- },
- };
- }),
+ for (const tl of taskListResults) {
+ if (matchesProjectFilter(tl.projectId) && matchesStatusFilter(tl.status)) {
+ results.push({
+ id: `tasklist-${tl.id}`,
+ title: tl.name,
+ description: tl.description || "",
+ type: "tasklist",
+ status: tl.status,
+ projectId: tl.projectId,
+ projectName: tl.projectName,
+ });
+ }
+ }
+ }
+
+ if (shouldSearchType("event")) {
+ const eventResults = await ctx.db
+ .select({
+ id: calendarEvent.id,
+ name: calendarEvent.name,
+ description: calendarEvent.description,
+ projectId: calendarEvent.projectId,
+ projectName: project.name,
+ })
+ .from(calendarEvent)
+ .innerJoin(project, eq(calendarEvent.projectId, project.id))
+ .where(
+ and(
+ inArray(calendarEvent.projectId, accessibleProjectIds),
+ or(
+ ilike(calendarEvent.name, searchPattern),
+ ilike(calendarEvent.description, searchPattern),
+ ),
+ ),
+ )
+ .limit(input.limit);
+
+ for (const e of eventResults) {
+ if (matchesProjectFilter(e.projectId)) {
+ results.push({
+ id: `event-${e.id}`,
+ title: e.name,
+ description: e.description || "",
+ type: "event",
+ status: "",
+ projectId: e.projectId,
+ projectName: e.projectName,
+ });
+ }
+ }
+ }
+
+ if (shouldSearchType("post")) {
+ const postResults = await ctx.db
+ .select({
+ id: post.id,
+ title: post.title,
+ content: post.content,
+ projectId: post.projectId,
+ projectName: project.name,
+ })
+ .from(post)
+ .innerJoin(project, eq(post.projectId, project.id))
+ .where(
+ and(
+ inArray(post.projectId, accessibleProjectIds),
+ eq(post.isDraft, false),
+ or(
+ ilike(post.title, searchPattern),
+ ilike(post.content, searchPattern),
+ ),
+ ),
+ )
+ .limit(input.limit);
+
+ for (const p of postResults) {
+ if (matchesProjectFilter(p.projectId)) {
+ results.push({
+ id: `post-${p.id}`,
+ title: p.title,
+ description: p.content || "",
+ type: "post",
+ status: "",
+ projectId: p.projectId,
+ projectName: p.projectName,
+ });
+ }
+ }
+ }
+
+ const limitedResults = results.slice(0, input.limit);
+
+ return limitedResults.map((row) => ({
+ id: row.id,
+ title: row.title,
+ description: row.description,
+ type: row.type,
+ status: row.status,
+ projectId: row.projectId,
+ projectName: row.projectName,
+ url: buildUrl(ctx.orgSlug, row),
+ score: 1,
+ createdAt: new Date(),
+ dueDate: undefined,
+ }));
+ }),
});
+
+function buildUrl(
+ orgSlug: string,
+ row: SearchResult,
+): string {
+ const projectId = row.projectId;
+ const entityId = row.id.split("-")[1];
+
+ switch (row.type) {
+ case "project":
+ return `/${orgSlug}/projects/${projectId}`;
+ case "task":
+ return `/${orgSlug}/projects/${projectId}/tasklists?task=${entityId}`;
+ case "tasklist":
+ return `/${orgSlug}/projects/${projectId}/tasklists/${entityId}`;
+ case "event":
+ return `/${orgSlug}/projects/${projectId}/events?event=${entityId}`;
+ case "post":
+ return `/${orgSlug}/projects/${projectId}/posts?post=${entityId}`;
+ default:
+ return `/${orgSlug}/projects/${projectId}`;
+ }
+}
diff --git a/trpc/routers/tasks.ts b/trpc/routers/tasks.ts
index 5f36496..6a2b976 100644
--- a/trpc/routers/tasks.ts
+++ b/trpc/routers/tasks.ts
@@ -5,11 +5,6 @@ import { task, taskList } from "@/drizzle/schema";
import { TaskListStatus, TaskStatus } from "@/drizzle/types";
import { logActivity } from "@/lib/activity";
import { canEditProject, canViewProject } from "@/lib/permissions";
-import {
- deleteSearchItem,
- indexTaskListWithProjectFetch,
- indexTaskWithDataFetch,
-} from "@/lib/search/helpers";
import { sendMentionNotifications } from "@/lib/utils/mentionNotifications";
import { notifyUser } from "@/lib/utils/useNotification";
import { createTRPCRouter, protectedProcedure } from "../init";
@@ -98,24 +93,15 @@ export const tasksRouter = createTRPCRouter({
newValue: createdTaskList[0],
});
- if (createdTaskList?.[0]) {
- await indexTaskListWithProjectFetch(
- ctx.db,
- ctx.search,
- createdTaskList[0],
- );
-
- // Send mention notifications if description was provided
- if (input.description) {
- await sendMentionNotifications(input.description, {
- type: "tasklist",
- entityName: input.name,
- entityId: createdTaskList[0].id,
- projectId: input.projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (createdTaskList?.[0] && input.description) {
+ await sendMentionNotifications(input.description, {
+ type: "tasklist",
+ entityName: input.name,
+ entityId: createdTaskList[0].id,
+ projectId: input.projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
return createdTaskList?.[0];
@@ -193,20 +179,15 @@ export const tasksRouter = createTRPCRouter({
newValue: data[0],
});
- if (data?.[0]) {
- await indexTaskListWithProjectFetch(ctx.db, ctx.search, data[0]);
-
- // Send mention notifications if description was updated
- if ("description" in input && input.description) {
- await sendMentionNotifications(input.description, {
- type: "tasklist",
- entityName: oldTaskList.name,
- entityId: input.id,
- projectId: oldTaskList.projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (data?.[0] && "description" in input && input.description) {
+ await sendMentionNotifications(input.description, {
+ type: "tasklist",
+ entityName: oldTaskList.name,
+ entityId: input.id,
+ projectId: oldTaskList.projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
}
@@ -243,9 +224,6 @@ export const tasksRouter = createTRPCRouter({
projectId: data[0].projectId,
oldValue: data[0],
});
-
- // Remove task list from search index
- await deleteSearchItem(ctx.search, `tasklist-${input.id}`, "task list");
}
return data?.[0];
@@ -347,20 +325,15 @@ export const tasksRouter = createTRPCRouter({
newValue: createdTask[0],
});
- if (createdTask?.[0]) {
- await indexTaskWithDataFetch(ctx.db, ctx.search, createdTask[0]);
-
- // Send mention notifications if description was provided
- if (input.description) {
- await sendMentionNotifications(input.description, {
- type: "task",
- entityName: input.name || "Untitled Task",
- entityId: createdTask[0].id,
- projectId: taskListDetails.projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (createdTask?.[0] && input.description) {
+ await sendMentionNotifications(input.description, {
+ type: "task",
+ entityName: input.name || "Untitled Task",
+ entityId: createdTask[0].id,
+ projectId: taskListDetails.projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
return createdTask?.[0];
@@ -468,20 +441,15 @@ export const tasksRouter = createTRPCRouter({
newValue: updatedTask[0],
});
- if (updatedTask?.[0]) {
- await indexTaskWithDataFetch(ctx.db, ctx.search, updatedTask[0]);
-
- // Send mention notifications if description was updated
- if ("description" in input && input.description) {
- await sendMentionNotifications(input.description, {
- type: "task",
- entityName: oldTask.name,
- entityId: input.id,
- projectId: oldTask.taskList.projectId,
- orgSlug: ctx.orgSlug,
- fromUserId: ctx.userId,
- });
- }
+ if (updatedTask?.[0] && "description" in input && input.description) {
+ await sendMentionNotifications(input.description, {
+ type: "task",
+ entityName: oldTask.name,
+ entityId: input.id,
+ projectId: oldTask.taskList.projectId,
+ orgSlug: ctx.orgSlug,
+ fromUserId: ctx.userId,
+ });
}
}
@@ -521,8 +489,6 @@ export const tasksRouter = createTRPCRouter({
projectId: currentTask.taskList.projectId,
oldValue: currentTask,
});
-
- await deleteSearchItem(ctx.search, `task-${input.id}`, "task");
}
return currentTask;