Skip to content

Commit ce4e847

Browse files
authored
Use user avatars for User causes (jenkinsci#774)
1 parent 7237cf1 commit ce4e847

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItem.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import hudson.model.Cause;
44
import hudson.model.CauseAction;
55
import hudson.model.User;
6+
import hudson.tasks.UserAvatarResolver;
67
import io.jenkins.plugins.pipelinegraphview.Messages;
78
import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem;
8-
import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.Ionicon;
9+
import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.SimpleIcon;
910
import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent;
1011
import java.util.HashMap;
1112
import java.util.List;
@@ -26,8 +27,9 @@ public static Optional<RunDetailsItem> get(WorkflowRun run) {
2627
.map(userIdCause -> (Cause.UserIdCause) userIdCause)
2728
.map(userIdCause -> User.get(userIdCause.getUserId(), false, new HashMap<>()))
2829
.filter(Objects::nonNull)
29-
.map(user -> ItemContent.of(Messages.cause_user(user.getDisplayName())))
30-
.<RunDetailsItem>map(content -> new RunDetailsItem.RunDetail(new Ionicon("person-outline"), content))
30+
.<RunDetailsItem>map(user -> new RunDetailsItem.RunDetail(
31+
new SimpleIcon(UserAvatarResolver.resolve(user, "48x48")),
32+
ItemContent.of(Messages.cause_user(user.getDisplayName()))))
3133
.findAny();
3234
}
3335
}

src/main/resources/io/jenkins/plugins/pipelinegraphview/cards/RunDetailsItem/RunDetail/description.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
33
<div>
4-
<l:icon src="${it.icon()}"/>
4+
<l:icon src="${it.icon()}" class="jenkins-avatar" />
55
<span tooltip="${it.tooltip()}">
66
<st:include page="description.jelly" it="${it.content()}" />
77
</span>

src/main/webapp/js/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ h1 {
4343
color: inherit;
4444
}
4545

46-
svg {
46+
svg, img {
4747
width: 1.125rem;
4848
height: 1.125rem;
4949
}

src/test/java/io/jenkins/plugins/pipelinegraphview/cards/items/UserIdCauseRunDetailsItemTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ void get() {
8080

8181
assertEquals(
8282
new RunDetailsItem.ItemContent.PlainContent(Messages.cause_user("User Id")), userDetails.content());
83-
assertEquals("symbol-person-outline plugin-ionicons-api", userDetails.icon());
83+
assertEquals("symbol-person-circle", userDetails.icon());
8484
}
8585
}

0 commit comments

Comments
 (0)