From 7c6f3c576df0a2f33d6a4b5c47d23effa59b5c67 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Tue, 29 Apr 2025 16:05:23 +0530 Subject: [PATCH] Move page-permissions logic to server/ee submodule --- server/ee | 2 +- .../versions/services/create.service.ts | 42 +------------------ 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/server/ee b/server/ee index 84ec48d0f6..30512fbfc2 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 84ec48d0f64fd6dc5f7677f71a5119219cc4ada4 +Subproject commit 30512fbfc2633b2eacc49666993b2c27a61b3327 diff --git a/server/src/modules/versions/services/create.service.ts b/server/src/modules/versions/services/create.service.ts index 94b7f9783c..12a24ac7c6 100644 --- a/server/src/modules/versions/services/create.service.ts +++ b/server/src/modules/versions/services/create.service.ts @@ -6,7 +6,7 @@ import { DataSource } from '@entities/data_source.entity'; import { DataSourceOptions } from '@entities/data_source_options.entity'; import { EventHandler, Target } from '@entities/event_handler.entity'; import { dbTransactionWrap } from '@helpers/database.helper'; -import { EntityManager, In } from 'typeorm'; +import { EntityManager } from 'typeorm'; import { Credential } from 'src/entities/credential.entity'; import * as uuid from 'uuid'; import { Page } from '@entities/page.entity'; @@ -22,8 +22,6 @@ import { DataSourcesRepository } from '@modules/data-sources/repository'; import { DataQueryRepository } from '@modules/data-queries/repository'; import { AppEnvironmentUtilService } from '@modules/app-environments/util.service'; import { IVersionsCreateService } from '../interfaces/services/ICreateService'; -import { PagePermission } from '@entities/page_permissions.entity'; -import { PageUser } from '@entities/page_users.entity'; @Injectable() export class VersionsCreateService implements IVersionsCreateService { @@ -403,44 +401,6 @@ export class VersionsCreateService implements IVersionsCreateService { homePageId = savedPage.id; } - const oldPermissions = await manager.find(PagePermission, { - where: { pageId: page.id }, - }); - - const newPermissions = oldPermissions.map((permission) => { - return manager.create(PagePermission, { - ...permission, - id: undefined, - pageId: oldPageToNewPageMapping[permission.pageId], - }); - }); - - await manager.save(PagePermission, newPermissions); - - const permissionIdMap = new Map(); - oldPermissions.forEach((oldPerm, index) => { - const newPerm = newPermissions[index]; - permissionIdMap.set(oldPerm.id, newPerm.id); - }); - - const oldPermissionIds = oldPermissions.map((p) => p.id); - - const oldPageUsers = await manager.find(PageUser, { - where: { - pagePermissionsId: In(oldPermissionIds), - }, - }); - - const newPageUsers = oldPageUsers.map((pu) => - manager.create(PageUser, { - ...pu, - id: undefined, - pagePermissionsId: permissionIdMap.get(pu.pagePermissionsId), - }) - ); - - await manager.save(PageUser, newPageUsers); - const pageEvents = allEvents.filter((event) => event.sourceId === page.id); pageEvents.forEach(async (event, index) => {