ts

Author: ameer2468

apps/web/actions/folders/moveVideoToFolder.ts

@@ -18,7 +18,7 @@ export async function moveVideoToFolder({
 }: {
 	videoId: Video.VideoId;
 	folderId: Folder.FolderId | null;
-	spaceId: Space.SpaceIdOrOrganisationId | null;
+	spaceId?: Space.SpaceIdOrOrganisationId | null;
 }) {
 	const user = await getCurrentUser();
 	if (!user || !user.activeOrganizationId)

apps/web/actions/spaces/remove-videos.ts

@@ -56,7 +56,13 @@ export async function removeVideosFromSpace(
 			const folderRows = await db()
 				.select({ id: folders.id })
 				.from(folders)
-				.where(isNull(folders.spaceId));
+				.where(
+					and(
+						isNull(folders.spaceId),
+						eq(folders.organizationId, user.activeOrganizationId),
+					),
+				);
+
 			const folderIds = folderRows.map((f) => f.id);
 
 			if (folderIds.length > 0) {
@@ -85,7 +91,13 @@ export async function removeVideosFromSpace(
 			const folderRows = await db()
 				.select({ id: folders.id })
 				.from(folders)
-				.where(eq(folders.spaceId, spaceId));
+				.where(
+					and(
+						isNull(folders.spaceId),
+						eq(folders.organizationId, user.activeOrganizationId),
+					),
+				);
+
 			const folderIds = folderRows.map((f) => f.id);
 
 			if (folderIds.length > 0) {

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

@@ -21,7 +21,7 @@ export type FolderDataType = {
 	id: Folder.FolderId;
 	color: "normal" | "blue" | "red" | "yellow";
 	videoCount: number;
-	spaceId: Space.SpaceIdOrOrganisationId;
+	spaceId?: Space.SpaceIdOrOrganisationId | null;
 	parentId: Folder.FolderId | null;
 };
 

apps/web/app/(org)/dashboard/folder/[id]/components/ClientMyCapsLink.tsx

@@ -15,7 +15,7 @@ import { registerDropTarget } from "./ClientCapCard";
 export function ClientMyCapsLink({
 	spaceId,
 }: {
-	spaceId: Space.SpaceIdOrOrganisationId;
+	spaceId?: Space.SpaceIdOrOrganisationId;
 }) {
 	const [isDragOver, setIsDragOver] = useState(false);
 	const [isMovingVideo, setIsMovingVideo] = useState(false);
@@ -94,11 +94,11 @@ export function ClientMyCapsLink({
 			await moveVideoToFolder({
 				videoId: capData.id,
 				folderId: null,
-				spaceId,
+				spaceId: spaceId ?? null,
 			});
 			router.refresh();
-			if (spaceId) {
-				toast.success(`Moved "${capData.name}" to "${spaceId}"`);
+			if (activeSpace) {
+				toast.success(`Moved "${capData.name}" to "${activeSpace.name}"`);
 			} else {
 				toast.success(`Moved "${capData.name}" to My Caps`);
 			}

apps/web/app/(org)/dashboard/folder/[id]/page.tsx

@@ -43,7 +43,7 @@ const FolderPage = async ({
 				</div>
 				<div className="flex justify-between items-center mb-6 w-full">
 					<div className="flex overflow-x-auto items-center font-medium">
-						<ClientMyCapsLink spaceId={params.spaceId} />
+						<ClientMyCapsLink />
 
 						{breadcrumb.map((folder, index) => (
 							<div key={folder.id} className="flex items-center">
@@ -72,7 +72,6 @@ const FolderPage = async ({
 									key={folder.id}
 									name={folder.name}
 									color={folder.color}
-									spaceId={params.spaceId}
 									id={folder.id}
 									parentId={folder.parentId}
 									videoCount={folder.videoCount}