feat: impl file delete

Co-authored-by: Ona <no-reply@ona.com>
2025-09-14 10:59:49 +00:00
parent eb9010cb20
commit eaa2a5cdb8
12 changed files with 259 additions and 69 deletions
--- a/bun.lock
+++ b/bun.lock
@@ -11,6 +11,7 @@
        "@radix-ui/react-separator": "^1.1.7",
        "@radix-ui/react-slot": "^1.2.3",
        "@radix-ui/react-tooltip": "^1.2.8",
+        "@tanstack/react-query": "^5.87.4",
        "@tanstack/react-router": "^1.131.41",
        "@tanstack/react-table": "^8.21.3",
        "@tanstack/router-devtools": "^1.131.42",
@@ -18,6 +19,7 @@
        "class-variance-authority": "^0.7.1",
        "clsx": "^2.1.1",
        "convex": "^1.27.0",
+        "jotai": "^2.14.0",
        "lucide-react": "^0.544.0",
        "next-themes": "^0.4.6",
        "react": "^19",
@@ -180,6 +182,10 @@

    "@tanstack/history": ["@tanstack/history@1.131.2", "", {}, "sha512-cs1WKawpXIe+vSTeiZUuSBy8JFjEuDgdMKZFRLKwQysKo8y2q6Q1HvS74Yw+m5IhOW1nTZooa6rlgdfXcgFAaw=="],

+    "@tanstack/query-core": ["@tanstack/query-core@5.87.4", "", {}, "sha512-uNsg6zMxraEPDVO2Bn+F3/ctHi+Zsk+MMpcN8h6P7ozqD088F6mFY5TfGM7zuyIrL7HKpDyu6QHfLWiDxh3cuw=="],
+
+    "@tanstack/react-query": ["@tanstack/react-query@5.87.4", "", { "dependencies": { "@tanstack/query-core": "5.87.4" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-T5GT/1ZaNsUXf5I3RhcYuT17I4CPlbZgyLxc/ZGv7ciS6esytlbjb3DgUFO6c8JWYMDpdjSWInyGZUErgzqhcA=="],
+
    "@tanstack/react-router": ["@tanstack/react-router@1.131.41", "", { "dependencies": { "@tanstack/history": "1.131.2", "@tanstack/react-store": "^0.7.0", "@tanstack/router-core": "1.131.41", "isbot": "^5.1.22", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" }, "peerDependencies": { "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-QEbTYpAosiD8e4qEZRr9aJipGSb8pQc+pfZwK6NCD2Tcxwu2oF6MVtwv0bIDLRpZP0VJMBpxXlTRISUDNMNqIA=="],

    "@tanstack/react-router-devtools": ["@tanstack/react-router-devtools@1.131.42", "", { "dependencies": { "@tanstack/router-devtools-core": "1.131.42" }, "peerDependencies": { "@tanstack/react-router": "^1.131.41", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0" } }, "sha512-7pymFB1CCimRHot2Zp0ZekQjd1iN812V88n9NLPSeiv9sVRtRVIaLphJjDeudx1NNgkfSJPx2lOhz6K38cuZog=="],
@@ -232,6 +238,8 @@

    "isbot": ["isbot@5.1.30", "", {}, "sha512-3wVJEonAns1OETX83uWsk5IAne2S5zfDcntD2hbtU23LelSqNXzXs9zKjMPOLMzroCgIjCfjYAEHrd2D6FOkiA=="],

+    "jotai": ["jotai@2.14.0", "", { "peerDependencies": { "@babel/core": ">=7.0.0", "@babel/template": ">=7.0.0", "@types/react": ">=17.0.0", "react": ">=17.0.0" }, "optionalPeers": ["@babel/core", "@babel/template", "@types/react", "react"] }, "sha512-JQkNkTnqjk1BlSUjHfXi+pGG/573bVN104gp6CymhrWDseZGDReTNniWrLhJ+zXbM6pH+82+UNJ2vwYQUkQMWQ=="],
+
    "jwt-decode": ["jwt-decode@4.0.0", "", {}, "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA=="],

    "lucide-react": ["lucide-react@0.544.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-t5tS44bqd825zAW45UQxpG2CvcC4urOwn2TrwSH8u+MjeE+1NnWl6QqeQ/6NdjMqdOygyiT9p3Ev0p1NJykxjw=="],
--- a/convex/_generated/api.d.ts
+++ b/convex/_generated/api.d.ts
@@ -15,6 +15,7 @@ import type {
 } from "convex/server";
 import type * as files from "../files.js";
 import type * as model_directories from "../model/directories.js";
+import type * as model_files from "../model/files.js";
 import type * as users from "../users.js";

 /**
@@ -28,6 +29,7 @@ import type * as users from "../users.js";
 declare const fullApi: ApiFromModules<{
  files: typeof files;
  "model/directories": typeof model_directories;
+  "model/files": typeof model_files;
  users: typeof users;
 }>;
 export declare const api: FilterApi<
--- a/convex/files.ts
+++ b/convex/files.ts
@@ -62,3 +62,15 @@ export const saveFile = mutation({
 		})
 	},
 })
+
+export const moveToTrash = mutation({
+	args: {
+		itemId: v.union(v.id("files"), v.id("directories")),
+	},
+	handler: async (ctx, { itemId }) => {
+		await ctx.db.patch(itemId, {
+			deletedAt: new Date().toISOString(),
+		})
+		return itemId
+	},
+})
--- a/convex/model/directories.ts
+++ b/convex/model/directories.ts
@@ -12,6 +12,7 @@ type File = {
 }

 export type DirectoryItem = Directory | File
+export type DirectoryItemKind = DirectoryItem["kind"]

 export async function fetchContent(
 	ctx: QueryCtx,
@@ -20,7 +21,9 @@ export async function fetchContent(
 	const [files, directories] = await Promise.all([
 		ctx.db
 			.query("files")
-			.withIndex("byDirectoryId", (q) => q.eq("directoryId", directoryId))
+			.withIndex("byDirectoryId", (q) =>
+				q.eq("directoryId", directoryId).eq("deletedAt", undefined),
+			)
 			.collect(),
 		ctx.db
 			.query("directories")
--- a/convex/model/files.ts
+++ b/convex/model/files.ts
@@ -0,0 +1,13 @@
+import { v } from "convex/values"
+import { mutation } from "../_generated/server"
+
+export const moveToTrash = mutation({
+	args: {
+		fileId: v.id("files"),
+	},
+	handler: async (ctx, { fileId }) => {
+		await ctx.db.patch(fileId, {
+			deletedAt: new Date().toISOString(),
+		})
+	},
+})
--- a/convex/schema.ts
+++ b/convex/schema.ts
@@ -16,7 +16,10 @@ const schema = defineSchema({
 		size: v.number(),
 		createdAt: v.string(),
 		updatedAt: v.string(),
-	}).index("byDirectoryId", ["directoryId"]),
+		deletedAt: v.optional(v.string()),
+	})
+		.index("byDirectoryId", ["directoryId", "deletedAt"])
+		.index("byDeletedAt", ["deletedAt"]),
 	directories: defineTable({
 		name: v.string(),
 		parentId: v.optional(v.id("directories")),
--- a/convex/users.ts
+++ b/convex/users.ts
@@ -4,7 +4,7 @@ import { query } from "./_generated/server"
 export const getCurrentUser = query({
 	handler: async (ctx) => {
 		return await ctx.db.get(
-			"j574n657f521n19v1stnr88ysd7qhbs1" as Id<"users">,
+			"jd7ampv4m200xr4yk2cfncccmh7qhj34" as Id<"users">,
 		)
 	},
 })
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
 		"@radix-ui/react-separator": "^1.1.7",
 		"@radix-ui/react-slot": "^1.2.3",
 		"@radix-ui/react-tooltip": "^1.2.8",
+		"@tanstack/react-query": "^5.87.4",
 		"@tanstack/react-router": "^1.131.41",
 		"@tanstack/react-table": "^8.21.3",
 		"@tanstack/router-devtools": "^1.131.42",
@@ -23,6 +24,7 @@
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"convex": "^1.27.0",
+		"jotai": "^2.14.0",
 		"lucide-react": "^0.544.0",
 		"next-themes": "^0.4.6",
 		"react": "^19",
--- a/src/components/ui/sonner.tsx
+++ b/src/components/ui/sonner.tsx
@@ -1,23 +1,24 @@
 import { useTheme } from "next-themes"
-import { Toaster as Sonner, ToasterProps } from "sonner"
+import { Toaster as Sonner, type ToasterProps } from "sonner"

 const Toaster = ({ ...props }: ToasterProps) => {
-  const { theme = "system" } = useTheme()
+	const { theme = "system" } = useTheme()

-  return (
-    <Sonner
-      theme={theme as ToasterProps["theme"]}
-      className="toaster group"
-      style={
-        {
-          "--normal-bg": "var(--popover)",
-          "--normal-text": "var(--popover-foreground)",
-          "--normal-border": "var(--border)",
-        } as React.CSSProperties
-      }
-      {...props}
-    />
-  )
+	return (
+		<Sonner
+			theme={theme as ToasterProps["theme"]}
+			className="toaster group"
+			style={
+				{
+					"--normal-bg": "var(--popover)",
+					"--normal-text": "var(--popover-foreground)",
+					"--normal-border": "var(--border)",
+				} as React.CSSProperties
+			}
+			position="top-center"
+			{...props}
+		/>
+	)
 }

 export { Toaster }
--- a/src/files/file-table.tsx
+++ b/src/files/file-table.tsx
@@ -1,9 +1,21 @@
 import { api } from "@convex/_generated/api"
-import type { DirectoryItem } from "@convex/model/directories"
-import type { ColumnDef, Row } from "@tanstack/react-table"
-import { useQuery } from "convex/react"
+import type { Id } from "@convex/_generated/dataModel"
+import type {
+	DirectoryItem,
+	DirectoryItemKind,
+} from "@convex/model/directories"
+import { useMutation } from "@tanstack/react-query"
+import {
+	type ColumnDef,
+	flexRender,
+	getCoreRowModel,
+	type Row,
+	useReactTable,
+} from "@tanstack/react-table"
+import { useMutation as useContextMutation, useQuery } from "convex/react"
+import { atom, useAtomValue, useSetAtom, useStore } from "jotai"
 import { TextCursorInputIcon, TrashIcon } from "lucide-react"
-import { useState } from "react"
+import { toast } from "sonner"
 import { DirectoryIcon } from "@/components/icons/directory-icon"
 import { Checkbox } from "@/components/ui/checkbox"
 import {
@@ -12,7 +24,14 @@ import {
 	ContextMenuItem,
 	ContextMenuTrigger,
 } from "@/components/ui/context-menu"
-import { DataTable } from "@/components/ui/data-table"
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table"

 function formatFileSize(bytes: number): string {
 	if (bytes === 0) return "0 B"
@@ -24,6 +43,16 @@ function formatFileSize(bytes: number): string {
 	return `${parseFloat((bytes / k ** i).toFixed(2))} ${sizes[i]}`
 }

+const contextMenuTargeItemAtom = atom<DirectoryItem | null>(null)
+const optimisticDeletedItemsAtom = atom(
+	new Set<Id<"files"> | Id<"directories">>(),
+)
+
+const itemBeingAddedAtom = atom<{
+	kind: DirectoryItemKind
+	name: string
+} | null>(null)
+
 const columns: ColumnDef<DirectoryItem>[] = [
 	{
 		id: "select",
@@ -89,14 +118,41 @@ const columns: ColumnDef<DirectoryItem>[] = [
 ]

 export function FileTable() {
-	const directory = useQuery(api.files.fetchDirectoryContent, {})
-	const [selectedItem, setSelectedItem] = useState<DirectoryItem | null>(null)
+	return (
+		<FileTableContextMenu>
+			<div className="w-full">
+				<FileTableContent />
+			</div>
+		</FileTableContextMenu>
+	)
+}

-	if (!directory) {
-		return null
-	}
+export function FileTableContextMenu({
+	children,
+}: {
+	children: React.ReactNode
+}) {
+	const store = useStore()
+	const setOptimisticDeletedItems = useSetAtom(optimisticDeletedItemsAtom)
+	const moveToTrash = useContextMutation(api.files.moveToTrash)
+	const moveToTrashMutation = useMutation({
+		mutationFn: (itemId: Id<"files"> | Id<"directories">) =>
+			moveToTrash({ itemId }),
+		onMutate: (itemId) => {
+			setOptimisticDeletedItems((prev) => new Set([...prev, itemId]))
+		},
+		onSuccess: (itemId) => {
+			setOptimisticDeletedItems((prev) => {
+				const newSet = new Set(prev)
+				newSet.delete(itemId)
+				return newSet
+			})
+			toast.success("Moved to trash")
+		},
+	})

 	const handleRename = () => {
+		const selectedItem = store.get(contextMenuTargeItemAtom)
 		if (selectedItem) {
 			console.log("Renaming:", selectedItem.doc.name)
 			// TODO: Implement rename functionality
@@ -104,27 +160,15 @@ export function FileTable() {
 	}

 	const handleDelete = () => {
+		const selectedItem = store.get(contextMenuTargeItemAtom)
 		if (selectedItem) {
-			console.log("Deleting:", selectedItem.doc.name)
-			// TODO: Implement delete functionality
+			moveToTrashMutation.mutate(selectedItem.doc._id)
 		}
 	}

-	const handleRowContextMenu = (row: Row<DirectoryItem>) => {
-		setSelectedItem(row.original)
-	}
-
 	return (
 		<ContextMenu>
-			<ContextMenuTrigger asChild>
-				<div className="w-full">
-					<DataTable
-						columns={columns}
-						data={directory}
-						onRowContextMenu={handleRowContextMenu}
-					/>
-				</div>
-			</ContextMenuTrigger>
+			<ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
 			<ContextMenuContent>
 				<ContextMenuItem onClick={handleRename}>
 					<TextCursorInputIcon />
@@ -139,6 +183,104 @@ export function FileTable() {
 	)
 }

+export function FileTableContent() {
+	const directory = useQuery(api.files.fetchDirectoryContent, {})
+	const optimisticDeletedItems = useAtomValue(optimisticDeletedItemsAtom)
+	const setContextMenuTargetItem = useSetAtom(contextMenuTargeItemAtom)
+
+	const handleRowContextMenu = (
+		row: Row<DirectoryItem>,
+		event: React.MouseEvent,
+	) => {
+		setContextMenuTargetItem(row.original)
+	}
+
+	const table = useReactTable({
+		data: directory || [],
+		columns,
+		getCoreRowModel: getCoreRowModel(),
+		enableRowSelection: true,
+		enableGlobalFilter: true,
+		globalFilterFn: (row, _columnId, _filterValue, _addMeta) => {
+			return !optimisticDeletedItems.has(row.original.doc._id)
+		},
+	})
+
+	if (!directory) {
+		return null
+	}
+
+	return (
+		<div className="overflow-hidden rounded-md border">
+			<Table>
+				<TableHeader>
+					{table.getHeaderGroups().map((headerGroup) => (
+						<TableRow key={headerGroup.id}>
+							{headerGroup.headers.map((header) => (
+								<TableHead key={header.id}>
+									{header.isPlaceholder
+										? null
+										: flexRender(
+												header.column.columnDef.header,
+												header.getContext(),
+											)}
+								</TableHead>
+							))}
+						</TableRow>
+					))}
+				</TableHeader>
+				<TableBody>
+					{table.getRowModel().rows?.length ? (
+						table.getRowModel().rows.map((row) => (
+							<TableRow
+								key={row.id}
+								data-state={row.getIsSelected() && "selected"}
+								onContextMenu={(e) => {
+									handleRowContextMenu(row, e)
+								}}
+							>
+								{row.getVisibleCells().map((cell) => (
+									<TableCell key={cell.id}>
+										{flexRender(
+											cell.column.columnDef.cell,
+											cell.getContext(),
+										)}
+									</TableCell>
+								))}
+							</TableRow>
+						))
+					) : (
+						<TableRow>
+							<TableCell
+								colSpan={columns.length}
+								className="text-center"
+							>
+								No results.
+							</TableCell>
+						</TableRow>
+					)}
+					<NewItemRow />
+				</TableBody>
+			</Table>
+		</div>
+	)
+}
+
+function NewItemRow() {
+	const itemBeingAdded = useAtomValue(itemBeingAddedAtom)
+	if (!itemBeingAdded) {
+		return null
+	}
+	return (
+		<TableRow>
+			<TableCell />
+			<TableCell>
+				<input type="text" value={itemBeingAdded.name} />
+			</TableCell>
+		</TableRow>
+	)
+}
+
 function FileNameCell({ initialName }: { initialName: string }) {
 	return <div>{initialName}</div>
 }
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -1,9 +1,10 @@
-import { createRootRoute, Outlet } from "@tanstack/react-router"
-import { TanStackRouterDevtools } from "@tanstack/router-devtools"
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"
 import { Toaster } from "@/components/ui/sonner"
 import DashboardSidebar from "@/dashboard/dashboard-sidebar"
 import "@/styles/globals.css"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import { Outlet, createRootRoute } from "@tanstack/react-router"
+import { TanStackRouterDevtools } from "@tanstack/router-devtools"
 import { ConvexProvider, ConvexReactClient } from "convex/react"

 export const Route = createRootRoute({
@@ -11,20 +12,23 @@ export const Route = createRootRoute({
 })

 const convexClient = new ConvexReactClient(process.env.BUN_PUBLIC_CONVEX_URL!)
+const queryClient = new QueryClient()

 function RootLayout() {
 	return (
-		<ConvexProvider client={convexClient}>
-			<SidebarProvider>
-				<div className="flex h-screen w-full">
-					<DashboardSidebar />
-					<SidebarInset>
-						<Outlet />
-					</SidebarInset>
-				</div>
-				<Toaster />
-				<TanStackRouterDevtools />
-			</SidebarProvider>
-		</ConvexProvider>
+		<QueryClientProvider client={queryClient}>
+			<ConvexProvider client={convexClient}>
+				<SidebarProvider>
+					<div className="flex h-screen w-full">
+						<DashboardSidebar />
+						<SidebarInset>
+							<Outlet />
+						</SidebarInset>
+					</div>
+					<Toaster />
+					<TanStackRouterDevtools />
+				</SidebarProvider>
+			</ConvexProvider>
+		</QueryClientProvider>
 	)
 }
--- a/src/routes/files.tsx
+++ b/src/routes/files.tsx
@@ -1,14 +1,3 @@
-import { api } from "@convex/_generated/api"
-import { createFileRoute } from "@tanstack/react-router"
-import { useMutation, useQuery } from "convex/react"
-import {
-	ChevronDownIcon,
-	Loader2Icon,
-	PlusIcon,
-	UploadCloudIcon,
-} from "lucide-react"
-import { type ChangeEvent, useRef, useState } from "react"
-import { toast } from "sonner"
 import { DirectoryIcon } from "@/components/icons/directory-icon"
 import { TextFileIcon } from "@/components/icons/text-file-icon"
 import {
@@ -26,6 +15,17 @@ import {
 } from "@/components/ui/dropdown-menu"
 import { SidebarTrigger } from "@/components/ui/sidebar"
 import { FileTable } from "@/files/file-table"
+import { api } from "@convex/_generated/api"
+import { createFileRoute } from "@tanstack/react-router"
+import { useMutation, useQuery } from "convex/react"
+import {
+	ChevronDownIcon,
+	Loader2Icon,
+	PlusIcon,
+	UploadCloudIcon,
+} from "lucide-react"
+import { useRef, useState, type ChangeEvent } from "react"
+import { toast } from "sonner"

 export const Route = createFileRoute("/files")({
 	component: FilesPage,