Fix the custom card for Dev UI Rabbit MQ

Signed-off-by: Phillip Kruger <[email protected]>
quarkusio · May 23, 2023 · 3da6296 · 3da6296
1 parent d73267b
commit 3da6296
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/...rye-reactive-messaging-rabbitmq/deployment/src/main/resources/dev-ui/qwc-rabbitmq-card.js b/...rye-reactive-messaging-rabbitmq/deployment/src/main/resources/dev-ui/qwc-rabbitmq-card.js
@@ -1,7 +1,7 @@
 import { LitElement, html, css} from 'lit';
 import { pages } from 'build-time-data';
 import { JsonRpc } from 'jsonrpc';
-import 'qwc/qwc-extension-link.js';
+import 'qwc-extension-link';
 
 const NAME = "Reactive Messaging - RabbitMQ";
 export class QwcRabbitMqCard extends LitElement {
@@ -44,13 +44,6 @@ export class QwcRabbitMqCard extends LitElement {
         _externalUrl: {state: true}
     };
 
-    constructor() {
-        super();
-        if(!this.extensionName){
-            this.extensionName = NAME;
-        }
-    }
-
     connectedCallback() {
         super.connectedCallback();
         this.jsonRpc.getRabbitMqPort().then(jsonRpcResponse => {
@@ -64,8 +57,8 @@ export class QwcRabbitMqCard extends LitElement {
             <div class="identity">
                 <div class="logo">
                     <img src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjM2MiIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI3MSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTI0NS40NCAxMDguMzA4aC04NS4wOWE3LjczOCA3LjczOCAwIDAgMS03LjczNS03LjczNHYtODguNjhDMTUyLjYxNSA1LjMyNyAxNDcuMjkgMCAxNDAuNzI2IDBoLTMwLjM3NWMtNi41NjggMC0xMS44OSA1LjMyNy0xMS44OSAxMS44OTR2ODguMTQzYzAgNC41NzMtMy42OTcgOC4yOS04LjI3IDguMzFsLTI3Ljg4NS4xMzNjLTQuNjEyLjAyNS04LjM1OS0zLjcxNy04LjM1LTguMzI1bC4xNzMtODguMjQxQzU0LjE0NCA1LjMzNyA0OC44MTcgMCA0Mi4yNCAwSDExLjg5QzUuMzIxIDAgMCA1LjMyNyAwIDExLjg5NFYyNjAuMjFjMCA1LjgzNCA0LjcyNiAxMC41NiAxMC41NTUgMTAuNTZIMjQ1LjQ0YzUuODM0IDAgMTAuNTYtNC43MjYgMTAuNTYtMTAuNTZWMTE4Ljg2OGMwLTUuODM0LTQuNzI2LTEwLjU2LTEwLjU2LTEwLjU2em0tMzkuOTAyIDkzLjIzM2MwIDcuNjQ1LTYuMTk4IDEzLjg0NC0xMy44NDMgMTMuODQ0SDE2Ny42OWMtNy42NDYgMC0xMy44NDQtNi4xOTktMTMuODQ0LTEzLjg0NHYtMjQuMDA1YzAtNy42NDYgNi4xOTgtMTMuODQ0IDEzLjg0NC0xMy44NDRoMjQuMDA1YzcuNjQ1IDAgMTMuODQzIDYuMTk4IDEzLjg0MyAxMy44NDR2MjQuMDA1eiIgZmlsbD0iI0Y2MCIvPjwvc3ZnPgo="
-                                       alt="${NAME}" 
-                                       title="${NAME}"
+                                       alt="${this.extensionName}" 
+                                       title="${this.extensionName}"
                                        width="32" 
                                        height="32">
                 </div>
@@ -77,17 +70,19 @@ export class QwcRabbitMqCard extends LitElement {
     }
 
     _renderCardLinks(){
-        return html`
-            <qwc-extension-link slot="link"
-                namespace="${this.namespace}"
-                extensionName="${this.extensionName}"
-                iconName="font-awesome-solid:arrow-up-right-from-square"
-                displayName="RabbitMQ Management UI"
-                dynamicLabel="getRabbitMqPort"
-                ?embed=false
-                externalUrl="${this._externalUrl}">
-            </qwc-extension-link>
-        `;
+        if(this._port){
+            return html`
+                <qwc-extension-link slot="link"
+                    namespace="${this.namespace}"
+                    extensionName="${this.extensionName}"
+                    iconName="font-awesome-solid:arrow-up-right-from-square"
+                    displayName="RabbitMQ Management UI"
+                    staticLabel="${this._port}"
+                    ?embed=false
+                    externalUrl="${this._externalUrl}">
+                </qwc-extension-link>
+            `;
+        }
     }
 
 }

diff --git a/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java b/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java
@@ -83,6 +83,7 @@ InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBu
         internalImportMapBuildItem.add("qwc/", contextRoot + "qwc/");
         internalImportMapBuildItem.add("qwc-hot-reload-element", contextRoot + "qwc/qwc-hot-reload-element.js");
         internalImportMapBuildItem.add("qwc-server-log", contextRoot + "qwc/qwc-server-log.js");
+        internalImportMapBuildItem.add("qwc-extension-link", contextRoot + "qwc/qwc-extension-link.js");
         // Quarkus UI
         internalImportMapBuildItem.add("qui/", contextRoot + "qui/");
         internalImportMapBuildItem.add("qui-card", contextRoot + "qui/qui-card.js");

diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension-link.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension-link.js
@@ -180,12 +180,10 @@ export class QwcExtensionLink extends QwcHotReloadElement {
     }
 
     render() {
-        if(this.path){
-            if(!this.embed) {
-                return html`${this.renderLink(this._effectiveExternalUrl, true, "_blank")}`;
-            }else{
-                return html`${this.renderLink(this.path, false, "_self")}`;
-            }
+        if(!this.embed && this._effectiveExternalUrl) {
+            return html`${this.renderLink(this._effectiveExternalUrl, true, "_blank")}`;
+        }else if(this.path){
+            return html`${this.renderLink(this.path, false, "_self")}`;
         }
     }