Merge pull request #48356 from holly-cummins/runtime-dev-service-info-in-dev-ui

Use lazy data for dev services in dev ui

Author: holly-cummins

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

@@ -1,15 +1,22 @@
 package io.quarkus.devui.deployment.menu;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
 
 import io.quarkus.deployment.IsLocalDevelopment;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesResultBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.dev.devservices.DevServiceDescriptionBuildItem;
+import io.quarkus.dev.spi.DevModeType;
+import io.quarkus.devui.deployment.DevUIConfig;
 import io.quarkus.devui.deployment.InternalPageBuildItem;
+import io.quarkus.devui.spi.buildtime.BuildTimeActionBuildItem;
 import io.quarkus.devui.spi.page.Page;
 
 /**
@@ -18,24 +25,33 @@
 public class DevServicesProcessor {
 
     @BuildStep(onlyIf = IsLocalDevelopment.class)
-    InternalPageBuildItem createDevServicesPages(List<DevServiceDescriptionBuildItem> devServiceDescriptions,
-            List<DevServicesResultBuildItem> devServicesResultBuildItems) {
+    InternalPageBuildItem createDevServicesPages(BuildProducer<BuildTimeActionBuildItem> buildTimeActionProducer,
+            List<DevServiceDescriptionBuildItem> devServiceDescriptions,
+            List<DevServicesResultBuildItem> devServicesResultBuildItems, LaunchModeBuildItem launchModeBuildItem,
+            DevUIConfig config) {
 
         List<DevServiceDescriptionBuildItem> otherDevServices = getOtherDevServices(devServicesResultBuildItems);
 
         InternalPageBuildItem devServicesPages = new InternalPageBuildItem("Dev Services", 40);
 
         devServicesPages.addPage(Page.webComponentPageBuilder()
-                .namespace("devui-dev-services")
+                .namespace(NAMESPACE)
                 .title("Dev services")
                 .icon("font-awesome-solid:wand-magic-sparkles")
                 .componentLink("qwc-dev-services.js"));
 
-        Map<String, DevServiceDescriptionBuildItem> combined = new TreeMap<>();
-        addToMap(combined, devServiceDescriptions);
-        addToMap(combined, otherDevServices);
+        Collection<DevServiceDescriptionBuildItem> services = getServices(devServiceDescriptions, otherDevServices);
+
+        devServicesPages.addBuildTimeData("devServices", services);
 
-        devServicesPages.addBuildTimeData("devServices", combined.values());
+        if (launchModeBuildItem.getDevModeType().isPresent()
+                && launchModeBuildItem.getDevModeType().get().equals(DevModeType.LOCAL)
+                && config.allowExtensionManagement()) {
+
+            BuildTimeActionBuildItem buildTimeActions = new BuildTimeActionBuildItem(NAMESPACE);
+            getDevServices(buildTimeActions, devServiceDescriptions, otherDevServices);
+            buildTimeActionProducer.produce(buildTimeActions);
+        }
 
         return devServicesPages;
 
@@ -64,4 +80,24 @@ private List<DevServiceDescriptionBuildItem> getOtherDevServices(
         }
         return devServiceDescriptions;
     }
+
+    private void getDevServices(BuildTimeActionBuildItem buildTimeActions,
+            List<DevServiceDescriptionBuildItem> devServiceDescriptions,
+            List<DevServiceDescriptionBuildItem> otherDevServices) {
+        buildTimeActions.addAction(new Object() {
+        }.getClass().getEnclosingMethod().getName(),
+                ignored -> CompletableFuture.supplyAsync(() -> getServices(devServiceDescriptions, otherDevServices)));
+    }
+
+    private Collection<DevServiceDescriptionBuildItem> getServices(List<DevServiceDescriptionBuildItem> devServiceDescriptions,
+            List<DevServiceDescriptionBuildItem> otherDevServices) {
+        Map<String, DevServiceDescriptionBuildItem> combined = new TreeMap<>();
+        addToMap(combined, devServiceDescriptions);
+        addToMap(combined, otherDevServices);
+
+        return combined.values();
+    }
+
+    private static final String NAMESPACE = "devui-dev-services";
+
 }

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

@@ -1,7 +1,8 @@
-import { QwcHotReloadElement, html, css } from 'qwc-hot-reload-element';
-import { devServices } from 'devui-data';
-import { observeState } from 'lit-element-state';
-import { themeState } from 'theme-state';
+import {css, html, QwcHotReloadElement} from 'qwc-hot-reload-element';
+import {JsonRpc} from 'jsonrpc';
+import {devServices} from 'devui-data';
+import {observeState} from 'lit-element-state';
+import {themeState} from 'theme-state';
 import '@vaadin/icon';
 import '@qomponent/qui-code-block';
 import '@qomponent/qui-card';
@@ -11,6 +12,8 @@ import 'qwc-no-data';
  * This component shows the Dev Services Page
  */
 export class QwcDevServices extends observeState(QwcHotReloadElement) {
+    jsonRpc = new JsonRpc("devui-dev-services", false);
+
     static styles = css`
         .cards {
             height: 100%;
@@ -58,9 +61,15 @@ export class QwcDevServices extends observeState(QwcHotReloadElement) {
         this._services = devServices;
     }
 
+    connectedCallback() {
+        super.connectedCallback();
+
+        this.hotReload();
+    }
+
     hotReload(){
-        import(`devui/devui-data.js?${Date.now()}`).then(newDevUIData => {
-            this._services = newDevUIData.devServices;
+        this.jsonRpc.getDevServices().then(jsonRpcResponse => {
+            this._services = jsonRpcResponse.result;
         });
     }