Merge branch 'master' into feat/annotations-in-data-management

# Conflicts:
#	frontend/__snapshots__/scenes-app-insights--trends-line-edit.png

ee/clickhouse/models/test/test_filters.py

@@ -610,6 +610,42 @@ def test_numerical(self):
         events = _filter_events(filter, self.team)
         self.assertEqual(events[0]["id"], event1_uuid)
 
+    def test_numerical_person_properties(self):
+        _create_person(team_id=self.team.pk, distinct_ids=["p1"], properties={"$a_number": 4})
+        _create_person(team_id=self.team.pk, distinct_ids=["p2"], properties={"$a_number": 5})
+        _create_person(team_id=self.team.pk, distinct_ids=["p3"], properties={"$a_number": 6})
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": 4,
+                        "operator": "gt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(_filter_persons(filter, self.team)), 2)
+
+        filter = Filter(data={"properties": [{"type": "person", "key": "$a_number", "value": 5}]})
+        self.assertEqual(len(_filter_persons(filter, self.team)), 1)
+
+        filter = Filter(
+            data={
+                "properties": [
+                    {
+                        "type": "person",
+                        "key": "$a_number",
+                        "value": 6,
+                        "operator": "lt",
+                    }
+                ]
+            }
+        )
+        self.assertEqual(len(_filter_persons(filter, self.team)), 2)
+
     def test_contains(self):
         _create_event(team=self.team, distinct_id="test", event="$pageview")
         event2_uuid = _create_event(

frontend/src/exporter/Exporter.stories.tsx

@@ -40,6 +40,14 @@ const Template: StoryFn<typeof Exporter> = (props) => {
 export const TrendsLineInsight: Story = Template.bind({})
 TrendsLineInsight.args = { insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLine.json') }
 
+export const TrendsLineMultiInsight: Story = Template.bind({})
+TrendsLineMultiInsight.args = {
+    insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'),
+}
+TrendsLineMultiInsight.parameters = {
+    mockDate: '2023-07-10',
+}
+
 export const TrendsLineBreakdownInsight: Story = Template.bind({})
 TrendsLineBreakdownInsight.args = {
     insight: require('../mocks/fixtures/api/projects/team_id/insights/trendsLineBreakdown.json'),

frontend/src/layout/navigation/navigationLogic.ts

@@ -8,7 +8,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
 import type { navigationLogicType } from './navigationLogicType'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { Scene } from 'scenes/sceneTypes'
 

frontend/src/lib/components/ActivationSidebar/activationLogic.test.ts

@@ -1,6 +1,6 @@
 import { expectLogic } from 'kea-test-utils'
 import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { navigationLogic } from '~/layout/navigation/navigationLogic'

frontend/src/lib/components/ActivationSidebar/activationLogic.ts

@@ -4,7 +4,7 @@ import { router, urlToAction } from 'kea-router'
 import api from 'lib/api'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { inviteLogic } from 'scenes/organization/Settings/inviteLogic'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
 import { teamLogic } from 'scenes/teamLogic'
 import { navigationLogic } from '~/layout/navigation/navigationLogic'

frontend/src/lib/components/Cards/InsightCard/InsightCard.stories.tsx

@@ -4,6 +4,7 @@ import { ChartDisplayType, InsightColor, InsightModel, InsightShortId, TrendsFil
 import { InsightCard as InsightCardComponent } from './index'
 
 import EXAMPLE_TRENDS from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsLine.json'
+import EXAMPLE_TRENDS_MULTI from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsLineMulti.json'
 import EXAMPLE_TRENDS_HORIZONTAL_BAR from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsValue.json'
 import EXAMPLE_TRENDS_TABLE from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsTable.json'
 import EXAMPLE_TRENDS_PIE from '../../../../mocks/fixtures/api/projects/team_id/insights/trendsPie.json'
@@ -18,6 +19,7 @@ import EXAMPLE_DATA_TABLE_NODE_EVENTS_QUERY from '../../../../mocks/fixtures/api
 
 const examples = [
     EXAMPLE_TRENDS,
+    EXAMPLE_TRENDS_MULTI,
     EXAMPLE_TRENDS_HORIZONTAL_BAR,
     EXAMPLE_TRENDS_TABLE,
     EXAMPLE_TRENDS_PIE,

frontend/src/lib/components/DefinitionPopover/DefinitionPopover.tsx

@@ -8,7 +8,7 @@ import { KeyMapping, UserBasicType, PropertyDefinition } from '~/types'
 import { Owner } from 'scenes/events/Owner'
 import { dayjs } from 'lib/dayjs'
 import { Divider, DividerProps, Select } from 'antd'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { Link } from 'lib/lemon-ui/Link'
 import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'

frontend/src/lib/components/Subscriptions/views/EditSubscription.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from 'react'
 import { useActions, useValues } from 'kea'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { membersLogic } from 'scenes/organization/Settings/membersLogic'
+import { membersLogic } from 'scenes/organization/membersLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { Field } from 'lib/forms/Field'
 import { dayjs } from 'lib/dayjs'

frontend/src/mocks/fixtures/api/projects/team_id/insights/trendsLine.json

@@ -4,37 +4,22 @@
     "name": "",
     "derived_name": "Pageview count",
     "filters": {
+        "display": "ActionsLineGraph",
         "events": [
             {
                 "id": "$pageview",
-                "name": "$pageview",
-                "type": "events",
-                "order": 0
-            },
-            {
-                "id": "$geoip_country_name",
-                "name": "$geoip_country_name",
                 "type": "events",
-                "order": 0
+                "order": 0,
+                "name": "$pageview",
+                "custom_name": null,
+                "math": null,
+                "math_property": null,
+                "math_group_type_index": null,
+                "properties": {}
             }
         ],
-        "actions": [],
-        "display": "ActionsLineGraph",
         "insight": "TRENDS",
-        "interval": "day",
-        "properties": {
-            "type": "AND",
-            "values": [
-                {
-                    "type": "AND",
-                    "values": [
-                        { "key": "$browser", "value": ["Chrome"], "operator": "exact", "type": "event" },
-                        { "key": "utm_source", "value": ["google"], "operator": "exact", "type": "event" }
-                    ]
-                }
-            ]
-        },
-        "filter_test_accounts": false
+        "interval": "day"
     },
     "filters_hash": "cache_42127776c1709f7c4209cea8925faefd",
     "order": null,
@@ -163,8 +148,6 @@
                 }
             ],
             "filter": {
-                "date_from": "2022-03-04T00:00:00+00:00",
-                "date_to": "2022-03-11T01:44:36.488058+00:00",
                 "display": "ActionsLineGraph",
                 "events": [
                     {