Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(web): keep folder parents in the same space
Aditya Garud217d241cf7f9
diff --git a/apps/web/__tests__/unit/folder-parent-location.test.ts b/apps/web/__tests__/unit/folder-parent-location.test.tsnew file mode 100644index 000000000..a1c579d9f--- /dev/null+++ b/apps/web/__tests__/unit/folder-parent-location.test.ts@@ -0,0 +1,124 @@+import {+ CurrentUser,+ Folder,+ Organisation,+ Space,+ User,+} from "@cap/web-domain";+import { Effect, Option } from "effect";+import { describe, expect, it, vi } from "vitest";+import { Database } from "../../../../packages/web-backend/src/Database";+import { Folders } from "../../../../packages/web-backend/src/Folders";+import { FoldersPolicy } from "../../../../packages/web-backend/src/Folders/FoldersPolicy";+import { FoldersRepo } from "../../../../packages/web-backend/src/Folders/FoldersRepo";++const organizationId = Organisation.OrganisationId.make("org-1");+const userId = User.UserId.make("user-1");+const parentId = Folder.FolderId.make("parent");+const childId = Folder.FolderId.make("child");+const parentSpaceId = Space.SpaceId.make("space-a");+const childSpaceId = Space.SpaceId.make("space-b");++const parent = {+ id: parentId,+ name: "Parent",+ color: "normal" as const,+ public: false,+ organizationId,+ createdById: userId,+ spaceId: parentSpaceId,+ parentId: null,+};++function makeFixture() {+ const create = vi.fn(() => Effect.succeed(childId));+ const repo = FoldersRepo.make({+ getById: (id) =>+ Effect.succeed(+ Option.some(+ id === parentId+ ? parent+ : { ...parent, id: childId, spaceId: childSpaceId },+ ),+ ),+ create,+ delete: () => Effect.void,+ update: () => Effect.succeed(Option.none()),+ });+ const policy = FoldersPolicy.make({+ canCreateIn: () => Effect.void,+ canEdit: () => Effect.void,+ });+ const database = Database.make({+ use: () => Effect.die("Unexpected database write"),+ });+ const run = <A, E>(+ operation: (folders: Folders) => Effect.Effect<A, E, CurrentUser>,+ ) =>+ Effect.runPromise(+ Effect.flatMap(Folders, operation).pipe(+ Effect.provide(Folders.DefaultWithoutDependencies),+ Effect.provideService(FoldersRepo, repo),+ Effect.provideService(FoldersPolicy, policy),+ Effect.provideService(Database, database),+ Effect.provideService(CurrentUser, {+ id: userId,+ email: "[email protected]",+ activeOrganizationId: organizationId,+ iconUrlOrKey: Option.none(),+ }),+ ),+ );+ return { create, run };+}++describe("folder parent location", () => {+ it("rejects a new child in a different space", async () => {+ const fixture = makeFixture();+ const result = await fixture.run((folders) =>+ Effect.either(+ folders.create({+ name: "Child",+ color: "normal",+ spaceId: Option.some(childSpaceId),+ parentId: Option.some(parentId),+ }),+ ),+ );++ expect(result).toMatchObject({+ _tag: "Left",+ left: { _tag: "FolderNotFoundError" },+ });+ expect(fixture.create).not.toHaveBeenCalled();+ });++ it("allows a new child in its parent's space", async () => {+ const fixture = makeFixture();+ const result = await fixture.run((folders) =>+ folders.create({+ name: "Child",+ color: "normal",+ spaceId: Option.some(parentSpaceId),+ parentId: Option.some(parentId),+ }),+ );++ expect(result).toBeUndefined();+ expect(fixture.create).toHaveBeenCalledOnce();+ });++ it("rejects moving a child under a parent in a different space", async () => {+ const fixture = makeFixture();+ const result = await fixture.run((folders) =>+ Effect.either(+ folders.update({ id: childId, parentId: Option.some(parentId) }),+ ),+ );++ expect(result).toMatchObject({+ _tag: "Left",+ left: { _tag: "ParentNotFoundError" },+ });+ });+});diff --git a/packages/web-backend/src/Folders/index.ts b/packages/web-backend/src/Folders/index.tsindex 941e72992..7ef990959 100644--- a/packages/web-backend/src/Folders/index.ts+++ b/packages/web-backend/src/Folders/index.ts@@ -120,7 +120,7 @@ export class Folders extends Effect.Service<Folders>()("Folders", {if (Option.isSome(data.parentId)) {const parentId = data.parentId.value;- yield* repo+ const parent = yield* repo.getById(parentId, {organizationId: Organisation.OrganisationId.make(user.activeOrganizationId,@@ -134,6 +134,8 @@ export class Folders extends Effect.Service<Folders>()("Folders", {),),);+ if (parent.spaceId !== Option.getOrNull(data.spaceId))+ return yield* new Folder.NotFoundError();}yield* repo.create({@@ -215,6 +217,8 @@ export class Folders extends Effect.Service<Folders>()("Folders", {),),);+ if (parentFolder.spaceId !== folder.spaceId)+ return yield* new Folder.ParentNotFoundError();// Check for circular references in the folder hierarchylet currentParentId = parentFolder.parentId;