From ce64080160bff427379b93b017eddc13518b37ee Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Mon, 23 Aug 2021 10:40:57 +0100 Subject: [PATCH] Implement the new Avatar interface to the teams page (#512) --- components/team/screens/Team.tsx | 11 +++++++---- lib/teams/getTeam.ts | 15 ++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/components/team/screens/Team.tsx b/components/team/screens/Team.tsx index b108d5cf..04ecc75f 100644 --- a/components/team/screens/Team.tsx +++ b/components/team/screens/Team.tsx @@ -37,7 +37,11 @@ const Team = ({ team }) => { )} /> - +
{member.user.name} @@ -68,9 +72,8 @@ const Team = ({ team }) => {
{team.name} diff --git a/lib/teams/getTeam.ts b/lib/teams/getTeam.ts index 60939d07..7e631f4c 100644 --- a/lib/teams/getTeam.ts +++ b/lib/teams/getTeam.ts @@ -1,15 +1,9 @@ import { Team } from "@prisma/client"; import prisma from "@lib/prisma"; -import logger from "@lib/logger"; +import { defaultAvatarSrc } from "@lib/profile"; -const log = logger.getChildLogger({ prefix: ["[lib] getTeam"] }); export const getTeam = async (idOrSlug: string): Promise => { const teamIdOrSlug = idOrSlug; - - let team = null; - - log.debug(`{teamIdOrSlug} ${teamIdOrSlug}`); - const teamSelectInput = { id: true, name: true, @@ -34,7 +28,7 @@ export const getTeam = async (idOrSlug: string): Promise => { }, }; - team = await prisma.team.findFirst({ + const team = await prisma.team.findFirst({ where: { OR: [ { @@ -48,7 +42,10 @@ export const getTeam = async (idOrSlug: string): Promise => { select: teamSelectInput, }); - log.debug(`{team}`, { team }); + team.members = team.members.map((member) => { + member.user.avatar = member.user.avatar || defaultAvatarSrc({ email: member.user.email }); + return member; + }); return team; };