From 5091112e4b26e71f00527dd7a15ebd54c7027a2c Mon Sep 17 00:00:00 2001 From: Mythie Date: Wed, 18 Sep 2024 10:27:13 +1000 Subject: [PATCH] fix: dont nullify externalId if not passed to update document settings --- packages/api/v1/implementation.ts | 4 +++- .../document/update-document-settings.ts | 15 +++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts index 48ee381d5..914138028 100644 --- a/packages/api/v1/implementation.ts +++ b/packages/api/v1/implementation.ts @@ -302,7 +302,9 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, { documentId: document.id, userId: user.id, teamId: team?.id, - data: body.authOptions, + data: { + ...body.authOptions, + }, requestMetadata: extractNextApiRequestMetadata(args.req), }); } diff --git a/packages/lib/server-only/document/update-document-settings.ts b/packages/lib/server-only/document/update-document-settings.ts index 5c36f5c5e..ebf663a60 100644 --- a/packages/lib/server-only/document/update-document-settings.ts +++ b/packages/lib/server-only/document/update-document-settings.ts @@ -93,11 +93,14 @@ export const updateDocumentSettings = async ({ } } - const isTitleSame = data.title === document.title; - const isExternalIdSame = data.externalId === document.externalId; - const isGlobalAccessSame = documentGlobalAccessAuth === newGlobalAccessAuth; - const isGlobalActionSame = documentGlobalActionAuth === newGlobalActionAuth; - const isDocumentVisibilitySame = data.visibility === document.visibility; + const isTitleSame = data.title === undefined || data.title === document.title; + const isExternalIdSame = data.externalId === undefined || data.externalId === document.externalId; + const isGlobalAccessSame = + documentGlobalAccessAuth === undefined || documentGlobalAccessAuth === newGlobalAccessAuth; + const isGlobalActionSame = + documentGlobalActionAuth === undefined || documentGlobalActionAuth === newGlobalActionAuth; + const isDocumentVisibilitySame = + data.visibility === undefined || data.visibility === document.visibility; const auditLogs: CreateDocumentAuditLogDataResponse[] = []; @@ -200,7 +203,7 @@ export const updateDocumentSettings = async ({ }, data: { title: data.title, - externalId: data.externalId || null, + externalId: data.externalId, visibility: data.visibility as DocumentVisibility, authOptions, },