Merge branch 'dev' into boards

This commit is contained in:
Mike Cao committed 2026-01-14 12:53:25 -08:00
commit 0fbd8a448d
32 files changed
+52 -43

No files matched your search

+3 -2
View File
@@ -1,5 +1,5 @@
import { ConfirmationForm } from '@/components/common/ConfirmationForm';
import { useDeleteQuery, useMessages } from '@/components/hooks';
import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';
import { Trash } from '@/components/icons';
import { DialogButton } from '@/components/input/DialogButton';
import { messages } from '@/components/messages';
@@ -15,7 +15,8 @@ export function LinkDeleteButton({
onSave?: () => void;
}) {
const { formatMessage, labels, getErrorMessage, FormattedMessage } = useMessages();
const { mutateAsync, isPending, error, touch } = useDeleteQuery(`/links/${linkId}`);
const { mutateAsync, isPending, error } = useDeleteQuery(`/links/${linkId}`);
const { touch } = useModified();
const handleConfirm = async (close: () => void) => {
await mutateAsync(null, {
+1
View File
@@ -50,6 +50,7 @@ export function LinkEditForm({
onSuccess: async () => {
toast(formatMessage(messages.saved));
touch('links');
touch(`link:${linkId}`);
onSave?.();
onClose?.();
},
+1
View File
@@ -48,6 +48,7 @@ export function PixelEditForm({
onSuccess: async () => {
toast(formatMessage(messages.saved));
touch('pixels');
touch(`pixel:${pixelId}`);
onSave?.();
onClose?.();
},
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const data = await getGoal(websiteId, parameters as GoalParameters, filters);
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const data = await getRetention(websiteId, parameters as RetentionParameters, filters);
+2 -2
View File
@@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
+2 -2
View File
@@ -18,8 +18,8 @@ export async function POST(request: Request) {
return unauthorized();
}
const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId);
const parameters = await setWebsiteDate(websiteId, body.parameters);
const data = {
utm_source: [],
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataEvents(websiteId, {
...filters,
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataFields(websiteId, filters);
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataProperties(websiteId, filters);
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataStats(websiteId, filters);
@@ -30,7 +30,7 @@ export async function GET(
}
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventDataValues(websiteId, {
...filters,
@@ -29,7 +29,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteEvents(websiteId, filters);
@@ -29,7 +29,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getEventStats(websiteId, filters);
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([
getEventMetrics(websiteId, { type: 'event' }, filters),
@@ -37,7 +37,7 @@ export async function GET(
}
const { type, limit, offset, search } = query;
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
if (search) {
filters[type] = `c.${search}`;
@@ -37,7 +37,7 @@ export async function GET(
}
const { type, limit, offset, search } = query;
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
if (search) {
filters[type] = `c.${search}`;
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const [pageviews, sessions] = await Promise.all([
getPageviewStats(websiteId, filters),
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataProperties(websiteId, filters);
@@ -29,7 +29,7 @@ export async function GET(
}
const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionDataValues(websiteId, {
...filters,
@@ -25,7 +25,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getSessionActivity(websiteId, sessionId, filters);
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteSessions(websiteId, filters);
@@ -27,7 +27,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const metrics = await getWebsiteSessionStats(websiteId, filters);
@@ -28,7 +28,7 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getWeeklyTraffic(websiteId, filters);
@@ -27,11 +27,13 @@ export async function GET(
return unauthorized();
}
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
const data = await getWebsiteStats(websiteId, filters);
const { startDate, endDate } = getCompareDate('prev', filters.startDate, filters.endDate);
const compare = filters.compare ?? 'prev';
const { startDate, endDate } = getCompareDate(compare, filters.startDate, filters.endDate);
const comparison = await getWebsiteStats(websiteId, {
...filters,
@@ -42,7 +42,7 @@ export async function GET(
value: segment.name,
}));
} else {
const filters = await getQueryFilters(query, websiteId, auth.user?.id);
const filters = await getQueryFilters(query, websiteId);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
}