From fdb63eae90841d2febe77d6feb0f1cb9608dd95b Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Tue, 28 Mar 2023 09:28:31 +0100
Subject: [PATCH] JENKINS-70730 Don't remove id inside symbol (#7689)

JENKINS-70730 Don't remove id in symbol
---
 .../main/java/org/jenkins/ui/symbol/Symbol.java    |  1 -
 .../java/org/jenkins/ui/symbol/SymbolTest.java     | 12 ++++++++++++
 core/src/test/resources/images/symbols/with-id.svg | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/resources/images/symbols/with-id.svg

diff --git a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
index ebb8bbce9b87..2dca039d8e92 100644
--- a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
+++ b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
@@ -94,7 +94,6 @@ private static String loadSymbol(String namespace, String name) {
                      .replaceAll("(class=\").*?(\")", "")
                      .replaceAll("(tooltip=\").*?(\")", "")
                      .replaceAll("(data-html-tooltip=\").*?(\")", "")
-                     .replaceAll("(id=\").*?(\")", "")
                      .replace("stroke:#000", "stroke:currentColor");
     }
 
diff --git a/core/src/test/java/org/jenkins/ui/symbol/SymbolTest.java b/core/src/test/java/org/jenkins/ui/symbol/SymbolTest.java
index 095663ac2810..022fe9873d6f 100644
--- a/core/src/test/java/org/jenkins/ui/symbol/SymbolTest.java
+++ b/core/src/test/java/org/jenkins/ui/symbol/SymbolTest.java
@@ -13,6 +13,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.jvnet.hudson.test.Issue;
 
 public class SymbolTest {
     public static final String SCIENCE_PATH;
@@ -190,4 +191,15 @@ void getSymbol_notSettingTooltipDoesntAddTooltipAttribute_evenWithAmpersand() {
         assertThat(symbol, containsString(SCIENCE_PATH));
         assertThat(symbol, not(containsString("tooltip")));
     }
+
+    @Test
+    @DisplayName("IDs in symbol should not be removed")
+    @Issue("JENKINS-70730")
+    void getSymbol_idInSymbolIsPresent() {
+        String symbol = Symbol.get(new SymbolRequest.Builder()
+                .withId("some-random-id")
+                .withName("with-id").build());
+
+        assertThat(symbol, containsString("id=\"a\""));
+    }
 }
diff --git a/core/src/test/resources/images/symbols/with-id.svg b/core/src/test/resources/images/symbols/with-id.svg
new file mode 100644
index 000000000000..3f08bf374b75
--- /dev/null
+++ b/core/src/test/resources/images/symbols/with-id.svg
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="82"
+    height="82"
+    viewBox="0 0 82 82"
+>
+  <defs>
+    <linearGradient id="a" x1="0%" x2="102%" y1="0%" y2="101%">
+      <stop offset="0%" stop-color="#3023AE"/>
+      <stop offset="100%" stop-color="#C86DD7"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#a)" d="M0 0h82v82H0z"/>
+</svg>