Restore folder icon for pipelines

jenkinsci · Mar 9, 2024 · e0ad7a7 · e0ad7a7
1 parent 4e6b63e
commit e0ad7a7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepoMetadataAction.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubRepoMetadataAction.java
@@ -36,7 +36,7 @@ public class GitHubRepoMetadataAction extends AvatarMetadataAction {
     /** {@inheritDoc} */
     @Override
     public String getAvatarIconClassName() {
-        return "symbol-logo-github plugin-ionicons-api";
+        return "icon-github-repo";
     }
 
     /** {@inheritDoc} */

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java
@@ -91,6 +91,7 @@
 import net.jcip.annotations.GuardedBy;
 import org.apache.commons.lang.StringUtils;
 import org.jenkins.ui.icon.Icon;
+import org.jenkins.ui.icon.IconFormat;
 import org.jenkins.ui.icon.IconSet;
 import org.jenkins.ui.icon.IconSpec;
 import org.jenkinsci.Symbol;
@@ -1911,6 +1912,27 @@ public List<SCMTrait<? extends SCMTrait<?>>> getTraitsDefaults() {
                     "icon-github-scm-navigator icon-xlg",
                     "plugin/github-branch-source/images/svgs/github-scmnavigator.svg",
                     Icon.ICON_XLARGE_STYLE));
+
+            IconSet.icons.addIcon(new Icon(
+                    "icon-github-repo icon-sm",
+                    "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo",
+                    Icon.ICON_SMALL_STYLE,
+                    IconFormat.EXTERNAL_SVG_SPRITE));
+            IconSet.icons.addIcon(new Icon(
+                    "icon-github-repo icon-md",
+                    "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo",
+                    Icon.ICON_MEDIUM_STYLE,
+                    IconFormat.EXTERNAL_SVG_SPRITE));
+            IconSet.icons.addIcon(new Icon(
+                    "icon-github-repo icon-lg",
+                    "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo",
+                    Icon.ICON_LARGE_STYLE,
+                    IconFormat.EXTERNAL_SVG_SPRITE));
+            IconSet.icons.addIcon(new Icon(
+                    "icon-github-repo icon-xlg",
+                    "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo",
+                    Icon.ICON_XLARGE_STYLE,
+                    IconFormat.EXTERNAL_SVG_SPRITE));
         }
     }
 

diff --git a/src/main/webapp/images/svgs/sprite-github.svg b/src/main/webapp/images/svgs/sprite-github.svg
diff --git a/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java b/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java
@@ -433,7 +433,7 @@ public void fetchActions() throws Exception {
                         Matchers.is(
                                 new ObjectMetadataAction("CloudBeers, Inc.", null, "https://github.com/cloudbeers")),
                         Matchers.is(new GitHubOrgMetadataAction((String) null)),
-                        Matchers.is(new GitHubLink("icon-github-logo", "https://github.com/cloudbeers"))));
+                        Matchers.is(new GitHubLink("https://github.com/cloudbeers"))));
     }
 
     @Test