Add support for properties

PostHog · Oct 19, 2023 · d426451 · d426451
1 parent 3de112b
commit d426451
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 7 deletions.
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -330,6 +330,19 @@
                 },
                 "date_to": {
                     "type": ["string", "null"]
+                },
+                "properties": {
+                    "anyOf": [
+                        {
+                            "items": {
+                                "$ref": "#/definitions/AnyPropertyFilter"
+                            },
+                            "type": "array"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ]
                 }
             },
             "type": "object"

diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
@@ -703,5 +703,6 @@ export interface BreakdownFilter {
 export interface DashboardFilter {
     date_from?: string | null
     date_to?: string | null
+    properties?: AnyPropertyFilter[] | null
     [s: string]: any
 }
diff --git a/frontend/src/scenes/dashboard/dashboardLogic.test.ts b/frontend/src/scenes/dashboard/dashboardLogic.test.ts
@@ -10,7 +10,6 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import {
     DashboardTile,
     DashboardType,
-    FilterType,
     InsightColor,
     InsightModel,
     InsightShortId,
@@ -24,6 +23,7 @@ import { dayjs, now } from 'lib/dayjs'
 import { teamLogic } from 'scenes/teamLogic'
 import { MOCK_TEAM_ID } from 'lib/api.mock'
 import api from 'lib/api'
+import { DashboardFilter } from '~/queries/schema'
 
 const dashboardJson = _dashboardJson as any as DashboardType
 
@@ -63,7 +63,7 @@ export const tileFromInsight = (insight: InsightModel, id: number = tileId++): D
 export const dashboardResult = (
     dashboardId: number,
     tiles: DashboardTile[],
-    filters: Partial<Pick<FilterType, 'date_from' | 'date_to' | 'properties'>> = {}
+    filters: Partial<DashboardFilter> = {}
 ): DashboardType => {
     return {
         ...dashboardJson,

diff --git a/posthog/hogql_queries/hogql_query_runner.py b/posthog/hogql_queries/hogql_query_runner.py
@@ -75,4 +75,7 @@ def apply_dashboard_filters(self, dashboard_filter: DashboardFilter) -> HogQLQue
             self.query.filters.dateRange.date_to = dashboard_filter.date_to
             self.query.filters.dateRange.date_from = dashboard_filter.date_from
 
+        if dashboard_filter.properties:
+            self.query.filters.properties = (self.query.filters.properties or []) + dashboard_filter.properties
+
         return self.query
diff --git a/posthog/schema.py b/posthog/schema.py
@@ -86,11 +86,6 @@ class CountPerActorMathType(str, Enum):
     p99_count_per_actor = "p99_count_per_actor"
 
 
-class DashboardFilter(BaseModel):
-    date_from: Optional[str] = None
-    date_to: Optional[str] = None
-
-
 class DatabaseSchemaQueryResponseField(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
@@ -951,6 +946,27 @@ class AnyResponseType(RootModel):
     ]
 
 
+class DashboardFilter(BaseModel):
+    date_from: Optional[str] = None
+    date_to: Optional[str] = None
+    properties: Optional[
+        List[
+            Union[
+                EventPropertyFilter,
+                PersonPropertyFilter,
+                ElementPropertyFilter,
+                SessionPropertyFilter,
+                CohortPropertyFilter,
+                RecordingDurationFilter,
+                GroupPropertyFilter,
+                FeaturePropertyFilter,
+                HogQLPropertyFilter,
+                EmptyPropertyFilter,
+            ]
+        ]
+    ] = None
+
+
 class DatabaseSchemaQuery(BaseModel):
     model_config = ConfigDict(
         extra="forbid",