:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
feat(analytics): sort my work by personal last viewed time (#120382)
Matt Pua4f43066240b5
diff --git a/frontend/snapshots.yml b/frontend/snapshots.ymlindex 6ffcfccfe329..538e58dd863d 100644--- a/frontend/snapshots.yml+++ b/frontend/snapshots.yml@@ -9431,9 +9431,9 @@ snapshots:scenes-app-ai-observability-trace-view-trace-view-switch--on-old-view--light:hash: v1.k794b7964.de72868c75c31f3ba3d9813b5f86064d7dbf37bc1a896b8f13032dc102758876.Xpri2jtS8YkCfKQmwMkmtGGWN8oTE_vfUOaiXtOwJK0scenes-app-analytics--list--dark:- hash: v1.k794b7964.491dc621aeb0310eccd1992b6bcb6e49c878d1af174ddb4f8a6eb5a206d2dc15.62VHh3pelc5zQaSVOAYh5nLSDsstMvfqAABNu1tXtIo+ hash: v1.k794b7964.abb26fec274378bcfd2eee0513d13dac2eb8cf85c0aceeb86fdea8e08f25655a.TqrSyRm1_SXs5vVYqtBsPynPESYVEMGjSbYdiwoYoHYscenes-app-analytics--list--light:- hash: v1.k794b7964.ec7610bdf50d37e731fdc0a6446671ff50903f1ccce1d5e33571c55a93ecd539.RpYbc1iskXq3RYmsMgbiyYHLxQwvYDar5HT8_zUiF6w+ hash: v1.k794b7964.2df452766c9771889e1289f95a73f8e0e357d940ca3568cd30908c8838c5a250.5GeQANbRykvLp6TTksIGB3KdIyCcus5JIci4hzOdi6kscenes-app-analytics--list-empty--dark:hash: v1.k794b7964.61b8cac61e0cb0c46668f8740b9202f976c06512abfb0a96f90673f4f50c03fd.Fs5KYZ0rz3bW9aNkR4AeY8U4A-uVhNEhPzrb0xVkAb0scenes-app-analytics--list-empty--light:@@ -9443,9 +9443,9 @@ snapshots:scenes-app-analytics--list-error--light:hash: v1.k794b7964.0b3822357c7057f4b4096caa49e409f04c0dcf873d1caec1142905c973b8a388.-6qSzWEy-GkipPBSWw5E7UIxgqM5hd_i7aeuO6vqLz0scenes-app-analytics--list-filtered--dark:- hash: v1.k794b7964.61ab68dc34b3f4d139c73fd9f79dafd14e688069057ec8c384d16dc246b89560.WDh5lB-Zoknv2Oi7bd_Yn0xJBE4zqDvpT8V9KOnX2i4+ hash: v1.k794b7964.106ee977952d89cbdee3179f56483abb7cc115d2a0f9664bbace6fd6cd63de51.NcKdhOSoAyzy2ugEBWkHpEM_E7EwOKwnmjqL5h5z21Qscenes-app-analytics--list-filtered--light:- hash: v1.k794b7964.adfe28600efc57e2163f9712881ccb60b9e1cc9c4ecd688ceb1968cc8fff9a5e.kFNWycZGCBpto8f3bZNrOCIs9iLecy9WssloS0FEZrQ+ hash: v1.k794b7964.80bd667dbfebc7cc86c8673109b1e5ef913292199941bf47b80ce3eb23248237.V6MFIEJFyIG3S3W0b_BXxkxOoaZR-jb2OhU-aWrX20Mscenes-app-analytics--list-new-insight-dialog--dark:hash: v1.k794b7964.983417bc244b0139b676dcf72f101702ac2c9066893c9c091efaeaf720f7771f.24WgEVRBrA6BG5sl7FcJ1JUNyWv-RivTP9rr8jiWDJEscenes-app-analytics--list-new-insight-dialog--light:@@ -9455,17 +9455,17 @@ snapshots:scenes-app-analytics--list-no-matches--light:hash: v1.k794b7964.fbe8cd795c32098fc31475759b54b388b64d541bcefc7871e76ccccb6479e2d1.rsL0ngvVt-9wpIgvEDLpDC5a463fGWs0hauE55Yr9Qsscenes-app-analytics--list-share-dialog--dark:- hash: v1.k794b7964.b528e70195dd8749bbde5002bf057f223bc98667cbc85dd3acbdfd866e2dbc26.V6FVJXZufy6dzhF-tSqQC5ViYRC_BJ-7UrrJDO3LdQg+ hash: v1.k794b7964.2a740b77c78ecd1a3ae672e864ae39fd5eec7e387cf425316aa439281dd3150f.FwADIGXp6NikI0I6AI9UPFH4W9t5qAX3RLMzZuNNAQkscenes-app-analytics--list-share-dialog--light:- hash: v1.k794b7964.f43cb0139d84b558a384e87b16b12481b3af4ecf809c00846830728b6623d015.mD3NNCHWyyLOisEnE7cUuWK2iKrGf9re7zP8o9IUrz0+ hash: v1.k794b7964.80289635ba2d5d09102a332ae81ead27a88abfbddb38ea50881f99a9166ef135.5Oyi-AcklyJ4_lb0Koo5EhbOtune0QTGdCZdH02RPPAscenes-app-analytics--list-space--dark:- hash: v1.k794b7964.02cc537be9545d63c1519a3c4e8843f49b4693f17ceda6e68dc2a43a03c226ad.OaYVq7xmYBotkOPvzh5CcQZRXv1z7LdFNfSGPXI24jg+ hash: v1.k794b7964.35aaf1f447db1e5264a74d11d04768e6c0ddd8edf2aec3b5e3269d73c3080b71.RrvgjaIRy042jm5TBz5wFeG-bU3C_1Um1S-TbS38udIscenes-app-analytics--list-space--light:- hash: v1.k794b7964.df1ef949811073830fa620d905b8abdc14cdf4a4ae3129d962ab678186bd8727.uWlFQERiA-1QpohoPbgqHGPOwHU4d9QSg6KQX6qHBxU+ hash: v1.k794b7964.2b1775021b767641cb184a7b87c779557b679473d758f1701330fdc2d4ce3dec.g2Vuc4uhu-FERFAKxbNC9HShP8-LjwOVozoeoyclWeMscenes-app-analytics--mine--dark:- hash: v1.k794b7964.bb59918810a92bfbfc2e3f30ad1eb218c0a6ba58ca25655b6007129d963599b1.Dm6FmdMgZMWl6QMTEWolU0B6Z82WRCgE--ap7yyFO10+ hash: v1.k794b7964.575137546dc3a4ca2313ada20f419da755c1205fb80ec6cb705afcca5aebced4.tQsFPgxlVXj8DxL__bFN-yvNWnUnpobA5tNpEN8spssscenes-app-analytics--mine--light:- hash: v1.k794b7964.98afd0e9cc82295301ee38ecbac67a15b64f99af446c8efc09d100668512e18a.tuARP9J2x7maARISipcsPmer_sYhiSdp0aVaDhTnN4w+ hash: v1.k794b7964.32325a423e8a3bc1c346e7e35a192913c87fec97246909006fd3d2f54d88e0ba.HQCwSIzbwN2oXJkWhPbnP7PJ_gqYNs8I2IAQxLPyAMcscenes-app-analytics--spaces--dark:hash: v1.k794b7964.978b19e47d5106243cfe2873e2a623a4e22cf89139df7bce365824ab34fde2b1.L4q9XBXDrhvtrZUasYZpzrKf2jCcvE7WORywHS7brOcscenes-app-analytics--spaces--light:diff --git a/frontend/src/scenes/analytics/Analytics.stories.tsx b/frontend/src/scenes/analytics/Analytics.stories.tsxindex 3d2ba5c4f851..d556f5a1caf0 100644--- a/frontend/src/scenes/analytics/Analytics.stories.tsx+++ b/frontend/src/scenes/analytics/Analytics.stories.tsx@@ -1,3 +1,5 @@+import { MOCK_DEFAULT_USER } from 'lib/api.mock'+import type { Meta, StoryObj } from '@storybook/react'import { waitFor, within } from '@testing-library/dom'import userEvent from '@testing-library/user-event'@@ -178,7 +180,9 @@ const fileSystemHandler = ({ request }: { request: Request }): [number, unknown]const depth = params.get('depth')const type = params.get('type')const typePrefix = params.get('type__startswith')- const search = params.get('search')?.toLowerCase()+ const rawSearch = params.get('search')?.toLowerCase() ?? ''+ const createdByMe = rawSearch.includes('user:me')+ const search = rawSearch.replace('user:me', '').trim()const ref = params.get('ref')const results = FILE_SYSTEM.filter((entry) =>@@ -188,8 +192,23 @@ const fileSystemHandler = ({ request }: { request: Request }): [number, unknown](typePrefix === null || entry.type.startsWith(typePrefix)) &&(ref === null || entry.ref === ref) &&(!search || entry.path.toLowerCase().includes(search)) &&+ (!createdByMe || entry.meta?.created_by === ADA.id) &&(parent !== null || depth !== null || type !== null || typePrefix !== null || entry.type !== 'folder'))+ const orderBy = params.get('order_by')+ results.sort((first, second) => {+ if (orderBy === '-last_viewed_at' || orderBy === 'last_viewed_at') {+ if (!first.last_viewed_at) {+ return second.last_viewed_at ? 1 : 0+ }+ if (!second.last_viewed_at) {+ return -1+ }+ const difference = first.last_viewed_at.localeCompare(second.last_viewed_at)+ return orderBy === '-last_viewed_at' ? -difference : difference+ }+ return (second.created_at ?? '').localeCompare(first.created_at ?? '')+ })return [200, { results, count: results.length, next: null, users: [ADA, GRACE] }]}@@ -199,6 +218,7 @@ const meta: Meta = {decorators: [mswDecorator({get: {+ '/api/users/@me/': { ...MOCK_DEFAULT_USER, ...ADA },'/api/projects/:team_id/task_channels/': [{ id: 'space-growth', name: 'growth', channel_type: 'public' },],diff --git a/frontend/src/scenes/analytics/AnalyticsList.tsx b/frontend/src/scenes/analytics/AnalyticsList.tsxindex c8e82f3562b4..6aa99a521dd9 100644--- a/frontend/src/scenes/analytics/AnalyticsList.tsx+++ b/frontend/src/scenes/analytics/AnalyticsList.tsx@@ -24,7 +24,6 @@ import {EmptyHeader,EmptyMedia,EmptyTitle,- Skeleton,Spinner,Text,} from '@posthog/quill'@@ -47,6 +46,7 @@ import { AnalyticsFolderBreadcrumbs } from './AnalyticsFolderBreadcrumbs'import { AnalyticsListRow, analyticsListColumns } from './AnalyticsListColumns'import { AnalyticsListFilters } from './AnalyticsListFilters'import { analyticsListLogic, analyticsListUrlParams } from './analyticsListLogic'+import { AnalyticsListSkeleton } from './AnalyticsListSkeleton'import { AnalyticsSpaceGlyph } from './AnalyticsSpaceGlyph'import { ANALYTICS_DRAG_SCOPE, ANALYTICS_TYPE_INFO, USERS_FOLDER, analyticsSpaceOfPath } from './analyticsUtils'import { NewAnalyticsMenu } from './NewAnalyticsMenu'@@ -65,16 +65,6 @@ export function AnalyticsList(): JSX.Element {return analyticsEnabled ? <AnalyticsListContent /> : <NotFound object="page" />}-function TableSkeleton(): JSX.Element {- return (- <div className="flex flex-col gap-2" aria-busy aria-label="Loading analytics">- {Array.from({ length: 6 }, (_, index) => (- <Skeleton key={index} className="h-9" />- ))}- </div>- )-}-function AnalyticsListContent(): JSX.Element {const {filters,@@ -89,8 +79,9 @@ function AnalyticsListContent(): JSX.Element {mode,scope,loadedCount,+ feedQuery,} = useValues(analyticsListLogic)- const { clearFilters, loadList, loadMore } = useActions(analyticsListLogic)+ const { clearFilters, loadList, loadMore, setFilters } = useActions(analyticsListLogic)const { setNewFolderDialogOpen } = useActions(todayAnalyticsLogic)const { deleteItem } = useActions(projectTreeDataLogic)const { ref: endRef, inView: endInView } = useInView({@@ -102,7 +93,13 @@ function AnalyticsListContent(): JSX.Element {scope === 'mine'? urls.analyticsMine(analyticsListUrlParams(filters)): urls.analyticsList(analyticsListUrlParams(filters))- const columns = analyticsListColumns({ backUrl, showSpace: mode === 'feed' })+ const columns = analyticsListColumns({+ backUrl,+ showSpace: mode === 'feed',+ showOwner: scope !== 'mine',+ orderBy: feedQuery.orderBy,+ onOrderByChange: (orderBy) => setFilters({ orderBy }),+ })const rows = useMemo<AnalyticsListRow[]>(() => [...subfolders.map((folder) => ({ kind: 'folder' as const, folder })),@@ -150,7 +147,7 @@ function AnalyticsListContent(): JSX.Element {)}if (listState === 'loading') {- return <TableSkeleton />+ return <AnalyticsListSkeleton columns={columns} />}if (listState === 'no-matches') {return (@@ -225,10 +222,7 @@ function AnalyticsListContent(): JSX.Element {fullWidthsize="sm"stickyHeader- // The title column soaks up the slack, and `max-w-0` stops a long title from widening- // the table past its container, so the filters above keep their width across types.- // Below the minimum width the table scrolls sideways instead of squeezing the title away.- className="w-full min-w-0 **:data-expand:max-w-0 **:data-[slot=table]:min-w-208"+ className="w-full min-w-0 **:data-expand:min-w-64 **:data-expand:max-w-0 **:data-[slot=table]:min-w-208"empty={<Text size="sm">Nothing in this collection.</Text>}/>)}diff --git a/frontend/src/scenes/analytics/AnalyticsListColumns.tsx b/frontend/src/scenes/analytics/AnalyticsListColumns.tsxindex ad26e028048a..ded1677a3708 100644--- a/frontend/src/scenes/analytics/AnalyticsListColumns.tsx+++ b/frontend/src/scenes/analytics/AnalyticsListColumns.tsx@@ -1,7 +1,16 @@import { useActions } from 'kea'import { router } from 'kea-router'-import { IconEllipsis, IconFolder, IconFolderMove, IconFolderOpen, IconShare, IconTrash, IconX } from '@posthog/icons'+import {+ IconChevronDown,+ IconEllipsis,+ IconFolder,+ IconFolderMove,+ IconFolderOpen,+ IconShare,+ IconTrash,+ IconX,+} from '@posthog/icons'import {Button,Chip,@@ -17,7 +26,7 @@ import {} from '@posthog/quill'import type { DataTableProps } from '@posthog/quill-components'-import { dayjs } from 'lib/dayjs'+import { TZLabel } from 'lib/components/TZLabel'import { LinkPrimitive } from 'lib/lemon-ui/Link'import { urls } from 'scenes/urls'@@ -25,6 +34,7 @@ import { projectTreeDataLogic } from '~/layout/panel-layout/ProjectTree/projectTimport { escapePath } from '~/layout/panel-layout/ProjectTree/utils'import { AnalyticsDraggableRow } from './AnalyticsDraggableRow'+import type { AnalyticsFeedQuery } from './analyticsFeed'import { AnalyticsFolderDropTarget } from './AnalyticsFolderDropTarget'import type { FolderRow } from './analyticsListLogic'import { AnalyticsOwner } from './AnalyticsOwner'@@ -45,24 +55,11 @@ function EmptyCell(): JSX.Element {)}-function TimeCell({ time, label }: { time: string | null; label?: string }): JSX.Element {+function TimeCell({ time }: { time: string | null }): JSX.Element {if (!time) {- return (- <Text size="xs" variant="muted">- –- </Text>- )+ return <EmptyCell />}- return (- <Tooltip>- <TooltipTrigger- render={<span className="text-xs whitespace-nowrap text-muted-foreground" translate="no" />}- >- {label ? `${label} ${dayjs(time).fromNow()}` : dayjs(time).fromNow()}- </TooltipTrigger>- <TooltipContent>{dayjs(time).format('LLL')}</TooltipContent>- </Tooltip>- )+ return <TZLabel time={time} className="text-xs whitespace-nowrap text-muted-foreground" />}// Two chips fit the fixed tags column; the rest fold into a count.@@ -78,18 +75,20 @@ function TagsCell({ tags }: { tags: string[] }): JSX.Element {}const hidden = tags.length - VISIBLE_TAGSreturn (- <ChipGroup className="flex-nowrap overflow-hidden">- {tags.slice(0, VISIBLE_TAGS).map((tag) => (- <Chip key={tag} size="xs" className="max-w-24 truncate">- {tag}- </Chip>- ))}+ <div className="flex min-w-0 items-center gap-1">+ <ChipGroup className="min-w-0 max-w-full flex-1 flex-nowrap">+ {tags.slice(0, VISIBLE_TAGS).map((tag) => (+ <Chip key={tag} size="xs" className="min-w-0 max-w-24 flex-1" title={tag}>+ <span className="min-w-0 truncate">{tag}</span>+ </Chip>+ ))}+ </ChipGroup>{hidden > 0 && (- <Text size="xs" variant="muted">+ <Text size="xs" variant="muted" className="shrink-0">{`+${hidden}`}</Text>)}- </ChipGroup>+ </div>)}@@ -298,9 +297,15 @@ function ItemTitle({export function analyticsListColumns({backUrl,showSpace,+ showOwner,+ orderBy,+ onOrderByChange,}: {backUrl: stringshowSpace: boolean+ showOwner: boolean+ orderBy: AnalyticsFeedQuery['orderBy']+ onOrderByChange: (orderBy: NonNullable<AnalyticsFeedQuery['orderBy']>) => void}): AnalyticsListColumns {const draggable = !showSpacereturn [@@ -335,29 +340,81 @@ export function analyticsListColumns({header: 'Tags',enableSorting: false,cell: ({ row }) => (- <div className="w-36 overflow-hidden">+ <div className="w-36">{row.original.kind === 'item' ? <TagsCell tags={row.original.item.tags} /> : <EmptyCell />}</div>),},- {- id: 'owner',- header: 'Owner',- enableSorting: false,- cell: ({ row }) => (- <AnalyticsOwner- owner={- row.original.kind === 'item'- ? row.original.item.createdBy- : (row.original.folder.createdBy ?? null)- }- className="w-36"- />- ),- },+ ...(showOwner+ ? ([+ {+ id: 'owner',+ header: 'Owner',+ enableSorting: false,+ cell: ({ row }) => (+ <AnalyticsOwner+ owner={+ row.original.kind === 'item'+ ? row.original.item.createdBy+ : (row.original.folder.createdBy ?? null)+ }+ className="w-36"+ />+ ),+ },+ ] satisfies AnalyticsListColumns)+ : []),+ ...(showSpace+ ? ([+ {+ id: 'last_viewed',+ header: () => (+ <Button+ variant="default"+ size="xs"+ className="px-0"+ data-attr="analytics-list-sort-last-viewed"+ onClick={() =>+ onOrderByChange(orderBy === '-last_viewed_at' ? 'last_viewed_at' : '-last_viewed_at')+ }+ >+ Last viewed+ {orderBy === '-last_viewed_at' && <IconChevronDown />}+ {orderBy === 'last_viewed_at' && <IconChevronDown className="rotate-180" />}+ </Button>+ ),+ enableSorting: false,+ cell: ({ row }) => (+ <div className="w-24">+ <TimeCell+ time={+ row.original.kind === 'item'+ ? (row.original.item.entry?.last_viewed_at ?? null)+ : null+ }+ />+ </div>+ ),+ },+ ] satisfies AnalyticsListColumns)+ : []),{id: 'created',- header: 'Created',+ header: () =>+ showSpace ? (+ <Button+ variant="default"+ size="xs"+ className="px-0"+ data-attr="analytics-list-sort-created"+ onClick={() => onOrderByChange('-created_at')}+ >+ Created+ {orderBy === '-created_at' && <IconChevronDown />}+ </Button>+ ) : (+ 'Created'+ ),enableSorting: false,cell: ({ row }) => (<div className="w-24">diff --git a/frontend/src/scenes/analytics/AnalyticsListSkeleton.tsx b/frontend/src/scenes/analytics/AnalyticsListSkeleton.tsxnew file mode 100644index 000000000000..79f15c31fa72--- /dev/null+++ b/frontend/src/scenes/analytics/AnalyticsListSkeleton.tsx@@ -0,0 +1,79 @@+import { Skeleton, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@posthog/quill'++import type { AnalyticsListColumns } from './AnalyticsListColumns'++const COLUMN_LABELS: Record<string, string> = {+ name: 'Title',+ space: 'Collection',+ tags: 'Tags',+ owner: 'Owner',+ last_viewed: 'Last viewed',+ created: 'Created',+}++export function AnalyticsListSkeleton({ columns }: { columns: AnalyticsListColumns }): JSX.Element {+ return (+ <div aria-busy aria-label="Loading analytics">+ <Table+ fullWidth+ size="sm"+ className="w-full min-w-0 **:data-expand:min-w-64 **:data-expand:max-w-0 **:data-[slot=table]:min-w-208"+ >+ <TableHeader>+ <TableRow>+ {columns.map((column) => (+ <TableHead key={column.id} expand={column.id === 'name'}>+ {COLUMN_LABELS[column.id ?? '']}+ </TableHead>+ ))}+ </TableRow>+ </TableHeader>+ <TableBody aria-hidden>+ {Array.from({ length: 6 }, (_, index) => (+ <TableRow key={index}>+ {columns.map((column) => {+ if (column.id === 'name') {+ return (+ <TableCell key={column.id} expand>+ <div className="flex h-6 min-w-48 items-center gap-2">+ <Skeleton className="size-4 shrink-0" />+ <Skeleton className={index % 2 === 0 ? 'h-3 w-40' : 'h-3 w-28'} />+ </div>+ </TableCell>+ )+ }+ if (column.id === 'space' || column.id === 'owner') {+ return (+ <TableCell key={column.id}>+ <div className="flex w-36 items-center gap-2">+ <Skeleton className="size-5 shrink-0 rounded-full" />+ <Skeleton className="h-3 w-20" />+ </div>+ </TableCell>+ )+ }+ if (column.id === 'tags') {+ return (+ <TableCell key={column.id}>+ <div className="flex w-36 gap-1">+ <Skeleton className="h-5 w-14" />+ <Skeleton className="h-5 w-12" />+ </div>+ </TableCell>+ )+ }+ return (+ <TableCell key={column.id}>+ <div className={column.id === 'move' ? 'w-8' : 'w-24'}>+ <Skeleton className={column.id === 'move' ? 'size-4' : 'h-3 w-20'} />+ </div>+ </TableCell>+ )+ })}+ </TableRow>+ ))}+ </TableBody>+ </Table>+ </div>+ )+}diff --git a/frontend/src/scenes/analytics/AnalyticsSpaces.tsx b/frontend/src/scenes/analytics/AnalyticsSpaces.tsxindex d8e5f51b5c73..0f8edca79c0c 100644--- a/frontend/src/scenes/analytics/AnalyticsSpaces.tsx+++ b/frontend/src/scenes/analytics/AnalyticsSpaces.tsx@@ -17,6 +17,7 @@ import {ItemMedia,ItemTitle,Skeleton,+ Spinner,Tooltip,TooltipContent,TooltipTrigger,@@ -136,8 +137,8 @@ function SpaceRow({ space }: { space: AnalyticsSpace }): JSX.Element {}function AnalyticsSpacesContent(): JSX.Element {- const { spaces, visibleSpaces, spacesLoading, spacesFailed, search } = useValues(analyticsSpacesLogic)- const { loadSpaces, setSearch } = useActions(analyticsSpacesLogic)+ const { spaces, visibleSpaces, spacesLoading, spacesFailed, search, pagination } = useValues(analyticsSpacesLogic)+ const { refreshSpaces, loadMore, setSearch } = useActions(analyticsSpacesLogic)const { setNewFolderDialogOpen } = useActions(todayAnalyticsLogic)const newSpaceButton = (@@ -168,18 +169,18 @@ function AnalyticsSpacesContent(): JSX.Element {<EmptyDescription>Try again, and if it keeps happening contact support.</EmptyDescription></EmptyHeader><EmptyContent>- <Button variant="outline" loading={spacesLoading} onClick={() => loadSpaces()}>+ <Button variant="outline" loading={spacesLoading} onClick={() => refreshSpaces()}>Try again</Button></EmptyContent></Empty>- ) : spacesLoading && !spaces.length ? (+ ) : spacesLoading && !spaces.length && !search ? (<div className="flex flex-col gap-2" aria-busy>{Array.from({ length: 4 }, (_, index) => (<Skeleton key={index} className="h-16" />))}</div>- ) : !spaces.length ? (+ ) : !spaces.length && !search && !pagination.hasMore ? (<Empty><EmptyHeader><EmptyTitle>No collections yet</EmptyTitle>@@ -198,13 +199,15 @@ function AnalyticsSpacesContent(): JSX.Element {placeholder="Search collections"dataAttr="analytics-spaces-search"/>- {visibleSpaces.length ? (+ {spacesLoading && !visibleSpaces.length && <Spinner aria-label="Loading collections" />}+ {visibleSpaces.length > 0 && (<ItemGroup className="flex flex-col gap-2 pb-8">{visibleSpaces.map((space) => (<SpaceRow key={space.path} space={space} />))}</ItemGroup>- ) : (+ )}+ {!visibleSpaces.length && !pagination.hasMore && !spacesLoading && (<Empty><EmptyHeader><EmptyMedia variant="icon">@@ -224,6 +227,16 @@ function AnalyticsSpacesContent(): JSX.Element {</EmptyContent></Empty>)}+ {pagination.hasMore && (+ <Button+ variant="outline"+ loading={spacesLoading}+ onClick={() => loadMore()}+ data-attr="analytics-spaces-load-more"+ >+ Load more+ </Button>+ )}</>)}</div>diff --git a/frontend/src/scenes/analytics/analyticsFeed.ts b/frontend/src/scenes/analytics/analyticsFeed.tsindex 150c9d0ccc53..34f47f6192f2 100644--- a/frontend/src/scenes/analytics/analyticsFeed.ts+++ b/frontend/src/scenes/analytics/analyticsFeed.ts@@ -10,10 +10,11 @@ import {fileSystemEntryToAnalytics,} from './analyticsUtils'-export const ANALYTICS_FEED_PAGE_SIZE = 50+export const ANALYTICS_FEED_PAGE_SIZE = 20export interface AnalyticsFeedQuery {type: AnalyticsTypeFilter+ orderBy?: '-created_at' | '-last_viewed_at' | 'last_viewed_at'search: string/** Creators' uuids; empty means anyone. The file system cannot filter on a uuid, so the rows are narrowed on the client. */createdBy: string[]@@ -70,7 +71,14 @@ export function analyticsFeedTypes(query: AnalyticsFeedQuery): AnalyticsType[] {}export function analyticsSourceKey(projectId: string, query: AnalyticsFeedQuery, type: AnalyticsType): string {- return JSON.stringify([projectId, query.search.trim(), query.createdBy, [...query.tags].sort(), type])+ return JSON.stringify([+ projectId,+ query.search.trim(),+ query.createdBy,+ [...query.tags].sort(),+ type,+ query.orderBy ?? '-created_at',+ ])}/** Keeps the rows a source's API could not filter itself. */@@ -86,7 +94,7 @@ export function fileSystemTypeParams(type: AnalyticsType): { type?: string; typereturn type === 'insight' ? { type__startswith: 'insight' } : { type }}-/** One page of a type's rows from the project file system, newest first, with the row's space. */+/** One page of a type's rows from the project file system, in the requested order, with the row's space. */export async function fetchAnalyticsSourcePage(_projectId: string,type: AnalyticsType,@@ -99,21 +107,45 @@ export async function fetchAnalyticsSourcePage(const result = await api.fileSystem.list({...fileSystemTypeParams(type),search: search || undefined,- orderBy: '-created_at',+ orderBy: query.orderBy ?? '-created_at',includeTags: true,limit,offset,})const items = result.results.flatMap((entry: FileSystemEntry) => {const item = fileSystemEntryToAnalytics(entry, result.users ?? [])- return item && matchesAnalyticsQuery(item, query) ? [item] : []+ if (!item || !matchesAnalyticsQuery(item, query)) {+ return []+ }+ if (query.orderBy && query.orderBy !== '-created_at') {+ item.timestamp = entry.last_viewed_at ?? null+ }+ return [item]})return { items, fetched: result.results.length, hasMore: !!result.next && result.results.length > 0 }}-export function analyticsTime(item: AnalyticsItem): number {- return item.timestamp ? new Date(item.timestamp).getTime() : 0+export function analyticsTime(item: AnalyticsItem, orderBy?: AnalyticsFeedQuery['orderBy']): number {+ if (!item.timestamp) {+ return -Infinity+ }+ const time = new Date(item.timestamp).getTime()+ return orderBy === 'last_viewed_at' ? -time : time}++function analyticsItemComesFirst(+ first: AnalyticsItem,+ second: AnalyticsItem,+ orderBy?: AnalyticsFeedQuery['orderBy']+): boolean {+ const firstTime = analyticsTime(first, orderBy)+ const secondTime = analyticsTime(second, orderBy)+ if (firstTime !== secondTime) {+ return firstTime > secondTime+ }+ return new Date(first.createdAt ?? 0).getTime() > new Date(second.createdAt ?? 0).getTime()+}+export function mergeAnalyticsSources(sources: (AnalyticsSourceState | undefined)[]): {items: AnalyticsItem[]blocking: AnalyticsSourceState[]@@ -135,8 +167,11 @@ export function mergeAnalyticsSources(sources: (AnalyticsSourceState | undefinedif (positions[index] < states[index].items.length &&(best === -1 ||- analyticsTime(states[index].items[positions[index]]) >- analyticsTime(states[best].items[positions[best]]))+ analyticsItemComesFirst(+ states[index].items[positions[index]],+ states[best].items[positions[best]],+ states[index].query?.orderBy+ ))) {best = index}diff --git a/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts b/frontend/src/scenes/analytics/analyticsFeedLogic.test.tsindex 18d65bf68994..11a92bc68b08 100644--- a/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts+++ b/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts@@ -5,8 +5,14 @@ import { teamLogic } from 'scenes/teamLogic'import { useMocks } from '~/mocks/jest'import { initKeaTests } from '~/test/init'-import { AnalyticsFeedQuery, EMPTY_ANALYTICS_FEED_QUERY } from './analyticsFeed'+import {+ AnalyticsFeedQuery,+ AnalyticsSourceState,+ EMPTY_ANALYTICS_FEED_QUERY,+ mergeAnalyticsSources,+} from './analyticsFeed'import { analyticsFeedLogic, resetAnalyticsFeedSnapshot, selectAnalyticsFeed } from './analyticsFeedLogic'+import { fileSystemEntryToAnalytics } from './analyticsUtils'const ALL: AnalyticsFeedQuery = EMPTY_ANALYTICS_FEED_QUERY@@ -165,3 +171,38 @@ describe('analyticsFeedLogic', () => {expect(feed(second)).toEqual(['dashboard:10', 'notebook:n9', 'dashboard:8'])})})++describe('mergeAnalyticsSources view order', () => {+ test.each(['-last_viewed_at', 'last_viewed_at'] as const)(+ 'merges %s across types with unviewed rows last',+ (orderBy) => {+ const source = (type: 'dashboard' | 'notebook', days: (number | null)[]): AnalyticsSourceState => ({+ projectId: '1',+ query: { ...ALL, orderBy },+ type,+ items: days.map((day, index) => ({+ ...fileSystemEntryToAnalytics({+ id: `fs-${type}-${index}`,+ type,+ ref: `${type}-${index}`,+ path: `${type}/${index}`,+ created_at: at(30 - index),+ })!,+ timestamp: day === null ? null : at(day),+ })),+ offset: days.length,+ hasMore: false,+ initialized: true,+ refreshing: false,+ loading: false,+ failed: false,+ generation: 0,+ })+ const dashboards = orderBy === '-last_viewed_at' ? [5, 2, null] : [2, 5, null]+ const { items } = mergeAnalyticsSources([source('dashboard', dashboards), source('notebook', [3, null])])+ const expected = orderBy === '-last_viewed_at' ? [5, 3, 2, null, null] : [2, 3, 5, null, null]+ expect(items.map((item) => item.timestamp)).toEqual(expected.map((day) => (day === null ? null : at(day))))+ expect(items.slice(-2).map((item) => item.type)).toEqual(['notebook', 'dashboard'])+ }+ )+})diff --git a/frontend/src/scenes/analytics/analyticsListLogic.test.ts b/frontend/src/scenes/analytics/analyticsListLogic.test.tsindex 722aed5cb7a3..59eac6242667 100644--- a/frontend/src/scenes/analytics/analyticsListLogic.test.ts+++ b/frontend/src/scenes/analytics/analyticsListLogic.test.ts@@ -13,6 +13,12 @@ import { initKeaTests } from '~/test/init'import { resetAnalyticsFeedSnapshot } from './analyticsFeedLogic'import { analyticsListLogic } from './analyticsListLogic'+jest.mock('lib/utils/getAppContext', () => ({+ ...jest.requireActual('lib/utils/getAppContext'),+ getCurrentTeamIdOrNone: () => 997,+ getCurrentUserIdOrNone: () => 'u-ada',+}))+const ADA = { id: 1, uuid: 'u-ada', first_name: 'Ada', last_name: '', email: '[email protected]' }const entry = (type: string, ref: string, path: string): Record<string, unknown> => ({id: `fs-${ref}`,@@ -27,8 +33,11 @@ const entry = (type: string, ref: string, path: string): Record<string, unknown>describe('analyticsListLogic', () => {let capture: jest.SpyInstance+ let lastViewedAt: string | nullbeforeEach(() => {+ localStorage.clear()+ lastViewedAt = nullresetAnalyticsFeedSnapshot()useMocks({get: {@@ -49,7 +58,11 @@ describe('analyticsListLogic', () => {: type === 'notebook'? [entry('notebook', 'n1', 'Users/Ada/N1')]: []- return { results, users: [ADA], next: null }+ return {+ results: results.map((item) => ({ ...item, last_viewed_at: lastViewedAt })),+ users: [ADA],+ next: null,+ }},},})@@ -78,6 +91,55 @@ describe('analyticsListLogic', () => {])})+ it('ignores saved defaults and remembers explicit sort choices separately for both scopes', async () => {+ localStorage.setItem(+ '997__u-ada__.scenes.analytics.analyticsListLogic.orderByByScope',+ JSON.stringify({ mine: '-last_viewed_at', all: '-created_at' })+ )+ const logic = analyticsListLogic()+ logic.mount()+ router.actions.push(urls.analyticsMine())+ await expectLogic(logic).toFinishAllListeners()+ expect(logic.values.feedQuery.orderBy).toBe('-last_viewed_at')+ logic.actions.setFilters({ orderBy: 'last_viewed_at' })+ await expectLogic(logic).toFinishAllListeners()+ router.actions.push(urls.analyticsList())+ await expectLogic(logic).toFinishAllListeners()+ expect(logic.values.feedQuery.orderBy).toBe('-last_viewed_at')+ router.actions.push(urls.analyticsMine())+ await expectLogic(logic).toFinishAllListeners()+ expect(logic.values.feedQuery.orderBy).toBe('last_viewed_at')+ logic.unmount()++ const restored = analyticsListLogic()+ restored.mount()+ await expectLogic(restored, () => router.actions.push(urls.analyticsList())).toFinishAllListeners()+ expect(restored.values.feedQuery.orderBy).toBe('-last_viewed_at')+ await expectLogic(restored, () =>+ restored.actions.setFilters({ orderBy: '-created_at' })+ ).toFinishAllListeners()+ restored.unmount()++ const withSavedChoice = analyticsListLogic()+ withSavedChoice.mount()+ await expectLogic(withSavedChoice, () => withSavedChoice.actions.loadList()).toFinishAllListeners()+ expect(withSavedChoice.values.feedQuery.orderBy).toBe('-created_at')+ })++ it('refreshes view times when URL filters restore a cached sorted list', async () => {+ const logic = analyticsListLogic()+ logic.mount()+ router.actions.push(urls.analyticsList({ orderBy: '-last_viewed_at' }))+ await expectLogic(logic).toFinishAllListeners()+ expect(logic.values.items[0].entry?.last_viewed_at).toBeNull()+ router.actions.push(urls.analyticsList({ type: 'notebook' }))+ await expectLogic(logic).toFinishAllListeners()+ lastViewedAt = '2026-09-02T00:00:00Z'+ router.actions.push(urls.analyticsList({ orderBy: '-last_viewed_at' }))+ await expectLogic(logic).toFinishAllListeners()+ expect(logic.values.items[0].entry?.last_viewed_at).toBe(lastViewedAt)+ })+it('reports a folder visit once, however it starts, and a space only when it changes', async () => {const logic = analyticsListLogic()logic.mount()@@ -106,6 +168,7 @@ describe('analyticsListLogic', () => {userLogic.actions.loadUserSuccess({ ...userLogic.values.user! })expect(query.createdByMe).toBe(true)+ expect(query.orderBy).toBe('-last_viewed_at')expect(logic.values.feedQuery).toBe(query)})diff --git a/frontend/src/scenes/analytics/analyticsListLogic.ts b/frontend/src/scenes/analytics/analyticsListLogic.tsindex 78f37f4ad376..0e90abfec3d6 100644--- a/frontend/src/scenes/analytics/analyticsListLogic.ts+++ b/frontend/src/scenes/analytics/analyticsListLogic.ts@@ -6,6 +6,7 @@ import posthog from 'posthog-js'import api from 'lib/api'import { FEATURE_FLAGS } from 'lib/constants'import { FeatureFlagsSet, featureFlagLogic } from 'lib/logic/featureFlagLogic'+import { getCurrentTeamIdOrNone, getCurrentUserIdOrNone } from 'lib/utils/getAppContext'import { removeProjectIdIfPresent } from 'lib/utils/kea-router'import { teamLogic } from 'scenes/teamLogic'import { AnalyticsListUrlParams, urls } from 'scenes/urls'@@ -39,10 +40,15 @@ import {export const ANALYTICS_PREFETCH_COUNT = ANALYTICS_FEED_PAGE_SIZE// A folder lists its direct children in one request. Deeper folders are opened by drilling in.-const FOLDER_PAGE_SIZE = 100+const FOLDER_PAGE_SIZE = ANALYTICS_FEED_PAGE_SIZE+const SORT_TEAM_ID = getCurrentTeamIdOrNone()+const SORT_USER_ID = getCurrentUserIdOrNone()+const SORT_PERSIST_OPTIONS =+ SORT_TEAM_ID && SORT_USER_ID ? { persist: true, prefix: `${SORT_TEAM_ID}__${SORT_USER_ID}__` } : { persist: false }export interface AnalyticsListFilters {type: AnalyticsTypeFilter+ orderBy?: AnalyticsFeedQuery['orderBy']search: string/** User uuids; empty means anyone. */createdBy: string[]@@ -62,6 +68,7 @@ export const DEFAULT_ANALYTICS_LIST_FILTERS: AnalyticsListFilters = {export type AnalyticsListMode = 'feed' | 'folder'/** `all` lists what the project shares; `mine` lists everything the person created, shared or not. */export type AnalyticsListScope = 'all' | 'mine'+type AnalyticsSortChoices = Partial<Record<AnalyticsListScope, NonNullable<AnalyticsFeedQuery['orderBy']>>>export interface FolderContents {/** The folder these rows belong to, so a failed or slow load never shows another folder's rows. */@@ -100,6 +107,9 @@ export function analyticsListFiltersFromUrl(params: Record<string, any>): Analyt: []return {type,+ orderBy: ['-created_at', '-last_viewed_at', 'last_viewed_at'].includes(params.orderBy)+ ? params.orderBy+ : undefined,search: urlParamToString(params.search),createdBy: stringList(params.createdBy),folder: params.folder === undefined || params.folder === null ? null : urlParamToString(params.folder),@@ -109,6 +119,7 @@ export function analyticsListFiltersFromUrl(params: Record<string, any>): Analytexport function analyticsListUrlParams(filters: AnalyticsListFilters): AnalyticsListUrlParams {return {+ orderBy: filters.orderBy,type: filters.type === 'all' ? undefined : filters.type,search: filters.search.trim() || undefined,createdBy: filters.createdBy.length ? filters.createdBy : undefined,@@ -163,6 +174,7 @@ export interface analyticsListLogicValues {scope: AnalyticsListScopesearchInput: stringshownQuery: AnalyticsFeedQuery | null+ sortChoicesByScope: AnalyticsSortChoicessubfolders: FolderRow[]}@@ -248,6 +260,13 @@ export interface analyticsListLogicActions {folderContents: FolderContents | nullpayload?: void}+ rememberOrderBy: (+ scope: AnalyticsListScope,+ orderBy: NonNullable<AnalyticsFeedQuery['orderBy']>+ ) => {+ orderBy: NonNullable<'-created_at' | '-last_viewed_at' | 'last_viewed_at' | undefined>+ scope: AnalyticsListScope+ }setFeedSearch: (search: string) => {search: string}@@ -282,7 +301,14 @@ export interface analyticsListLogicMeta {filters: AnalyticsListFilters,feedSearch: string,creators: string[],- currentUserUuid: string | null+ currentUserUuid: string | null,+ scope: AnalyticsListScope,+ sortChoicesByScope: Partial<+ Record<+ AnalyticsListScope,+ NonNullable<'-created_at' | '-last_viewed_at' | 'last_viewed_at' | undefined>+ >+ >) => AnalyticsFeedQuerycurrentFeed: (sources: Record<string, AnalyticsSourceState>,@@ -369,6 +395,10 @@ export const analyticsListLogic = kea<analyticsListLogicType>([actions({setScope: (scope: AnalyticsListScope) => ({ scope }),setFilters: (filters: Partial<AnalyticsListFilters>) => ({ filters }),+ rememberOrderBy: (scope: AnalyticsListScope, orderBy: NonNullable<AnalyticsFeedQuery['orderBy']>) => ({+ scope,+ orderBy,+ }),setFiltersFromUrl: (filters: AnalyticsListFilters) => ({ filters }),/** Remembers URL filters without reading anything, for a visit the flag does not render yet. */storeFilters: (filters: AnalyticsListFilters) => ({ filters }),@@ -426,6 +456,13 @@ export const analyticsListLogic = kea<analyticsListLogicType>([],})),reducers({+ sortChoicesByScope: [+ {} as AnalyticsSortChoices,+ SORT_PERSIST_OPTIONS,+ {+ rememberOrderBy: (state, { scope, orderBy }) => ({ ...state, [scope]: orderBy }),+ },+ ],scope: ['all' as AnalyticsListScope, { setScope: (_, { scope }) => scope }],filters: [DEFAULT_ANALYTICS_LIST_FILTERS,@@ -475,14 +512,17 @@ export const analyticsListLogic = kea<analyticsListLogicType>([scope === 'mine' ? (currentUserUuid ? [currentUserUuid] : []) : filters.createdBy,],feedQuery: [- (s) => [s.filters, s.feedSearch, s.creators, s.currentUserUuid],+ (s) => [s.filters, s.feedSearch, s.creators, s.currentUserUuid, s.scope, s.sortChoicesByScope],(filters: AnalyticsListFilters,feedSearch: string,creators: string[],- currentUserUuid: string | null+ currentUserUuid: string | null,+ scope: AnalyticsListScope,+ sortChoicesByScope: AnalyticsSortChoices): AnalyticsFeedQuery => ({type: filters.type,+ orderBy: filters.orderBy ?? sortChoicesByScope[scope] ?? '-last_viewed_at',search: feedSearch.trim(),createdBy: creators,createdByMe: !!currentUserUuid && creators.length === 1 && creators[0] === currentUserUuid,@@ -733,6 +773,9 @@ export const analyticsListLogic = kea<analyticsListLogicType>([actions.setFilters({ search })},setFilters: ({ filters }) => {+ if (filters.orderBy) {+ actions.rememberOrderBy(values.scope, filters.orderBy)+ }if (filters.search !== undefined) {actions.setFeedSearch(filters.search)}@@ -755,7 +798,7 @@ export const analyticsListLogic = kea<analyticsListLogicType>([},setFiltersFromUrl: () => {actions.setFeedSearch(values.filters.search)- loadCurrentMode()+ actions.loadList()},clearFilters: () => {actions.setFeedSearch('')diff --git a/frontend/src/scenes/analytics/analyticsShareLogic.test.ts b/frontend/src/scenes/analytics/analyticsShareLogic.test.tsindex 7ee9c3259e79..a4089bce1bd6 100644--- a/frontend/src/scenes/analytics/analyticsShareLogic.test.ts+++ b/frontend/src/scenes/analytics/analyticsShareLogic.test.ts@@ -4,13 +4,15 @@ import { useMocks } from '~/mocks/jest'import { initKeaTests } from '~/test/init'import { analyticsShareLogic } from './analyticsShareLogic'-import { AnalyticsSpace } from './analyticsSpacesLogic'+import { AnalyticsSpace, analyticsSpacesLogic } from './analyticsSpacesLogic'describe('analyticsShareLogic', () => {let moves: string[]+ let folders: string[]beforeEach(() => {moves = []+ folders = []useMocks({get: {'/api/projects/:team_id/file_system_shortcut/': { results: [] },@@ -21,6 +23,17 @@ describe('analyticsShareLogic', () => {}),'/api/projects/:team_id/file_system/': ({ request }) => {const params = new URL(request.url).searchParams+ if (params.get('type') === 'folder') {+ const offset = Number(params.get('offset') ?? 0)+ const limit = Number(params.get('limit') ?? 200)+ return {+ results: folders+ .slice(offset, offset + limit)+ .map((path) => ({ id: `fs-${path}`, path, type: 'folder', meta: {} })),+ next: offset + limit < folders.length ? '/next-page' : null,+ count: folders.length,+ }+ }const ref = params.get('ref')return ref? {@@ -67,6 +80,23 @@ describe('analyticsShareLogic', () => {expect(logic.values.itemSpaces[`${type}:${ref}`]).toBe(space?.name ?? null)})+ it('loads every sharing destination independently of browser search and refreshes them on each open', async () => {+ folders = Array.from({ length: 22 }, (_, index) => `Collection ${String(index).padStart(2, '0')}`)+ const logic = analyticsShareLogic()+ logic.mount()+ const browser = analyticsSpacesLogic()+ browser.actions.setSearch('missing')+ const target = { type: 'insight' as const, ref: 'i1', name: 'Weekly active' }+ await expectLogic(logic, () => logic.actions.openShareToSpace(target)).toDispatchActions(['loadSpacesSuccess'])+ expect(logic.values.spaces.map((space) => space.name)).toEqual(folders)+ expect(browser.values.search).toBe('missing')++ logic.actions.closeShareToSpace()+ folders = [...folders.slice(1), 'New collection']+ await expectLogic(logic, () => logic.actions.openShareToSpace(target)).toDispatchActions(['loadSpacesSuccess'])+ expect(logic.values.spaces.map((space) => space.name)).toEqual(folders)+ })+it('refuses to share a canvas from a private channel, since the space would not make it visible', async () => {const logic = analyticsShareLogic()logic.mount()diff --git a/frontend/src/scenes/analytics/analyticsShareLogic.ts b/frontend/src/scenes/analytics/analyticsShareLogic.tsindex 5555ecc81aef..30a93abfe4ef 100644--- a/frontend/src/scenes/analytics/analyticsShareLogic.ts+++ b/frontend/src/scenes/analytics/analyticsShareLogic.ts@@ -1,4 +1,5 @@import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'+import { loaders } from 'kea-loaders'import { router } from 'kea-router'import posthog from 'posthog-js'@@ -16,7 +17,7 @@ import { canvasesRetrieve } from 'products/canvas/frontend/generated/api'import { taskChannelsRetrieve } from 'products/tasks/frontend/generated/api'import { fileSystemTypeParams } from './analyticsFeed'-import { AnalyticsSpace, analyticsSpacesLogic } from './analyticsSpacesLogic'+import { AnalyticsSpace, analyticsSpacesLogic, listSpaceFolders, loadSpace } from './analyticsSpacesLogic'import { ANALYTICS_TYPE_INFO, AnalyticsType, UNFILED_FOLDER, analyticsSpaceOfPath } from './analyticsUtils'export interface ShareToSpaceTarget {@@ -31,19 +32,21 @@ export function shareTargetKey(target: Pick<ShareToSpaceTarget, 'type' | 'ref'>)// Generated by kea-typegen. Update if you're an agent, ignore if you're human.export interface analyticsShareLogicValues {- spaces: AnalyticsSpace[] // analyticsSpacesLogic- spacesLoading: boolean // analyticsSpacesLogiccurrentSpace: string | nullentry: FileSystemEntry | nullentryLoading: booleanitemSpaces: Record<string, string | null>sharing: boolean+ spaces: AnalyticsSpace[]+ spacesLoading: booleantarget: ShareToSpaceTarget | null}// Generated by kea-typegen. Update if you're an agent, ignore if you're human.export interface analyticsShareLogicActions {- loadSpaces: (_?: void | undefined) => void // analyticsSpacesLogic+ refreshSpaces: () => {+ value: true+ } // analyticsSpacesLogiccloseShareToSpace: () => {value: true}@@ -60,6 +63,21 @@ export interface analyticsShareLogicActions {loadItemSpace: (target: ShareToSpaceTarget) => {target: ShareToSpaceTarget}+ loadSpaces: (_: void) => void+ loadSpacesFailure: (+ error: string,+ errorObject?: any+ ) => {+ error: string+ errorObject?: any+ }+ loadSpacesSuccess: (+ spaces: AnalyticsSpace[],+ payload?: void+ ) => {+ spaces: AnalyticsSpace[]+ payload?: void+ }moveItem: (target: ShareToSpaceTarget,space: AnalyticsSpace | null@@ -114,8 +132,7 @@ async function findEntry(target: ShareToSpaceTarget): Promise<FileSystemEntry |export const analyticsShareLogic = kea<analyticsShareLogicType>([path(['scenes', 'analytics', 'analyticsShareLogic']),connect(() => ({- values: [analyticsSpacesLogic, ['spaces', 'spacesLoading']],- actions: [analyticsSpacesLogic, ['loadSpaces']],+ actions: [analyticsSpacesLogic, ['refreshSpaces']],})),actions({openShareToSpace: (target: ShareToSpaceTarget) => ({ target }),@@ -129,6 +146,20 @@ export const analyticsShareLogic = kea<analyticsShareLogicType>([moveItem: (target: ShareToSpaceTarget, space: AnalyticsSpace | null) => ({ target, space }),itemSpaceLoaded: (key: string, space: string | null) => ({ key, space }),}),+ loaders({+ spaces: [+ [] as AnalyticsSpace[],+ {+ loadSpaces: async (_: void, breakpoint): Promise<AnalyticsSpace[]> => {+ const folders = await listSpaceFolders()+ breakpoint()+ const spaces = await Promise.all(folders.map((folder) => loadSpace(folder)))+ breakpoint()+ return spaces.sort((first, second) => first.name.localeCompare(second.name))+ },+ },+ ],+ }),reducers({target: [null as ShareToSpaceTarget | null,@@ -204,7 +235,7 @@ export const analyticsShareLogic = kea<analyticsShareLogicType>([})actions.itemSpaceLoaded(shareTargetKey(target), space ? space.name : null)if (removeProjectIdIfPresent(router.values.location.pathname) === urls.analyticsSpaces()) {- actions.loadSpaces()+ actions.refreshSpaces()}// pinned: analytics event name and properties. Renaming them breaks dashboards.posthog.capture('analytics item moved', {diff --git a/frontend/src/scenes/analytics/analyticsSpacesLogic.test.ts b/frontend/src/scenes/analytics/analyticsSpacesLogic.test.tsindex 013ba5b1d1f1..b8a3f6319e3f 100644--- a/frontend/src/scenes/analytics/analyticsSpacesLogic.test.ts+++ b/frontend/src/scenes/analytics/analyticsSpacesLogic.test.ts@@ -24,9 +24,15 @@ const row = (type: string, ref: string, path: string): Record<string, unknown> =describe('analyticsSpacesLogic', () => {let requests: string[]+ let folders: string[]+ let folderRequests: URLSearchParams[]+ let metadataRequests: string[]beforeEach(() => {requests = []+ folders = ['Growth', 'Unfiled', 'Finance', 'Users']+ folderRequests = []+ metadataRequests = []useMocks({get: {'/api/projects/:team_id/file_system_shortcut/': {@@ -40,13 +46,19 @@ describe('analyticsSpacesLogic', () => {const parent = params.get('parent')const type = params.get('type') ?? params.get('type__startswith')if (params.get('depth') === '1' && type === 'folder') {+ folderRequests.push(params)+ const search = params.get('search')?.toLowerCase() ?? ''+ const matches = folders.filter((name) => name.toLowerCase().includes(search))+ const offset = Number(params.get('offset') ?? 0)+ const limit = Number(params.get('limit') ?? 20)return {- results: ['Growth', 'Unfiled', 'Finance', 'Users'].map(folder),- count: 4,- next: null,+ results: matches.slice(offset, offset + limit).map(folder),+ count: matches.length,+ next: offset + limit < matches.length ? '/next-page' : null,}}if (parent && type) {+ metadataRequests.push(parent)// Per-type counts come from `count`, not from the one row the page holds.const count = parent === 'Growth' ? ({ insight: 7, dashboard: 2 }[type] ?? 0) : 0return { results: count ? [row(type, `${type}-x`, `${parent}/X`)] : [], count, next: null }@@ -96,4 +108,39 @@ describe('analyticsSpacesLogic', () => {expect(requests).toEqual(['delete shortcut sc-growth'])})++ it('pages metadata after pin and literal name filters, and reuses metadata across searches', async () => {+ folders = [+ ...Array.from({ length: 22 }, (_, index) => `Collection ${String(index + 1).padStart(2, '0')}`),+ 'Growth',+ '-Finance',+ ]+ const logic = analyticsSpacesLogic()+ logic.mount()++ await expectLogic(logic, () => logic.actions.loadSpaces()).toDispatchActions(['loadSpacesSuccess'])+ expect(logic.values.spaces).toHaveLength(20)+ expect(logic.values.visibleSpaces[0].name).toBe('Growth')+ expect(logic.values.pagination).toEqual({ offset: 20, hasMore: true })+ expect(folderRequests).toHaveLength(1)+ expect(folderRequests[0].get('limit')).toBe('200')++ await expectLogic(logic, () => {+ logic.actions.loadMore()+ logic.actions.loadMore()+ }).toDispatchActions(['loadSpacesSuccess'])+ expect(logic.values.spaces.map((space) => space.name)).toEqual([...folders].sort((a, b) => a.localeCompare(b)))+ expect(logic.values.pagination).toEqual({ offset: 24, hasMore: false })+ expect(folderRequests).toHaveLength(1)+ expect(metadataRequests).toHaveLength(24 * 4)++ for (const search of ['Collection 22', '-Finance', 'Collection', '-Finance']) {+ await expectLogic(logic, () => logic.actions.setSearch(search)).toDispatchActions(['loadSpacesSuccess'])+ expect(logic.values.visibleSpaces.map((space) => space.name)).toEqual(+ folders.filter((name) => name.includes(search)).slice(0, 20)+ )+ }+ expect(folderRequests).toHaveLength(1)+ expect(metadataRequests).toHaveLength(24 * 4)+ })})diff --git a/frontend/src/scenes/analytics/analyticsSpacesLogic.ts b/frontend/src/scenes/analytics/analyticsSpacesLogic.tsindex 1749dc4078f4..045d40781594 100644--- a/frontend/src/scenes/analytics/analyticsSpacesLogic.ts+++ b/frontend/src/scenes/analytics/analyticsSpacesLogic.ts@@ -17,11 +17,9 @@ import { splitPath } from '~/layout/panel-layout/ProjectTree/utils'import { todayAnalyticsLogic } from '~/layout/today/todayAnalyticsLogic'import { FileSystemEntry } from '~/queries/schema/schema-general'-import { fileSystemTypeParams } from './analyticsFeed'+import { ANALYTICS_FEED_PAGE_SIZE, fileSystemTypeParams } from './analyticsFeed'import { ANALYTICS_TYPES, AnalyticsType, UNFILED_FOLDER, USERS_FOLDER, fileSystemEntryName } from './analyticsUtils'-// Top-level folders come a page at a time; a project with more than this many is unlikely but handled.-const SPACES_PAGE_SIZE = 200// Marks the shortcuts this page makes, so other folder shortcuts (such as a home folder) stay off the list.// kea-localstorage keys by logic path, and starred spaces belong to one person in one project. Without// both ids (OAuth mode can load this module early) nothing persists, so one account never sees another's.@@ -55,19 +53,10 @@ export interface AnalyticsSpace {lastAddedAt: string | null}-async function listAllTopLevelFolders(): Promise<FileSystemEntry[]> {- const folders: FileSystemEntry[] = []- for (let offset = 0; ; offset += SPACES_PAGE_SIZE) {- const page = await api.fileSystem.list({ depth: 1, type: 'folder', limit: SPACES_PAGE_SIZE, offset })- folders.push(...page.results)- if (!page.next || page.results.length === 0) {- return folders- }- }-}+type SpacesPagination = { offset: number; hasMore: boolean }/** One request per type reads the count and the newest row, so a big space costs four small calls. */-export async function loadSpace(folder: FileSystemEntry): Promise<AnalyticsSpace> {+export async function loadSpace(folder: FileSystemEntry, signal?: AbortSignal): Promise<AnalyticsSpace> {const pages = await Promise.all(ANALYTICS_TYPES.map((info) =>api.fileSystem.list({@@ -75,6 +64,7 @@ export async function loadSpace(folder: FileSystemEntry): Promise<AnalyticsSpace...fileSystemTypeParams(info.type),orderBy: '-created_at',limit: 1,+ signal,})))@@ -95,9 +85,28 @@ export async function loadSpace(folder: FileSystemEntry): Promise<AnalyticsSpace}}+export async function listSpaceFolders(signal?: AbortSignal): Promise<FileSystemEntry[]> {+ const folders: FileSystemEntry[] = []+ for (let offset = 0; ; offset += 200) {+ const page = await api.fileSystem.list({+ depth: 1,+ type: 'folder',+ limit: 200,+ offset,+ orderBy: 'path',+ signal,+ })+ folders.push(...page.results.filter((folder) => isSpacePath(folder.path)))+ if (!page.next || !page.results.length) {+ return folders+ }+ }+}+// Generated by kea-typegen. Update if you're an agent, ignore if you're human.export interface analyticsSpacesLogicValues {featureFlags: FeatureFlagsSet // featureFlagLogic+ pagination: SpacesPaginationpinnedPaths: Set<string>pinnedSpaces: PinnedSpace[]pinning: string | null@@ -118,6 +127,9 @@ export interface analyticsSpacesLogicActions {folderCreated: () => {value: true} // todayAnalyticsLogic+ loadMore: () => {+ value: true+ }loadShortcuts: () => anyloadShortcutsFailure: (error: string,@@ -133,7 +145,7 @@ export interface analyticsSpacesLogicActions {shortcuts: FileSystemEntry[]payload?: any}- loadSpaces: (_: void) => void+ loadSpaces: (append?: boolean) => booleanloadSpacesFailure: (error: string,errorObject?: any@@ -143,10 +155,20 @@ export interface analyticsSpacesLogicActions {}loadSpacesSuccess: (spaces: AnalyticsSpace[],- payload?: void+ payload?: boolean) => {spaces: AnalyticsSpace[]- payload?: void+ payload?: boolean+ }+ refreshSpaces: () => {+ value: true+ }+ setPagination: (+ offset: number,+ hasMore: boolean+ ) => {+ hasMore: boolean+ offset: number}setSearch: (search: string) => {search: string@@ -186,33 +208,79 @@ export const analyticsSpacesLogic = kea<analyticsSpacesLogicType>([togglePin: (space: Pick<AnalyticsSpace, 'path' | 'name'>) => ({ space }),togglePinDone: true,setSearch: (search: string) => ({ search }),+ loadMore: true,+ refreshSpaces: true,+ setPagination: (offset: number, hasMore: boolean) => ({ offset, hasMore }),}),- loaders(({ cache }) => ({+ loaders(({ actions, values, cache }) => ({shortcuts: [[] as FileSystemEntry[],{- loadShortcuts: async () => (await api.fileSystemShortcuts.list()).results,+ loadShortcuts: async () => {+ cache.shortcutsRequest = api.fileSystemShortcuts.list()+ return (await cache.shortcutsRequest).results+ },},],spaces: [[] as AnalyticsSpace[],{- loadSpaces: async (_: void, breakpoint) => {- const folders = await listAllTopLevelFolders()+ loadSpaces: async (append: boolean = false, breakpoint): Promise<AnalyticsSpace[]> => {+ const controller = new AbortController()+ cache.disposables.add(() => () => controller.abort(), 'spacesRequest', { pauseOnPageHidden: false })+ const metadata: Map<string, AnalyticsSpace> = (cache.metadata ??= new Map())+ let folders: FileSystemEntry[] | undefined = cache.folders+ if (!folders) {+ folders = await listSpaceFolders(controller.signal)+ breakpoint()+ cache.folders = folders+ }+ if (!cache.shortcutsRequest) {+ actions.loadShortcuts()+ }+ const shortcuts: FileSystemEntry[] = (await cache.shortcutsRequest).resultsbreakpoint()+ const pinned = new Set(shortcuts.filter((item) => item.type === 'folder').map((item) => item.ref))+ const needle = values.search.trim().toLowerCase()+ const matches = folders+ .filter(+ (folder) =>+ isSpacePath(folder.path) && fileSystemEntryName(folder).toLowerCase().includes(needle)+ )+ .sort((first, second) => {+ const pinnedFirst = Number(pinned.has(second.path)) - Number(pinned.has(first.path))+ return pinnedFirst || first.path.localeCompare(second.path)+ })+ const offset = append ? values.pagination.offset : 0+ const page = matches.slice(offset, offset + ANALYTICS_FEED_PAGE_SIZE)const spaces = await Promise.all(- folders- .filter((folder) => ![UNFILED_FOLDER, USERS_FOLDER].includes(fileSystemEntryName(folder)))- .map(loadSpace)+ page.map(async (folder) => {+ const existing = metadata.get(folder.path)+ if (existing) {+ return existing+ }+ const space = await loadSpace(folder, controller.signal)+ metadata.set(folder.path, space)+ return space+ }))breakpoint()cache.loaded = true- return spaces.sort((first, second) => first.name.localeCompare(second.name))+ actions.setPagination(offset + page.length, offset + page.length < matches.length)+ const combined = append ? [...values.spaces, ...spaces] : spaces+ return combined.sort((first, second) => first.name.localeCompare(second.name))},},],})),reducers({+ pagination: [+ { offset: 0, hasMore: false } as SpacesPagination,+ {+ setPagination: (_, { offset, hasMore }) => ({ offset, hasMore }),+ setSearch: (): SpacesPagination => ({ offset: 0, hasMore: false }),+ },+ ],spacesFailed: [false,{ loadSpaces: () => false, loadSpacesSuccess: () => false, loadSpacesFailure: () => true },@@ -259,7 +327,29 @@ export const analyticsSpacesLogic = kea<analyticsSpacesLogicType>([},],}),- listeners(({ actions, values }) => ({+ listeners(({ actions, values, cache }) => ({+ refreshSpaces: () => {+ cache.folders = undefined+ cache.metadata = new Map<string, AnalyticsSpace>()+ actions.loadSpaces()+ },+ loadShortcutsFailure: () => {+ cache.shortcutsRequest = undefined+ },+ loadShortcutsSuccess: () => {+ if (cache.loaded && removeProjectIdIfPresent(router.values.location.pathname) === urls.analyticsSpaces()) {+ actions.loadSpaces()+ }+ },+ loadMore: () => {+ if (!values.spacesLoading && values.pagination.hasMore) {+ actions.loadSpaces(true)+ }+ },+ setSearch: async (_, breakpoint) => {+ await breakpoint(200)+ actions.loadSpaces()+ },togglePin: async ({ space }) => {try {const pinned = values.pinnedSpaces.find((candidate) => candidate.path === space.path)@@ -287,13 +377,13 @@ export const analyticsSpacesLogic = kea<analyticsSpacesLogicType>([cache.flagSeen = trueactions.loadShortcuts()if (removeProjectIdIfPresent(router.values.location.pathname) === urls.analyticsSpaces()) {- actions.loadSpaces()+ actions.refreshSpaces()}},// A space made from the dialog shows up without a reload.folderCreated: () => {if (removeProjectIdIfPresent(router.values.location.pathname) === urls.analyticsSpaces()) {- actions.loadSpaces()+ actions.refreshSpaces()}},// A collection is deleted like any folder, through the project tree. The server keeps its pin, so it goes here.@@ -309,7 +399,7 @@ export const analyticsSpacesLogic = kea<analyticsSpacesLogicType>([posthog.capture('analytics collection deleted')actions.loadShortcuts()if (removeProjectIdIfPresent(router.values.location.pathname) === urls.analyticsSpaces()) {- actions.loadSpaces()+ actions.refreshSpaces()}},togglePinDone: () => {@@ -321,7 +411,7 @@ export const analyticsSpacesLogic = kea<analyticsSpacesLogicType>([urlToAction(({ actions, values }) => ({[urls.analyticsSpaces()]: () => {if (values.featureFlags[FEATURE_FLAGS.TODAY_RAIL_NAV]) {- actions.loadSpaces()+ actions.refreshSpaces()}},})),diff --git a/frontend/src/scenes/urls.ts b/frontend/src/scenes/urls.tsindex 2047e1ead7b3..023f0870845d 100644--- a/frontend/src/scenes/urls.ts+++ b/frontend/src/scenes/urls.ts@@ -35,6 +35,7 @@ import type { SettingId, SettingLevelId, SettingSectionId } from './settings/typ/** The filters the analytics list reads from its URL. */export interface AnalyticsListUrlParams {+ orderBy?: stringtype?: stringcreatedBy?: string[]folder?: stringdiff --git a/posthog/api/file_system/file_system.py b/posthog/api/file_system/file_system.pyindex 1d352688aa73..56ba960bbaa2 100644--- a/posthog/api/file_system/file_system.py+++ b/posthog/api/file_system/file_system.py@@ -8,8 +8,21 @@ from typing import Any, Optional, castfrom uuid import UUIDfrom django.apps import apps-from django.db import transaction-from django.db.models import Case, CharField, Exists, F, Func, IntegerField, Q, QuerySet, Value, When+from django.db import connection, transaction+from django.db.models import (+ Case,+ CharField,+ Exists,+ F,+ Func,+ IntegerField,+ OuterRef,+ Q,+ QuerySet,+ Subquery,+ Value,+ When,+)from django.db.models.functions import Concat, Lowerfrom drf_spectacular.utils import extend_schema@@ -50,7 +63,11 @@ from posthog.models.file_system.file_system import (from posthog.models.file_system.file_system_home_folder import FileSystemHomeFolderfrom posthog.models.file_system.file_system_representation import FileSystemRepresentationfrom posthog.models.file_system.file_system_shortcut import FileSystemShortcut-from posthog.models.file_system.file_system_view_log import get_recent_file_system_items, recent_view_logs+from posthog.models.file_system.file_system_view_log import (+ FileSystemViewLog,+ get_recent_file_system_items,+ recent_view_logs,+)from posthog.models.file_system.unfiled_file_saver import save_unfiled_filesfrom posthog.models.tagged_item import TaggedItemfrom posthog.models.tagged_item_registry import object_column_for@@ -566,12 +583,21 @@ class FileSystemViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):queryset = self._filter_by_access_control(queryset)+ if type_param or type__startswith_param:+ views = FileSystemViewLog.objects.filter(+ team_id=OuterRef("team_id"),+ user_id=cast(User, self.request.user).id,+ type=OuterRef("type"),+ ref=OuterRef("ref"),+ )+ queryset = queryset.annotate(last_viewed_at=Subquery(views.values("viewed_at")[:1]))+if ref_param:queryset = queryset.filter(ref=ref_param)queryset = queryset.order_by("shortcut") # override orderelif order_by_param:if order_by_param in ["path", "-path", "created_at", "-created_at"]:- queryset = queryset.order_by(order_by_param)+ queryset = queryset.order_by(order_by_param, "id")else:# `last_viewed_at` ordering (Recents, with or without a search term) is served# view-log-first in `_list_recents`, so it never reaches this queryset path.@@ -718,6 +744,60 @@ class FileSystemViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):metadata["content_type"] = content_types.get((str(item["type"]), team_id, ref), "application/json")item["meta"] = metadata+ def _list_typed_by_views(self, request: Request, *, descending: bool) -> Response:+ queryset = self.filter_queryset(self.get_queryset()).order_by()+ paginator = cast(FileSystemsLimitOffsetPagination, self.paginator)+ paginator.request = request+ paginator.limit = paginator.get_limit(request)+ paginator.offset = paginator.get_offset(request)+ paginator.count = queryset.count()+ if paginator.offset >= paginator.count:+ response = paginator.get_paginated_response([])+ response.data["users"] = []+ return response+ limit = paginator.limit or paginator.default_limit++ views = FileSystemViewLog.objects.filter(+ team_id__in=Team.objects.filter(project_id=self.team.project_id).values("id"),+ user_id=cast(User, request.user).id,+ )+ files_sql, files_params = queryset.values("id", "team_id", "type", "ref", "created_at").query.sql_with_params()+ views_sql, views_params = views.order_by().values("team_id", "type", "ref", "viewed_at").query.sql_with_params()+ direction = "DESC" if descending else "ASC"+ # ORM-compiled SQL retains access filters; OFFSET 0 keeps the lateral join view-log-first.+ page_sql = f"""+ SELECT files.id+ FROM ({views_sql}) AS views+ CROSS JOIN LATERAL (+ SELECT eligible.id, eligible.created_at+ FROM ({files_sql}) AS eligible+ WHERE eligible.team_id = views.team_id AND eligible.type = views.type AND eligible.ref = views.ref+ ORDER BY eligible.created_at DESC, eligible.id+ OFFSET 0+ ) AS files+ ORDER BY views.viewed_at {direction}, files.created_at DESC, files.id+ LIMIT %s OFFSET %s+ """+ with connection.cursor() as cursor:+ cursor.execute(page_sql, [*views_params, *files_params, limit, paginator.offset])+ page_ids = [row[0] for row in cursor.fetchall()]+ if len(page_ids) < limit:+ own_view = views.filter(team_id=OuterRef("team_id"), type=OuterRef("type"), ref=OuterRef("ref"))+ unseen_offset = 0+ if not page_ids and paginator.offset:+ viewed_count = queryset.filter(Exists(own_view)).count()+ unseen_offset = max(0, paginator.offset - viewed_count)+ page_ids.extend(+ queryset.filter(~Exists(own_view))+ .order_by("-created_at", "id")+ .values_list("id", flat=True)[unseen_offset : unseen_offset + limit - len(page_ids)]+ )+ rows = {row.id: row for row in queryset.filter(id__in=page_ids)}+ results = self.get_serializer([rows[row_id] for row_id in page_ids if row_id in rows], many=True).data+ response = paginator.get_paginated_response(results)+ response.data["users"] = self._created_by_users(results)+ return response+@extend_schema(parameters=[FileSystemListQuerySerializer])def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:query_serializer = FileSystemListQuerySerializer(data=request.query_params)@@ -725,8 +805,12 @@ class FileSystemViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):order_by_param = request.query_params.get("order_by")# Recents (the high-volume, timeout-prone path) is served view-log-first, with or without a# search term — one query function, no join, no COUNT(*).+ typed_list = request.query_params.get("type") or request.query_params.get("type__startswith")if order_by_param in ("-last_viewed_at", "last_viewed_at") and request.user.is_authenticated:- response = self._list_recents(request, descending=order_by_param == "-last_viewed_at")+ if typed_list:+ response = self._list_typed_by_views(request, descending=order_by_param == "-last_viewed_at")+ else:+ response = self._list_recents(request, descending=order_by_param == "-last_viewed_at")else:response = super().list(request, *args, **kwargs)response.data["users"] = self._created_by_users(response.data.get("results", []))diff --git a/posthog/api/file_system/test/test_file_system.py b/posthog/api/file_system/test/test_file_system.pyindex b855b646dae9..d2677057d07d 100644--- a/posthog/api/file_system/test/test_file_system.py+++ b/posthog/api/file_system/test/test_file_system.py@@ -31,6 +31,7 @@ from posthog.models import OrganizationMembership, Project, Team, Userfrom posthog.models.activity_logging.activity_log import ActivityLogfrom posthog.models.file_system.file_system import FileSystemfrom posthog.models.file_system.file_system_shortcut import FileSystemShortcut+from posthog.models.file_system.file_system_view_log import FileSystemViewLogfrom posthog.models.tag import Tagfrom posthog.models.tagged_item import TaggedItemfrom posthog.session_recordings.models.session_recording_playlist import SessionRecordingPlaylist@@ -1126,6 +1127,48 @@ class TestFileSystemAPI(APIBaseTest):# Pure case-insensitive alphabetical order, regardless of typeself.assertEqual(paths, ["Afile.txt", "alpha", "beta", "bFile.txt"])+ @parameterized.expand([("type=dashboard",), ("type__startswith=dashboard",)])+ def test_typed_list_orders_by_own_views_with_unviewed_last(self, type_filter: str) -> None:+ files = [+ FileSystem.objects.create(team=self.team, path=f"Dashboard {index}", type="dashboard", ref=str(index))+ for index in range(3)+ ]+ FileSystemViewLog.objects.create(+ team=self.team, user=self.user, type="dashboard", ref="0", viewed_at="2026-09-01T00:00:00Z"+ )+ FileSystemViewLog.objects.create(+ team=self.team, user=self.user, type="dashboard", ref="1", viewed_at="2026-09-02T00:00:00Z"+ )+ other_user = User.objects.create_and_join(self.organization, "[email protected]", "password")+ FileSystemViewLog.objects.create(+ team=self.team, user=other_user, type="dashboard", ref="2", viewed_at="2026-09-03T00:00:00Z"+ )+ files.append(FileSystem.objects.create(team=self.team, path="Dashboard copy", type="dashboard", ref="0"))+ files.extend(+ FileSystem.objects.create(+ team=self.team, path=f"Dashboard unseen {index}", type="dashboard", ref=f"unseen-{index}"+ )+ for index in range(2)+ )+ FileSystem.objects.create(team=self.team, path="Excluded", type="dashboard", ref="excluded")+ FileSystemViewLog.objects.create(+ team=self.team, user=self.user, type="dashboard", ref="excluded", viewed_at="2026-09-04T00:00:00Z"+ )+ base = f"/api/projects/{self.team.id}/file_system/?{type_filter}&search=name:Dashboard&order_by="+ for ordering, expected in [("-last_viewed_at", [1, 3, 0, 5, 4, 2]), ("last_viewed_at", [3, 0, 1, 5, 4, 2])]:+ next_url = f"{base}{ordering}&limit=2"+ results = []+ while next_url:+ response = self.client.get(next_url)+ self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())+ data = response.json()+ self.assertEqual(data["count"], 6)+ results.extend(data["results"])+ next_url = data["next"]+ self.assertEqual([row["id"] for row in results], [str(files[index].id) for index in expected])+ self.assertTrue(all(row["last_viewed_at"] is None for row in results[-3:]))+ self.assertTrue(all(row["last_viewed_at"] for row in results[:-3]))+def test_list_order_by_created_at(self):# Create items in chronological orderwith time_machine.travel("2020-01-01 10:00:00", tick=False):diff --git a/services/mcp/package.json b/services/mcp/package.jsonindex a872f2b21b6a..41b1c188c906 100644--- a/services/mcp/package.json+++ b/services/mcp/package.json@@ -14,7 +14,7 @@"author": "PostHog Inc.","scripts": {"generate:ui-apps": "tsx scripts/generate-ui-apps.ts",- "build:quill": "pnpm --dir ../../packages/quill -r --filter '@posthog/quill-*' --filter '@posthog/quill' build",+ "build:quill": "pnpm --dir ../../packages/quill -r --filter '@posthog/quill-*' --filter '@posthog/quill' --filter '!@posthog/quill-workspace' build","build:ui-apps": "pnpm run build:quill && pnpm run generate:ui-apps && tsx scripts/build-ui-apps.ts","build:ui-apps:watch": "pnpm run build:quill && pnpm run generate:ui-apps && tsx scripts/build-ui-apps.ts --watch","build": "pnpm run build:ui-apps",