github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix search results.

Browse Source
This commit is contained in:
Brian Cao
2023-08-11 11:37:01 -07:00
parent 937ff82d9f
commit cbed961d01
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/api/me/websites.ts
View File

@@ -1,5 +1,5 @@
import { useAuth, useCors } from 'lib/middleware'; import { useAuth, useCors } from 'lib/middleware';
import { NextApiRequestQueryBody, WebsiteSearchFilterType } from 'lib/types'; import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
import { NextApiResponse } from 'next'; import { NextApiResponse } from 'next';
import { methodNotAllowed } from 'next-basics'; import { methodNotAllowed } from 'next-basics';

2
queries/admin/team.ts
View File

@@ -104,7 +104,7 @@ export async function getTeams(
...((filterType === TEAM_FILTER_TYPES.all || ...((filterType === TEAM_FILTER_TYPES.all ||
filterType === TEAM_FILTER_TYPES['user:username']) && { filterType === TEAM_FILTER_TYPES['user:username']) && {
teamUser: { teamUser: {
every: { some: {
role: ROLES.teamOwner, role: ROLES.teamOwner,
user: { user: {
username: { username: {

44
queries/admin/website.ts
View File

@@ -57,31 +57,33 @@ export async function getWebsites(
}, },
}, },
}), }),
AND: { AND: [
OR: [ {
{ OR: [
...(userId && { {
userId, ...(userId && {
}), userId,
}, }),
{ },
...(includeTeams && { {
teamWebsite: { ...(includeTeams && {
some: { teamWebsite: {
team: { some: {
teamUser: { team: {
some: { teamUser: {
userId, some: {
userId,
},
}, },
}, },
}, },
}, },
}, }),
}), },
}, ],
], },
}, { ...(filter && filterQuery) },
...(filter && filterQuery), ],
}; };
const [pageFilters, getParameters] = prisma.getPageFilters({ const [pageFilters, getParameters] = prisma.getPageFilters({