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

fix: displayName return undefined and drop displayName from user table (#505)

Browse Source
This commit is contained in:
Jérémy M
2023-07-04 20:08:15 +02:00
committed by GitHub
parent d83313cd93
commit 6fc416da76
98 changed files with 128 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/core/user/user.resolver.ts
View File

@ -1,8 +1,6 @@
import { Args, Resolver, Query, ResolveField, Parent } from '@nestjs/graphql';
import { UserService } from './user.service';
import { FindManyUserArgs } from 'src/core/@generated/user/find-many-user.args';
import { Workspace } from '@prisma/client';
import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator';
import { User } from 'src/core/@generated/user/user.model';
import { ExceptionFilter } from 'src/filters/exception.filter';
import { UseFilters, UseGuards } from '@nestjs/common';
@ -31,7 +29,6 @@ export class UserResolver {
@CheckAbilities(ReadUserAbilityHandler)
async findManyUser(
@Args() args: FindManyUserArgs,
@AuthWorkspace() workspace: Workspace,
@UserAbility() ability: AppAbility,
@PrismaSelector({ modelName: 'User' })
prismaSelect: PrismaSelect<'User'>,
@ -51,11 +48,6 @@ export class UserResolver {
nullable: false,
})
displayName(@Parent() parent: User): string {
// TODO: Should be removed when displayName is removed from the database
if (!parent.firstName && !parent.lastName) {
return parent.displayName ?? '';
}
return `${parent.firstName} ${parent.lastName}`;
return `${parent.firstName ?? ''} ${parent.lastName ?? ''}`;
}
}