diff --git a/server/src/modules/apps/services/page.service.ts b/server/src/modules/apps/services/page.service.ts index 00071abe81..955c1901d7 100644 --- a/server/src/modules/apps/services/page.service.ts +++ b/server/src/modules/apps/services/page.service.ts @@ -57,7 +57,7 @@ export class PageService implements IPageService { async clonePage(pageId: string, appVersionId: string, organizationId: string) { // TODO - Should use manager here - multiple db operations found - return dbTransactionForAppVersionAssociationsUpdate(async (manager) => { + await dbTransactionForAppVersionAssociationsUpdate(async (manager) => { const pageToClone = await manager.findOne(Page, { where: { id: pageId, appVersionId }, }); @@ -91,12 +91,13 @@ export class PageService implements IPageService { const clonedpage = await manager.save(newPage); await this.clonePageEventsAndComponents(pageId, clonedpage.id, manager); - - const pages = await this.findPagesForVersion(appVersionId, organizationId, '', manager); - const events = await this.eventHandlerService.findEventsForVersion(appVersionId, manager); - - return { pages, events }; }, appVersionId); + + // Fetch pages and events separately after transaction completes + const pages = await this.findPagesForVersion(appVersionId, organizationId, ''); + const events = await this.eventHandlerService.findEventsForVersion(appVersionId); + + return { pages, events }; } async cloneGroup(groupPageId: string, appVersionId: string, organizationId) {