Skip to content

The open alternative to Salesforce, designed for AI.

Remove pre-2-32 uiScale and pre-2-27 openRecordIn fallbacks (#24966)

Félix Malfaitbed21e79e9c4
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/workspace-member-transpiler.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/workspace-member-transpiler.service.ts
index a14ef79c9b4..53ddf0417c3 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/workspace-member-transpiler.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/workspace-member-transpiler.service.ts
@@ -100,10 +100,8 @@ export class WorkspaceMemberTranspiler {
avatarUrl,
userWorkspaceId: userWorkspace.id,
colorScheme,
- // Workspaces upgrade after the code rolls out, so these fields are
- // absent until their workspace commands (2-27, 2-32) reach them.
- openRecordIn: (openRecordIn as OpenRecordIn) ?? OpenRecordIn.SIDE_PANEL,
- uiScale: uiScale ?? 'Default',
+ openRecordIn: openRecordIn as OpenRecordIn,
+ uiScale,
dateFormat: dateFormat as WorkspaceMemberDateFormatEnum,
locale,
timeFormat: timeFormat as WorkspaceMemberTimeFormatEnum,
diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
index 7ee5ba9f55d..0ed48de0c19 100644
--- a/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/role/role.resolver.ts
@@ -127,8 +127,6 @@ export class RoleResolver {
return {
...workspaceMember,
- // pre-2-32 workspaces lack the column until the upgrade command runs
- uiScale: workspaceMember.uiScale ?? 'Default',
userWorkspaceId,
roles,
} as WorkspaceMemberDTO;
@@ -319,17 +317,10 @@ export class RoleResolver {
@Parent() role: RoleDTO,
@AuthWorkspace() workspace: WorkspaceEntity,
): Promise<WorkspaceMemberWorkspaceEntity[]> {
- const workspaceMembers =
- await this.userRoleService.getWorkspaceMembersAssignedToRole(
- role.id,
- workspace.id,
- );
-
- // pre-2-32 workspaces lack the column until the upgrade command runs
- return workspaceMembers.map((workspaceMember) => ({
- ...workspaceMember,
- uiScale: workspaceMember.uiScale ?? 'Default',
- }));
+ return await this.userRoleService.getWorkspaceMembersAssignedToRole(
+ role.id,
+ workspace.id,
+ );
}
@ResolveField('agents', () => [AgentDTO])