From c9c331ad7886db7591044ef04ee614c56579c29d Mon Sep 17 00:00:00 2001
From: Alex Tumanov <oleksii.tumanov@gmail.com>
Date: Mon, 7 Sep 2026 11:36:58 -0500
Subject: [PATCH] Restore iconOnly summary link behavior (#27353)

Co-authored-by: Alex Tumanov <6143578+oleksii-tumanov@users.noreply.github.com>
---
 .../main/resources/lib/hudson/summary.jelly   | 11 ++-
 .../src/test/java/lib/hudson/SummaryTest.java | 97 +++++++++++++++++++
 .../SummaryTest/TestRootAction/index.jelly    | 48 +++++++++
 3 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 test/src/test/java/lib/hudson/SummaryTest.java
 create mode 100644 test/src/test/resources/lib/hudson/SummaryTest/TestRootAction/index.jelly

diff --git a/core/src/main/resources/lib/hudson/summary.jelly b/core/src/main/resources/lib/hudson/summary.jelly
index a9945322b4..d21283a05f 100644
--- a/core/src/main/resources/lib/hudson/summary.jelly
+++ b/core/src/main/resources/lib/hudson/summary.jelly
@@ -46,7 +46,16 @@ THE SOFTWARE.
     <j:if test="${attrs.icon!=null}">
       <tr class="app-summary">
         <td>
-          <l:icon src="${icon}" />
+          <j:choose>
+            <j:when test="${attrs.href!=null}">
+              <a href="${attrs.href}">
+                <l:icon src="${icon}" />
+              </a>
+            </j:when>
+            <j:otherwise>
+              <l:icon src="${icon}" />
+            </j:otherwise>
+          </j:choose>
         </td>
         <td style="vertical-align:middle">
           <j:choose>
diff --git a/test/src/test/java/lib/hudson/SummaryTest.java b/test/src/test/java/lib/hudson/SummaryTest.java
new file mode 100644
index 0000000000..137dc6052b
--- /dev/null
+++ b/test/src/test/java/lib/hudson/SummaryTest.java
@@ -0,0 +1,97 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2026, Jenkins project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package lib.hudson;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+
+import hudson.model.InvisibleAction;
+import hudson.model.RootAction;
+import org.htmlunit.html.DomNodeList;
+import org.htmlunit.html.HtmlElement;
+import org.htmlunit.html.HtmlPage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestExtension;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
+
+@WithJenkins
+class SummaryTest {
+
+    private JenkinsRule j;
+
+    @BeforeEach
+    void setUp(JenkinsRule rule) {
+        j = rule;
+    }
+
+    @Test
+    void iconOnlyLinksIconButNotBody() throws Exception {
+        HtmlPage page = j.createWebClient().goTo("summary");
+
+        HtmlElement summary = page.getHtmlElementById("icon-only-summary");
+        DomNodeList<HtmlElement> anchors = summary.getElementsByTagName("a");
+        assertThat(anchors.size(), is(1));
+        assertThat(anchors.get(0).getAttribute("href"), is("target"));
+        assertThat(anchors.get(0).getElementsByTagName("svg").getFirst(), notNullValue());
+        assertThat(anchors.get(0).getTextContent(), not(containsString("Icon-only body")));
+        assertThat(summary.getTextContent(), containsString("Icon-only body"));
+    }
+
+    @Test
+    void hrefLinksIconAndBodyByDefault() throws Exception {
+        HtmlPage page = j.createWebClient().goTo("summary");
+
+        HtmlElement summary = page.getHtmlElementById("default-summary");
+        DomNodeList<HtmlElement> anchors = summary.getElementsByTagName("a");
+        assertThat(anchors.size(), is(2));
+        assertThat(anchors.get(0).getAttribute("href"), is("target"));
+        assertThat(anchors.get(0).getElementsByTagName("svg").getFirst(), notNullValue());
+        assertThat(anchors.get(1).getAttribute("href"), is("target"));
+        assertThat(anchors.get(1).getTextContent(), containsString("Default body"));
+    }
+
+    @Test
+    void withoutHrefDoesNotLinkIconOrBody() throws Exception {
+        HtmlPage page = j.createWebClient().goTo("summary");
+
+        HtmlElement summary = page.getHtmlElementById("no-href-summary");
+        assertThat(summary.getElementsByTagName("a").size(), is(0));
+        assertThat(summary.getTextContent(), containsString("No href body"));
+    }
+
+    @TestExtension
+    public static class TestRootAction extends InvisibleAction implements RootAction {
+
+        @Override
+        public String getUrlName() {
+            return "summary";
+        }
+    }
+}
diff --git a/test/src/test/resources/lib/hudson/SummaryTest/TestRootAction/index.jelly b/test/src/test/resources/lib/hudson/SummaryTest/TestRootAction/index.jelly
new file mode 100644
index 0000000000..936fe66bda
--- /dev/null
+++ b/test/src/test/resources/lib/hudson/SummaryTest/TestRootAction/index.jelly
@@ -0,0 +1,48 @@
+<!--
+The MIT License
+
+Copyright (c) 2026, Jenkins project contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+<l:layout title="">
+  <l:main-panel>
+    <table id="icon-only-summary">
+      <t:summary icon="symbol-search" href="target" iconOnly="true">
+        Icon-only body
+      </t:summary>
+    </table>
+
+    <table id="default-summary">
+      <t:summary icon="symbol-search" href="target">
+        Default body
+      </t:summary>
+    </table>
+
+    <table id="no-href-summary">
+      <t:summary icon="symbol-search">
+        No href body
+      </t:summary>
+    </table>
+  </l:main-panel>
+</l:layout>
+</j:jelly>