Merge branch 'master' into nullable-materialized-columns

.github/workflows/container-images-cd.yml

@@ -55,9 +55,9 @@ jobs:
               uses: aws-actions/amazon-ecr-login@v2
 
             - name: Login to DockerHub
-              uses: docker/login-action@v2
+              uses: docker/login-action@v3
               with:
-                  username: posthog
+                  username: ${{ secrets.DOCKERHUB_USER }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Build and push container image

.github/workflows/copy-clickhouse-udfs.yml

@@ -0,0 +1,20 @@
+name: Trigger UDFs Workflow
+
+on:
+    push:
+        branches:
+            - master
+        paths:
+            - 'posthog/user_scripts/**'
+
+jobs:
+    trigger_udfs_workflow:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Trigger UDFs Workflow
+              uses: benc-uk/workflow-dispatch@v1
+              with:
+                  workflow: .github/workflows/clickhouse-udfs.yml
+                  repo: posthog/posthog-cloud-infra
+                  token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
+                  ref: refs/heads/main

.github/workflows/pr-deploy.yml

@@ -33,7 +33,7 @@ jobs:
             - name: Login to DockerHub
               uses: docker/login-action@v3
               with:
-                  username: posthog
+                  username: ${{ secrets.DOCKERHUB_USER }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - uses: aws-actions/configure-aws-credentials@v4

.storybook/decorators/withKea/kea-story.tsx

@@ -8,6 +8,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { worker } from '~/mocks/browser'
 import { teamLogic } from 'scenes/teamLogic'
 import { userLogic } from 'scenes/userLogic'
+import { projectLogic } from 'scenes/projectLogic'
 
 export function resetKeaStory(): void {
     worker.resetHandlers()
@@ -18,6 +19,7 @@ export function resetKeaStory(): void {
     initKea({ routerLocation: history.location, routerHistory: history })
     featureFlagLogic.mount()
     teamLogic.mount()
+    projectLogic.mount()
     userLogic.mount()
     router.mount()
     const { store } = getContext()

bin/copy-posthog-js

@@ -6,6 +6,7 @@ set -e
 
 cp node_modules/posthog-js/dist/array.js* frontend/dist/
 cp node_modules/posthog-js/dist/array.full.js* frontend/dist/
+cp node_modules/posthog-js/dist/array.full.es5.js* frontend/dist/
 cp node_modules/posthog-js/dist/recorder.js* frontend/dist/
 cp node_modules/posthog-js/dist/recorder-v2.js* frontend/dist/
 cp node_modules/posthog-js/dist/surveys.js* frontend/dist/

bin/deploy-hobby

@@ -12,6 +12,9 @@ export SENTRY_DSN="${SENTRY_DSN:-'https://[email protected]/1'}"
 POSTHOG_SECRET=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)
 export POSTHOG_SECRET
 
+ENCRYPTION_SALT_KEYS=$(openssl rand -hex 16)
+export ENCRYPTION_SALT_KEYS
+
 # Talk to the user
 echo "Welcome to the single instance PostHog installer 🦔"
 echo ""
@@ -128,6 +131,7 @@ EOF
 # Write .env file
 envsubst > .env <<EOF
 POSTHOG_SECRET=$POSTHOG_SECRET
+ENCRYPTION_SALT_KEYS=$ENCRYPTION_SALT_KEYS
 SENTRY_DSN=$SENTRY_DSN
 DOMAIN=$DOMAIN
 EOF

bin/temporal-django-worker

@@ -2,8 +2,21 @@
 
 set -e
 
-trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+cleanup() {
+    echo "Stopping worker..."
+    if kill -0 "$worker_pid" >/dev/null 2>&1; then
+        kill "$worker_pid"
+    else
+        echo "Worker process is not running."
+    fi
+}
 
-python3 manage.py start_temporal_worker "$@"
+trap cleanup SIGINT SIGTERM EXIT
 
-wait
+python3 manage.py start_temporal_worker "$@" &
+
+worker_pid=$!
+
+wait $worker_pid
+
+cleanup

bin/upgrade-hobby

@@ -3,7 +3,7 @@
 set -e
 
 echo "Upgrading PostHog. This will cause a few minutes of downtime."
-read -r -p "Do you want to upgarde PostHog? [y/N] " response
+read -r -p "Do you want to upgrade PostHog? [y/N] " response
 if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]
 then
     echo "OK!"
@@ -56,6 +56,28 @@ else
 fi
 
 [[ -f ".env" ]] && export $(cat .env | xargs) || ( echo "No .env file found. Please create it with POSTHOG_SECRET and DOMAIN set." && exit 1)
+
+# we introduced ENCRYPTION_SALT_KEYS and so if there isn't one, need to add it
+# check for it in the .env file
+if ! grep -q "ENCRYPTION_SALT_KEYS" .env; then
+    ENCRYPTION_KEY=$(openssl rand -hex 16)
+    echo "ENCRYPTION_SALT_KEYS=$ENCRYPTION_KEY" >> .env
+    echo "Added missing ENCRYPTION_SALT_KEYS to .env file"
+    source .env
+else
+    # Read the existing key
+    EXISTING_KEY=$(grep "ENCRYPTION_SALT_KEYS" .env | cut -d '=' -f2)
+
+    # Check if the existing key is in the correct format (32 bytes base64url)
+    if [[ ! $EXISTING_KEY =~ ^[A-Za-z0-9_-]{32}$ ]]; then
+        echo "ENCRYPTION_SALT_KEYS is not in the correct fernet format and will not work"
+        echo "🛑 Stop this script and do not proceed"
+        echo "remove ENCRYPTION_SALT_KEYS from .env and try again"
+        exit 1
+    fi
+fi
+
+
 export POSTHOG_APP_TAG="${POSTHOG_APP_TAG:-latest-release}"
 
 cd posthog

cypress.e2e.config.ts

@@ -34,7 +34,7 @@ export default defineConfig({
     // cypress default is 'top' this means sometimes the element is underneath the top navbar
     // not what a human would do... so, set it to center to avoid this weird behavior
     scrollBehavior: 'center',
-    retries: {runMode: 2},
+    retries: { runMode: 2 },
     e2e: {
         // We've imported your old cypress plugins here.
         // You may want to clean this up later by importing these.
@@ -101,11 +101,19 @@ export default defineConfig({
                         .on('error', (err) => console.log('Redis client error', err))
                         .connect()
                     // Clear cache
-                    for await (const key of redisClient.scanIterator({ TYPE: 'string', MATCH: '*cache*', COUNT: 500 })) {
+                    for await (const key of redisClient.scanIterator({
+                        TYPE: 'string',
+                        MATCH: '*cache*',
+                        COUNT: 500,
+                    })) {
                         await redisClient.del(key)
                     }
                     // Also clear the more ephemeral async query statuses
-                    for await (const key of redisClient.scanIterator({ TYPE: 'string', MATCH: 'query_async*', COUNT: 500 })) {
+                    for await (const key of redisClient.scanIterator({
+                        TYPE: 'string',
+                        MATCH: 'query_async*',
+                        COUNT: 500,
+                    })) {
                         await redisClient.del(key)
                     }
                     await redisClient.quit()
@@ -117,5 +125,6 @@ export default defineConfig({
         },
         baseUrl: 'http://localhost:8000',
         specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+        chromeWebSecurity: false,
     },
 })

cypress/e2e/alerts.cy.ts

@@ -16,14 +16,22 @@ describe('Alerts', () => {
     const createAlert = (
         name: string = 'Alert name',
         lowerThreshold: string = '100',
-        upperThreshold: string = '200'
+        upperThreshold: string = '200',
+        condition?: string
     ): void => {
         cy.get('[data-attr=more-button]').click()
         cy.contains('Manage alerts').click()
         cy.contains('New alert').click()
 
         cy.get('[data-attr=alertForm-name]').clear().type(name)
         cy.get('[data-attr=subscribed-users').click().type('{downarrow}{enter}')
+
+        if (condition) {
+            cy.get('[data-attr=alertForm-condition').click()
+            cy.contains(condition).click()
+            cy.contains('%').click()
+        }
+
         cy.get('[data-attr=alertForm-lower-threshold').clear().type(lowerThreshold)
         cy.get('[data-attr=alertForm-upper-threshold').clear().type(upperThreshold)
         cy.contains('Create alert').click()
@@ -39,7 +47,6 @@ describe('Alerts', () => {
         cy.get('[data-attr=insight-edit-button]').click()
         cy.get('[data-attr=chart-filter]').click()
         cy.contains(displayType).click()
-        cy.get('.insight-empty-state').should('not.exist')
         cy.get('[data-attr=insight-save-button]').contains('Save').click()
         cy.url().should('not.include', '/edit')
     }
@@ -69,7 +76,7 @@ describe('Alerts', () => {
     })
 
     it('Should warn about an alert deletion', () => {
-        setInsightDisplayTypeAndSave('Number')
+        setInsightDisplayTypeAndSave('Area chart')
 
         createAlert('Alert to be deleted because of a changed insight')
 
@@ -90,4 +97,28 @@ describe('Alerts', () => {
         cy.contains('Manage alerts').click()
         cy.contains('Alert to be deleted because of a changed insight').should('not.exist')
     })
+
+    it('Should allow create and delete a relative alert', () => {
+        cy.get('[data-attr=more-button]').click()
+        // Alerts should be disabled for trends represented with graphs
+        cy.get('[data-attr=manage-alerts-button]').should('have.attr', 'aria-disabled', 'true')
+
+        setInsightDisplayTypeAndSave('Bar chart')
+
+        createAlert('Alert name', '10', '20', 'increases by')
+        cy.reload()
+
+        // Check the alert has the same values as when it was created
+        cy.get('[data-attr=more-button]').click()
+        cy.contains('Manage alerts').click()
+        cy.get('[data-attr=alert-list-item]').contains('Alert name').click()
+        cy.get('[data-attr=alertForm-name]').should('have.value', 'Alert name')
+        cy.get('[data-attr=alertForm-lower-threshold').should('have.value', '10')
+        cy.get('[data-attr=alertForm-upper-threshold').should('have.value', '20')
+        cy.contains('Delete alert').click()
+        cy.wait(2000)
+
+        cy.reload()
+        cy.contains('Alert name').should('not.exist')
+    })
 })

cypress/e2e/billingUpgradeCTA.cy.ts

@@ -21,6 +21,6 @@ describe('Billing Upgrade CTA', () => {
         cy.reload()
 
         cy.get('[data-attr=billing-page-core-upgrade-cta] .LemonButton__content').should('not.exist')
-        cy.get('[data-attr=manage-billing]').should('have.text', 'Manage card details and view past invoices')
+        cy.get('[data-attr=manage-billing]').should('have.text', 'Manage card details and invoices')
     })
 })

cypress/e2e/dashboard-duplication.ts

@@ -7,7 +7,7 @@ describe('duplicating dashboards', () => {
     let dashboardName, insightName, expectedCopiedDashboardName, expectedCopiedInsightName
 
     beforeEach(() => {
-        cy.intercept('POST', /\/api\/projects\/\d+\/dashboards/).as('createDashboard')
+        cy.intercept('POST', /\/api\/environments\/\d+\/dashboards/).as('createDashboard')
 
         dashboardName = randomString('dashboard-')
         expectedCopiedDashboardName = `${dashboardName} (Copy)`

cypress/e2e/dashboard-shared.cy.ts

@@ -2,9 +2,9 @@ import { dashboards } from '../productAnalytics'
 
 describe('Shared dashboard', () => {
     beforeEach(() => {
-        cy.intercept('GET', /api\/projects\/\d+\/insights\/\?.*/).as('loadInsightList')
-        cy.intercept('PATCH', /api\/projects\/\d+\/insights\/\d+\/.*/).as('patchInsight')
-        cy.intercept('POST', /\/api\/projects\/\d+\/dashboards/).as('createDashboard')
+        cy.intercept('GET', /api\/environments\/\d+\/insights\/\?.*/).as('loadInsightList')
+        cy.intercept('PATCH', /api\/environments\/\d+\/insights\/\d+\/.*/).as('patchInsight')
+        cy.intercept('POST', /\/api\/environments\/\d+\/dashboards/).as('createDashboard')
         cy.useSubscriptionStatus('unsubscribed')
 
         cy.clickNavMenu('dashboards')

cypress/e2e/dashboard.cy.ts

@@ -3,9 +3,9 @@ import { randomString } from '../support/random'
 
 describe('Dashboard', () => {
     beforeEach(() => {
-        cy.intercept('GET', /api\/projects\/\d+\/insights\/\?.*/).as('loadInsightList')
-        cy.intercept('PATCH', /api\/projects\/\d+\/insights\/\d+\/.*/).as('patchInsight')
-        cy.intercept('POST', /\/api\/projects\/\d+\/dashboards/).as('createDashboard')
+        cy.intercept('GET', /api\/environments\/\d+\/insights\/\?.*/).as('loadInsightList')
+        cy.intercept('PATCH', /api\/environments\/\d+\/insights\/\d+\/.*/).as('patchInsight')
+        cy.intercept('POST', /\/api\/environments\/\d+\/dashboards/).as('createDashboard')
 
         cy.clickNavMenu('dashboards')
         cy.location('pathname').should('include', '/dashboard')
@@ -306,7 +306,7 @@ describe('Dashboard', () => {
     })
 
     it('Move dashboard item', () => {
-        cy.intercept('PATCH', /api\/projects\/\d+\/dashboards\/\d+\/move_tile.*/).as('moveTile')
+        cy.intercept('PATCH', /api\/environments\/\d+\/dashboards\/\d+\/move_tile.*/).as('moveTile')
 
         const sourceDashboard = randomString('source-dashboard')
         const targetDashboard = randomString('target-dashboard')

cypress/e2e/insights-saved.cy.ts

@@ -30,7 +30,7 @@ describe('Insights - saved', () => {
     })
 
     it('If cache empty, initiate async refresh', () => {
-        cy.intercept('GET', /\/api\/projects\/\d+\/insights\/?\?[^/]*?refresh=async/).as('getInsightsRefreshAsync')
+        cy.intercept('GET', /\/api\/environments\/\d+\/insights\/?\?[^/]*?refresh=async/).as('getInsightsRefreshAsync')
         let newInsightId: string
         createInsight('saved insight').then((insightId) => {
             newInsightId = insightId

cypress/e2e/insights.cy.ts

@@ -53,7 +53,7 @@ describe('Insights', () => {
     })
 
     it('Create new insight and save and continue editing', () => {
-        cy.intercept('PATCH', /\/api\/projects\/\d+\/insights\/\d+\/?/).as('patchInsight')
+        cy.intercept('PATCH', /\/api\/environments\/\d+\/insights\/\d+\/?/).as('patchInsight')
 
         const insightName = randomString('insight-name-')
         createInsight(insightName)

cypress/e2e/notebooks-insights.ts

@@ -0,0 +1,29 @@
+import { insight, savedInsights } from '../productAnalytics'
+
+describe('Notebooks', () => {
+    beforeEach(() => {
+        cy.clickNavMenu('notebooks')
+        cy.location('pathname').should('include', '/notebooks')
+    })
+
+    it(`Can add a HogQL insight`, () => {
+        savedInsights.createNewInsightOfType('SQL')
+        insight.editName('SQL Insight')
+        insight.save()
+        cy.get('[data-attr="notebooks-add-button"]').click()
+        cy.get('[data-attr="notebooks-select-button-create"]').click()
+        cy.get('.ErrorBoundary').should('not.exist')
+        // Detect if table settings are present. They shouldn't appear in the block, but rather on side.
+        cy.get('[data-attr="notebook-node-query"]').get('[data-attr="export-button"]').should('not.exist')
+    })
+    ;['TRENDS', 'FUNNELS', 'RETENTION', 'PATHS', 'STICKINESS', 'LIFECYCLE'].forEach((insightType) => {
+        it(`Can add a ${insightType} insight`, () => {
+            savedInsights.createNewInsightOfType(insightType)
+            insight.editName(`${insightType} Insight`)
+            insight.save()
+            cy.get('[data-attr="notebooks-add-button"]').click()
+            cy.get('[data-attr="notebooks-select-button-create"]').click()
+            cy.get('.ErrorBoundary').should('not.exist')
+        })
+    })
+})

cypress/e2e/notebooks.cy.ts

@@ -3,13 +3,13 @@ import { urls } from 'scenes/urls'
 describe('Notebooks', () => {
     beforeEach(() => {
         cy.fixture('api/session-recordings/recordings.json').then((recordings) => {
-            cy.intercept('GET', /api\/projects\/\d+\/session_recordings\/?\?.*/, { body: recordings }).as(
+            cy.intercept('GET', /api\/environments\/\d+\/session_recordings\/?\?.*/, { body: recordings }).as(
                 'loadSessionRecordingsList'
             )
         })
 
         cy.fixture('api/session-recordings/recording.json').then((recording) => {
-            cy.intercept('GET', /api\/projects\/\d+\/session_recordings\/.*\?.*/, { body: recording }).as(
+            cy.intercept('GET', /api\/environments\/\d+\/session_recordings\/.*\?.*/, { body: recording }).as(
                 'loadSessionRecording'
             )
         })

cypress/e2e/projectHomepage.cy.ts

@@ -1,6 +1,6 @@
 describe('Project Homepage', () => {
     beforeEach(() => {
-        cy.intercept('GET', /\/api\/projects\/\d+\/dashboards\/\d+\//).as('getDashboard')
+        cy.intercept('GET', /\/api\/environments\/\d+\/dashboards\/\d+\//).as('getDashboard')
         cy.clickNavMenu('projecthomepage')
     })
 

cypress/e2e/trends.cy.ts

@@ -6,7 +6,7 @@ describe('Trends', () => {
     })
 
     it('Can load a graph from a URL directly', () => {
-        cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
+        cy.intercept('POST', /api\/environments\/\d+\/query\//).as('loadNewQueryInsight')
 
         // regression test, the graph wouldn't load when going directly to a URL
         cy.visit(