From c4cb6eeb94e0c6996f0471baac7bd442bf6318cf Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Wed, 28 May 2025 00:32:54 +0000 Subject: [PATCH] chore: minor updates --- .../document-signing-checkbox-field.tsx | 2 +- .../document-signing-dropdown-field.tsx | 2 +- .../document-signing-field-container.tsx | 2 +- .../document-signing-name-field.tsx | 2 +- .../document-signing-number-field.tsx | 2 +- .../document-signing-radio-field.tsx | 2 +- .../document-signing-signature-field.tsx | 2 +- .../document-signing-text-field.tsx | 2 +- .../server-only/document/update-document.ts | 17 ------------ .../document-global-auth-action-select.tsx | 26 ++++++++----------- 10 files changed, 19 insertions(+), 40 deletions(-) diff --git a/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx index 84e2bef31..dcd8edc1c 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx @@ -43,7 +43,7 @@ export const DocumentSigningCheckboxField = ({ const { recipient, isAssistantMode } = useDocumentSigningRecipientContext(); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const parsedFieldMeta = ZCheckboxFieldMeta.parse( field.fieldMeta ?? { diff --git a/apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx index edfc528c6..b2d5a4b0f 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx @@ -46,7 +46,7 @@ export const DocumentSigningDropdownField = ({ const { recipient, isAssistantMode } = useDocumentSigningRecipientContext(); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const parsedFieldMeta = ZDropdownFieldMeta.parse(field.fieldMeta); const isReadOnly = parsedFieldMeta?.readOnly; diff --git a/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx b/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx index 59c84393a..14fe95c44 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx @@ -62,7 +62,7 @@ export const DocumentSigningFieldContainer = ({ type, tooltipText, }: DocumentSigningFieldContainerProps) => { - const { executeActionAuthProcedure, isAuthRedirectRequired, isEnterprise } = + const { executeActionAuthProcedure, isAuthRedirectRequired } = useRequiredDocumentSigningAuthContext(); const parsedFieldMeta = field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined; diff --git a/apps/remix/app/components/general/document-signing/document-signing-name-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-name-field.tsx index 42ac1e220..7c0246c97 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-name-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-name-field.tsx @@ -48,7 +48,7 @@ export const DocumentSigningNameField = ({ const { recipient, isAssistantMode } = useDocumentSigningRecipientContext(); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } = trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION); diff --git a/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx index 19932fbdc..307225778 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx @@ -72,7 +72,7 @@ export const DocumentSigningNumberField = ({ const [errors, setErrors] = useState(initialErrors); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } = trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION); diff --git a/apps/remix/app/components/general/document-signing/document-signing-radio-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-radio-field.tsx index 6e19af13e..b518c7bb3 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-radio-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-radio-field.tsx @@ -50,7 +50,7 @@ export const DocumentSigningRadioField = ({ const [selectedOption, setSelectedOption] = useState(defaultValue); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } = trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION); diff --git a/apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx index 7eba0dcee..381658ab3 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx @@ -59,7 +59,7 @@ export const DocumentSigningSignatureField = ({ const { signature: providedSignature, setSignature: setProvidedSignature } = useRequiredDocumentSigningContext(); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } = trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION); diff --git a/apps/remix/app/components/general/document-signing/document-signing-text-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-text-field.tsx index a7eea896b..074628cc4 100644 --- a/apps/remix/app/components/general/document-signing/document-signing-text-field.tsx +++ b/apps/remix/app/components/general/document-signing/document-signing-text-field.tsx @@ -62,7 +62,7 @@ export const DocumentSigningTextField = ({ const [errors, setErrors] = useState(initialErrors); const userInputHasErrors = Object.values(errors).some((error) => error.length > 0); - const { executeActionAuthProcedure, isEnterprise } = useRequiredDocumentSigningAuthContext(); + const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext(); const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } = trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION); diff --git a/packages/lib/server-only/document/update-document.ts b/packages/lib/server-only/document/update-document.ts index cc817c520..0ac96ba04 100644 --- a/packages/lib/server-only/document/update-document.ts +++ b/packages/lib/server-only/document/update-document.ts @@ -114,7 +114,6 @@ export const updateDocument = async ({ } } - // If no data just return the document since this function is normally chained after a meta update. if (!data || Object.values(data).length === 0) { return document; } @@ -126,26 +125,11 @@ export const updateDocument = async ({ const documentGlobalAccessAuth = documentAuthOption?.globalAccessAuth ?? null; const documentGlobalActionAuth = documentAuthOption?.globalActionAuth ?? null; - // If the new global auth values aren't passed in, fallback to the current document values. const newGlobalAccessAuth = data?.globalAccessAuth === undefined ? documentGlobalAccessAuth : data.globalAccessAuth; const newGlobalActionAuth = data?.globalActionAuth === undefined ? documentGlobalActionAuth : data.globalActionAuth; - // Check if user has permission to set the global action auth. - // if (newGlobalActionAuth) { - // const isDocumentEnterprise = await isUserEnterprise({ - // userId, - // teamId, - // }); - - // if (!isDocumentEnterprise) { - // throw new AppError(AppErrorCode.UNAUTHORIZED, { - // message: 'You do not have permission to set the action auth', - // }); - // } - // } - const isTitleSame = data.title === undefined || data.title === document.title; const isExternalIdSame = data.externalId === undefined || data.externalId === document.externalId; const isGlobalAccessSame = @@ -233,7 +217,6 @@ export const updateDocument = async ({ ); } - // Early return if nothing is required. if (auditLogs.length === 0) { return document; } diff --git a/packages/ui/components/document/document-global-auth-action-select.tsx b/packages/ui/components/document/document-global-auth-action-select.tsx index 76f2d5580..2ede93cad 100644 --- a/packages/ui/components/document/document-global-auth-action-select.tsx +++ b/packages/ui/components/document/document-global-auth-action-select.tsx @@ -31,6 +31,12 @@ export const DocumentGlobalAuthActionSelect = forwardRef< >(({ isDocumentEnterprise, ...props }, ref) => { const { _ } = useLingui(); + const authTypes = isDocumentEnterprise + ? Object.values(DocumentActionAuth).filter((auth) => auth !== DocumentAuth.ACCOUNT) + : Object.values(NonEnterpriseDocumentActionAuth).filter( + (auth) => auth !== DocumentAuth.EXPLICIT_NONE, + ); + return ( );