Effect: Port UpdateFolder

apps/web/app/(org)/dashboard/caps/components/Folder.tsx

@@ -9,7 +9,6 @@ import { useRouter } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 import { moveVideoToFolder } from "@/actions/folders/moveVideoToFolder";
-import { updateFolder } from "@/actions/folders/updateFolder";
 import { useEffectMutation } from "@/lib/EffectRuntime";
 import { withRpc } from "@/lib/Rpcs";
 import { ConfirmationDialog } from "../../_components/ConfirmationDialog";
@@ -83,6 +82,17 @@ const FolderCard = ({
 		},
 	});
 
+	const updateFolder = useEffectMutation({
+		mutationFn: (data: Folder.FolderUpdate) =>
+			withRpc((r) => r.FolderUpdate(data)),
+		onSuccess: () => {
+			toast.success("Folder name updated successfully");
+			router.refresh();
+		},
+		onError: () => toast.error("Failed to update folder name"),
+		onSettled: () => setIsRenaming(false),
+	});
+
 	useEffect(() => {
 		if (isRenaming && nameRef.current) {
 			nameRef.current.focus();
@@ -176,17 +186,6 @@ const FolderCard = ({
 		};
 	}, [id, name, rive, isDragOver]);
 
-	const updateFolderNameHandler = async () => {
-		try {
-			await updateFolder({ folderId: id, name: updateName });
-			toast.success("Folder name updated successfully");
-		} catch (error) {
-			toast.error("Failed to update folder name");
-		} finally {
-			setIsRenaming(false);
-		}
-	};
-
 	const handleDragOver = (e: React.DragEvent<HTMLDivElement>) => {
 		e.preventDefault();
 		e.stopPropagation();
@@ -342,18 +341,22 @@ const FolderCard = ({
 								rows={1}
 								value={updateName}
 								onChange={(e) => setUpdateName(e.target.value)}
-								onBlur={async () => {
+								onBlur={() => {
 									setIsRenaming(false);
-									if (updateName.trim() !== name) {
-										await updateFolderNameHandler();
-									}
+									if (updateName.trim() !== name)
+										updateFolder.mutate({
+											id,
+											name: updateName.trim(),
+										});
 								}}
-								onKeyDown={async (e) => {
+								onKeyDown={(e) => {
 									if (e.key === "Enter") {
 										setIsRenaming(false);
-										if (updateName.trim() !== name) {
-											await updateFolderNameHandler();
-										}
+										if (updateName.trim() !== name)
+											updateFolder.mutate({
+												id,
+												name: updateName.trim(),
+											});
 									}
 								}}
 								className="w-full resize-none bg-transparent border-none focus:outline-none

apps/web/app/Layout/devtoolsServer.ts

@@ -6,8 +6,6 @@ import { users } from "@cap/database/schema";
 import { eq } from "drizzle-orm";
 
 export async function promoteToPro() {
-	"use server";
-
 	if (process.env.NODE_ENV !== "development")
 		throw new Error("promoteToPro can only be used in development");
 
@@ -24,8 +22,6 @@ export async function promoteToPro() {
 }
 
 export async function demoteFromPro() {
-	"use server";
-
 	if (process.env.NODE_ENV !== "development")
 		throw new Error("demoteFromPro can only be used in development");
 

apps/web/app/embed/page.tsx

@@ -1,4 +1,3 @@
-"use server";
 import { redirect } from "next/navigation";
 
 export default async function EmbedPage() {

apps/web/app/s/page.tsx

@@ -1,5 +1,3 @@
-"use server";
-
 import { redirect } from "next/navigation";
 
 export default async function SharePage() {

packages/web-backend/src/Folders/FoldersRepo.ts

@@ -0,0 +1,78 @@
+import { nanoId } from "@cap/database/helpers";
+import * as Db from "@cap/database/schema";
+import { Folder, type Organisation, type User } from "@cap/web-domain";
+import * as Dz from "drizzle-orm";
+import { Effect, Option } from "effect";
+import type { Schema } from "effect/Schema";
+import { Database } from "../Database.ts";
+
+export type CreateFolderInput = Omit<
+	Schema.Type<typeof Folder.Folder>,
+	"id" | "createdAt" | "updatedAt"
+> & {
+	organizationId: Organisation.OrganisationId;
+	createdById: User.UserId;
+};
+
+export class FoldersRepo extends Effect.Service<FoldersRepo>()("FoldersRepo", {
+	effect: Effect.gen(function* () {
+		const db = yield* Database;
+
+		/**
+		 * Gets a `Folder` by its ID.
+		 */
+		const getById = (id: Folder.FolderId) =>
+			Effect.gen(function* () {
+				const [folder] = yield* db.execute((db) =>
+					db.select().from(Db.folders).where(Dz.eq(Db.folders.id, id)),
+				);
+
+				return Option.fromNullable(folder);
+			});
+
+		const delete_ = (id: Folder.FolderId) =>
+			db.execute((db) => db.delete(Db.folders).where(Dz.eq(Db.folders.id, id)));
+
+		const create = (data: CreateFolderInput) =>
+			Effect.gen(function* () {
+				const id = Folder.FolderId.make(nanoId());
+
+				yield* db.execute((db) =>
+					db.insert(Db.folders).values([
+						{
+							...data,
+							id,
+							parentId: Option.getOrNull(data.parentId ?? Option.none()),
+							spaceId: Option.getOrNull(data.spaceId ?? Option.none()),
+						},
+					]),
+				);
+
+				return id;
+			});
+
+		const update = (id: Folder.FolderId, data: Partial<CreateFolderInput>) =>
+			Effect.gen(function* () {
+				yield* db.execute((db) =>
+					db
+						.update(Db.folders)
+						.set({
+							...data,
+							parentId: data.parentId
+								? Option.getOrNull(data.parentId)
+								: undefined,
+							spaceId: data.spaceId
+								? Option.getOrNull(data.spaceId)
+								: undefined,
+							updatedAt: new Date(),
+						})
+						.where(Dz.eq(Db.folders.id, id)),
+				);
+
+				return yield* getById(id);
+			});
+
+		return { getById, delete: delete_, create, update };
+	}),
+	dependencies: [Database.Default],
+}) {}

packages/web-backend/src/Folders/FoldersRpcs.ts

@@ -17,6 +17,7 @@ export const FolderRpcsLive = Folder.FolderRpcs.toLayer(
 							() => new InternalError({ type: "database" }),
 						),
 					),
+
 			FolderCreate: (data) =>
 				folders
 					.create(data)
@@ -26,6 +27,16 @@ export const FolderRpcsLive = Folder.FolderRpcs.toLayer(
 							() => new InternalError({ type: "database" }),
 						),
 					),
+
+			FolderUpdate: (data) =>
+				folders
+					.update(data.id, data)
+					.pipe(
+						Effect.catchTag(
+							"DatabaseError",
+							() => new InternalError({ type: "database" }),
+						),
+					),
 		};
 	}),
 );

packages/web-backend/src/Folders/index.ts

@@ -1,8 +1,15 @@
 import { nanoId } from "@cap/database/helpers";
 import * as Db from "@cap/database/schema";
-import { CurrentUser, Folder, Policy } from "@cap/web-domain";
+import {
+	CurrentUser,
+	Folder,
+	Organisation,
+	Policy,
+	User,
+} from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
 import { Effect, Option } from "effect";
+import { revalidatePath } from "next/cache";
 import { Database, type DatabaseError } from "../Database.ts";
 import { FoldersPolicy } from "./FoldersPolicy.ts";
 
@@ -105,8 +112,15 @@ export class Folders extends Effect.Service<Folders>()("Folders", {
 					}),
 				);
 
-				return new Folder.Folder(folder);
+				return new Folder.Folder({
+					...folder,
+					organizationId: Organisation.OrganisationId.make(
+						user.activeOrganizationId,
+					),
+					createdById: User.UserId.make(user.id),
+				});
 			}),
+
 			/**
 			 * Deletes a folder and all its subfolders. Videos inside the folders will be
 			 * relocated to the root of the collection (space or My Caps) they're in
@@ -122,6 +136,79 @@ export class Folders extends Effect.Service<Folders>()("Folders", {
 
 				yield* deleteFolder(folder);
 			}),
+
+			update: Effect.fn("Folders.update")(function* (
+				folderId: Folder.FolderId,
+				data: Folder.FolderUpdate,
+			) {
+				const [folder] = yield* db
+					.execute((db) =>
+						db.select().from(Db.folders).where(Dz.eq(Db.folders.id, folderId)),
+					)
+					.pipe(Policy.withPolicy(policy.canEdit(folderId)));
+				if (!folder) return yield* new Folder.NotFoundError();
+
+				// If parentId is provided and not null, verify it exists and belongs to the same organization
+				if (!data.parentId) return;
+				const parentId = data.parentId;
+
+				// Check that we're not creating an immediate circular reference
+				if (parentId === folderId)
+					return yield* new Folder.RecursiveDefinitionError();
+
+				const [parentFolder] = yield* db
+					.execute((db) =>
+						db
+							.select()
+							.from(Db.folders)
+							.where(
+								Dz.and(
+									Dz.eq(Db.folders.id, parentId),
+									Dz.eq(Db.folders.organizationId, folder.organizationId),
+								),
+							),
+					)
+					.pipe(Policy.withPolicy(policy.canEdit(parentId)));
+				if (!parentFolder) return yield* new Folder.ParentNotFoundError();
+
+				// Check for circular references in the folder hierarchy
+				let currentParentId = parentFolder.parentId;
+				while (currentParentId) {
+					if (currentParentId === folderId)
+						return yield* new Folder.RecursiveDefinitionError();
+
+					const parentId = currentParentId;
+					const [nextParent] = yield* db.execute((db) =>
+						db
+							.select()
+							.from(Db.folders)
+							.where(
+								Dz.and(
+									Dz.eq(Db.folders.id, parentId),
+									// This should be implied but extra tenant isolation can't hurt
+									Dz.eq(Db.folders.organizationId, folder.organizationId),
+								),
+							),
+					);
+
+					if (!nextParent) break;
+					currentParentId = nextParent.parentId;
+				}
+
+				yield* db.execute((db) =>
+					db
+						.update(Db.folders)
+						.set({
+							...(data.name ? { name: data.name } : {}),
+							...(data.color ? { color: data.color } : {}),
+							...(data.parentId ? { parentId: data.parentId } : {}),
+						})
+						.where(Dz.eq(Db.folders.id, folderId)),
+				);
+
+				revalidatePath(`/dashboard/caps`);
+				revalidatePath(`/dashboard/folder/${folderId}`);
+			}),
 		};
 	}),
 	dependencies: [FoldersPolicy.Default, Database.Default],