diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx index 15cb86ccc..5471a11aa 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionData.tsx @@ -1,4 +1,5 @@ -import { Box, Column, Label, Row, Text } from '@umami/react-zen'; +import { Column, Label, Row, Text } from '@umami/react-zen'; +import { Badge } from '@/components/common/Badge'; import { Empty } from '@/components/common/Empty'; import { LoadingPanel } from '@/components/common/LoadingPanel'; import { useSessionDataQuery } from '@/components/hooks'; @@ -17,11 +18,9 @@ export function SessionData({ websiteId, sessionId }: { websiteId: string; sessi {stringValue} - - - {DATA_TYPES[dataType]} - - + + {DATA_TYPES[dataType]} + ); diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.test.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.test.ts new file mode 100644 index 000000000..5563590af --- /dev/null +++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.test.ts @@ -0,0 +1,84 @@ +import { endOfMonth, startOfMonth } from 'date-fns'; +import { beforeEach, expect, test, vi } from 'vitest'; +import { getQueryFilters, parseRequest } from '@/lib/request'; +import { canViewWebsiteSection } from '@/permissions'; +import { getLinkedSessionIds, getSessionActivity } from '@/queries/sql'; +import { GET } from './route'; + +vi.mock('@/lib/request', () => ({ + getQueryFilters: vi.fn(), + parseRequest: vi.fn(), +})); + +vi.mock('@/permissions', () => ({ + canViewWebsiteSection: vi.fn(), +})); + +vi.mock('@/queries/sql', () => ({ + getLinkedDistinctIds: vi.fn(), + getLinkedSessionIds: vi.fn(), + getSessionActivity: vi.fn(), +})); + +const parseRequestMock = vi.mocked(parseRequest); +const getQueryFiltersMock = vi.mocked(getQueryFilters); +const canViewWebsiteSectionMock = vi.mocked(canViewWebsiteSection); +const getLinkedSessionIdsMock = vi.mocked(getLinkedSessionIds); +const getSessionActivityMock = vi.mocked(getSessionActivity); + +beforeEach(() => { + parseRequestMock.mockReset(); + getQueryFiltersMock.mockReset(); + canViewWebsiteSectionMock.mockReset(); + getLinkedSessionIdsMock.mockReset(); + getSessionActivityMock.mockReset(); +}); + +test('uses linked session months to widen stitched activity without scanning event bounds', async () => { + const query = { + startAt: +new Date('2026-07-20T23:38:54.000Z'), + endAt: +new Date('2026-07-21T00:08:01.000Z'), + distinctId: 'bob@aol.com', + }; + const linkedStart = new Date('2026-05-15T12:00:00.000Z'); + const linkedEnd = new Date('2026-08-02T12:00:00.000Z'); + const filters = { + startDate: startOfMonth(linkedStart), + endDate: endOfMonth(linkedEnd), + }; + + parseRequestMock.mockResolvedValue({ auth: {}, query, error: undefined }); + canViewWebsiteSectionMock.mockResolvedValue(true); + getLinkedSessionIdsMock.mockResolvedValue([ + { sessionId: 'session-2', createdAt: linkedStart.toISOString() }, + { sessionId: 'session-3', createdAt: linkedEnd.toISOString() }, + ]); + getQueryFiltersMock.mockResolvedValue(filters); + getSessionActivityMock.mockResolvedValue([{ eventId: 'event-1' }]); + + const response = await GET( + new Request( + 'http://localhost/api/websites/website-1/sessions/session-1/activity?startAt=1784590734000&endAt=1784592481000&distinctId=bob%40aol.com', + ), + { + params: Promise.resolve({ websiteId: 'website-1', sessionId: 'session-1' }), + }, + ); + + expect(response.status).toBe(200); + expect(getLinkedSessionIdsMock).toHaveBeenCalledWith('website-1', 'bob@aol.com'); + expect(getQueryFiltersMock).toHaveBeenCalledWith( + { + ...query, + startAt: +startOfMonth(linkedStart), + endAt: +endOfMonth(linkedEnd), + }, + 'website-1', + ); + expect(getSessionActivityMock).toHaveBeenCalledWith( + 'website-1', + ['session-1', 'session-2', 'session-3'], + filters, + ); + await expect(response.json()).resolves.toEqual([{ eventId: 'event-1' }]); +}); diff --git a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts index 27f0716ec..29efcad62 100644 --- a/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts +++ b/src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts @@ -1,3 +1,4 @@ +import { endOfMonth, startOfMonth } from 'date-fns'; import { z } from 'zod'; import { FIELD_LENGTH } from '@/lib/constants'; import { getQueryFilters, parseRequest } from '@/lib/request'; @@ -7,7 +8,6 @@ import { getLinkedDistinctIds, getLinkedSessionIds, getSessionActivity, - getSessionActivityBounds, } from '@/queries/sql'; export async function GET( @@ -42,18 +42,19 @@ export async function GET( : await getLinkedDistinctIds(websiteId, sessionId); if (distinctIds.length) { - const links = await Promise.all(distinctIds.map(distinctId => getLinkedSessionIds(websiteId, distinctId))); + const links = await Promise.all( + distinctIds.map(distinctId => getLinkedSessionIds(websiteId, distinctId)), + ); const linkedIds = links.flatMap(group => group.map(link => link.sessionId)); + const linkedDates = links + .flatMap(group => group.map(link => +new Date(link.createdAt))) + .filter(timestamp => !Number.isNaN(timestamp)); sessionIds = Array.from(new Set([sessionId, ...linkedIds])); - if (sessionIds.length > 1) { - const bounds = await getSessionActivityBounds(websiteId, sessionIds); - - if (bounds?.firstAt && bounds?.lastAt) { - startAt = Math.min(startAt, +new Date(bounds.firstAt)); - endAt = Math.max(endAt, +new Date(bounds.lastAt)); - } + if (sessionIds.length > 1 && linkedDates.length) { + startAt = Math.min(startAt, +startOfMonth(new Date(Math.min(...linkedDates)))); + endAt = Math.max(endAt, +endOfMonth(new Date(Math.max(...linkedDates)))); } } diff --git a/src/components/common/Badge.module.css b/src/components/common/Badge.module.css index c3c293141..13d9123d9 100644 --- a/src/components/common/Badge.module.css +++ b/src/components/common/Badge.module.css @@ -2,6 +2,7 @@ display: inline-flex; align-items: center; align-self: flex-start; + flex-shrink: 0; gap: 6px; padding: 2px 8px; border-radius: 6px; diff --git a/src/components/property-data/PropertyFilterRecord.tsx b/src/components/property-data/PropertyFilterRecord.tsx index 2dd387eb4..710cb40e3 100644 --- a/src/components/property-data/PropertyFilterRecord.tsx +++ b/src/components/property-data/PropertyFilterRecord.tsx @@ -148,8 +148,18 @@ export function PropertyFilterRecord({ }; return ( - - + +