houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance role-check system with stricter checks (#15392)

Browse Source 
## Overview

This PR strengthens our permission system by introducing more granular
role-based access control across the platform.

## Changes

### New Permissions Added
- **Applications** - Control who can install and manage applications
- **Layouts** - Control who can customize page layouts and UI structure
- **AI** - Control access to AI features and agents
- **Upload File** - Separate permission for file uploads
- **Download File** - Separate permission for file downloads (frontend
visibility)

### Security Enhancements
- Implemented whitelist-based validation for workspace field updates
- Added explicit permission guards to core entity resolvers
- Enhanced ESLint rule to enforce permission checks on all mutations
- Created `CustomPermissionGuard` and `NoPermissionGuard` for better
code documentation

### Affected Components
- Core entity resolvers: webhooks, files, domains, applications,
layouts, postgres credentials
- Workspace update mutations now use whitelist validation
- Settings UI updated with new permission controls

### Developer Experience
- ESLint now catches missing permission guards during development
- Explicit guard markers make permission requirements clear in code
review
- Comprehensive test coverage for new permission logic

## Testing
- ✅ All TypeScript type checks pass
- ✅ ESLint validation passes
- ✅ New permission guards properly enforced
- ✅ Frontend UI displays new permissions correctly

## Migration Notes
Existing workspaces will need to assign the new permissions to roles as
needed. By default, all new permissions are set to `false` for non-admin
roles.
This commit is contained in:
Félix Malfait
2025-11-07 15:37:17 +01:00
committed by GitHub
parent 44d6ec2594
commit cff17db6cb
306 changed files with 13863 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/metadata-modules/agent/agent-chat.resolver.ts
+7 -1
View File
@@ -8,13 +8,19 @@ import {
FeatureFlagGuard,
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AgentChatService } from 'src/engine/metadata-modules/agent/agent-chat.service';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { AgentChatMessageDTO } from './dtos/agent-chat-message.dto';
import { AgentChatThreadDTO } from './dtos/agent-chat-thread.dto';
@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
@UseGuards(
WorkspaceAuthGuard,
FeatureFlagGuard,
SettingsPermissionsGuard(PermissionFlagType.AI),
)
@Resolver()
export class AgentChatResolver {
constructor(private readonly agentChatService: AgentChatService) {}
packages/twenty-server/src/engine/metadata-modules/agent/agent.resolver.ts
+7
View File
@@ -8,9 +8,11 @@ import {
FeatureFlagGuard,
RequireFeatureFlag,
} from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { CreateAgentHandoffInput } from 'src/engine/metadata-modules/agent/dtos/create-agent-handoff.input';
import { RemoveAgentHandoffInput } from 'src/engine/metadata-modules/agent/dtos/remove-agent-handoff.input';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { AgentHandoffService } from './agent-handoff.service';
import { AgentService } from './agent.service';
@@ -70,6 +72,7 @@ export class AgentResolver {
@Mutation(() => AgentDTO)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.AI_SETTINGS))
async createOneAgent(
@Args('input') input: CreateAgentInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -82,6 +85,7 @@ export class AgentResolver {
@Mutation(() => AgentDTO)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.AI_SETTINGS))
async updateOneAgent(
@Args('input') input: UpdateAgentInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -91,6 +95,7 @@ export class AgentResolver {
@Mutation(() => AgentDTO)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.AI_SETTINGS))
async deleteOneAgent(
@Args('input') { id }: AgentIdInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -100,6 +105,7 @@ export class AgentResolver {
@Mutation(() => Boolean)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.AI_SETTINGS))
async createAgentHandoff(
@Args('input') input: CreateAgentHandoffInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -116,6 +122,7 @@ export class AgentResolver {
@Mutation(() => Boolean)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.AI_SETTINGS))
async removeAgentHandoff(
@Args('input') input: RemoveAgentHandoffInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/cron-trigger/cron-trigger.module.ts
+2
View File
@@ -9,12 +9,14 @@ import { CronTriggerResolver } from 'src/engine/metadata-modules/cron-trigger/re
import { CronTriggerV2Service } from 'src/engine/metadata-modules/cron-trigger/services/cron-trigger-v2.service';
import { WorkspaceFlatCronTriggerMapCacheService } from 'src/engine/metadata-modules/cron-trigger/services/workspace-flat-cron-trigger-map-cache.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
@Module({
imports: [
TypeOrmModule.forFeature([WorkspaceEntity, CronTriggerEntity]),
WorkspaceManyOrAllFlatEntityMapsCacheModule,
PermissionsModule,
WorkspaceMigrationV2Module,
],
providers: [
packages/twenty-server/src/engine/metadata-modules/cron-trigger/resolvers/cron-trigger.resolver.ts
+6 -1
View File
@@ -8,6 +8,7 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { CreateCronTriggerInput } from 'src/engine/metadata-modules/cron-trigger/dtos/create-cron-trigger.input';
import { CronTriggerIdInput } from 'src/engine/metadata-modules/cron-trigger/dtos/cron-trigger-id.input';
@@ -16,8 +17,12 @@ import { UpdateCronTriggerInput } from 'src/engine/metadata-modules/cron-trigger
import { CronTriggerEntity } from 'src/engine/metadata-modules/cron-trigger/entities/cron-trigger.entity';
import { CronTriggerV2Service } from 'src/engine/metadata-modules/cron-trigger/services/cron-trigger-v2.service';
import { cronTriggerGraphQLApiExceptionHandler } from 'src/engine/metadata-modules/cron-trigger/utils/cron-trigger-graphql-api-exception-handler.util';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
@UseGuards(WorkspaceAuthGuard)
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS),
)
@Resolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
packages/twenty-server/src/engine/metadata-modules/database-event-trigger/database-event-trigger.module.ts
+2
View File
@@ -8,12 +8,14 @@ import { DatabaseEventTriggerResolver } from 'src/engine/metadata-modules/databa
import { DatabaseEventTriggerV2Service } from 'src/engine/metadata-modules/database-event-trigger/services/database-event-trigger-v2.service';
import { WorkspaceFlatDatabaseEventTriggerMapCacheService } from 'src/engine/metadata-modules/database-event-trigger/services/workspace-flat-database-event-trigger-map-cache.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
@Module({
imports: [
TypeOrmModule.forFeature([WorkspaceEntity, DatabaseEventTriggerEntity]),
WorkspaceManyOrAllFlatEntityMapsCacheModule,
PermissionsModule,
WorkspaceMigrationV2Module,
],
providers: [
packages/twenty-server/src/engine/metadata-modules/database-event-trigger/resolvers/database-event-trigger.resolver.ts
+6 -1
View File
@@ -8,6 +8,7 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { CreateDatabaseEventTriggerInput } from 'src/engine/metadata-modules/database-event-trigger/dtos/create-database-event-trigger.input';
import { DatabaseEventTriggerIdInput } from 'src/engine/metadata-modules/database-event-trigger/dtos/database-event-trigger-id.input';
@@ -16,8 +17,12 @@ import { UpdateDatabaseEventTriggerInput } from 'src/engine/metadata-modules/dat
import { DatabaseEventTriggerEntity } from 'src/engine/metadata-modules/database-event-trigger/entities/database-event-trigger.entity';
import { DatabaseEventTriggerV2Service } from 'src/engine/metadata-modules/database-event-trigger/services/database-event-trigger-v2.service';
import { databaseEventTriggerGraphQLApiExceptionHandler } from 'src/engine/metadata-modules/database-event-trigger/utils/database-event-trigger-graphql-api-exception-handler.utils';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
@UseGuards(WorkspaceAuthGuard)
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS),
)
@Resolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
packages/twenty-server/src/engine/metadata-modules/flat-view/constants/flat-view-editable-properties.constant.ts
+1
View File
@@ -12,4 +12,5 @@ export const FLAT_VIEW_EDITABLE_PROPERTIES = [
'anyFieldFilterValue',
'calendarLayout',
'calendarFieldMetadataId',
'visibility',
] as const satisfies (keyof FlatView)[];
packages/twenty-server/src/engine/metadata-modules/flat-view/constants/view-entity-relation-properties.constant.ts
+2
View File
@@ -8,4 +8,6 @@ export const VIEW_ENTITY_RELATION_PROPERTIES = [
'viewGroups',
'viewSorts',
'workspace',
'createdBy',
'application',
] as const satisfies ViewEntityRelationProperties[];
packages/twenty-server/src/engine/metadata-modules/flat-view/types/flat-view.type.ts
+4
View File
@@ -1,3 +1,5 @@
import { type ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type';
@@ -21,6 +23,8 @@ export type ViewEntityRelationProperties =
| ViewFilterGroupEntity
| WorkspaceEntity
| FieldMetadataEntity
| UserWorkspaceEntity
| ApplicationEntity
>;
export type FlatView = FlatEntityFrom<
packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util.ts
+5
View File
@@ -5,13 +5,16 @@ import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-
import { type CreateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/create-view.input';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
export const fromCreateViewInputToFlatViewToCreate = ({
createViewInput: rawCreateViewInput,
workspaceId,
createdByUserWorkspaceId,
}: {
createViewInput: CreateViewInput;
workspaceId: string;
createdByUserWorkspaceId?: string;
}): FlatView => {
const { objectMetadataId, ...createViewInput } =
trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties(
@@ -44,6 +47,8 @@ export const fromCreateViewInputToFlatViewToCreate = ({
position: createViewInput.position ?? 0,
type: createViewInput.type ?? ViewType.TABLE,
universalIdentifier: createViewInput.universalIdentifier ?? viewId,
visibility: createViewInput.visibility ?? ViewVisibility.WORKSPACE,
createdByUserWorkspaceId: createdByUserWorkspaceId ?? null,
viewFieldIds: [],
viewFilterIds: [],
viewGroupIds: [],
packages/twenty-server/src/engine/metadata-modules/permissions/constants/permission-flag-type.constants.ts
+9 -1
View File
@@ -5,14 +5,22 @@ export enum PermissionFlagType {
WORKSPACE_MEMBERS = 'WORKSPACE_MEMBERS',
ROLES = 'ROLES',
DATA_MODEL = 'DATA_MODEL',
ADMIN_PANEL = 'ADMIN_PANEL',
SECURITY = 'SECURITY',
WORKFLOWS = 'WORKFLOWS',
IMPERSONATE = 'IMPERSONATE',
SSO_BYPASS = 'SSO_BYPASS',
APPLICATIONS = 'APPLICATIONS',
LAYOUTS = 'LAYOUTS',
BILLING = 'BILLING',
AI_SETTINGS = 'AI_SETTINGS',
// Tool permissions
AI = 'AI',
VIEWS = 'VIEWS',
UPLOAD_FILE = 'UPLOAD_FILE',
DOWNLOAD_FILE = 'DOWNLOAD_FILE',
SEND_EMAIL_TOOL = 'SEND_EMAIL_TOOL',
IMPORT_CSV = 'IMPORT_CSV',
EXPORT_CSV = 'EXPORT_CSV',
CONNECTED_ACCOUNTS = 'CONNECTED_ACCOUNTS',
}
packages/twenty-server/src/engine/metadata-modules/permissions/constants/tool-permission-flags.ts
+5
View File
@@ -1,5 +1,10 @@
export const TOOL_PERMISSION_FLAGS = [
'AI',
'VIEWS',
'UPLOAD_FILE',
'DOWNLOAD_FILE',
'SEND_EMAIL_TOOL',
'IMPORT_CSV',
'EXPORT_CSV',
'CONNECTED_ACCOUNTS',
];
packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts
+9 -1
View File
@@ -98,12 +98,20 @@ export class PermissionsService {
[PermissionFlagType.WORKSPACE_MEMBERS]: false,
[PermissionFlagType.ROLES]: false,
[PermissionFlagType.DATA_MODEL]: false,
[PermissionFlagType.ADMIN_PANEL]: false,
[PermissionFlagType.SECURITY]: false,
[PermissionFlagType.WORKFLOWS]: false,
[PermissionFlagType.APPLICATIONS]: false,
[PermissionFlagType.LAYOUTS]: false,
[PermissionFlagType.VIEWS]: false,
[PermissionFlagType.BILLING]: false,
[PermissionFlagType.AI_SETTINGS]: false,
[PermissionFlagType.AI]: false,
[PermissionFlagType.UPLOAD_FILE]: false,
[PermissionFlagType.DOWNLOAD_FILE]: false,
[PermissionFlagType.SEND_EMAIL_TOOL]: false,
[PermissionFlagType.IMPORT_CSV]: false,
[PermissionFlagType.EXPORT_CSV]: false,
[PermissionFlagType.CONNECTED_ACCOUNTS]: false,
[PermissionFlagType.IMPERSONATE]: false,
[PermissionFlagType.SSO_BYPASS]: false,
},
packages/twenty-server/src/engine/metadata-modules/permissions/utils/__tests__/permission-graphql-api-exception-handler.util.spec.ts
+101
View File
@@ -0,0 +1,101 @@
import {
ForbiddenError,
NotFoundError,
UserInputError,
} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import {
PermissionsException,
PermissionsExceptionCode,
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
import { permissionGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util';
describe('permissionGraphqlApiExceptionHandler', () => {
it('should throw ForbiddenError for PERMISSION_DENIED', () => {
const exception = new PermissionsException(
PermissionsExceptionMessage.PERMISSION_DENIED,
PermissionsExceptionCode.PERMISSION_DENIED,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
ForbiddenError,
);
});
it('should throw ForbiddenError for role-related forbidden cases', () => {
const exception = new PermissionsException(
'Cannot update self',
PermissionsExceptionCode.CANNOT_UPDATE_SELF_ROLE,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
ForbiddenError,
);
});
it('should throw UserInputError for INVALID_ARG', () => {
const exception = new PermissionsException(
'Invalid argument',
PermissionsExceptionCode.INVALID_ARG,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
UserInputError,
);
});
it('should throw UserInputError for permission validation errors', () => {
const exception = new PermissionsException(
'Empty field permission',
PermissionsExceptionCode.EMPTY_FIELD_PERMISSION_NOT_ALLOWED,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
UserInputError,
);
});
it('should throw NotFoundError for ROLE_NOT_FOUND', () => {
const exception = new PermissionsException(
'Role not found',
PermissionsExceptionCode.ROLE_NOT_FOUND,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
NotFoundError,
);
});
it('should throw NotFoundError for metadata not found cases', () => {
const exception = new PermissionsException(
'Object metadata not found',
PermissionsExceptionCode.OBJECT_METADATA_NOT_FOUND,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
NotFoundError,
);
});
it('should rethrow exception for METHOD_NOT_ALLOWED', () => {
const exception = new PermissionsException(
'Method not allowed',
PermissionsExceptionCode.METHOD_NOT_ALLOWED,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
exception,
);
});
it('should rethrow exception for internal error codes', () => {
const exception = new PermissionsException(
'Default role not found',
PermissionsExceptionCode.DEFAULT_ROLE_NOT_FOUND,
);
expect(() => permissionGraphqlApiExceptionHandler(exception)).toThrow(
exception,
);
});
});
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts
+2
View File
@@ -4,6 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { ForeignDataWrapperServerQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/foreign-data-wrapper-server-query.factory';
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RemoteServerEntity } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
import { RemoteServerResolver } from 'src/engine/metadata-modules/remote-server/remote-server.resolver';
import { RemoteServerService } from 'src/engine/metadata-modules/remote-server/remote-server.service';
@@ -13,6 +14,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
@Module({
imports: [
JwtModule,
PermissionsModule,
TypeOrmModule.forFeature([RemoteServerEntity]),
RemoteTableModule,
WorkspaceDataSourceModule,
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.resolver.ts
+5
View File
@@ -5,7 +5,9 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { CreateRemoteServerInput } from 'src/engine/metadata-modules/remote-server/dtos/create-remote-server.input';
import { RemoteServerIdInput } from 'src/engine/metadata-modules/remote-server/dtos/remote-server-id.input';
import { RemoteServerTypeInput } from 'src/engine/metadata-modules/remote-server/dtos/remote-server-type.input';
@@ -25,6 +27,7 @@ export class RemoteServerResolver {
) {}
@Mutation(() => RemoteServerDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async createOneRemoteServer(
@Args('input') input: CreateRemoteServerInput<RemoteServerType>,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -40,6 +43,7 @@ export class RemoteServerResolver {
}
@Mutation(() => RemoteServerDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async updateOneRemoteServer(
@Args('input') input: UpdateRemoteServerInput<RemoteServerType>,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -55,6 +59,7 @@ export class RemoteServerResolver {
}
@Mutation(() => RemoteServerDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async deleteOneRemoteServer(
@Args('input') { id }: RemoteServerIdInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts
+2
View File
@@ -4,6 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RemoteServerEntity } from 'src/engine/metadata-modules/remote-server/remote-server.entity';
import { DistantTableModule } from 'src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.module';
import { ForeignTableModule } from 'src/engine/metadata-modules/remote-server/remote-table/foreign-table/foreign-table.module';
@@ -21,6 +22,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
DataSourceModule,
ObjectMetadataModule,
FieldMetadataModule,
PermissionsModule,
WorkspaceMetadataVersionModule,
WorkspaceDataSourceModule,
ForeignTableModule,
packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.resolver.ts
+5
View File
@@ -5,7 +5,9 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { FindManyRemoteTablesInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/find-many-remote-tables-input';
import { RemoteTableInput } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table-input';
import { RemoteTableDTO } from 'src/engine/metadata-modules/remote-server/remote-table/dtos/remote-table.dto';
@@ -36,6 +38,7 @@ export class RemoteTableResolver {
}
@Mutation(() => RemoteTableDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async syncRemoteTable(
@Args('input') input: RemoteTableInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -48,6 +51,7 @@ export class RemoteTableResolver {
}
@Mutation(() => RemoteTableDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async unsyncRemoteTable(
@Args('input') input: RemoteTableInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -63,6 +67,7 @@ export class RemoteTableResolver {
}
@Mutation(() => RemoteTableDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.DATA_MODEL))
async syncRemoteTableSchemaChanges(
@Args('input') input: RemoteTableInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/route-trigger/resolvers/route-trigger.resolver.ts
+11 -2
View File
@@ -8,7 +8,10 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { CreateRouteTriggerInput } from 'src/engine/metadata-modules/route-trigger/dtos/create-route-trigger.input';
import { RouteTriggerIdInput } from 'src/engine/metadata-modules/route-trigger/dtos/route-trigger-id.input';
import { RouteTriggerDTO } from 'src/engine/metadata-modules/route-trigger/dtos/route-trigger.dto';
@@ -17,10 +20,16 @@ import { RouteTriggerEntity } from 'src/engine/metadata-modules/route-trigger/ro
import { RouteTriggerV2Service } from 'src/engine/metadata-modules/route-trigger/services/route-trigger-v2.service';
import { routeTriggerGraphQLApiExceptionHandler } from 'src/engine/metadata-modules/route-trigger/utils/route-trigger-graphql-api-exception-handler.utils';
@UseGuards(WorkspaceAuthGuard)
@UseGuards(
WorkspaceAuthGuard,
SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS),
)
@Resolver()
@UsePipes(ResolverValidationPipe)
@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)
@UseFilters(
PreventNestToAutoLogGraphqlErrorsFilter,
PermissionsGraphqlApiExceptionFilter,
)
export class RouteTriggerResolver {
constructor(
private readonly routeV2Service: RouteTriggerV2Service,
packages/twenty-server/src/engine/metadata-modules/route-trigger/route-trigger.module.ts
+2
View File
@@ -4,6 +4,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RouteTriggerResolver } from 'src/engine/metadata-modules/route-trigger/resolvers/route-trigger.resolver';
import { RouteTriggerController } from 'src/engine/metadata-modules/route-trigger/route-trigger.controller';
import { RouteTriggerEntity } from 'src/engine/metadata-modules/route-trigger/route-trigger.entity';
@@ -20,6 +21,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
WorkspaceDomainsModule,
ServerlessFunctionModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
PermissionsModule,
WorkspaceMigrationV2Module,
],
controllers: [RouteTriggerController],
packages/twenty-server/src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.module.ts
+6 -2
View File
@@ -1,12 +1,16 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ServerlessFunctionLayerEntity } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.entity';
import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
import { ServerlessFunctionLayerResolver } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.resolver';
import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
@Module({
imports: [TypeOrmModule.forFeature([ServerlessFunctionLayerEntity])],
imports: [
PermissionsModule,
TypeOrmModule.forFeature([ServerlessFunctionLayerEntity]),
],
providers: [ServerlessFunctionLayerService, ServerlessFunctionLayerResolver],
exports: [ServerlessFunctionLayerService],
})
packages/twenty-server/src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.resolver.ts
+6 -3
View File
@@ -1,12 +1,14 @@
import { UseGuards } from '@nestjs/common';
import { Args, Mutation, Resolver } from '@nestjs/graphql';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { CreateServerlessFunctionLayerInput } from 'src/engine/metadata-modules/serverless-function-layer/dtos/create-serverless-function-layer.input';
import { ServerlessFunctionLayerDTO } from 'src/engine/metadata-modules/serverless-function-layer/dtos/serverless-function-layer.dto';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
@UseGuards(WorkspaceAuthGuard)
@Resolver()
@@ -16,6 +18,7 @@ export class ServerlessFunctionLayerResolver {
) {}
@Mutation(() => ServerlessFunctionLayerDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async createOneServerlessFunctionLayer(
@Args()
createServerlessFunctionLayerInput: CreateServerlessFunctionLayerInput,
packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.module.ts
+2
View File
@@ -12,6 +12,7 @@ import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.mod
import { CronTriggerEntity } from 'src/engine/metadata-modules/cron-trigger/entities/cron-trigger.entity';
import { DatabaseEventTriggerEntity } from 'src/engine/metadata-modules/database-event-trigger/entities/database-event-trigger.entity';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RouteTriggerEntity } from 'src/engine/metadata-modules/route-trigger/route-trigger.entity';
import { ServerlessFunctionLayerModule } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.module';
import { ServerlessFunctionTriggerJob } from 'src/engine/metadata-modules/serverless-function/jobs/serverless-function-trigger.job';
@@ -36,6 +37,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
ThrottlerModule,
AuditModule,
FeatureFlagModule,
PermissionsModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
WorkspaceMigrationV2Module,
ServerlessFunctionLayerModule,
packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts
+8 -1
View File
@@ -10,7 +10,10 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/re
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionsGuard } from 'src/engine/guards/settings-permissions.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { CreateServerlessFunctionInput } from 'src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input';
import { ExecuteServerlessFunctionInput } from 'src/engine/metadata-modules/serverless-function/dtos/execute-serverless-function.input';
import { GetServerlessFunctionSourceCodeInput } from 'src/engine/metadata-modules/serverless-function/dtos/get-serverless-function-source-code.input';
import { PublishServerlessFunctionInput } from 'src/engine/metadata-modules/serverless-function/dtos/publish-serverless-function.input';
@@ -21,7 +24,6 @@ import { UpdateServerlessFunctionInput } from 'src/engine/metadata-modules/serve
import { ServerlessFunctionEntity } from 'src/engine/metadata-modules/serverless-function/serverless-function.entity';
import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverless-function/serverless-function.service';
import { serverlessFunctionGraphQLApiExceptionHandler } from 'src/engine/metadata-modules/serverless-function/utils/serverless-function-graphql-api-exception-handler.utils';
import { CreateServerlessFunctionInput } from 'src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input';
@UseGuards(WorkspaceAuthGuard, FeatureFlagGuard)
@Resolver()
@@ -92,6 +94,7 @@ export class ServerlessFunctionResolver {
}
@Mutation(() => ServerlessFunctionDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async deleteOneServerlessFunction(
@Args('input') input: ServerlessFunctionIdInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -107,6 +110,7 @@ export class ServerlessFunctionResolver {
}
@Mutation(() => ServerlessFunctionDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async updateOneServerlessFunction(
@Args('input')
input: UpdateServerlessFunctionInput,
@@ -123,6 +127,7 @@ export class ServerlessFunctionResolver {
}
@Mutation(() => ServerlessFunctionDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async createOneServerlessFunction(
@Args('input')
input: CreateServerlessFunctionInput,
@@ -139,6 +144,7 @@ export class ServerlessFunctionResolver {
}
@Mutation(() => ServerlessFunctionExecutionResultDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async executeOneServerlessFunction(
@Args('input') input: ExecuteServerlessFunctionInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -158,6 +164,7 @@ export class ServerlessFunctionResolver {
}
@Mutation(() => ServerlessFunctionDTO)
@UseGuards(SettingsPermissionsGuard(PermissionFlagType.WORKFLOWS))
async publishServerlessFunction(
@Args('input') input: PublishServerlessFunctionInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts
+6
View File
@@ -32,6 +32,9 @@ import {
import { ViewFieldRestApiExceptionFilter } from 'src/engine/metadata-modules/view-field/filters/view-field-rest-api-exception.filter';
import { ViewFieldV2Service } from 'src/engine/metadata-modules/view-field/services/view-field-v2.service';
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';
@Controller('rest/metadata/viewFields')
@UseGuards(WorkspaceAuthGuard)
@@ -81,6 +84,7 @@ export class ViewFieldController {
}
@Patch(':id')
@UseGuards(UpdateViewFieldPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewFieldInput['update'],
@@ -122,6 +126,7 @@ export class ViewFieldController {
}
@Post()
@UseGuards(CreateViewFieldPermissionGuard)
async create(
@Body() input: CreateViewFieldInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -161,6 +166,7 @@ export class ViewFieldController {
}
@Delete(':id')
@UseGuards(DeleteViewFieldPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-field/exceptions/view-field.exception.ts
+4
View File
@@ -17,6 +17,7 @@ export class ViewFieldException extends CustomException {
export enum ViewFieldExceptionCode {
VIEW_FIELD_NOT_FOUND = 'VIEW_FIELD_NOT_FOUND',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
INVALID_VIEW_FIELD_DATA = 'INVALID_VIEW_FIELD_DATA',
}
@@ -24,6 +25,7 @@ export enum ViewFieldExceptionMessageKey {
WORKSPACE_ID_REQUIRED = 'WORKSPACE_ID_REQUIRED',
VIEW_ID_REQUIRED = 'VIEW_ID_REQUIRED',
VIEW_FIELD_NOT_FOUND = 'VIEW_FIELD_NOT_FOUND',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
INVALID_VIEW_FIELD_DATA = 'INVALID_VIEW_FIELD_DATA',
FIELD_METADATA_ID_REQUIRED = 'FIELD_METADATA_ID_REQUIRED',
VIEW_FIELD_ALREADY_EXISTS = 'VIEW_FIELD_ALREADY_EXISTS',
@@ -40,6 +42,8 @@ export const generateViewFieldExceptionMessage = (
return 'ViewId is required';
case ViewFieldExceptionMessageKey.VIEW_FIELD_NOT_FOUND:
return `View field${id ? ` (id: ${id})` : ''} not found`;
case ViewFieldExceptionMessageKey.VIEW_NOT_FOUND:
return `View${id ? ` (id: ${id})` : ''} not found`;
case ViewFieldExceptionMessageKey.INVALID_VIEW_FIELD_DATA:
return `Invalid view field data${id ? ` for view field id: ${id}` : ''}`;
case ViewFieldExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
packages/twenty-server/src/engine/metadata-modules/view-field/resolvers/view-field.resolver.ts
+11 -11
View File
@@ -18,6 +18,10 @@ import {
} from 'src/engine/metadata-modules/view-field/exceptions/view-field.exception';
import { ViewFieldV2Service } from 'src/engine/metadata-modules/view-field/services/view-field-v2.service';
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';
@Resolver(() => ViewFieldDTO)
@@ -47,6 +51,7 @@ export class ViewFieldResolver {
}
@Mutation(() => ViewFieldDTO)
@UseGuards(UpdateViewFieldPermissionGuard)
async updateCoreViewField(
@Args('input') updateViewFieldInput: UpdateViewFieldInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -72,6 +77,7 @@ export class ViewFieldResolver {
}
@Mutation(() => ViewFieldDTO)
@UseGuards(CreateViewFieldPermissionGuard)
async createCoreViewField(
@Args('input') createViewFieldInput: CreateViewFieldInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -96,6 +102,7 @@ export class ViewFieldResolver {
}
@Mutation(() => [ViewFieldDTO])
@UseGuards(CreateViewFieldPermissionGuard)
async createManyCoreViewFields(
@Args('inputs', { type: () => [CreateViewFieldInput] })
createViewFieldInputs: CreateViewFieldInput[],
@@ -121,6 +128,7 @@ export class ViewFieldResolver {
}
@Mutation(() => ViewFieldDTO)
@UseGuards(DeleteViewFieldPermissionGuard)
async deleteCoreViewField(
@Args('input') deleteViewFieldInput: DeleteViewFieldInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -137,15 +145,12 @@ export class ViewFieldResolver {
workspaceId,
});
}
const deletedViewField = await this.viewFieldService.delete(
deleteViewFieldInput.id,
workspaceId,
);
return deletedViewField;
return this.viewFieldService.delete(deleteViewFieldInput.id, workspaceId);
}
@Mutation(() => ViewFieldDTO)
@UseGuards(DestroyViewFieldPermissionGuard)
async destroyCoreViewField(
@Args('input') destroyViewFieldInput: DestroyViewFieldInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -163,11 +168,6 @@ export class ViewFieldResolver {
});
}
const deletedViewField = await this.viewFieldService.destroy(
destroyViewFieldInput.id,
workspaceId,
);
return deletedViewField;
return this.viewFieldService.destroy(destroyViewFieldInput.id, workspaceId);
}
}
packages/twenty-server/src/engine/metadata-modules/view-field/services/tests/view-field.service.spec.ts
+8 -2
View File
@@ -513,12 +513,18 @@ describe('ViewFieldService', () => {
const id = 'view-field-id';
const workspaceId = 'workspace-id';
jest.spyOn(viewFieldService, 'findById').mockResolvedValue(mockViewField);
jest
.spyOn(viewFieldRepository, 'findOne')
.mockResolvedValue(mockViewField);
jest.spyOn(viewFieldRepository, 'delete').mockResolvedValue({} as any);
const result = await viewFieldService.destroy(id, workspaceId);
expect(viewFieldService.findById).toHaveBeenCalledWith(id, workspaceId);
expect(viewFieldRepository.findOne).toHaveBeenCalledWith({
where: { id, workspaceId },
relations: ['workspace', 'view'],
withDeleted: true,
});
expect(viewFieldRepository.delete).toHaveBeenCalledWith(id);
expect(result).toBeDefined();
});
packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts
+9 -1
View File
@@ -205,6 +205,7 @@ export class ViewFieldService {
ViewFieldExceptionCode.VIEW_FIELD_NOT_FOUND,
);
}
const viewId = existingViewField.viewId;
if (this.updatesPosition(updateData)) {
@@ -257,7 +258,14 @@ export class ViewFieldService {
}
async destroy(id: string, workspaceId: string): Promise<ViewFieldEntity> {
const viewField = await this.findById(id, workspaceId);
const viewField = await this.viewFieldRepository.findOne({
where: {
id,
workspaceId,
},
relations: ['workspace', 'view'],
withDeleted: true,
});
if (!isDefined(viewField)) {
throw new ViewFieldException(
packages/twenty-server/src/engine/metadata-modules/view-field/view-field.module.ts
+4
View File
@@ -3,11 +3,13 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewFieldController } from 'src/engine/metadata-modules/view-field/controllers/view-field.controller';
import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
import { ViewFieldResolver } from 'src/engine/metadata-modules/view-field/resolvers/view-field.resolver';
import { ViewFieldV2Service } from 'src/engine/metadata-modules/view-field/services/view-field-v2.service';
import { ViewFieldService } from 'src/engine/metadata-modules/view-field/services/view-field.service';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
@@ -17,8 +19,10 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
TypeOrmModule.forFeature([ViewFieldEntity, ViewEntity]),
WorkspaceCacheStorageModule,
FeatureFlagModule,
PermissionsModule,
WorkspaceMigrationV2Module,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
ViewPermissionsModule,
],
controllers: [ViewFieldController],
providers: [ViewFieldService, ViewFieldResolver, ViewFieldV2Service],
packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts
+6
View File
@@ -28,6 +28,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';
@Controller('rest/metadata/viewFilterGroups')
@UseGuards(WorkspaceAuthGuard)
@@ -79,6 +82,7 @@ export class ViewFilterGroupController {
}
@Post()
@UseGuards(CreateViewFilterGroupPermissionGuard)
async create(
@Body() input: CreateViewFilterGroupInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -90,6 +94,7 @@ export class ViewFilterGroupController {
}
@Patch(':id')
@UseGuards(UpdateViewFilterGroupPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewFilterGroupInput,
@@ -105,6 +110,7 @@ export class ViewFilterGroupController {
}
@Delete(':id')
@UseGuards(DeleteViewFilterGroupPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-filter-group/exceptions/view-filter-group.exception.ts
+5 -1
View File
@@ -1,5 +1,5 @@
import { msg } from '@lingui/core/macro';
import { type MessageDescriptor } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { assertUnreachable } from 'twenty-shared/utils';
import { CustomException } from 'src/utils/custom-exception';
@@ -18,6 +18,7 @@ export class ViewFilterGroupException extends CustomException {
export enum ViewFilterGroupExceptionCode {
VIEW_FILTER_GROUP_NOT_FOUND = 'VIEW_FILTER_GROUP_NOT_FOUND',
INVALID_VIEW_FILTER_GROUP_DATA = 'INVALID_VIEW_FILTER_GROUP_DATA',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export enum ViewFilterGroupExceptionMessageKey {
@@ -26,6 +27,7 @@ export enum ViewFilterGroupExceptionMessageKey {
VIEW_FILTER_GROUP_NOT_FOUND = 'VIEW_FILTER_GROUP_NOT_FOUND',
INVALID_VIEW_FILTER_GROUP_DATA = 'INVALID_VIEW_FILTER_GROUP_DATA',
FIELD_METADATA_ID_REQUIRED = 'FIELD_METADATA_ID_REQUIRED',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export const generateViewFilterGroupExceptionMessage = (
@@ -43,6 +45,8 @@ export const generateViewFilterGroupExceptionMessage = (
return `Invalid view filter group data${id ? ` for view filter group id: ${id}` : ''}`;
case ViewFilterGroupExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
return 'FieldMetadataId is required';
case ViewFilterGroupExceptionMessageKey.VIEW_NOT_FOUND:
return `View${id ? ` (id: ${id})` : ''} not found`;
default:
assertUnreachable(key);
}
packages/twenty-server/src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver.ts
+9 -6
View File
@@ -10,6 +10,10 @@ import { CreateViewFilterGroupInput } from 'src/engine/metadata-modules/view-fil
import { 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';
@Resolver(() => ViewFilterGroupDTO)
@@ -42,6 +46,7 @@ export class ViewFilterGroupResolver {
}
@Mutation(() => ViewFilterGroupDTO)
@UseGuards(CreateViewFilterGroupPermissionGuard)
async createCoreViewFilterGroup(
@Args('input') input: CreateViewFilterGroupInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -53,6 +58,7 @@ export class ViewFilterGroupResolver {
}
@Mutation(() => ViewFilterGroupDTO)
@UseGuards(UpdateViewFilterGroupPermissionGuard)
async updateCoreViewFilterGroup(
@Args('id', { type: () => String }) id: string,
@Args('input') input: UpdateViewFilterGroupInput,
@@ -62,6 +68,7 @@ export class ViewFilterGroupResolver {
}
@Mutation(() => Boolean)
@UseGuards(DeleteViewFilterGroupPermissionGuard)
async deleteCoreViewFilterGroup(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -75,15 +82,11 @@ export class ViewFilterGroupResolver {
}
@Mutation(() => Boolean)
@UseGuards(DestroyViewFilterGroupPermissionGuard)
async destroyCoreViewFilterGroup(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<boolean> {
const deletedViewFilterGroup = await this.viewFilterGroupService.destroy(
id,
workspace.id,
);
return isDefined(deletedViewFilterGroup);
return this.viewFilterGroupService.destroy(id, workspace.id);
}
}
packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts
+12 -5
View File
@@ -344,7 +344,7 @@ describe('ViewFilterGroupService', () => {
const workspaceId = 'workspace-id';
jest
.spyOn(viewFilterGroupService, 'findById')
.spyOn(viewFilterGroupRepository, 'findOne')
.mockResolvedValue(mockViewFilterGroup);
jest
.spyOn(viewFilterGroupRepository, 'delete')
@@ -352,10 +352,17 @@ describe('ViewFilterGroupService', () => {
const result = await viewFilterGroupService.destroy(id, workspaceId);
expect(viewFilterGroupService.findById).toHaveBeenCalledWith(
id,
workspaceId,
);
expect(viewFilterGroupRepository.findOne).toHaveBeenCalledWith({
where: { id, workspaceId },
relations: [
'workspace',
'view',
'viewFilters',
'parentViewFilterGroup',
'childViewFilterGroups',
],
withDeleted: true,
});
expect(viewFilterGroupRepository.delete).toHaveBeenCalledWith(id);
expect(result).toEqual(true);
});
packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts
+14 -1
View File
@@ -180,7 +180,20 @@ export class ViewFilterGroupService {
}
async destroy(id: string, workspaceId: string): Promise<boolean> {
const viewFilterGroup = await this.findById(id, workspaceId);
const viewFilterGroup = await this.viewFilterGroupRepository.findOne({
where: {
id,
workspaceId,
},
relations: [
'workspace',
'view',
'viewFilters',
'parentViewFilterGroup',
'childViewFilterGroups',
],
withDeleted: true,
});
if (!isDefined(viewFilterGroup)) {
throw new ViewFilterGroupException(
packages/twenty-server/src/engine/metadata-modules/view-filter-group/view-filter-group.module.ts
+6 -1
View File
@@ -1,16 +1,21 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewFilterGroupController } from 'src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller';
import { ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';
import { ViewFilterGroupResolver } from 'src/engine/metadata-modules/view-filter-group/resolvers/view-filter-group.resolver';
import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
@Module({
imports: [
TypeOrmModule.forFeature([ViewFilterGroupEntity]),
TypeOrmModule.forFeature([ViewFilterGroupEntity, ViewEntity]),
PermissionsModule,
WorkspaceCacheStorageModule,
ViewPermissionsModule,
],
controllers: [ViewFilterGroupController],
providers: [ViewFilterGroupService, ViewFilterGroupResolver],
packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts
+6
View File
@@ -31,6 +31,9 @@ import {
import { ViewFilterRestApiExceptionFilter } from 'src/engine/metadata-modules/view-filter/filters/view-filter-rest-api-exception.filter';
import { ViewFilterV2Service } from 'src/engine/metadata-modules/view-filter/services/view-filter-v2.service';
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';
@Controller('rest/metadata/viewFilters')
@UseGuards(WorkspaceAuthGuard)
@@ -80,6 +83,7 @@ export class ViewFilterController {
}
@Post()
@UseGuards(CreateViewFilterPermissionGuard)
async create(
@Body() input: CreateViewFilterInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -104,6 +108,7 @@ export class ViewFilterController {
}
@Patch(':id')
@UseGuards(UpdateViewFilterPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewFilterInput,
@@ -137,6 +142,7 @@ export class ViewFilterController {
}
@Delete(':id')
@UseGuards(DeleteViewFilterPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-filter/dtos/inputs/update-view-filter.input.ts
+1 -1
View File
@@ -1,5 +1,6 @@
import { Field, InputType } from '@nestjs/graphql';
import { Type } from 'class-transformer';
import {
IsEnum,
IsNotEmpty,
@@ -11,7 +12,6 @@ import {
} from 'class-validator';
import GraphQLJSON from 'graphql-type-json';
import { ViewFilterOperand } from 'twenty-shared/types';
import { Type } from 'class-transformer';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { ViewFilterValue } from 'src/engine/metadata-modules/view-filter/types/view-filter-value.type';
packages/twenty-server/src/engine/metadata-modules/view-filter/exceptions/view-filter.exception.ts
+5 -1
View File
@@ -1,5 +1,5 @@
import { msg } from '@lingui/core/macro';
import { type MessageDescriptor } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { assertUnreachable } from 'twenty-shared/utils';
import { CustomException } from 'src/utils/custom-exception';
@@ -18,6 +18,7 @@ export class ViewFilterException extends CustomException {
export enum ViewFilterExceptionCode {
VIEW_FILTER_NOT_FOUND = 'VIEW_FILTER_NOT_FOUND',
INVALID_VIEW_FILTER_DATA = 'INVALID_VIEW_FILTER_DATA',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export enum ViewFilterExceptionMessageKey {
@@ -26,6 +27,7 @@ export enum ViewFilterExceptionMessageKey {
VIEW_FILTER_NOT_FOUND = 'VIEW_FILTER_NOT_FOUND',
INVALID_VIEW_FILTER_DATA = 'INVALID_VIEW_FILTER_DATA',
FIELD_METADATA_ID_REQUIRED = 'FIELD_METADATA_ID_REQUIRED',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export const generateViewFilterExceptionMessage = (
@@ -43,6 +45,8 @@ export const generateViewFilterExceptionMessage = (
return `Invalid view filter data${id ? ` for view filter id: ${id}` : ''}`;
case ViewFilterExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
return 'FieldMetadataId is required';
case ViewFilterExceptionMessageKey.VIEW_NOT_FOUND:
return `View${id ? ` (id: ${id})` : ''} not found`;
default:
assertUnreachable(key);
}
packages/twenty-server/src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver.ts
+11 -12
View File
@@ -13,6 +13,10 @@ import { UpdateViewFilterInput } from 'src/engine/metadata-modules/view-filter/d
import { ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view-filter.dto';
import { ViewFilterV2Service } from 'src/engine/metadata-modules/view-filter/services/view-filter-v2.service';
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';
@Resolver(() => ViewFilterDTO)
@@ -47,6 +51,7 @@ export class ViewFilterResolver {
}
@Mutation(() => ViewFilterDTO)
@UseGuards(CreateViewFilterPermissionGuard)
async createCoreViewFilter(
@Args('input') createViewFilterInput: CreateViewFilterInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -71,6 +76,7 @@ export class ViewFilterResolver {
}
@Mutation(() => ViewFilterDTO)
@UseGuards(UpdateViewFilterPermissionGuard)
async updateCoreViewFilter(
@Args('input') updateViewFilterInput: UpdateViewFilterInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -96,6 +102,7 @@ export class ViewFilterResolver {
}
@Mutation(() => ViewFilterDTO)
@UseGuards(DeleteViewFilterPermissionGuard)
async deleteCoreViewFilter(
@Args('input') deleteViewFilterInput: DeleteViewFilterInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -113,15 +120,11 @@ export class ViewFilterResolver {
});
}
const deletedViewFilter = await this.viewFilterService.delete(
deleteViewFilterInput.id,
workspaceId,
);
return deletedViewFilter;
return this.viewFilterService.delete(deleteViewFilterInput.id, workspaceId);
}
@Mutation(() => ViewFilterDTO)
@UseGuards(DestroyViewFilterPermissionGuard)
async destroyCoreViewFilter(
@Args('input') destroyViewFilterInput: DestroyViewFilterInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -133,19 +136,15 @@ export class ViewFilterResolver {
);
if (isWorkspaceMigrationV2Enabled) {
const destroyedViewFilter = await this.viewFilterV2Service.destroyOne({
return await this.viewFilterV2Service.destroyOne({
destroyViewFilterInput,
workspaceId,
});
return destroyedViewFilter;
}
const destroyedViewFilter = await this.viewFilterService.destroy(
return this.viewFilterService.destroy(
destroyViewFilterInput.id,
workspaceId,
);
return destroyedViewFilter;
}
}
packages/twenty-server/src/engine/metadata-modules/view-filter/services/tests/view-filter.service.spec.ts
+6 -2
View File
@@ -325,13 +325,17 @@ describe('ViewFilterService', () => {
const workspaceId = 'workspace-id';
jest
.spyOn(viewFilterService, 'findById')
.spyOn(viewFilterRepository, 'findOne')
.mockResolvedValue(mockViewFilter);
jest.spyOn(viewFilterRepository, 'delete').mockResolvedValue({} as any);
const result = await viewFilterService.destroy(id, workspaceId);
expect(viewFilterService.findById).toHaveBeenCalledWith(id, workspaceId);
expect(viewFilterRepository.findOne).toHaveBeenCalledWith({
where: { id, workspaceId },
relations: ['workspace', 'view', 'viewFilterGroup'],
withDeleted: true,
});
expect(viewFilterRepository.delete).toHaveBeenCalledWith(id);
expect(result).toEqual(mockViewFilter);
});
packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts
+8 -1
View File
@@ -169,7 +169,14 @@ export class ViewFilterService {
}
async destroy(id: string, workspaceId: string): Promise<ViewFilterEntity> {
const viewFilter = await this.findById(id, workspaceId);
const viewFilter = await this.viewFilterRepository.findOne({
where: {
id,
workspaceId,
},
relations: ['workspace', 'view', 'viewFilterGroup'],
withDeleted: true,
});
if (!isDefined(viewFilter)) {
throw new ViewFilterException(
packages/twenty-server/src/engine/metadata-modules/view-filter/view-filter.module.ts
+4
View File
@@ -3,11 +3,13 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewFilterController } from 'src/engine/metadata-modules/view-filter/controllers/view-filter.controller';
import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';
import { ViewFilterResolver } from 'src/engine/metadata-modules/view-filter/resolvers/view-filter.resolver';
import { ViewFilterV2Service } from 'src/engine/metadata-modules/view-filter/services/view-filter-v2.service';
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
@@ -17,8 +19,10 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
TypeOrmModule.forFeature([ViewFilterEntity, ViewEntity]),
WorkspaceCacheStorageModule,
FeatureFlagModule,
PermissionsModule,
WorkspaceMigrationV2Module,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
ViewPermissionsModule,
],
controllers: [ViewFilterController],
providers: [ViewFilterService, ViewFilterResolver, ViewFilterV2Service],
packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts
+6
View File
@@ -31,6 +31,9 @@ import {
import { ViewGroupRestApiExceptionFilter } from 'src/engine/metadata-modules/view-group/filters/view-group-rest-api-exception.filter';
import { ViewGroupV2Service } from 'src/engine/metadata-modules/view-group/services/view-group-v2.service';
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';
@Controller('rest/metadata/viewGroups')
@UseGuards(WorkspaceAuthGuard)
@@ -80,6 +83,7 @@ export class ViewGroupController {
}
@Post()
@UseGuards(CreateViewGroupPermissionGuard)
async create(
@Body() input: CreateViewGroupInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -104,6 +108,7 @@ export class ViewGroupController {
}
@Patch(':id')
@UseGuards(UpdateViewGroupPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewGroupInput,
@@ -137,6 +142,7 @@ export class ViewGroupController {
}
@Delete(':id')
@UseGuards(DeleteViewGroupPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-group/dtos/inputs/update-view-group.input.ts
+1 -1
View File
@@ -1,5 +1,6 @@
import { Field, InputType } from '@nestjs/graphql';
import { Type } from 'class-transformer';
import {
IsBoolean,
IsNotEmpty,
@@ -9,7 +10,6 @@ import {
IsUUID,
ValidateNested,
} from 'class-validator';
import { Type } from 'class-transformer';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
packages/twenty-server/src/engine/metadata-modules/view-group/exceptions/view-group.exception.ts
+6 -4
View File
@@ -1,5 +1,6 @@
import { type MessageDescriptor } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { assertUnreachable } from 'twenty-shared/utils';
import { CustomException } from 'src/utils/custom-exception';
@@ -17,6 +18,7 @@ export class ViewGroupException extends CustomException {
export enum ViewGroupExceptionCode {
VIEW_GROUP_NOT_FOUND = 'VIEW_GROUP_NOT_FOUND',
INVALID_VIEW_GROUP_DATA = 'INVALID_VIEW_GROUP_DATA',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export enum ViewGroupExceptionMessageKey {
@@ -25,6 +27,7 @@ export enum ViewGroupExceptionMessageKey {
VIEW_GROUP_NOT_FOUND = 'VIEW_GROUP_NOT_FOUND',
INVALID_VIEW_GROUP_DATA = 'INVALID_VIEW_GROUP_DATA',
FIELD_METADATA_ID_REQUIRED = 'FIELD_METADATA_ID_REQUIRED',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export const generateViewGroupExceptionMessage = (
@@ -42,8 +45,10 @@ export const generateViewGroupExceptionMessage = (
return `Invalid view group data${id ? ` for view group id: ${id}` : ''}`;
case ViewGroupExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
return 'FieldMetadataId is required';
case ViewGroupExceptionMessageKey.VIEW_NOT_FOUND:
return `View${id ? ` (id: ${id})` : ''} not found`;
default:
return 'unknown';
assertUnreachable(key);
}
};
@@ -57,8 +62,5 @@ export const generateViewGroupUserFriendlyExceptionMessage = (
return msg`ViewId is required to create a view group.`;
case ViewGroupExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
return msg`FieldMetadataId is required to create a view group.`;
default: {
return msg`unknown`;
}
}
};
packages/twenty-server/src/engine/metadata-modules/view-group/resolvers/view-group.resolver.ts
+12 -15
View File
@@ -17,6 +17,10 @@ import {
} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';
import { ViewGroupV2Service } from 'src/engine/metadata-modules/view-group/services/view-group-v2.service';
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 { 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 { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
@Resolver(() => ViewGroupDTO)
@@ -51,6 +55,7 @@ export class ViewGroupResolver {
}
@Mutation(() => ViewGroupDTO)
@UseGuards(CreateViewGroupPermissionGuard)
async createCoreViewGroup(
@Args('input') createViewGroupInput: CreateViewGroupInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -75,6 +80,7 @@ export class ViewGroupResolver {
}
@Mutation(() => [ViewGroupDTO])
@UseGuards(CreateViewGroupPermissionGuard)
async createManyCoreViewGroups(
@Args('inputs', { type: () => [CreateViewGroupInput] })
createViewGroupInputs: CreateViewGroupInput[],
@@ -100,6 +106,7 @@ export class ViewGroupResolver {
}
@Mutation(() => ViewGroupDTO)
@UseGuards(UpdateViewGroupPermissionGuard)
async updateCoreViewGroup(
@Args('input') updateViewGroupInput: UpdateViewGroupInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -125,6 +132,7 @@ export class ViewGroupResolver {
}
@Mutation(() => ViewGroupDTO)
@UseGuards(DeleteViewGroupPermissionGuard)
async deleteCoreViewGroup(
@Args('input') deleteViewGroupInput: DeleteViewGroupInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -142,15 +150,11 @@ export class ViewGroupResolver {
});
}
const deletedViewGroup = await this.viewGroupService.delete(
deleteViewGroupInput.id,
workspaceId,
);
return deletedViewGroup;
return this.viewGroupService.delete(deleteViewGroupInput.id, workspaceId);
}
@Mutation(() => ViewGroupDTO)
@UseGuards(DestroyViewGroupPermissionGuard)
async destroyCoreViewGroup(
@Args('input') destroyViewGroupInput: DestroyViewGroupInput,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
@@ -162,19 +166,12 @@ export class ViewGroupResolver {
);
if (isWorkspaceMigrationV2Enabled) {
const destroyedViewGroup = await this.viewGroupV2Service.destroyOne({
return await this.viewGroupV2Service.destroyOne({
destroyViewGroupInput,
workspaceId,
});
return destroyedViewGroup;
}
const destroyedViewGroup = await this.viewGroupService.destroy(
destroyViewGroupInput.id,
workspaceId,
);
return destroyedViewGroup;
return this.viewGroupService.destroy(destroyViewGroupInput.id, workspaceId);
}
}
packages/twenty-server/src/engine/metadata-modules/view-group/services/tests/view-group.service.spec.ts
+8 -2
View File
@@ -308,12 +308,18 @@ describe('ViewGroupService', () => {
const id = 'view-group-id';
const workspaceId = 'workspace-id';
jest.spyOn(viewGroupService, 'findById').mockResolvedValue(mockViewGroup);
jest
.spyOn(viewGroupRepository, 'findOne')
.mockResolvedValue(mockViewGroup);
jest.spyOn(viewGroupRepository, 'delete').mockResolvedValue({} as any);
const result = await viewGroupService.destroy(id, workspaceId);
expect(viewGroupService.findById).toHaveBeenCalledWith(id, workspaceId);
expect(viewGroupRepository.findOne).toHaveBeenCalledWith({
where: { id, workspaceId },
relations: ['workspace', 'view'],
withDeleted: true,
});
expect(viewGroupRepository.delete).toHaveBeenCalledWith(id);
expect(result).toEqual(mockViewGroup);
});
packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts
+8 -1
View File
@@ -169,7 +169,14 @@ export class ViewGroupService {
}
async destroy(id: string, workspaceId: string): Promise<ViewGroupEntity> {
const viewGroup = await this.findById(id, workspaceId);
const viewGroup = await this.viewGroupRepository.findOne({
where: {
id,
workspaceId,
},
relations: ['workspace', 'view'],
withDeleted: true,
});
if (!isDefined(viewGroup)) {
throw new ViewGroupException(
packages/twenty-server/src/engine/metadata-modules/view-group/view-group.module.ts
+6 -1
View File
@@ -3,21 +3,26 @@ import { TypeOrmModule } from '@nestjs/typeorm';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewGroupController } from 'src/engine/metadata-modules/view-group/controllers/view-group.controller';
import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';
import { ViewGroupResolver } from 'src/engine/metadata-modules/view-group/resolvers/view-group.resolver';
import { ViewGroupV2Service } from 'src/engine/metadata-modules/view-group/services/view-group-v2.service';
import { ViewGroupService } from 'src/engine/metadata-modules/view-group/services/view-group.service';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';
@Module({
imports: [
TypeOrmModule.forFeature([ViewGroupEntity]),
TypeOrmModule.forFeature([ViewGroupEntity, ViewEntity]),
WorkspaceCacheStorageModule,
FeatureFlagModule,
PermissionsModule,
WorkspaceMigrationV2Module,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
ViewPermissionsModule,
],
controllers: [ViewGroupController],
providers: [ViewGroupService, ViewGroupV2Service, ViewGroupResolver],
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-field-permission.guard.ts
+45
View File
@@ -0,0 +1,45 @@
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;
// For GraphQL: extract from args.input or args.inputs
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;
}
// For REST: extract from request body
if (!viewId && typeof request.body?.viewId === 'string') {
viewId = request.body.viewId;
}
return this.viewAccessService.canUserModifyViewByChildEntity(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-group-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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 CreateViewFilterGroupPermissionGuard 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;
// For GraphQL: extract from args.input
const args = gqlContext.getArgs();
if (typeof args?.input?.viewId === 'string') {
viewId = args.input.viewId;
}
// For REST: extract from request body
if (!viewId && typeof request.body?.viewId === 'string') {
viewId = request.body.viewId;
}
return this.viewAccessService.canUserModifyViewByChildEntity(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-filter-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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;
// For GraphQL: extract from args.input
const args = gqlContext.getArgs();
if (typeof args?.input?.viewId === 'string') {
viewId = args.input.viewId;
}
// For REST: extract from request body
if (!viewId && typeof request.body?.viewId === 'string') {
viewId = request.body.viewId;
}
return this.viewAccessService.canUserModifyViewByChildEntity(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-group-permission.guard.ts
+45
View File
@@ -0,0 +1,45 @@
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;
// For GraphQL: extract from args.input or args.inputs
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;
}
// For REST: extract from request body
if (!viewId && typeof request.body?.viewId === 'string') {
viewId = request.body.viewId;
}
return this.viewAccessService.canUserModifyViewByChildEntity(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/create-view-sort-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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;
// For GraphQL: extract from args.input
const args = gqlContext.getArgs();
if (typeof args?.input?.viewId === 'string') {
viewId = args.input.viewId;
}
// For REST: extract from request body
if (!viewId && typeof request.body?.viewId === 'string') {
viewId = request.body.viewId;
}
return this.viewAccessService.canUserModifyViewByChildEntity(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-field-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-filter-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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;
// For GraphQL: extract from args
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
viewId = args.id;
}
// For REST: extract from URL params
if (!viewId && typeof request.params?.id === 'string') {
viewId = request.params.id;
}
return this.viewAccessService.canUserModifyView(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/delete-view-sort-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-field-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-filter-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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;
// For GraphQL: extract from args
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
viewId = args.id;
}
// For REST: extract from URL params
if (!viewId && typeof request.params?.id === 'string') {
viewId = request.params.id;
}
return this.viewAccessService.canUserModifyView(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/destroy-view-sort-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-field-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-filter-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-group-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.input.id
const args = gqlContext.getArgs();
if (typeof args?.input?.id === 'string') {
entityId = args.input.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard.ts
+38
View File
@@ -0,0 +1,38 @@
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 UpdateViewPermissionGuard 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;
// For GraphQL: extract from args
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
viewId = args.id;
}
// For REST: extract from URL params
if (!viewId && typeof request.params?.id === 'string') {
viewId = request.params.id;
}
return this.viewAccessService.canUserModifyView(
viewId,
request.userWorkspaceId,
request.workspace.id,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/guards/update-view-sort-permission.guard.ts
+50
View File
@@ -0,0 +1,50 @@
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 = '';
// For GraphQL: extract from args.id
const args = gqlContext.getArgs();
if (typeof args?.id === 'string') {
entityId = args.id;
}
// For REST: extract from URL params
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,
);
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-access.service.ts
+115
View File
@@ -0,0 +1,115 @@
import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
import {
ViewException,
ViewExceptionCode,
ViewExceptionMessageKey,
generateViewExceptionMessage,
generateViewUserFriendlyExceptionMessage,
} from 'src/engine/metadata-modules/view/exceptions/view.exception';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
@Injectable()
export class ViewAccessService {
constructor(
private readonly viewService: ViewService,
private readonly permissionsService: PermissionsService,
) {}
async canUserModifyView(
viewId: string | null,
userWorkspaceId: string | undefined,
workspaceId: string,
): Promise<boolean> {
// If viewId is null, the entity doesn't exist - allow the operation
// so the service can handle the NOT_FOUND error properly
if (!viewId) {
return true;
}
const view = await this.viewService.findByIdIncludingDeleted(
viewId,
workspaceId,
);
// If view doesn't exist, allow through to service for proper error message
if (!view) {
return true;
}
return this.checkViewAccess(view, userWorkspaceId, workspaceId);
}
async canUserModifyViewByChildEntity(
viewId: string | null,
userWorkspaceId: string | undefined,
workspaceId: string,
): Promise<boolean> {
// If viewId is null, the child entity doesn't exist
// Allow through so the service can throw the proper entity-specific error
// (e.g., "View field not found" instead of generic "View not found")
if (!viewId) {
return true;
}
const view = await this.viewService.findByIdIncludingDeleted(
viewId,
workspaceId,
);
// If view doesn't exist, allow through to service for proper error message
if (!view) {
return true;
}
return this.checkViewAccess(view, userWorkspaceId, workspaceId);
}
private async checkViewAccess(
view: ViewEntity,
userWorkspaceId: string | undefined,
workspaceId: string,
): Promise<boolean> {
const permissions = isDefined(userWorkspaceId)
? await this.permissionsService.getUserWorkspacePermissions({
userWorkspaceId,
workspaceId,
})
: null;
const hasViewsPermission =
permissions?.permissionFlags[PermissionFlagType.VIEWS] ?? false;
// Users with VIEWS permission can manipulate all views
if (hasViewsPermission) {
return true;
}
// Users without VIEWS permission can only manipulate their own unlisted views
const canAccess =
view.visibility === ViewVisibility.UNLISTED &&
view.createdByUserWorkspaceId === userWorkspaceId;
if (!canAccess) {
throw new ViewException(
generateViewExceptionMessage(
ViewExceptionMessageKey.VIEW_MODIFY_PERMISSION_DENIED,
),
ViewExceptionCode.VIEW_MODIFY_PERMISSION_DENIED,
{
userFriendlyMessage: generateViewUserFriendlyExceptionMessage(
ViewExceptionMessageKey.VIEW_MODIFY_PERMISSION_DENIED,
),
},
);
}
return true;
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/services/view-entity-lookup.service.ts
+89
View File
@@ -0,0 +1,89 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
import { 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 { type ViewChildEntityKind } from 'src/engine/metadata-modules/view-permissions/types/view-permissions.types';
import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';
@Injectable()
export class ViewEntityLookupService {
constructor(
@InjectRepository(ViewFieldEntity)
private readonly viewFieldRepository: Repository<ViewFieldEntity>,
@InjectRepository(ViewFilterEntity)
private readonly viewFilterRepository: Repository<ViewFilterEntity>,
@InjectRepository(ViewFilterGroupEntity)
private readonly viewFilterGroupRepository: Repository<ViewFilterGroupEntity>,
@InjectRepository(ViewGroupEntity)
private readonly viewGroupRepository: Repository<ViewGroupEntity>,
@InjectRepository(ViewSortEntity)
private readonly viewSortRepository: Repository<ViewSortEntity>,
) {}
async findViewIdByEntityIdAndKind(
kind: ViewChildEntityKind,
entityId: string,
workspaceId: string,
): Promise<string | null> {
switch (kind) {
case 'viewField': {
const row = await this.viewFieldRepository.findOne({
where: { id: entityId, workspaceId },
select: ['viewId'],
});
if (row) return row.viewId;
break;
}
case 'viewFilter': {
const row = await this.viewFilterRepository.findOne({
where: { id: entityId, workspaceId },
select: ['viewId'],
});
if (row) return row.viewId;
break;
}
case 'viewFilterGroup': {
const row = await this.viewFilterGroupRepository.findOne({
where: { id: entityId, workspaceId },
select: ['viewId'],
});
if (row) return row.viewId;
break;
}
case 'viewGroup': {
const row = await this.viewGroupRepository.findOne({
where: { id: entityId, workspaceId },
select: ['viewId'],
});
if (row) return row.viewId;
break;
}
case 'viewSort': {
const row = await this.viewSortRepository.findOne({
where: { id: entityId, workspaceId },
select: ['viewId'],
});
if (row) return row.viewId;
break;
}
default:
break;
}
return null;
}
}
packages/twenty-server/src/engine/metadata-modules/view-permissions/types/view-permissions.types.ts
+6
View File
@@ -0,0 +1,6 @@
export type ViewChildEntityKind =
| 'viewField'
| 'viewFilter'
| 'viewFilterGroup'
| 'viewGroup'
| 'viewSort';
packages/twenty-server/src/engine/metadata-modules/view-permissions/view-permissions.module.ts
+111
View File
@@ -0,0 +1,111 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { I18nModule } from 'src/engine/core-modules/i18n/i18n.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';
import { 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 { 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';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
@Module({
imports: [
TypeOrmModule.forFeature([
ViewEntity,
ViewFieldEntity,
ViewFilterEntity,
ViewFilterGroupEntity,
ViewGroupEntity,
ViewSortEntity,
]),
I18nModule,
PermissionsModule,
WorkspaceCacheStorageModule,
],
providers: [
ViewService,
ViewEntityLookupService,
ViewAccessService,
UpdateViewPermissionGuard,
DeleteViewPermissionGuard,
DestroyViewPermissionGuard,
CreateViewFieldPermissionGuard,
UpdateViewFieldPermissionGuard,
DeleteViewFieldPermissionGuard,
DestroyViewFieldPermissionGuard,
CreateViewFilterPermissionGuard,
UpdateViewFilterPermissionGuard,
DeleteViewFilterPermissionGuard,
DestroyViewFilterPermissionGuard,
CreateViewFilterGroupPermissionGuard,
UpdateViewFilterGroupPermissionGuard,
DeleteViewFilterGroupPermissionGuard,
DestroyViewFilterGroupPermissionGuard,
CreateViewGroupPermissionGuard,
UpdateViewGroupPermissionGuard,
DeleteViewGroupPermissionGuard,
DestroyViewGroupPermissionGuard,
CreateViewSortPermissionGuard,
UpdateViewSortPermissionGuard,
DeleteViewSortPermissionGuard,
DestroyViewSortPermissionGuard,
],
exports: [
ViewService,
ViewEntityLookupService,
ViewAccessService,
UpdateViewPermissionGuard,
DeleteViewPermissionGuard,
DestroyViewPermissionGuard,
CreateViewFieldPermissionGuard,
UpdateViewFieldPermissionGuard,
DeleteViewFieldPermissionGuard,
DestroyViewFieldPermissionGuard,
CreateViewFilterPermissionGuard,
UpdateViewFilterPermissionGuard,
DeleteViewFilterPermissionGuard,
DestroyViewFilterPermissionGuard,
CreateViewFilterGroupPermissionGuard,
UpdateViewFilterGroupPermissionGuard,
DeleteViewFilterGroupPermissionGuard,
DestroyViewFilterGroupPermissionGuard,
CreateViewGroupPermissionGuard,
UpdateViewGroupPermissionGuard,
DeleteViewGroupPermissionGuard,
DestroyViewGroupPermissionGuard,
CreateViewSortPermissionGuard,
UpdateViewSortPermissionGuard,
DeleteViewSortPermissionGuard,
DestroyViewSortPermissionGuard,
],
})
export class ViewPermissionsModule {}
packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts
+6
View File
@@ -16,6 +16,9 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
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 { 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 { type ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';
@@ -73,6 +76,7 @@ export class ViewSortController {
}
@Post()
@UseGuards(CreateViewSortPermissionGuard)
async create(
@Body() input: CreateViewSortInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -84,6 +88,7 @@ export class ViewSortController {
}
@Patch(':id')
@UseGuards(UpdateViewSortPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewSortInput,
@@ -99,6 +104,7 @@ export class ViewSortController {
}
@Delete(':id')
@UseGuards(DeleteViewSortPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view-sort/exceptions/view-sort.exception.ts
+10 -19
View File
@@ -1,5 +1,5 @@
import { msg, t } from '@lingui/core/macro';
import { type MessageDescriptor } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { assertUnreachable } from 'twenty-shared/utils';
import { CustomException } from 'src/utils/custom-exception';
@@ -18,6 +18,7 @@ export class ViewSortException extends CustomException {
export enum ViewSortExceptionCode {
VIEW_SORT_NOT_FOUND = 'VIEW_SORT_NOT_FOUND',
INVALID_VIEW_SORT_DATA = 'INVALID_VIEW_SORT_DATA',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export enum ViewSortExceptionMessageKey {
@@ -26,39 +27,29 @@ export enum ViewSortExceptionMessageKey {
VIEW_SORT_NOT_FOUND = 'VIEW_SORT_NOT_FOUND',
INVALID_VIEW_SORT_DATA = 'INVALID_VIEW_SORT_DATA',
FIELD_METADATA_ID_REQUIRED = 'FIELD_METADATA_ID_REQUIRED',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
}
export const generateViewSortExceptionMessage = (
key: ViewSortExceptionMessageKey,
id?: string,
) => {
let message = '';
switch (key) {
case ViewSortExceptionMessageKey.WORKSPACE_ID_REQUIRED:
message = t`WorkspaceId is required`;
break;
return 'WorkspaceId is required';
case ViewSortExceptionMessageKey.VIEW_ID_REQUIRED:
message = t`ViewId is required`;
break;
return 'ViewId is required';
case ViewSortExceptionMessageKey.VIEW_SORT_NOT_FOUND:
message = id
? t`View sort (id: ${id}) not found`
: t`View sort not found`;
break;
return `View sort${id ? ` (id: ${id})` : ''} not found`;
case ViewSortExceptionMessageKey.INVALID_VIEW_SORT_DATA:
message = id
? t`Invalid view sort data for view sort id: ${id}`
: t`Invalid view sort data`;
break;
return `Invalid view sort data${id ? ` for view sort id: ${id}` : ''}`;
case ViewSortExceptionMessageKey.FIELD_METADATA_ID_REQUIRED:
message = t`FieldMetadataId is required`;
break;
return 'FieldMetadataId is required';
case ViewSortExceptionMessageKey.VIEW_NOT_FOUND:
return `View${id ? ` (id: ${id})` : ''} not found`;
default:
assertUnreachable(key);
}
return message;
};
export const generateViewSortUserFriendlyExceptionMessage = (
packages/twenty-server/src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver.ts
+9 -6
View File
@@ -6,6 +6,10 @@ import { isDefined } from 'twenty-shared/utils';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
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';
@@ -40,6 +44,7 @@ export class ViewSortResolver {
}
@Mutation(() => ViewSortDTO)
@UseGuards(CreateViewSortPermissionGuard)
async createCoreViewSort(
@Args('input') input: CreateViewSortInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -51,6 +56,7 @@ export class ViewSortResolver {
}
@Mutation(() => ViewSortDTO)
@UseGuards(UpdateViewSortPermissionGuard)
async updateCoreViewSort(
@Args('id', { type: () => String }) id: string,
@Args('input') input: UpdateViewSortInput,
@@ -60,6 +66,7 @@ export class ViewSortResolver {
}
@Mutation(() => Boolean)
@UseGuards(DeleteViewSortPermissionGuard)
async deleteCoreViewSort(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -70,15 +77,11 @@ export class ViewSortResolver {
}
@Mutation(() => Boolean)
@UseGuards(DestroyViewSortPermissionGuard)
async destroyCoreViewSort(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<boolean> {
const deletedViewSort = await this.viewSortService.destroy(
id,
workspace.id,
);
return isDefined(deletedViewSort);
return this.viewSortService.destroy(id, workspace.id);
}
}
packages/twenty-server/src/engine/metadata-modules/view-sort/services/tests/view-sort.service.spec.ts
+6 -2
View File
@@ -295,12 +295,16 @@ describe('ViewSortService', () => {
const id = 'view-sort-id';
const workspaceId = 'workspace-id';
jest.spyOn(viewSortService, 'findById').mockResolvedValue(mockViewSort);
jest.spyOn(viewSortRepository, 'findOne').mockResolvedValue(mockViewSort);
jest.spyOn(viewSortRepository, 'delete').mockResolvedValue({} as any);
const result = await viewSortService.destroy(id, workspaceId);
expect(viewSortService.findById).toHaveBeenCalledWith(id, workspaceId);
expect(viewSortRepository.findOne).toHaveBeenCalledWith({
where: { id, workspaceId },
relations: ['workspace', 'view'],
withDeleted: true,
});
expect(viewSortRepository.delete).toHaveBeenCalledWith(id);
expect(result).toEqual(true);
});
packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts
+8 -1
View File
@@ -163,7 +163,14 @@ export class ViewSortService {
}
async destroy(id: string, workspaceId: string): Promise<boolean> {
const viewSort = await this.findById(id, workspaceId);
const viewSort = await this.viewSortRepository.findOne({
where: {
id,
workspaceId,
},
relations: ['workspace', 'view'],
withDeleted: true,
});
if (!isDefined(viewSort)) {
throw new ViewSortException(
packages/twenty-server/src/engine/metadata-modules/view-sort/view-sort.module.ts
+6 -1
View File
@@ -1,16 +1,21 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewSortController } from 'src/engine/metadata-modules/view-sort/controllers/view-sort.controller';
import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';
import { ViewSortResolver } from 'src/engine/metadata-modules/view-sort/resolvers/view-sort.resolver';
import { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
@Module({
imports: [
TypeOrmModule.forFeature([ViewSortEntity]),
TypeOrmModule.forFeature([ViewSortEntity, ViewEntity]),
PermissionsModule,
WorkspaceCacheStorageModule,
ViewPermissionsModule,
],
controllers: [ViewSortController],
providers: [ViewSortService, ViewSortResolver],
packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts
+8 -1
View File
@@ -18,10 +18,13 @@ import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/featu
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { RequestLocale } from 'src/engine/decorators/locale/request-locale.decorator';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { resolveObjectMetadataStandardOverride } from 'src/engine/metadata-modules/object-metadata/utils/resolve-object-metadata-standard-override.util';
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';
@@ -53,14 +56,16 @@ export class ViewController {
async findMany(
@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string | undefined,
@Query('objectMetadataId') objectMetadataId?: string,
): Promise<ViewDTO[]> {
const views = objectMetadataId
? await this.viewService.findByObjectMetadataId(
workspace.id,
objectMetadataId,
userWorkspaceId,
)
: await this.viewService.findByWorkspaceId(workspace.id);
: await this.viewService.findByWorkspaceId(workspace.id, userWorkspaceId);
return this.processViewsWithTemplates(views, workspace.id, locale);
}
@@ -133,6 +138,7 @@ export class ViewController {
}
@Patch(':id')
@UseGuards(UpdateViewPermissionGuard)
async update(
@Param('id') id: string,
@Body() input: UpdateViewInput,
@@ -169,6 +175,7 @@ export class ViewController {
}
@Delete(':id')
@UseGuards(DeleteViewPermissionGuard)
async delete(
@Param('id') id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/create-view.input.ts
+8
View File
@@ -17,6 +17,7 @@ import { ViewCalendarLayout } from 'src/engine/metadata-modules/view/enums/view-
import { ViewKey } from 'src/engine/metadata-modules/view/enums/view-key.enum';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
@InputType()
export class CreateViewInput {
@@ -91,6 +92,13 @@ export class CreateViewInput {
@Field(() => UUIDScalarType, { nullable: true })
calendarFieldMetadataId?: string;
@IsOptional()
@IsEnum(ViewVisibility)
@Field(() => ViewVisibility, {
nullable: true,
})
visibility?: ViewVisibility;
@HideField()
universalIdentifier?: string;
packages/twenty-server/src/engine/metadata-modules/view/dtos/inputs/update-view.input.ts
+6
View File
@@ -15,6 +15,7 @@ import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-met
import { ViewCalendarLayout } from 'src/engine/metadata-modules/view/enums/view-calendar-layout.enum';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
// TODO: this should be refactored like for view-field.input.ts
// This is a temporary fix as we were extending the CreateViewInput class which was adding default values for the non filled fields
@@ -81,4 +82,9 @@ export class UpdateViewInput {
@IsUUID()
@Field(() => UUIDScalarType, { nullable: true })
calendarFieldMetadataId?: string;
@IsOptional()
@IsEnum(ViewVisibility)
@Field(() => ViewVisibility, { nullable: true })
visibility?: ViewVisibility;
}
packages/twenty-server/src/engine/metadata-modules/view/dtos/view.dto.ts
+10
View File
@@ -13,11 +13,13 @@ import { ViewCalendarLayout } from 'src/engine/metadata-modules/view/enums/view-
import { ViewKey } from 'src/engine/metadata-modules/view/enums/view-key.enum';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
registerEnumType(ViewOpenRecordIn, { name: 'ViewOpenRecordIn' });
registerEnumType(ViewType, { name: 'ViewType' });
registerEnumType(ViewKey, { name: 'ViewKey' });
registerEnumType(ViewCalendarLayout, { name: 'ViewCalendarLayout' });
registerEnumType(ViewVisibility, { name: 'ViewVisibility' });
@ObjectType('CoreView')
export class ViewDTO {
@@ -95,4 +97,12 @@ export class ViewDTO {
@Field(() => [ViewGroupDTO])
viewGroups?: ViewGroupDTO[];
@Field(() => ViewVisibility, {
nullable: false,
})
visibility: ViewVisibility;
@Field(() => UUIDScalarType, { nullable: true })
createdByUserWorkspaceId?: string | null;
}
packages/twenty-server/src/engine/metadata-modules/view/entities/view.entity.ts
+20
View File
@@ -16,6 +16,7 @@ import {
import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/interfaces/syncable-entity.interface';
import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
@@ -28,6 +29,7 @@ import { ViewCalendarLayout } from 'src/engine/metadata-modules/view/enums/view-
import { ViewKey } from 'src/engine/metadata-modules/view/enums/view-key.enum';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
// We could refactor this type to be dynamic to view type
@Entity({ name: 'view', schema: 'core' })
@@ -35,6 +37,7 @@ import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum'
'workspaceId',
'objectMetadataId',
])
@Index('IDX_VIEW_VISIBILITY', ['visibility'])
@Check(
'CHK_VIEW_CALENDAR_INTEGRITY',
`("type" != 'CALENDAR' OR ("calendarLayout" IS NOT NULL AND "calendarFieldMetadataId" IS NOT NULL))`,
@@ -150,6 +153,23 @@ export class ViewEntity extends SyncableEntity implements Required<ViewEntity> {
@Column({ nullable: true, type: 'text', default: null })
anyFieldFilterValue: string | null;
@Column({
type: 'enum',
enum: Object.values(ViewVisibility),
nullable: false,
default: ViewVisibility.WORKSPACE,
})
visibility: ViewVisibility;
@Column({ nullable: true, type: 'uuid' })
createdByUserWorkspaceId: string | null;
@ManyToOne(() => UserWorkspaceEntity, {
onDelete: 'SET NULL',
})
@JoinColumn({ name: 'createdByUserWorkspaceId' })
createdBy: Relation<UserWorkspaceEntity>;
@ManyToOne(() => WorkspaceEntity, {
onDelete: 'CASCADE',
})
packages/twenty-server/src/engine/metadata-modules/view/enums/view-visibility.enum.ts
+4
View File
@@ -0,0 +1,4 @@
export enum ViewVisibility {
WORKSPACE = 'WORKSPACE',
UNLISTED = 'UNLISTED',
}
packages/twenty-server/src/engine/metadata-modules/view/exceptions/view.exception.ts
+12
View File
@@ -18,6 +18,8 @@ export class ViewException extends CustomException {
export enum ViewExceptionCode {
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
INVALID_VIEW_DATA = 'INVALID_VIEW_DATA',
VIEW_CREATE_PERMISSION_DENIED = 'VIEW_CREATE_PERMISSION_DENIED',
VIEW_MODIFY_PERMISSION_DENIED = 'VIEW_MODIFY_PERMISSION_DENIED',
}
export enum ViewExceptionMessageKey {
@@ -25,6 +27,8 @@ export enum ViewExceptionMessageKey {
OBJECT_METADATA_ID_REQUIRED = 'OBJECT_METADATA_ID_REQUIRED',
VIEW_NOT_FOUND = 'VIEW_NOT_FOUND',
INVALID_VIEW_DATA = 'INVALID_VIEW_DATA',
VIEW_CREATE_PERMISSION_DENIED = 'VIEW_CREATE_PERMISSION_DENIED',
VIEW_MODIFY_PERMISSION_DENIED = 'VIEW_MODIFY_PERMISSION_DENIED',
}
export const generateViewExceptionMessage = (
@@ -40,6 +44,10 @@ export const generateViewExceptionMessage = (
return `View${id ? ` (id: ${id})` : ''} not found`;
case ViewExceptionMessageKey.INVALID_VIEW_DATA:
return `Invalid view data${id ? ` for view id: ${id}` : ''}`;
case ViewExceptionMessageKey.VIEW_CREATE_PERMISSION_DENIED:
return 'You do not have permission to create workspace-level views';
case ViewExceptionMessageKey.VIEW_MODIFY_PERMISSION_DENIED:
return 'You do not have permission to modify this view';
default:
assertUnreachable(key);
}
@@ -53,5 +61,9 @@ export const generateViewUserFriendlyExceptionMessage = (
return msg`WorkspaceId is required to create a view.`;
case ViewExceptionMessageKey.OBJECT_METADATA_ID_REQUIRED:
return msg`ObjectMetadataId is required to create a view.`;
case ViewExceptionMessageKey.VIEW_CREATE_PERMISSION_DENIED:
return msg`You don't have permission to create workspace-level views.`;
case ViewExceptionMessageKey.VIEW_MODIFY_PERMISSION_DENIED:
return msg`You don't have permission to modify this view.`;
}
};
packages/twenty-server/src/engine/metadata-modules/view/filters/view-rest-api-exception.filter.ts
+6
View File
@@ -67,6 +67,12 @@ export class ViewRestApiExceptionFilter implements ExceptionFilter {
response,
400,
);
case ViewExceptionCode.VIEW_MODIFY_PERMISSION_DENIED:
return this.httpExceptionHandlerService.handleError(
exception as CustomException,
response,
403,
);
default:
// TODO: change to 500 when we have input validation
return this.httpExceptionHandlerService.handleError(
packages/twenty-server/src/engine/metadata-modules/view/resolvers/view.resolver.ts
+67 -4
View File
@@ -18,9 +18,14 @@ import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { resolveObjectMetadataStandardOverride } from 'src/engine/metadata-modules/object-metadata/utils/resolve-object-metadata-standard-override.util';
import { PermissionFlagType } from 'src/engine/metadata-modules/permissions/constants/permission-flag-type.constants';
import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
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 { ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';
@@ -29,11 +34,23 @@ import { ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view
import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/services/view-filter.service';
import { 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 { 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 { ViewSortService } from 'src/engine/metadata-modules/view-sort/services/view-sort.service';
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 { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
import {
ViewException,
ViewExceptionCode,
ViewExceptionMessageKey,
generateViewExceptionMessage,
generateViewUserFriendlyExceptionMessage,
} from 'src/engine/metadata-modules/view/exceptions/view.exception';
import { ViewV2Service } from 'src/engine/metadata-modules/view/services/view-v2.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';
@@ -52,6 +69,8 @@ export class ViewResolver {
private readonly i18nService: I18nService,
private readonly featureFlagService: FeatureFlagService,
private readonly viewV2Service: ViewV2Service,
private readonly userRoleService: UserRoleService,
private readonly permissionsService: PermissionsService,
) {}
@ResolveField(() => String)
@@ -102,17 +121,19 @@ export class ViewResolver {
@Query(() => [ViewDTO])
async getCoreViews(
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string | undefined,
@Args('objectMetadataId', { type: () => String, nullable: true })
objectMetadataId?: string,
): Promise<ViewDTO[]> {
): Promise<ViewEntity[]> {
if (objectMetadataId) {
return this.viewService.findByObjectMetadataId(
workspace.id,
objectMetadataId,
userWorkspaceId,
);
}
return this.viewService.findByWorkspaceId(workspace.id);
return this.viewService.findByWorkspaceId(workspace.id, userWorkspaceId);
}
@Query(() => ViewDTO, { nullable: true })
@@ -120,14 +141,49 @@ export class ViewResolver {
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<ViewDTO | null> {
return this.viewService.findById(id, workspace.id);
const view = await this.viewService.findById(id, workspace.id);
if (!view) {
return null;
}
// Do not apply list visibility filtering here: unlisted views are accessible by link
return view;
}
@Mutation(() => ViewDTO)
@UseGuards(CustomPermissionGuard)
async createCoreView(
@Args('input') input: CreateViewInput,
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string | undefined,
): Promise<ViewDTO> {
const visibility = input.visibility ?? ViewVisibility.WORKSPACE;
if (visibility === ViewVisibility.WORKSPACE && isDefined(userWorkspaceId)) {
const permissions =
await this.permissionsService.getUserWorkspacePermissions({
userWorkspaceId,
workspaceId: workspace.id,
});
if (!permissions.permissionFlags[PermissionFlagType.VIEWS]) {
throw new ViewException(
generateViewExceptionMessage(
ViewExceptionMessageKey.VIEW_CREATE_PERMISSION_DENIED,
),
ViewExceptionCode.VIEW_CREATE_PERMISSION_DENIED,
{
userFriendlyMessage: generateViewUserFriendlyExceptionMessage(
ViewExceptionMessageKey.VIEW_CREATE_PERMISSION_DENIED,
),
},
);
}
}
input.visibility = visibility;
const isWorkspaceMigrationV2Enabled =
await this.featureFlagService.isFeatureEnabled(
FeatureFlagKey.IS_WORKSPACE_MIGRATION_V2_ENABLED,
@@ -138,16 +194,21 @@ export class ViewResolver {
return await this.viewV2Service.createOne({
createViewInput: input,
workspaceId: workspace.id,
createdByUserWorkspaceId: userWorkspaceId ?? '',
});
}
return this.viewService.create({
const createdView = await this.viewService.create({
...input,
workspaceId: workspace.id,
createdByUserWorkspaceId: userWorkspaceId ?? '',
});
return createdView;
}
@Mutation(() => ViewDTO)
@UseGuards(UpdateViewPermissionGuard)
async updateCoreView(
@Args('id', { type: () => String }) id: string,
@Args('input') input: UpdateViewInput,
@@ -170,6 +231,7 @@ export class ViewResolver {
}
@Mutation(() => Boolean)
@UseGuards(DeleteViewPermissionGuard)
async deleteCoreView(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
@@ -195,6 +257,7 @@ export class ViewResolver {
}
@Mutation(() => Boolean)
@UseGuards(DestroyViewPermissionGuard)
async destroyCoreView(
@Args('id', { type: () => String }) id: string,
@AuthWorkspace() workspace: WorkspaceEntity,
packages/twenty-server/src/engine/metadata-modules/view/services/tests/view.service.spec.ts
+116 -11
View File
@@ -7,6 +7,7 @@ import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewOpenRecordIn } from 'src/engine/metadata-modules/view/enums/view-open-record-in';
import { ViewType } from 'src/engine/metadata-modules/view/enums/view-type.enum';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
import {
ViewException,
ViewExceptionCode,
@@ -37,6 +38,8 @@ describe('ViewService', () => {
kanbanAggregateOperation: null,
kanbanAggregateOperationFieldMetadataId: null,
anyFieldFilterValue: null,
visibility: ViewVisibility.WORKSPACE,
createdByUserWorkspaceId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
@@ -84,13 +87,34 @@ describe('ViewService', () => {
});
describe('findByWorkspaceId', () => {
it('should return views for a workspace', async () => {
it('should return workspace views and user-owned unlisted views', async () => {
const workspaceId = 'workspace-id';
const expectedViews = [mockView];
const userWorkspaceId = 'user-workspace-id';
const workspaceView = {
...mockView,
id: 'workspace-view',
visibility: ViewVisibility.WORKSPACE,
} as ViewEntity;
const userUnlistedView = {
...mockView,
id: 'user-unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: userWorkspaceId,
} as ViewEntity;
const otherUserUnlistedView = {
...mockView,
id: 'other-user-unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: 'other-user-workspace-id',
} as ViewEntity;
const allViews = [workspaceView, userUnlistedView, otherUserUnlistedView];
jest.spyOn(viewRepository, 'find').mockResolvedValue(expectedViews);
jest.spyOn(viewRepository, 'find').mockResolvedValue(allViews);
const result = await viewService.findByWorkspaceId(workspaceId);
const result = await viewService.findByWorkspaceId(
workspaceId,
userWorkspaceId,
);
expect(viewRepository.find).toHaveBeenCalledWith({
where: {
@@ -107,21 +131,67 @@ describe('ViewService', () => {
'viewFilterGroups',
],
});
expect(result).toEqual(expectedViews);
expect(result).toEqual([workspaceView, userUnlistedView]);
expect(result).not.toContain(otherUserUnlistedView);
});
it('should return only workspace views when no userWorkspaceId provided', async () => {
const workspaceId = 'workspace-id';
const workspaceView = {
...mockView,
id: 'workspace-view',
visibility: ViewVisibility.WORKSPACE,
} as ViewEntity;
const unlistedView = {
...mockView,
id: 'unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: 'some-user-workspace-id',
} as ViewEntity;
const allViews = [workspaceView, unlistedView];
jest.spyOn(viewRepository, 'find').mockResolvedValue(allViews);
const result = await viewService.findByWorkspaceId(workspaceId);
expect(result).toEqual([workspaceView]);
expect(result).not.toContain(unlistedView);
});
});
describe('findByObjectMetadataId', () => {
it('should return views for an object metadata id', async () => {
it('should return workspace views and user-owned unlisted views for an object', async () => {
const workspaceId = 'workspace-id';
const objectMetadataId = 'object-id';
const expectedViews = [mockView];
const userWorkspaceId = 'user-workspace-id';
const workspaceView = {
...mockView,
id: 'workspace-view',
visibility: ViewVisibility.WORKSPACE,
objectMetadataId,
} as ViewEntity;
const userUnlistedView = {
...mockView,
id: 'user-unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: userWorkspaceId,
objectMetadataId,
} as ViewEntity;
const otherUserUnlistedView = {
...mockView,
id: 'other-user-unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: 'other-user-workspace-id',
objectMetadataId,
} as ViewEntity;
const allViews = [workspaceView, userUnlistedView, otherUserUnlistedView];
jest.spyOn(viewRepository, 'find').mockResolvedValue(expectedViews);
jest.spyOn(viewRepository, 'find').mockResolvedValue(allViews);
const result = await viewService.findByObjectMetadataId(
workspaceId,
objectMetadataId,
userWorkspaceId,
);
expect(viewRepository.find).toHaveBeenCalledWith({
@@ -140,7 +210,37 @@ describe('ViewService', () => {
'viewFilterGroups',
],
});
expect(result).toEqual(expectedViews);
expect(result).toEqual([workspaceView, userUnlistedView]);
expect(result).not.toContain(otherUserUnlistedView);
});
it('should return only workspace views when no userWorkspaceId provided', async () => {
const workspaceId = 'workspace-id';
const objectMetadataId = 'object-id';
const workspaceView = {
...mockView,
id: 'workspace-view',
visibility: ViewVisibility.WORKSPACE,
objectMetadataId,
} as ViewEntity;
const unlistedView = {
...mockView,
id: 'unlisted-view',
visibility: ViewVisibility.UNLISTED,
createdByUserWorkspaceId: 'some-user-workspace-id',
objectMetadataId,
} as ViewEntity;
const allViews = [workspaceView, unlistedView];
jest.spyOn(viewRepository, 'find').mockResolvedValue(allViews);
const result = await viewService.findByObjectMetadataId(
workspaceId,
objectMetadataId,
);
expect(result).toEqual([workspaceView]);
expect(result).not.toContain(unlistedView);
});
});
@@ -322,12 +422,17 @@ describe('ViewService', () => {
const id = 'view-id';
const workspaceId = 'workspace-id';
jest.spyOn(viewService, 'findById').mockResolvedValue(mockView);
jest
.spyOn(viewService, 'findByIdIncludingDeleted')
.mockResolvedValue(mockView);
jest.spyOn(viewRepository, 'delete').mockResolvedValue({} as any);
const result = await viewService.destroy(id, workspaceId);
expect(viewService.findById).toHaveBeenCalledWith(id, workspaceId);
expect(viewService.findByIdIncludingDeleted).toHaveBeenCalledWith(
id,
workspaceId,
);
expect(viewRepository.delete).toHaveBeenCalledWith(id);
expect(result).toEqual(true);
});
packages/twenty-server/src/engine/metadata-modules/view/services/view-v2.service.ts
+3
View File
@@ -27,9 +27,11 @@ export class ViewV2Service {
async createOne({
createViewInput,
workspaceId,
createdByUserWorkspaceId,
}: {
createViewInput: CreateViewInput;
workspaceId: string;
createdByUserWorkspaceId?: string;
}): Promise<ViewDTO> {
const {
flatObjectMetadataMaps,
@@ -49,6 +51,7 @@ export class ViewV2Service {
const flatViewFromCreateInput = fromCreateViewInputToFlatViewToCreate({
createViewInput,
workspaceId,
createdByUserWorkspaceId,
});
const validateAndBuildResult =
packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts
+80 -4
View File
@@ -9,6 +9,7 @@ import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
import { generateMessageId } from 'src/engine/core-modules/i18n/utils/generateMessageId';
import { FIND_ALL_CORE_VIEWS_GRAPHQL_OPERATION } from 'src/engine/metadata-modules/view/constants/find-all-core-views-graphql-operation.constant';
import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
import { ViewVisibility } from 'src/engine/metadata-modules/view/enums/view-visibility.enum';
import {
ViewException,
ViewExceptionCode,
@@ -27,8 +28,11 @@ export class ViewService {
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
) {}
async findByWorkspaceId(workspaceId: string): Promise<ViewEntity[]> {
return this.viewRepository.find({
async findByWorkspaceId(
workspaceId: string,
userWorkspaceId?: string,
): Promise<ViewEntity[]> {
const views = await this.viewRepository.find({
where: {
workspaceId,
deletedAt: IsNull(),
@@ -43,13 +47,30 @@ export class ViewService {
'viewFilterGroups',
],
});
return views.filter((view) => {
if (view.visibility === ViewVisibility.WORKSPACE) {
return true;
}
if (
view.visibility === ViewVisibility.UNLISTED &&
isDefined(userWorkspaceId) &&
view.createdByUserWorkspaceId === userWorkspaceId
) {
return true;
}
return false;
});
}
async findByObjectMetadataId(
workspaceId: string,
objectMetadataId: string,
userWorkspaceId?: string,
): Promise<ViewEntity[]> {
return this.viewRepository.find({
const views = await this.viewRepository.find({
where: {
workspaceId,
objectMetadataId,
@@ -65,6 +86,23 @@ export class ViewService {
'viewFilterGroups',
],
});
// Apply visibility filtering
return views.filter((view) => {
if (view.visibility === ViewVisibility.WORKSPACE) {
return true;
}
if (
view.visibility === ViewVisibility.UNLISTED &&
isDefined(userWorkspaceId) &&
view.createdByUserWorkspaceId === userWorkspaceId
) {
return true;
}
return false;
});
}
async findById(id: string, workspaceId: string): Promise<ViewEntity | null> {
@@ -87,6 +125,29 @@ export class ViewService {
return view || null;
}
async findByIdIncludingDeleted(
id: string,
workspaceId: string,
): Promise<ViewEntity | null> {
const view = await this.viewRepository.findOne({
where: {
id,
workspaceId,
},
relations: [
'workspace',
'viewFields',
'viewFilters',
'viewSorts',
'viewGroups',
'viewFilterGroups',
],
withDeleted: true,
});
return view || null;
}
async create(viewData: Partial<ViewEntity>): Promise<ViewEntity> {
if (!isDefined(viewData.workspaceId)) {
throw new ViewException(
@@ -176,7 +237,7 @@ export class ViewService {
}
async destroy(id: string, workspaceId: string): Promise<boolean> {
const view = await this.findById(id, workspaceId);
const view = await this.findByIdIncludingDeleted(id, workspaceId);
if (!isDefined(view)) {
throw new ViewException(
@@ -232,6 +293,21 @@ export class ViewService {
return viewName;
}
canUserUpdateView(
view: ViewEntity,
userWorkspaceId: string | undefined,
userHasViewsPermission: boolean,
): boolean {
if (userHasViewsPermission) {
return true;
}
return (
view.visibility === ViewVisibility.UNLISTED &&
view.createdByUserWorkspaceId === userWorkspaceId
);
}
async flushGraphQLCache(workspaceId: string): Promise<void> {
await this.workspaceCacheStorageService.flushGraphQLOperation({
operationName: FIND_ALL_CORE_VIEWS_GRAPHQL_OPERATION,
packages/twenty-server/src/engine/metadata-modules/view/utils/view-graphql-api-exception-handler.util.ts
+19
View File
@@ -2,6 +2,7 @@ import { type I18n } from '@lingui/core';
import { assertUnreachable } from 'twenty-shared/utils';
import {
ForbiddenError,
NotFoundError,
UserInputError,
} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
@@ -45,6 +46,14 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
});
case ViewExceptionCode.VIEW_CREATE_PERMISSION_DENIED:
throw new ForbiddenError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
});
case ViewExceptionCode.VIEW_MODIFY_PERMISSION_DENIED:
throw new ForbiddenError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
});
default: {
return assertUnreachable(error.code);
}
@@ -55,6 +64,8 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
switch (error.code) {
case ViewFieldExceptionCode.VIEW_FIELD_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFieldExceptionCode.VIEW_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFieldExceptionCode.INVALID_VIEW_FIELD_DATA:
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
@@ -69,6 +80,8 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
switch (error.code) {
case ViewFilterExceptionCode.VIEW_FILTER_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFilterExceptionCode.VIEW_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFilterExceptionCode.INVALID_VIEW_FILTER_DATA:
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
@@ -83,6 +96,8 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
switch (error.code) {
case ViewFilterGroupExceptionCode.VIEW_FILTER_GROUP_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFilterGroupExceptionCode.VIEW_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewFilterGroupExceptionCode.INVALID_VIEW_FILTER_GROUP_DATA:
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
@@ -97,6 +112,8 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
switch (error.code) {
case ViewGroupExceptionCode.VIEW_GROUP_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewGroupExceptionCode.VIEW_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewGroupExceptionCode.INVALID_VIEW_GROUP_DATA:
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
@@ -111,6 +128,8 @@ export const viewGraphqlApiExceptionHandler = (error: Error, i18n: I18n) => {
switch (error.code) {
case ViewSortExceptionCode.VIEW_SORT_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewSortExceptionCode.VIEW_NOT_FOUND:
throw new NotFoundError(error.message);
case ViewSortExceptionCode.INVALID_VIEW_SORT_DATA:
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
packages/twenty-server/src/engine/metadata-modules/view/view.module.ts
+6
View File
@@ -5,6 +5,9 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
import { I18nModule } from 'src/engine/core-modules/i18n/i18n.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
import { FlatViewModule } from 'src/engine/metadata-modules/flat-view/flat-view.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
import { ViewPermissionsModule } from 'src/engine/metadata-modules/view-permissions/view-permissions.module';
import { ViewFieldModule } from 'src/engine/metadata-modules/view-field/view-field.module';
import { ViewFilterGroupModule } from 'src/engine/metadata-modules/view-filter-group/view-filter-group.module';
import { ViewFilterModule } from 'src/engine/metadata-modules/view-filter/view-filter.module';
@@ -22,6 +25,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
@Module({
imports: [
TypeOrmModule.forFeature([ViewEntity]),
ViewPermissionsModule,
ViewFieldModule,
ViewFilterModule,
ViewFilterGroupModule,
@@ -29,6 +33,8 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
ViewSortModule,
I18nModule,
FeatureFlagModule,
PermissionsModule,
UserRoleModule,
WorkspaceMetadataCacheModule,
WorkspaceCacheStorageModule,
WorkspaceMigrationV2Module,