Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix teamRole showing.

Brian Caoc5dd3390d61c
diff --git a/src/components/pages/settings/teams/TeamMembersTable.js b/src/components/pages/settings/teams/TeamMembersTable.js
index 4f620cf77..0755c1932 100644
--- a/src/components/pages/settings/teams/TeamMembersTable.js
+++ b/src/components/pages/settings/teams/TeamMembersTable.js
@@ -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];
diff --git a/src/pages/api/teams/[id]/index.ts b/src/pages/api/teams/[id]/index.ts
index 31c47b2f1..a5527580d 100644
--- a/src/pages/api/teams/[id]/index.ts
+++ b/src/pages/api/teams/[id]/index.ts
@@ -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(),
diff --git a/src/queries/admin/user.ts b/src/queries/admin/user.ts
index dfe8ea283..ee6f778b0 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -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: {