The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Default workspaceMember openRecordIn when the workspace is not upgraded yet (#23723)
Félix Malfait66e0f620bcfd
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/__tests__/workspace-member-transpiler.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user/services/__tests__/workspace-member-transpiler.service.spec.tsnew file mode 100644index 00000000000..d32946aa3aa--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/user/services/__tests__/workspace-member-transpiler.service.spec.ts@@ -0,0 +1,78 @@+import { Test, type TestingModule } from '@nestjs/testing';++import { OpenRecordIn } from 'twenty-shared/types';++import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';+import { type UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { WorkspaceMemberTranspiler } from 'src/engine/core-modules/user/services/workspace-member-transpiler.service';+import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';++const buildWorkspaceMemberEntity = (+ overrides: Partial<WorkspaceMemberWorkspaceEntity> = {},+) =>+ ({+ id: '20202020-0687-4c41-b707-ed1bfca972a7',+ name: { firstName: 'Tim', lastName: 'Apple' },+ userEmail: '[email protected]',+ colorScheme: 'System',+ openRecordIn: OpenRecordIn.RECORD_PAGE,+ locale: 'en',+ avatarUrl: null,+ timeFormat: 'SYSTEM',+ timeZone: 'system',+ dateFormat: 'SYSTEM',+ calendarStartDay: 0,+ numberFormat: 'SYSTEM',+ ...overrides,+ }) as unknown as WorkspaceMemberWorkspaceEntity;++const userWorkspace = {+ id: '20202020-9e3b-46d4-a556-88b9ddc2b034',+ workspaceId: '20202020-1c25-4d02-bf25-6aeccf7ea419',+} as UserWorkspaceEntity;++describe('WorkspaceMemberTranspiler', () => {+ let transpiler: WorkspaceMemberTranspiler;++ beforeEach(async () => {+ const module: TestingModule = await Test.createTestingModule({+ providers: [+ WorkspaceMemberTranspiler,+ {+ provide: FileUrlService,+ useValue: { signFileByIdUrl: jest.fn().mockResolvedValue('') },+ },+ ],+ }).compile();++ transpiler = module.get<WorkspaceMemberTranspiler>(+ WorkspaceMemberTranspiler,+ );+ });++ afterEach(() => {+ jest.clearAllMocks();+ });++ it('should preserve openRecordIn when the workspace member has one', async () => {+ const dto = await transpiler.toWorkspaceMemberDto({+ userWorkspace,+ workspaceMemberEntity: buildWorkspaceMemberEntity(),+ userWorkspaceRoles: [],+ });++ expect(dto.openRecordIn).toBe(OpenRecordIn.RECORD_PAGE);+ });++ it('should fall back to SIDE_PANEL when the workspace has not been upgraded yet', async () => {+ const dto = await transpiler.toWorkspaceMemberDto({+ userWorkspace,+ workspaceMemberEntity: buildWorkspaceMemberEntity({+ openRecordIn: undefined as unknown as string,+ }),+ userWorkspaceRoles: [],+ });++ expect(dto.openRecordIn).toBe(OpenRecordIn.SIDE_PANEL);+ });+});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.tsindex 4bf3820f0c5..c516b51fed5 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@@ -16,7 +16,7 @@ import {type WorkspaceMemberTimeFormatEnum,type WorkspaceMemberWorkspaceEntity,} from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';-import { FileFolder, type OpenRecordIn } from 'twenty-shared/types';+import { FileFolder, OpenRecordIn } from 'twenty-shared/types';export type ToWorkspaceMemberDtoArgs = {workspaceMemberEntity: WorkspaceMemberWorkspaceEntity;@@ -99,7 +99,9 @@ export class WorkspaceMemberTranspiler {avatarUrl,userWorkspaceId: userWorkspace.id,colorScheme,- openRecordIn: openRecordIn as OpenRecordIn,+ // Workspaces upgrade after the code rolls out, so the field is absent+ // until the 2-27 workspace command reaches them.+ openRecordIn: (openRecordIn as OpenRecordIn) ?? OpenRecordIn.SIDE_PANEL,dateFormat: dateFormat as WorkspaceMemberDateFormatEnum,locale,timeFormat: timeFormat as WorkspaceMemberTimeFormatEnum,