include global properties

PostHog · Sep 4, 2024 · 7a3a4bd · 7a3a4bd
1 parent b2bede5
commit 7a3a4bd
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/frontend/src/scenes/pipeline/hogfunctions/hogFunctionConfigurationLogic.tsx b/frontend/src/scenes/pipeline/hogfunctions/hogFunctionConfigurationLogic.tsx
@@ -36,6 +36,7 @@ import {
     PipelineTab,
     PropertyFilterType,
     PropertyGroupFilter,
+    PropertyGroupFilterValue,
 } from '~/types'
 
 import { EmailTemplate } from './email-templater/emailTemplaterLogic'
@@ -448,10 +449,14 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         sparklineQuery: [
             (s) => [s.configuration],
             (configuration): TrendsQuery => {
-                const properties: PropertyGroupFilter = {
+                const seriesProperties: PropertyGroupFilterValue = {
                     type: FilterLogicalOperator.Or,
                     values: [],
                 }
+                const properties: PropertyGroupFilter = {
+                    type: FilterLogicalOperator.And,
+                    values: [seriesProperties],
+                }
                 for (const event of configuration.filters?.events ?? []) {
                     const eventProperties: AnyPropertyFilter[] = [...(event.properties ?? [])]
                     if (event.id) {
@@ -466,7 +471,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
                             key: 'true',
                         })
                     }
-                    properties.values.push({
+                    seriesProperties.values.push({
                         type: FilterLogicalOperator.And,
                         values: eventProperties,
                     })
@@ -479,11 +484,21 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
                             key: hogql`matchesAction(${parseInt(action.id)})`,
                         })
                     }
-                    properties.values.push({
+                    seriesProperties.values.push({
                         type: FilterLogicalOperator.And,
                         values: actionProperties,
                     })
                 }
+                if ((configuration.filters?.properties?.length ?? 0) > 0) {
+                    const globalProperties: PropertyGroupFilterValue = {
+                        type: FilterLogicalOperator.And,
+                        values: [],
+                    }
+                    for (const property of configuration.filters?.properties ?? []) {
+                        globalProperties.values.push(property as AnyPropertyFilter)
+                    }
+                    properties.values.push(globalProperties)
+                }
 
                 return {
                     kind: NodeKind.TrendsQuery,