Merge branch 'master' into fix/filtering-out-empty-url-recordings

PostHog · Jun 17, 2024 · df53fbc · df53fbc
2 parents 44f8d4a + f9ed838
commit df53fbc
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 49 deletions.
diff --git a/frontend/src/scenes/data-warehouse/new/sourceWizardLogic.tsx b/frontend/src/scenes/data-warehouse/new/sourceWizardLogic.tsx
@@ -167,6 +167,13 @@ export const SOURCE_DETAILS: Record<ExternalDataSourceType, SourceConfig> = {
                                 label: 'Key pair',
                                 value: 'keypair',
                                 fields: [
+                                    {
+                                        name: 'username',
+                                        label: 'Tunnel username',
+                                        type: 'text',
+                                        required: false,
+                                        placeholder: 'User1',
+                                    },
                                     {
                                         name: 'private_key',
                                         label: 'Tunnel private key',

diff --git a/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx b/frontend/src/scenes/web-analytics/WebAnalyticsNotice.tsx
@@ -16,7 +16,7 @@ export const WebAnalyticsNotice = (): JSX.Element => {
         <LemonBanner type="info" className="my-4">
             <div className="flex items-center flex-wrap gap-2 justify-between">
                 <div className="flex-1 min-w-full sm:min-w-0">
-                    PostHog Web Analytics is in opt-in Beta. Thanks for taking part! We'd love to hear what you think.
+                    PostHog Web Analytics is in open beta. Thanks for taking part! We'd love to hear what you think.
                 </div>
                 {showSupportOptions ? (
                     <span className="flex items-center gap-2">

diff --git a/posthog/session_recordings/queries/session_recording_list_from_filters.py b/posthog/session_recordings/queries/session_recording_list_from_filters.py
@@ -352,7 +352,7 @@ def get_query(self) -> ast.SelectQuery | ast.SelectUnionQuery | None:
                 """
                 SELECT distinct_id
                 FROM person_distinct_ids
-                WHERE person.id = {person_id}
+                WHERE person_id = {person_id}
                 """,
                 {
                     "person_id": ast.Constant(value=self._filter.person_uuid),