Merge pull request #48560 from phillip-kruger/dev-ui-workspace-cosmetic

Dev UI Workspace fixes

Author: gsmet

extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/WorkspaceProcessor.java

@@ -24,7 +24,7 @@
 import io.quarkus.assistant.runtime.dev.Assistant;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.IsLocalDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -47,7 +47,7 @@
 /**
  * This creates the workspace Page
  */
-@BuildSteps(onlyIf = IsDevelopment.class)
+@BuildSteps(onlyIf = IsLocalDevelopment.class)
 public class WorkspaceProcessor {
 
     @BuildStep
@@ -62,7 +62,6 @@ void locateWorkspaceItems(BuildSystemTargetBuildItem buildSystemTarget,
 
         Path outputDir = buildSystemTarget.getOutputDirectory();
         Path projectRoot = outputDir.getParent();
-
         if (projectRoot != null && Files.exists(projectRoot)) {
 
             List<WorkspaceBuildItem.WorkspaceItem> workspaceItems = new ArrayList<>();
@@ -87,7 +86,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
                     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                         String fileName = file.getFileName().toString();
                         boolean shouldIgnore = Files.isHidden(file)
-                                || file.startsWith(outputDir) || !Files.isReadable(file) || !Files.isExecutable(file)
+                                || file.startsWith(outputDir) || !Files.isReadable(file)
                                 || ignoreFilePatterns.stream().anyMatch(p -> p.matcher(fileName).matches());
 
                         if (!shouldIgnore) {

extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qui/qui-themed-code-block.js

@@ -41,7 +41,11 @@ class QuiThemedCodeBlock extends observeState(LitElement) {
     }
 
     _onValueChanged(e) {
+        e.stopPropagation();
         // re-dispatch event so parent can listen on <qui-themed-code-block>
+        if (this.value !== e.detail.value) {
+            this.value = e.detail.value;
+        }
         this.dispatchEvent(new CustomEvent('value-changed', {
             detail: e.detail,
             bubbles: true,

extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-workspace.js

@@ -87,21 +87,21 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
         .mainMenuBarButtons {
             display: flex; 
             align-items: center; 
-            width: 100%;
         }
 
         .mainMenuBarTitle {
             font-size: large;
             color: var(--lumo-contrast-50pct);
             user-select: none;
             cursor: pointer;
+            width: 100%;
+            text-align: center;
         }
 
         .mainMenuBarActions {
             display: flex; 
             align-items: center; 
             gap: 0.5rem;
-            width: 100%;
             justify-content: end;
             padding-right: 10px;
         }
@@ -325,7 +325,7 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
 
     _renderActionResult(){
         if(this._actionResult && this._actionResult.content && this._actionResult.displayType === "raw"){
-            return html`<div class="actionResult">${this._actionResult.content}${this._renderAssistantWarning()}</div>`;
+            return html`<div class="actionResult">${this._actionResult.content}</div>${this._renderAssistantWarning()}`;
         }else if(this._actionResult && this._actionResult.content && this._actionResult.displayType === "code"){
             // TODO: We can not assume the mode is the same as the input
             // Maybe return name|content ?
@@ -360,7 +360,7 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
     _renderActions(){
         if(this._filteredActions){
             if(this._showActionProgress){
-                return html`<vaadin-progress-bar indeterminate></vaadin-progress-bar>`;
+                return html`<vaadin-progress-bar style="width:400px;" indeterminate></vaadin-progress-bar>`;
             }else{
                 return html`<div class="actions">
                             <vaadin-menu-bar .items="${this._filteredActions}" theme="dropdown-indicators tertiary" @item-selected="${(e) => this._actionSelected(e)}"></vaadin-menu-bar>
@@ -479,6 +479,21 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
                                     content:newWorkspaceItemValue,
                                     type:this._selectedWorkspaceItem.type}).then(jsonRpcResponse => { 
 
+            if (!('content' in jsonRpcResponse.result.result) || !('name' in jsonRpcResponse.result.result)) {
+                const firstEntry = Object.entries(jsonRpcResponse.result.result).find(
+                    ([key]) => key !== 'path' && key !== 'name'
+                );
+                if (firstEntry) {
+                    const [key, value] = firstEntry;
+                    if (!('content' in jsonRpcResponse.result.result)) {
+                        jsonRpcResponse.result.result.content = value;
+                    }
+                    if (!('name' in jsonRpcResponse.result.result)) {
+                        jsonRpcResponse.result.result.name = key;
+                    }
+                }
+            }
+            
             if(e.detail.value.display === "notification"){
                 notifier.showInfoMessage(jsonRpcResponse.result.result);
             }else if(e.detail.value.display === "replace"){
@@ -489,7 +504,11 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
                 this._selectedWorkspaceItem.isAssistant = jsonRpcResponse.result?.isAssistant ?? false;
             }else if(e.detail.value.display !== "nothing"){
                 this._actionResult = jsonRpcResponse.result.result;
-                this._actionResult.name = this._actionResult.path;
+                if(jsonRpcResponse.result.result.name){
+                    this._actionResult.name = jsonRpcResponse.result.result.name;
+                }else{
+                    this._actionResult.name = this._actionResult.path;
+                }
                 this._actionResult.path = jsonRpcResponse.result.path;
                 this._actionResult.display = e.detail.value.display;
                 this._actionResult.isAssistant = jsonRpcResponse.result?.isAssistant ?? false;