Make iconXml private, rename to icon

jenkinsci · Dec 11, 2024 · 809d2e6 · 809d2e6
1 parent 1b9faa8
commit 809d2e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
@@ -277,23 +277,23 @@ public static class Item {
 
         private final String type;
 
-        public final String iconXml;
+        private final String icon;
 
         public Item(String name) {
             this(name, null, null);
         }
 
-        public Item(String name, String url, String iconXml) {
+        public Item(String name, String url, String icon) {
             this.name = name;
             this.url = url;
-            this.iconXml = iconXml;
+            this.icon = icon;
             this.type = "symbol";
         }
 
-        public Item(String name, String url, String iconXml, String type) {
+        public Item(String name, String url, String icon, String type) {
             this.name = name;
             this.url = url;
-            this.iconXml = iconXml;
+            this.icon = icon;
             this.type = type;
         }
 
@@ -303,8 +303,8 @@ public String getUrl() {
         }
 
         @Exported
-        public String getIconXml() {
-            return iconXml;
+        public String getIcon() {
+            return icon;
         }
 
         @Exported

diff --git a/src/main/js/components/command-palette/datasources.js b/src/main/js/components/command-palette/datasources.js
@@ -17,7 +17,7 @@ export const JenkinsSearchSource = {
       rsp.json().then((data) => {
         return data["suggestions"].slice().map((e) =>
           LinkResult({
-            icon: e.iconXml,
+            icon: e.icon,
             type: e.type,
             label: e.name,
             url: correctAddress(e.url),

diff --git a/src/main/js/components/command-palette/models.js b/src/main/js/components/command-palette/models.js
@@ -5,7 +5,7 @@ import { xmlEscape } from "@/util/security";
  * @param {Object} params
  * @param {string} params.icon
  * @param {string} params.label
- * @param {string} params.type
+ * @param {'symbol' | 'image'} params.type
  * @param {string} params.url
  * @param {boolean | undefined} params.isExternal
  */