diff --git a/apps/server/src/collaboration/collaboration.handler.ts b/apps/server/src/collaboration/collaboration.handler.ts index 37842a03..87dc5010 100644 --- a/apps/server/src/collaboration/collaboration.handler.ts +++ b/apps/server/src/collaboration/collaboration.handler.ts @@ -31,11 +31,11 @@ export class CollaborationHandler { documentName: string, payload: { prosemirrorJson: any; - contentOperation: string; + operation: string; user: User; }, ) => { - const { prosemirrorJson, contentOperation, user } = payload; + const { prosemirrorJson, operation, user } = payload; this.logger.debug('Updating page content via yjs', documentName); await this.withYdocConnection( hocuspocus, @@ -44,7 +44,7 @@ export class CollaborationHandler { (doc) => { const fragment = doc.getXmlFragment('default'); - if (contentOperation === 'replace') { + if (operation === 'replace') { if (fragment.length > 0) { fragment.delete(0, fragment.length); } @@ -59,7 +59,7 @@ export class CollaborationHandler { const newContent = prosemirrorJson.content || []; const yElements = newContent.map(prosemirrorNodeToYElement); const position = - contentOperation === 'prepend' ? 0 : fragment.length; + operation === 'prepend' ? 0 : fragment.length; fragment.insert(position, yElements); } }, diff --git a/apps/server/src/core/page/dto/update-page.dto.ts b/apps/server/src/core/page/dto/update-page.dto.ts index f79c55aa..026b3076 100644 --- a/apps/server/src/core/page/dto/update-page.dto.ts +++ b/apps/server/src/core/page/dto/update-page.dto.ts @@ -15,7 +15,7 @@ export class UpdatePageDto extends PartialType(CreatePageDto) { @ValidateIf((o) => o.content !== undefined) @Transform(({ value }) => value?.toLowerCase()) @IsIn(['append', 'prepend', 'replace']) - contentOperation?: ContentOperation; + operation?: ContentOperation; @ValidateIf((o) => o.content !== undefined) @Transform(({ value }) => value?.toLowerCase() ?? 'json') diff --git a/apps/server/src/core/page/services/page.service.ts b/apps/server/src/core/page/services/page.service.ts index 1b559557..1cabbdc0 100644 --- a/apps/server/src/core/page/services/page.service.ts +++ b/apps/server/src/core/page/services/page.service.ts @@ -212,13 +212,13 @@ export class PageService { if ( updatePageDto.content && - updatePageDto.contentOperation && + updatePageDto.operation && updatePageDto.format ) { await this.updatePageContent( page.id, updatePageDto.content, - updatePageDto.contentOperation, + updatePageDto.operation, updatePageDto.format, user, ); @@ -236,7 +236,7 @@ export class PageService { async updatePageContent( pageId: string, content: string | object, - contentOperation: ContentOperation, + operation: ContentOperation, format: ContentFormat, user: User, ): Promise { @@ -269,7 +269,7 @@ export class PageService { await this.collaborationGateway.handleYjsEvent( 'updatePageContent', documentName, - { contentOperation, prosemirrorJson, user }, + { operation, prosemirrorJson, user }, ); }