feat(web-analytics): Allow other session properties beyond $session_d…

…uration (#21515) * Allow other session properties beyond $session_duration * Remove empty properties
PostHog · Apr 15, 2024 · fc4719d · fc4719d
1 parent d83d5eb
commit fc4719d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -4931,7 +4931,6 @@
             "additionalProperties": false,
             "properties": {
                 "key": {
-                    "const": "$session_duration",
                     "type": "string"
                 },
                 "label": {

diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -694,7 +694,6 @@ export interface ElementPropertyFilter extends BasePropertyFilter {
 
 export interface SessionPropertyFilter extends BasePropertyFilter {
     type: PropertyFilterType.Session
-    key: '$session_duration'
     operator: PropertyOperator
 }
 

diff --git a/posthog/hogql_queries/legacy_compatibility/clean_properties.py b/posthog/hogql_queries/legacy_compatibility/clean_properties.py
@@ -60,7 +60,8 @@ def clean_property_group_filter(properties: dict):
 
 
 def clean_property_group_filter_values(properties: list[dict]):
-    return [clean_property_group_filter_value(property) for property in properties]
+    cleaned = [clean_property_group_filter_value(property) for property in properties if property]
+    return cleaned
 
 
 def clean_property_group_filter_value(property: dict):

diff --git a/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py b/posthog/hogql_queries/legacy_compatibility/test/test_filter_to_query.py
@@ -1230,7 +1230,7 @@ def test_series_properties(self):
                 EventsNode(
                     event="$pageview",
                     name="$pageview",
-                    properties=[SessionPropertyFilter(value=1, operator=PropertyOperator.gt)],
+                    properties=[SessionPropertyFilter(key="$session_duration", value=1, operator=PropertyOperator.gt)],
                 ),
                 EventsNode(
                     event="$pageview",

diff --git a/posthog/schema.py b/posthog/schema.py
@@ -818,7 +818,7 @@ class SessionPropertyFilter(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
-    key: Literal["$session_duration"] = "$session_duration"
+    key: str
     label: Optional[str] = None
     operator: PropertyOperator
     type: Literal["session"] = "session"