fix: Filter out templates if not enabled (#23938)

PostHog · Jul 25, 2024 · a6571ff · a6571ff
1 parent 86d55bc
commit a6571ff
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/frontend/src/scenes/pipeline/destinations/newDestinationsLogic.tsx b/frontend/src/scenes/pipeline/destinations/newDestinationsLogic.tsx
@@ -4,7 +4,9 @@ import { actions, afterMount, connect, kea, listeners, path, reducers, selectors
 import { loaders } from 'kea-loaders'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import api from 'lib/api'
+import { FEATURE_FLAGS } from 'lib/constants'
 import { LemonField } from 'lib/lemon-ui/LemonField'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { objectsEqual } from 'lib/utils'
 import posthog from 'posthog-js'
 import { urls } from 'scenes/urls'
@@ -42,7 +44,7 @@ export interface Fuse extends FuseClass<NewDestinationItemType> {}
 
 export const newDestinationsLogic = kea<newDestinationsLogicType>([
     connect({
-        values: [userLogic, ['user']],
+        values: [userLogic, ['user'], featureFlagLogic, ['featureFlags']],
     }),
     path(() => ['scenes', 'pipeline', 'destinations', 'newDestinationsLogic']),
     actions({
@@ -104,10 +106,26 @@ export const newDestinationsLogic = kea<newDestinationsLogicType>([
             },
         ],
         destinations: [
-            (s) => [s.plugins, s.hogFunctionTemplates, s.batchExportServiceNames, router.selectors.hashParams],
-            (plugins, hogFunctionTemplates, batchExportServiceNames, hashParams): NewDestinationItemType[] => {
+            (s) => [
+                s.plugins,
+                s.hogFunctionTemplates,
+                s.batchExportServiceNames,
+                s.featureFlags,
+                router.selectors.hashParams,
+            ],
+            (
+                plugins,
+                hogFunctionTemplates,
+                batchExportServiceNames,
+                featureFlags,
+                hashParams
+            ): NewDestinationItemType[] => {
+                const hogTemplates = featureFlags[FEATURE_FLAGS.HOG_FUNCTIONS]
+                    ? Object.values(hogFunctionTemplates)
+                    : []
+
                 return [
-                    ...Object.values(hogFunctionTemplates).map((hogFunction) => ({
+                    ...hogTemplates.map((hogFunction) => ({
                         icon: <HogFunctionIcon size="small" src={hogFunction.icon_url} />,
                         name: hogFunction.name,
                         description: hogFunction.description,

diff --git a/frontend/src/scenes/pipeline/hogfunctions/hogFunctionConfigurationLogic.tsx b/frontend/src/scenes/pipeline/hogfunctions/hogFunctionConfigurationLogic.tsx
@@ -304,6 +304,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
         exampleInvocationGlobals: [
             (s) => [s.configuration, s.currentTeam, s.groupTypes],
             (configuration, currentTeam, groupTypes): HogFunctionInvocationGlobals => {
+                const currentUrl = window.location.href.split('#')[0]
                 const globals: HogFunctionInvocationGlobals = {
                     event: {
                         uuid: uuid(),
@@ -312,7 +313,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
                         timestamp: dayjs().toISOString(),
                         url: `${window.location.origin}/project/${currentTeam?.id}/events/`,
                         properties: {
-                            $current_url: window.location.href,
+                            $current_url: currentUrl,
                             $browser: 'Chrome',
                         },
                     },
@@ -332,7 +333,7 @@ export const hogFunctionConfigurationLogic = kea<hogFunctionConfigurationLogicTy
                     },
                     source: {
                         name: configuration?.name ?? 'Unnamed',
-                        url: window.location.href,
+                        url: currentUrl,
                     },
                 }
 

diff --git a/posthog/cdp/templates/customerio/template_customerio.py b/posthog/cdp/templates/customerio/template_customerio.py
@@ -3,7 +3,7 @@
 # Based off of https://customer.io/docs/api/track/#operation/entity
 
 template: HogFunctionTemplate = HogFunctionTemplate(
-    status="alpha",
+    status="beta",
     id="template-customerio",
     name="Update persons in Customer.io",
     description="Updates persons in Customer.io",

diff --git a/posthog/cdp/templates/hubspot/template_hubspot.py b/posthog/cdp/templates/hubspot/template_hubspot.py
@@ -2,7 +2,7 @@
 
 
 template: HogFunctionTemplate = HogFunctionTemplate(
-    status="alpha",
+    status="beta",
     id="template-hubspot",
     name="Create Hubspot contact",
     description="Creates a new contact in Hubspot whenever an event is triggered.",

diff --git a/posthog/cdp/templates/intercom/template_intercom.py b/posthog/cdp/templates/intercom/template_intercom.py
@@ -2,7 +2,7 @@
 
 
 template: HogFunctionTemplate = HogFunctionTemplate(
-    status="alpha",
+    status="beta",
     id="template-Intercom",
     name="Send data to Intercom",
     description="Send events and contact information to Intercom",

diff --git a/posthog/cdp/templates/sendgrid/template_sendgrid.py b/posthog/cdp/templates/sendgrid/template_sendgrid.py
@@ -3,7 +3,7 @@
 # Based off of https://www.twilio.com/docs/sendgrid/api-reference/contacts/add-or-update-a-contact
 
 template: HogFunctionTemplate = HogFunctionTemplate(
-    status="alpha",
+    status="beta",
     id="template-sendgrid",
     name="Update marketing contacts in Sendgrid",
     description="Update marketing contacts in Sendgrid",