Skip to content

Restore compatibility for CredentialsStore implementing IconSpec #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglick merged 1 commit into from
Jan 5, 2026
+10 −4
Merged

Restore compatibility for CredentialsStore implementing IconSpec #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
import hudson.tasks.UserAvatarResolver;
import jenkins.model.Jenkins;
import org.apache.commons.lang3.StringUtils;
import org.jenkins.ui.icon.IconSpec;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest2;
import org.springframework.security.core.Authentication;
Expand Down Expand Up @@ -535,9 +538,12 @@
* Returns the icon class name of the {@link #getContext()} of this {@link CredentialsStore}.
*
* @return the icon class name for the store.
* @since TODO
*/
public final String getIconClassName() {
@Restricted(DoNotUse.class) // Jelly
public final String getContextIconClassName() {
if (this instanceof IconSpec iconSpec) {
return iconSpec.getIconClassName();

Check warning on line 545 in src/main/java/com/cloudbees/plugins/credentials/CredentialsStore.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 544-545 are not covered by tests
}
ModelObject context = getContext();
if (context instanceof User user) {
return UserAvatarResolver.resolve(user, "96x96");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/com/cloudbees/plugins/credentials/ViewCredentialsAction/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
<div class="credentials-card__details">
<a href="${storeAction==null?d.store.relativeLinkToAction:d.store.relativeLinkToContext+'credentials/store/'+storeAction.urlName}">
<l:icon src="${d.store.iconClassName}" class="jenkins-avatar" tooltip="${d.provider.displayName}"/>
<l:icon src="${d.store.contextIconClassName}" class="jenkins-avatar" tooltip="${d.provider.displayName}"/>
${d.store.context == app ? d.store.displayName : d.store.contextDisplayName}
</a>
<span>-</span>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/lib/credentials/store.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ THE SOFTWARE.
<div class="credentials-card">
<div class="credentials-card__inner credentials-card__inner--split">
<div class="credentials-card__title">
<l:icon src="${store.iconClassName}" class="jenkins-avatar" tooltip="${store.provider.displayName}"/>
<l:icon src="${store.contextIconClassName}" class="jenkins-avatar" tooltip="${store.provider.displayName}"/>
<a href="${storeAction==null?store.relativeLinkToAction:store.relativeLinkToContext+'credentials/store/'+storeAction.urlName}">
${store.context == app ? store.displayName : store.contextDisplayName}
</a>
Expand Down
Loading