Fix support for dashboard filters on insights with global filters

PostHog · Apr 25, 2024 · 5ac1bcf · 5ac1bcf
1 parent 29b55e9
commit 5ac1bcf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/posthog/api/test/test_insight.py b/posthog/api/test/test_insight.py
@@ -1246,12 +1246,13 @@ def test_insight_refreshing_query(self, spy_execute_hogql_query) -> None:
 
         #  Test property filter
 
-        dashboard = Dashboard.objects.get(pk=dashboard_id)
-        dashboard.filters = {
-            "properties": [{"key": "prop", "value": "val"}],
-            "date_from": "-14d",
-        }
-        dashboard.save()
+        Dashboard.objects.update(
+            id=dashboard_id,
+            filters={
+                "properties": [{"key": "prop", "value": "val"}],
+                "date_from": "-14d",
+            },
+        )
         with freeze_time("2012-01-16T05:01:34.000Z"):
             response = self.client.get(
                 f"/api/projects/{self.team.id}/insights/{insight_id}/?refresh=true&from_dashboard={dashboard_id}"

diff --git a/posthog/hogql_queries/query_runner.py b/posthog/hogql_queries/query_runner.py
@@ -25,6 +25,7 @@
     FunnelCorrelationQuery,
     FunnelsActorsQuery,
     PropertyGroupFilter,
+    PropertyGroupFilterValue,
     TrendsQuery,
     FunnelsQuery,
     RetentionQuery,
@@ -429,7 +430,13 @@ def apply_dashboard_filters(self, dashboard_filter: DashboardFilter) -> Q:
             if dashboard_filter.properties:
                 if self.query.properties:
                     query_update["properties"] = PropertyGroupFilter(
-                        type=FilterLogicalOperator.AND, values=[self.query.properties, dashboard_filter.properties]
+                        type=FilterLogicalOperator.AND,
+                        values=[
+                            PropertyGroupFilterValue(type=FilterLogicalOperator.AND, values=self.query.properties),
+                            PropertyGroupFilterValue(
+                                type=FilterLogicalOperator.AND, values=dashboard_filter.properties
+                            ),
+                        ],
                     )
                 else:
                     query_update["properties"] = dashboard_filter.properties