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

11
server/src/decorators/prisma-select.decorator.ts
View File

@ -1,5 +1,6 @@
import { createParamDecorator, ExecutionContext } from '@nestjs/common';
import { GqlExecutionContext } from '@nestjs/graphql';
import merge from 'lodash.merge';
import {
PrismaSelect,
ModelSelectMap,
@ -8,6 +9,14 @@ import {
export { PrismaSelect };
const globalDefaultFields: DefaultFieldsMap = {
User: {
// Needed for displayName resolve field
firstName: true,
lastName: true,
},
};
export const PrismaSelector = createParamDecorator(
(
data: {
@ -20,7 +29,7 @@ export const PrismaSelector = createParamDecorator(
const info = gqlCtx.getInfo();
return new PrismaSelect(data.modelName, info, {
defaultFields: data.defaultFields,
defaultFields: merge(globalDefaultFields, data.defaultFields),
});
},
);