Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kie-issues#1669: jBPM Quarkus DevUI seems to not update the # of items #2814

Merged
merged 37 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
63a31f1
Changes to make counters dynamic
bncriju Dec 2, 2024
4295790
introducing Intermediate class
bncriju Dec 9, 2024
064c91c
fixing broken build and chnaged refreshData logic
bncriju Dec 16, 2024
db4eaa6
Merge branch 'apache:main' into kie-issues#1669
bncriju Dec 16, 2024
be1aeca
Merge branch 'main' into kie-issues#1669
bncriju Dec 17, 2024
57d1685
Changes to make counters dynamic
bncriju Dec 2, 2024
3049e49
introducing Intermediate class
bncriju Dec 9, 2024
73856dd
fixing broken build and chnaged refreshData logic
bncriju Dec 16, 2024
0585ce9
publishing logic modified
bncriju Dec 17, 2024
335c344
Merge branch 'kie-issues#1669' of github.com:bncriju/incubator-kie-to…
bncriju Dec 17, 2024
45b9171
review comments incorporated, reformatted code and adjusted delay
bncriju Dec 17, 2024
cf08be5
fixing ci build
bncriju Dec 19, 2024
a4f9e6d
incorporated review comments
bncriju Dec 19, 2024
fc852d9
Fixing ci buid issue
bncriju Dec 19, 2024
6cf3afd
Removing Dafault Annotation
bncriju Dec 19, 2024
d9ebee9
kie-issues#1547: DMN Editor: Render evaluation highlights in the Boxe…
jomarko Dec 18, 2024
af8cb99
build(deps): bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /examp…
dependabot[bot] Dec 18, 2024
6c54b32
[sonataflow-images] [kogito-images] Fix #2817 - Disable debug on e2e …
ricardozanini Dec 18, 2024
a067504
kie-tools#2751: Remove references to Quarkus and Kogito versions; Aut…
ricardozanini Dec 20, 2024
04c4da8
[kie-issues#1720] Enhance Process Details UI page to show nodeInstanc…
josedee Dec 23, 2024
cbac01c
Merge remote-tracking branch 'origin/main'
bncriju Dec 30, 2024
63d6c90
Merge branch 'main' of github.com:bncriju/incubator-kie-tools
bncriju Jan 3, 2025
d69a9e7
Merge branch 'apache:main' into main
bncriju Jan 6, 2025
d889c09
making behaviors uniform across
bncriju Jan 6, 2025
694f791
Merge branch 'apache:main' into main
bncriju Jan 8, 2025
bfbadba
count initialisation made right
bncriju Jan 8, 2025
ecf8a43
changed the logger info to debug
bncriju Jan 9, 2025
111c233
Merge branch 'apache:main' into main
bncriju Jan 9, 2025
3ce2026
- Adding `MultiCacheOp` to automatically replying emitted data to new…
pefernan Jan 9, 2025
13a1646
- Restoring context path
pefernan Jan 9, 2025
f4880ee
Merge pull request #2 from pefernan/kie-issues#1669
bncriju Jan 9, 2025
25fa945
making behaviors uniform across
bncriju Jan 6, 2025
a096450
count initialisation made right
bncriju Jan 8, 2025
7db193e
changed the logger info to debug
bncriju Jan 9, 2025
4abf71c
- Adding `MultiCacheOp` to automatically replying emitted data to new…
pefernan Jan 9, 2025
2c8bdae
- Restoring context path
pefernan Jan 9, 2025
6a67bd9
Merge branch 'kie-issues#1669' of github.com:bncriju/incubator-kie-to…
bncriju Jan 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,21 @@ public CardPageBuildItem pages(
.metadata("page", "Processes")
.title("Process Instances")
.icon("font-awesome-solid:diagram-project")
.dynamicLabelJsonRPCMethodName("queryProcessInstancesCount"));
.streamingLabelJsonRPCMethodName("queryProcessInstancesCount"));

cardPageBuildItem.addPage(Page.webComponentPageBuilder()
.componentLink("qwc-jbpm-quarkus-devui.js")
.metadata("page", "Tasks")
.title("Tasks")
.icon("font-awesome-solid:bars-progress")
.dynamicLabelJsonRPCMethodName("queryTasksCount"));
.streamingLabelJsonRPCMethodName("queryTasksCount"));

cardPageBuildItem.addPage(Page.webComponentPageBuilder()
.componentLink("qwc-jbpm-quarkus-devui.js")
.metadata("page", "Jobs")
.title("Jobs")
.icon("font-awesome-solid:clock")
.dynamicLabelJsonRPCMethodName("queryJobsCount"));
.streamingLabelJsonRPCMethodName("queryJobsCount"));

cardPageBuildItem.addPage(Page.webComponentPageBuilder()
.componentLink("qwc-jbpm-quarkus-devui.js")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@
<artifactId>vertx-web-client</artifactId>
</dependency>

<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-api</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jbpm.quarkus.devui.runtime.rpc;

import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.operators.multi.MultiCacheOp;
import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.client.WebClient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class DataIndexCounter {
private static final Logger LOGGER = LoggerFactory.getLogger(DataIndexCounter.class);

private final Vertx vertx;
private final MultiCacheOp<String> multi;
private final WebClient dataIndexWebClient;
private final String path;

private final String query;
private final String field;

public DataIndexCounter(String query, String graphField, String path, Vertx vertx, WebClient dataIndexWebClient) {
if (dataIndexWebClient == null) {
throw new IllegalArgumentException("dataIndexWebClient is null");
}
this.query = query;
this.field = graphField;
this.path = path;

this.vertx = vertx;
this.dataIndexWebClient = dataIndexWebClient;

this.multi = new MultiCacheOp<>(BroadcastProcessor.create());

refreshCount();
}

public void refresh() {
vertx.setTimer(1000, id -> {
refreshCount();
});
}

public void stop() {
multi.onComplete();
}

private void refreshCount() {
LOGGER.debug("Refreshing data for query: {}", query);

this.dataIndexWebClient.post(path + "/graphql")
.putHeader("content-type", "application/json")
.sendJson(new JsonObject(query))
.map(response -> {
if (response.statusCode() == 200) {
JsonObject responseData = response.bodyAsJsonObject().getJsonObject("data");
return String.valueOf(responseData.getJsonArray(field).size());
}
return "0";
})
.onComplete(count -> this.multi.onNext(count.result()));
}

public Multi<String> getMulti() {
return multi;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.jbpm.quarkus.devui.runtime.rpc;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;

import org.kie.kogito.event.DataEvent;
import org.kie.kogito.event.EventPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.quarkus.arc.profile.IfBuildProfile;

import java.util.Collection;
import java.util.Objects;
@ApplicationScoped
@IfBuildProfile("dev")
public class JBPMDevUIEventPublisher implements EventPublisher {

private Runnable onProcessEvent;
private Runnable onTaskEvent;
private Runnable onJobEvent;

@Override
public void publish(DataEvent<?> event) {
switch (event.getType()) {
case "ProcessInstanceStateDataEvent":
maybeRun(onProcessEvent);
break;
case "UserTaskInstanceStateDataEvent":
maybeRun(onTaskEvent);
break;
case "JobEvent":
maybeRun(onJobEvent);
break;
}
}

@Override
public void publish(Collection<DataEvent<?>> events) {
events.forEach(this::publish);
}

private void maybeRun(Runnable runnable) {
if (Objects.nonNull(runnable)) {
runnable.run();
}
}

public void setOnProcessEventListener(Runnable onProcessEvent) {
this.onProcessEvent = onProcessEvent;
}

public void setOnTaskEventListener(Runnable onTaskEvent) {
this.onTaskEvent = onTaskEvent;
}

public void setOnJobEventListener(Runnable onJobEvent) {
this.onJobEvent = onJobEvent;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@
import java.util.Optional;

import io.smallrye.mutiny.Uni;
import io.quarkus.arc.profile.IfBuildProfile;
import io.smallrye.mutiny.Multi;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.client.WebClient;
import io.vertx.ext.web.client.WebClientOptions;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;

import org.eclipse.microprofile.config.ConfigProvider;
import org.jbpm.quarkus.devui.runtime.forms.FormsStorage;

Expand All @@ -38,6 +41,7 @@
import org.slf4j.LoggerFactory;

@ApplicationScoped
@IfBuildProfile("dev")
public class JBPMDevuiJsonRPCService {
private static final String DATA_INDEX_URL = "kogito.data-index.url";

Expand All @@ -54,11 +58,16 @@ public class JBPMDevuiJsonRPCService {
private WebClient dataIndexWebClient;

private final Vertx vertx;
private final JBPMDevUIEventPublisher eventPublisher;
private final FormsStorage formsStorage;
private DataIndexCounter processesCounter;
private DataIndexCounter tasksCounter;
private DataIndexCounter jobsCounter;

@Inject
public JBPMDevuiJsonRPCService(Vertx vertx, FormsStorage formsStorage) {
public JBPMDevuiJsonRPCService(Vertx vertx, JBPMDevUIEventPublisher eventPublisher, FormsStorage formsStorage) {
this.vertx = vertx;
this.eventPublisher = eventPublisher;
this.formsStorage = formsStorage;
}

Expand All @@ -70,50 +79,50 @@ public void init() {

private void initDataIndexWebClient(String dataIndexURL) {
try {
this.dataIndexWebClient = WebClient.create(vertx, buildWebClientOptions(dataIndexURL));
URL url = new URL(dataIndexURL);
this.dataIndexWebClient = WebClient.create(vertx, buildWebClientOptions(url));

String contextPath = url.getPath();
this.processesCounter = new DataIndexCounter(ALL_PROCESS_INSTANCES_IDS_QUERY, PROCESS_INSTANCES,
contextPath, vertx, dataIndexWebClient);
this.tasksCounter = new DataIndexCounter(ALL_TASKS_IDS_QUERY, USER_TASKS, contextPath, vertx, dataIndexWebClient);
this.jobsCounter = new DataIndexCounter(ALL_JOBS_IDS_QUERY, JOBS, contextPath, vertx, dataIndexWebClient);

this.eventPublisher.setOnProcessEventListener(processesCounter::refresh);
this.eventPublisher.setOnTaskEventListener(tasksCounter::refresh);
this.eventPublisher.setOnJobEventListener(jobsCounter::refresh);
} catch (Exception ex) {
LOGGER.warn("Cannot configure dataIndexWebClient with 'kogito.data-index.url'='{}':", dataIndexURL, ex);
}
}

protected WebClientOptions buildWebClientOptions(String dataIndexURL) throws MalformedURLException {
URL url = new URL(dataIndexURL);
protected WebClientOptions buildWebClientOptions(URL dataIndexURL) throws MalformedURLException {
return new WebClientOptions()
.setDefaultHost(url.getHost())
.setDefaultPort((url.getPort() != -1 ? url.getPort() : url.getDefaultPort()))
.setSsl(url.getProtocol().compareToIgnoreCase("https") == 0);
}

public Uni<String> queryProcessInstancesCount() {
return doQuery(ALL_PROCESS_INSTANCES_IDS_QUERY, PROCESS_INSTANCES);
.setDefaultHost(dataIndexURL.getHost())
.setDefaultPort((dataIndexURL.getPort() != -1 ? dataIndexURL.getPort() : dataIndexURL.getDefaultPort()))
.setSsl(dataIndexURL.getProtocol().compareToIgnoreCase("https") == 0);
}

public Uni<String> queryTasksCount() {
return doQuery(ALL_TASKS_IDS_QUERY, USER_TASKS);
public Multi<String> queryProcessInstancesCount() {
return processesCounter.getMulti();
}

public Uni<String> queryJobsCount() {
return doQuery(ALL_JOBS_IDS_QUERY, JOBS);
public Multi<String> queryTasksCount() {
return tasksCounter.getMulti();
}

private Uni<String> doQuery(String query, String graphModelName) {
if(dataIndexWebClient == null) {
LOGGER.warn("Cannot perform '{}' query, dataIndexWebClient couldn't be set. Is DataIndex correctly? Please verify '{}' value", graphModelName, DATA_INDEX_URL);
return Uni.createFrom().item("-");
}
return Uni.createFrom().completionStage(this.dataIndexWebClient.post("/graphql")
.putHeader("content-type", "application/json")
.sendJson(new JsonObject(query))
.map(response -> {
if(response.statusCode() == 200) {
JsonObject responseData = response.bodyAsJsonObject().getJsonObject("data");
return String.valueOf(responseData.getJsonArray(graphModelName).size());
}
return "-";
}).toCompletionStage());
public Multi<String> queryJobsCount() {
return jobsCounter.getMulti();
}

public Uni<String> getFormsCount() {
return Uni.createFrom().item(String.valueOf(this.formsStorage.getFormsCount()));
}
}

@PreDestroy
public void destroy() {
processesCounter.stop();
tasksCounter.stop();
jobsCounter.stop();
}
}
Loading