Merge branch 'master' into fix/gravatar-over-fetching

.github/workflows/ci-backend.yml

@@ -60,7 +60,9 @@ jobs:
                         # NOTE: we are at risk of missing a dependency here. We could make
                         # the dependencies more clear if we separated the backend/frontend
                         # code completely
+                        # really we should ignore ee/frontend/** but dorny doesn't support that
                         - 'ee/**/*'
+                        - '!ee/frontend/**'
                         - 'posthog/**/*'
                         - 'bin/*.py'
                         - requirements.txt

.github/workflows/ci-frontend.yml

@@ -35,6 +35,7 @@ jobs:
                         # NOTE: we are at risk of missing a dependency here. 
                         - 'bin/**'
                         - 'frontend/**'
+                        - 'ee/frontend/**'
                         # Make sure we run if someone is explicitly change the workflow
                         - .github/workflows/ci-frontend.yml
                         # various JS config files
@@ -117,18 +118,23 @@ jobs:
     jest:
         runs-on: ubuntu-latest
         needs: changes
-        name: Jest test (${{ matrix.chunk }})
+        name: Jest test (${{ matrix.segment }} - ${{ matrix.chunk }})
 
         strategy:
             # If one test fails, still run the others
             fail-fast: false
             matrix:
+                segment: ['FOSS', 'EE']
                 chunk: [1, 2, 3]
 
         steps:
             # we need at least one thing to run to make sure we include everything for required jobs
             - uses: actions/checkout@v3
 
+            - name: Remove ee
+              if: needs.changes.outputs.frontend == 'true' && matrix.segment == 'FOSS'
+              run: rm -rf ee
+
             - name: Install pnpm
               if: needs.changes.outputs.frontend == 'true'
               uses: pnpm/action-setup@v2

.storybook/test-runner.ts

@@ -2,10 +2,11 @@ import { toMatchImageSnapshot } from 'jest-image-snapshot'
 import { getStoryContext, TestRunnerConfig, TestContext, waitForPageReady } from '@storybook/test-runner'
 import type { Locator, Page, LocatorScreenshotOptions } from '@playwright/test'
 import type { Mocks } from '~/mocks/utils'
-import { StoryContext } from '@storybook/types'
+import { StoryContext } from '@storybook/csf'
 
 // 'firefox' is technically supported too, but as of June 2023 it has memory usage issues that make is unusable
 type SupportedBrowserName = 'chromium' | 'webkit'
+type SnapshotTheme = 'legacy' | 'light' | 'dark'
 
 // Extend Storybook interface `Parameters` with Chromatic parameters
 declare module '@storybook/types' {
@@ -35,12 +36,18 @@ declare module '@storybook/types' {
             snapshotBrowsers?: SupportedBrowserName[]
             /** If taking a component snapshot, you can narrow it down by specifying the selector. */
             snapshotTargetSelector?: string
+            /** Include snapshots of buttons in 3000. */
+            include3000?: boolean
         }
         msw?: {
             mocks?: Mocks
         }
         [name: string]: any
     }
+
+    interface Globals {
+        theme: SnapshotTheme
+    }
 }
 
 const RETRY_TIMES = 3
@@ -68,7 +75,7 @@ module.exports = {
     },
     async postVisit(page, context) {
         const browserContext = page.context()
-        const storyContext = (await getStoryContext(page, context)) as StoryContext
+        const storyContext = await getStoryContext(page, context)
         const { snapshotBrowsers = ['chromium'] } = storyContext.parameters?.testOptions ?? {}
 
         browserContext.setDefaultTimeout(PLAYWRIGHT_TIMEOUT_MS)
@@ -92,12 +99,14 @@ async function expectStoryToMatchSnapshot(
         waitForLoadersToDisappear = true,
         waitForSelector,
         excludeNavigationFromSnapshot = false,
+        include3000 = false,
     } = storyContext.parameters?.testOptions ?? {}
 
     let check: (
         page: Page,
         context: TestContext,
         browser: SupportedBrowserName,
+        theme: SnapshotTheme,
         targetSelector?: string
     ) => Promise<void>
     if (storyContext.parameters?.layout === 'fullscreen') {
@@ -129,37 +138,55 @@ async function expectStoryToMatchSnapshot(
         Array.from(document.querySelectorAll('img')).every((i: HTMLImageElement) => i.complete)
     )
 
-    await check(page, context, browser, storyContext.parameters?.testOptions?.snapshotTargetSelector)
+    await check(page, context, browser, 'legacy', storyContext.parameters?.testOptions?.snapshotTargetSelector)
+
+    if (include3000) {
+        await page.evaluate(() => {
+            document.body.classList.add('posthog-3000')
+            document.body.setAttribute('theme', 'light')
+        })
+
+        await check(page, context, browser, 'light', storyContext.parameters?.testOptions?.snapshotTargetSelector)
+
+        await page.evaluate(() => {
+            document.body.setAttribute('theme', 'dark')
+        })
+
+        await check(page, context, browser, 'dark', storyContext.parameters?.testOptions?.snapshotTargetSelector)
+    }
 }
 
 async function expectStoryToMatchFullPageSnapshot(
     page: Page,
     context: TestContext,
-    browser: SupportedBrowserName
+    browser: SupportedBrowserName,
+    theme: SnapshotTheme
 ): Promise<void> {
-    await expectLocatorToMatchStorySnapshot(page, context, browser)
+    await expectLocatorToMatchStorySnapshot(page, context, browser, theme)
 }
 
 async function expectStoryToMatchSceneSnapshot(
     page: Page,
     context: TestContext,
-    browser: SupportedBrowserName
+    browser: SupportedBrowserName,
+    theme: SnapshotTheme
 ): Promise<void> {
     await page.evaluate(() => {
         // The screenshot gets clipped by the overflow hidden of the sidebar
         document.querySelector('.SideBar')?.setAttribute('style', 'overflow: visible;')
     })
 
-    await expectLocatorToMatchStorySnapshot(page.locator('.main-app-content'), context, browser)
+    await expectLocatorToMatchStorySnapshot(page.locator('.main-app-content'), context, browser, theme)
 }
 
 async function expectStoryToMatchComponentSnapshot(
     page: Page,
     context: TestContext,
     browser: SupportedBrowserName,
+    theme: SnapshotTheme,
     targetSelector: string = '#storybook-root'
 ): Promise<void> {
-    await page.evaluate(() => {
+    await page.evaluate((theme) => {
         const rootEl = document.getElementById('storybook-root')
         if (!rootEl) {
             throw new Error('Could not find root element')
@@ -183,21 +210,27 @@ async function expectStoryToMatchComponentSnapshot(
                 rootEl.style.width = `${-popoverBoundingClientRect.left + currentRootBoundingClientRect.right}px`
             }
         })
-        // Make the body transparent to take the screenshot without background
-        document.body.style.background = 'transparent'
-    })
+        // For legacy style, make the body transparent to take the screenshot without background
+        document.body.style.background = theme === 'legacy' ? 'transparent' : 'var(--bg-3000)'
+    }, theme)
 
-    await expectLocatorToMatchStorySnapshot(page.locator(targetSelector), context, browser, { omitBackground: true })
+    await expectLocatorToMatchStorySnapshot(page.locator(targetSelector), context, browser, theme, {
+        omitBackground: true,
+    })
 }
 
 async function expectLocatorToMatchStorySnapshot(
     locator: Locator | Page,
     context: TestContext,
     browser: SupportedBrowserName,
+    theme: SnapshotTheme,
     options?: LocatorScreenshotOptions
 ): Promise<void> {
     const image = await locator.screenshot({ ...options })
     let customSnapshotIdentifier = context.id
+    if (theme !== 'legacy') {
+        customSnapshotIdentifier += `--${theme}`
+    }
     if (browser !== 'chromium') {
         customSnapshotIdentifier += `--${browser}`
     }

ee/frontend/exports.ts

@@ -0,0 +1,13 @@
+import { PostHogEE } from '@posthog/ee/types'
+
+const myTestCode = (): void => {
+    // eslint-disable-next-line no-console
+    console.log('it works!')
+}
+
+const postHogEE: PostHogEE = {
+    enabled: true,
+    myTestCode,
+}
+
+export default postHogEE

frontend/@posthog/ee/exports.ts

@@ -0,0 +1,7 @@
+import { PostHogEE } from './types'
+
+const posthogEE: PostHogEE = {
+    enabled: false,
+}
+
+export default posthogEE

frontend/@posthog/ee/types.ts

@@ -0,0 +1,5 @@
+// NOTE: All exported items from the EE module _must_ be optionally defined to ensure we work well with FOSS
+export type PostHogEE = {
+    enabled: boolean
+    myTestCode?: () => void
+}

frontend/src/lib/components/CompactList/CompactList.scss

@@ -1,31 +1,31 @@
-.compact-list {
+.CompactList {
     border-radius: var(--radius);
     border: 1px solid var(--border);
-    height: calc(19.25rem);
     background: var(--bg-light);
     box-sizing: content-box;
     display: flex;
     flex-direction: column;
     flex: 1;
+    overflow: hidden;
 
-    .compact-list-header {
-        padding: 0.5rem 1rem 0;
+    .CompactList__header {
+        padding: 0.5rem;
         display: flex;
         align-items: center;
         justify-content: space-between;
 
         h3 {
             margin-bottom: 0;
             font-weight: 600;
-            font-size: 1rem;
+            font-size: 0.9rem;
             line-height: 1.4;
         }
     }
 
-    .scrollable-list {
-        flex: 1;
-        overflow: auto;
-        padding: 0 0.5rem;
+    .CompactList__content {
+        overflow-y: auto;
+        height: 16rem;
+        padding: 0.5rem;
     }
 
     .LemonButton {

frontend/src/lib/components/CompactList/CompactList.tsx

@@ -24,15 +24,15 @@ export function CompactList({
     renderRow,
 }: CompactListProps): JSX.Element {
     return (
-        <div className="compact-list border">
-            <div className="compact-list-header">
-                <h3>{title}</h3>
+        <div className="CompactList">
+            <div className="CompactList__header">
+                <h3 className="px-2 truncate" title={title}>
+                    {title}
+                </h3>
                 {viewAllURL && <LemonButton to={viewAllURL}>View all</LemonButton>}
             </div>
-            <div className="mx-2">
-                <LemonDivider />
-            </div>
-            <div className="scrollable-list">
+            <LemonDivider className="my-0 mx-2" />
+            <div className="CompactList__content">
                 {loading ? (
                     <div className="p-2 space-y-6">
                         {Array.from({ length: 6 }, (_, index) => (

frontend/src/lib/ee.test.ts

@@ -0,0 +1,17 @@
+import fs from 'fs'
+
+const eeFolderExists = fs.existsSync('ee/frontend/exports.ts')
+export const ifEeIt = eeFolderExists ? it : it.skip
+export const ifFossIt = !eeFolderExists ? it : it.skip
+
+import posthogEE from '@posthog/ee/exports'
+
+describe('ee importing', () => {
+    ifEeIt('should import actual ee code', () => {
+        expect(posthogEE.enabled).toBe(true)
+    })
+
+    ifFossIt('should import actual ee code', () => {
+        expect(posthogEE.enabled).toBe(false)
+    })
+})

frontend/src/lib/lemon-ui/LemonButton/LemonButton.stories.tsx

@@ -30,6 +30,9 @@ const meta: Meta<typeof LemonButton> = {
             type: 'function',
         },
     },
+    parameters: {
+        testOptions: { include3000: true },
+    },
 }
 export default meta
 const BasicTemplate: StoryFn<typeof LemonButton> = (props: LemonButtonProps) => {

frontend/src/scenes/persons-management/PersonsManagementScene.stories.tsx

@@ -0,0 +1,37 @@
+import { Meta, StoryFn } from '@storybook/react'
+import { router } from 'kea-router'
+import { useEffect } from 'react'
+import { App } from 'scenes/App'
+import { urls } from 'scenes/urls'
+
+const meta: Meta = {
+    title: 'Scenes-App/Persons & Groups',
+    parameters: {
+        layout: 'fullscreen',
+        viewMode: 'story',
+        mockDate: '2023-07-04', // To stabilize relative dates
+    },
+    decorators: [],
+}
+export default meta
+
+export const Persons: StoryFn = () => {
+    useEffect(() => {
+        router.actions.push(urls.persons())
+    }, [])
+    return <App />
+}
+
+export const Cohorts: StoryFn = () => {
+    useEffect(() => {
+        router.actions.push(urls.cohorts())
+    }, [])
+    return <App />
+}
+
+export const Groups: StoryFn = () => {
+    useEffect(() => {
+        router.actions.push(urls.groups(0))
+    }, [])
+    return <App />
+}

frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx

@@ -95,7 +95,7 @@ export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>(
                     ...(showGroupsIntroductionPage
                         ? [
                               {
-                                  key: 'groups-intro',
+                                  key: 'groups-0',
                                   label: 'Groups',
                                   url: urls.groups(0),
                                   content: <Groups groupTypeIndex={0} />,