mirror of
https://github.com/kremalicious/umami.git
synced 2024-06-28 08:47:50 +02:00
rename url filter to url_path
This commit is contained in:
parent
9cb6046844
commit
92f32ce7fa
|
@ -45,7 +45,7 @@ export const SESSION_COLUMNS = [
|
||||||
];
|
];
|
||||||
|
|
||||||
export const FILTER_COLUMNS = {
|
export const FILTER_COLUMNS = {
|
||||||
url: 'url_path',
|
url_path: 'url_path',
|
||||||
referrer: 'referrer_domain',
|
referrer: 'referrer_domain',
|
||||||
title: 'page_title',
|
title: 'page_title',
|
||||||
query: 'url_query',
|
query: 'url_query',
|
||||||
|
|
|
@ -189,7 +189,7 @@ export interface QueryFilters {
|
||||||
timezone?: string;
|
timezone?: string;
|
||||||
unit?: string;
|
unit?: string;
|
||||||
eventType?: number;
|
eventType?: number;
|
||||||
url?: string;
|
url_path?: string;
|
||||||
referrer?: string;
|
referrer?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
query?: string;
|
query?: string;
|
||||||
|
|
|
@ -14,7 +14,7 @@ export interface WebsiteEventsRequestQuery {
|
||||||
endAt: string;
|
endAt: string;
|
||||||
unit?: string;
|
unit?: string;
|
||||||
timezone?: string;
|
timezone?: string;
|
||||||
url: string;
|
url_path: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const schema = {
|
const schema = {
|
||||||
|
@ -24,7 +24,7 @@ const schema = {
|
||||||
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
|
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
|
||||||
unit: UnitTypeTest,
|
unit: UnitTypeTest,
|
||||||
timezone: TimezoneTest,
|
timezone: TimezoneTest,
|
||||||
url: yup.string(),
|
url_path: yup.string(),
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ export default async (
|
||||||
await useAuth(req, res);
|
await useAuth(req, res);
|
||||||
await useValidate(schema, req, res);
|
await useValidate(schema, req, res);
|
||||||
|
|
||||||
const { id: websiteId, timezone, url } = req.query;
|
const { id: websiteId, timezone, url_path } = req.query;
|
||||||
const { startDate, endDate, unit } = await parseDateRangeQuery(req);
|
const { startDate, endDate, unit } = await parseDateRangeQuery(req);
|
||||||
|
|
||||||
if (req.method === 'GET') {
|
if (req.method === 'GET') {
|
||||||
|
@ -49,7 +49,7 @@ export default async (
|
||||||
endDate,
|
endDate,
|
||||||
timezone,
|
timezone,
|
||||||
unit,
|
unit,
|
||||||
url,
|
url_path,
|
||||||
});
|
});
|
||||||
|
|
||||||
return ok(res, events);
|
return ok(res, events);
|
||||||
|
|
|
@ -13,7 +13,7 @@ export interface WebsiteMetricsRequestQuery {
|
||||||
type: string;
|
type: string;
|
||||||
startAt: number;
|
startAt: number;
|
||||||
endAt: number;
|
endAt: number;
|
||||||
url?: string;
|
url_path?: string;
|
||||||
referrer?: string;
|
referrer?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
query?: string;
|
query?: string;
|
||||||
|
@ -33,7 +33,7 @@ const schema = {
|
||||||
type: yup.string().required(),
|
type: yup.string().required(),
|
||||||
startAt: yup.number().required(),
|
startAt: yup.number().required(),
|
||||||
endAt: yup.number().required(),
|
endAt: yup.number().required(),
|
||||||
url: yup.string(),
|
url_path: yup.string(),
|
||||||
referrer: yup.string(),
|
referrer: yup.string(),
|
||||||
title: yup.string(),
|
title: yup.string(),
|
||||||
query: yup.string(),
|
query: yup.string(),
|
||||||
|
@ -59,7 +59,7 @@ export default async (
|
||||||
const {
|
const {
|
||||||
id: websiteId,
|
id: websiteId,
|
||||||
type,
|
type,
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
query,
|
query,
|
||||||
|
@ -83,7 +83,7 @@ export default async (
|
||||||
const filters = {
|
const filters = {
|
||||||
startDate,
|
startDate,
|
||||||
endDate,
|
endDate,
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
query,
|
query,
|
||||||
|
|
|
@ -12,7 +12,7 @@ export interface WebsitePageviewRequestQuery {
|
||||||
endAt: number;
|
endAt: number;
|
||||||
unit?: string;
|
unit?: string;
|
||||||
timezone?: string;
|
timezone?: string;
|
||||||
url?: string;
|
url_path?: string;
|
||||||
referrer?: string;
|
referrer?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
os?: string;
|
os?: string;
|
||||||
|
@ -32,7 +32,7 @@ const schema = {
|
||||||
endAt: yup.number().required(),
|
endAt: yup.number().required(),
|
||||||
unit: UnitTypeTest,
|
unit: UnitTypeTest,
|
||||||
timezone: TimezoneTest,
|
timezone: TimezoneTest,
|
||||||
url: yup.string(),
|
url_path: yup.string(),
|
||||||
referrer: yup.string(),
|
referrer: yup.string(),
|
||||||
title: yup.string(),
|
title: yup.string(),
|
||||||
os: yup.string(),
|
os: yup.string(),
|
||||||
|
@ -55,7 +55,7 @@ export default async (
|
||||||
const {
|
const {
|
||||||
id: websiteId,
|
id: websiteId,
|
||||||
timezone,
|
timezone,
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
os,
|
os,
|
||||||
|
@ -78,7 +78,7 @@ export default async (
|
||||||
endDate,
|
endDate,
|
||||||
timezone,
|
timezone,
|
||||||
unit,
|
unit,
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
os,
|
os,
|
||||||
|
|
|
@ -11,7 +11,7 @@ export interface WebsiteStatsRequestQuery {
|
||||||
id: string;
|
id: string;
|
||||||
startAt: number;
|
startAt: number;
|
||||||
endAt: number;
|
endAt: number;
|
||||||
url?: string;
|
url_path?: string;
|
||||||
referrer?: string;
|
referrer?: string;
|
||||||
title?: string;
|
title?: string;
|
||||||
query?: string;
|
query?: string;
|
||||||
|
@ -30,7 +30,7 @@ const schema = {
|
||||||
id: yup.string().uuid().required(),
|
id: yup.string().uuid().required(),
|
||||||
startAt: yup.number().required(),
|
startAt: yup.number().required(),
|
||||||
endAt: yup.number().required(),
|
endAt: yup.number().required(),
|
||||||
url: yup.string(),
|
url_path: yup.string(),
|
||||||
referrer: yup.string(),
|
referrer: yup.string(),
|
||||||
title: yup.string(),
|
title: yup.string(),
|
||||||
query: yup.string(),
|
query: yup.string(),
|
||||||
|
@ -54,7 +54,7 @@ export default async (
|
||||||
|
|
||||||
const {
|
const {
|
||||||
id: websiteId,
|
id: websiteId,
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
query,
|
query,
|
||||||
|
@ -78,7 +78,7 @@ export default async (
|
||||||
const prevEndDate = subMinutes(endDate, diff);
|
const prevEndDate = subMinutes(endDate, diff);
|
||||||
|
|
||||||
const filters = {
|
const filters = {
|
||||||
url,
|
url_path,
|
||||||
referrer,
|
referrer,
|
||||||
title,
|
title,
|
||||||
query,
|
query,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user