mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-01 12:29:35 +01:00
Merge branch 'dev' of https://github.com/umami-software/umami into dev
This commit is contained in:
commit
b585f5e53f
@ -10,7 +10,7 @@ import * as yup from 'yup';
|
|||||||
|
|
||||||
export interface WebsitesRequestQuery extends PageParams {
|
export interface WebsitesRequestQuery extends PageParams {
|
||||||
userId?: string;
|
userId?: string;
|
||||||
includeTeams?: boolean;
|
includeOwnedTeams?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface WebsitesRequestBody {
|
export interface WebsitesRequestBody {
|
||||||
@ -43,27 +43,28 @@ export default async (
|
|||||||
return unauthorized(res);
|
return unauthorized(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { userId, includeTeams } = req.query;
|
const { userId, includeOwnedTeams } = req.query;
|
||||||
|
|
||||||
const websites = await getWebsites(
|
const websites = await getWebsites(
|
||||||
{
|
{
|
||||||
where: {
|
where: {
|
||||||
OR: [
|
OR: [
|
||||||
...(userId && [{ userId }]),
|
...(userId && [{ userId }]),
|
||||||
...(userId &&
|
...(userId && includeOwnedTeams
|
||||||
includeTeams && [
|
? [
|
||||||
{
|
{
|
||||||
team: {
|
team: {
|
||||||
deletedAt: null,
|
deletedAt: null,
|
||||||
teamUser: {
|
teamUser: {
|
||||||
some: {
|
some: {
|
||||||
role: ROLES.teamOwner,
|
role: ROLES.teamOwner,
|
||||||
userId,
|
userId,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
]
|
||||||
]),
|
: []),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
|
Loading…
Reference in New Issue
Block a user