More fixes

PostHog · Dec 21, 2023 · 2663bea · 2663bea
1 parent a005e30
commit 2663bea
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 24 deletions.
diff --git a/frontend/src/lib/components/ActivityLog/ActivityLog.tsx b/frontend/src/lib/components/ActivityLog/ActivityLog.tsx
@@ -73,9 +73,11 @@ export const ActivityLogRow = ({
         <div className={clsx('ActivityLogRow', logItem.unread && 'ActivityLogRow--unread')}>
             <ProfilePicture
                 showName={false}
-                name={logItem.isSystem ? logItem.name : undefined}
+                user={{
+                    first_name: logItem.isSystem ? logItem.name : undefined,
+                    email: logItem.email ?? undefined,
+                }}
                 type={logItem.isSystem ? 'system' : 'person'}
-                email={logItem.email ?? undefined}
                 size={'xl'}
             />
             <div className="ActivityLogRow__details">

diff --git a/frontend/src/lib/components/ActivityLog/humanizeActivity.tsx b/frontend/src/lib/components/ActivityLog/humanizeActivity.tsx
@@ -1,4 +1,5 @@
 import { dayjs } from 'lib/dayjs'
+import { fullName } from 'lib/utils'
 
 import { InsightShortId, PersonType } from '~/types'
 
@@ -110,7 +111,7 @@ export function humanize(
         if (description !== null) {
             logLines.push({
                 email: logItem.user?.email,
-                name: logItem.user?.first_name,
+                name: logItem.user ? fullName(logItem.user) : undefined,
                 isSystem: logItem.is_system,
                 description,
                 extendedDescription,
@@ -126,5 +127,5 @@ export function userNameForLogItem(logItem: ActivityLogItem): string {
     if (logItem.is_system) {
         return 'PostHog'
     }
-    return logItem.user?.first_name ?? 'A user'
+    return logItem.user ? fullName(logItem.user) : 'A user'
 }
diff --git a/frontend/src/lib/components/AnnotationsOverlay/AnnotationsOverlay.tsx b/frontend/src/lib/components/AnnotationsOverlay/AnnotationsOverlay.tsx
@@ -258,8 +258,9 @@ function AnnotationCard({ annotation }: { annotation: AnnotationType }): JSX.Ele
             <div className="mt-1">{annotation.content}</div>
             <div className="leading-6 mt-2">
                 <ProfilePicture
-                    name={annotation.creation_type === 'GIT' ? 'GitHub automation' : annotation.created_by?.first_name}
-                    email={annotation.creation_type === 'GIT' ? undefined : annotation.created_by?.email}
+                    user={
+                        annotation.creation_type === 'GIT' ? { first_name: 'GitHub automation' } : annotation.created_by
+                    }
                     showName
                     size="md"
                     type={annotation.creation_type === 'GIT' ? 'bot' : 'person'}

diff --git a/frontend/src/lib/components/MemberSelect.tsx b/frontend/src/lib/components/MemberSelect.tsx
@@ -80,13 +80,7 @@ export function MemberSelect({
                                     fullWidth
                                     role="menuitem"
                                     size="small"
-                                    icon={
-                                        <ProfilePicture
-                                            size="md"
-                                            name={fullName(member.user)}
-                                            email={member.user.email}
-                                        />
-                                    }
+                                    icon={<ProfilePicture size="md" user={member.user} />}
                                     onClick={() => _onChange(member.user)}
                                 >
                                     <span className="flex items-center justify-between gap-2 flex-1">

diff --git a/frontend/src/lib/lemon-ui/LemonSnack/LemonSnack.stories.tsx b/frontend/src/lib/lemon-ui/LemonSnack/LemonSnack.stories.tsx
@@ -44,7 +44,7 @@ export const ComplexContent: Story = BasicTemplate.bind({})
 ComplexContent.args = {
     children: (
         <span className="flex gap-2 items-center">
-            <ProfilePicture email="ben@posthog.com" size="sm" />
+            <ProfilePicture name="ben" size="sm" />
             <span>
                 Look at me I'm <b>bold!</b>
             </span>

diff --git a/frontend/src/lib/lemon-ui/ProfilePicture/ProfileBubbles.tsx b/frontend/src/lib/lemon-ui/ProfilePicture/ProfileBubbles.tsx
@@ -29,8 +29,10 @@ export function ProfileBubbles({ people, tooltip, limit = 6, ...divProps }: Prof
                 {shownPeople.map(({ email, name, title }, index) => (
                     <ProfilePicture
                         key={email}
-                        name={name}
-                        email={email}
+                        user={{
+                            email,
+                            first_name: name,
+                        }}
                         title={title || name || email}
                         size="md"
                         index={index}

diff --git a/frontend/src/scenes/annotations/Annotations.tsx b/frontend/src/scenes/annotations/Annotations.tsx
@@ -102,8 +102,7 @@ export function Annotations(): JSX.Element {
                 return (
                     <div className="flex flex-row items-center">
                         <ProfilePicture
-                            name={creation_type === 'GIT' ? 'GitHub Actions' : created_by?.first_name}
-                            email={creation_type === 'GIT' ? undefined : created_by?.email}
+                            user={creation_type === 'GIT' ? { first_name: 'GitHub Actions' } : created_by}
                             showName
                             size="md"
                             type={creation_type === 'GIT' ? 'bot' : 'person'}

diff --git a/frontend/src/scenes/dashboard/DashboardCollaborators.tsx b/frontend/src/scenes/dashboard/DashboardCollaborators.tsx
@@ -121,7 +121,7 @@ function CollaboratorRow({
 
     return (
         <div className="flex items-center justify-between mt-2 pl-2 h-8">
-            <ProfilePicture email={user.email} name={user.first_name} size="md" showName />
+            <ProfilePicture user={user} size="md" showName />
             <Tooltip
                 title={
                     !wasInvited

diff --git a/frontend/src/scenes/notebooks/Notebook/NotebookHistory.tsx b/frontend/src/scenes/notebooks/Notebook/NotebookHistory.tsx
@@ -51,9 +51,11 @@ function NotebookHistoryList({ onItemClick }: { onItemClick: (logItem: ActivityL
                         const buttonContent = (
                             <span className="flex flex-1 gap-2 items-center p-2">
                                 <ProfilePicture
-                                    name={logItem.is_system ? name : undefined}
+                                    user={{
+                                        first_name: name,
+                                        email: logItem.user?.email ?? undefined,
+                                    }}
                                     type={logItem.is_system ? 'system' : 'person'}
-                                    email={logItem.user?.email ?? undefined}
                                     size={'md'}
                                 />
                                 <span className="flex-1">

diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx b/frontend/src/scenes/notebooks/NotebookSelectButton/NotebookSelectButton.tsx
@@ -57,8 +57,7 @@ function NotebooksChoiceList(props: {
                             sideIcon={
                                 notebook.created_by ? (
                                     <ProfilePicture
-                                        name={notebook.created_by?.first_name}
-                                        email={notebook.created_by?.email}
+                                        user={notebook.created_by}
                                         size="md"
                                         title={`Created by ${notebook.created_by?.first_name} <${notebook.created_by?.email}>`}
                                     />

diff --git a/frontend/src/scenes/settings/organization/Permissions/Roles/CreateRoleModal.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/CreateRoleModal.tsx
@@ -154,7 +154,7 @@ function MemberRow({
 
     return (
         <div className="flex items-center justify-between mt-2 h-8">
-            <ProfilePicture email={user.email} name={user.first_name} size="md" showName />
+            <ProfilePicture user={user} size="md" showName />
             {isAdminOrOwner && deleteMember && (
                 <LemonButton
                     icon={<IconDelete />}

diff --git a/posthog/api/test/test_organization_invites.py b/posthog/api/test/test_organization_invites.py
@@ -88,6 +88,7 @@ def test_add_organization_invite_with_email(self, mock_capture):
                     "distinct_id": self.user.distinct_id,
                     "email": self.user.email,
                     "first_name": self.user.first_name,
+                    "last_name": self.user.last_name,
                     "is_email_verified": self.user.is_email_verified,
                 },
                 "is_expired": False,

diff --git a/posthog/api/test/test_organization_members.py b/posthog/api/test/test_organization_members.py
@@ -97,6 +97,7 @@ def test_change_organization_member_level(self):
                     "uuid": str(user.uuid),
                     "distinct_id": str(user.distinct_id),
                     "first_name": user.first_name,
+                    "last_name": user.last_name,
                     "email": user.email,
                     "is_email_verified": None,
                 },

diff --git a/posthog/api/test/test_signup.py b/posthog/api/test/test_signup.py
@@ -62,6 +62,7 @@ def test_api_sign_up(self, mock_capture):
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "John",
                 "email": "[email protected]",
                 "redirect_url": "/",
@@ -210,6 +211,7 @@ def test_signup_minimum_attrs(self, mock_capture):
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "Jane",
                 "email": "[email protected]",
                 "redirect_url": "/",
@@ -364,6 +366,7 @@ def test_default_dashboard_is_created_on_signup(self):
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "Jane",
                 "email": "[email protected]",
                 "redirect_url": "/",
@@ -868,6 +871,7 @@ def test_api_invite_sign_up(self, mock_capture):
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "Alice",
                 "email": "[email protected]",
                 "redirect_url": "/",
@@ -1076,6 +1080,7 @@ def test_existing_user_can_sign_up_to_a_new_organization(self, mock_update_disti
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "",
                 "email": "[email protected]",
                 "redirect_url": "/",
@@ -1151,6 +1156,7 @@ def test_cannot_use_claim_invite_endpoint_to_update_user(self, mock_capture):
                 "id": user.pk,
                 "uuid": str(user.uuid),
                 "distinct_id": user.distinct_id,
+                "last_name": "",
                 "first_name": "",
                 "email": "[email protected]",
                 "redirect_url": "/",