feat: exp for nontechnical users in prod. analytics

frontend/src/lib/constants.tsx

@@ -156,6 +156,7 @@ export const FEATURE_FLAGS = {
     FF_DASHBOARD_TEMPLATES: 'ff-dashboard-templates', // owner: @EDsCODE
     ARTIFICIAL_HOG: 'artificial-hog', // owner: @Twixes
     CS_DASHBOARDS: 'cs-dashboards', // owner: @pauldambra
+    PRODUCT_ANALYTICS_MODIFIED_SDK_LIST: 'product-analytics-modified-sdk-list', // owner: @surbhi
     PRODUCT_SPECIFIC_ONBOARDING: 'product-specific-onboarding', // owner: @raquelmsmith
     REDIRECT_SIGNUPS_TO_INSTANCE: 'redirect-signups-to-instance', // owner: @raquelmsmith
     APPS_AND_EXPORTS_UI: 'apps-and-exports-ui', // owner: @benjackwhite

frontend/src/scenes/onboarding/sdks/SDKs.tsx

@@ -38,6 +38,7 @@ export function SDKs({
     const { goToNextStep, completeOnboarding } = useActions(onboardingLogic)
     const [showListeningFor, setShowListeningFor] = React.useState(false)
     const [hasCheckedInstallation, setHasCheckedInstallation] = React.useState(false)
+    const { isUserInNonTechnicalTest } = useValues(sdksLogic)
 
     const { width } = useWindowSize()
 
@@ -66,8 +67,17 @@ export function SDKs({
         }
     }, 2000)
 
+    const HelpCard = (): JSX.Element => (
+        <LemonCard className="mt-6" hoverEffect={false}>
+            <h3 className="font-bold">Need help with this step?</h3>
+            <p>Invite a team member to help you get set up.</p>
+            <InviteMembersButton type="secondary" />
+        </LemonCard>
+    )
+
     return (
         <OnboardingStep title="Install" stepKey={stepKey} continueOverride={<></>}>
+            {isUserInNonTechnicalTest && <HelpCard />}
             <div className="flex gap-x-8 mt-6">
                 <div
                     className={`flex-col gap-y-2 flex-wrap gap-x-4 ${showSideBySide && 'min-w-[12.5rem] w-50'} ${
@@ -106,11 +116,7 @@ export function SDKs({
                             </LemonButton>
                         </React.Fragment>
                     ))}
-                    <LemonCard className="mt-6" hoverEffect={false}>
-                        <h3 className="font-bold">Need help with this step?</h3>
-                        <p>Invite a team member to help you get set up.</p>
-                        <InviteMembersButton type="secondary" />
-                    </LemonCard>
+                    {!isUserInNonTechnicalTest && <HelpCard />}
                 </div>
                 {selectedSDK && productKey && !!sdkInstructionMap[selectedSDK.key] && (
                     <div

frontend/src/scenes/onboarding/sdks/sdksLogic.tsx

@@ -2,8 +2,11 @@ import { actions, afterMount, connect, events, kea, listeners, path, reducers, s
 import { loaders } from 'kea-loaders'
 import { urlToAction } from 'kea-router'
 import api from 'lib/api'
+import { FEATURE_FLAGS } from 'lib/constants'
 import { LemonSelectOptions } from 'lib/lemon-ui/LemonSelect/LemonSelect'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { liveEventsTableLogic } from 'scenes/activity/live/liveEventsTableLogic'
+import { userLogic } from 'scenes/userLogic'
 
 import { HogQLQuery, NodeKind } from '~/queries/schema'
 import { hogql } from '~/queries/utils'
@@ -12,7 +15,6 @@ import { ProductKey, SDK, SDKInstructionsMap } from '~/types'
 import { onboardingLogic } from '../onboardingLogic'
 import { allSDKs } from './allSDKs'
 import type { sdksLogicType } from './sdksLogicType'
-
 /*
 To add SDK instructions for your product:
     1. If needed, add a new ProductKey enum value in ~/types.ts
@@ -39,10 +41,27 @@ Products that will often be installed in multiple places, eg. web and mobile
 */
 export const multiInstallProducts = [ProductKey.PRODUCT_ANALYTICS, ProductKey.FEATURE_FLAGS]
 
+const getProductAnalyticsOrderedSDKs = (sdks: SDK[]): SDK[] => {
+    return [
+        ...sdks.filter((sdk) => sdk.key === 'html'),
+        ...sdks.filter((sdk) => sdk.key === 'javascript-web'),
+        ...sdks.filter((sdk) => !['html', 'javascript-web'].includes(sdk.key)),
+    ]
+}
+
 export const sdksLogic = kea<sdksLogicType>([
     path(['scenes', 'onboarding', 'sdks', 'sdksLogic']),
     connect({
-        values: [onboardingLogic, ['productKey'], liveEventsTableLogic, ['eventHosts']],
+        values: [
+            onboardingLogic,
+            ['productKey'],
+            liveEventsTableLogic,
+            ['eventHosts'],
+            featureFlagLogic,
+            ['featureFlags'],
+            userLogic,
+            ['user', 'isUserTechnical'],
+        ],
     }),
     actions({
         setSourceFilter: (sourceFilter: string | null) => ({ sourceFilter }),
@@ -133,6 +152,16 @@ export const sdksLogic = kea<sdksLogicType>([
                 return combinedSnippetAndLiveEventsHosts
             },
         ],
+        isUserInNonTechnicalTest: [
+            (s) => [s.productKey, s.featureFlags, s.isUserTechnical],
+            (productKey, featureFlags, isUserTechnical): boolean => {
+                return (
+                    productKey === ProductKey.PRODUCT_ANALYTICS &&
+                    featureFlags[FEATURE_FLAGS.PRODUCT_ANALYTICS_MODIFIED_SDK_LIST] === 'test' &&
+                    isUserTechnical === false
+                )
+            },
+        ],
     }),
     loaders(({ actions }) => ({
         hasSnippetEvents: [
@@ -173,14 +202,17 @@ export const sdksLogic = kea<sdksLogicType>([
     })),
     listeners(({ actions, values }) => ({
         filterSDKs: () => {
-            const filteredSDks: SDK[] = allSDKs
+            let filteredSDks: SDK[] = allSDKs
                 .filter((sdk) => {
                     if (!values.sourceFilter || !sdk) {
                         return true
                     }
                     return sdk.tags.includes(values.sourceFilter)
                 })
                 .filter((sdk) => Object.keys(values.availableSDKInstructionsMap).includes(sdk.key))
+            if (values.isUserInNonTechnicalTest) {
+                filteredSDks = getProductAnalyticsOrderedSDKs(filteredSDks)
+            }
             actions.setSDKs(filteredSDks)
             actions.setSourceOptions(getSourceOptions(values.availableSDKInstructionsMap))
         },
@@ -225,12 +257,7 @@ export const sdksLogic = kea<sdksLogicType>([
     afterMount(({ actions }) => {
         actions.loadSnippetEvents()
     }),
-    urlToAction(({ actions }) => ({
-        '/onboarding/:productKey': (_productKey, { sdk }) => {
-            const matchedSDK = allSDKs.find((s) => s.key === sdk)
-            if (matchedSDK) {
-                actions.setSelectedSDK(matchedSDK)
-            }
-        },
+    urlToAction(() => ({
+        '/onboarding/:productKey': () => {},
     })),
 ])

frontend/src/scenes/userLogic.ts

@@ -250,6 +250,14 @@ export const userLogic = kea<userLogicType>([
                 return user?.theme_mode || 'light'
             },
         ],
+
+        isUserTechnical: [
+            (s) => [s.user],
+            (user) => {
+                const technicalRoles = ['engineering', 'founder']
+                return user?.role_at_organization && technicalRoles.includes(user.role_at_organization)
+            },
+        ],
     }),
     afterMount(({ actions }) => {
         const preloadedUser = getAppContext()?.current_user

frontend/src/types.ts

@@ -288,6 +288,7 @@ export interface UserType extends UserBaseType {
     scene_personalisation?: SceneDashboardChoice[]
     theme_mode?: UserTheme | null
     hedgehog_config?: Partial<HedgehogConfig>
+    role_at_organization?: string
 }
 
 export type HedgehogColorOptions =

posthog/api/signup.py

@@ -111,6 +111,7 @@ def create(self, validated_data, **kwargs):
                 create_team=self.create_team,
                 is_staff=is_instance_first_user,
                 is_email_verified=self.is_email_auto_verified(),
+                role_at_organization=role_at_organization,
                 **validated_data,
             )
         except IntegrityError:
@@ -142,6 +143,7 @@ def enter_demo(self, validated_data) -> User:
         email = validated_data["email"]
         first_name = validated_data["first_name"]
         organization_name = validated_data["organization_name"]
+        role_at_organization = validated_data["role_at_organization"]
         # In the demo env, social signups gets staff privileges
         # - grep SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS for more info
         is_staff = self.is_social_signup
@@ -152,7 +154,9 @@ def enter_demo(self, validated_data) -> User:
                 self._organization,
                 self._team,
                 self._user,
-            ) = manager.ensure_account_and_save(email, first_name, organization_name, is_staff=is_staff)
+            ) = manager.ensure_account_and_save(
+                email, first_name, organization_name, role_at_organization, is_staff=is_staff
+            )
 
         login(
             self.context["request"],
@@ -209,8 +213,6 @@ def create(self, validated_data, **kwargs):
         user: Optional[User] = None
         is_new_user: bool = False
 
-        role_at_organization = validated_data.pop("role_at_organization", "")
-
         if self.context["request"].user.is_authenticated:
             user = cast(User, self.context["request"].user)
 
@@ -236,11 +238,13 @@ def create(self, validated_data, **kwargs):
             if not user:
                 is_new_user = True
                 try:
+                    role = validated_data.pop("role_at_organization", "")
                     user = User.objects.create_user(
                         invite.target_email,
                         validated_data.pop("password"),
                         validated_data.pop("first_name"),
                         is_email_verified=False,
+                        role_at_organization=role,
                         **validated_data,
                     )
                 except IntegrityError:
@@ -264,7 +268,7 @@ def create(self, validated_data, **kwargs):
                 backend_processor="OrganizationInviteSignupSerializer",
                 user_analytics_metadata=user.get_analytics_metadata(),
                 org_analytics_metadata=user.organization.get_analytics_metadata() if user.organization else None,
-                role_at_organization=role_at_organization,
+                role_at_organization=role,
                 referral_source="signed up from invite link",
             )
 

posthog/api/user.py

@@ -94,6 +94,7 @@ class UserSerializer(serializers.ModelSerializer):
     notification_settings = serializers.DictField(required=False)
     scene_personalisation = ScenePersonalisationBasicSerializer(many=True, read_only=True)
     anonymize_data = ClassicBehaviorBooleanFieldSerializer()
+    role_at_organization = serializers.ChoiceField(choices=User.ROLE_CHOICES, required=True)
 
     class Meta:
         model = User
@@ -128,6 +129,7 @@ class Meta:
             "scene_personalisation",
             "theme_mode",
             "hedgehog_config",
+            "role_at_organization",
         ]
 
         read_only_fields = [
@@ -250,6 +252,11 @@ def validate_is_staff(self, value: bool) -> bool:
             raise exceptions.PermissionDenied("You are not a staff user, contact your instance admin.")
         return value
 
+    def validate_role_at_organization(self, value):
+        if value and value not in dict(User.ROLE_CHOICES):
+            raise serializers.ValidationError("Invalid role selected")
+        return value
+
     def update(self, instance: "User", validated_data: Any) -> Any:
         # Update current_organization and current_team
         current_organization = validated_data.pop("set_current_organization", None)

posthog/migrations/0533_user_role_at_organization.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.15 on 2024-12-19 21:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("posthog", "0532_taxonomy_unique_on_project"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="role_at_organization",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("engineering", "Engineering"),
+                    ("data", "Data"),
+                    ("product", "Product Management"),
+                    ("founder", "Founder"),
+                    ("leadership", "Leadership"),
+                    ("marketing", "Marketing"),
+                    ("sales", "Sales / Success"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+                null=True,
+            ),
+        ),
+    ]

posthog/migrations/max_migration.txt

@@ -1 +1 @@
-0532_taxonomy_unique_on_project
+0533_user_role_at_organization

posthog/models/user.py

@@ -172,6 +172,19 @@ class User(AbstractUser, UUIDClassicModel):
     # Remove unused attributes from `AbstractUser`
     username = None
 
+    ROLE_CHOICES = (
+        ("engineering", "Engineering"),
+        ("data", "Data"),
+        ("product", "Product Management"),
+        ("founder", "Founder"),
+        ("leadership", "Leadership"),
+        ("marketing", "Marketing"),
+        ("sales", "Sales / Success"),
+        ("other", "Other"),
+    )
+
+    role_at_organization = models.CharField(max_length=64, choices=ROLE_CHOICES, null=True, blank=True)
+
     objects: UserManager = UserManager()
 
     @property