Skip to content

: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.

perf(today): filter my work on the server and keep its query stable (#119835)

Mike Warrencb7df96ece62
diff --git a/frontend/src/scenes/analytics/analyticsFeed.ts b/frontend/src/scenes/analytics/analyticsFeed.ts
index 3c1e2dee9635..150c9d0ccc53 100644
--- a/frontend/src/scenes/analytics/analyticsFeed.ts
+++ b/frontend/src/scenes/analytics/analyticsFeed.ts
@@ -15,13 +15,21 @@ export const ANALYTICS_FEED_PAGE_SIZE = 50
export interface AnalyticsFeedQuery {
type: AnalyticsTypeFilter
search: string
- /** Creators' uuids; empty means anyone. The file system cannot filter on it, so the rows are narrowed on the client. */
+ /** Creators' uuids; empty means anyone. The file system cannot filter on a uuid, so the rows are narrowed on the client. */
createdBy: string[]
+ /** True when the only creator is the current person, so the file system narrows the rows itself with `user:me`. */
+ createdByMe: boolean
/** Tag names a row must all carry. Like the creator, narrowed on the client. */
tags: string[]
}
-export const EMPTY_ANALYTICS_FEED_QUERY: AnalyticsFeedQuery = { type: 'all', search: '', createdBy: [], tags: [] }
+export const EMPTY_ANALYTICS_FEED_QUERY: AnalyticsFeedQuery = {
+ type: 'all',
+ search: '',
+ createdBy: [],
+ createdByMe: false,
+ tags: [],
+}
export interface AnalyticsSourcePage {
items: AnalyticsItem[]
@@ -86,9 +94,11 @@ export async function fetchAnalyticsSourcePage(
offset: number
): Promise<AnalyticsSourcePage> {
const limit = ANALYTICS_FEED_PAGE_SIZE
+ // Without the server filter, a person's rows hide among everyone else's and each page brings few of them.
+ const search = [query.createdByMe ? 'user:me' : '', query.search.trim()].filter(Boolean).join(' ')
const result = await api.fileSystem.list({
...fileSystemTypeParams(type),
- search: query.search.trim() || undefined,
+ search: search || undefined,
orderBy: '-created_at',
includeTags: true,
limit,
diff --git a/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts b/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts
index c6443970ed76..18d65bf68994 100644
--- a/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts
+++ b/frontend/src/scenes/analytics/analyticsFeedLogic.test.ts
@@ -34,10 +34,12 @@ const entry = (
describe('analyticsFeedLogic', () => {
let requests: string[]
+ let searches: (string | null)[]
beforeEach(() => {
resetAnalyticsFeedSnapshot()
requests = []
+ searches = []
useMocks({
get: {
'/api/projects/:team_id/task_channels/': [],
@@ -50,6 +52,7 @@ describe('analyticsFeedLogic', () => {
const type = params.get('type') ?? params.get('type__startswith') ?? ''
const offset = params.get('offset') ?? '0'
requests.push(`${type}:${offset}:${params.get('order_by')}`)
+ searches.push(params.get('search'))
if (type === 'canvas') {
return { results: [entry('canvas', 'c7', 'Growth/C', at(7), GRACE)], users: USERS, next: null }
}
@@ -135,15 +138,19 @@ describe('analyticsFeedLogic', () => {
])
})
- it('narrows rows to a creator on the client, since the file system cannot', async () => {
+ it.each([
+ ['another person, on the client alone', false, null],
+ ['the current person, on the server too', true, 'user:me'],
+ ])('narrows rows to %s', async (_, createdByMe, search) => {
const logic = analyticsFeedLogic()
logic.mount()
- const byAda: AnalyticsFeedQuery = { ...ALL, createdBy: ['u-ada'] }
+ const byAda: AnalyticsFeedQuery = { ...ALL, createdBy: ['u-ada'], createdByMe }
await expectLogic(logic, () => logic.actions.ensureFeed(byAda, 100)).toFinishAllListeners()
await expectLogic(logic, () => logic.actions.ensureFeed(byAda, 100)).toFinishAllListeners()
expect(feed(logic, byAda)).toEqual(['dashboard:10', 'notebook:n9', 'insight:i5', 'dashboard:3', 'notebook:n1'])
+ expect(new Set(searches)).toEqual(new Set([search]))
})
it('keeps the loaded list after a remount, so a revisit shows rows at once', async () => {
diff --git a/frontend/src/scenes/analytics/analyticsListLogic.test.ts b/frontend/src/scenes/analytics/analyticsListLogic.test.ts
index 5e1f86b77383..6075ad2fc68c 100644
--- a/frontend/src/scenes/analytics/analyticsListLogic.test.ts
+++ b/frontend/src/scenes/analytics/analyticsListLogic.test.ts
@@ -5,6 +5,7 @@ import posthog from 'posthog-js'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { urls } from 'scenes/urls'
+import { userLogic } from 'scenes/userLogic'
import { useMocks } from '~/mocks/jest'
import { initKeaTests } from '~/test/init'
@@ -94,4 +95,17 @@ describe('analyticsListLogic', () => {
['views list loaded', 'folder'],
])
})
+
+ it('keeps My work on one query when the user record reloads, so the list does not render again', async () => {
+ const logic = analyticsListLogic()
+ logic.mount()
+ router.actions.push(urls.analyticsMine())
+ await expectLogic(logic).toFinishAllListeners()
+ const query = logic.values.feedQuery
+
+ userLogic.actions.loadUserSuccess({ ...userLogic.values.user! })
+
+ expect(query.createdByMe).toBe(true)
+ expect(logic.values.feedQuery).toBe(query)
+ })
})
diff --git a/frontend/src/scenes/analytics/analyticsListLogic.ts b/frontend/src/scenes/analytics/analyticsListLogic.ts
index ee705866e739..f73829c8d0e6 100644
--- a/frontend/src/scenes/analytics/analyticsListLogic.ts
+++ b/frontend/src/scenes/analytics/analyticsListLogic.ts
@@ -137,6 +137,7 @@ export interface analyticsListLogicValues {
user: UserType | null // userLogic
creators: string[]
currentFeed: AnalyticsFeed
+ currentUserUuid: string | null
failedTypes: AnalyticsFeed['failedTypes']
feed: AnalyticsFeed
feedQuery: AnalyticsFeedQuery
@@ -270,8 +271,14 @@ export interface analyticsListLogicMeta {
__keaTypeGenInternalSelectorTypes: {
mode: (filters: AnalyticsListFilters) => AnalyticsListMode
filtersActive: (filters: AnalyticsListFilters) => boolean
- creators: (filters: AnalyticsListFilters, user: UserType | null, scope: AnalyticsListScope) => string[]
- feedQuery: (filters: AnalyticsListFilters, feedSearch: string, creators: string[]) => AnalyticsFeedQuery
+ currentUserUuid: (user: UserType | null) => string | null
+ creators: (filters: AnalyticsListFilters, currentUserUuid: string | null, scope: AnalyticsListScope) => string[]
+ feedQuery: (
+ filters: AnalyticsListFilters,
+ feedSearch: string,
+ creators: string[],
+ currentUserUuid: string | null
+ ) => AnalyticsFeedQuery
currentFeed: (
sources: Record<string, AnalyticsSourceState>,
currentTeamId: number | null,
@@ -455,17 +462,25 @@ export const analyticsListLogic = kea<analyticsListLogicType>([
(filters: AnalyticsListFilters): boolean => analyticsListFiltersActive(filters),
],
// My work narrows to the person; View all narrows to whoever they picked.
+ // The user record is replaced on every reload; its uuid is not, so the feed query only changes when the person does.
+ currentUserUuid: [(s) => [s.user], (user: UserType | null): string | null => user?.uuid ?? null],
creators: [
- (s) => [s.filters, s.user, s.scope],
- (filters: AnalyticsListFilters, user: UserType | null, scope: AnalyticsListScope): string[] =>
- scope === 'mine' ? (user?.uuid ? [user.uuid] : []) : filters.createdBy,
+ (s) => [s.filters, s.currentUserUuid, s.scope],
+ (filters: AnalyticsListFilters, currentUserUuid: string | null, scope: AnalyticsListScope): string[] =>
+ scope === 'mine' ? (currentUserUuid ? [currentUserUuid] : []) : filters.createdBy,
],
feedQuery: [
- (s) => [s.filters, s.feedSearch, s.creators],
- (filters: AnalyticsListFilters, feedSearch: string, creators: string[]): AnalyticsFeedQuery => ({
+ (s) => [s.filters, s.feedSearch, s.creators, s.currentUserUuid],
+ (
+ filters: AnalyticsListFilters,
+ feedSearch: string,
+ creators: string[],
+ currentUserUuid: string | null
+ ): AnalyticsFeedQuery => ({
type: filters.type,
search: feedSearch.trim(),
createdBy: creators,
+ createdByMe: !!currentUserUuid && creators.length === 1 && creators[0] === currentUserUuid,
tags: filters.tags,
}),
],