diff --git a/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/nuxt.tsx b/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/nuxt.tsx
index e57a46e534d61..baa4947ad4950 100644
--- a/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/nuxt.tsx
+++ b/frontend/src/scenes/onboarding/sdks/sdk-install-instructions/nuxt.tsx
@@ -35,7 +35,7 @@ import posthog from 'posthog-js'
export default defineNuxtPlugin(nuxtApp => {
const runtimeConfig = useRuntimeConfig();
const posthogClient = posthog.init(runtimeConfig.public.posthogPublicKey, {
- api_host: runtimeConfig.public.posthogHost',
+ api_host: runtimeConfig.public.posthogHost,
${
isPersonProfilesDisabled
? ``
diff --git a/frontend/src/scenes/pipeline/Destinations.tsx b/frontend/src/scenes/pipeline/Destinations.tsx
index 61af57f3061c5..500111bdc5d1b 100644
--- a/frontend/src/scenes/pipeline/Destinations.tsx
+++ b/frontend/src/scenes/pipeline/Destinations.tsx
@@ -57,10 +57,14 @@ export function DestinationsTable({ inOverview = false }: { inOverview?: boolean
title: 'App',
width: 0,
render: function RenderAppInfo(_, destination) {
- if (destination.backend === 'plugin') {
- return
+ switch (destination.backend) {
+ case 'plugin':
+ return
+ case 'batch_export':
+ return
+ default:
+ return null
}
- return
},
},
{
diff --git a/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx b/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
index 61d09e36015c4..926469a85ffd6 100644
--- a/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
+++ b/frontend/src/scenes/pipeline/PipelineNodeConfiguration.tsx
@@ -1,6 +1,7 @@
import { useValues } from 'kea'
import { NotFound } from 'lib/components/NotFound'
+import { PipelineHogFunctionConfiguration } from './hogfunctions/PipelineHogFunctionConfiguration'
import { PipelineBatchExportConfiguration } from './PipelineBatchExportConfiguration'
import { pipelineNodeLogic } from './pipelineNodeLogic'
import { PipelinePluginConfiguration } from './PipelinePluginConfiguration'
@@ -15,7 +16,9 @@ export function PipelineNodeConfiguration(): JSX.Element {
return (
- {node.backend === PipelineBackend.Plugin ? (
+ {node.backend === PipelineBackend.HogFunction ? (
+
+ ) : node.backend === PipelineBackend.Plugin ? (
) : (
diff --git a/frontend/src/scenes/pipeline/PipelineNodeNew.tsx b/frontend/src/scenes/pipeline/PipelineNodeNew.tsx
index 30504da3fe51d..76eea7518a6b0 100644
--- a/frontend/src/scenes/pipeline/PipelineNodeNew.tsx
+++ b/frontend/src/scenes/pipeline/PipelineNodeNew.tsx
@@ -1,17 +1,20 @@
import { IconPlusSmall } from '@posthog/icons'
import { useValues } from 'kea'
+import { combineUrl, router } from 'kea-router'
import { NotFound } from 'lib/components/NotFound'
import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'
+import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { LemonTable } from 'lib/lemon-ui/LemonTable'
import { LemonTableLink } from 'lib/lemon-ui/LemonTable/LemonTableLink'
import { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
-import { AvailableFeature, BatchExportService, PipelineStage, PluginType } from '~/types'
+import { AvailableFeature, BatchExportService, HogFunctionTemplateType, PipelineStage, PluginType } from '~/types'
import { pipelineDestinationsLogic } from './destinationsLogic'
import { frontendAppsLogic } from './frontendAppsLogic'
+import { PipelineHogFunctionConfiguration } from './hogfunctions/PipelineHogFunctionConfiguration'
import { PipelineBatchExportConfiguration } from './PipelineBatchExportConfiguration'
import { PIPELINE_TAB_TO_NODE_STAGE } from './PipelineNode'
import { pipelineNodeNewLogic, PipelineNodeNewLogicProps } from './pipelineNodeNewLogic'
@@ -21,21 +24,20 @@ import { PipelineBackend } from './types'
import { getBatchExportUrl, RenderApp, RenderBatchExportIcon } from './utils'
const paramsToProps = ({
- params: { stage, pluginIdOrBatchExportDestination },
+ params: { stage, id },
}: {
- params: { stage?: string; pluginIdOrBatchExportDestination?: string }
+ params: { stage?: string; id?: string }
}): PipelineNodeNewLogicProps => {
- const numericId =
- pluginIdOrBatchExportDestination && /^\d+$/.test(pluginIdOrBatchExportDestination)
- ? parseInt(pluginIdOrBatchExportDestination)
- : undefined
+ const numericId = id && /^\d+$/.test(id) ? parseInt(id) : undefined
const pluginId = numericId && !isNaN(numericId) ? numericId : null
- const batchExportDestination = pluginId ? null : pluginIdOrBatchExportDestination ?? null
+ const hogFunctionId = pluginId ? null : id?.startsWith('hog-') ? id.slice(4) : null
+ const batchExportDestination = hogFunctionId ? null : id ?? null
return {
stage: PIPELINE_TAB_TO_NODE_STAGE[stage + 's'] || null, // pipeline tab has stage plural here we have singular
- pluginId: pluginId,
- batchExportDestination: batchExportDestination,
+ pluginId,
+ batchExportDestination,
+ hogFunctionId,
}
}
@@ -45,32 +47,22 @@ export const scene: SceneExport = {
paramsToProps,
}
-type PluginEntry = {
- backend: PipelineBackend.Plugin
- id: number
+type TableEntry = {
+ backend: PipelineBackend
+ id: string | number
name: string
description: string
- plugin: PluginType
url?: string
+ icon: JSX.Element
}
-type BatchExportEntry = {
- backend: PipelineBackend.BatchExport
- id: BatchExportService['type']
- name: string
- description: string
- url: string
-}
-
-type TableEntry = PluginEntry | BatchExportEntry
-
function convertPluginToTableEntry(plugin: PluginType): TableEntry {
return {
backend: PipelineBackend.Plugin,
id: plugin.id,
name: plugin.name,
description: plugin.description || '',
- plugin: plugin,
+ icon:
,
// TODO: ideally we'd link to docs instead of GitHub repo, so it can open in panel
// Same for transformations and destinations tables
url: plugin.url,
@@ -80,17 +72,26 @@ function convertPluginToTableEntry(plugin: PluginType): TableEntry {
function convertBatchExportToTableEntry(service: BatchExportService['type']): TableEntry {
return {
backend: PipelineBackend.BatchExport,
- id: service,
+ id: service as string,
name: service,
description: `${service} batch export`,
+ icon:
,
url: getBatchExportUrl(service),
}
}
-export function PipelineNodeNew(
- params: { stage?: string; pluginIdOrBatchExportDestination?: string } = {}
-): JSX.Element {
- const { stage, pluginId, batchExportDestination } = paramsToProps({ params })
+function convertHogFunctionToTableEntry(hogFunction: HogFunctionTemplateType): TableEntry {
+ return {
+ backend: PipelineBackend.HogFunction,
+ id: `hog-${hogFunction.id}`, // TODO: This weird identifier thing isn't great
+ name: hogFunction.name,
+ description: hogFunction.description,
+ icon:
🦔,
+ }
+}
+
+export function PipelineNodeNew(params: { stage?: string; id?: string } = {}): JSX.Element {
+ const { stage, pluginId, batchExportDestination, hogFunctionId } = paramsToProps({ params })
if (!stage) {
return
@@ -103,6 +104,7 @@ export function PipelineNodeNew(
}
return res
}
+
if (batchExportDestination) {
if (stage !== PipelineStage.Destination) {
return
@@ -114,6 +116,14 @@ export function PipelineNodeNew(
)
}
+ if (hogFunctionId) {
+ const res =
+ if (stage === PipelineStage.Destination) {
+ return
{res}
+ }
+ return res
+ }
+
if (stage === PipelineStage.Transformation) {
return
} else if (stage === PipelineStage.Destination) {
@@ -135,11 +145,15 @@ function TransformationOptionsTable(): JSX.Element {
}
function DestinationOptionsTable(): JSX.Element {
+ const hogFunctionsEnabled = !!useFeatureFlag('HOG_FUNCTIONS')
const { batchExportServiceNames } = useValues(pipelineNodeNewLogic)
- const { plugins, loading } = useValues(pipelineDestinationsLogic)
+ const { plugins, loading, hogFunctionTemplates } = useValues(pipelineDestinationsLogic)
const pluginTargets = Object.values(plugins).map(convertPluginToTableEntry)
const batchExportTargets = Object.values(batchExportServiceNames).map(convertBatchExportToTableEntry)
- const targets = [...batchExportTargets, ...pluginTargets]
+ const hogFunctionTargets = hogFunctionsEnabled
+ ? Object.values(hogFunctionTemplates).map(convertHogFunctionToTableEntry)
+ : []
+ const targets = [...batchExportTargets, ...pluginTargets, ...hogFunctionTargets]
return
}
@@ -158,6 +172,7 @@ function NodeOptionsTable({
targets: TableEntry[]
loading: boolean
}): JSX.Element {
+ const { hashParams } = useValues(router)
return (
<>
- }
- return
+ return target.icon
},
},
{
@@ -198,7 +210,8 @@ function NodeOptionsTable({
type="primary"
data-attr={`new-${stage}-${target.id}`}
icon={
}
- to={urls.pipelineNodeNew(stage, target.id)}
+ // Preserve hash params to pass config in
+ to={combineUrl(urls.pipelineNodeNew(stage, target.id), {}, hashParams).url}
>
Create
diff --git a/frontend/src/scenes/pipeline/destinationsLogic.tsx b/frontend/src/scenes/pipeline/destinationsLogic.tsx
index d50e6b5de5091..05d4e2ff1d1e6 100644
--- a/frontend/src/scenes/pipeline/destinationsLogic.tsx
+++ b/frontend/src/scenes/pipeline/destinationsLogic.tsx
@@ -8,6 +8,8 @@ import { userLogic } from 'scenes/userLogic'
import {
BatchExportConfiguration,
+ HogFunctionTemplateType,
+ HogFunctionType,
PipelineStage,
PluginConfigTypeNew,
PluginConfigWithPluginInfoNew,
@@ -16,6 +18,7 @@ import {
} from '~/types'
import type { pipelineDestinationsLogicType } from './destinationsLogicType'
+import { HOG_FUNCTION_TEMPLATES } from './hogfunctions/templates/hog-templates'
import { pipelineAccessLogic } from './pipelineAccessLogic'
import { BatchExportDestination, convertToPipelineNode, Destination, PipelineBackend } from './types'
import { captureBatchExportEvent, capturePluginEvent, loadPluginsFromUrl } from './utils'
@@ -116,28 +119,68 @@ export const pipelineDestinationsLogic = kea
([
},
},
],
+
+ hogFunctionTemplates: [
+ {} as Record,
+ {
+ loadHogFunctionTemplates: async () => {
+ return HOG_FUNCTION_TEMPLATES.reduce((acc, template) => {
+ acc[template.id] = template
+ return acc
+ }, {} as Record)
+ },
+ },
+ ],
+ hogFunctions: [
+ [] as HogFunctionType[],
+ {
+ loadHogFunctions: async () => {
+ // TODO: Support pagination?
+ return (await api.hogFunctions.list()).results
+ },
+ },
+ ],
})),
selectors({
loading: [
- (s) => [s.pluginsLoading, s.pluginConfigsLoading, s.batchExportConfigsLoading],
- (pluginsLoading, pluginConfigsLoading, batchExportConfigsLoading) =>
- pluginsLoading || pluginConfigsLoading || batchExportConfigsLoading,
+ (s) => [
+ s.pluginsLoading,
+ s.pluginConfigsLoading,
+ s.batchExportConfigsLoading,
+ s.hogFunctionTemplatesLoading,
+ s.hogFunctionsLoading,
+ ],
+ (
+ pluginsLoading,
+ pluginConfigsLoading,
+ batchExportConfigsLoading,
+ hogFunctionTemplatesLoading,
+ hogFunctionsLoading
+ ) =>
+ pluginsLoading ||
+ pluginConfigsLoading ||
+ batchExportConfigsLoading ||
+ hogFunctionTemplatesLoading ||
+ hogFunctionsLoading,
],
destinations: [
- (s) => [s.pluginConfigs, s.plugins, s.batchExportConfigs, s.user],
- (pluginConfigs, plugins, batchExportConfigs, user): Destination[] => {
+ (s) => [s.pluginConfigs, s.plugins, s.batchExportConfigs, s.hogFunctions, s.user],
+ (pluginConfigs, plugins, batchExportConfigs, hogFunctions, user): Destination[] => {
// Migrations are shown only in impersonation mode, for us to be able to trigger them.
const rawBatchExports = Object.values(batchExportConfigs).filter(
(config) => config.destination.type !== 'HTTP' || user?.is_impersonated
)
- const rawDestinations: (PluginConfigWithPluginInfoNew | BatchExportConfiguration)[] = Object.values(
- pluginConfigs
- )
- .map((pluginConfig) => ({
- ...pluginConfig,
- plugin_info: plugins[pluginConfig.plugin] || null,
- }))
- .concat(rawBatchExports)
+
+ const rawDestinations: (PluginConfigWithPluginInfoNew | BatchExportConfiguration | HogFunctionType)[] =
+ Object.values(pluginConfigs)
+ .map(
+ (pluginConfig) => ({
+ ...pluginConfig,
+ plugin_info: plugins[pluginConfig.plugin] || null,
+ })
+ )
+ .concat(rawBatchExports)
+ .concat(hogFunctions)
const convertedDestinations = rawDestinations.map((d) =>
convertToPipelineNode(d, PipelineStage.Destination)
)
@@ -183,5 +226,7 @@ export const pipelineDestinationsLogic = kea([
actions.loadPlugins()
actions.loadPluginConfigs()
actions.loadBatchExports()
+ actions.loadHogFunctionTemplates()
+ actions.loadHogFunctions()
}),
])
diff --git a/frontend/src/scenes/pipeline/pipelineNodeLogic.tsx b/frontend/src/scenes/pipeline/pipelineNodeLogic.tsx
index 38d5acba5fcd3..f9a4d7d66b824 100644
--- a/frontend/src/scenes/pipeline/pipelineNodeLogic.tsx
+++ b/frontend/src/scenes/pipeline/pipelineNodeLogic.tsx
@@ -24,7 +24,11 @@ type BatchExportNodeId = {
backend: PipelineBackend.BatchExport
id: string
}
-export type PipelineNodeLimitedType = PluginNodeId | BatchExportNodeId
+type HogFunctionNodeId = {
+ backend: PipelineBackend.HogFunction
+ id: string
+}
+export type PipelineNodeLimitedType = PluginNodeId | BatchExportNodeId | HogFunctionNodeId
export const pipelineNodeLogic = kea([
props({} as PipelineNodeLogicProps),
@@ -61,18 +65,23 @@ export const pipelineNodeLogic = kea([
},
],
],
+
+ nodeBackend: [
+ (s) => [s.node],
+ (node): PipelineBackend => {
+ return node.backend
+ },
+ ],
node: [
(_, p) => [p.id],
(id): PipelineNodeLimitedType => {
return typeof id === 'string'
- ? { backend: PipelineBackend.BatchExport, id: id }
- : { backend: PipelineBackend.Plugin, id: id }
+ ? id.indexOf('hog-') === 0
+ ? { backend: PipelineBackend.HogFunction, id: `${id}`.replace('hog-', '') }
+ : { backend: PipelineBackend.BatchExport, id }
+ : { backend: PipelineBackend.Plugin, id }
},
],
- nodeBackend: [
- (_, p) => [p.id],
- (id): PipelineBackend => (typeof id === 'string' ? PipelineBackend.BatchExport : PipelineBackend.Plugin),
- ],
tabs: [
(s) => [s.nodeBackend],
(nodeBackend) => {
diff --git a/frontend/src/scenes/pipeline/pipelineNodeNewLogic.tsx b/frontend/src/scenes/pipeline/pipelineNodeNewLogic.tsx
index 395055b913a9b..81e45ff15d394 100644
--- a/frontend/src/scenes/pipeline/pipelineNodeNewLogic.tsx
+++ b/frontend/src/scenes/pipeline/pipelineNodeNewLogic.tsx
@@ -18,6 +18,7 @@ export interface PipelineNodeNewLogicProps {
stage: PipelineStage | null
pluginId: number | null
batchExportDestination: string | null
+ hogFunctionId: string | null
}
export const pipelineNodeNewLogic = kea([
@@ -25,12 +26,7 @@ export const pipelineNodeNewLogic = kea([
connect({
values: [userLogic, ['user']],
}),
- path((pluginIdOrBatchExportDestination) => [
- 'scenes',
- 'pipeline',
- 'pipelineNodeNewLogic',
- pluginIdOrBatchExportDestination,
- ]),
+ path((id) => ['scenes', 'pipeline', 'pipelineNodeNewLogic', id]),
actions({
createNewButtonPressed: (stage: PipelineStage, id: number | BatchExportService['type']) => ({ stage, id }),
}),
diff --git a/frontend/src/scenes/pipeline/types.ts b/frontend/src/scenes/pipeline/types.ts
index dc6ac93442df9..f958ebb887ca6 100644
--- a/frontend/src/scenes/pipeline/types.ts
+++ b/frontend/src/scenes/pipeline/types.ts
@@ -1,6 +1,7 @@
import {
BatchExportConfiguration,
BatchExportService,
+ HogFunctionType,
PipelineStage,
PluginConfigWithPluginInfoNew,
PluginType,
@@ -9,6 +10,7 @@ import {
export enum PipelineBackend {
BatchExport = 'batch_export',
Plugin = 'plugin',
+ HogFunction = 'hog_function',
}
// Base - we're taking a discriminated union approach here, so that TypeScript can discern types for free
@@ -39,6 +41,11 @@ export interface BatchExportBasedNode extends PipelineNodeBase {
interval: BatchExportConfiguration['interval']
}
+export interface HogFunctionBasedNode extends PipelineNodeBase {
+ backend: PipelineBackend.HogFunction
+ id: string
+}
+
// Stage: Transformations
export interface Transformation extends PluginBasedNode {
@@ -55,7 +62,11 @@ export interface WebhookDestination extends PluginBasedNode {
export interface BatchExportDestination extends BatchExportBasedNode {
stage: PipelineStage.Destination
}
-export type Destination = BatchExportDestination | WebhookDestination
+export interface FunctionDestination extends HogFunctionBasedNode {
+ stage: PipelineStage.Destination
+ interval: 'realtime'
+}
+export type Destination = BatchExportDestination | WebhookDestination | FunctionDestination
export interface DataImportApp extends PluginBasedNode {
stage: PipelineStage.DataImport
@@ -84,7 +95,7 @@ function isPluginConfig(
}
export function convertToPipelineNode(
- candidate: PluginConfigWithPluginInfoNew | BatchExportConfiguration,
+ candidate: PluginConfigWithPluginInfoNew | BatchExportConfiguration | HogFunctionType,
stage: S
): S extends PipelineStage.Transformation
? Transformation
@@ -98,7 +109,20 @@ export function convertToPipelineNode(
? ImportApp
: never {
let node: PipelineNode
- if (isPluginConfig(candidate)) {
+ // check if type is a hog function
+ if ('hog' in candidate) {
+ node = {
+ stage: stage as PipelineStage.Destination,
+ backend: PipelineBackend.HogFunction,
+ interval: 'realtime',
+ id: `hog-${candidate.id}`,
+ name: candidate.name,
+ description: candidate.description,
+ enabled: candidate.enabled,
+ created_at: candidate.created_at,
+ updated_at: candidate.created_at,
+ }
+ } else if (isPluginConfig(candidate)) {
const almostNode: Omit<
Transformation | WebhookDestination | SiteApp | ImportApp | DataImportApp,
'frequency' | 'order'
diff --git a/frontend/src/scenes/sceneTypes.ts b/frontend/src/scenes/sceneTypes.ts
index c80897e8dd192..1dcb3f8af312b 100644
--- a/frontend/src/scenes/sceneTypes.ts
+++ b/frontend/src/scenes/sceneTypes.ts
@@ -9,6 +9,7 @@ export enum Scene {
Error404 = '404',
ErrorNetwork = '4xx',
ErrorProjectUnavailable = 'ProjectUnavailable',
+ ErrorTracking = 'ErrorTracking',
Dashboards = 'Dashboards',
Dashboard = 'Dashboard',
Insight = 'Insight',
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index 94983524158f6..f4ef644d8665c 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -53,6 +53,10 @@ export const sceneConfigurations: Record = {
activityScope: ActivityScope.DASHBOARD,
defaultDocsPath: '/docs/product-analytics/dashboards',
},
+ [Scene.ErrorTracking]: {
+ projectBased: true,
+ name: 'Error tracking',
+ },
[Scene.Insight]: {
projectBased: true,
name: 'Insights',
@@ -408,7 +412,6 @@ export const sceneConfigurations: Record = {
[Scene.Heatmaps]: {
projectBased: true,
name: 'Heatmaps',
- hideProjectNotice: true,
},
}
@@ -529,7 +532,7 @@ export const routes: Record = {
[urls.persons()]: Scene.PersonsManagement,
[urls.pipelineNodeDataWarehouseNew()]: Scene.pipelineNodeDataWarehouseNew,
[urls.pipelineNodeNew(':stage')]: Scene.PipelineNodeNew,
- [urls.pipelineNodeNew(':stage', ':pluginIdOrBatchExportDestination')]: Scene.PipelineNodeNew,
+ [urls.pipelineNodeNew(':stage', ':id')]: Scene.PipelineNodeNew,
[urls.pipeline(':tab')]: Scene.Pipeline,
[urls.pipelineNode(':stage', ':id', ':nodeTab')]: Scene.PipelineNode,
[urls.groups(':groupTypeIndex')]: Scene.PersonsManagement,
@@ -541,6 +544,7 @@ export const routes: Record = {
[urls.experiment(':id')]: Scene.Experiment,
[urls.earlyAccessFeatures()]: Scene.EarlyAccessFeatures,
[urls.earlyAccessFeature(':id')]: Scene.EarlyAccessFeature,
+ [urls.errorTracking()]: Scene.ErrorTracking,
[urls.surveys()]: Scene.Surveys,
[urls.survey(':id')]: Scene.Survey,
[urls.surveyTemplates()]: Scene.SurveyTemplates,
diff --git a/frontend/src/scenes/session-recordings/player/controller/Seekbar.scss b/frontend/src/scenes/session-recordings/player/controller/Seekbar.scss
index 943f17aa977ba..8549d99d48dde 100644
--- a/frontend/src/scenes/session-recordings/player/controller/Seekbar.scss
+++ b/frontend/src/scenes/session-recordings/player/controller/Seekbar.scss
@@ -47,7 +47,7 @@
.PlayerSeekbar__currentbar {
z-index: 3;
- background-color: var(--recording-seekbar-red);
+ background-color: var(--primary-3000);
border-radius: var(--bar-height) 0 0 var(--bar-height);
}
@@ -76,7 +76,7 @@
width: var(--thumb-size);
height: var(--thumb-size);
margin-top: calc(var(--thumb-size) / 2 * -1);
- background-color: var(--recording-seekbar-red);
+ background-color: var(--primary-3000);
border: 2px solid var(--bg-light);
border-radius: 50%;
transition: top 150ms ease-in-out;
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
index e851684d58874..9131ba82271d2 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemEvent.tsx
@@ -68,7 +68,7 @@ export function ItemEvent({ item, expanded, setExpanded }: ItemEventProps): JSX.
{item.data.fullyLoaded ? (
item.data.event === '$exception' ? (
-
+
) : (
)
diff --git a/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts b/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
index 65829d1257afd..965e6f33382e3 100644
--- a/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/playerSettingsLogic.ts
@@ -1,5 +1,6 @@
-import { actions, kea, listeners, path, reducers, selectors } from 'kea'
+import { actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
+import { teamLogic } from 'scenes/teamLogic'
import { AutoplayDirection, DurationType, SessionRecordingPlayerTab } from '~/types'
@@ -191,7 +192,10 @@ export const playerSettingsLogic = kea([
setQuickFilterProperties: (properties: string[]) => ({ properties }),
setTimestampFormat: (format: TimestampFormat) => ({ format }),
}),
- reducers(() => ({
+ connect({
+ values: [teamLogic, ['currentTeam']],
+ }),
+ reducers(({ values }) => ({
showFilters: [
true,
{
@@ -211,7 +215,7 @@ export const playerSettingsLogic = kea([
},
],
quickFilterProperties: [
- ['$geoip_country_name'] as string[],
+ ['$geoip_country_name', ...(values.currentTeam?.person_display_name_properties || [])] as string[],
{
persist: true,
},
diff --git a/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.tsx b/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.tsx
index 40d3d356bd447..17ae678e31792 100644
--- a/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.tsx
+++ b/frontend/src/scenes/session-recordings/playlist/SessionRecordingsPlaylist.tsx
@@ -23,6 +23,7 @@ import { urls } from 'scenes/urls'
import { ReplayTabs, SessionRecordingType } from '~/types'
+import { RecordingsUniversalFilters } from '../filters/RecordingsUniversalFilters'
import { SessionRecordingsFilters } from '../filters/SessionRecordingsFilters'
import { SessionRecordingPlayer } from '../player/SessionRecordingPlayer'
import { SessionRecordingPreview, SessionRecordingPreviewSkeleton } from './SessionRecordingPreview'
@@ -118,6 +119,7 @@ function RecordingsLists(): JSX.Element {
recordingsCount,
isRecordingsListCollapsed,
sessionSummaryLoading,
+ useUniversalFiltering,
} = useValues(sessionRecordingsPlaylistLogic)
const {
setSelectedRecordingId,
@@ -205,25 +207,27 @@ function RecordingsLists(): JSX.Element {
-
-
-
- }
- onClick={() => {
- if (notebookNode) {
- notebookNode.actions.toggleEditing()
- } else {
- setShowFilters(!showFilters)
+ {(!useUniversalFiltering || notebookNode) && (
+
+
+
}
- }}
- >
- Filter
-
+ onClick={() => {
+ if (notebookNode) {
+ notebookNode.actions.toggleEditing()
+ } else {
+ setShowFilters(!showFilters)
+ }
+ }}
+ >
+ Filter
+
+ )}
-
+
+
+ {useUniversalFiltering &&
}
+
-
-
+
You can now use key "{key.label}" for authentication:
- {value}
+
+ {value}
+
For security reasons the value above will never be shown again.
diff --git a/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx b/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
index 4b43be07bcf46..ec3b03d54b41d 100644
--- a/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
+++ b/frontend/src/scenes/surveys/SurveyEditQuestionRow.tsx
@@ -7,12 +7,15 @@ import { IconPlusSmall, IconTrash } from '@posthog/icons'
import { LemonButton, LemonCheckbox, LemonInput, LemonSelect } from '@posthog/lemon-ui'
import { useActions, useValues } from 'kea'
import { Group } from 'kea-forms'
+import { FEATURE_FLAGS } from 'lib/constants'
import { SortableDragIcon } from 'lib/lemon-ui/icons'
import { LemonField } from 'lib/lemon-ui/LemonField'
+import { featureFlagLogic as enabledFeaturesLogic } from 'lib/logic/featureFlagLogic'
import { Survey, SurveyQuestionType } from '~/types'
import { defaultSurveyFieldValues, NewSurvey, SurveyQuestionLabel } from './constants'
+import { QuestionBranchingInput } from './QuestionBranchingInput'
import { HTMLEditor } from './SurveyAppearanceUtils'
import { surveyLogic } from './surveyLogic'
@@ -85,6 +88,10 @@ export function SurveyEditQuestionHeader({
export function SurveyEditQuestionGroup({ index, question }: { index: number; question: any }): JSX.Element {
const { survey, descriptionContentType } = useValues(surveyLogic)
const { setDefaultForQuestionType, setSurveyValue } = useActions(surveyLogic)
+ const { featureFlags } = useValues(enabledFeaturesLogic)
+ const hasBranching =
+ featureFlags[FEATURE_FLAGS.SURVEYS_BRANCHING_LOGIC] &&
+ (question.type === SurveyQuestionType.Rating || question.type === SurveyQuestionType.SingleChoice)
const initialDescriptionContentType = descriptionContentType(index) ?? 'text'
@@ -332,6 +339,7 @@ export function SurveyEditQuestionGroup({ index, question }: { index: number; qu
}
/>
+ {hasBranching && }
)
diff --git a/frontend/src/scenes/surveys/surveyLogic.tsx b/frontend/src/scenes/surveys/surveyLogic.tsx
index c976e7f5dfb53..9b3964b64fdf3 100644
--- a/frontend/src/scenes/surveys/surveyLogic.tsx
+++ b/frontend/src/scenes/surveys/surveyLogic.tsx
@@ -16,10 +16,13 @@ import { hogql } from '~/queries/utils'
import {
Breadcrumb,
FeatureFlagFilters,
+ MultipleSurveyQuestion,
PropertyFilterType,
PropertyOperator,
+ RatingSurveyQuestion,
Survey,
SurveyQuestionBase,
+ SurveyQuestionBranchingType,
SurveyQuestionType,
SurveyUrlMatchType,
} from '~/types'
@@ -154,6 +157,7 @@ export const surveyLogic = kea
