Kinda sorta working

posthog/hogql_queries/apply_dashboard_filters.py

@@ -1,29 +1,21 @@
-from posthog.schema import HogQLQuery, DashboardFilter, HogQLFilters, DateRange
+from posthog.models import Team
+from posthog.schema import DashboardFilter
 
 
 # Apply the filters from the django-style Dashboard object
-def apply_dashboard_filters(query: dict, filters: dict) -> dict:
+def apply_dashboard_filters(query: dict, filters: dict, team: Team) -> dict:
     kind = query.get("kind", None)
 
     if kind == "DataTableNode":
-        source = apply_dashboard_filters(query["source"], filters)
+        source = apply_dashboard_filters(query["source"], filters, team)
         return {**query, "source": source}
 
     dashboard_filter = DashboardFilter(**filters)
 
     if kind == "HogQLQuery":
-        node = HogQLQuery(**query)
+        from posthog.hogql_queries.hogql_query_runner import HogQLQueryRunner
 
-        hogql_filters = node.filters or HogQLFilters()
-        date_range = hogql_filters.dateRange or DateRange()
-        node.filters = hogql_filters
-        hogql_filters.dateRange = date_range
-
-        if dashboard_filter.date_to:
-            date_range.date_to = dashboard_filter.date_to
-        if dashboard_filter.date_from:
-            date_range.date_from = dashboard_filter.date_from
-
-        return node.dict()
+        query_runner = HogQLQueryRunner(query, team)
+        return query_runner.apply_dashboard_filters(dashboard_filter).dict()
     else:
         return query

posthog/hogql_queries/hogql_query_runner.py

@@ -10,7 +10,7 @@
 from posthog.hogql.timings import HogQLTimings
 from posthog.hogql_queries.query_runner import QueryRunner
 from posthog.models import Team
-from posthog.schema import HogQLQuery, HogQLQueryResponse
+from posthog.schema import HogQLQuery, HogQLQueryResponse, DashboardFilter, HogQLFilters, DateRange
 
 
 class HogQLQueryRunner(QueryRunner):
@@ -66,3 +66,13 @@ def _is_stale(self, cached_result_package):
 
     def _refresh_frequency(self):
         return timedelta(minutes=1)
+
+    def apply_dashboard_filters(self, dashboard_filter: DashboardFilter) -> HogQLQuery:
+        self.query.filters = self.query.filters or HogQLFilters()
+        self.query.filters.dateRange = self.query.filters.dateRange or DateRange()
+
+        if dashboard_filter.date_to or dashboard_filter.date_from:
+            self.query.filters.dateRange.date_to = dashboard_filter.date_to
+            self.query.filters.dateRange.date_from = dashboard_filter.date_from
+
+        return self.query

posthog/models/insight.py

@@ -7,7 +7,6 @@
 from django_deprecate_fields import deprecate_field
 from rest_framework.exceptions import ValidationError
 
-from posthog.hogql_queries.apply_dashboard_filters import apply_dashboard_filters
 from posthog.logging.timing import timed
 from posthog.models.dashboard import Dashboard
 from posthog.models.filters.utils import get_filter
@@ -158,8 +157,9 @@ def dashboard_filters(self, dashboard: Optional[Dashboard] = None):
     def dashboard_query(self, dashboard: Optional[Dashboard]):
         if not dashboard or not self.query:
             return self.query
+        from posthog.hogql_queries.apply_dashboard_filters import apply_dashboard_filters
 
-        return apply_dashboard_filters(self.query, dashboard.filters)
+        return apply_dashboard_filters(self.query, dashboard.filters, self.team)
 
     @property
     def url(self):
@@ -181,8 +181,9 @@ class Meta:
 def generate_insight_cache_key(insight: Insight, dashboard: Optional[Dashboard]) -> str:
     try:
         if insight.query is not None:
-            # TODO: dashboard filtering needs to know how to override queries and date ranges 😱
-            q = insight.query
+            from posthog.hogql_queries.apply_dashboard_filters import apply_dashboard_filters
+
+            q = apply_dashboard_filters(insight.query, dashboard.filters, insight.team)
             if q.get("source"):
                 q = q["source"]