thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

style: showing first name for bot profile (#1894)

Browse Source
This commit is contained in:
Dakshesh Jain 2023-08-18 17:15:20 +05:30 committed by GitHub
parent 1f8117c987
commit d825dc5579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app/components/issues/activity.tsx
View File

@ -134,7 +134,9 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
<div <div
className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`} className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
> >
{activityItem.actor_detail.display_name.charAt(0)} {activityItem.actor_detail.is_bot
? activityItem.actor_detail.first_name.charAt(0)
: activityItem.actor_detail.display_name.charAt(0)}
</div> </div>
)} )}
</div> </div>
@ -153,7 +155,9 @@ export const IssueActivitySection: React.FC<Props> = ({ issueId, user }) => {
) : ( ) : (
<Link href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}> <Link href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}>
<a className="text-gray font-medium"> <a className="text-gray font-medium">
{activityItem.actor_detail.display_name} {activityItem.actor_detail.is_bot
? activityItem.actor_detail.first_name
: activityItem.actor_detail.display_name}
</a> </a>
</Link> </Link>
)}{" "} )}{" "}

10
apps/app/components/issues/comment/comment-card.tsx
View File

@ -65,7 +65,11 @@ export const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentD
{comment.actor_detail.avatar && comment.actor_detail.avatar !== "" ? ( {comment.actor_detail.avatar && comment.actor_detail.avatar !== "" ? (
<img <img
src={comment.actor_detail.avatar} src={comment.actor_detail.avatar}
alt={comment.actor_detail.display_name} alt={
comment.actor_detail.is_bot
? comment.actor_detail.first_name + " Bot"
: comment.actor_detail.display_name
}
height={30} height={30}
width={30} width={30}
className="grid h-7 w-7 place-items-center rounded-full border-2 border-custom-border-200" className="grid h-7 w-7 place-items-center rounded-full border-2 border-custom-border-200"
@ -74,7 +78,9 @@ export const CommentCard: React.FC<Props> = ({ comment, onSubmit, handleCommentD
<div <div
className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`} className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
> >
{comment.actor_detail.display_name.charAt(0)} {comment.actor_detail.is_bot
? comment.actor_detail.first_name.charAt(0)
: comment.actor_detail.display_name.charAt(0)}
</div> </div>
)} )}

10
apps/app/components/notifications/notification-card.tsx
View File

@ -80,7 +80,9 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
) : ( ) : (
<div className="w-12 h-12 bg-custom-background-80 rounded-full flex justify-center items-center"> <div className="w-12 h-12 bg-custom-background-80 rounded-full flex justify-center items-center">
<span className="text-custom-text-100 font-medium text-lg"> <span className="text-custom-text-100 font-medium text-lg">
{notification.triggered_by_details.display_name?.[0] ? ( {notification.triggered_by_details.is_bot ? (
notification.triggered_by_details.first_name?.[0]?.toUpperCase()
) : notification.triggered_by_details.display_name?.[0] ? (
notification.triggered_by_details.display_name?.[0]?.toUpperCase() notification.triggered_by_details.display_name?.[0]?.toUpperCase()
) : ( ) : (
<Icon iconName="person" className="h-6 w-6" /> <Icon iconName="person" className="h-6 w-6" />
@ -91,7 +93,11 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
</div> </div>
<div className="space-y-2.5 w-full overflow-hidden"> <div className="space-y-2.5 w-full overflow-hidden">
<div className="text-sm w-full break-words"> <div className="text-sm w-full break-words">
<span className="font-semibold">{notification.triggered_by_details.display_name} </span> <span className="font-semibold">
{notification.triggered_by_details.is_bot
? notification.triggered_by_details.first_name
: notification.triggered_by_details.display_name}{" "}
</span>
{notification.data.issue_activity.field !== "comment" && {notification.data.issue_activity.field !== "comment" &&
notification.data.issue_activity.verb}{" "} notification.data.issue_activity.verb}{" "}
{notification.data.issue_activity.field === "comment" {notification.data.issue_activity.field === "comment"