m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-01 12:29:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix teamRole showing.

Browse Source
This commit is contained in:
Brian Cao 2023-09-06 11:37:41 -07:00
parent f2f5517051
commit c5dd3390d6
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/pages/settings/teams/TeamMembersTable.js
View File

@ -29,7 +29,9 @@ export function TeamMembersTable({
}
if (key === 'role') {
return formatMessage(
labels[Object.keys(ROLES).find(key => ROLES[key] === row.role) || labels.unknown],
labels[
Object.keys(ROLES).find(key => ROLES[key] === row?.teamUser[0]?.role) || labels.unknown
],
);
}
return data[key];

4
src/pages/api/teams/[id]/index.ts
View File

@ -22,8 +22,8 @@ const schema = {
}),
POST: yup.object().shape({
id: yup.string().uuid().required(),
name: yup.string().max(50).required(),
accessCode: yup.string().max(50).required(),
name: yup.string().max(50),
accessCode: yup.string().max(50),
}),
DELETE: yup.object().shape({
id: yup.string().uuid().required(),

13
src/queries/admin/user.ts
View File

@ -97,7 +97,18 @@ export async function getUsers(
}
export async function getUsersByTeamId(teamId: string, filter?: UserSearchFilter) {
return getUsers({ teamId, ...filter });
return getUsers(
{ teamId, ...filter },
{
include: {
teamUser: {
select: {
role: true,
},
},
},
},
);
}
export async function createUser(data: {