Effect: Port UpdateFolder (#1142)

* wip

* wip

* more wip

* wip

* fix error

* cleanup `"use server"`'s

* add policy for parent folder

* improve logic

* do it goodly

* drop em

* cleanup

* introduce more branded types

* drop it

* format

* use repo in most places

* remove organisation re-export

* cleanup + fix some policy problems

* fix folderspolicy too

* formatting

---------

Co-authored-by: Brendan Allan <brendonovich@outlook.com>

Author: oscartbeaumont

apps/web/actions/folders/updateFolder.ts

@@ -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/(org)/dashboard/caps/components/Folder.tsx

@@ -1,5 +1,6 @@
 import { getCurrentUser } from "@cap/database/auth/session";
 import { serverEnv } from "@cap/env";
+import { Spaces } from "@cap/web-backend";
 import { CurrentUser, type Folder } from "@cap/web-domain";
 import { Effect } from "effect";
 import { notFound } from "next/navigation";
@@ -16,7 +17,6 @@ import {
 	NewSubfolderButton,
 } from "../../../../folder/[id]/components";
 import FolderVideosSection from "../../../../folder/[id]/components/FolderVideosSection";
-import { getSpaceOrOrg } from "../../utils";
 
 const FolderPage = async (props: {
 	params: Promise<{ spaceId: string; folderId: Folder.FolderId }>;
@@ -26,7 +26,8 @@ const FolderPage = async (props: {
 	if (!user) return notFound();
 
 	return await Effect.gen(function* () {
-		const spaceOrOrg = yield* getSpaceOrOrg(params.spaceId);
+		const spaces = yield* Spaces;
+		const spaceOrOrg = yield* spaces.getSpaceOrOrg(params.spaceId);
 		if (!spaceOrOrg) notFound();
 
 		const [childFolders, breadcrumb, videosData] = yield* Effect.all([

apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx

@@ -12,14 +12,14 @@ import {
 	videoUploads,
 } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
+import { Spaces } from "@cap/web-backend";
 import { CurrentUser, Video } from "@cap/web-domain";
 import { and, count, desc, eq, isNull, sql } from "drizzle-orm";
 import { Effect } from "effect";
 import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 import { runPromise } from "@/lib/server";
 import { SharedCaps } from "./SharedCaps";
-import { getSpaceOrOrg } from "./utils";
 
 export const metadata: Metadata = {
 	title: "Shared Caps — Cap",
@@ -92,7 +92,9 @@ export default async function SharedCapsPage(props: {
 	const user = await getCurrentUser();
 	if (!user) notFound();
 
-	const spaceOrOrg = await getSpaceOrOrg(params.spaceId).pipe(
+	const spaceOrOrg = await Effect.flatMap(Spaces, (s) =>
+		s.getSpaceOrOrg(params.spaceId),
+	).pipe(
 		Effect.catchTag("PolicyDenied", () => Effect.sync(() => notFound())),
 		Effect.provideService(CurrentUser, user),
 		runPromise,

apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx

@@ -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/(org)/dashboard/spaces/[spaceId]/utils.ts

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

apps/web/app/Layout/devtoolsServer.ts

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

apps/web/app/embed/page.tsx

@@ -7,6 +7,7 @@ import {
 	HttpAuthMiddlewareLive,
 	OrganisationsPolicy,
 	S3Buckets,
+	Spaces,
 	SpacesPolicy,
 	Videos,
 	VideosPolicy,
@@ -47,6 +48,7 @@ export const Dependencies = Layer.mergeAll(
 	Folders.Default,
 	SpacesPolicy.Default,
 	OrganisationsPolicy.Default,
+	Spaces.Default,
 ).pipe(
 	Layer.provideMerge(
 		Layer.mergeAll(Database.Default, TracingLayer, FetchHttpClient.layer),

apps/web/app/s/page.tsx

@@ -1,47 +1,52 @@
-import * as Db from "@cap/database/schema";
 import { type Folder, Policy } from "@cap/web-domain";
-import * as Dz from "drizzle-orm";
 import { Effect } from "effect";
 
 import { Database } from "../Database.ts";
+import { OrganisationsPolicy } from "../Organisations/OrganisationsPolicy.ts";
+import { Spaces } from "../Spaces/index.ts";
+import { SpacesPolicy } from "../Spaces/SpacesPolicy.ts";
+import { FoldersRepo } from "./FoldersRepo.ts";
 
 export class FoldersPolicy extends Effect.Service<FoldersPolicy>()(
 	"FoldersPolicy",
 	{
 		effect: Effect.gen(function* () {
-			const db = yield* Database;
+			const repo = yield* FoldersRepo;
+			const spacesPolicy = yield* SpacesPolicy;
+			const orgsPolicy = yield* OrganisationsPolicy;
+			const spaces = yield* Spaces;
 
 			const canEdit = (id: Folder.FolderId) =>
 				Policy.policy((user) =>
 					Effect.gen(function* () {
-						const [folder] = yield* db.execute((db) =>
-							db.select().from(Db.folders).where(Dz.eq(Db.folders.id, id)),
+						const folder = yield* (yield* repo.getById(id)).pipe(
+							Effect.catchTag(
+								"NoSuchElementException",
+								() => new Policy.PolicyDeniedError(),
+							),
 						);
 
-						// All space members can edit space properties
-						if (!folder?.spaceId) {
-							return folder?.createdById === user.id;
-						}
-
-						const { spaceId } = folder;
-						const [spaceMember] = yield* db.execute((db) =>
-							db
-								.select()
-								.from(Db.spaceMembers)
-								.where(
-									Dz.and(
-										Dz.eq(Db.spaceMembers.userId, user.id),
-										Dz.eq(Db.spaceMembers.spaceId, spaceId),
-									),
-								),
-						);
+						if (folder.spaceId === null) return folder.createdById === user.id;
+
+						const spaceOrOrg = yield* spaces.getSpaceOrOrg(folder.spaceId);
+						if (!spaceOrOrg) return false;
+
+						if (spaceOrOrg.variant === "space")
+							yield* spacesPolicy.isMember(spaceOrOrg.space.id);
+						else yield* orgsPolicy.isOwner(spaceOrOrg.organization.id);
 
-						return spaceMember !== undefined;
+						return true;
 					}),
 				);
 
 			return { canEdit };
 		}),
-		dependencies: [Database.Default],
+		dependencies: [
+			FoldersRepo.Default,
+			Database.Default,
+			Spaces.Default,
+			SpacesPolicy.Default,
+			OrganisationsPolicy.Default,
+		],
 	},
 ) {}