From a1863c00ac53873813fdf1889bf658bad517f226 Mon Sep 17 00:00:00 2001 From: melloware Date: Tue, 1 Jul 2025 08:08:41 -0400 Subject: [PATCH 1/2] Fix #81: Cleanup pgAdmin dev service --- .../deployment/devui/EmbeddedPostgreSQLDevUIProcessor.java | 5 +++-- .../postgresql/deployment/devui/PgAdminProcessor.java | 4 ++++ runtime/src/main/resources/META-INF/quarkus-extension.yaml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/EmbeddedPostgreSQLDevUIProcessor.java b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/EmbeddedPostgreSQLDevUIProcessor.java index e6988b3..50bacc7 100644 --- a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/EmbeddedPostgreSQLDevUIProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/EmbeddedPostgreSQLDevUIProcessor.java @@ -33,9 +33,10 @@ void createVersion(BuildProducer cardPageBuildItemBuildProduc .dynamicLabelJsonRPCMethodName("getDatasourcePort"); card.addPage(portPage); - final PageBuilder pgAdminPage = Page.externalPageBuilder("Postgre Admin UI") + final PageBuilder pgAdminPage = Page.externalPageBuilder("pgAdmin UI") .icon("font-awesome-solid:database") - .url(managementBase); + .url(managementBase, managementBase) + .isHtmlContent(); card.addPage(pgAdminPage); card.setCustomCard("qwc-embedded-postgresql-card.js"); diff --git a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java index c714341..3601e99 100644 --- a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java @@ -17,16 +17,20 @@ import io.quarkiverse.embedded.postgresql.devui.PgAdminUiProxy; import io.quarkus.deployment.IsDevelopment; import io.quarkus.deployment.IsLocalDevelopment; +import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.DevServicesResultBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; +@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class) public class PgAdminProcessor { private final static String CONTAINER_ID = "quarkus-embedded-postgresql-pgadmin"; diff --git a/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 2bb4187..14c87fd 100644 --- a/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,7 @@ metadata: - "data" config: - "quarkus.embedded.postgresql." + - "quarkus.pgadmin-ui." status: "preview" guide: "https://quarkiverse.github.io/quarkiverse-docs/quarkus-embedded-postgresql/dev/index.html" icon-url: "https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg" \ No newline at end of file From 1677e70764d8f4d7791491c42fcefa1675f353fb Mon Sep 17 00:00:00 2001 From: Melloware Date: Thu, 3 Jul 2025 13:27:25 -0400 Subject: [PATCH 2/2] Update PgAdminProcessor.java --- .../postgresql/deployment/devui/PgAdminProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java index 3601e99..52626f8 100644 --- a/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/embedded/postgresql/deployment/devui/PgAdminProcessor.java @@ -25,12 +25,12 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.DevServicesResultBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; -import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.dev.devservices.DevServicesConfig; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; -@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class) +@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class) public class PgAdminProcessor { private final static String CONTAINER_ID = "quarkus-embedded-postgresql-pgadmin";