Merge pull request quarkusio#40002 from phillip-kruger/dev-ui-title

Fix url encoding issue for Dev UI Page with unusual chars
gsmet · Apr 11, 2024 · 25a82a8 · 25a82a8
2 parents 0bbbfdc + 5e95a7b
commit 25a82a8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...ons/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js b/...ons/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js
@@ -176,7 +176,6 @@ export class RouterController {
 
     addRoute(path, component, name, page, defaultRoute = false) {
         path = this.getPageUrlFor(page);
-        var currentSelection = window.location.pathname;
         const search = new URLSearchParams(window.location.search);
         if (!this.isExistingPath(path)) {
             RouterController.pageMap.set(path, page);

diff --git a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java
@@ -1,5 +1,8 @@
 package io.quarkus.devui.spi.page;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 /**
@@ -61,6 +64,12 @@ protected Page(String icon,
 
     public String getId() {
         String id = this.title.toLowerCase().replaceAll(SPACE, DASH);
+        try {
+            id = URLEncoder.encode(id, StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException ex) {
+            throw new RuntimeException(ex);
+        }
+
         if (!this.isInternal() && this.namespace != null) {
             // This is extension pages in Dev UI
             id = this.namespace.toLowerCase() + SLASH + id;

diff --git a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/PageBuilder.java b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/PageBuilder.java
@@ -42,7 +42,10 @@ public T title(String title) {
 
     @SuppressWarnings("unchecked")
     public T staticLabel(String staticLabel) {
-        this.staticLabel = staticLabel;
+        if (this.staticLabel == null) {
+            this.staticLabel = "";
+        }
+        this.staticLabel = this.staticLabel + " " + staticLabel;
         return (T) this;
     }