Dev console fixes and layout improvements #14244

phillip-kruger · 2021-01-12T08:51:07Z

Signed-off-by:Phillip Kruger [email protected]
Fix #14216

This PR Contains a few small fixes related to the new non-application path and dev console.

Dev Console

Fixed case where httpRoot is set (did not work)
Pass httpRoot and frameworkRoot to all templates
Make config available in templates
Removed hardcoded /q from main.html

Health UI

Fixed case where httpRoot is set
Fixed wrong ui dependency in health UI (runtime vs deploy)
Added embeded.html to expose health UI links
Removed hardcoded health-ui and replaced with config lookup

GraphQL UI

Fixed case where httpRoot is set
Removed hardcoded /q from embedded.html
Removed hardcoded graphql-ui and replaced with config lookup

Swagger UI

Removed hardcoded /q from embedded.html
Removed hardcoded swagger-ui and replaced with config lookup
Fixed case where httpRoot is set

ghost · 2021-01-12T08:51:09Z

Thanks for your pull request!

The title of your pull request does not follow our editorial rules. Could you have a look?

title should not end up with dot

This message is automatically generated by a bot.

FroMage

Looks good, except two verifications and a disagreement about slashes ;)

...eployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java

extensions/smallrye-health/deployment/src/main/resources/dev-templates/embedded.html

...ment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java

...eployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java

...ment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java

gsmet · 2021-01-12T11:11:39Z

I just pushed my changes to this branch as we will collaborate with Phillip.

gsmet

Please don't merge, we are iterating with @phillip-kruger (but I still want the CI to run so don't want to make it draft).

gsmet · 2021-01-12T13:14:21Z

We have a test failure:

Error:  io.quarkus.vertx.web.SimpleRouteTest.testSimpleRoute  Time elapsed: 1.125 s  <<< FAILURE!
java.lang.AssertionError: 
1 expectation failed.
Expected status code <405> but was <404>.

Looks like the fact that GET on /delete is not supported now get you status 404 instead of 405.

kenfinnigan · 2021-01-12T13:27:34Z

...tp/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java

        this.engine = engine;
+        this.globalData.put("httpRootPath", httpRootPath);
+        this.globalData.put("frameworkRootPath", frameworkRootPath);


Should this be named "nonApplicationRootPath" instead of "frameworkRootPath" to align with the name elsewhere?

Signed-off-by: Phillip Kruger <[email protected]>

Using externally hosted resources will not work when not connected to the Internet.

Most of the icons were copy/pasted from the first examples.

Otherwise it causes the installation of the root static handler and Vert.x Web tests start to fail.

Signed-off-by:Phillip Kruger <[email protected]>

…ace with config lookup Signed-off-by:Phillip Kruger <[email protected]>

…ys set Especially when running tests.

phillip-kruger requested review from FroMage and kenfinnigan January 12, 2021 08:51

ghost added area/graphql area/health area/openapi area/smallrye area/swagger-ui area/vertx labels Jan 12, 2021

phillip-kruger changed the title ~~Some more nonApplicationPath fixes.~~ Non-application path and Dev console fixes. Jan 12, 2021

phillip-kruger added the triage/backport? label Jan 12, 2021

phillip-kruger changed the title ~~Non-application path and Dev console fixes.~~ Non-application path and Dev console fixes Jan 12, 2021

FroMage requested changes Jan 12, 2021

View reviewed changes

phillip-kruger requested review from FroMage and gsmet January 12, 2021 10:44

FroMage requested changes Jan 12, 2021

View reviewed changes

...eployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java Show resolved Hide resolved

...ment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java Show resolved Hide resolved

FroMage approved these changes Jan 12, 2021

View reviewed changes

ghost added the area/core label Jan 12, 2021

gsmet requested changes Jan 12, 2021

View reviewed changes

ghost added area/arc Issue related to ARC (dependency injection) area/cache area/flyway area/kubernetes area/liquibase area/qute The template engine area/rest area/scheduler labels Jan 12, 2021

gsmet changed the title ~~Non-application path and Dev console fixes~~ Dev console fixes and layout improvements Jan 12, 2021

kenfinnigan approved these changes Jan 12, 2021

View reviewed changes

phillip-kruger and others added 16 commits January 12, 2021 17:49

Non-application path and Dev console fixes

bf28a6d

Signed-off-by: Phillip Kruger <[email protected]>

Support deploying from directory in WebJarUtil

d55d979

DEV Console - Use locally deployed resources

c2c310e

Using externally hosted resources will not work when not connected to the Internet.

DEV Console - Make breadcrumb prettier

77ef48f

DEV Console - Improve index page

d8d6353

Allow usage of the Bootstrap Icons font

af0b1fc

Switch to Font Awesome and also pick better icons

e838ce5

Most of the icons were copy/pasted from the first examples.

DEV Console - Move static resources outside of META-INF/resources/

8fe8076

Otherwise it causes the installation of the root static handler and Vert.x Web tests start to fail.

Added dark top banner and application name

c7806b7

Signed-off-by:Phillip Kruger <[email protected]>

Allow using a fluid layout when we have large tables

962c92a

DEV Console - Improve layout of forms

4986e6e

DEV Console - Minor adjustments

3b0db83

DEV Console - Adjust titles so that they are not redundant

0c35081

DEV Console - Small adjustments to new Qute additions

118d255

Dev console - make it possible to output config properties

28954d9

Dev console config editor - fix NPE if application.properties missing

21856c2

ghost added the area/documentation label Jan 12, 2021

gsmet approved these changes Jan 12, 2021

View reviewed changes

gsmet and others added 3 commits January 12, 2021 18:29

DEV Console - Use Font Awesome icons for GraphQL

4686474

Replaced the hardcoded paths in the extensions embedded.html and repl…

17283c9

…ace with config lookup Signed-off-by:Phillip Kruger <[email protected]>

quarkus.application.name and quarkus.application.version are not alwa…

08cb956

…ys set Especially when running tests.

gsmet merged commit 10610fb into quarkusio:master Jan 12, 2021

ghost added this to the 1.12 - master milestone Jan 12, 2021

gsmet modified the milestones: 1.12 - master, 1.11.0.Final Jan 12, 2021

gsmet removed the triage/backport? label Jan 12, 2021

gsmet mentioned this pull request Jan 18, 2021

Dev console config editor - fix NPE if application.properties missing #14256

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev console fixes and layout improvements #14244

Dev console fixes and layout improvements #14244

phillip-kruger commented Jan 12, 2021 •

edited

Loading

ghost commented Jan 12, 2021

FroMage left a comment

gsmet commented Jan 12, 2021

gsmet left a comment

gsmet commented Jan 12, 2021

kenfinnigan Jan 12, 2021

Dev console fixes and layout improvements #14244

Dev console fixes and layout improvements #14244

Conversation

phillip-kruger commented Jan 12, 2021 • edited Loading

ghost commented Jan 12, 2021

FroMage left a comment

Choose a reason for hiding this comment

gsmet commented Jan 12, 2021

gsmet left a comment

Choose a reason for hiding this comment

gsmet commented Jan 12, 2021

kenfinnigan Jan 12, 2021

Choose a reason for hiding this comment

phillip-kruger commented Jan 12, 2021 •

edited

Loading