watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 21:57:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Added useFilterQuery. Converted websites and reports pages.

Browse source
This commit is contained in:
Mike Cao 2023-09-26 23:20:29 -07:00
parent 6846355c63
commit 7e626dcd52
29 changed files with 373 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

107
src/queries/admin/report.ts
View file

@ -1,5 +1,4 @@
import { Prisma, Report } from '@prisma/client';
import { REPORT_FILTER_TYPES } from 'lib/constants';
import prisma from 'lib/prisma';
import { FilterResult, ReportSearchFilter } from 'lib/types';
@ -27,27 +26,21 @@ export async function deleteReport(reportId: string): Promise<Report> {
}
export async function getReports(
ReportSearchFilter: ReportSearchFilter,
params: ReportSearchFilter,
options?: { include?: Prisma.ReportInclude },
): Promise<FilterResult<Report[]>> {
const {
userId,
websiteId,
includeTeams,
filter,
filterType = REPORT_FILTER_TYPES.all,
} = ReportSearchFilter;
const { query, userId, websiteId, includeTeams } = params;
const mode = prisma.getSearchMode();
const where: Prisma.ReportWhereInput = {
...(userId && { userId: userId }),
...(websiteId && { websiteId: websiteId }),
userId,
websiteId,
AND: [
{
OR: [
{
...(userId && { userId: userId }),
userId,
},
{
...(includeTeams && {
@ -71,71 +64,53 @@ export async function getReports(
{
OR: [
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES.name) && {
name: {
contains: query,
...mode,
},
},
{
description: {
contains: query,
...mode,
},
},
{
type: {
contains: query,
...mode,
},
},
{
user: {
username: {
contains: query,
...mode,
},
},
},
{
website: {
name: {
startsWith: filter,
contains: query,
...mode,
},
}),
},
},
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES.description) && {
description: {
startsWith: filter,
website: {
domain: {
contains: query,
...mode,
},
}),
},
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES.type) && {
type: {
startsWith: filter,
...mode,
},
}),
},
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES['user:username']) && {
user: {
username: {
startsWith: filter,
...mode,
},
},
}),
},
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES['website:name']) && {
website: {
name: {
startsWith: filter,
...mode,
},
},
}),
},
{
...((filterType === REPORT_FILTER_TYPES.all ||
filterType === REPORT_FILTER_TYPES['website:domain']) && {
website: {
domain: {
startsWith: filter,
...mode,
},
},
}),
},
},
],
},
],
};
const [pageFilters, getParameters] = prisma.getPageFilters(ReportSearchFilter);
const [pageFilters, pageInfo] = prisma.getPageFilters(params);
const reports = await prisma.client.report.findMany({
where,
@ -150,13 +125,13 @@ export async function getReports(
return {
data: reports,
count,
...getParameters,
...pageInfo,
};
}
export async function getReportsByUserId(
userId: string,
filter: ReportSearchFilter,
filter?: ReportSearchFilter,
): Promise<FilterResult<Report[]>> {
return getReports(
{ userId, ...filter },

4
src/queries/admin/website.ts
View file

@ -72,10 +72,10 @@ export async function getWebsites(
OR: query
? [
{
name: { startsWith: query, ...mode },
name: { contains: query, ...mode },
},
{
domain: { startsWith: query, ...mode },
domain: { contains: query, ...mode },
},
]
: [],