watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 22:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Support contains queries in overview page.

Browse source
This commit is contained in:
Mike Cao 2024-03-27 02:17:55 -07:00
commit d945ed3a23
12 changed files with 75 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/pages/api/websites/[websiteId]/metrics.ts
View file

@ -5,7 +5,7 @@ import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { SESSION_COLUMNS, EVENT_COLUMNS, FILTER_COLUMNS, OPERATORS } from 'lib/constants';
import { getPageviewMetrics, getSessionMetrics } from 'queries';
import { parseDateRangeQuery } from 'lib/query';
import { getQueryFilters, parseDateRangeQuery } from 'lib/query';
import * as yup from 'yup';
export interface WebsiteMetricsRequestQuery {
@ -62,25 +62,7 @@ export default async (
await useAuth(req, res);
await useValidate(schema, req, res);
const {
websiteId,
type,
url,
referrer,
title,
query,
os,
browser,
device,
country,
region,
city,
language,
event,
limit,
offset,
search,
} = req.query;
const { websiteId, type, limit, offset, search } = req.query;
if (req.method === 'GET') {
if (!(await canViewWebsite(req.auth, websiteId))) {
@ -90,24 +72,13 @@ export default async (
const { startDate, endDate } = await parseDateRangeQuery(req);
const column = FILTER_COLUMNS[type] || type;
const filters = {
...getQueryFilters(req),
startDate,
endDate,
url,
referrer,
title,
query,
os,
browser,
device,
country,
region,
city,
language,
event,
};
if (search) {
filters[column] = {
filters[type] = {
column,
operator: OPERATORS.contains,
value: search,

15
src/pages/api/websites/[websiteId]/pageviews.ts
View file

@ -1,6 +1,6 @@
import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { parseDateRangeQuery } from 'lib/query';
import { getQueryFilters, parseDateRangeQuery } from 'lib/query';
import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
@ -52,8 +52,7 @@ export default async (
await useAuth(req, res);
await useValidate(schema, req, res);
const { websiteId, timezone, url, referrer, title, os, browser, device, country, region, city } =
req.query;
const { websiteId, timezone } = req.query;
if (req.method === 'GET') {
if (!(await canViewWebsite(req.auth, websiteId))) {
@ -63,19 +62,11 @@ export default async (
const { startDate, endDate, unit } = await parseDateRangeQuery(req);
const filters = {
...getQueryFilters(req),
startDate,
endDate,
timezone,
unit,
url,
referrer,
title,
os,
browser,
device,
country,
region,
city,
};
const [pageviews, sessions] = await Promise.all([

31
src/pages/api/websites/[websiteId]/stats.ts
View file

@ -4,7 +4,7 @@ import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';
import { parseDateRangeQuery } from 'lib/query';
import { getQueryFilters, parseDateRangeQuery } from 'lib/query';
import { getWebsiteStats } from 'queries';
export interface WebsiteStatsRequestQuery {
@ -52,20 +52,7 @@ export default async (
await useAuth(req, res);
await useValidate(schema, req, res);
const {
websiteId,
url,
referrer,
title,
query,
event,
os,
browser,
device,
country,
region,
city,
}: any & { websiteId: string } = req.query;
const { websiteId } = req.query;
if (req.method === 'GET') {
if (!(await canViewWebsite(req.auth, websiteId))) {
@ -77,19 +64,7 @@ export default async (
const prevStartDate = subMinutes(startDate, diff);
const prevEndDate = subMinutes(endDate, diff);
const filters = {
url,
referrer,
title,
query,
event,
os,
browser,
device,
country,
region,
city,
};
const filters = getQueryFilters(req);
const metrics = await getWebsiteStats(websiteId, { ...filters, startDate, endDate });