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

udpate constants and references to filter groups

Browse Source
This commit is contained in:
Francis Cao
2025-06-24 11:09:36 -07:00
parent 5ffafc71fc
commit 657ae8ebdb
6 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
View File

@@ -7,7 +7,7 @@ import WebsiteExpandedView from './WebsiteExpandedView';
import WebsiteHeader from './WebsiteHeader';
import WebsiteMetricsBar from './WebsiteMetricsBar';
import WebsiteTableView from './WebsiteTableView';
import { FILTER_COLUMNS } from '@/lib/constants';
import { FILTER_COLUMNS, FILTER_GROUPS } from '@/lib/constants';
export default function WebsiteDetailsPage({ websiteId }: { websiteId: string }) {
const pathname = usePathname();
@@ -17,7 +17,7 @@ export default function WebsiteDetailsPage({ websiteId }: { websiteId: string })
const { view } = query;
const params = Object.keys(query).reduce((obj, key) => {
if (FILTER_COLUMNS[key]) {
if (FILTER_COLUMNS[key] || FILTER_GROUPS[key]) {
obj[key] = query[key];
}
return obj;

4
src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
View File

@@ -3,7 +3,7 @@ import WebsiteHeader from '../WebsiteHeader';
import WebsiteMetricsBar from '../WebsiteMetricsBar';
import FilterTags from '@/components/metrics/FilterTags';
import { useNavigation } from '@/components/hooks';
import { FILTER_COLUMNS } from '@/lib/constants';
import { FILTER_COLUMNS, FILTER_GROUPS } from '@/lib/constants';
import WebsiteChart from '../WebsiteChart';
import WebsiteCompareTables from './WebsiteCompareTables';
@@ -11,7 +11,7 @@ export function WebsiteComparePage({ websiteId }) {
const { query } = useNavigation();
const params = Object.keys(query).reduce((obj, key) => {
if (FILTER_COLUMNS[key]) {
if (FILTER_COLUMNS[key] || FILTER_GROUPS[key]) {
obj[key] = query[key];
}
return obj;

8
src/app/api/websites/[websiteId]/values/route.ts
View File

@@ -30,17 +30,13 @@ export async function GET(
return unauthorized();
}
if (
!SESSION_COLUMNS.includes(type) &&
!EVENT_COLUMNS.includes(type) &&
!FILTER_GROUPS.includes(type)
) {
if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type) && !FILTER_GROUPS[type]) {
return badRequest('Invalid type.');
}
let values;
if (FILTER_GROUPS.includes(type)) {
if (FILTER_GROUPS[type]) {
values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
} else {
values = await getValues(websiteId, FILTER_COLUMNS[type], startDate, endDate, search);