Merge branch 'master' into delete_test_fixes

PostHog · Jul 31, 2024 · 95548ea · 95548ea
2 parents 96f66c8 + e32c9a9
commit 95548ea
Show file tree

Hide file tree

Showing 82 changed files with 1,008 additions and 441 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2023 PostHog Inc.
+Copyright (c) 2020-2024 PostHog Inc.
 
 Portions of this software are licensed as follows:
 

diff --git a/ee/clickhouse/models/test/__snapshots__/test_cohort.ambr b/ee/clickhouse/models/test/__snapshots__/test_cohort.ambr
@@ -32,7 +32,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 0
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohort.test_cohortpeople_with_not_in_cohort_operator
@@ -66,7 +67,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 0
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohort.test_cohortpeople_with_not_in_cohort_operator.1
@@ -115,7 +117,8 @@
            HAVING max(is_deleted) = 0
            AND (((((NOT has(['something1'], replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), '$some_prop'), '^"|"$', ''))))))) SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
      WHERE 1 = 1
-       AND ((((performed_event_condition_X_level_level_0_level_0_level_0_0)))) SETTINGS optimize_aggregation_in_order=1 ) as person
+       AND ((((performed_event_condition_X_level_level_0_level_0_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                        join_algorithm = 'auto' ) as person
   UNION ALL
   SELECT person_id,
          cohort_id,
@@ -126,7 +129,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 0
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohort.test_cohortpeople_with_not_in_cohort_operator_and_no_precalculation
@@ -181,7 +185,8 @@
                        HAVING max(is_deleted) = 0
                        AND (((((NOT has(['something1'], replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), '$some_prop'), '^"|"$', ''))))))) SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
                  WHERE 1 = 1
-                   AND ((((performed_event_condition_X_level_level_0_level_0_level_0_0)))) SETTINGS optimize_aggregation_in_order=1 ) ))
+                   AND ((((performed_event_condition_X_level_level_0_level_0_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                                    join_algorithm = 'auto' ) ))
   '''
 # ---
 # name: TestCohort.test_cohortpeople_with_not_in_cohort_operator_for_behavioural_cohorts
@@ -211,7 +216,8 @@
           AND event IN ['signup']
         GROUP BY person_id) behavior_query
      WHERE 1 = 1
-       AND (((first_time_condition_X_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order=1 ) as person
+       AND (((first_time_condition_X_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                         join_algorithm = 'auto' ) as person
   UNION ALL
   SELECT person_id,
          cohort_id,
@@ -222,7 +228,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 0
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohort.test_cohortpeople_with_not_in_cohort_operator_for_behavioural_cohorts.1
@@ -257,7 +264,8 @@
         GROUP BY person_id) behavior_query
      WHERE 1 = 1
        AND ((((performed_event_condition_X_level_level_0_level_0_level_0_0))
-             AND ((((NOT first_time_condition_X_level_level_0_level_1_level_0_level_0_level_0_0)))))) SETTINGS optimize_aggregation_in_order=1 ) as person
+             AND ((((NOT first_time_condition_X_level_level_0_level_1_level_0_level_0_level_0_0)))))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                                               join_algorithm = 'auto' ) as person
   UNION ALL
   SELECT person_id,
          cohort_id,
@@ -268,7 +276,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 0
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohort.test_static_cohort_precalculated

diff --git a/ee/clickhouse/queries/enterprise_cohort_query.py b/ee/clickhouse/queries/enterprise_cohort_query.py
@@ -85,7 +85,7 @@ def get_query(self) -> tuple[str, dict[str, Any]]:
         {q}
         WHERE 1 = 1
         {conditions}
-        SETTINGS optimize_aggregation_in_order=1
+        SETTINGS optimize_aggregation_in_order = 1, join_algorithm = 'auto'
         """
 
         return final_query, self.params

diff --git a/ee/clickhouse/queries/test/__snapshots__/test_cohort_query.ambr b/ee/clickhouse/queries/test/__snapshots__/test_cohort_query.ambr
@@ -46,7 +46,8 @@
   WHERE 1 = 1
     AND ((((performed_event_condition_None_level_level_0_level_0_level_0_0)
            OR (performed_event_condition_None_level_level_0_level_0_level_1_0))
-          AND ((first_time_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order=1
+          AND ((first_time_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                       join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_cohort_filter_with_another_cohort_with_event_sequence
@@ -117,7 +118,8 @@
         AND (((has(['test'], replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), 'name'), '^"|"$', ''))))) SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = funnel_query.person_id
   WHERE 1 = 1
     AND ((((steps_0))
-          AND (steps_1))) SETTINGS optimize_aggregation_in_order=1
+          AND (steps_1))) SETTINGS optimize_aggregation_in_order = 1,
+                                   join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_cohort_filter_with_extra
@@ -159,7 +161,8 @@
         HAVING max(is_deleted) = 0
         AND ((((has(['test'], replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), 'name'), '^"|"$', '')))))) SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
   WHERE 1 = 1
-    AND (((performed_event_condition_None_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order=1
+    AND (((performed_event_condition_None_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                              join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_cohort_filter_with_extra.1
@@ -197,7 +200,8 @@
         HAVING max(is_deleted) = 0 SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
   WHERE 1 = 1
     AND ((((has(['test'], replaceRegexpAll(JSONExtractRaw(person_props, 'name'), '^"|"$', ''))))
-          OR ((performed_event_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order=1
+          OR ((performed_event_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                           join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_performed_event_sequence
@@ -240,7 +244,8 @@
              AND timestamp >= now() - INTERVAL 7 day ))
      GROUP BY person_id) funnel_query
   WHERE 1 = 1
-    AND (((steps_0))) SETTINGS optimize_aggregation_in_order=1
+    AND (((steps_0))) SETTINGS optimize_aggregation_in_order = 1,
+                               join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_performed_event_sequence_and_clause_with_additional_event
@@ -288,7 +293,8 @@
      GROUP BY person_id) funnel_query
   WHERE 1 = 1
     AND (((steps_0)
-          OR (performed_event_multiple_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order=1
+          OR (performed_event_multiple_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_performed_event_sequence_with_person_properties
@@ -351,7 +357,8 @@
         AND ((has(['[email protected]'], replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), 'email'), '^"|"$', '')))) SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = funnel_query.person_id
   WHERE 1 = 1
     AND (((steps_0)
-          AND (performed_event_multiple_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order=1
+          AND (performed_event_multiple_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                           join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_performed_event_with_event_filters_and_explicit_date
@@ -378,7 +385,8 @@
        AND timestamp >= now() - INTERVAL 4 day
      GROUP BY person_id) behavior_query
   WHERE 1 = 1
-    AND (((performed_event_condition_None_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order=1
+    AND (((performed_event_condition_None_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                              join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_person
@@ -416,7 +424,8 @@
         HAVING max(is_deleted) = 0 SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
   WHERE 1 = 1
     AND (((performed_event_condition_None_level_level_0_level_0_0)
-          OR (has(['[email protected]'], replaceRegexpAll(JSONExtractRaw(person_props, '$sample_field'), '^"|"$', ''))))) SETTINGS optimize_aggregation_in_order=1
+          OR (has(['[email protected]'], replaceRegexpAll(JSONExtractRaw(person_props, '$sample_field'), '^"|"$', ''))))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                                                                  join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_person_materialized
@@ -454,7 +463,8 @@
         HAVING max(is_deleted) = 0 SETTINGS optimize_aggregation_in_order = 1)) person ON person.person_id = behavior_query.person_id
   WHERE 1 = 1
     AND (((performed_event_condition_None_level_level_0_level_0_0)
-          OR (has(['[email protected]'], "pmat_$sample_field")))) SETTINGS optimize_aggregation_in_order=1
+          OR (has(['[email protected]'], "pmat_$sample_field")))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_person_properties_with_pushdowns
@@ -506,7 +516,8 @@
     AND ((((performed_event_condition_None_level_level_0_level_0_level_0_0)
            OR (performed_event_condition_None_level_level_0_level_0_level_1_0)
            OR (has(['special'], replaceRegexpAll(JSONExtractRaw(person_props, 'name'), '^"|"$', ''))))
-          AND ((first_time_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order=1
+          AND ((first_time_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                       join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_person_props_only
@@ -596,7 +607,8 @@
              (SELECT person_id as id
               FROM person_static_cohort
               WHERE cohort_id = 2
-                AND team_id = 2)))) SETTINGS optimize_aggregation_in_order=1
+                AND team_id = 2)))) SETTINGS optimize_aggregation_in_order = 1,
+                                             join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_static_cohort_filter_with_extra
@@ -646,7 +658,8 @@
               FROM person_static_cohort
               WHERE cohort_id = 2
                 AND team_id = 2))
-          AND (performed_event_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order=1
+          AND (performed_event_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                  join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_static_cohort_filter_with_extra.2
@@ -687,7 +700,8 @@
                FROM person_static_cohort
                WHERE cohort_id = 2
                  AND team_id = 2)))
-          OR ((performed_event_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order=1
+          OR ((performed_event_condition_None_level_level_0_level_1_level_0_0)))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                           join_algorithm = 'auto'
   '''
 # ---
 # name: TestCohortQuery.test_unwrapping_static_cohort_filter_hidden_in_layers_of_cohorts
@@ -742,6 +756,7 @@
                    FROM person_static_cohort
                    WHERE cohort_id = 2
                      AND team_id = 2)))
-          OR (performed_event_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order=1
+          OR (performed_event_condition_None_level_level_0_level_1_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                                 join_algorithm = 'auto'
   '''
 # ---
diff --git a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr
@@ -1035,7 +1035,8 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 1
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
 # name: TestExperimentAuxiliaryEndpoints.test_create_exposure_cohort_for_experiment_with_custom_action_filters_exposure.1
@@ -1095,7 +1096,8 @@
           AND timestamp >= now() - INTERVAL 6 day
         GROUP BY person_id) behavior_query
      WHERE 1 = 1
-       AND (((performed_event_condition_X_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order=1 ) as person
+       AND (((performed_event_condition_X_level_level_0_level_0_0))) SETTINGS optimize_aggregation_in_order = 1,
+                                                                              join_algorithm = 'auto' ) as person
   UNION ALL
   SELECT person_id,
          cohort_id,
@@ -1106,6 +1108,7 @@
   WHERE team_id = 2
     AND cohort_id = 2
     AND version < 1
-    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1
+    AND sign = 1 SETTINGS optimize_aggregation_in_order = 1,
+                          join_algorithm = 'auto'
   '''
 # ---
diff --git a/...snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png b/...snapshots__/scenes-app-insights--funnel-top-to-bottom-breakdown-edit--light.png
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-docs--dark.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-docs--dark.png
diff --git a/frontend/__snapshots__/scenes-app-sidepanels--side-panel-docs--light.png b/frontend/__snapshots__/scenes-app-sidepanels--side-panel-docs--light.png
diff --git a/frontend/public/services/mailjet.png b/frontend/public/services/mailjet.png
diff --git a/frontend/src/layout/ErrorBoundary/ErrorBoundary.tsx b/frontend/src/layout/ErrorBoundary/ErrorBoundary.tsx
@@ -1,12 +1,13 @@
 import './ErrorBoundary.scss'
 
-import { IconChevronDown } from '@posthog/icons'
 import { ErrorBoundary as SentryErrorBoundary, getCurrentHub } from '@sentry/react'
-import { HelpButton } from 'lib/components/HelpButton/HelpButton'
+import { useActions } from 'kea'
+import { supportLogic } from 'lib/components/Support/supportLogic'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
 
 export function ErrorBoundary({ children }: { children?: React.ReactNode }): JSX.Element {
     const isSentryInitialized = !!getCurrentHub().getClient()
+    const { openSupportForm } = useActions(supportLogic)
 
     return (
         <SentryErrorBoundary
@@ -28,15 +29,16 @@ export function ErrorBoundary({ children }: { children?: React.ReactNode }): JSX
                         {isSentryInitialized && eventId?.match(/[^0]/)
                             ? `We've registered this event for analysis (ID ${eventId}), but feel free to contact us directly too.`
                             : 'Please help us resolve the issue by sending a screenshot of this message.'}
-                        <HelpButton
-                            customComponent={
-                                <LemonButton type="primary" sideIcon={<IconChevronDown />}>
-                                    Contact PostHog
-                                </LemonButton>
-                            }
-                            customKey="error-boundary"
-                            contactOnly
-                        />
+                        <LemonButton
+                            type="primary"
+                            fullWidth
+                            center
+                            onClick={() => openSupportForm({ kind: 'bug', isEmailFormOpen: true })}
+                            targetBlank
+                            className="mt-2"
+                        >
+                            Email an engineer
+                        </LemonButton>
                     </>
                 </div>
             )}

diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
@@ -1025,10 +1025,14 @@ const api = {
                     return new ApiRequest().insightsActivity(teamId)
                 },
                 [ActivityScope.PLUGIN]: () => {
-                    return new ApiRequest().pluginsActivity()
+                    return activityLogProps.id
+                        ? new ApiRequest().pluginConfig(activityLogProps.id as number, teamId).withAction('activity')
+                        : new ApiRequest().plugins().withAction('activity')
                 },
                 [ActivityScope.PLUGIN_CONFIG]: () => {
-                    return new ApiRequest().pluginsActivity()
+                    return activityLogProps.id
+                        ? new ApiRequest().pluginConfig(activityLogProps.id as number, teamId).withAction('activity')
+                        : new ApiRequest().plugins().withAction('activity')
                 },
                 [ActivityScope.DATA_MANAGEMENT]: () => {
                     return new ApiRequest().dataManagementActivity()

diff --git a/frontend/src/lib/components/ActivityLog/activityLogLogic.plugin.test.tsx b/frontend/src/lib/components/ActivityLog/activityLogLogic.plugin.test.tsx
@@ -16,7 +16,10 @@ describe('the activity log logic', () => {
     })
 
     describe('humanizing plugins', () => {
-        const pluginTestSetup = makeTestSetup(ActivityScope.PLUGIN, '/api/organizations/:id/plugins/activity')
+        const pluginTestSetup = makeTestSetup(
+            ActivityScope.PLUGIN,
+            '/api/projects/:id/plugin_configs/:config_id/activity'
+        )
         it('can handle installation of a plugin', async () => {
             const logic = await pluginTestSetup('the installed plugin', 'installed', null)
             const actual = logic.values.humanizedActivity

diff --git a/frontend/src/lib/components/ActivityLog/complex.sql b/frontend/src/lib/components/ActivityLog/complex.sql