Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add new CDP sources such as activity log and alerts #25141

Closed
wants to merge 16 commits into from
Closed

feat: Add new CDP sources such as activity log and alerts #25141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7144940
Added rewrite rule for activity log
benjackwhite Sep 23, 2024
b50580b
Added tests
benjackwhite Sep 23, 2024
49523e6
Added config for other sources
benjackwhite Sep 23, 2024
3f104f4
Update UI snapshots for `chromium` (1)
github-actions[bot] Sep 23, 2024
4db5a48
Update UI snapshots for `chromium` (2)
github-actions[bot] Sep 23, 2024
50ad747
Update UI snapshots for `chromium` (1)
github-actions[bot] Sep 23, 2024
6121bb6
Added more source filters
benjackwhite Sep 24, 2024
e66db0f
Merge branch 'master' into feat/cdp-other-sources
benjackwhite Sep 24, 2024
e9b5894
Fixes
benjackwhite Sep 24, 2024
58c80f7
Update UI snapshots for `chromium` (2)
github-actions[bot] Sep 24, 2024
f056d09
Update UI snapshots for `chromium` (2)
github-actions[bot] Sep 24, 2024
5656524
Fixes
benjackwhite Sep 24, 2024
dba18f9
Merge branch 'feat/cdp-other-sources' of github.com:PostHog/posthog i…
benjackwhite Sep 24, 2024
236f657
Update UI snapshots for `chromium` (1)
github-actions[bot] Sep 24, 2024
21e28f2
Update UI snapshots for `chromium` (1)
github-actions[bot] Sep 24, 2024
95a91bc
Merge branch 'master' into feat/cdp-other-sources
benjackwhite Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 39 additions & 37 deletions frontend/src/scenes/pipeline/hogfunctions/HogFunctionConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,43 +262,45 @@ export function HogFunctionConfiguration({ templateId, id }: { templateId?: stri

<HogFunctionFilters />

<div className="relative border bg-bg-light rounded p-3 space-y-2">
<LemonLabel>Expected volume</LemonLabel>
{sparkline && !sparklineLoading ? (
<>
{sparkline.count > EVENT_THRESHOLD_ALERT_LEVEL ? (
<LemonBanner type="warning">
<b>Warning:</b> This destination would have triggered{' '}
<strong>
{sparkline.count ?? 0} time{sparkline.count !== 1 ? 's' : ''}
</strong>{' '}
in the last 7 days. Consider the impact of this function on your
destination.
</LemonBanner>
) : (
<p>
This destination would have triggered{' '}
<strong>
{sparkline.count ?? 0} time{sparkline.count !== 1 ? 's' : ''}
</strong>{' '}
in the last 7 days.
</p>
)}
<Sparkline
type="bar"
className="w-full h-20"
data={sparkline.data}
labels={sparkline.labels}
/>
</>
) : sparklineLoading ? (
<div className="min-h-20">
<SpinnerOverlay />
</div>
) : (
<p>The expected volume could not be calculated</p>
)}
</div>
{configuration.trigger === 'event' && (
<div className="relative border bg-bg-light rounded p-3 space-y-2">
<LemonLabel>Expected volume</LemonLabel>
{sparkline && !sparklineLoading ? (
<>
{sparkline.count > EVENT_THRESHOLD_ALERT_LEVEL ? (
<LemonBanner type="warning">
<b>Warning:</b> This destination would have triggered{' '}
<strong>
{sparkline.count ?? 0} time{sparkline.count !== 1 ? 's' : ''}
</strong>{' '}
in the last 7 days. Consider the impact of this function on your
destination.
</LemonBanner>
) : (
<p>
This destination would have triggered{' '}
<strong>
{sparkline.count ?? 0} time{sparkline.count !== 1 ? 's' : ''}
</strong>{' '}
in the last 7 days.
</p>
)}
<Sparkline
type="bar"
className="w-full h-20"
data={sparkline.data}
labels={sparkline.labels}
/>
</>
) : sparklineLoading ? (
<div className="min-h-20">
<SpinnerOverlay />
</div>
) : (
<p>The expected volume could not be calculated</p>
)}
</div>
)}
</div>

<div className="flex-2 min-w-100 space-y-4">
Expand Down
267 changes: 55 additions & 212 deletions frontend/src/scenes/pipeline/hogfunctions/filters/HogFunctionFilters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,228 +1,71 @@
import { LemonLabel, LemonSelect } from '@posthog/lemon-ui'
import { id } from 'chartjs-plugin-trendline'
import { LemonSelect } from '@posthog/lemon-ui'
import { useValues } from 'kea'
import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { ActionFilter } from 'scenes/insights/filters/ActionFilter/ActionFilter'
import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/ActionFilterRow'

import { groupsModel } from '~/models/groupsModel'
import { AnyPropertyFilter, EntityTypes, FilterType, HogFunctionFiltersType } from '~/types'

import { hogFunctionConfigurationLogic } from '../hogFunctionConfigurationLogic'

function sanitizeActionFilters(filters?: FilterType): Partial<HogFunctionFiltersType> {
if (!filters) {
return {}
}
const sanitized: HogFunctionFiltersType = {}

if (filters.events) {
sanitized.events = filters.events.map((f) => ({
id: f.id,
type: 'events',
name: f.name,
order: f.order,
properties: f.properties,
}))
}

if (filters.actions) {
sanitized.actions = filters.actions.map((f) => ({
id: f.id,
type: 'actions',
name: f.name,
order: f.order,
properties: f.properties,
}))
}

return sanitized
}
import { HogFunctionFiltersActivityLog } from './HogFunctionFiltersActivityLog'
import { HogFunctionFiltersAlerts } from './HogFunctionFiltersAlerts'
import { HogFunctionFiltersEvents } from './HogFunctionFiltersEvents'

export function HogFunctionFilters(): JSX.Element {
const { groupsTaxonomicTypes } = useValues(groupsModel)
const { configuration } = useValues(hogFunctionConfigurationLogic)

return (
<div className="border bg-bg-light rounded p-3 space-y-2">
<LemonField name="filters" label="Filters">
{({ value, onChange }) => (
<>
<TestAccountFilterSwitch
checked={value?.filter_test_accounts ?? false}
onChange={(filter_test_accounts) => onChange({ ...value, filter_test_accounts })}
fullWidth
/>
<PropertyFilters
propertyFilters={value?.properties ?? []}
taxonomicGroupTypes={[
TaxonomicFilterGroupType.EventProperties,
TaxonomicFilterGroupType.PersonProperties,
TaxonomicFilterGroupType.EventFeatureFlags,
TaxonomicFilterGroupType.Elements,
TaxonomicFilterGroupType.HogQLExpression,
]}
onChange={(properties: AnyPropertyFilter[]) => {
onChange({
...value,
properties,
})
}}
pageKey={`HogFunctionPropertyFilters.${id}`}
/>

<LemonLabel>Match event and actions</LemonLabel>
<p className="mb-0 text-muted-alt text-xs">
If set, the destination will only run if the <b>event matches any</b> of the below.
</p>
<ActionFilter
bordered
filters={value ?? {}}
setFilters={(payload) => {
onChange({
...value,
...sanitizeActionFilters(payload),
})
}}
typeKey="plugin-filters"
mathAvailability={MathAvailability.None}
hideRename
hideDuplicate
showNestedArrow={false}
actionsTaxonomicGroupTypes={[
TaxonomicFilterGroupType.Events,
TaxonomicFilterGroupType.Actions,
]}
propertiesTaxonomicGroupTypes={[
TaxonomicFilterGroupType.EventProperties,
TaxonomicFilterGroupType.EventFeatureFlags,
TaxonomicFilterGroupType.Elements,
TaxonomicFilterGroupType.PersonProperties,
TaxonomicFilterGroupType.HogQLExpression,
...groupsTaxonomicTypes,
]}
propertyFiltersPopover
addFilterDefaultOptions={{
id: '$pageview',
name: '$pageview',
type: EntityTypes.EVENTS,
}}
buttonCopy="Add event matcher"
/>
</>
)}
</LemonField>

<LemonField name="masking" label="Trigger options">
{({ value, onChange }) => (
<div className="flex items-center gap-1 flex-wrap">
<LemonSelect
options={[
{
value: null,
label: 'Run every time',
},
{
value: 'all',
label: 'Run once per interval',
},
{
value: '{person.uuid}',
label: 'Run once per person per interval',
},
]}
value={value?.hash ?? null}
onChange={(val) =>
onChange({
hash: val,
ttl: value?.ttl ?? 60 * 30,
})
}
/>
{configuration.masking?.hash ? (
<>
<div className="flex items-center gap-1 flex-wrap">
<span>of</span>
<LemonSelect
value={value?.ttl}
onChange={(val) => onChange({ ...value, ttl: val })}
options={[
{
value: 5 * 60,
label: '5 minutes',
},
{
value: 15 * 60,
label: '15 minutes',
},
{
value: 30 * 60,
label: '30 minutes',
},
{
value: 60 * 60,
label: '1 hour',
},
{
value: 2 * 60 * 60,
label: '2 hours',
},
{
value: 4 * 60 * 60,
label: '4 hours',
},
{
value: 8 * 60 * 60,
label: '8 hours',
},
{
value: 12 * 60 * 60,
label: '12 hours',
},
{
value: 24 * 60 * 60,
label: '24 hours',
},
]}
/>
<LemonField name="trigger" label="Trigger source">
<LemonSelect
options={[
{
value: 'event',
label: 'Events',
labelInMenu: (
<div>
Events
<br />
<span className="text-xs text-muted-alt">Incoming real-time PostHog events</span>
</div>
<div className="flex items-center gap-1 flex-wrap">
<span>or until</span>
<LemonSelect
value={value?.threshold}
onChange={(val) => onChange({ ...value, threshold: val })}
options={[
{
value: null,
label: 'Not set',
},
{
value: 1000,
label: '1000 events',
},
{
value: 10000,
label: '10,000 events',
},
{
value: 100000,
label: '100,000 events',
},
{
value: 1000000,
label: '1,000,000 events',
},
]}
/>
),
},
{
value: 'activity_log',
label: 'Team activity',
labelInMenu: (
<div>
Team activity
<br />
<span className="text-xs text-muted-alt">
Changes in PostHog such as an Insight being created
</span>
</div>
</>
) : null}
</div>
)}
),
},
{
value: 'alert',
label: 'Alerts',
labelInMenu: (
<div>
Alerts
<br />
<span className="text-xs text-muted-alt">
React to alerts created in PostHog such as for an Insight threshold being
reached
</span>
</div>
),
},
]}
/>
</LemonField>

{configuration.trigger === 'event' ? (
<HogFunctionFiltersEvents />
) : configuration.trigger === 'alert' ? (
<HogFunctionFiltersAlerts />
) : configuration.trigger === 'activity_log' ? (
<HogFunctionFiltersActivityLog />
) : (
<span>Something went wrong...</span>
)}
</div>
)
}
Loading
Loading