From 22aeaf7166ea7a3169b8b760fdc7323d66f05cc3 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 2 Feb 2023 02:54:43 -0800 Subject: [PATCH] Added owner column to teams table. --- assets/add-user.svg | 1 + components/pages/settings/teams/TeamsTable.js | 2 +- queries/admin/user.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 assets/add-user.svg diff --git a/assets/add-user.svg b/assets/add-user.svg new file mode 100644 index 00000000..9d0544c6 --- /dev/null +++ b/assets/add-user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/components/pages/settings/teams/TeamsTable.js b/components/pages/settings/teams/TeamsTable.js index 3e7dd2cd..bc26fd47 100644 --- a/components/pages/settings/teams/TeamsTable.js +++ b/components/pages/settings/teams/TeamsTable.js @@ -42,7 +42,7 @@ export default function TeamsTable({ data = [] }) { const rowData = { ...row, - owner: row.teamUsers.find(({ role }) => role === ROLES.teamOwner)?.user?.username, + owner: row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username, action: ( diff --git a/queries/admin/user.ts b/queries/admin/user.ts index 94109251..ba6ef186 100644 --- a/queries/admin/user.ts +++ b/queries/admin/user.ts @@ -49,14 +49,14 @@ export async function getUsers(): Promise { export async function getUserTeams(userId: string): Promise { return prisma.client.team.findMany({ where: { - teamUsers: { + teamUser: { some: { userId, }, }, }, include: { - teamUsers: { + teamUser: { include: { user: true, },