Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-13 08:13:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: move permission check outside the document visibility component (#1543)

Browse Source 
PR created because of this comment
https://github.com/documenso/documenso/pull/1521#discussion_r1881895305.
This commit is contained in:
Catalin Pit
2024-12-17 08:03:08 +02:00
committed by GitHub
parent 2245812f0b
commit 82deab41f4
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/ui/components/document/document-visibility-select.tsx
View File

@ -3,7 +3,6 @@ import React, { forwardRef } from 'react';
import { TeamMemberRole } from '@prisma/client'; import { TeamMemberRole } from '@prisma/client';
import type { SelectProps } from '@radix-ui/react-select'; import type { SelectProps } from '@radix-ui/react-select';
import { InfoIcon } from 'lucide-react'; import { InfoIcon } from 'lucide-react';
import { match } from 'ts-pattern';
import { DOCUMENT_VISIBILITY } from '@documenso/lib/constants/document-visibility'; import { DOCUMENT_VISIBILITY } from '@documenso/lib/constants/document-visibility';
import { DocumentVisibility } from '@documenso/lib/types/document-visibility'; import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
@ -17,26 +16,19 @@ import {
import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip'; import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
export type DocumentVisibilitySelectType = SelectProps & { export type DocumentVisibilitySelectType = SelectProps & {
currentMemberRole?: string; currentTeamMemberRole?: string;
isTeamSettings?: boolean; isTeamSettings?: boolean;
disabled?: boolean; disabled?: boolean;
visibility?: string; canUpdateVisibility?: boolean;
}; };
export const DocumentVisibilitySelect = forwardRef<HTMLButtonElement, DocumentVisibilitySelectType>( export const DocumentVisibilitySelect = forwardRef<HTMLButtonElement, DocumentVisibilitySelectType>(
({ currentMemberRole, isTeamSettings = false, disabled, visibility, ...props }, ref) => { (
const canUpdateVisibility = match(currentMemberRole) { currentTeamMemberRole, isTeamSettings = false, disabled, canUpdateVisibility, ...props },
.with(TeamMemberRole.ADMIN, () => true) ref,
.with( ) => {
TeamMemberRole.MANAGER, const isAdmin = currentTeamMemberRole === TeamMemberRole.ADMIN;
() => const isManager = currentTeamMemberRole === TeamMemberRole.MANAGER;
visibility === DocumentVisibility.EVERYONE ||
visibility === DocumentVisibility.MANAGER_AND_ABOVE,
)
.otherwise(() => false);
const isAdmin = currentMemberRole === TeamMemberRole.ADMIN;
const isManager = currentMemberRole === TeamMemberRole.MANAGER;
const canEdit = isTeamSettings || canUpdateVisibility; const canEdit = isTeamSettings || canUpdateVisibility;
return ( return (
@ -51,7 +43,7 @@ export const DocumentVisibilitySelect = forwardRef<HTMLButtonElement, DocumentVi
</SelectItem> </SelectItem>
<SelectItem <SelectItem
value={DocumentVisibility.MANAGER_AND_ABOVE} value={DocumentVisibility.MANAGER_AND_ABOVE}
disabled={!isAdmin && (!isManager || visibility === DocumentVisibility.ADMIN)} disabled={!isAdmin && !isManager}
> >
{DOCUMENT_VISIBILITY.MANAGER_AND_ABOVE.value} {DOCUMENT_VISIBILITY.MANAGER_AND_ABOVE.value}
</SelectItem> </SelectItem>

17
packages/ui/primitives/document-flow/add-settings.tsx
View File

@ -6,12 +6,13 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { Trans } from '@lingui/macro'; import { Trans } from '@lingui/macro';
import { InfoIcon } from 'lucide-react'; import { InfoIcon } from 'lucide-react';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { match } from 'ts-pattern';
import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats'; import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n'; import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones'; import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth'; import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
import type { TeamMemberRole } from '@documenso/prisma/client'; import { DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
import { DocumentStatus, type Field, type Recipient, SendStatus } from '@documenso/prisma/client'; import { DocumentStatus, type Field, type Recipient, SendStatus } from '@documenso/prisma/client';
import type { DocumentWithData } from '@documenso/prisma/types/document-with-data'; import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
import { import {
@ -110,6 +111,16 @@ export const AddSettingsFormPartial = ({
(recipient) => recipient.sendStatus === SendStatus.SENT, (recipient) => recipient.sendStatus === SendStatus.SENT,
); );
const canUpdateVisibility = match(currentTeamMemberRole)
.with(TeamMemberRole.ADMIN, () => true)
.with(
TeamMemberRole.MANAGER,
() =>
document.visibility === DocumentVisibility.EVERYONE ||
document.visibility === DocumentVisibility.MANAGER_AND_ABOVE,
)
.otherwise(() => false);
// We almost always want to set the timezone to the user's local timezone to avoid confusion // We almost always want to set the timezone to the user's local timezone to avoid confusion
// when the document is signed. // when the document is signed.
useEffect(() => { useEffect(() => {
@ -237,8 +248,8 @@ export const AddSettingsFormPartial = ({
<FormControl> <FormControl>
<DocumentVisibilitySelect <DocumentVisibilitySelect
currentMemberRole={currentTeamMemberRole} canUpdateVisibility={canUpdateVisibility}
visibility={document.visibility} currentTeamMemberRole={currentTeamMemberRole}
{...field} {...field}
onValueChange={field.onChange} onValueChange={field.onChange}
/> />