Skip to content

Commit 6a28f70

Browse files
aspiceraspicer
authored
Merge branch 'master' into aspicer/3.11
2 parents dd4d7ed + e92f66b commit 6a28f70

File tree

74 files changed

+3410
-1747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3410
-1747
lines changed

‎ee/session_recordings/queries/test/__snapshots__/test_session_recording_list_from_session_replay.ambr

+40-40
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
GROUP BY distinct_id
5151
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
5252
GROUP BY session_id
53-
HAVING 1=1
53+
HAVING s.first_url is not null
5454
ORDER BY start_time DESC
5555
LIMIT %(limit)s
5656
OFFSET %(offset)s
@@ -107,7 +107,7 @@
107107
GROUP BY distinct_id
108108
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
109109
GROUP BY session_id
110-
HAVING 1=1
110+
HAVING s.first_url is not null
111111
ORDER BY start_time DESC
112112
LIMIT %(limit)s
113113
OFFSET %(offset)s
@@ -163,7 +163,7 @@
163163
GROUP BY `$session_id`
164164
HAVING 1=1) as session_events_sub_query)
165165
GROUP BY session_id
166-
HAVING 1=1
166+
HAVING s.first_url is not null
167167
ORDER BY start_time DESC
168168
LIMIT %(limit)s
169169
OFFSET %(offset)s
@@ -219,7 +219,7 @@
219219
GROUP BY `$session_id`
220220
HAVING 1=1) as session_events_sub_query)
221221
GROUP BY session_id
222-
HAVING 1=1
222+
HAVING s.first_url is not null
223223
ORDER BY start_time DESC
224224
LIMIT %(limit)s
225225
OFFSET %(offset)s
@@ -249,7 +249,7 @@
249249
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
250250
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
251251
GROUP BY session_id
252-
HAVING 1=1
252+
HAVING s.first_url is not null
253253
ORDER BY start_time DESC
254254
LIMIT 51
255255
OFFSET 0
@@ -292,7 +292,7 @@
292292
GROUP BY `$session_id`
293293
HAVING 1=1) as session_events_sub_query)
294294
GROUP BY session_id
295-
HAVING 1=1
295+
HAVING s.first_url is not null
296296
ORDER BY start_time DESC
297297
LIMIT 51
298298
OFFSET 0
@@ -322,7 +322,7 @@
322322
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
323323
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
324324
GROUP BY session_id
325-
HAVING 1=1
325+
HAVING s.first_url is not null
326326
ORDER BY start_time DESC
327327
LIMIT 51
328328
OFFSET 0
@@ -365,7 +365,7 @@
365365
GROUP BY `$session_id`
366366
HAVING 1=1) as session_events_sub_query)
367367
GROUP BY session_id
368-
HAVING 1=1
368+
HAVING s.first_url is not null
369369
ORDER BY start_time DESC
370370
LIMIT 51
371371
OFFSET 0
@@ -395,7 +395,7 @@
395395
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
396396
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
397397
GROUP BY session_id
398-
HAVING 1=1
398+
HAVING s.first_url is not null
399399
ORDER BY start_time DESC
400400
LIMIT 51
401401
OFFSET 0
@@ -438,7 +438,7 @@
438438
GROUP BY `$session_id`
439439
HAVING 1=1) as session_events_sub_query)
440440
GROUP BY session_id
441-
HAVING 1=1
441+
HAVING s.first_url is not null
442442
ORDER BY start_time DESC
443443
LIMIT 51
444444
OFFSET 0
@@ -468,7 +468,7 @@
468468
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
469469
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
470470
GROUP BY session_id
471-
HAVING 1=1
471+
HAVING s.first_url is not null
472472
ORDER BY start_time DESC
473473
LIMIT 51
474474
OFFSET 0
@@ -511,7 +511,7 @@
511511
GROUP BY `$session_id`
512512
HAVING 1=1) as session_events_sub_query)
513513
GROUP BY session_id
514-
HAVING 1=1
514+
HAVING s.first_url is not null
515515
ORDER BY start_time DESC
516516
LIMIT 51
517517
OFFSET 0
@@ -541,7 +541,7 @@
541541
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
542542
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
543543
GROUP BY session_id
544-
HAVING 1=1
544+
HAVING s.first_url is not null
545545
ORDER BY start_time DESC
546546
LIMIT 51
547547
OFFSET 0
@@ -592,7 +592,7 @@
592592
GROUP BY distinct_id
593593
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
594594
GROUP BY session_id
595-
HAVING 1=1
595+
HAVING s.first_url is not null
596596
ORDER BY start_time DESC
597597
LIMIT 51
598598
OFFSET 0
@@ -622,7 +622,7 @@
622622
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
623623
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
624624
GROUP BY session_id
625-
HAVING 1=1
625+
HAVING s.first_url is not null
626626
ORDER BY start_time DESC
627627
LIMIT 51
628628
OFFSET 0
@@ -673,7 +673,7 @@
673673
GROUP BY distinct_id
674674
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
675675
GROUP BY session_id
676-
HAVING 1=1
676+
HAVING s.first_url is not null
677677
ORDER BY start_time DESC
678678
LIMIT 51
679679
OFFSET 0
@@ -703,7 +703,7 @@
703703
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
704704
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
705705
GROUP BY session_id
706-
HAVING 1=1
706+
HAVING s.first_url is not null
707707
ORDER BY start_time DESC
708708
LIMIT 51
709709
OFFSET 0
@@ -754,7 +754,7 @@
754754
GROUP BY distinct_id
755755
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
756756
GROUP BY session_id
757-
HAVING 1=1
757+
HAVING s.first_url is not null
758758
ORDER BY start_time DESC
759759
LIMIT 51
760760
OFFSET 0
@@ -784,7 +784,7 @@
784784
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
785785
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
786786
GROUP BY session_id
787-
HAVING 1=1
787+
HAVING s.first_url is not null
788788
ORDER BY start_time DESC
789789
LIMIT 51
790790
OFFSET 0
@@ -835,7 +835,7 @@
835835
GROUP BY distinct_id
836836
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
837837
GROUP BY session_id
838-
HAVING 1=1
838+
HAVING s.first_url is not null
839839
ORDER BY start_time DESC
840840
LIMIT 51
841841
OFFSET 0
@@ -865,7 +865,7 @@
865865
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
866866
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
867867
GROUP BY session_id
868-
HAVING 1=1
868+
HAVING s.first_url is not null
869869
ORDER BY start_time DESC
870870
LIMIT 51
871871
OFFSET 0
@@ -916,7 +916,7 @@
916916
GROUP BY distinct_id
917917
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
918918
GROUP BY session_id
919-
HAVING 1=1
919+
HAVING s.first_url is not null
920920
ORDER BY start_time DESC
921921
LIMIT 51
922922
OFFSET 0
@@ -946,7 +946,7 @@
946946
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
947947
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
948948
GROUP BY session_id
949-
HAVING 1=1
949+
HAVING s.first_url is not null
950950
ORDER BY start_time DESC
951951
LIMIT 51
952952
OFFSET 0
@@ -997,7 +997,7 @@
997997
GROUP BY distinct_id
998998
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
999999
GROUP BY session_id
1000-
HAVING 1=1
1000+
HAVING s.first_url is not null
10011001
ORDER BY start_time DESC
10021002
LIMIT 51
10031003
OFFSET 0
@@ -1027,7 +1027,7 @@
10271027
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
10281028
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
10291029
GROUP BY session_id
1030-
HAVING 1=1
1030+
HAVING s.first_url is not null
10311031
ORDER BY start_time DESC
10321032
LIMIT 51
10331033
OFFSET 0
@@ -1078,7 +1078,7 @@
10781078
GROUP BY distinct_id
10791079
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
10801080
GROUP BY session_id
1081-
HAVING 1=1
1081+
HAVING s.first_url is not null
10821082
ORDER BY start_time DESC
10831083
LIMIT 51
10841084
OFFSET 0
@@ -1108,7 +1108,7 @@
11081108
AND s.min_first_timestamp >= '2020-12-25 00:00:00'
11091109
AND s.min_first_timestamp <= '2021-01-01 13:46:23'
11101110
GROUP BY session_id
1111-
HAVING 1=1
1111+
HAVING s.first_url is not null
11121112
ORDER BY start_time DESC
11131113
LIMIT 51
11141114
OFFSET 0
@@ -1159,7 +1159,7 @@
11591159
GROUP BY distinct_id
11601160
HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
11611161
GROUP BY session_id
1162-
HAVING 1=1
1162+
HAVING s.first_url is not null
11631163
ORDER BY start_time DESC
11641164
LIMIT 51
11651165
OFFSET 0
@@ -1204,7 +1204,7 @@
12041204
HAVING argMax(is_deleted, version) = 0
12051205
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
12061206
GROUP BY session_id
1207-
HAVING 1=1
1207+
HAVING s.first_url is not null
12081208
ORDER BY start_time DESC
12091209
LIMIT 51
12101210
OFFSET 0
@@ -1249,7 +1249,7 @@
12491249
HAVING argMax(is_deleted, version) = 0
12501250
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
12511251
GROUP BY session_id
1252-
HAVING 1=1
1252+
HAVING s.first_url is not null
12531253
ORDER BY start_time DESC
12541254
LIMIT 51
12551255
OFFSET 0
@@ -1294,7 +1294,7 @@
12941294
HAVING argMax(is_deleted, version) = 0
12951295
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
12961296
GROUP BY session_id
1297-
HAVING 1=1
1297+
HAVING s.first_url is not null
12981298
ORDER BY start_time DESC
12991299
LIMIT 51
13001300
OFFSET 0
@@ -1339,7 +1339,7 @@
13391339
HAVING argMax(is_deleted, version) = 0
13401340
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
13411341
GROUP BY session_id
1342-
HAVING 1=1
1342+
HAVING s.first_url is not null
13431343
ORDER BY start_time DESC
13441344
LIMIT 51
13451345
OFFSET 0
@@ -1384,7 +1384,7 @@
13841384
HAVING argMax(is_deleted, version) = 0
13851385
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
13861386
GROUP BY session_id
1387-
HAVING 1=1
1387+
HAVING s.first_url is not null
13881388
ORDER BY start_time DESC
13891389
LIMIT 51
13901390
OFFSET 0
@@ -1429,7 +1429,7 @@
14291429
HAVING argMax(is_deleted, version) = 0
14301430
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
14311431
GROUP BY session_id
1432-
HAVING 1=1
1432+
HAVING s.first_url is not null
14331433
ORDER BY start_time DESC
14341434
LIMIT 51
14351435
OFFSET 0
@@ -1474,7 +1474,7 @@
14741474
HAVING argMax(is_deleted, version) = 0
14751475
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
14761476
GROUP BY session_id
1477-
HAVING 1=1
1477+
HAVING s.first_url is not null
14781478
ORDER BY start_time DESC
14791479
LIMIT 51
14801480
OFFSET 0
@@ -1519,7 +1519,7 @@
15191519
HAVING argMax(is_deleted, version) = 0
15201520
AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
15211521
GROUP BY session_id
1522-
HAVING 1=1
1522+
HAVING s.first_url is not null
15231523
ORDER BY start_time DESC
15241524
LIMIT 51
15251525
OFFSET 0
@@ -1562,7 +1562,7 @@
15621562
GROUP BY `$session_id`
15631563
HAVING 1=1) as session_events_sub_query)
15641564
GROUP BY session_id
1565-
HAVING 1=1
1565+
HAVING s.first_url is not null
15661566
ORDER BY start_time DESC
15671567
LIMIT 51
15681568
OFFSET 0
@@ -1605,7 +1605,7 @@
16051605
GROUP BY `$session_id`
16061606
HAVING 1=1) as session_events_sub_query)
16071607
GROUP BY session_id
1608-
HAVING 1=1
1608+
HAVING s.first_url is not null
16091609
ORDER BY start_time DESC
16101610
LIMIT 51
16111611
OFFSET 0
@@ -1648,7 +1648,7 @@
16481648
GROUP BY `$session_id`
16491649
HAVING 1=1) as session_events_sub_query)
16501650
GROUP BY session_id
1651-
HAVING 1=1
1651+
HAVING s.first_url is not null
16521652
ORDER BY start_time DESC
16531653
LIMIT 51
16541654
OFFSET 0
@@ -1691,7 +1691,7 @@
16911691
GROUP BY `$session_id`
16921692
HAVING 1=1) as session_events_sub_query)
16931693
GROUP BY session_id
1694-
HAVING 1=1
1694+
HAVING s.first_url is not null
16951695
ORDER BY start_time DESC
16961696
LIMIT 51
16971697
OFFSET 0

‎frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--dark.png

651 Bytes
Loading

‎frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown--light.png

622 Bytes
Loading

‎frontend/__snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png

-1.95 KB
Loading

‎frontend/__snapshots__/scenes-app-insights--trends-line-edit--dark.png

-952 Bytes
Loading

‎frontend/__snapshots__/scenes-app-insights--user-paths-edit--light.png

-400 Bytes
Loading

‎frontend/src/lib/components/ActivityLog/activityLogLogic.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
} from 'lib/components/ActivityLog/humanizeActivity'
1212
import { ACTIVITY_PAGE_SIZE } from 'lib/constants'
1313
import { PaginationManual } from 'lib/lemon-ui/PaginationControl'
14+
import { cohortActivityDescriber } from 'scenes/cohorts/activityDescriptions'
1415
import { dataManagementActivityDescriber } from 'scenes/data-management/dataManagementDescribers'
1516
import { flagActivityDescriber } from 'scenes/feature-flags/activityDescriptions'
1617
import { notebookActivityDescriber } from 'scenes/notebooks/Notebook/notebookActivityDescriber'
@@ -36,6 +37,8 @@ export const describerFor = (logItem?: ActivityLogItem): Describer | undefined =
3637
case ActivityScope.PLUGIN:
3738
case ActivityScope.PLUGIN_CONFIG:
3839
return pluginActivityDescriber
40+
case ActivityScope.COHORT:
41+
return cohortActivityDescriber
3942
case ActivityScope.INSIGHT:
4043
return insightActivityDescriber
4144
case ActivityScope.PERSON:

0 commit comments

Comments
 (0)