Various fixes for Kubernetes Dev UI 2

Fixes quarkusio#32540
gsmet · Apr 11, 2023 · 33f3cf3 · 33f3cf3
1 parent 8d5b024
commit 33f3cf3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/.../main/java/io/quarkus/kubernetes/deployment/devconsole/KubernetesDevConsoleProcessor.java b/.../main/java/io/quarkus/kubernetes/deployment/devconsole/KubernetesDevConsoleProcessor.java
@@ -33,10 +33,14 @@ public static class GeneratedKubernetesResourceHandler implements BiConsumer<Map
         @Override
         public void accept(Map<String, byte[]> context, BuildResult buildResult) {
             // the idea here is to only display the content of the manifest file that will be selected for deployment
+            var selectedTargetBI = buildResult
+                    .consumeOptional(SelectedKubernetesDeploymentTargetBuildItem.class);
+            if (selectedTargetBI == null) {
+                return;
+            }
+
             var generatedFilesBI = buildResult
                     .consumeMulti(GeneratedKubernetesResourceBuildItem.class);
-            var selectedTargetBI = buildResult
-                    .consume(SelectedKubernetesDeploymentTargetBuildItem.class);
             for (var bi : generatedFilesBI) {
                 if (bi.getName().startsWith(selectedTargetBI.getEntry().getName())
                         && bi.getName().endsWith(".yml")) {

diff --git a/...oyment/src/main/java/io/quarkus/kubernetes/deployment/devui/KubernetesDevUiProcessor.java b/...oyment/src/main/java/io/quarkus/kubernetes/deployment/devui/KubernetesDevUiProcessor.java
@@ -36,7 +36,6 @@ JsonRPCProvidersBuildItem createJsonRPCServiceForCache() {
                 List<KubernetesDevConsoleProcessor.Manifest> manifests = holder.getManifests();
                 // Avoid relying on databind.
                 Map<String, String> map = new LinkedHashMap<>();
-                System.out.println("manifests are " + manifests);
                 for (KubernetesDevConsoleProcessor.Manifest manifest : manifests) {
                     map.put(manifest.getName(), manifest.getContent());
                 }

diff --git a/...nsions/kubernetes/vanilla/deployment/src/main/resources/dev-ui/qwc-kubernetes-manifest.js b/...nsions/kubernetes/vanilla/deployment/src/main/resources/dev-ui/qwc-kubernetes-manifest.js
@@ -47,7 +47,7 @@ export class QwcKubernetesManifest extends observeState(LitElement)  {
                 m.set(key, data[key]);
             }
             this._manifests = m;
-            this._message = "No manifests generated";
+            this._message = "No manifests generated.";
         });
     }
 
@@ -57,6 +57,14 @@ export class QwcKubernetesManifest extends observeState(LitElement)  {
      */
     render() {
         if (this._manifests) {
+            if (this._manifests.size == 0) {
+                return html`
+                <div style="color: var(--lumo-secondary-text-color);width: 95%;" >
+                    <div>${this._message}</div>
+                </div>
+                `;
+            }
+
             return html`
                 <vaadin-tabsheet>
                     <vaadin-tabs slot="tabs">
@@ -65,14 +73,14 @@ export class QwcKubernetesManifest extends observeState(LitElement)  {
                     ${this._renderContent()}
                 </vaadin-tabsheet>
               `;
-        }else{
-            return html`
+        }
+
+        return html`
             <div style="color: var(--lumo-secondary-text-color);width: 95%;" >
                 <div>${this._message}</div>
                 <vaadin-progress-bar indeterminate></vaadin-progress-bar>
             </div>
             `;
-        }
     }
 
     _renderFileName(){