From dcc90e14fbbe9cebf473298901ca4f241e6ea070 Mon Sep 17 00:00:00 2001 From: Apoorv Mishra Date: Thu, 14 Dec 2023 19:52:35 +0530 Subject: [PATCH] fix: if user is viewer at workspace level, they should have only read perm by default on a doc --- app/scenes/Document/components/InviteTeamMembers.tsx | 2 -- server/routes/api/documents/documents.ts | 2 +- server/routes/api/documents/schema.ts | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/scenes/Document/components/InviteTeamMembers.tsx b/app/scenes/Document/components/InviteTeamMembers.tsx index c7bb6e2b8a..08ddf69ea2 100644 --- a/app/scenes/Document/components/InviteTeamMembers.tsx +++ b/app/scenes/Document/components/InviteTeamMembers.tsx @@ -5,7 +5,6 @@ import * as React from "react"; import { toast } from "sonner"; import styled from "styled-components"; import { Pagination } from "@shared/constants"; -import { DocumentPermission } from "@shared/types"; import Document from "~/models/Document"; import User from "~/models/User"; import UserMembership from "~/models/UserMembership"; @@ -66,7 +65,6 @@ function InviteTeamMembers({ document }: Props) { userMemberships.create({ documentId: document.id, userId: user.id, - permission: DocumentPermission.ReadWrite, }), [userMemberships, document.id] ); diff --git a/server/routes/api/documents/documents.ts b/server/routes/api/documents/documents.ts index 556d981735..f29eb3bc99 100644 --- a/server/routes/api/documents/documents.ts +++ b/server/routes/api/documents/documents.ts @@ -1501,7 +1501,7 @@ router.post( }, { transaction } ); - } else { + } else if (permission) { membership.permission = permission; await membership.save({ transaction }); } diff --git a/server/routes/api/documents/schema.ts b/server/routes/api/documents/schema.ts index 9cebdf6b38..aabfd2382e 100644 --- a/server/routes/api/documents/schema.ts +++ b/server/routes/api/documents/schema.ts @@ -362,9 +362,7 @@ export const DocumentsAddUserSchema = BaseSchema.extend({ /** Id of the user who is to be added*/ userId: z.string().uuid(), /** Permission to be granted to the added user */ - permission: z - .nativeEnum(DocumentPermission) - .default(DocumentPermission.ReadWrite), + permission: z.nativeEnum(DocumentPermission).optional(), }), });