The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Collapse the 24 view permission guards into three (#24415)
Félix Malfait0c8aaeda26c5
diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.tsindex 2751ee4bb88..8e3c3929886 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts@@ -35,10 +35,9 @@ import {} from 'src/engine/metadata-modules/view-field/exceptions/view-field.exception';import { ViewFieldRestApiExceptionFilter } from 'src/engine/metadata-modules/view-field/filters/view-field-rest-api-exception.filter';import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';-import { CreateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard';-import { DeleteViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard';-import { UpdateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@Controller(`${ApiPath.Rest}/metadata/viewFields`)@UseGuards(WorkspaceAuthGuard)@@ -92,7 +91,7 @@ export class ViewFieldController {}@Patch(':id')- @UseGuards(UpdateViewFieldPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewField'))async update(@Param('id') id: string,@Body() input: UpdateViewFieldInput['update'],@@ -105,7 +104,7 @@ export class ViewFieldController {}@Post()- @UseGuards(CreateViewFieldPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async create(@Body() input: CreateViewFieldInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -117,7 +116,7 @@ export class ViewFieldController {}@Delete(':id')- @UseGuards(DeleteViewFieldPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewField'))async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.tsindex 4974e69bb80..862cd8713f8 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts@@ -12,11 +12,9 @@ import { DestroyViewFieldInput } from 'src/engine/metadata-modules/view-field/dtimport { UpdateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/update-view-field.input';import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';-import { CreateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard';-import { DeleteViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard';-import { DestroyViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard';-import { UpdateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard';import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@MetadataResolver(() => ViewFieldDTO)@UseFilters(ViewGraphqlApiExceptionFilter)@@ -43,7 +41,7 @@ export class ViewFieldResolver {}@Mutation(() => ViewFieldDTO)- @UseGuards(UpdateViewFieldPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewField'))async updateViewField(@Args('input') updateViewFieldInput: UpdateViewFieldInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -55,7 +53,7 @@ export class ViewFieldResolver {}@Mutation(() => ViewFieldDTO)- @UseGuards(CreateViewFieldPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewField(@Args('input') createViewFieldInput: CreateViewFieldInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -67,7 +65,7 @@ export class ViewFieldResolver {}@Mutation(() => [ViewFieldDTO])- @UseGuards(CreateViewFieldPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createManyViewFields(@Args('inputs', { type: () => [CreateViewFieldInput] })createViewFieldInputs: CreateViewFieldInput[],@@ -80,7 +78,7 @@ export class ViewFieldResolver {}@Mutation(() => ViewFieldDTO)- @UseGuards(DeleteViewFieldPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewField'))async deleteViewField(@Args('input') deleteViewFieldInput: DeleteViewFieldInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -92,7 +90,7 @@ export class ViewFieldResolver {}@Mutation(() => ViewFieldDTO)- @UseGuards(DestroyViewFieldPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewField'))async destroyViewField(@Args('input') destroyViewFieldInput: DestroyViewFieldInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.tsindex 5762072cad9..d2bf028399d 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts@@ -35,10 +35,9 @@ import {} from 'src/engine/metadata-modules/view-filter-group/exceptions/view-filter-group.exception';import { ViewFilterGroupRestApiExceptionFilter } from 'src/engine/metadata-modules/view-filter-group/filters/view-filter-group-rest-api-exception.filter';import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';-import { CreateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard';-import { DeleteViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard';-import { UpdateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@Controller(`${ApiPath.Rest}/metadata/viewFilterGroups`)@UseGuards(WorkspaceAuthGuard)@@ -98,7 +97,7 @@ export class ViewFilterGroupController {}@Post()- @UseGuards(CreateViewFilterGroupPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async create(@Body() input: CreateViewFilterGroupInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -110,7 +109,7 @@ export class ViewFilterGroupController {}@Patch(':id')- @UseGuards(UpdateViewFilterGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilterGroup'))async update(@Param('id') id: string,@Body() input: UpdateViewFilterGroupInput,@@ -124,7 +123,7 @@ export class ViewFilterGroupController {}@Delete(':id')- @UseGuards(DeleteViewFilterGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilterGroup'))async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.tsindex ef09afab911..e8cf8afd2ed 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts@@ -12,11 +12,9 @@ import { CreateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filimport { UpdateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/update-view-filter-group.input';import { ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';-import { CreateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard';-import { DeleteViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard';-import { DestroyViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard';-import { UpdateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard';import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@MetadataResolver(() => ViewFilterGroupDTO)@UseFilters(ViewGraphqlApiExceptionFilter)@@ -50,7 +48,7 @@ export class ViewFilterGroupResolver {}@Mutation(() => ViewFilterGroupDTO)- @UseGuards(CreateViewFilterGroupPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewFilterGroup(@Args('input') input: CreateViewFilterGroupInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -62,7 +60,7 @@ export class ViewFilterGroupResolver {}@Mutation(() => ViewFilterGroupDTO)- @UseGuards(UpdateViewFilterGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilterGroup'))async updateViewFilterGroup(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdateViewFilterGroupInput,@@ -76,7 +74,7 @@ export class ViewFilterGroupResolver {}@Mutation(() => Boolean)- @UseGuards(DeleteViewFilterGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilterGroup'))async deleteViewFilterGroup(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -90,7 +88,7 @@ export class ViewFilterGroupResolver {}@Mutation(() => Boolean)- @UseGuards(DestroyViewFilterGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilterGroup'))async destroyViewFilterGroup(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.tsindex 095e04eb9c3..4b23cc74275 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts@@ -35,10 +35,9 @@ import {} from 'src/engine/metadata-modules/view-filter/exceptions/view-filter.exception';import { ViewFilterRestApiExceptionFilter } from 'src/engine/metadata-modules/view-filter/filters/view-filter-rest-api-exception.filter';import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';-import { CreateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard';-import { DeleteViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard';-import { UpdateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@Controller(`${ApiPath.Rest}/metadata/viewFilters`)@UseGuards(WorkspaceAuthGuard)@@ -100,7 +99,7 @@ export class ViewFilterController {}@Post()- @UseGuards(CreateViewFilterPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async create(@Body() input: CreateViewFilterInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -112,7 +111,7 @@ export class ViewFilterController {}@Patch(':id')- @UseGuards(UpdateViewFilterPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilter'))async update(@Param('id') id: string,@Body() input: UpdateViewFilterInput,@@ -130,7 +129,7 @@ export class ViewFilterController {}@Delete(':id')- @UseGuards(DeleteViewFilterPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilter'))async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.tsindex 71c9319a838..e3e73838769 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts@@ -12,11 +12,9 @@ import { DestroyViewFilterInput } from 'src/engine/metadata-modules/view-filter/import { UpdateViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/update-view-filter.input';import { ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view-filter.dto';import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';-import { CreateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard';-import { DeleteViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard';-import { DestroyViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard';-import { UpdateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard';import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@MetadataResolver(() => ViewFilterDTO)@UseFilters(ViewGraphqlApiExceptionFilter)@@ -48,7 +46,7 @@ export class ViewFilterResolver {}@Mutation(() => ViewFilterDTO)- @UseGuards(CreateViewFilterPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewFilter(@Args('input') createViewFilterInput: CreateViewFilterInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -60,7 +58,7 @@ export class ViewFilterResolver {}@Mutation(() => ViewFilterDTO)- @UseGuards(UpdateViewFilterPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilter'))async updateViewFilter(@Args('input') updateViewFilterInput: UpdateViewFilterInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -72,7 +70,7 @@ export class ViewFilterResolver {}@Mutation(() => ViewFilterDTO)- @UseGuards(DeleteViewFilterPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilter'))async deleteViewFilter(@Args('input') deleteViewFilterInput: DeleteViewFilterInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -84,7 +82,7 @@ export class ViewFilterResolver {}@Mutation(() => ViewFilterDTO)- @UseGuards(DestroyViewFilterPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewFilter'))async destroyViewFilter(@Args('input') destroyViewFilterInput: DestroyViewFilterInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.tsindex 461b9955ab0..586f416a678 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts@@ -35,10 +35,9 @@ import {} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';import { ViewGroupRestApiExceptionFilter } from 'src/engine/metadata-modules/view-group/filters/view-group-rest-api-exception.filter';import { ViewGroupService } from 'src/engine/metadata-modules/view-group/services/view-group.service';-import { CreateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard';-import { DeleteViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard';-import { UpdateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@Controller(`${ApiPath.Rest}/metadata/viewGroups`)@UseGuards(WorkspaceAuthGuard)@@ -92,7 +91,7 @@ export class ViewGroupController {}@Post()- @UseGuards(CreateViewGroupPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async create(@Body() input: CreateViewGroupInput,@AuthWorkspace() workspace: WorkspaceEntity,@@ -104,7 +103,7 @@ export class ViewGroupController {}@Patch(':id')- @UseGuards(UpdateViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async update(@Param('id') id: string,@Body() input: UpdateViewGroupInput,@@ -122,7 +121,7 @@ export class ViewGroupController {}@Delete(':id')- @UseGuards(DeleteViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.tsindex 2b93c17352a..4d3c45e4a74 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts@@ -13,10 +13,8 @@ import { UpdateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtoimport { ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';import { ViewGroupService } from 'src/engine/metadata-modules/view-group/services/view-group.service';import { ViewGroupGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view-group/utils/view-group-graphql-api-exception.filter';-import { CreateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard';-import { DeleteViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard';-import { DestroyViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard';-import { UpdateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@MetadataResolver(() => ViewGroupDTO)@UseFilters(ViewGroupGraphqlApiExceptionFilter)@@ -48,7 +46,7 @@ export class ViewGroupResolver {}@Mutation(() => ViewGroupDTO)- @UseGuards(CreateViewGroupPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewGroup(@Args('input') createViewGroupInput: CreateViewGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -60,7 +58,7 @@ export class ViewGroupResolver {}@Mutation(() => [ViewGroupDTO])- @UseGuards(CreateViewGroupPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createManyViewGroups(@Args('inputs', { type: () => [CreateViewGroupInput] })createViewGroupInputs: CreateViewGroupInput[],@@ -73,7 +71,7 @@ export class ViewGroupResolver {}@Mutation(() => ViewGroupDTO)- @UseGuards(UpdateViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async updateViewGroup(@Args('input') updateViewGroupInput: UpdateViewGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -85,7 +83,7 @@ export class ViewGroupResolver {}@Mutation(() => [ViewGroupDTO])- @UseGuards(UpdateViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async updateManyViewGroups(@Args('inputs', { type: () => [UpdateViewGroupInput] })updateViewGroupInputs: UpdateViewGroupInput[],@@ -98,7 +96,7 @@ export class ViewGroupResolver {}@Mutation(() => ViewGroupDTO)- @UseGuards(DeleteViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async deleteViewGroup(@Args('input') deleteViewGroupInput: DeleteViewGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -110,7 +108,7 @@ export class ViewGroupResolver {}@Mutation(() => ViewGroupDTO)- @UseGuards(DestroyViewGroupPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewGroup'))async destroyViewGroup(@Args('input') destroyViewGroupInput: DestroyViewGroupInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.tssimilarity index 71%rename from packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard.tsrename to packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.tsindex 8f57adef333..40c7b17d1e3 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard.ts@@ -6,26 +6,18 @@ import {import { GqlExecutionContext } from '@nestjs/graphql';import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';+import { resolveViewChildEntityViewId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util';@Injectable()-export class CreateViewFilterGroupPermissionGuard implements CanActivate {+export class CreateViewChildEntityPermissionGuard implements CanActivate {constructor(private readonly viewAccessService: ViewAccessService) {}async canActivate(context: ExecutionContext): Promise<boolean> {const gqlContext = GqlExecutionContext.create(context);const request = gqlContext.getContext().req;-- let viewId: string | null = null;-const args = gqlContext.getArgs();- if (typeof args?.input?.viewId === 'string') {- viewId = args.input.viewId;- }-- if (!viewId && typeof request.body?.viewId === 'string') {- viewId = request.body.viewId;- }+ const viewId = resolveViewChildEntityViewId({ args, body: request.body });return this.viewAccessService.canUserModifyViewByChildEntity(viewId,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard.tsdeleted file mode 100644index 20518279cb5..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard.ts+++ /dev/null@@ -1,44 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class CreateViewFieldPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.input?.viewId === 'string') {- viewId = args.input.viewId;- }-- if (!viewId && Array.isArray(args?.inputs) && args.inputs.length > 0) {- viewId =- typeof args.inputs[0]?.viewId === 'string'- ? args.inputs[0].viewId- : null;- }-- if (!viewId && typeof request.body?.viewId === 'string') {- viewId = request.body.viewId;- }-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard.tsdeleted file mode 100644index 1d56c7c0a72..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard.ts+++ /dev/null@@ -1,37 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class CreateViewFilterPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.input?.viewId === 'string') {- viewId = args.input.viewId;- }-- if (!viewId && typeof request.body?.viewId === 'string') {- viewId = request.body.viewId;- }-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard.tsdeleted file mode 100644index e23e9c474eb..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard.ts+++ /dev/null@@ -1,44 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class CreateViewGroupPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.input?.viewId === 'string') {- viewId = args.input.viewId;- }-- if (!viewId && Array.isArray(args?.inputs) && args.inputs.length > 0) {- viewId =- typeof args.inputs[0]?.viewId === 'string'- ? args.inputs[0].viewId- : null;- }-- if (!viewId && typeof request.body?.viewId === 'string') {- viewId = request.body.viewId;- }-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard.tsdeleted file mode 100644index 88aaa3c28f2..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard.ts+++ /dev/null@@ -1,37 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class CreateViewSortPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.input?.viewId === 'string') {- viewId = args.input.viewId;- }-- if (!viewId && typeof request.body?.viewId === 'string') {- viewId = request.body.viewId;- }-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard.tsdeleted file mode 100644index 377d14bfc05..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DeleteViewFieldPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewField',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard.tsdeleted file mode 100644index e7461eb5774..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DeleteViewFilterGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilterGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard.tsdeleted file mode 100644index 3d5f732cd54..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DeleteViewFilterPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilter',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard.tsdeleted file mode 100644index c98bd1bfb8e..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DeleteViewGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard.tsdeleted file mode 100644index 13cd6316710..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard.ts+++ /dev/null@@ -1,37 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class DeleteViewPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- viewId = args.id;- }-- if (!viewId && typeof request.params?.id === 'string') {- viewId = request.params.id;- }-- return this.viewAccessService.canUserModifyView(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard.tsdeleted file mode 100644index 3d525699a63..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DeleteViewSortPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewSort',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard.tsdeleted file mode 100644index 3e19b3f749c..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DestroyViewFieldPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewField',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard.tsdeleted file mode 100644index ec6f7a2f3cf..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DestroyViewFilterGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilterGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard.tsdeleted file mode 100644index c5f135052b5..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DestroyViewFilterPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilter',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard.tsdeleted file mode 100644index 36848494c20..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DestroyViewGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard.tsdeleted file mode 100644index 73a91e2f6a3..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard.ts+++ /dev/null@@ -1,37 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';--@Injectable()-export class DestroyViewPermissionGuard implements CanActivate {- constructor(private readonly viewAccessService: ViewAccessService) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let viewId: string | null = null;-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- viewId = args.id;- }-- if (!viewId && typeof request.params?.id === 'string') {- viewId = request.params.id;- }-- return this.viewAccessService.canUserModifyView(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard.tsdeleted file mode 100644index a212241f8e6..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class DestroyViewSortPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewSort',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard.tsdeleted file mode 100644index 9e4ef56e368..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class UpdateViewFieldPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewField',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard.tsdeleted file mode 100644index 08a293e34cd..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class UpdateViewFilterGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilterGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard.tsdeleted file mode 100644index 14e41158ae8..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class UpdateViewFilterPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewFilter',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard.tsdeleted file mode 100644index 578ea68ffe9..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class UpdateViewGroupPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.input?.id === 'string') {- entityId = args.input.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewGroup',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard.tsdeleted file mode 100644index 0272648f7f6..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard.ts+++ /dev/null@@ -1,49 +0,0 @@-import {- Injectable,- type CanActivate,- type ExecutionContext,-} from '@nestjs/common';-import { GqlExecutionContext } from '@nestjs/graphql';--import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';-import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';--@Injectable()-export class UpdateViewSortPermissionGuard implements CanActivate {- constructor(- private readonly viewAccessService: ViewAccessService,- private readonly viewEntityLookupService: ViewEntityLookupService,- ) {}-- async canActivate(context: ExecutionContext): Promise<boolean> {- const gqlContext = GqlExecutionContext.create(context);- const request = gqlContext.getContext().req;-- let entityId = '';-- const args = gqlContext.getArgs();-- if (typeof args?.id === 'string') {- entityId = args.id;- }-- if (!entityId && typeof request.params?.id === 'string') {- entityId = request.params.id;- }-- const viewId = entityId- ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(- 'viewSort',- entityId,- request.workspace.id,- )- : null;-- return this.viewAccessService.canUserModifyViewByChildEntity(- viewId,- request.userWorkspaceId,- request.workspace.id,- request.apiKey?.id,- );- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.tsnew file mode 100644index 00000000000..9f5d48c2d87--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard.ts@@ -0,0 +1,52 @@+import {+ Injectable,+ type CanActivate,+ type ExecutionContext,+ type Type,+} from '@nestjs/common';+import { GqlExecutionContext } from '@nestjs/graphql';++import { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';+import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';+import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';+import { resolveViewChildEntityId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-id.util';++export const ViewChildEntityPermissionGuard = (+ kind: ViewChildEntityKind,+): Type<CanActivate> => {+ @Injectable()+ class ViewChildEntityPermissionGuardMixin implements CanActivate {+ constructor(+ private readonly viewAccessService: ViewAccessService,+ private readonly viewEntityLookupService: ViewEntityLookupService,+ ) {}++ async canActivate(context: ExecutionContext): Promise<boolean> {+ const gqlContext = GqlExecutionContext.create(context);+ const request = gqlContext.getContext().req;+ const args = gqlContext.getArgs();++ const entityId = resolveViewChildEntityId({+ args,+ params: request.params,+ });++ const viewId = entityId+ ? await this.viewEntityLookupService.findViewIdByEntityIdAndKind(+ kind,+ entityId,+ request.workspace.id,+ )+ : null;++ return this.viewAccessService.canUserModifyViewByChildEntity(+ viewId,+ request.userWorkspaceId,+ request.workspace.id,+ request.apiKey?.id,+ );+ }+ }++ return ViewChildEntityPermissionGuardMixin;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-permission.guard.tssimilarity index 72%rename from packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard.tsrename to packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-permission.guard.tsindex 24d54cb3013..e685dc86212 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/view-permission.guard.ts@@ -5,27 +5,21 @@ import {} from '@nestjs/common';import { GqlExecutionContext } from '@nestjs/graphql';+import { isNonEmptyString } from '@sniptt/guards';+import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';@Injectable()-export class UpdateViewPermissionGuard implements CanActivate {+export class ViewPermissionGuard implements CanActivate {constructor(private readonly viewAccessService: ViewAccessService) {}async canActivate(context: ExecutionContext): Promise<boolean> {const gqlContext = GqlExecutionContext.create(context);const request = gqlContext.getContext().req;-- let viewId: string | null = null;-const args = gqlContext.getArgs();- if (typeof args?.id === 'string') {- viewId = args.id;- }-- if (!viewId && typeof request.params?.id === 'string') {- viewId = request.params.id;- }+ const viewId =+ [args?.id, request.params?.id].find(isNonEmptyString) ?? null;return this.viewAccessService.canUserModifyView(viewId,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-id.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-id.util.spec.tsnew file mode 100644index 00000000000..5d9770eb15c--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-id.util.spec.ts@@ -0,0 +1,60 @@+import { resolveViewChildEntityId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-id.util';++describe('resolveViewChildEntityId', () => {+ it('reads the top-level id a mutation is routed by', () => {+ expect(+ resolveViewChildEntityId({+ args: { id: 'entity-id' },+ params: undefined,+ }),+ ).toBe('entity-id');+ });++ it('prefers the routed id over one carried in the input', () => {+ expect(+ resolveViewChildEntityId({+ args: { id: 'routed-entity-id', input: { id: 'other-entity-id' } },+ params: undefined,+ }),+ ).toBe('routed-entity-id');+ });++ it('reads the input id when the mutation takes no top-level id', () => {+ expect(+ resolveViewChildEntityId({+ args: { input: { id: 'entity-id' } },+ params: undefined,+ }),+ ).toBe('entity-id');+ });++ it('falls back to the REST path parameter', () => {+ expect(+ resolveViewChildEntityId({ args: {}, params: { id: 'entity-id' } }),+ ).toBe('entity-id');+ });++ it('returns null when no id is named', () => {+ expect(+ resolveViewChildEntityId({ args: {}, params: undefined }),+ ).toBeNull();+ });++ it('ignores an empty string so it does not pass as a named entity', () => {+ expect(+ resolveViewChildEntityId({+ args: { id: '', input: { id: 'entity-id' } },+ params: undefined,+ }),+ ).toBe('entity-id');+ });++ it('ignores non-string ids', () => {+ expect(+ resolveViewChildEntityId({+ args: { id: 42 },+ params: { id: 'entity-id' },+ }),+ ).toBe('entity-id');+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.tsnew file mode 100644index 00000000000..8cb4123d60b--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/__tests__/resolve-view-child-entity-view-id.util.spec.ts@@ -0,0 +1,42 @@+import { resolveViewChildEntityViewId } from 'src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util';++describe('resolveViewChildEntityViewId', () => {+ it('reads the view named by the input', () => {+ expect(+ resolveViewChildEntityViewId({+ args: { input: { viewId: 'view-id' } },+ body: undefined,+ }),+ ).toBe('view-id');+ });++ it('reads the view named by the first of a bulk create', () => {+ expect(+ resolveViewChildEntityViewId({+ args: { inputs: [{ viewId: 'view-id' }] },+ body: undefined,+ }),+ ).toBe('view-id');+ });++ it('falls back to the REST body', () => {+ expect(+ resolveViewChildEntityViewId({ args: {}, body: { viewId: 'view-id' } }),+ ).toBe('view-id');+ });++ it('returns null when no view is named', () => {+ expect(+ resolveViewChildEntityViewId({ args: {}, body: undefined }),+ ).toBeNull();+ });++ it('does not accept an empty string as a named view', () => {+ expect(+ resolveViewChildEntityViewId({+ args: { input: { viewId: '' } },+ body: undefined,+ }),+ ).toBeNull();+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-id.util.tsnew file mode 100644index 00000000000..15c0bb6cfce--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-id.util.ts@@ -0,0 +1,13 @@+import { isNonEmptyString } from '@sniptt/guards';++// The top-level id is the authoritative one where a mutation takes it: its+// input extends a partial create input that also carries an optional id, and+// only the argument routes the mutation.+export const resolveViewChildEntityId = ({+ args,+ params,+}: {+ args: { id?: unknown; input?: { id?: unknown } } | undefined;+ params: { id?: unknown } | undefined;+}): string | null =>+ [args?.id, args?.input?.id, params?.id].find(isNonEmptyString) ?? null;diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.tsnew file mode 100644index 00000000000..135415308ae--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/utils/resolve-view-child-entity-view-id.util.ts@@ -0,0 +1,14 @@+import { isNonEmptyString } from '@sniptt/guards';++export const resolveViewChildEntityViewId = ({+ args,+ body,+}: {+ args:+ | { input?: { viewId?: unknown }; inputs?: { viewId?: unknown }[] }+ | undefined;+ body: { viewId?: unknown } | undefined;+}): string | null =>+ [args?.input?.viewId, args?.inputs?.[0]?.viewId, body?.viewId].find(+ isNonEmptyString,+ ) ?? null;diff --git a/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts b/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.tsindex 51bac9d65fd..dae267557dd 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts@@ -9,30 +9,6 @@ import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entitiesimport { ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';-import { CreateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard';-import { CreateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard';-import { CreateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard';-import { CreateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard';-import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';-import { CreateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard';-import { DeleteViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard';-import { DeleteViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard';-import { DeleteViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard';-import { DeleteViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard';-import { DeleteViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard';-import { DeleteViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard';-import { DestroyViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard';-import { DestroyViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard';-import { DestroyViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard';-import { DestroyViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard';-import { DestroyViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard';-import { DestroyViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard';-import { UpdateViewFieldPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard';-import { UpdateViewFilterGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard';-import { UpdateViewFilterPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard';-import { UpdateViewGroupPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard';-import { UpdateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard';-import { UpdateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard';import { ViewAccessService } from 'src/engine/metadata-modules/view-permissions/services/view-access.service';import { ViewEntityLookupService } from 'src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service';import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';@@ -41,6 +17,9 @@ import { ViewService } from 'src/engine/metadata-modules/view/services/view.servimport { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-permission.guard';+import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';@Module({imports: [@@ -64,29 +43,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceViewEntityLookupService,ViewAccessService,CreateViewPermissionGuard,- UpdateViewPermissionGuard,- DeleteViewPermissionGuard,- DestroyViewPermissionGuard,- CreateViewFieldPermissionGuard,- UpdateViewFieldPermissionGuard,- DeleteViewFieldPermissionGuard,- DestroyViewFieldPermissionGuard,- CreateViewFilterPermissionGuard,- UpdateViewFilterPermissionGuard,- DeleteViewFilterPermissionGuard,- DestroyViewFilterPermissionGuard,- CreateViewFilterGroupPermissionGuard,- UpdateViewFilterGroupPermissionGuard,- DeleteViewFilterGroupPermissionGuard,- DestroyViewFilterGroupPermissionGuard,- CreateViewGroupPermissionGuard,- UpdateViewGroupPermissionGuard,- DeleteViewGroupPermissionGuard,- DestroyViewGroupPermissionGuard,- CreateViewSortPermissionGuard,- UpdateViewSortPermissionGuard,- DeleteViewSortPermissionGuard,- DestroyViewSortPermissionGuard,+ CreateViewChildEntityPermissionGuard,+ ViewPermissionGuard,provideWorkspaceScopedRepository(ViewEntity),provideWorkspaceScopedRepository(ViewFieldEntity),provideWorkspaceScopedRepository(ViewFilterEntity),@@ -99,29 +57,8 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceViewEntityLookupService,ViewAccessService,CreateViewPermissionGuard,- UpdateViewPermissionGuard,- DeleteViewPermissionGuard,- DestroyViewPermissionGuard,- CreateViewFieldPermissionGuard,- UpdateViewFieldPermissionGuard,- DeleteViewFieldPermissionGuard,- DestroyViewFieldPermissionGuard,- CreateViewFilterPermissionGuard,- UpdateViewFilterPermissionGuard,- DeleteViewFilterPermissionGuard,- DestroyViewFilterPermissionGuard,- CreateViewFilterGroupPermissionGuard,- UpdateViewFilterGroupPermissionGuard,- DeleteViewFilterGroupPermissionGuard,- DestroyViewFilterGroupPermissionGuard,- CreateViewGroupPermissionGuard,- UpdateViewGroupPermissionGuard,- DeleteViewGroupPermissionGuard,- DestroyViewGroupPermissionGuard,- CreateViewSortPermissionGuard,- UpdateViewSortPermissionGuard,- DeleteViewSortPermissionGuard,- DestroyViewSortPermissionGuard,+ CreateViewChildEntityPermissionGuard,+ ViewPermissionGuard,],})export class ViewPermissionsModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.tsindex bd22afe0bef..fe7c345eed8 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts@@ -23,9 +23,6 @@ import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';-import { CreateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard';-import { DeleteViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard';-import { UpdateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard';import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';import { type ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';import {@@ -38,6 +35,8 @@ import {import { ViewSortRestApiExceptionFilter } from 'src/engine/metadata-modules/view-sort/filters/view-sort-rest-api-exception.filter';import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@Controller(`${ApiPath.Rest}/metadata/viewSorts`)@UseGuards(WorkspaceAuthGuard)@UseFilters(@@ -90,7 +89,7 @@ export class ViewSortController {}@Post()- @UseGuards(CreateViewSortPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async create(@Body() input: CreateViewSortInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -102,7 +101,7 @@ export class ViewSortController {}@Patch(':id')- @UseGuards(UpdateViewSortPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewSort'))async update(@Param('id') id: string,@Body() input: { direction?: ViewSortDirection },@@ -115,7 +114,7 @@ export class ViewSortController {}@Delete(':id')- @UseGuards(DeleteViewSortPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewSort'))async delete(@Param('id') id: string,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.tsindex 4ff978b13cc..f6ad5be535c 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts@@ -8,10 +8,6 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-import { CreateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard';-import { DeleteViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard';-import { DestroyViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard';-import { UpdateViewSortPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard';import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';import { UpdateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/update-view-sort.input';import { ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';@@ -19,6 +15,8 @@ import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';import { DeleteViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/delete-view-sort.input';import { DestroyViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/destroy-view-sort.input';+import { CreateViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-child-entity-permission.guard';+import { ViewChildEntityPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-child-entity-permission.guard';@MetadataResolver(() => ViewSortDTO)@UseFilters(ViewGraphqlApiExceptionFilter)@@ -50,7 +48,7 @@ export class ViewSortResolver {}@Mutation(() => ViewSortDTO)- @UseGuards(CreateViewSortPermissionGuard)+ @UseGuards(CreateViewChildEntityPermissionGuard)async createViewSort(@Args('input') createViewSortInput: CreateViewSortInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -62,7 +60,7 @@ export class ViewSortResolver {}@Mutation(() => ViewSortDTO)- @UseGuards(UpdateViewSortPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewSort'))async updateViewSort(@Args('input') updateViewSortInput: UpdateViewSortInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -74,7 +72,7 @@ export class ViewSortResolver {}@Mutation(() => Boolean)- @UseGuards(DeleteViewSortPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewSort'))async deleteViewSort(@Args('input') deleteViewSortInput: DeleteViewSortInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,@@ -88,7 +86,7 @@ export class ViewSortResolver {}@Mutation(() => Boolean)- @UseGuards(DestroyViewSortPermissionGuard)+ @UseGuards(ViewChildEntityPermissionGuard('viewSort'))async destroyViewSort(@Args('input') destroyViewSortInput: DestroyViewSortInput,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.tsindex f938325ff41..a3c8b0121e4 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts@@ -33,9 +33,6 @@ import { ApplicationTranslationCatalogService } from 'src/engine/metadata-moduleimport { buildViewNameObjectLabels } from 'src/engine/metadata-modules/view/utils/build-view-name-object-labels.util';import { resolveViewName } from 'src/engine/metadata-modules/view/utils/resolve-view-name.util';import { belongsToTwentyStandardApp } from 'src/engine/metadata-modules/utils/belongs-to-twenty-standard-app.util';-import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';-import { DeleteViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard';-import { UpdateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard';import { CreateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/create-view.input';import { UpdateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/update-view.input';import { type ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';@@ -51,6 +48,8 @@ import { ViewService } from 'src/engine/metadata-modules/view/services/view.servimport { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';import { WorkspaceMigrationRunnerRestApiExceptionFilter } from 'src/engine/workspace-manager/workspace-migration/filters/workspace-migration-runner-rest-api-exception.filter';+import { ViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-permission.guard';+import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';@Controller(`${ApiPath.Rest}/metadata/views`)@UseGuards(WorkspaceAuthGuard)@@ -151,7 +150,7 @@ export class ViewController {}@Patch(':id')- @UseGuards(UpdateViewPermissionGuard)+ @UseGuards(ViewPermissionGuard)async update(@Param('id') id: string,@Body() input: UpdateViewInput,@@ -179,7 +178,7 @@ export class ViewController {}@Delete(':id')- @UseGuards(DeleteViewPermissionGuard)+ @UseGuards(ViewPermissionGuard)async delete(@Param('id') id: string,@AuthWorkspace() workspace: WorkspaceEntity,diff --git a/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.tsindex 505c80e5032..2cc600e1696 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts@@ -35,10 +35,6 @@ import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-fimport { ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';import { ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view-filter.dto';import { ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';-import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';-import { DeleteViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard';-import { DestroyViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard';-import { UpdateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard';import { ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';import { CreateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/create-view.input';import { UpdateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/update-view.input';@@ -48,6 +44,8 @@ import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.import { ViewWidgetUpsertService } from 'src/engine/metadata-modules/view/services/view-widget-upsert.service';import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';+import { ViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/view-permission.guard';+import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';@MetadataResolver(() => ViewDTO)@UseFilters(ViewGraphqlApiExceptionFilter)@@ -186,7 +184,7 @@ export class ViewResolver {}@Mutation(() => ViewDTO)- @UseGuards(UpdateViewPermissionGuard)+ @UseGuards(ViewPermissionGuard)async updateView(@Args('id', { type: () => String }) id: string,@Args('input') input: UpdateViewInput,@@ -202,7 +200,7 @@ export class ViewResolver {}@Mutation(() => Boolean)- @UseGuards(DeleteViewPermissionGuard)+ @UseGuards(ViewPermissionGuard)async deleteView(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,@@ -216,7 +214,7 @@ export class ViewResolver {}@Mutation(() => Boolean)- @UseGuards(DestroyViewPermissionGuard)+ @UseGuards(ViewPermissionGuard)async destroyView(@Args('id', { type: () => String }) id: string,@AuthWorkspace() workspace: WorkspaceEntity,