Skip to content

Commit

Permalink
Merge branch 'master' into aspicer/3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@aspicer
aspicer authored Jun 14, 2024
2 parents dd4d7ed + e92f66b commit 6a28f70
Show file tree
Hide file tree
Showing 74 changed files with 3,410 additions and 1,747 deletions.
80 changes: 40 additions & 40 deletions ...ecordings/queries/test/__snapshots__/test_session_recording_list_from_session_replay.ambr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT %(limit)s
OFFSET %(offset)s
Expand Down Expand Up @@ -107,7 +107,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT %(limit)s
OFFSET %(offset)s
Expand Down Expand Up @@ -163,7 +163,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT %(limit)s
OFFSET %(offset)s
Expand Down Expand Up @@ -219,7 +219,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT %(limit)s
OFFSET %(offset)s
Expand Down Expand Up @@ -249,7 +249,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -292,7 +292,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -322,7 +322,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -365,7 +365,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -395,7 +395,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -438,7 +438,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -468,7 +468,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -511,7 +511,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -541,7 +541,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -592,7 +592,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -622,7 +622,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -673,7 +673,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -703,7 +703,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -754,7 +754,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -784,7 +784,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -835,7 +835,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -865,7 +865,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -916,7 +916,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -946,7 +946,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -997,7 +997,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1027,7 +1027,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1078,7 +1078,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1108,7 +1108,7 @@
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1159,7 +1159,7 @@
GROUP BY distinct_id
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1204,7 +1204,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1249,7 +1249,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1294,7 +1294,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1339,7 +1339,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1384,7 +1384,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1429,7 +1429,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1474,7 +1474,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1519,7 +1519,7 @@
HAVING argMax(is_deleted, version) = 0
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1562,7 +1562,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1605,7 +1605,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1648,7 +1648,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down Expand Up @@ -1691,7 +1691,7 @@
GROUP BY `$session_id`
HAVING 1=1) as session_events_sub_query)
GROUP BY session_id
HAVING 1=1
HAVING s.first_url is not null
ORDER BY start_time DESC
LIMIT 51
OFFSET 0
Expand Down
Binary file modified ...end/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...nd/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/__snapshots__/scenes-app-insights--trends-line-edit--dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/lib/components/ActivityLog/activityLogLogic.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from 'lib/components/ActivityLog/humanizeActivity'
import { ACTIVITY_PAGE_SIZE } from 'lib/constants'
import { PaginationManual } from 'lib/lemon-ui/PaginationControl'
import { cohortActivityDescriber } from 'scenes/cohorts/activityDescriptions'
import { dataManagementActivityDescriber } from 'scenes/data-management/dataManagementDescribers'
import { flagActivityDescriber } from 'scenes/feature-flags/activityDescriptions'
import { notebookActivityDescriber } from 'scenes/notebooks/Notebook/notebookActivityDescriber'
Expand All @@ -36,6 +37,8 @@ export const describerFor = (logItem?: ActivityLogItem): Describer | undefined =
case ActivityScope.PLUGIN:
case ActivityScope.PLUGIN_CONFIG:
return pluginActivityDescriber
case ActivityScope.COHORT:
return cohortActivityDescriber
case ActivityScope.INSIGHT:
return insightActivityDescriber
case ActivityScope.PERSON:
Expand Down
Loading

0 comments on commit 6a28f70

Please sign in to comment.