watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 07:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Code cleanup.

Browse source
This commit is contained in:
Mike Cao 2023-08-18 21:52:59 -07:00
parent 21cdb06571
commit 7d5a24044a
10 changed files with 34 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
queries/admin/user.ts
View file

@ -37,10 +37,10 @@ export async function getUserByUsername(username: string, options: GetUserOption
}
export async function getUsers(
UserSearchFilter: UserSearchFilter,
searchFilter: UserSearchFilter,
options?: { include?: Prisma.UserInclude },
): Promise<FilterResult<User[]>> {
const { teamId, filter, filterType = USER_FILTER_TYPES.all } = UserSearchFilter;
const { teamId, filter, filterType = USER_FILTER_TYPES.all } = searchFilter;
const mode = prisma.getSearchMode();
const where: Prisma.UserWhereInput = {
@ -67,9 +67,10 @@ export async function getUsers(
},
}),
};
const [pageFilters, getParameters] = prisma.getPageFilters({
orderBy: 'username',
...UserSearchFilter,
...searchFilter,
});
const users = await prisma.client.user
@ -82,12 +83,9 @@ export async function getUsers(
...(options?.include && { include: options.include }),
})
.then(a => {
return a.map(a => {
const { password, ...rest } = a;
return rest;
});
return a.map(({ password, ...rest }) => rest);
});
const count = await prisma.client.user.count({
where: {
...where,