JENKINS-70730 Don't remove id inside symbol (#7689)

JENKINS-70730 Don't remove id in symbol
jenkinsci · Mar 28, 2023 · fdb63ea · fdb63ea
1 parent 3a59e07
commit fdb63ea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git 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
@@ -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