Enable plugins for everyone (#3557)

* Put Team.plugins_opt_in out of use * Put Plugins out of BETA * Add attention-grabbing blip for Plugins in nav * Add end of Plugins beta banner * Refactor MenuItem highlighting * Update Plugins page copy * Prettier * Add User.flags field and use it instead of posthog.persistence * Fix User.flags API * Update migration * Update Plugins.tsx * Roll back extraneous additions * Roll back more * Update code ordering
PostHog · Apr 7, 2021 · 61feb50 · 61feb50
1 parent c7ca412
commit 61feb50
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 188 deletions.
diff --git a/frontend/src/layout/navigation/MainNavigation.tsx b/frontend/src/layout/navigation/MainNavigation.tsx
@@ -12,7 +12,7 @@ import {
 } from '@ant-design/icons'
 import { useActions, useValues } from 'kea'
 import { Link } from 'lib/components/Link'
-import { sceneLogic } from 'scenes/sceneLogic'
+import { Scene, sceneLogic } from 'scenes/sceneLogic'
 import { isMobile } from 'lib/utils'
 import { useEscapeKey } from 'lib/hooks/useEscapeKey'
 import lgLogo from 'public/posthog-logo-white.svg'
@@ -40,7 +40,7 @@ import { router } from 'kea-router'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 
 // to show the right page in the sidebar
-const sceneOverride: Record<string, string> = {
+const sceneOverride: Partial<Record<Scene, string>> = {
     action: 'actions',
     person: 'persons',
     dashboard: 'dashboards',
@@ -65,7 +65,7 @@ const MenuItem = ({ title, icon, identifier, to, hotkey, tooltip, onClick }: Men
     const { featureFlags } = useValues(featureFlagLogic)
 
     function activeScene(): string {
-        const nominalScene = loadingScene || scene
+        const nominalScene: Scene = loadingScene || scene
         // Scenes with special handling can go here
         return sceneOverride[nominalScene] || nominalScene
     }

diff --git a/frontend/src/scenes/plugins/Plugins.tsx b/frontend/src/scenes/plugins/Plugins.tsx
@@ -4,29 +4,26 @@ import { PluginDrawer } from 'scenes/plugins/edit/PluginDrawer'
 import { RepositoryTab } from 'scenes/plugins/tabs/repository/RepositoryTab'
 import { InstalledTab } from 'scenes/plugins/tabs/installed/InstalledTab'
 import { useActions, useValues } from 'kea'
-import { userLogic } from 'scenes/userLogic'
 import { pluginsLogic } from './pluginsLogic'
-import { Spin, Tabs, Tag } from 'antd'
-import { OptInPlugins } from 'scenes/plugins/optin/OptInPlugins'
+import { Tag, Tabs } from 'antd'
 import { PageHeader } from 'lib/components/PageHeader'
 import { PluginTab } from 'scenes/plugins/types'
 import { AdvancedTab } from 'scenes/plugins/tabs/advanced/AdvancedTab'
 import { canGloballyManagePlugins, canInstallPlugins, canViewPlugins } from './access'
+import { UserType } from '../../types'
 
-export function Plugins(): JSX.Element | null {
-    const { user } = useValues(userLogic)
+export function Plugins({ user }: { user: UserType }): JSX.Element | null {
     const { pluginTab } = useValues(pluginsLogic)
     const { setPluginTab } = useActions(pluginsLogic)
     const { TabPane } = Tabs
 
-    if (!user) {
-        return <Spin />
-    }
+    useEffect(() => {
+        if (!canViewPlugins(user.organization)) {
+            window.location.href = '/'
+        }
+    }, [user])
 
     if (!canViewPlugins(user.organization)) {
-        useEffect(() => {
-            window.location.href = '/'
-        }, [])
         return null
     }
 
@@ -43,35 +40,26 @@ export function Plugins(): JSX.Element | null {
                         </sup>
                     </>
                 }
-                caption={user.team?.plugins_opt_in ? "Plugins enable you to extend PostHog's core functionality." : ''}
+                caption="Plugins enable you to extend PostHog's core data processing functionality."
             />
-
-            {user.team?.plugins_opt_in ? (
-                <>
-                    {canInstallPlugins(user.organization) ? (
-                        <Tabs activeKey={pluginTab} onChange={(activeKey) => setPluginTab(activeKey as PluginTab)}>
-                            <TabPane tab="Installed" key={PluginTab.Installed}>
-                                <InstalledTab />
-                            </TabPane>
-                            {canGloballyManagePlugins(user.organization) && (
-                                <TabPane tab="Repository" key={PluginTab.Repository}>
-                                    <RepositoryTab />
-                                </TabPane>
-                            )}
-                            <TabPane tab="Advanced" key={PluginTab.Advanced}>
-                                <AdvancedTab />
-                            </TabPane>
-                        </Tabs>
-                    ) : (
+            {canInstallPlugins(user.organization) ? (
+                <Tabs activeKey={pluginTab} onChange={(activeKey) => setPluginTab(activeKey as PluginTab)}>
+                    <TabPane tab="Installed" key={PluginTab.Installed}>
                         <InstalledTab />
+                    </TabPane>
+                    {canGloballyManagePlugins(user.organization) && (
+                        <TabPane tab="Repository" key={PluginTab.Repository}>
+                            <RepositoryTab />
+                        </TabPane>
                     )}
-                    <PluginDrawer />
-                </>
+                    <TabPane tab="Advanced" key={PluginTab.Advanced}>
+                        <AdvancedTab user={user} />
+                    </TabPane>
+                </Tabs>
             ) : (
-                <div style={{ maxWidth: 600, marginTop: 20 }}>
-                    <OptInPlugins />
-                </div>
+                <InstalledTab />
             )}
+            <PluginDrawer />
         </div>
     )
 }
diff --git a/frontend/src/scenes/plugins/optin/OptInPlugins.tsx b/frontend/src/scenes/plugins/optin/OptInPlugins.tsx
diff --git a/frontend/src/scenes/plugins/tabs/advanced/AdvancedTab.tsx b/frontend/src/scenes/plugins/tabs/advanced/AdvancedTab.tsx
@@ -5,14 +5,13 @@ import React from 'react'
 import { SourcePlugin } from 'scenes/plugins/tabs/advanced/SourcePlugin'
 import { CustomPlugin } from 'scenes/plugins/tabs/advanced/CustomPlugin'
 import { LocalPlugin } from 'scenes/plugins/tabs/advanced/LocalPlugin'
-import { useActions, useValues } from 'kea'
+import { useActions } from 'kea'
 import { pluginsLogic } from 'scenes/plugins/pluginsLogic'
-import { DangerZone } from 'scenes/plugins/tabs/advanced/DangerZone'
-import { userLogic } from 'scenes/userLogic'
+import { UserType } from 'src/types'
 
-export function AdvancedTab(): JSX.Element {
-    const { user } = useValues(userLogic)
+export function AdvancedTab({ user }: { user: UserType }): JSX.Element {
     const { setPluginTab } = useActions(pluginsLogic)
+
     return (
         <>
             <Alert
@@ -40,7 +39,6 @@ export function AdvancedTab(): JSX.Element {
             <SourcePlugin />
             <CustomPlugin />
             {user && !user.is_multi_tenancy && <LocalPlugin />}
-            {user?.team?.plugins_opt_in && <DangerZone />}
         </>
     )
 }
diff --git a/frontend/src/scenes/plugins/tabs/advanced/DangerZone.tsx b/frontend/src/scenes/plugins/tabs/advanced/DangerZone.tsx
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -122,7 +122,6 @@ export interface TeamType {
     slack_incoming_webhook: string
     session_recording_opt_in: boolean
     session_recording_retention_period_days: number | null
-    plugins_opt_in: boolean
     ingested_event: boolean
     is_demo: boolean
     test_account_filters: FilterType[]

diff --git a/package.json b/package.json
@@ -146,7 +146,7 @@
     },
     "lint-staged": {
         "*.{js,ts,tsx,json,yml,css,scss}": "prettier --write",
-        "*.{js,ts,tsx}": "eslint",
+        "*.{js,ts,tsx}": "eslint --fix",
         "*.{py,pyi}": [
             "flake8 --select=E9,F63,F7,F82",
             "black",

diff --git a/posthog/api/capture.py b/posthog/api/capture.py
@@ -243,13 +243,8 @@ def get_event(request):
                     event_uuid=event_uuid,
                 )
         else:
-            task_name = "posthog.tasks.process_event.process_event"
-            if settings.PLUGIN_SERVER_INGESTION or team.plugins_opt_in:
-                task_name += "_with_plugins"
-                celery_queue = settings.PLUGINS_CELERY_QUEUE
-            else:
-                celery_queue = settings.CELERY_DEFAULT_QUEUE
-
+            task_name = "posthog.tasks.process_event.process_event_with_plugins"
+            celery_queue = settings.PLUGINS_CELERY_QUEUE
             celery_app.send_task(
                 name=task_name,
                 queue=celery_queue,

diff --git a/posthog/api/user.py b/posthog/api/user.py
@@ -202,9 +202,6 @@ def user(request):
             team.session_recording_retention_period_days = data["team"].get(
                 "session_recording_retention_period_days", team.session_recording_retention_period_days,
             )
-            if data["team"].get("plugins_opt_in") is not None:
-                reload_plugins_on_workers()
-            team.plugins_opt_in = data["team"].get("plugins_opt_in", team.plugins_opt_in)
             team.completed_snippet_onboarding = data["team"].get(
                 "completed_snippet_onboarding", team.completed_snippet_onboarding,
             )
@@ -281,7 +278,6 @@ def user(request):
                 "completed_snippet_onboarding": team.completed_snippet_onboarding,
                 "session_recording_opt_in": team.session_recording_opt_in,
                 "session_recording_retention_period_days": team.session_recording_retention_period_days,
-                "plugins_opt_in": team.plugins_opt_in,
                 "ingested_event": team.ingested_event,
                 "is_demo": team.is_demo,
                 "test_account_filters": team.test_account_filters,

diff --git a/posthog/models/team.py b/posthog/models/team.py
@@ -97,13 +97,14 @@ class Team(UUIDClassicModel):
     session_recording_retention_period_days: models.IntegerField = models.IntegerField(
         null=True, default=None, blank=True
     )
-    plugins_opt_in: models.BooleanField = models.BooleanField(default=False)
     signup_token: models.CharField = models.CharField(max_length=200, null=True, blank=True)
     is_demo: models.BooleanField = models.BooleanField(default=False)
     test_account_filters: JSONField = JSONField(default=list)
     timezone: models.CharField = models.CharField(max_length=240, choices=TIMEZONES, default="UTC")
     data_attributes: JSONField = JSONField(default=get_default_data_attributes)
 
+    # DEPRECATED, DISUSED: plugins are enabled for everyone now
+    plugins_opt_in: models.BooleanField = models.BooleanField(default=False)
     # DEPRECATED, DISUSED: replaced with env variable OPT_OUT_CAPTURE and User.anonymized_data
     opt_out_capture: models.BooleanField = models.BooleanField(default=False)
     # DEPRECATED, DISUSED: now managing access in an Organization-centric way