Merge branch 'dev' into boards

src/app/(main)/links/LinkDeleteButton.tsx

@@ -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, {

src/app/(main)/links/LinkEditForm.tsx

@@ -50,6 +50,7 @@ export function LinkEditForm({
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('links');
+        touch(`link:${linkId}`);
         onSave?.();
         onClose?.();
       },

src/app/(main)/pixels/PixelEditForm.tsx

@@ -48,6 +48,7 @@ export function PixelEditForm({
       onSuccess: async () => {
         toast(formatMessage(messages.saved));
         touch('pixels');
+        touch(`pixel:${pixelId}`);
         onSave?.();
         onClose?.();
       },

src/app/api/reports/attribution/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
 

src/app/api/reports/breakdown/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
 

src/app/api/reports/funnel/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
 

src/app/api/reports/goal/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getGoal(websiteId, parameters as GoalParameters, filters);
 

src/app/api/reports/retention/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = await getRetention(websiteId, parameters as RetentionParameters, filters);
 

src/app/api/reports/revenue/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
 

src/app/api/reports/utm/route.ts

@@ -18,8 +18,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(body.filters, websiteId);
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = {
     utm_source: [],

src/app/api/websites/[websiteId]/event-data/events/route.ts

@@ -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,

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -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,

src/app/api/websites/[websiteId]/events/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/events/series/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/export/route.ts

@@ -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),

src/app/api/websites/[websiteId]/metrics/expanded/route.ts

@@ -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}`;

src/app/api/websites/[websiteId]/metrics/route.ts

@@ -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}`;

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -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),

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -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,

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/sessions/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -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);
 

src/app/api/websites/[websiteId]/stats/route.ts

@@ -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,

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

@@ -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);
   }
 

src/components/hooks/queries/useWebsiteStatsQuery.ts

@@ -1,5 +1,6 @@
 import type { UseQueryOptions } from '@tanstack/react-query';
 import { useDateParameters } from '@/components/hooks/useDateParameters';
+import { useDateRange } from '@/components/hooks/useDateRange';
 import { useApi } from '../useApi';
 import { useFilterParameters } from '../useFilterParameters';
 
@@ -24,12 +25,16 @@ export function useWebsiteStatsQuery(
 ) {
   const { get, useQuery } = useApi();
   const { startAt, endAt, unit, timezone } = useDateParameters();
+  const { compare } = useDateRange();
   const filters = useFilterParameters();
 
   return useQuery<WebsiteStatsData>({
-    queryKey: ['websites:stats', { websiteId, startAt, endAt, unit, timezone, ...filters }],
+    queryKey: [
+      'websites:stats',
+      { websiteId, startAt, endAt, unit, timezone, compare, ...filters },
+    ],
     queryFn: () =>
-      get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, ...filters }),
+      get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, compare, ...filters }),
     enabled: !!websiteId,
     ...options,
   });

src/lib/request.ts

@@ -81,12 +81,12 @@ export function getRequestFilters(query: Record<string, any>) {
   return result;
 }
 
-export async function setWebsiteDate(websiteId: string, userId: string, data: Record<string, any>) {
+export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
   const website = await fetchWebsite(websiteId);
   const cloudMode = !!process.env.CLOUD_MODE;
 
   if (cloudMode && website && !website.teamId) {
-    const account = await fetchAccount(userId);
+    const account = await fetchAccount(website.userId);
 
     if (!account?.hasSubscription) {
       data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
@@ -103,13 +103,12 @@ export async function setWebsiteDate(websiteId: string, userId: string, data: Re
 export async function getQueryFilters(
   params: Record<string, any>,
   websiteId?: string,
-  userId?: string,
 ): Promise<QueryFilters> {
   const dateRange = getRequestDateRange(params);
   const filters = getRequestFilters(params);
 
   if (websiteId) {
-    await setWebsiteDate(websiteId, userId, dateRange);
+    await setWebsiteDate(websiteId, dateRange);
 
     if (params.segment) {
       const segmentParams = (await getWebsiteSegment(websiteId, params.segment))

src/lib/schema.ts

@@ -20,7 +20,7 @@ export const dateRangeParams = {
   endDate: z.coerce.date().optional(),
   timezone: timezoneParam.optional(),
   unit: unitParam.optional(),
-  compare: z.string().optional(),
+  compare: z.enum(['prev', 'yoy']).optional(),
 };
 
 export const filterParams = {