Skip to content

Commit

Permalink
Merge branch 'main' of github.com:apache/incubator-kie-tools into mgm…
Browse files Browse the repository at this point in the history
…t-console-refactor-squash
  • Loading branch information
thiagoelg committed Jan 9, 2025
2 parents 091fe74 + 4f079d7 commit 7540fd4
Show file tree
Hide file tree
Showing 48 changed files with 2,240 additions and 175 deletions.
26 changes: 26 additions & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,32 @@ goapi.go
greetingAPI.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/hello.sw.yaml
hello.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/emptyworkflow.sw.yaml
emptyworkflow.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi-subflow34.expected.yaml
openapi-subflow34.expected.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi.expected.yaml
openapi.expected.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi.yaml
openapi.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi1.expected.yaml
openapi1.expected.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi1.yaml
openapi1.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi2.expected.yaml
openapi2.expected.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/openapi2.yaml
openapi2.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/subflow1.sw.yaml
subflow1.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/subflow2.sw.yaml
subflow2.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/subflow3.sw.yaml
subflow3.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/subflow4.sw.yaml
subflow4.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/refs/workflow1.sw.yaml
workflow1.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/subflow-custom.sw.yaml
subflow-custom.sw.yaml
# packages/kn-plugin-workflow/pkg/specs/testdata/subflow-mySpecsDir.sw.yaml
Expand Down
3 changes: 2 additions & 1 deletion packages/dmn-editor/src/dataTypes/DataTypeName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { InlineFeelNameInput, OnInlineFeelNameRenamed } from "../feel/InlineFeel
import { useExternalModels } from "../includedModels/DmnEditorDependenciesContext";
import { State } from "../store/Store";
import { DmnBuiltInDataType } from "@kie-tools/boxed-expression-component/dist/api";
import { isStruct } from "./DataTypeSpec";

export function DataTypeName({
isReadOnly,
Expand Down Expand Up @@ -137,7 +138,7 @@ export function DataTypeName({
/>
{!isEditingLabel && (
<TypeRefLabel
typeRef={itemDefinition.typeRef?.__$$text ?? DmnBuiltInDataType.Undefined}
typeRef={isStruct(itemDefinition) ? "" : itemDefinition.typeRef?.__$$text ?? DmnBuiltInDataType.Undefined}
isCollection={itemDefinition["@_isCollection"]}
relativeToNamespace={relativeToNamespace}
/>
Expand Down
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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,12 @@ describe("KIE Editors End to End Test Suite - BPMN Editor", () => {
await bpmnEditorTester.scrollElementIntoView(onExitActionSection);

const newOnEntryAction = "console.log('On Entry Action test log');";
const newOnEntryLanguage = "javascript";
const newOnEntryLanguage = "mvel";
await propertiesPanel.changeWidgetedProperty("On Entry Action", newOnEntryAction, "textarea");
await propertiesPanel.changeWidgetedProperty("On Entry Action", newOnEntryLanguage, "select");

const newOnExitAction = "console.log('On Exit Action test log');";
const newOnExitLanguage = "javascript";
const newOnExitLanguage = "mvel";
await propertiesPanel.changeWidgetedProperty("On Exit Action", newOnExitAction, "textarea");
await propertiesPanel.changeWidgetedProperty("On Exit Action", newOnExitLanguage, "select");

Expand Down
Loading

0 comments on commit 7540fd4

Please sign in to comment.