From 0577fb94ef3c31f1a0de92df8facd1ed727f585c Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 16 Feb 2024 18:06:59 +0100 Subject: [PATCH 01/69] first migration of the java module --- .../env/index.js | 31 +++ .../install.js | 25 ++ .../package.json | 41 ++++ .../pom.xml | 70 ++++++ .../pom.xml | 202 ++++++++++++++++ .../tools/deployment/DevConsoleProcessor.java | 148 ++++++++++++ ...lessWorkflowQuarkusExtensionProcessor.java | 32 +++ .../resources/dev-templates/embedded.html | 58 +++++ .../resources/dev-templates/monitoring.html | 44 ++++ .../dev-templates/workflowInstances.html | 45 ++++ .../src/main/resources/static/index.html | 45 ++++ .../pom.xml | 154 ++++++++++++ .../dashboard/CustomDashboardService.java | 83 +++++++ .../dashboard/CustomDashboardStorage.java | 36 +++ .../CustomDashboardFilterParamConverter.java | 40 ++++ ...DashboardFilterParamConverterProvider.java | 41 ++++ .../impl/CustomDashboardStorageImpl.java | 226 ++++++++++++++++++ .../model/CustomDashboardFilter.java | 50 ++++ .../dashboard/model/CustomDashboardInfo.java | 95 ++++++++ .../src/main/resources/META-INF/beans.xml | 20 ++ .../resources/META-INF/quarkus-extension.yaml | 28 +++ .../impl/CustomDashboardStorageTest.java | 115 +++++++++ .../CustomDashboardStorageTestProfile.java | 46 ++++ .../custom/dashboards/products.dash.yaml | 61 +++++ .../custom/dashboards/subdir/age.dash.yml | 44 ++++ pnpm-lock.yaml | 69 ++---- repo/graph.dot | 2 + repo/graph.json | 7 + 28 files changed, 1805 insertions(+), 53 deletions(-) create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/env/index.js create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/install.js create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/package.json create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/pom.xml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml create mode 100644 packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml diff --git a/packages/sonataflow-serverless-workflow-devui-parent/env/index.js b/packages/sonataflow-serverless-workflow-devui-parent/env/index.js new file mode 100644 index 00000000000..d2fb5a077ef --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/env/index.js @@ -0,0 +1,31 @@ +/* + * 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. + */ + +const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env"); + +module.exports = composeEnv([require("@kie-tools/root-env/env")], { + vars: varsWithName({}), + get env() { + return { + sonataflowServerlessWorkflowDevui: { + version: require("../package.json").version, + }, + }; + }, +}); diff --git a/packages/sonataflow-serverless-workflow-devui-parent/install.js b/packages/sonataflow-serverless-workflow-devui-parent/install.js new file mode 100644 index 00000000000..c26349eea4d --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/install.js @@ -0,0 +1,25 @@ +/* + * 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. + */ + +const buildEnv = require("./env"); +const { setup } = require("@kie-tools/maven-config-setup-helper"); + +setup(` + -Drevision=${buildEnv.env.sonataflowServerlessWorkflowDevui.version} +`); diff --git a/packages/sonataflow-serverless-workflow-devui-parent/package.json b/packages/sonataflow-serverless-workflow-devui-parent/package.json new file mode 100644 index 00000000000..d65be2da950 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/package.json @@ -0,0 +1,41 @@ +{ + "private": true, + "name": "@kie-tools/sonataflow-serverless-workflow-devui-parent", + "version": "0.0.0", + "description": "", + "license": "Apache-2.0", + "homepage": "https://github.com/apache/incubator-kie-tools", + "repository": { + "type": "git", + "url": "https://github.com/apache/incubator-kie-tools.git" + }, + "bugs": { + "url": "https://github.com/apache/incubator-kie-tools/issues" + }, + "scripts": { + "build:dev": "run-script-os", + "build:dev:darwin:linux": "mvn clean install -DskipTests", + "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests \"", + "build:prod": "pnpm lint && run-script-os", + "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", + "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", + "install": "node install.js", + "lint": "echo 'Linting'", + "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", + "quarkus:dev": "run-script-os", + "quarkus:dev:darwin:linux": "mvn clean package quarkus:dev -DskipTests", + "quarkus:dev:win32": "mvn clean package quarkus:dev `-DskipTests" + }, + "devDependencies": { + "@kie-tools/maven-config-setup-helper": "workspace:*", + "@kie-tools/root-env": "workspace:*", + "@kie-tools/serverless-workflow-dev-ui-webapp": "workspace:*", + "run-script-os": "^1.1.6" + }, + "kieTools": { + "requiredPreinstalledCliCommands": [ + "java", + "mvn" + ] + } +} \ No newline at end of file diff --git a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml new file mode 100644 index 00000000000..13e73193ceb --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml @@ -0,0 +1,70 @@ + + + + + 4.0.0 + KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension + org.kie.kogito + ${revision} + sonataflow-serverless-workflow-devui-parent + pom + + + org.kie.kogito.quarkus.swf.dev.ui + + + + sonataflow-serverless-workflow-devui-deployment + sonataflow-serverless-workflow-devui + + + + + + + io.quarkus + quarkus-maven-plugin + + + maven-surefire-plugin + + + org.jboss.logmanager.LogManager + + + + + maven-failsafe-plugin + + + org.jboss.logmanager.LogManager + + + + + maven-compiler-plugin + + + + + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml new file mode 100644 index 00000000000..463c41b4556 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml @@ -0,0 +1,202 @@ + + + + 4.0.0 + + + org.kie.kogito + sonataflow-serverless-workflow-devui-parent + 999-SNAPSHOT + + + sonataflow-serverless-workflow-devui-deployment + KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension :: Deployment + + + ../../serverless-workflow-dev-ui-webapp + + + + + + io.quarkus + quarkus-development-mode-spi + + + io.quarkus + quarkus-core-deployment + + + io.quarkus + quarkus-arc-deployment + + + io.quarkus + quarkus-resteasy-deployment + + + io.quarkus + quarkus-resteasy-jackson-deployment + + + io.quarkus + quarkus-rest-client-deployment + + + io.quarkus + quarkus-resteasy-multipart-deployment + + + org.kie.kogito + kogito-quarkus-extension-spi + + + + + io.quarkus + quarkus-undertow-deployment + + + + + io.rest-assured + rest-assured + test + + + org.mockito + mockito-core + test + + + org.kie.kogito + sonataflow-serverless-workflow-devui + ${project.version} + + + io.quarkus + quarkus-junit5-internal + test + + + org.kie.kogito + kogito-apps-ui-packages + pom + + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${version.io.quarkus} + + + + + + maven-resources-plugin + + + copy-webapp + process-resources + + copy-resources + + + ${basedir}/target/classes/dev-static/resources/webapp + + + ${path.to.webapp.app}/dist/resources/webapp + false + + + ${path.to.webapp.app}/dist/webapp + false + + + + + + + copy-envelope-resources + process-resources + + copy-resources + + + ${basedir}/target/classes/dev-static/resources + + + ${path.to.webapp.app}/dist/resources + + form-displayer.html + form-displayer.js + serverless-workflow-combined-editor-envelope.html + serverless-workflow-combined-editor-envelope.js + serverless-workflow-text-editor-envelope.html + serverless-workflow-text-editor-envelope.js + serverless-workflow-diagram-editor-envelope.html + serverless-workflow-diagram-editor-envelope.js + + + + + ${path.to.webapp.app}/dist/resources + + diagram/ + + + + + + + + copy-index + process-resources + + copy-resources + + + ${basedir}/target/classes/dev-static + + + ${basedir}/target/classes/static + + index.html + + + + + + + + + + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java new file mode 100644 index 00000000000..8ee81614fff --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java @@ -0,0 +1,148 @@ +/* + * 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.kie.kogito.swf.tools.deployment; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.file.Path; +import java.util.Optional; + +import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoDataIndexServiceAvailableBuildItem; + +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ConfigurationBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.LiveReloadBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; +import io.quarkus.deployment.util.WebJarUtil; +import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.devui.spi.page.CardPageBuildItem; +import io.quarkus.devui.spi.page.Page; +import io.quarkus.maven.dependency.ResolvedDependency; +import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; +import io.quarkus.vertx.http.deployment.RouteBuildItem; +import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder; +import io.quarkus.vertx.http.runtime.management.ManagementInterfaceBuildTimeConfig; + +public class DevConsoleProcessor { + + private static final String STATIC_RESOURCES_PATH = "dev-static/"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.sonataflow-serverless-workflow-devui"; + private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; + + @BuildStep(onlyIf = IsDevelopment.class) + public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, + ManagementInterfaceBuildTimeConfig managementInterfaceBuildTimeConfig, + LaunchModeBuildItem launchModeBuildItem, + ConfigurationBuildItem configurationBuildItem) throws UnsupportedEncodingException { + + String uiPath = nonApplicationRootPathBuildItem.resolveManagementPath(BASE_RELATIVE_URL, + managementInterfaceBuildTimeConfig, launchModeBuildItem, true); + + String devUIUrl = getProperty(configurationBuildItem, "kogito.dev-ui.url"); + String devUIUrlQueryParam = devUIUrl != null ? "&devUIUrl=" + URLEncoder.encode(devUIUrl, "UTF-8") : ""; + + String dataIndexUrl = getProperty(configurationBuildItem, "kogito.data-index.url"); + String dataIndexUrlQueryParam = dataIndexUrl != null ? "&dataIndexUrl=" + URLEncoder.encode(dataIndexUrl, "UTF-8") : ""; + + CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); + + cardPageBuildItem.addPage(Page.externalPageBuilder("Workflows") + .url(uiPath + "/index.html?page=Processes" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) + .isHtmlContent() + .icon("font-awesome-solid:diagram-project")); + + cardPageBuildItem.addPage(Page.externalPageBuilder("Monitoring") + .url(uiPath + "/index.html?page=Monitoring" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) + .isHtmlContent() + .icon("font-awesome-solid:gauge-high")); + + return cardPageBuildItem; + } + + @BuildStep(onlyIf = IsDevelopment.class) + @Record(ExecutionTime.RUNTIME_INIT) + public void deployStaticResources(final DevConsoleRecorder recorder, + final CurateOutcomeBuildItem curateOutcomeBuildItem, + final LiveReloadBuildItem liveReloadBuildItem, + final LaunchModeBuildItem launchMode, + final ShutdownContextBuildItem shutdownContext, + final BuildProducer routeBuildItemBuildProducer) throws IOException { + ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, + "org.kie.kogito", + "sonataflow-serverless-workflow-devui-deployment"); + + Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( + liveReloadBuildItem, + curateOutcomeBuildItem, + launchMode, + devConsoleResourcesArtifact, + STATIC_RESOURCES_PATH, + true); + + routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder() + .route(BASE_RELATIVE_URL + "/*") + .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(), + shutdownContext)) + .build()); + } + + @SuppressWarnings("unused") + @BuildStep(onlyIf = IsDevelopment.class) + public void isDataIndexAvailable(BuildProducer devConsoleTemplateInfoBuildItemBuildProducer, + Optional dataIndexServiceAvailableBuildItem, + Capabilities capabilities) { + devConsoleTemplateInfoBuildItemBuildProducer.produce(new DevConsoleTemplateInfoBuildItem("isDataIndexAvailable", + dataIndexServiceAvailableBuildItem.isPresent() || capabilities.isPresent(DATA_INDEX_CAPABILITY))); + } + + private static String getProperty(ConfigurationBuildItem configurationBuildItem, + String propertyKey) { + + String propertyValue = configurationBuildItem + .getReadResult() + .getAllBuildTimeValues() + .get(propertyKey); + + if (propertyValue == null) { + propertyValue = configurationBuildItem + .getReadResult() + .getBuildTimeRunTimeValues() + .get(propertyKey); + } else { + return propertyValue; + } + + if (propertyValue == null) { + propertyValue = configurationBuildItem + .getReadResult() + .getRunTimeDefaultValues() + .get(propertyKey); + } + + return propertyValue; + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java new file mode 100644 index 00000000000..3ccc8dcf1f6 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java @@ -0,0 +1,32 @@ +/* + * 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.kie.kogito.swf.tools.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +class ServerlessWorkflowQuarkusExtensionProcessor { + + private static final String FEATURE = "sonataflow-serverless-workflow-devui"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html new file mode 100644 index 00000000000..d61c149e66d --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html @@ -0,0 +1,58 @@ + +{#if info:isDataIndexAvailable} + + + Workflow Instances + + + + + Monitoring + +{/if} {#if info:isDataIndexAvailable == false} +

No Kogito addons detected.

+{/if} {#if info:isDataIndexAvailable} + +{/if} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html new file mode 100644 index 00000000000..d89e93894c0 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html @@ -0,0 +1,44 @@ + +{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; } #envelope-app { width: 100vw; height: +calc(100vh - 98px); } {/style} {#title}Runtime UI{/title} {#body} +
+ + + +{/body} {/include} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html new file mode 100644 index 00000000000..4da80a78e74 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html @@ -0,0 +1,45 @@ + +{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; } #envelope-app { width: 100vw; height: +calc(100vh - 98px); } {/style} {#title}Runtime UI{/title} {#body} +
+ + + +{/body} {/include} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html new file mode 100644 index 00000000000..dfccd2c2dea --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html @@ -0,0 +1,45 @@ + +
+ + + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml new file mode 100644 index 00000000000..6c6ef2b90db --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml @@ -0,0 +1,154 @@ + + + + 4.0.0 + + org.kie.kogito + sonataflow-serverless-workflow-devui-parent + 999-SNAPSHOT + + sonataflow-serverless-workflow-devui + KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension + Runtime development tools for Serverless Workflows + + + + io.quarkus + quarkus-core + + + + io.quarkus + quarkus-resteasy + + + + io.quarkus + quarkus-resteasy-jackson + + + + io.quarkus + quarkus-rest-client + + + + io.quarkus + quarkus-resteasy-multipart + + + + io.quarkus + quarkus-arc + + + + io.quarkus.arc + arc-processor + + + + + io.quarkus + quarkus-undertow + + + + jakarta.annotation + jakarta.annotation-api + + + + org.apache.commons + commons-lang3 + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + org.mockito + mockito-junit-jupiter + test + + + + io.quarkus + quarkus-junit5 + test + + + + io.quarkus + quarkus-junit5-mockito + test + + + + io.rest-assured + rest-assured + test + + + org.awaitility + awaitility + test + + + + + + io.quarkus + quarkus-extension-maven-plugin + ${version.io.quarkus} + + + compile + + extension-descriptor + + + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${version.io.quarkus} + + + + + + + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java new file mode 100644 index 00000000000..7dcc95128a3 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java @@ -0,0 +1,83 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard; + +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; + +@Path("/customDashboard") +public class CustomDashboardService { + + private static final Logger LOGGER = LoggerFactory.getLogger(CustomDashboardService.class); + + private CustomDashboardStorage storage; + + @Inject + public void setStorage(CustomDashboardStorage storage) { + this.storage = storage; + } + + @GET + @Path("/count") + @Produces(MediaType.TEXT_PLAIN) + public Response getCustomDashboardFilesCount() { + try { + return Response.ok(storage.getCustomDashboardFilesCount()).build(); + } catch (Exception e) { + LOGGER.warn("Error while getting CustomDashboard file count: ", e); + return Response.status(INTERNAL_SERVER_ERROR.getStatusCode(), "Unexpected error while getting CustomDashboard files count: " + e.getMessage()).build(); + } + } + + @GET + @Path("/list") + @Produces(MediaType.APPLICATION_JSON) + public Response getCustomDashboardFiles(@QueryParam("names") CustomDashboardFilter filter) { + try { + return Response.ok(storage.getCustomDashboardFiles(filter)).build(); + } catch (Exception e) { + LOGGER.warn("Error while getting CustomDashboard list: ", e); + return Response.status(INTERNAL_SERVER_ERROR.getStatusCode(), "Unexpected error while getting CustomDashboard files list: " + e.getMessage()).build(); + } + } + + @GET + @Path("/{name:\\S+}") + @Produces(MediaType.APPLICATION_JSON) + public Response getCustomDashboardFileContent(@PathParam("name") String name) { + try { + return Response.ok(storage.getCustomDashboardFileContent(name)).build(); + } catch (Exception e) { + LOGGER.warn("Error while getting CustomDashboard file content: ", e); + return Response.status(INTERNAL_SERVER_ERROR.getStatusCode(), "Unexpected error while getting CustomDashboard file content: " + e.getMessage()).build(); + } + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java new file mode 100644 index 00000000000..7d9c3a3d218 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java @@ -0,0 +1,36 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard; + +import java.io.IOException; +import java.util.Collection; + +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; + +public interface CustomDashboardStorage { + + int getCustomDashboardFilesCount(); + + Collection getCustomDashboardFiles(CustomDashboardFilter filter); + + String getCustomDashboardFileContent(String name) throws IOException; + + void updateCustomDashboard(String content); +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java new file mode 100644 index 00000000000..7ee3476df97 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java @@ -0,0 +1,40 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.converter; + +import java.util.Collections; +import java.util.StringTokenizer; +import java.util.stream.Collectors; + +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; + +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.Provider; + +@Provider +public class CustomDashboardFilterParamConverter implements ParamConverter { + public CustomDashboardFilter fromString(String names) { + StringTokenizer stringTokenizer = new StringTokenizer(names, ";"); + return new CustomDashboardFilter(Collections.list(stringTokenizer).stream().map(s -> (String) s).collect(Collectors.toList())); + } + + public String toString(CustomDashboardFilter names) { + return names.toString(); + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java new file mode 100644 index 00000000000..a6043248ad8 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java @@ -0,0 +1,41 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.converter; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; + +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; + +@Provider +public class CustomDashboardFilterParamConverterProvider implements ParamConverterProvider { + + @SuppressWarnings("unchecked") + @Override + public ParamConverter getConverter(Class rawType, Type genericType, Annotation[] annotations) { + if (rawType.isAssignableFrom(CustomDashboardFilter.class)) { + return (ParamConverter) new CustomDashboardFilterParamConverter(); + } + return null; + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java new file mode 100644 index 00000000000..a2a00437c09 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java @@ -0,0 +1,226 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.impl; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; +import java.nio.file.attribute.BasicFileAttributes; +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.eclipse.microprofile.config.ConfigProvider; +import org.kie.kogito.swf.tools.custom.dashboard.CustomDashboardStorage; +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.enterprise.context.ApplicationScoped; + +import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE; +import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY; + +@ApplicationScoped +public class CustomDashboardStorageImpl implements CustomDashboardStorage { + + public static final String PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP = "quarkus.kogito-runtime-tools.custom.dashboard.folder"; + private static final String CUSTOM_DASHBOARD_STORAGE_PATH = "/dashboards/"; + private static final Logger LOGGER = LoggerFactory.getLogger(CustomDashboardStorageImpl.class); + + private final Map customDashboardInfoMap = new HashMap<>(); + + private URL classLoaderCustomDashboardUrl; + private URL customDashStorageUrl; + + public CustomDashboardStorageImpl() { + start(Thread.currentThread().getContextClassLoader().getResource(CUSTOM_DASHBOARD_STORAGE_PATH)); + } + + public CustomDashboardStorageImpl(final URL classLoaderFormsUrl) { + start(classLoaderFormsUrl); + } + + private void start(final URL classLoaderFormsUrl) { + start(classLoaderFormsUrl, getCustomDashboardStorageUrl(classLoaderFormsUrl)); + } + + private void start(final URL classLoaderCustomDashboardUrl, final URL customDashStorageUrl) { + try { + this.classLoaderCustomDashboardUrl = classLoaderCustomDashboardUrl; + this.customDashStorageUrl = customDashStorageUrl; + } catch (Exception ex) { + LOGGER.warn("Couldn't properly initialize CustomDashboardStorageImpl"); + } finally { + if (classLoaderCustomDashboardUrl == null) { + return; + } + + init(readCustomDashboardResources()); + String storageUrl = getStorageUrl(classLoaderCustomDashboardUrl); + Thread t = new Thread(new DashboardFilesWatcher(reload(), storageUrl)); + t.start(); + } + } + + protected String getStorageUrl(URL classLoaderCustomDashboardUrl) { + return ConfigProvider.getConfig() + .getOptionalValue(PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP, String.class) + .orElseGet(() -> classLoaderCustomDashboardUrl.getFile()); + } + + private URL getCustomDashboardStorageUrl(URL classLoaderCustomDashboardUrl) { + if (classLoaderCustomDashboardUrl == null) { + return null; + } + + String storageUrl = getStorageUrl(classLoaderCustomDashboardUrl); + + File customDashStorageeFolder = new File(storageUrl); + + if (!customDashStorageeFolder.exists() || !customDashStorageeFolder.isDirectory()) { + LOGGER.warn("Cannot initialize form storage folder in path '" + customDashStorageeFolder.getPath() + "'"); + } + + try { + return customDashStorageeFolder.toURI().toURL(); + } catch (MalformedURLException ex) { + LOGGER.warn("Cannot initialize form storage folder in path '" + customDashStorageeFolder.getPath() + "'", ex); + } + return null; + } + + @Override + public int getCustomDashboardFilesCount() { + return customDashboardInfoMap.size(); + } + + @Override + public Collection getCustomDashboardFiles(CustomDashboardFilter filter) { + if (filter != null && !filter.getNames().isEmpty()) { + return customDashboardInfoMap.entrySet().stream() + .filter(entry -> StringUtils.containsAnyIgnoreCase(entry.getKey(), filter.getNames().toArray(new String[0]))) + .map(Map.Entry::getValue) + .collect(Collectors.toList()); + } else { + return customDashboardInfoMap.values(); + } + } + + @Override + public String getCustomDashboardFileContent(String name) throws IOException { + try { + return IOUtils.toString(new FileInputStream(customDashboardInfoMap.get(name).getPath()), StandardCharsets.UTF_8); + } catch (IOException e) { + LOGGER.info("custom-dashboard's file {} can not ready, because of {}", customDashboardInfoMap.get(name).getPath(), e.getMessage()); + throw e; + } + } + + @Override + public void updateCustomDashboard(String content) { + + } + + private void init(Collection files) { + customDashboardInfoMap.clear(); + files.stream() + .forEach(file -> { + LocalDateTime lastModified = LocalDateTime.ofInstant(Instant.ofEpochMilli(file.lastModified()), TimeZone.getDefault().toZoneId()); + customDashboardInfoMap.put(file.getName(), + new CustomDashboardInfo(file.getName(), file.getPath(), lastModified)); + }); + } + + private Collection readCustomDashboardResources() { + if (classLoaderCustomDashboardUrl != null) { + LOGGER.info("custom-dashboard's files path is {}", classLoaderCustomDashboardUrl.toString()); + File rootFolder = FileUtils.toFile(classLoaderCustomDashboardUrl); + return FileUtils.listFiles(rootFolder, new String[] { "dash.yaml", "dash.yml" }, true); + } + return Collections.emptyList(); + } + + private Consumer> reload() { + return this::init; + } + + private class DashboardFilesWatcher implements Runnable { + + private final Map keys = new HashMap<>(); + private Consumer> consumer; + private String folder; + + public DashboardFilesWatcher(Consumer> consumer, String folder) { + this.consumer = consumer; + this.folder = folder; + } + + @Override + public void run() { + try (WatchService ws = FileSystems.getDefault().newWatchService()) { + Path path = Path.of(folder); + keys.put(path.register(ws, ENTRY_MODIFY, ENTRY_CREATE), path); + + Files.walkFileTree(path, new SimpleFileVisitor() { + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + keys.put(dir.register(ws, ENTRY_MODIFY, ENTRY_CREATE, ENTRY_DELETE), dir); + return FileVisitResult.CONTINUE; + } + }); + WatchKey key; + while ((key = ws.take()) != null) { + for (WatchEvent event : key.pollEvents()) { + LOGGER.warn("Event kind: {}. File affected: {}", event.kind(), event.context()); + consumer.accept(readCustomDashboardResources()); + } + key.reset(); + } + } catch (InterruptedException e) { + LOGGER.warn("Exception in custom dashboard folder watcher for folder: {}, message: {}", folder, e.getMessage(), e); + Thread.currentThread().interrupt(); + } catch (IOException ex) { + LOGGER.warn("Exception in custom dashboard folder watcher for folder: {}, message: {}", folder, ex.getMessage(), ex); + } + } + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java new file mode 100644 index 00000000000..d3982535ce4 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java @@ -0,0 +1,50 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.model; + +import java.util.ArrayList; +import java.util.List; + +public class CustomDashboardFilter { + + private final List names; + + public CustomDashboardFilter() { + this.names = new ArrayList<>(); + } + + public CustomDashboardFilter(List names) { + this.names = names; + } + + public List getNames() { + return names; + } + + public void setNames(List names) { + this.names.addAll(names); + } + + @Override + public String toString() { + return "CustomDashboardFilter{" + + "names=" + names + + '}'; + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java new file mode 100644 index 00000000000..a7f80ac6afa --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java @@ -0,0 +1,95 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.model; + +import java.time.LocalDateTime; + +public class CustomDashboardInfo { + String name; + String path; + LocalDateTime lastModified; + + public CustomDashboardInfo(String name, String path, LocalDateTime lastModified) { + this.name = name; + this.path = path; + this.lastModified = lastModified; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public LocalDateTime getLastModified() { + return lastModified; + } + + public void setLastModified(LocalDateTime lastModified) { + this.lastModified = lastModified; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + CustomDashboardInfo that = (CustomDashboardInfo) o; + + if (name != null ? !name.equals(that.name) : that.name != null) { + return false; + } + if (path != null ? !path.equals(that.path) : that.path != null) { + return false; + } + return lastModified != null ? lastModified.equals(that.lastModified) : that.lastModified == null; + } + + @Override + public int hashCode() { + int result = name != null ? name.hashCode() : 0; + result = 31 * result + (path != null ? path.hashCode() : 0); + result = 31 * result + (lastModified != null ? lastModified.hashCode() : 0); + return result; + } + + @Override + public String toString() { + return "CustomDashboardInfo{" + + "name='" + name + '\'' + + ", path='" + path + '\'' + + ", lastModified=" + lastModified + + '}'; + } + +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml new file mode 100644 index 00000000000..a0eb9fbf8cd --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml @@ -0,0 +1,20 @@ + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000..f94bcb9779c --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,28 @@ +# +# 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. +# + +name: Serverless Workflow Tools +metadata: + keywords: + - "kogito" + - "workflows" + guide: "https://quarkus.io/guides/kogito" + categories: + - "business-automation" + status: "preview" diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java new file mode 100644 index 00000000000..88a398014a8 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java @@ -0,0 +1,115 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.impl; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.concurrent.TimeUnit; + +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.kie.kogito.swf.tools.custom.dashboard.CustomDashboardStorage; +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; + +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class CustomDashboardStorageTest { + + private static String[] DASHBOARD_NAMES = { "age.dash.yml", "products.dash.yaml" }; + private static String DASHBOARD_NAME = "age.dash.yml"; + + private CustomDashboardStorage customDashboardStorage; + private URL tempFolder; + + @BeforeAll + public void init() { + tempFolder = Thread.currentThread().getContextClassLoader().getResource("custom/dashboards/"); + + customDashboardStorage = new CustomDashboardStorageImpl(tempFolder); + } + + @Test + public void testGetFormInfoList() { + Collection customDashboardInfoFilterAll = customDashboardStorage.getCustomDashboardFiles(null); + assertEquals(2, customDashboardInfoFilterAll.size()); + + CustomDashboardFilter filterEmpty = new CustomDashboardFilter(); + filterEmpty.setNames(Collections.emptyList()); + Collection customDashboardInfoAllEmptyFilter = customDashboardStorage.getCustomDashboardFiles(filterEmpty); + assertEquals(2, customDashboardInfoAllEmptyFilter.size()); + + CustomDashboardFilter filter = new CustomDashboardFilter(); + filter.setNames(Arrays.asList(DASHBOARD_NAMES)); + + Collection formInfos = customDashboardStorage.getCustomDashboardFiles(filter); + assertEquals(2, formInfos.size()); + } + + @Test + public void testHotReloading() throws IOException { + String storageUrl = Thread.currentThread().getContextClassLoader().getResource("custom/dashboards/").getFile(); + File srcFile = new File(storageUrl + "products.dash.yaml"); + File targetFile = new File(storageUrl + "copy.dash.yml"); + + assertEquals(false, targetFile.exists()); + FileUtils.copyFile(srcFile, targetFile); + assertEquals(true, targetFile.exists()); + await().atMost(20, TimeUnit.SECONDS).until(() -> testBeforeDelete()); + Collection customDashboardInfoFilterAllBeforeDelete = customDashboardStorage.getCustomDashboardFiles(null); + assertEquals(3, customDashboardInfoFilterAllBeforeDelete.size()); + + assertEquals(true, targetFile.exists()); + FileUtils.delete(targetFile); + assertEquals(false, targetFile.exists()); + await().atMost(20, TimeUnit.SECONDS).until(() -> testAfterDelete()); + + Collection customDashboardInfoFilterAllAfterDelete = customDashboardStorage.getCustomDashboardFiles(null); + assertEquals(2, customDashboardInfoFilterAllAfterDelete.size()); + } + + private boolean testBeforeDelete() { + if (customDashboardStorage.getCustomDashboardFiles(null).size() == 3) { + return true; + } + return false; + } + + private boolean testAfterDelete() { + if (customDashboardStorage.getCustomDashboardFiles(null).size() == 2) { + return true; + } + return false; + } + + @Test + public void testGetFormContent() throws IOException { + String content = customDashboardStorage.getCustomDashboardFileContent(DASHBOARD_NAME); + assertNotNull(content); + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java new file mode 100644 index 00000000000..a901f732291 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java @@ -0,0 +1,46 @@ +/* + * 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.kie.kogito.swf.tools.custom.dashboard.impl; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.Collections; +import java.util.Map; + +import io.quarkus.test.junit.QuarkusTestProfile; + +import static org.kie.kogito.swf.tools.custom.dashboard.impl.CustomDashboardStorageImpl.PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP; + +public class CustomDashboardStorageTestProfile implements QuarkusTestProfile { + + private String storagePath; + + public CustomDashboardStorageTestProfile() throws IOException { + File storage = Files.createTempDirectory("CustomDashboardStorageTestProfile").toFile(); + storage.deleteOnExit(); + storage.mkdir(); + storagePath = storage.getAbsolutePath(); + } + + @Override + public Map getConfigOverrides() { + return Collections.singletonMap(PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP, storagePath); + } +} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml new file mode 100644 index 00000000000..ea685a0b5c3 --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml @@ -0,0 +1,61 @@ +# +# 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. +# + +datasets: + - uuid: products + content: >- + [ + ["Computers", "Scanner", 5, 3], + ["Computers", "Printer", 7, 4], + ["Computers", "Laptop", 3, 2], + ["Electronics", "Camera", 10, 7], + ["Electronics", "Headphones", 5, 9] + ] + columns: + - id: Section + type: LABEL + - id: Product + type: LABEL + - id: Quantity + type: NUMBER + - id: Quantity2 + type: NUMBER +pages: + - components: + - html: Welcome to Dashbuilder! + properties: + font-size: xx-large + margin-bottom: 30px + - settings: + type: BARCHART + dataSetLookup: + uuid: products + group: + - columnGroup: + source: Product + groupFunctions: + - source: Product + - source: Quantity + function: SUM + - source: Quantity2 + function: SUM + - settings: + type: TABLE + dataSetLookup: + uuid: products diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml new file mode 100644 index 00000000000..011aff8684e --- /dev/null +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml @@ -0,0 +1,44 @@ +# +# 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. +# + +datasets: + - uuid: age + content: >- + [ + ["John", 5], + ["Mary", 7], + ["Mark", 3] + ] + columns: + - id: Name + type: LABEL + - id: Age + type: Number +pages: + - components: + - settings: + type: BARCHART + dataSetLookup: + uuid: age + group: + - columnGroup: + source: Name + groupFunctions: + - source: Name + - source: Age diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5f21896cf6..52321c1983a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9167,6 +9167,21 @@ importers: specifier: ^5.9.0 version: 5.9.0 + packages/sonataflow-serverless-workflow-devui-parent: + devDependencies: + "@kie-tools/maven-config-setup-helper": + specifier: workspace:* + version: link:../maven-config-setup-helper + "@kie-tools/root-env": + specifier: workspace:* + version: link:../root-env + "@kie-tools/serverless-workflow-dev-ui-webapp": + specifier: workspace:* + version: link:../serverless-workflow-dev-ui-webapp + run-script-os: + specifier: ^1.1.6 + version: 1.1.6 + packages/storybook-base: devDependencies: "@kie-tools-core/webpack-base": @@ -9582,7 +9597,7 @@ importers: version: 5.88.2(webpack-cli@4.10.0) webpack-dev-server: specifier: ^4.15.1 - version: 4.15.1(webpack@5.88.2) + version: 4.15.1(webpack-cli@4.10.0)(webpack@5.88.2) webpack-merge: specifier: ^5.9.0 version: 5.9.0 @@ -45349,58 +45364,6 @@ packages: - utf-8-validate dev: true - /webpack-dev-server@4.15.1(webpack@5.88.2): - resolution: - { integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== } - engines: { node: ">= 12.13.0" } - hasBin: true - peerDependencies: - webpack: ^4.37.0 || ^5.0.0 - webpack-cli: "*" - peerDependenciesMeta: - webpack: - optional: true - webpack-cli: - optional: true - dependencies: - "@types/bonjour": 3.5.10 - "@types/connect-history-api-fallback": 1.3.5 - "@types/express": 4.17.17 - "@types/serve-index": 1.9.1 - "@types/serve-static": 1.13.10 - "@types/sockjs": 0.3.33 - "@types/ws": 8.5.5 - ansi-html-community: 0.0.8 - bonjour-service: 1.1.1 - chokidar: 3.5.3 - colorette: 2.0.20 - compression: 1.7.4 - connect-history-api-fallback: 2.0.0 - default-gateway: 6.0.3 - express: 4.18.2 - graceful-fs: 4.2.11 - html-entities: 2.3.2 - http-proxy-middleware: 2.0.6(@types/express@4.17.17) - ipaddr.js: 2.0.1 - launch-editor: 2.6.0 - open: 8.4.0 - p-retry: 4.6.1 - rimraf: 3.0.2 - schema-utils: 4.0.0 - selfsigned: 2.1.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack: 5.88.2(webpack-cli@4.10.0) - webpack-dev-middleware: 5.3.3(webpack@5.88.2) - ws: 8.14.2 - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - dev: true - /webpack-hot-middleware@2.25.4: resolution: { integrity: sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w== } diff --git a/repo/graph.dot b/repo/graph.dot index 30d6dff5996..733871919e7 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -150,6 +150,7 @@ digraph G { "@kie-tools/serverless-workflow-service-catalog" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/serverless-workflow-language-service" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "swf-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; + "@kie-tools/sonataflow-serverless-workflow-devui-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/stunner-editors-dmn-loader" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/unitables" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "vscode-extension-dashbuilder-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -462,6 +463,7 @@ digraph G { "swf-vscode-extension" -> "@kie-tools/vscode-extension-common-test-helpers" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools-core/react-hooks" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools/runtime-tools-webapp-components" [ style = "dashed", color = "blue" ]; + "@kie-tools/sonataflow-serverless-workflow-devui-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ]; "@kie-tools/storybook-base" -> "@kie-tools/tsconfig" [ style = "dashed", color = "blue" ]; "@kie-tools/stunner-editors" -> "@kie-tools/stunner-editors-dmn-loader" [ style = "solid", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index 3440aac19f1..0e1c16cbba0 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -155,6 +155,7 @@ { "id": "@kie-tools/serverless-workflow-jq-expressions" }, { "id": "@kie-tools/serverless-workflow-service-catalog" }, { "id": "swf-vscode-extension" }, + { "id": "@kie-tools/sonataflow-serverless-workflow-devui-parent" }, { "id": "vscode-extension-dashbuilder-editor" }, { "id": "vscode-extension-kie-ba-bundle" }, { "id": "vscode-extension-kogito-bundle" }, @@ -963,6 +964,11 @@ "weight": 1 }, { "source": "swf-vscode-extension", "target": "@kie-tools/vscode-extension-common-test-helpers", "weight": 1 }, + { + "source": "@kie-tools/sonataflow-serverless-workflow-devui-parent", + "target": "@kie-tools/serverless-workflow-dev-ui-webapp", + "weight": 1 + }, { "source": "vscode-extension-dashbuilder-editor", "target": "@kie-tools-core/vscode-extension", "weight": 1 }, { "source": "vscode-extension-dashbuilder-editor", @@ -1141,6 +1147,7 @@ ["@kie-tools/serverless-workflow-text-editor", "packages/serverless-workflow-text-editor"], ["swf-vscode-extension", "packages/serverless-workflow-vscode-extension"], ["sonataflow-deployment-webapp", "packages/sonataflow-deployment-webapp"], + ["@kie-tools/sonataflow-serverless-workflow-devui-parent", "packages/sonataflow-serverless-workflow-devui-parent"], ["@kie-tools/storybook-base", "packages/storybook-base"], ["@kie-tools/stunner-editors", "packages/stunner-editors"], ["@kie-tools/stunner-editors-dmn-loader", "packages/stunner-editors-dmn-loader"], From c1652ffdef74ac12f17b2bbe74ec45d88e08789b Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Tue, 20 Feb 2024 15:23:07 +0100 Subject: [PATCH 02/69] Resources setup --- .../pom.xml | 8 +++++--- .../kogito/swf/tools/deployment/DevConsoleProcessor.java | 2 +- .../src/main/resources/static/index.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml index 463c41b4556..043e84e6049 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml @@ -151,10 +151,10 @@ copy-resources - ${basedir}/target/classes/dev-static/resources + ${basedir}/target/classes/dev-static - ${path.to.webapp.app}/dist/resources + ${path.to.webapp.app}/dist form-displayer.html form-displayer.js @@ -164,11 +164,13 @@ serverless-workflow-text-editor-envelope.js serverless-workflow-diagram-editor-envelope.html serverless-workflow-diagram-editor-envelope.js + vendors-*.bundle.js + *.worker.js - ${path.to.webapp.app}/dist/resources + ${path.to.webapp.app}/dist diagram/ diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java index 8ee81614fff..a494df7c8d0 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java @@ -71,7 +71,7 @@ public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRoo CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); cardPageBuildItem.addPage(Page.externalPageBuilder("Workflows") - .url(uiPath + "/index.html?page=Processes" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) + .url(uiPath + "/index.html?page=Workflows" + devUIUrlQueryParam + dataIndexUrlQueryParam, uiPath) .isHtmlContent() .icon("font-awesome-solid:diagram-project")); diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html index dfccd2c2dea..8e850ece508 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html @@ -28,7 +28,7 @@ const dataIndexUrl = urlParams.get("dataIndexUrl"); const devUI = RuntimeToolsDevUI.open({ - container: document.getElementById("webapp"), + container: document.getElementById("envelope-app"), isDataIndexAvailable: true, dataIndexUrl: dataIndexUrl ? dataIndexUrl : "" + "/graphql", page: page, From daae2bb70fea620509fa72f8507d0bf65f27fc18 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 23 Feb 2024 18:27:24 +0100 Subject: [PATCH 03/69] Make stunner editor compatible with JDK 17 --- packages/stunner-editors/pom.xml | 16 +++++++++++----- .../pfly/tab/TabPanelWithDropdownsTest.java | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index e1273052e33..88787dc2b03 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -231,8 +231,8 @@ 8.29 - 1.8 - 1.8 + 8 + 8 ${maven.compiler.target} ${maven.compiler.source} UTF-8 @@ -249,7 +249,7 @@ 3.3.0 3.2.0 3.1.0 - 3.10.1 + 3.12.1 3.3.0 2.8.2 3.1.0 @@ -267,7 +267,7 @@ 3.1.8 3.9.1.2184 3.0.1 - 2.22.2 + 3.2.5 3.2.2 2.3.0 @@ -1516,7 +1516,13 @@ org/drools/workbench/**/*IntegrationTest.java org/drools/workbench/**/*IT.java - -Dfile.encoding=${project.build.sourceEncoding} + + -Dfile.encoding=${project.build.sourceEncoding} + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.time.format=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + diff --git a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java index 13df2a0ec3a..394d69f7f8a 100644 --- a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java +++ b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java @@ -36,6 +36,7 @@ import org.gwtbootstrap3.client.ui.TabContent; import org.gwtbootstrap3.client.ui.TabPane; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -122,7 +123,7 @@ public void testInsertItem() { verify(tabPanel).resizeTabContent(); } - @Test + @Test @Ignore public void testInsertTabAndContent() { final int index = 1; From 9baeac9b5bb5cc18d20c3eed031732b6452772d4 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 23 Feb 2024 18:46:43 +0100 Subject: [PATCH 04/69] Test fixed --- .../views/pfly/tab/TabPanelWithDropdownsTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java index 394d69f7f8a..b60b08c43d2 100644 --- a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java +++ b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java @@ -45,11 +45,7 @@ import static com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant.endOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.*; @RunWith(GwtMockitoTestRunner.class) public class TabPanelWithDropdownsTest { @@ -123,15 +119,15 @@ public void testInsertItem() { verify(tabPanel).resizeTabContent(); } - @Test @Ignore + @Test public void testInsertTabAndContent() { final int index = 1; final TabPane tabContentPane = mock(TabPane.class); final NavTabs tabBar = mock(NavTabs.class); final TabContent tabContent = mock(TabContent.class); - final Set allContentTabs = spy(new HashSet<>()); - final Set activatableWidgets = spy(new HashSet<>()); + final Set allContentTabs = mock(Set.class); + final Set activatableWidgets = mock(Set.class); doReturn(tabWidget).when(tab).getTabWidget(); doReturn(tabContentPane).when(tab).getContentPane(); From e96c6ed02486d5e6ec59d930442cf71b6d2eb679 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 23 Feb 2024 18:50:02 +0100 Subject: [PATCH 05/69] Test fixed --- .../client/views/pfly/tab/TabPanelWithDropdownsTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java index b60b08c43d2..1f7e7f4ee0e 100644 --- a/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java +++ b/packages/stunner-editors/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java @@ -36,7 +36,6 @@ import org.gwtbootstrap3.client.ui.TabContent; import org.gwtbootstrap3.client.ui.TabPane; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -45,7 +44,11 @@ import static com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant.endOf; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; @RunWith(GwtMockitoTestRunner.class) public class TabPanelWithDropdownsTest { From 70cf51d640dadfa800413cb59419114e8510c9f3 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sat, 24 Feb 2024 09:49:09 +0100 Subject: [PATCH 06/69] Unnecessary entry --- packages/stunner-editors/errai-reflections/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/stunner-editors/errai-reflections/pom.xml b/packages/stunner-editors/errai-reflections/pom.xml index 04281375ee5..bea0ab861d4 100644 --- a/packages/stunner-editors/errai-reflections/pom.xml +++ b/packages/stunner-editors/errai-reflections/pom.xml @@ -82,13 +82,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin From b2468cc37dc2280a70c12cad4bf3d0b8e7c29fbb Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sat, 24 Feb 2024 23:01:03 +0100 Subject: [PATCH 07/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../fields/model/AssignmentBaseTest.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/model/AssignmentBaseTest.java b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/model/AssignmentBaseTest.java index 05471881e04..edbf055e2eb 100644 --- a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/model/AssignmentBaseTest.java +++ b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-client/src/test/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/model/AssignmentBaseTest.java @@ -21,16 +21,12 @@ package org.kie.workbench.common.stunner.bpmn.client.forms.fields.model; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.net.URLDecoder; import java.net.URLEncoder; import com.google.gwt.junit.GWTMockUtilities; -import org.kie.workbench.common.stunner.bpmn.client.forms.fields.i18n.StunnerFormsClientFieldsConstants; import org.kie.workbench.common.stunner.bpmn.client.forms.util.StringUtils; import org.kie.workbench.common.stunner.bpmn.client.forms.util.URL; -import org.mockito.stubbing.Answer; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -42,11 +38,6 @@ public void setUp() throws Exception { // Prevent runtime GWT.create() error at DesignerEditorConstants.INSTANCE GWTMockUtilities.disarm(); // MockDesignerEditorConstants replaces DesignerEditorConstants.INSTANCE - final Answer answer = invocation -> invocation.getMethod().getName(); - final StunnerFormsClientFieldsConstants constants = mock(StunnerFormsClientFieldsConstants.class, - answer); - setFinalStaticField(StunnerFormsClientFieldsConstants.class.getDeclaredField("CONSTANTS"), - constants); // Prevent GWT calls in StringUtils URL url = mock(URL.class); @@ -99,14 +90,4 @@ public String urlDecode(String s) { } } - private void setFinalStaticField(Field field, - Object newValue) throws Exception { - field.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, - field.getModifiers() & ~Modifier.FINAL); - field.set(null, - newValue); - } } From b0b899354dbec0155aea23dac961ac5013e09a0e Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 00:55:20 +0100 Subject: [PATCH 08/69] Update Selenium + Webdriver --- .../selenium/BPMNDesignerKogitoSeleniumIT.java | 7 ++----- packages/stunner-editors/pom.xml | 16 +++++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-kogito-runtime/src/test/java/org/kie/workbench/common/stunner/kogito/client/selenium/BPMNDesignerKogitoSeleniumIT.java b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-kogito-runtime/src/test/java/org/kie/workbench/common/stunner/kogito/client/selenium/BPMNDesignerKogitoSeleniumIT.java index 91fede92c43..6970f970dd8 100644 --- a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-kogito-runtime/src/test/java/org/kie/workbench/common/stunner/kogito/client/selenium/BPMNDesignerKogitoSeleniumIT.java +++ b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-kogito-runtime/src/test/java/org/kie/workbench/common/stunner/kogito/client/selenium/BPMNDesignerKogitoSeleniumIT.java @@ -73,10 +73,7 @@ public class BPMNDesignerKogitoSeleniumIT { private static final String DIAGRAM_EXPLORER_EXPANDED = "expanded-docks-bar-E"; private static final String DIAGRAM_PANEL = "qe-static-workbench-panel-view"; private static final String EDITOR_CONTENT_HAS_NOT_BEEN_SET_HEADING = "//h1[@data-i18n-key='Editor_content_has_not_been_set.']"; - private static final String ERROR_MODAL_DIALOG = "//div[@class='modal-dialog']"; - private static final String ERROR_MODAL_BODY = "//div[@class='modal-body']"; private static final String PROCESS_NODE = "//div[@data-field='explorerPanelBody']//a[text()='%s']"; - private static final Boolean HEADLESS = Boolean.valueOf(System.getProperty("org.kie.bpmn.kogito.browser.headless")); private static final String SCREENSHOTS_DIR = System.getProperty("org.kie.bpmn.kogito.screenshots.dir"); /** @@ -102,7 +99,7 @@ public static void setupClass() { @Before public void openBPMNDesigner() { final FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(HEADLESS); + firefoxOptions.addArguments("--headless"); driver = new FirefoxDriver(firefoxOptions); driver.manage().window().maximize(); @@ -300,6 +297,6 @@ private ExpectedCondition element(final String xpathLocator, final S } private WebDriverWait waitOperation() { - return new WebDriverWait(driver, Duration.ofSeconds(10).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(10)); } } diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index 88787dc2b03..dc0a493db1c 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -300,7 +300,7 @@ 1.0.1 1.0.2 3.26.0-GA - 3.13.0 + 4.18.1 2.3.5 2.0.0 1.3 - 5.5.3 + 5.7.0 4.13.2 3.22.0 1.1.9 @@ -330,14 +330,10 @@ import - - org.jboss.arquillian.selenium - selenium-bom - ${version.org.jboss.arquillian.selenium} - pom - import + org.seleniumhq.selenium + selenium-java + ${version.org.seleniumhq.selenium} @@ -1519,8 +1515,10 @@ -Dfile.encoding=${project.build.sourceEncoding} --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.format=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED From 81a246cb5d6fe0390f6ab739154ae59e1ffabbd0 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 01:05:16 +0100 Subject: [PATCH 09/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../presenters/session/impl/SessionPresenterViewTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/src/test/java/org/kie/workbench/common/stunner/client/widgets/presenters/session/impl/SessionPresenterViewTest.java b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/src/test/java/org/kie/workbench/common/stunner/client/widgets/presenters/session/impl/SessionPresenterViewTest.java index 182c196b27b..1e8938bdc4c 100644 --- a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/src/test/java/org/kie/workbench/common/stunner/client/widgets/presenters/session/impl/SessionPresenterViewTest.java +++ b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-widgets/src/test/java/org/kie/workbench/common/stunner/client/widgets/presenters/session/impl/SessionPresenterViewTest.java @@ -21,7 +21,6 @@ package org.kie.workbench.common.stunner.client.widgets.presenters.session.impl; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style; @@ -187,11 +186,7 @@ private static void setFinal(Object instance, Field field, Object newValue) throws Exception { field.setAccessible(true); - // remove final modifier from field - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, - field.getModifiers() & ~Modifier.FINAL); + field.set(instance, newValue); } From 328784001533293978fdb0b8a16e16bb6150395f Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 09:42:03 +0100 Subject: [PATCH 10/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../toolbox/DMNEditDRDToolboxActionTest.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/canvas/controls/toolbox/DMNEditDRDToolboxActionTest.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/canvas/controls/toolbox/DMNEditDRDToolboxActionTest.java index ab1a678d6c7..4b4fd79d3cb 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/canvas/controls/toolbox/DMNEditDRDToolboxActionTest.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/canvas/controls/toolbox/DMNEditDRDToolboxActionTest.java @@ -19,13 +19,10 @@ package org.kie.workbench.common.dmn.client.canvas.controls.toolbox; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.Collection; import com.google.gwtmockito.GwtMockitoTestRunner; import elemental2.dom.CSSStyleDeclaration; -import elemental2.dom.DomGlobal; import elemental2.dom.HTMLBodyElement; import elemental2.dom.HTMLDocument; import elemental2.dom.HTMLElement; @@ -100,15 +97,6 @@ public void testOnMouseClick() throws NoSuchFieldException, IllegalAccessExcepti final HTMLDocument htmlDocument = new HTMLDocument(); htmlDocument.body = new HTMLBodyElement(); - final Field field = DomGlobal.class.getDeclaredField("document"); - field.setAccessible(true); - - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); - - field.set(DomGlobal.class, htmlDocument); - when(drdContextMenu.getElement()).thenReturn(htmlElement); dmnEditDRDToolboxAction.onMouseClick(canvasHandler, UUID, mouseClickEvent); From f2ceda621337ce43ea5da4e495445a7dea463611 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 10:08:32 +0100 Subject: [PATCH 11/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../dmn/client/editors/drd/DRDContextMenuTest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java index c77d2378735..076f690d7ec 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java @@ -20,7 +20,6 @@ package org.kie.workbench.common.dmn.client.editors.drd; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -29,7 +28,6 @@ import com.google.gwtmockito.GwtMockitoTestRunner; import elemental2.dom.CSSStyleDeclaration; -import elemental2.dom.DomGlobal; import elemental2.dom.HTMLBodyElement; import elemental2.dom.HTMLDocument; import elemental2.dom.HTMLElement; @@ -144,14 +142,10 @@ public void testAppendContextMenuToTheDOM() throws NoSuchFieldException, Illegal field.setAccessible(true); field.set(element, styleDeclaration); - final Field field2 = DomGlobal.class.getDeclaredField("document"); + /*final Field field2 = DomGlobal.class.getDeclaredField("document"); field2.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field2, field2.getModifiers() & ~Modifier.FINAL); - - field2.set(DomGlobal.class, htmlDocument); + field2.set(DomGlobal.class, htmlDocument);*/ final Field field3 = HTMLDocument.class.getDeclaredField("body"); field3.setAccessible(true); From 9567d6b141665da0b25bf4f0f6a3d266c26c64ed Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 11:33:49 +0100 Subject: [PATCH 12/69] Update Selenium + Webdriver --- .../common/dmn/showcase/client/common/DMNDesignerBaseIT.java | 4 +--- .../common/dmn/showcase/client/common/wait/WaitUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/DMNDesignerBaseIT.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/DMNDesignerBaseIT.java index f5d49b43ff3..c0c5a4d6738 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/DMNDesignerBaseIT.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/DMNDesignerBaseIT.java @@ -87,8 +87,6 @@ public class DMNDesignerBaseIT { private static final String INDEX_HTML_PATH = "file:///" + new File(INDEX_HTML).getAbsolutePath(); - private static final Boolean HEADLESS = Boolean.valueOf(System.getProperty("org.kie.dmn.kogito.browser.headless")); - private static final String SCREENSHOTS_DIR = System.getProperty("org.kie.dmn.kogito.screenshots.dir"); private WebDriver driver; @@ -118,7 +116,7 @@ public void openDMNDesigner() { private FirefoxOptions getFirefoxOptions() { final FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(HEADLESS); + firefoxOptions.addArguments("--headless"); return firefoxOptions; } diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/wait/WaitUtils.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/wait/WaitUtils.java index 723ddc20aad..cb312b0f27a 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/wait/WaitUtils.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/test/java/org/kie/workbench/common/dmn/showcase/client/common/wait/WaitUtils.java @@ -34,14 +34,14 @@ public class WaitUtils { - private WebDriver driver; + private final WebDriver driver; public WaitUtils(final WebDriver driver) { this.driver = driver; } private WebDriverWait waitOperation() { - return new WebDriverWait(driver, Duration.ofSeconds(10).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(10)); } public WebElement waitUntilElementIsVisible(final DMNDesignerLocator elementLocator, From e971dfa645f3f6c4bf1cd23eed9e45f729d4279c Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 11:34:33 +0100 Subject: [PATCH 13/69] Updating plugin --- packages/stunner-editors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index dc0a493db1c..23cd2def06d 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -261,7 +261,7 @@ 0.15.1 1.3 1.5.2 - 3.1.0 + 3.2.0 3.2.1 3.7.1 3.1.8 From 1b578ad4fab1af098f94834d8c5dc2777cdd5e01 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 21:56:36 +0100 Subject: [PATCH 14/69] Updating test dependency that doesn't support JDK 17 --- packages/stunner-editors/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index 23cd2def06d..e15ed018bc2 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -255,7 +255,7 @@ 3.1.0 ${version.surefire.plugin} 2.5.2 - 0.8.5 + 0.8.11 3.1.0 1.5 0.15.1 @@ -287,14 +287,14 @@ 1.7.4 1.3.2 2.0.SP1 - 1.10.3 + 1.14.12 0.9.21 1.8.2 1.4 2.3 1.0 2.9.0 - 2.3.31 + 2.3.32 3.0.0 4.0 1.0.1 From 358cddd8debc5517e2fbf84ca8c449ec22046a37 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 22:06:45 +0100 Subject: [PATCH 15/69] Update Selenium + Webdriver --- .../org/kie/lienzo/client/selenium/JsCanvasDriver.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/stunner-editors/lienzo-webapp/src/test/java/org/kie/lienzo/client/selenium/JsCanvasDriver.java b/packages/stunner-editors/lienzo-webapp/src/test/java/org/kie/lienzo/client/selenium/JsCanvasDriver.java index 3c253e7af0c..57847aa51c6 100644 --- a/packages/stunner-editors/lienzo-webapp/src/test/java/org/kie/lienzo/client/selenium/JsCanvasDriver.java +++ b/packages/stunner-editors/lienzo-webapp/src/test/java/org/kie/lienzo/client/selenium/JsCanvasDriver.java @@ -34,8 +34,6 @@ public class JsCanvasDriver extends JsCanvasExecutor { private static final String INDEX_HTML = "target/lienzo-webapp-0.0.0/LienzoShowcase.html"; private static final String INDEX_HTML_PATH = "file:///" + new File(INDEX_HTML).getAbsolutePath(); - private static final boolean HEADLESS = false; - private final WebDriver driver; // TODO: Refactor/remove use of loadTimeMillis by using selenium until conditions private long loadTimeMillis = 1000; @@ -56,7 +54,7 @@ public static JsCanvasDriver build() { public static JsCanvasDriver build(String url) { final FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(HEADLESS); + firefoxOptions.addArguments("--headless"); WebDriver driver = new FirefoxDriver(firefoxOptions); driver.manage().window().maximize(); driver.get(url); @@ -80,10 +78,10 @@ public void closeTest() { } private WebDriverWait waitOperation(long seconds) { - return new WebDriverWait(driver, Duration.ofSeconds(seconds).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(seconds)); } private WebDriverWait waitAppLoaded() { - return new WebDriverWait(driver, Duration.ofSeconds(5).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(5)); } } From 01b50e5db51089fea37da252b5c1b8878f7b6246 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Sun, 25 Feb 2024 23:09:35 +0100 Subject: [PATCH 16/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../dmn/client/editors/drd/DRDContextMenu.java | 8 +++++++- .../client/editors/drd/DRDContextMenuTest.java | 16 +++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenu.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenu.java index 8cdc2d322a6..8ad00b4493f 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenu.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenu.java @@ -27,6 +27,7 @@ import javax.inject.Inject; import elemental2.dom.DomGlobal; +import elemental2.dom.HTMLBodyElement; import elemental2.dom.HTMLElement; import org.kie.workbench.common.dmn.api.property.dmn.Id; import org.kie.workbench.common.dmn.client.docks.navigator.drds.DMNDiagramTuple; @@ -71,7 +72,12 @@ public void appendContextMenuToTheDOM(final double x, final double y) { contextMenuElement.style.position = "absolute"; contextMenuElement.style.left = x + "px"; contextMenuElement.style.top = y + "px"; - DomGlobal.document.body.appendChild(contextMenuElement); + getDocumentBody().appendChild(contextMenuElement); + } + + /* Indirection required by unit tests */ + protected HTMLBodyElement getDocumentBody() { + return DomGlobal.document.body; } public void show(final Collection, Edge>> selectedNodes) { diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java index 076f690d7ec..df853d67ab3 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/drd/DRDContextMenuTest.java @@ -51,8 +51,10 @@ import static org.kie.workbench.common.dmn.client.editors.drd.DRDContextMenu.DRDACTIONS_CONTEXT_MENU_TITLE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.when; @@ -91,7 +93,7 @@ public class DRDContextMenuTest { @Before public void setUp() { - drdContextMenu = new DRDContextMenu(contextMenu, translationService, drdContextMenuService, dmnDiagramsSession); + drdContextMenu = spy(new DRDContextMenu(contextMenu, translationService, drdContextMenuService, dmnDiagramsSession)); } @Test @@ -137,22 +139,14 @@ public void testContextMenuHandler() { @Test public void testAppendContextMenuToTheDOM() throws NoSuchFieldException, IllegalAccessException { when(contextMenu.getElement()).thenReturn(element); + doReturn(body).when(drdContextMenu).getDocumentBody(); final Field field = HTMLElement.class.getDeclaredField("style"); field.setAccessible(true); field.set(element, styleDeclaration); - /*final Field field2 = DomGlobal.class.getDeclaredField("document"); - field2.setAccessible(true); - - field2.set(DomGlobal.class, htmlDocument);*/ - - final Field field3 = HTMLDocument.class.getDeclaredField("body"); - field3.setAccessible(true); - field3.set(htmlDocument, body); - drdContextMenu.appendContextMenuToTheDOM(10, 10); - verify(body).appendChild(Mockito.any()); + verify(body).appendChild(Mockito.any()); } } From dcca35944eeece2abf7719bec04a24f4ddeff4bb Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 09:14:16 +0100 Subject: [PATCH 17/69] Removing reflection trick to mock static final fields (no longer valid with JDK 12+) --- .../editors/contextmenu/ContextMenuView.java | 14 ++++++++++---- .../editors/contextmenu/ContextMenuViewTest.java | 15 +++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuView.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuView.java index d164d04f35f..71b3c9a4ab2 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuView.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/main/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuView.java @@ -31,6 +31,7 @@ import elemental2.dom.Element; import elemental2.dom.Event; import elemental2.dom.EventListener; +import elemental2.dom.HTMLDocument; import jsinterop.base.Js; import jsinterop.base.JsArrayLike; import org.jboss.errai.ui.shared.api.annotations.DataField; @@ -59,10 +60,10 @@ public void init(final ContextMenu presenter) { @PreDestroy private void removeDOMEventListeners() { - DomGlobal.document.removeEventListener(BrowserEvents.MOUSEDOWN, + getDocument().removeEventListener(BrowserEvents.MOUSEDOWN, hideContextMenuHandler, false); - DomGlobal.document.removeEventListener(BrowserEvents.MOUSEWHEEL, + getDocument().removeEventListener(BrowserEvents.MOUSEWHEEL, hideContextMenuHandler, false); } @@ -72,10 +73,10 @@ public void show() { listSelector.bind(this, 0, 0); listSelector.show(); - DomGlobal.document.addEventListener(BrowserEvents.MOUSEDOWN, + getDocument().addEventListener(BrowserEvents.MOUSEDOWN, hideContextMenuHandler, false); - DomGlobal.document.addEventListener(BrowserEvents.MOUSEWHEEL, + getDocument().addEventListener(BrowserEvents.MOUSEWHEEL, hideContextMenuHandler, false); } @@ -125,4 +126,9 @@ public void onItemSelected(final ListSelectorItem item) { ((ListSelectorTextItem) item).getCommand().execute(); hide(); } + + /* Indirection required by unit tests */ + protected HTMLDocument getDocument() { + return DomGlobal.document; + } } diff --git a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuViewTest.java b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuViewTest.java index a2499ced185..5fb3f5c8e89 100644 --- a/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuViewTest.java +++ b/packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-client/src/test/java/org/kie/workbench/common/dmn/client/editors/contextmenu/ContextMenuViewTest.java @@ -19,14 +19,11 @@ package org.kie.workbench.common.dmn.client.editors.contextmenu; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collections; import java.util.List; import elemental2.core.JsArray; -import elemental2.dom.DomGlobal; import elemental2.dom.Element; import elemental2.dom.Event; import elemental2.dom.EventTarget; @@ -58,17 +55,11 @@ public class ContextMenuViewTest { public void setUp() throws NoSuchFieldException, IllegalAccessException { presenter = mock(ContextMenu.class); listSelector = mock(ListSelector.class); - final Field field = DomGlobal.class.getDeclaredField("document"); - field.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); - - field.set(DomGlobal.class, mock(HTMLDocument.class)); - - contextMenuView = new ContextMenuView(listSelector); + contextMenuView = spy(new ContextMenuView(listSelector)); contextMenuView.init(presenter); + + doReturn(mock(HTMLDocument.class)).when(contextMenuView).getDocument(); } @Test From 97454896c6904139483ee5ad34b789408adb3ed4 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 09:39:02 +0100 Subject: [PATCH 18/69] java-vscode completion dependencies updated. --- .../vscode-java-code-completion-extension-plugin/pom.xml | 2 +- .../pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vscode-java-code-completion-extension-plugin/pom.xml b/packages/vscode-java-code-completion-extension-plugin/pom.xml index 50c87b74ab5..0c2aaa8b2ee 100644 --- a/packages/vscode-java-code-completion-extension-plugin/pom.xml +++ b/packages/vscode-java-code-completion-extension-plugin/pom.xml @@ -46,7 +46,7 @@ -Xmx512m ${tycho.test.platformArgs} - 0.8.5 + 0.8.11 org.eclipse.jdt.ls.* reuseReports ${project.build.directory}/jacoco.exec diff --git a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml index c8c78295c08..f81f92c0944 100644 --- a/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml +++ b/packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/pom.xml @@ -17,9 +17,9 @@ 2.3.32 - 3.23.1 - 5.9.1 - 4.8.0 + 3.25.3 + 5.10.2 + 4.11.0 From 5844ac4cf7df480cc55a811dfe520f6098b80146 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 18:03:58 +0100 Subject: [PATCH 19/69] Java, Maven, Quarkus and Kogito Runtimes to `17`, `3.9.6`, `3.2.10` and `999-20240225-SNAPSHOT` --- .github/actions/setup-env/action.yml | 6 +++--- README.md | 4 ++-- packages/root-env/env/index.js | 4 ++-- packages/stunner-editors/pom.xml | 2 +- repo/build-dependencies-versions.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index e1c1d0dde23..cf4ea93e004 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -52,10 +52,10 @@ runs: with: node-version: 18.14.0 - - name: "Setup JDK 11" + - name: "Setup JDK 17" uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: "zulu" - name: "Set up GOLANG 1.21.5" @@ -66,7 +66,7 @@ runs: - name: "Set up Maven" uses: stCarolas/setup-maven@v4.5 with: - maven-version: 3.8.6 + maven-version: 3.9.6 - name: Setup docker (macOS only) if: runner.os == 'macOS' diff --git a/README.md b/README.md index e06412ca67e..9c9d76210bc 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ To start building the Apache KIE Tools project, you're going to need: - Node `18` _(To install, follow these instructions: https://nodejs.org/en/download/package-manager/)_ - pnpm `8.7.0` _(To install, follow these instructions: https://pnpm.io/installation)_ -- Maven `3.8.6` -- Java `11` +- Maven `3.9.6` +- Java `17` - Go `1.21.5` _(To install, follow these instructions: https://go.dev/doc/install)_ - Helm `3.13.3` _(To install, follow these instructions: https://helm.sh/docs/intro/install/)_ diff --git a/packages/root-env/env/index.js b/packages/root-env/env/index.js index 3ae77927d82..05c0b3a9e69 100644 --- a/packages/root-env/env/index.js +++ b/packages/root-env/env/index.js @@ -51,11 +51,11 @@ module.exports = composeEnv([], { description: "Enables/disables building example packages during the build.", }, QUARKUS_PLATFORM_version: { - default: "2.16.11.Final", + default: "3.2.10.Final", description: "Quarkus version to be used on dependency declaration.", }, KOGITO_RUNTIME_version: { - default: "1.44.1.Final", + default: "999-20240225-SNAPSHOT", description: "Kogito version to be used on dependency declaration.", }, }), diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index e15ed018bc2..7580c1c66a5 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -272,7 +272,7 @@ 2.3.0 - 8.44.0.Final + 999-20240225-SNAPSHOT 1.3.0 diff --git a/repo/build-dependencies-versions.json b/repo/build-dependencies-versions.json index e52fac5ed24..3b7e9efc407 100644 --- a/repo/build-dependencies-versions.json +++ b/repo/build-dependencies-versions.json @@ -1,7 +1,7 @@ { "go": "1.21.5", - "java": "11", - "maven": "3.8.6", + "java": "17", + "maven": "3.9.6", "node": "18.14.0", "pnpm": "8.7.0" } From 779ced0f5d725f49b00ca69dadb9dc720c888956 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 18:22:14 +0100 Subject: [PATCH 20/69] Java, Maven, Quarkus and Kogito Runtimes to `17`, `3.9.6`, `3.2.10` and `999-20240225-SNAPSHOT` --- packages/extended-services/package.json | 2 +- packages/stunner-editors/pom.xml | 27 +++++++++++ pnpm-lock.yaml | 62 ++----------------------- 3 files changed, 33 insertions(+), 58 deletions(-) diff --git a/packages/extended-services/package.json b/packages/extended-services/package.json index 92477a9bbcf..0311d431b1f 100644 --- a/packages/extended-services/package.json +++ b/packages/extended-services/package.json @@ -40,7 +40,7 @@ "start": "cross-env ENV=dev make start" }, "dependencies": { - "@kie-tools/jitexecutor-native": "1.44.1-Final" + "@kie-tools/jitexecutor-native": "999.0.0-20240218-SNAPSHOT" }, "devDependencies": { "@kie-tools/root-env": "workspace:*", diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index 7580c1c66a5..43130928200 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -66,6 +66,33 @@ + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + jboss JBoss Public Repo diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c5f21896cf6..cbe576ed34a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4158,8 +4158,8 @@ importers: packages/extended-services: dependencies: "@kie-tools/jitexecutor-native": - specifier: 1.44.1-Final - version: 1.44.1-Final + specifier: 999.0.0-20240218-SNAPSHOT + version: 999.0.0-20240218-SNAPSHOT devDependencies: "@kie-tools/root-env": specifier: workspace:* @@ -9582,7 +9582,7 @@ importers: version: 5.88.2(webpack-cli@4.10.0) webpack-dev-server: specifier: ^4.15.1 - version: 4.15.1(webpack@5.88.2) + version: 4.15.1(webpack-cli@4.10.0)(webpack@5.88.2) webpack-merge: specifier: ^5.9.0 version: 5.9.0 @@ -19106,9 +19106,9 @@ packages: { integrity: sha512-dxmfwq2F+yxawuGrVVRGmTeZHTqRHa79Vp4FX2KEXHAA9AgK1aaVz8mxZxXYFs2ycfp30NjWvhZCOIRbIKTjAQ== } dev: false - /@kie-tools/jitexecutor-native@1.44.1-Final: + /@kie-tools/jitexecutor-native@999.0.0-20240218-SNAPSHOT: resolution: - { integrity: sha512-yf03B3gV7c3VATLKBmcZ2gavc8JyhCEarqsxIy8JhyF8sCTRIPLkFYIbLnW9kosucO36zLrggDZHzY3navC7GA== } + { integrity: sha512-sZiFV1tBngSZy6ksD0eue9T3JA4K+lfPNrtiQT9CjumwTlefPlPNNOhKXpsjt/LLyybRfJzFg01R2R3VVCWX2w== } dev: false /@koa/cors@3.4.3: @@ -45349,58 +45349,6 @@ packages: - utf-8-validate dev: true - /webpack-dev-server@4.15.1(webpack@5.88.2): - resolution: - { integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== } - engines: { node: ">= 12.13.0" } - hasBin: true - peerDependencies: - webpack: ^4.37.0 || ^5.0.0 - webpack-cli: "*" - peerDependenciesMeta: - webpack: - optional: true - webpack-cli: - optional: true - dependencies: - "@types/bonjour": 3.5.10 - "@types/connect-history-api-fallback": 1.3.5 - "@types/express": 4.17.17 - "@types/serve-index": 1.9.1 - "@types/serve-static": 1.13.10 - "@types/sockjs": 0.3.33 - "@types/ws": 8.5.5 - ansi-html-community: 0.0.8 - bonjour-service: 1.1.1 - chokidar: 3.5.3 - colorette: 2.0.20 - compression: 1.7.4 - connect-history-api-fallback: 2.0.0 - default-gateway: 6.0.3 - express: 4.18.2 - graceful-fs: 4.2.11 - html-entities: 2.3.2 - http-proxy-middleware: 2.0.6(@types/express@4.17.17) - ipaddr.js: 2.0.1 - launch-editor: 2.6.0 - open: 8.4.0 - p-retry: 4.6.1 - rimraf: 3.0.2 - schema-utils: 4.0.0 - selfsigned: 2.1.1 - serve-index: 1.9.1 - sockjs: 0.3.24 - spdy: 4.0.2 - webpack: 5.88.2(webpack-cli@4.10.0) - webpack-dev-middleware: 5.3.3(webpack@5.88.2) - ws: 8.14.2 - transitivePeerDependencies: - - bufferutil - - debug - - supports-color - - utf-8-validate - dev: true - /webpack-hot-middleware@2.25.4: resolution: { integrity: sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w== } From 1264a68f76191e21963eac4ad4fc1d8016f41457 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 19:51:04 +0100 Subject: [PATCH 21/69] Apache repo added --- .../pom.xml | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index 64b8a38c345..b8bd3ce9e68 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -27,15 +27,45 @@ dev-deployment-kogito-quarkus-blank-app ${revision} + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + + + - 3.8.1 + 3.12.1 true - 11 - 11 + 17 + 17 UTF-8 UTF-8 - 3.0.0-M5 - 4.13.1 + 3.2.5 + 4.13.2 From 21843c79b69fbf8158d4c720b477b5354db5fc71 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 20:52:38 +0100 Subject: [PATCH 22/69] kogito-quarkus-blank-app --- .../pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index b8bd3ce9e68..7d759a189e7 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -77,13 +77,6 @@ pom import - - io.quarkus.platform - quarkus-kogito-bom - ${quarkus.platform.version} - pom - import - org.kie.kogito kogito-kie-bom @@ -119,16 +112,6 @@ org.kie kie-dmn-openapi - - org.kie.kogito - kogito-quarkus - - - org.kie.kogito - kogito-ruleunits - - - io.quarkus quarkus-junit5 From 7c5cf9a54a328fc8d7d8728a73f7252c31722a3a Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 21:36:36 +0100 Subject: [PATCH 23/69] Restoring kogtio-quarkus --- .../dev-deployment-kogito-quarkus-blank-app/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index 7d759a189e7..ccda91210ea 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -112,6 +112,16 @@ org.kie kie-dmn-openapi + + org.kie.kogito + kogito-quarkus + + + org.kie.kogito + kogito-ruleunits + + + io.quarkus quarkus-junit5 From 1894d569ebbd291671fe6bd6e1b7dfb1da94c169 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 21:37:22 +0100 Subject: [PATCH 24/69] extended-services-java --- packages/extended-services-java/pom.xml | 40 +++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/packages/extended-services-java/pom.xml b/packages/extended-services-java/pom.xml index 16d7a067512..8027e91ee23 100644 --- a/packages/extended-services-java/pom.xml +++ b/packages/extended-services-java/pom.xml @@ -53,15 +53,45 @@ + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + + + - 3.8.1 + 3.12.1 true - 11 - 11 + 17 + 17 UTF-8 UTF-8 - 3.0.0-M5 - 4.13.1 + 3.2.5 + 4.13.2 From 4b09adf333cdf0f5f19dc93736473b4a601ab249 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 21:53:39 +0100 Subject: [PATCH 25/69] Restoring kogito-quarkus --- packages/dev-deployment-kogito-quarkus-blank-app/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml index ccda91210ea..c67a6f58ec3 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml +++ b/packages/dev-deployment-kogito-quarkus-blank-app/pom.xml @@ -84,6 +84,11 @@ pom import + + org.kie.kogito + kogito-quarkus + ${version.org.kie.kogito} + From 251a7ff6536c54ead392bfd7c18f58c891845729 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 21:57:57 +0100 Subject: [PATCH 26/69] Change snapshot version --- packages/root-env/env/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/root-env/env/index.js b/packages/root-env/env/index.js index 05c0b3a9e69..3e26c173707 100644 --- a/packages/root-env/env/index.js +++ b/packages/root-env/env/index.js @@ -51,11 +51,11 @@ module.exports = composeEnv([], { description: "Enables/disables building example packages during the build.", }, QUARKUS_PLATFORM_version: { - default: "3.2.10.Final", + default: "3.2.9.Final", description: "Quarkus version to be used on dependency declaration.", }, KOGITO_RUNTIME_version: { - default: "999-20240225-SNAPSHOT", + default: "999-20240218-SNAPSHOT", description: "Kogito version to be used on dependency declaration.", }, }), From 262bb4db0f325ac9a6e30add15ed37ba118d3615 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Mon, 26 Feb 2024 22:20:17 +0100 Subject: [PATCH 27/69] jakarta vs javax --- .../src/main/java/org/kie/tools/PingResource.java | 12 ++++++------ .../src/main/java/org/kie/tools/PingResponse.java | 3 +-- .../test/java/org/kie/tools/PingResourceTest.java | 5 +---- .../test/java/org/kie/tools/PingResponseTest.java | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/packages/extended-services-java/src/main/java/org/kie/tools/PingResource.java b/packages/extended-services-java/src/main/java/org/kie/tools/PingResource.java index 5187b49d274..e7893568981 100644 --- a/packages/extended-services-java/src/main/java/org/kie/tools/PingResource.java +++ b/packages/extended-services-java/src/main/java/org/kie/tools/PingResource.java @@ -19,12 +19,12 @@ package org.kie.tools; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/ping") public class PingResource { diff --git a/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java b/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java index dc6208f6c9a..54e3168b4b1 100644 --- a/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java +++ b/packages/extended-services-java/src/main/java/org/kie/tools/PingResponse.java @@ -23,8 +23,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.eclipse.microprofile.config.inject.ConfigProperty; - -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @JsonPropertyOrder({ "version", "started" }) diff --git a/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java b/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java index 7734728d7fa..a16f05500c3 100644 --- a/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java +++ b/packages/extended-services-java/src/test/java/org/kie/tools/PingResourceTest.java @@ -21,11 +21,8 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; - import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; - - import javax.inject.Inject; - + import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.*; diff --git a/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java b/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java index e4395d0daac..17885e1fc13 100644 --- a/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java +++ b/packages/extended-services-java/src/test/java/org/kie/tools/PingResponseTest.java @@ -20,10 +20,9 @@ package org.kie.tools; import io.quarkus.test.junit.QuarkusTest; - import org.eclipse.microprofile.config.inject.ConfigProperty; + import jakarta.inject.Inject; import org.junit.jupiter.api.Test; - import javax.inject.Inject; - + import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest From 72337a9136f36e4d04b488852fe9036683ecdb5c Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Tue, 27 Feb 2024 10:52:42 +0100 Subject: [PATCH 28/69] SFW JDK 17 compliant --- .../pom.xml | 40 ++++++++++--------- .../sw/definition/DefinitionTests.java | 6 +-- .../client/selenium/SWEditorSeleniumBase.java | 6 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/serverless-workflow-diagram-editor/pom.xml b/packages/serverless-workflow-diagram-editor/pom.xml index 7bf01c54b15..8df5ad70ec7 100644 --- a/packages/serverless-workflow-diagram-editor/pom.xml +++ b/packages/serverless-workflow-diagram-editor/pom.xml @@ -209,8 +209,8 @@ 8.29 - 1.8 - 1.8 + 8 + 8 ${maven.compiler.target} ${maven.compiler.source} UTF-8 @@ -227,25 +227,25 @@ 3.3.0 3.2.0 3.1.0 - 3.10.1 + 3.12.1 3.3.0 2.8.2 3.1.0 ${version.surefire.plugin} 2.5.2 - 0.8.5 + 0.8.11 3.1.0 1.5 3.0.1 1.3 1.5.2 - 3.1.0 + 3.2.0 3.2.1 3.7.1 3.1.8 3.9.1.2184 3.0.1 - 2.22.2 + 3.2.5 3.2.2 2.3.0 0.21.0 @@ -264,7 +264,7 @@ 1.7.4 1.3.2 2.0.SP1 - 1.10.3 + 1.14.12 0.9.21 4.8.2 1.1.12 @@ -273,11 +273,11 @@ 2.3 1.0 2.9.0 - 2.3.31 + 2.3.32 3.0.0 4.0 3.26.0-GA - 3.13.0 + 4.18.1 2.3.5 2.0.0 0.4.1 - 5.5.3 + 5.7.0 4.13.2 3.22.0 1.1.9 @@ -312,14 +312,10 @@ - - org.jboss.arquillian.selenium - selenium-bom - ${version.org.jboss.arquillian.selenium} - pom - import + org.seleniumhq.selenium + selenium-java + ${version.org.seleniumhq.selenium} @@ -1638,7 +1634,15 @@ org/drools/workbench/**/*IntegrationTest.java org/drools/workbench/**/*IT.java - -Dfile.encoding=${project.build.sourceEncoding} + + -Dfile.encoding=${project.build.sourceEncoding} + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.time.format=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + diff --git a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-api/src/test/java/org/kie/workbench/common/stunner/sw/definition/DefinitionTests.java b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-api/src/test/java/org/kie/workbench/common/stunner/sw/definition/DefinitionTests.java index 35d4b46adae..b8b42c11a99 100644 --- a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-api/src/test/java/org/kie/workbench/common/stunner/sw/definition/DefinitionTests.java +++ b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-api/src/test/java/org/kie/workbench/common/stunner/sw/definition/DefinitionTests.java @@ -70,8 +70,6 @@ public class DefinitionTests { private static final String DIAGRAM_PANEL = "root-container"; private static final String CANVAS_PANEL = "canvas-panel"; - private static final Boolean HEADLESS = Boolean.valueOf(System.getProperty("org.kie.sw.editor.browser.headless")); - /** * Selenium web driver */ @@ -85,7 +83,7 @@ public static void setupClass() { @Before public void openSWEditor() { final FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(HEADLESS); + firefoxOptions.addArguments("--headless"); driver = new FirefoxDriver(firefoxOptions); driver.manage().window().maximize(); @@ -340,6 +338,6 @@ private ExpectedCondition element(final String xpathLocator, final S } private WebDriverWait waitOperation() { - return new WebDriverWait(driver, Duration.ofSeconds(2).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(2)); } } diff --git a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/src/test/java/org/kie/workbench/common/stunner/sw/client/selenium/SWEditorSeleniumBase.java b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/src/test/java/org/kie/workbench/common/stunner/sw/client/selenium/SWEditorSeleniumBase.java index 70040770fa6..155d7bbbaab 100644 --- a/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/src/test/java/org/kie/workbench/common/stunner/sw/client/selenium/SWEditorSeleniumBase.java +++ b/packages/serverless-workflow-diagram-editor/sw-editor/sw-editor-kogito-app/src/test/java/org/kie/workbench/common/stunner/sw/client/selenium/SWEditorSeleniumBase.java @@ -64,8 +64,6 @@ public class SWEditorSeleniumBase { private static final String DIAGRAM_PANEL = "root-container"; protected static final String CANVAS_PANEL = "canvas-panel"; - private static final Boolean HEADLESS = Boolean.valueOf(System.getProperty("org.kie.sw.editor.browser.headless")); - /** * Selenium web driver */ @@ -85,7 +83,7 @@ public void openSWEditor() { .usingAnyFreePort() .build(); ChromeOptions options = new ChromeOptions() - .setHeadless(HEADLESS); + .addArguments("--headless");; driver = new ChromeDriver(service, options); driver.manage().window().maximize(); @@ -147,6 +145,6 @@ protected ExpectedCondition element(final String xpathLocator, final } protected WebDriverWait waitOperation() { - return new WebDriverWait(driver, Duration.ofSeconds(10).getSeconds()); + return new WebDriverWait(driver, Duration.ofSeconds(10)); } } From 3bad38c90aa76cdcf0d8b3c0a6f9367203b1fc04 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Tue, 27 Feb 2024 15:28:26 +0100 Subject: [PATCH 29/69] Using `999-20240218-SNAPSHOT` --- packages/stunner-editors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index 43130928200..737e339a513 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -299,7 +299,7 @@ 2.3.0 - 999-20240225-SNAPSHOT + 999-20240218-SNAPSHOT 1.3.0 From f0191343bbff5728e60336c20259e4da7edce6cf Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Tue, 27 Feb 2024 15:49:14 +0100 Subject: [PATCH 30/69] Dashbuilder --- .../views/pfly/tab/TabPanelWithDropdownsTest.java | 4 ++-- .../dashbuilder-runtime-client/pom.xml | 9 ++++++++- packages/dashbuilder/pom.xml | 12 ++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java b/packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java index e27b3025f32..ec730a9d6fe 100644 --- a/packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java +++ b/packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/test/java/org/uberfire/client/views/pfly/tab/TabPanelWithDropdownsTest.java @@ -129,8 +129,8 @@ public void testInsertTabAndContent() { final TabPane tabContentPane = mock(TabPane.class); final NavTabs tabBar = mock(NavTabs.class); final TabContent tabContent = mock(TabContent.class); - final Set allContentTabs = spy(new HashSet<>()); - final Set activatableWidgets = spy(new HashSet<>()); + final Set allContentTabs = mock(Set.class); + final Set activatableWidgets = mock(Set.class); doReturn(tabWidget).when(tab).getTabWidget(); doReturn(tabContentPane).when(tab).getContentPane(); diff --git a/packages/dashbuilder/dashbuilder-runtime-parent/dashbuilder-runtime-client/pom.xml b/packages/dashbuilder/dashbuilder-runtime-parent/dashbuilder-runtime-client/pom.xml index db9566d743d..c85da13486d 100644 --- a/packages/dashbuilder/dashbuilder-runtime-parent/dashbuilder-runtime-client/pom.xml +++ b/packages/dashbuilder/dashbuilder-runtime-parent/dashbuilder-runtime-client/pom.xml @@ -407,7 +407,14 @@ -Ddashbuilder.kieserver.serverTemplate.sample-server.password=kieserver1! -Ddashbuilder.kieserver.defaultServerTemplate=default -Ddashbuilder.kieserver.serverTemplate.sample-server.replace_query=true - -Ddashbuilder.dev=true + -Ddashbuilder.dev=true + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.time.format=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + false diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index cc440d605c5..8bc230b1eac 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -58,7 +58,7 @@ 1.0.0.GA - 4.13.1 + 4.13.2 3.14.0 3.6.0 7.59.0.Final @@ -78,7 +78,7 @@ 4.1.59.Final 1.1.0 3.3.3 - 2.3.30 + 2.3.32 1.2.2 1.0.0 2.0.0 @@ -100,10 +100,10 @@ 2.22.2 ${version.surefire.plugin} 3.0.0 - 2.22.2 - 3.0.0-M3 + 3.2.5 + 3.1.0 3.1.0 - 3.8.1 + 3.12.1 3.2.0 3.2.3 3.1.1 @@ -112,6 +112,7 @@ 3.8.2 1.8 3.0.0 + 3.1.2 java - 3.1.2 From fe6f3af1ec554f05caf8a50f8550284ae9060ab5 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Tue, 27 Feb 2024 18:23:24 +0100 Subject: [PATCH 31/69] fixed repos --- packages/stunner-editors/pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/stunner-editors/pom.xml b/packages/stunner-editors/pom.xml index 737e339a513..f23c3ef603e 100644 --- a/packages/stunner-editors/pom.xml +++ b/packages/stunner-editors/pom.xml @@ -151,6 +151,33 @@ + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + jboss JBoss Public Repo From 81c6c9b1eba01be06f094fc592f7005b032944d9 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 10:51:31 +0100 Subject: [PATCH 32/69] JDK updated to version 17 in dev-deployment-base-image --- packages/dev-deployment-base-image/env/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dev-deployment-base-image/env/index.js b/packages/dev-deployment-base-image/env/index.js index 49f4a819153..6b8156b682f 100644 --- a/packages/dev-deployment-base-image/env/index.js +++ b/packages/dev-deployment-base-image/env/index.js @@ -22,7 +22,7 @@ const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/b module.exports = composeEnv([require("@kie-tools/root-env/env")], { vars: varsWithName({ DEV_DEPLOYMENT_BASE_IMAGE__builderImage: { - default: "registry.access.redhat.com/ubi9/openjdk-11:1.17", + default: "registry.access.redhat.com/ubi9/openjdk-17:1.17-1.1705573248", description: "The image used in the FROM import.", }, DEV_DEPLOYMENT_BASE_IMAGE__registry: { From f3ea2d7dc80204c0762dcd716fe3a9a1aa7aaffb Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 12:19:20 +0100 Subject: [PATCH 33/69] Dashbuilder --- packages/dashbuilder/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index 8bc230b1eac..c798e7c6240 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -468,6 +468,7 @@ dashbuilder-bom kie-soup-dataset appformer + errai dashbuilder-shared dashbuilder-client dashbuilder-runtime-parent @@ -768,7 +769,7 @@ + Logback) --> - commons-logging:commons-log* + log4j:log4j org.apache.geronimo.specs:geronimo-activation_1.1_spec org.apache.geronimo.specs:geronimo-annotation_1.0_spec org.apache.geronimo.specs:geronimo-javamail_1.4_spec From e571ce2842614a2554f6558dd9a9fd39e2f71082 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 13:55:30 +0100 Subject: [PATCH 34/69] Dashbuilder - reverted --- packages/dashbuilder/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index c798e7c6240..8bc230b1eac 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -468,7 +468,6 @@ dashbuilder-bom kie-soup-dataset appformer - errai dashbuilder-shared dashbuilder-client dashbuilder-runtime-parent @@ -769,7 +768,7 @@ + Logback) --> - + commons-logging:commons-log* log4j:log4j + org.jboss.spec.javax.*:* org.apache.geronimo.specs:geronimo-activation_1.1_spec org.apache.geronimo.specs:geronimo-annotation_1.0_spec org.apache.geronimo.specs:geronimo-javamail_1.4_spec From 104b3b6d903eab587fef5bf658a66f94440aa2c9 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 17:44:11 +0100 Subject: [PATCH 35/69] Dashbuilder --- packages/dashbuilder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashbuilder/pom.xml b/packages/dashbuilder/pom.xml index 8bc230b1eac..0c3482857b3 100644 --- a/packages/dashbuilder/pom.xml +++ b/packages/dashbuilder/pom.xml @@ -101,7 +101,7 @@ ${version.surefire.plugin} 3.0.0 3.2.5 - 3.1.0 + 3.0.0-M3 3.1.0 3.12.1 3.2.0 From 2dd2c2e69559ab5d13394304507a72a95af89267 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Wed, 28 Feb 2024 16:44:52 +0100 Subject: [PATCH 36/69] serverless-logic-web-tools-swf-deployment-quarkus-app updated dependencies --- .../env/index.js | 4 ++-- .../pom.xml | 10 +++++----- .../src/main/java/org/kie/kogito/AppStartup.java | 6 +++--- .../java/org/kie/kogito/HotReloadResource.java | 16 ++++++++-------- .../kie/kogito/StaticContentCachingFilter.java | 4 ++-- .../kie/kogito/health/LivenessHealthCheck.java | 2 +- .../kie/kogito/health/ReadinessHealthCheck.java | 2 +- .../kie/kogito/health/StartupHealthCheck.java | 2 +- .../org/kie/kogito/service/FileServiceImpl.java | 2 +- .../kie/kogito/service/UploadServiceImpl.java | 4 ++-- .../org/kie/kogito/service/ZipServiceImpl.java | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js index 78a072250de..d9af52fe321 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/env/index.js @@ -22,11 +22,11 @@ const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/b module.exports = composeEnv([require("@kie-tools/root-env/env")], { vars: varsWithName({ SERVERLESS_LOGIC_WEB_TOOLS__quarkusPlatformVersion: { - default: "2.16.9.Final", + default: "3.2.9.Final", description: "Quarkus platform version", }, SERVERLESS_LOGIC_WEB_TOOLS__kogitoVersion: { - default: "1.42.0.Final", + default: "999-20240218-SNAPSHOT", description: "Kogito version", }, }), diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml index 7e29737a666..d6e72bc11f7 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml @@ -28,19 +28,19 @@ ${revision} - 3.8.1 + 3.12.1 false - 11 + 17 UTF-8 UTF-8 quarkus-bom - io.quarkus.platform + io.quarkus org.kie.kogito kogito-bom - 2.1.12 + 2.1.20 1.24.0 1.14.2 - 3.0.0-M7 + 3.2.5 diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/AppStartup.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/AppStartup.java index 098379795b1..b8261afdf94 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/AppStartup.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/AppStartup.java @@ -23,9 +23,9 @@ import java.io.File; import java.io.IOException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.runtime.Startup; import org.apache.commons.io.FileUtils; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/HotReloadResource.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/HotReloadResource.java index 3515cea79bb..73e91a6b24f 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/HotReloadResource.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/HotReloadResource.java @@ -26,14 +26,14 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/StaticContentCachingFilter.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/StaticContentCachingFilter.java index 4a608550a2a..a6531e1d752 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/StaticContentCachingFilter.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/StaticContentCachingFilter.java @@ -22,8 +22,8 @@ import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.filters.Filters; import io.vertx.core.Handler; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/LivenessHealthCheck.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/LivenessHealthCheck.java index f3797227760..4df7dd3dc44 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/LivenessHealthCheck.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/LivenessHealthCheck.java @@ -20,7 +20,7 @@ package org.kie.kogito.health; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/ReadinessHealthCheck.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/ReadinessHealthCheck.java index 6ef19df9d3d..1d6a2eda5dc 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/ReadinessHealthCheck.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/ReadinessHealthCheck.java @@ -20,7 +20,7 @@ package org.kie.kogito.health; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/StartupHealthCheck.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/StartupHealthCheck.java index aa88e071129..f3762c2c7e4 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/StartupHealthCheck.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/health/StartupHealthCheck.java @@ -20,7 +20,7 @@ package org.kie.kogito.health; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/FileServiceImpl.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/FileServiceImpl.java index d5d1a8c320d..6903a593364 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/FileServiceImpl.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/FileServiceImpl.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.commons.io.FileUtils; import org.jboss.logging.Logger; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/UploadServiceImpl.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/UploadServiceImpl.java index 87e34c49461..b0afa091762 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/UploadServiceImpl.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/UploadServiceImpl.java @@ -31,8 +31,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.logging.Logger; import org.kie.kogito.FileStructureConstants; diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/ZipServiceImpl.java b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/ZipServiceImpl.java index acbec3a27a2..7e2bd798476 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/ZipServiceImpl.java +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/src/main/java/org/kie/kogito/service/ZipServiceImpl.java @@ -29,7 +29,7 @@ import java.util.Enumeration; import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipFile; From dbc917e496911a178dff38f84eb99cbc5a3bd332 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 18:31:23 +0100 Subject: [PATCH 37/69] Apache repo added --- .../pom.xml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml index d6e72bc11f7..bf02272e71d 100644 --- a/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml +++ b/packages/serverless-logic-web-tools-swf-deployment-quarkus-app/pom.xml @@ -44,6 +44,33 @@ + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + jboss-public-repository-group JBoss Public Repository Group From 799cdc087bcce428e333c7c363e3042af48c389f Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Wed, 28 Feb 2024 18:33:02 +0100 Subject: [PATCH 38/69] Jenkis CI build updated --- .ci/kie-tools-ci-build.Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/kie-tools-ci-build.Dockerfile b/.ci/kie-tools-ci-build.Dockerfile index 882285505da..dc68123d9d2 100644 --- a/.ci/kie-tools-ci-build.Dockerfile +++ b/.ci/kie-tools-ci-build.Dockerfile @@ -23,7 +23,7 @@ libxi6 \ libnss3 \ libgconf-2-4 \ libpci-dev \ -openjdk-11-jdk \ +openjdk-17-jdk \ git \ jq \ vim \ @@ -44,7 +44,7 @@ RUN wget -O /tmp/firefox-latest.tar.bz2 "https://download.mozilla.org/?product=f # Install chromedriver RUN CHROME_VERSION=$(curl https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json | jq -r .channels.Stable.version) && \ - wget -O /tmp/chromedriver-linux64.zip https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_VERSION/linux64/chromedriver-linux64.zip && \ + wget -O /tmp/chromedriver-linux64.zip https://storage.googleapis.com/chrome-for-testing-public/$CHROME_VERSION/linux64/chromedriver-linux64.zip && \ unzip /tmp/chromedriver-linux64.zip -d /tmp && mv /tmp/chromedriver-linux64/chromedriver /usr/bin/ && \ rm /tmp/chromedriver-linux64.zip @@ -75,9 +75,9 @@ RUN bash -c 'source $HOME/.nvm/nvm.sh && \ npm install -g pnpm@8.7.0' # Maven setup -RUN wget https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz -P /tmp && \ - sudo tar xzf /tmp/apache-maven-3.8.6-bin.tar.gz -C /opt && rm /tmp/apache-maven-3.8.6-bin.tar.gz && \ - sudo ln -s /opt/apache-maven-3.8.6 /opt/maven && \ +RUN wget https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp && \ + sudo tar xzf /tmp/apache-maven-3.9.6-bin.tar.gz -C /opt && rm /tmp/apache-maven-3.9.6-bin.tar.gz && \ + sudo ln -s /opt/apache-maven-3.9.6 /opt/maven && \ echo 'export M2_HOME=/opt/maven' | sudo tee -a /etc/profile.d/maven.sh && \ echo 'export MAVEN_HOME=${M2_HOME}' | sudo tee -a /etc/profile.d/maven.sh && \ echo 'export PATH=${M2_HOME}/bin:${PATH}' | sudo tee -a /etc/profile.d/maven.sh && \ @@ -106,7 +106,7 @@ RUN wget https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz -P /tmp && \ sudo tar -C /usr/bin/ -zxvf /tmp/helm-v3.13.3-linux-amd64.tar.gz linux-amd64/helm --strip-components 1 && rm /tmp/helm-v3.13.3-linux-amd64.tar.gz # Env vars -ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64" +ENV JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64" ENV DISPLAY=":99" ENV NODE_OPTIONS="--max_old_space_size=4096" From 0a8098dca18837d21e7da224310681fbbb622411 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Thu, 29 Feb 2024 08:39:01 +0100 Subject: [PATCH 39/69] Disabling test in macOS (dev-deployment-uploaded-service) --- packages/dev-deployment-upload-service/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/dev-deployment-upload-service/package.json b/packages/dev-deployment-upload-service/package.json index e353539ea45..0b84114215d 100644 --- a/packages/dev-deployment-upload-service/package.json +++ b/packages/dev-deployment-upload-service/package.json @@ -29,7 +29,8 @@ "start": "make start", "start-test-servers": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"node scripts/runTestServers.js\"", "stop-test-servers": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"node scripts/runTestServers.js --cleanup\"", - "test": "run-script-if --bool \"$(build-env containerImages.build)\" --bool \"$(build-env tests.run)\" --ignore-errors \"$(build-env tests.ignoreFailures)\" --then \"jest --verbose --silent=false\"" + "test:linux": "run-script-if --bool \"$(build-env containerImages.build)\" --bool \"$(build-env tests.run)\" --ignore-errors \"$(build-env tests.ignoreFailures)\" --then \"jest --verbose --silent=false\"", + "test:win32:darwin": "echo 'Not supported'" }, "devDependencies": { "@kie-tools/root-env": "workspace:*", From 3ecd13c7b98dcc83e8822e677a88ec5456e6305b Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Thu, 29 Feb 2024 09:21:53 +0100 Subject: [PATCH 40/69] Disabling test in macOS (dev-deployment-uploaded-service) --- packages/dev-deployment-upload-service/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/dev-deployment-upload-service/package.json b/packages/dev-deployment-upload-service/package.json index 0b84114215d..95afd3e580b 100644 --- a/packages/dev-deployment-upload-service/package.json +++ b/packages/dev-deployment-upload-service/package.json @@ -29,6 +29,7 @@ "start": "make start", "start-test-servers": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"node scripts/runTestServers.js\"", "stop-test-servers": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"node scripts/runTestServers.js --cleanup\"", + "test": "run-script-os", "test:linux": "run-script-if --bool \"$(build-env containerImages.build)\" --bool \"$(build-env tests.run)\" --ignore-errors \"$(build-env tests.ignoreFailures)\" --then \"jest --verbose --silent=false\"", "test:win32:darwin": "echo 'Not supported'" }, From 9673a2ccceff4a571f71d6311cb514e84319beb0 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Thu, 29 Feb 2024 09:47:55 +0100 Subject: [PATCH 41/69] Temporarly disabled kn-plugin e2e tests --- packages/kn-plugin-workflow/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kn-plugin-workflow/package.json b/packages/kn-plugin-workflow/package.json index 64716b531a4..7137755a3d3 100644 --- a/packages/kn-plugin-workflow/package.json +++ b/packages/kn-plugin-workflow/package.json @@ -22,7 +22,7 @@ "build:darwin:arm": "pnpm setup:env make build-darwin-arm64", "build:dev": "rimraf dist && pnpm build", "build:linux": "pnpm setup:env make build-linux-amd64", - "build:prod": "rimraf dist && run-script-os && pnpm test && pnpm test:e2e", + "build:prod": "rimraf dist && run-script-os && pnpm test", "build:prod:darwin": "rimraf dist && pnpm setup:env make build-all", "build:prod:linux": "rimraf dist && pnpm setup:env make build-all", "build:prod:win32": "rimraf dist && pnpm setup:env:win32 make build-all", From 33b932f475b211332ac368c44532021f4423d898 Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Thu, 29 Feb 2024 12:41:42 -0300 Subject: [PATCH 42/69] Build base-image and blank-app together --- .ci/jenkins/Jenkinsfile.staging-build | 27 ++++----------------------- .github/workflows/ci_build.yml | 13 +++++++------ 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.staging-build b/.ci/jenkins/Jenkinsfile.staging-build index 5b9d6df580d..5f5ac836221 100644 --- a/.ci/jenkins/Jenkinsfile.staging-build +++ b/.ci/jenkins/Jenkinsfile.staging-build @@ -626,23 +626,25 @@ pipeline { } } - stage('Build (dev-deployment-base-image)') { + stage('Build (dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app-image)') { steps { dir('kie-tools') { script { buildDevDeploymentBaseImage() + buildDevDeploymentKogitoQuarkusBlankAppImage() } } } } - stage('STAGING: Push dev-deployment-base-image to quay.io') { + stage('STAGING: Push dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app-image to quay.io') { when { expression { !params.DRY_RUN } } steps { script { pushDevDeploymentBaseImageToQuay() + pushDevDeploymentKogitoQuarkusBlankAppImageToQuay() } } } @@ -668,27 +670,6 @@ pipeline { } } - stage('Build (dev-deployment-kogito-quarkus-blank-app-image)') { - steps { - dir('kie-tools') { - script { - buildDevDeploymentKogitoQuarkusBlankAppImage() - } - } - } - } - - stage('STAGING: Push dev-deployment-kogito-quarkus-blank-app-image to quay.io') { - when { - expression { !params.DRY_RUN } - } - steps { - script { - pushDevDeploymentKogitoQuarkusBlankAppImageToQuay() - } - } - } - stage('Build (serverless-logic-web-tools-base-builder-image)') { steps { dir('kie-tools') { diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 944bbfb9595..6bb1250649a 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -97,12 +97,13 @@ jobs: START_SERVER_AND_TEST_INSECURE: "true" NODE_OPTIONS: "--max_old_space_size=4096" run: >- - pnpm - -F='!@kie-tools/serverless-logic-web-tools-swf-dev-mode-image' + pnpm + -F='!@kie-tools/serverless-logic-web-tools-swf-dev-mode-image' -F='!@kie-tools/dev-deployment-base-image' + -F='!@kie-tools/dev-deployment-kogito-quarkus-blank-app' -F='!@kie-tools/dev-deployment-dmn-form-webapp-image' - -F='!@kie-tools/serverless-logic-web-tools-base-builder-image' - -F='!@kie-tools/dashbuilder-viewer-image' + -F='!@kie-tools/serverless-logic-web-tools-base-builder-image' + -F='!@kie-tools/dashbuilder-viewer-image' -r --workspace-concurrency=1 build:prod - name: "FULL → Build → serverless-logic-web-tools-swf-dev-mode-image" @@ -122,7 +123,7 @@ jobs: echo "Build @kie-tools/serverless-logic-web-tools-swf-dev-mode-image" pnpm -F @kie-tools/serverless-logic-web-tools-swf-dev-mode-image... --workspace-concurrency=1 build:prod - - name: "FULL → Build → dev-deployment-base-image" + - name: "FULL → Build → dev-deployment-base-image and dev-deployment-kogito-quarkus-blank-app" if: steps.setup_build_mode.outputs.mode == 'full' && runner.os == 'Linux' env: KIE_TOOLS_BUILD__runTests: "true" @@ -137,7 +138,7 @@ jobs: podman system prune --all --force fi echo "Build @kie-tools/dev-deployment-base-image" - pnpm -F @kie-tools/dev-deployment-base-image... --workspace-concurrency=1 build:prod + pnpm -F @kie-tools/dev-deployment-base-image... -F @kie-tools/dev-deployment-kogito-quarkus-blank-app --workspace-concurrency=1 build:prod - name: "FULL → Build → dev-deployment-dmn-form-webapp-image" if: steps.setup_build_mode.outputs.mode == 'full' && runner.os == 'Linux' From 519b8f4c7ce5a09345fa4114193d44641674ece5 Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Thu, 29 Feb 2024 12:43:35 -0300 Subject: [PATCH 43/69] Build quarkus-blank-app deps --- .github/workflows/ci_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 6bb1250649a..0032ef19f11 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -138,7 +138,7 @@ jobs: podman system prune --all --force fi echo "Build @kie-tools/dev-deployment-base-image" - pnpm -F @kie-tools/dev-deployment-base-image... -F @kie-tools/dev-deployment-kogito-quarkus-blank-app --workspace-concurrency=1 build:prod + pnpm -F @kie-tools/dev-deployment-base-image... -F @kie-tools/dev-deployment-kogito-quarkus-blank-app... --workspace-concurrency=1 build:prod - name: "FULL → Build → dev-deployment-dmn-form-webapp-image" if: steps.setup_build_mode.outputs.mode == 'full' && runner.os == 'Linux' From d88c71fe7190d03f70eccacdcee7250a257867cf Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Thu, 29 Feb 2024 13:16:04 -0300 Subject: [PATCH 44/69] Exclude blank-app-image instead of blank-app --- .github/workflows/ci_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 0032ef19f11..dd4fddb6d93 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -100,7 +100,7 @@ jobs: pnpm -F='!@kie-tools/serverless-logic-web-tools-swf-dev-mode-image' -F='!@kie-tools/dev-deployment-base-image' - -F='!@kie-tools/dev-deployment-kogito-quarkus-blank-app' + -F='!@kie-tools/dev-deployment-kogito-quarkus-blank-app-image' -F='!@kie-tools/dev-deployment-dmn-form-webapp-image' -F='!@kie-tools/serverless-logic-web-tools-base-builder-image' -F='!@kie-tools/dashbuilder-viewer-image' From 7db76a47b219666ced529cc45434cdb8f8d0beda Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Thu, 29 Feb 2024 18:45:09 -0300 Subject: [PATCH 45/69] Fix distribution tests --- .../dev-deployment-base-image/Containerfile | 2 +- packages/dev-deployment-base-image/README.md | 2 +- .../dev-deployment-base-image/env/index.js | 2 +- .../kie-sandbox-distribution/package.json | 5 +- .../integrationTest.test.js.snap | 46 +++++++++++++---- .../tests/integrationTest.test.js | 12 ++++- .../Containerfile | 8 +-- pnpm-lock.yaml | 49 ++----------------- 8 files changed, 62 insertions(+), 64 deletions(-) diff --git a/packages/dev-deployment-base-image/Containerfile b/packages/dev-deployment-base-image/Containerfile index ef4463e3a80..19222f3ce3b 100644 --- a/packages/dev-deployment-base-image/Containerfile +++ b/packages/dev-deployment-base-image/Containerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -# Defaults to registry.access.redhat.com/ubi9/openjdk-11 (check env/index.js) +# Defaults to registry.access.redhat.com/ubi9/openjdk-17 (check env/index.js) ARG BUILDER_IMAGE_ARG FROM --platform=linux/amd64 ${BUILDER_IMAGE_ARG} diff --git a/packages/dev-deployment-base-image/README.md b/packages/dev-deployment-base-image/README.md index ef964fbe3ab..30c0e6c4fb4 100644 --- a/packages/dev-deployment-base-image/README.md +++ b/packages/dev-deployment-base-image/README.md @@ -4,7 +4,7 @@ Docker image with Java and Maven, as well as the dev-deployment-upload-service b ## Build arguments -- `BUILDER_IMAGE_ARG`: The base image used for building this image (defaults to `registry.access.redhat.com/ubi9/openjdk-11:1.17`). +- `BUILDER_IMAGE_ARG`: The base image used for building this image (defaults to `registry.access.redhat.com/ubi9/openjdk-17:1.18`). ## Environment variables diff --git a/packages/dev-deployment-base-image/env/index.js b/packages/dev-deployment-base-image/env/index.js index 6b8156b682f..3f8b0d48b56 100644 --- a/packages/dev-deployment-base-image/env/index.js +++ b/packages/dev-deployment-base-image/env/index.js @@ -22,7 +22,7 @@ const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/b module.exports = composeEnv([require("@kie-tools/root-env/env")], { vars: varsWithName({ DEV_DEPLOYMENT_BASE_IMAGE__builderImage: { - default: "registry.access.redhat.com/ubi9/openjdk-17:1.17-1.1705573248", + default: "registry.access.redhat.com/ubi9/openjdk-17:1.18", description: "The image used in the FROM import.", }, DEV_DEPLOYMENT_BASE_IMAGE__registry: { diff --git a/packages/kie-sandbox-distribution/package.json b/packages/kie-sandbox-distribution/package.json index 5e4f20a821e..35158cf2cce 100644 --- a/packages/kie-sandbox-distribution/package.json +++ b/packages/kie-sandbox-distribution/package.json @@ -24,7 +24,7 @@ "install": "pnpm docker:create-env-file", "test": "run-script-os", "test:darwin:win32": "echo 'Testing kie-sandbox-distribution not supported'", - "test:linux": "run-script-if --bool \"$(build-env containerImages.build)\" --bool \"$(build-env tests.run)\" --ignore-errors \"$(build-env tests.ignoreFailures)\" --then \"pnpm docker:start-no-pull\" \"sleep 240\" \"jest --silent --verbose\" \"pnpm docker:stop\"" + "test:linux": "run-script-if --bool \"$(build-env containerImages.build)\" --bool \"$(build-env tests.run)\" --ignore-errors \"$(build-env tests.ignoreFailures)\" --then \"jest --verbose\"" }, "dependencies": { "@kie-tools/cors-proxy-image": "workspace:*", @@ -39,6 +39,7 @@ "node-fetch": "^3.3.1", "rimraf": "^3.0.2", "run-script-os": "^1.1.6", - "typescript": "^4.6.2" + "typescript": "^4.6.2", + "wait-on": "^7.2.0" } } \ No newline at end of file diff --git a/packages/kie-sandbox-distribution/tests/__snapshots__/integrationTest.test.js.snap b/packages/kie-sandbox-distribution/tests/__snapshots__/integrationTest.test.js.snap index 64cf03fa6f8..03df213aace 100644 --- a/packages/kie-sandbox-distribution/tests/__snapshots__/integrationTest.test.js.snap +++ b/packages/kie-sandbox-distribution/tests/__snapshots__/integrationTest.test.js.snap @@ -12,25 +12,51 @@ exports[`Test built images individually cors-proxy homepage 1`] = ` `; exports[`Test built images individually extended-services homepage 1`] = ` -" +" + - - + + + + - - Demo system
- -" + +" `; diff --git a/packages/kie-sandbox-distribution/tests/integrationTest.test.js b/packages/kie-sandbox-distribution/tests/integrationTest.test.js index 45b1932c7e5..798927b7d2d 100644 --- a/packages/kie-sandbox-distribution/tests/integrationTest.test.js +++ b/packages/kie-sandbox-distribution/tests/integrationTest.test.js @@ -17,13 +17,23 @@ * under the License. */ +const { execSync } = require("child_process"); const kieSandboxDistributionEnv = require("../env"); const env = kieSandboxDistributionEnv.env; const kieSandboxUrl = `http://127.0.0.1:${env.kieSandboxDistribution.kieSandbox.exposedPort}`; const corsProxyUrl = `http://127.0.0.1:${env.kieSandboxDistribution.corsProxy.exposedPort}`; const extendedServicesUrl = `http://127.0.0.1:${env.kieSandboxDistribution.extendedServices.exposedPort}`; -describe("Test built images individually", async () => { +describe("Test built images individually", () => { + beforeAll(() => { + execSync( + `pnpm docker:start-no-pull && wait-on -t 5m ${extendedServicesUrl}/ping && wait-on -t 5m ${corsProxyUrl}/ping && wait-on -t 5m ${kieSandboxUrl}`, + { stdio: "inherit" } + ); + }); + afterAll(() => { + execSync(`pnpm docker:stop`, { stdio: "inherit" }); + }); it("cors-proxy homepage", async () => { expect(await (await fetch(corsProxyUrl)).text()).toMatchSnapshot(); }); diff --git a/packages/kie-sandbox-extended-services-image/Containerfile b/packages/kie-sandbox-extended-services-image/Containerfile index c56b32f831a..2a0c5159edd 100644 --- a/packages/kie-sandbox-extended-services-image/Containerfile +++ b/packages/kie-sandbox-extended-services-image/Containerfile @@ -5,17 +5,17 @@ # 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. +# under the License. -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/openjdk-11-runtime:1.16-3 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/openjdk-17:1.18 ARG EXTENDED_SERVICES_DEFAULT_HOST ARG EXTENDED_SERVICES_DEFAULT_PORT diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52dfcae85ab..3dea46698d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5660,6 +5660,9 @@ importers: typescript: specifier: ^4.6.2 version: 4.8.4 + wait-on: + specifier: ^7.2.0 + version: 7.2.0 packages/kie-sandbox-extended-services-image: dependencies: @@ -20746,23 +20749,11 @@ packages: graphql: 14.3.1 dev: true - /@hapi/hoek@9.1.0: - resolution: - { integrity: sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== } - dev: true - /@hapi/hoek@9.3.0: resolution: { integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== } dev: true - /@hapi/topo@5.0.0: - resolution: - { integrity: sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw== } - dependencies: - "@hapi/hoek": 9.1.0 - dev: true - /@hapi/topo@5.1.0: resolution: { integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== } @@ -23836,13 +23827,6 @@ packages: js-yaml: 4.1.0 dev: false - /@sideway/address@4.1.0: - resolution: - { integrity: sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA== } - dependencies: - "@hapi/hoek": 9.1.0 - dev: true - /@sideway/address@4.1.4: resolution: { integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw== } @@ -23850,11 +23834,6 @@ packages: "@hapi/hoek": 9.3.0 dev: true - /@sideway/formula@3.0.0: - resolution: - { integrity: sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== } - dev: true - /@sideway/formula@3.0.1: resolution: { integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== } @@ -38256,17 +38235,6 @@ packages: "@sideway/pinpoint": 2.0.0 dev: true - /joi@17.4.0: - resolution: - { integrity: sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg== } - dependencies: - "@hapi/hoek": 9.1.0 - "@hapi/topo": 5.0.0 - "@sideway/address": 4.1.0 - "@sideway/formula": 3.0.0 - "@sideway/pinpoint": 2.0.0 - dev: true - /jose@4.14.6: resolution: { integrity: sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ== } @@ -39186,7 +39154,7 @@ packages: log-update: 4.0.0 p-map: 4.0.0 rfdc: 1.3.0 - rxjs: 7.5.6 + rxjs: 7.8.1 through: 2.3.8 wrap-ansi: 7.0.0 dev: true @@ -44588,13 +44556,6 @@ packages: dependencies: tslib: 2.3.1 - /rxjs@7.5.6: - resolution: - { integrity: sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== } - dependencies: - tslib: 2.6.2 - dev: true - /rxjs@7.8.1: resolution: { integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== } @@ -48157,7 +48118,7 @@ packages: hasBin: true dependencies: axios: 0.21.4(debug@4.3.1) - joi: 17.4.0 + joi: 17.12.0 lodash: 4.17.21 minimist: 1.2.8 rxjs: 6.6.7 From 8aaaa6f3ebc774d58f948b2daf3438525390dbce Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Thu, 29 Feb 2024 22:55:37 +0100 Subject: [PATCH 46/69] Updated to the new environment --- .../install.js | 2 ++ .../pom.xml | 14 ++++++++++++++ .../pom.xml | 8 ++++++-- .../sonataflow-serverless-workflow-devui/pom.xml | 6 +++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/packages/sonataflow-serverless-workflow-devui-parent/install.js b/packages/sonataflow-serverless-workflow-devui-parent/install.js index c26349eea4d..1e672a97f5e 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/install.js +++ b/packages/sonataflow-serverless-workflow-devui-parent/install.js @@ -22,4 +22,6 @@ const { setup } = require("@kie-tools/maven-config-setup-helper"); setup(` -Drevision=${buildEnv.env.sonataflowServerlessWorkflowDevui.version} + -Dquarkus.platform.version=${buildEnv.env.quarkusPlatform.version} + -Dversion.org.kie.kogito=${buildEnv.env.kogitoRuntime.version} `); diff --git a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml index 13e73193ceb..16401f39040 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml @@ -30,6 +30,8 @@ pom + 3.12.1 + 3.2.0 org.kie.kogito.quarkus.swf.dev.ui @@ -38,6 +40,18 @@ sonataflow-serverless-workflow-devui + + + + io.quarkus + quarkus-bom + ${quarkus.platform.version} + pom + import + + + + diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml index 043e84e6049..f9cb1fd4932 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml @@ -26,7 +26,7 @@ org.kie.kogito sonataflow-serverless-workflow-devui-parent - 999-SNAPSHOT + ${revision} sonataflow-serverless-workflow-devui-deployment @@ -69,6 +69,7 @@ org.kie.kogito kogito-quarkus-extension-spi + ${version.org.kie.kogito} From cf07abfe792b4f8c54ea832c85d1757036b34afe Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Fri, 1 Mar 2024 13:39:06 -0300 Subject: [PATCH 51/69] Fix swfBuilder tag --- .../serverless-logic-web-tools-swf-builder-image/env/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js index d26682d3e8a..0ebb0de86a8 100644 --- a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js +++ b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js @@ -28,7 +28,7 @@ module.exports = composeEnv( description: "", }, SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderKogitoImageTag: { - default: "main-2024-02-18", + default: "latest", description: "", }, }), From cc0a41836c45c52c39cfa8f98a81bf2f3be8f94d Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 1 Mar 2024 18:57:03 +0100 Subject: [PATCH 52/69] Fixed prettier error --- .../src/main/resources/META-INF/beans.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml index ab8bfa54fa5..030bdcbec5b 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml @@ -5,4 +5,3 @@ > - From 63bfc6ae86631f2ee65783539c72cb13da1569e7 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 1 Mar 2024 21:43:26 +0100 Subject: [PATCH 53/69] Temporary disabled java code completion module --- .../vscode-java-code-completion-extension-plugin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-java-code-completion-extension-plugin/package.json b/packages/vscode-java-code-completion-extension-plugin/package.json index 639541c2b64..7196c372b3f 100644 --- a/packages/vscode-java-code-completion-extension-plugin/package.json +++ b/packages/vscode-java-code-completion-extension-plugin/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build:dev": "pnpm install:mvnw && mvn clean install -DskipTests", - "build:prod": "pnpm lint && run-script-os", + "build:prod": "echo 'Disabled'", "build:prod:darwin:linux": "pnpm install:mvnw && mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm install:mvnw && pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", "install": "node install.js", From 81a332de36b46ca3dd7b0cc4626cd930af6feb83 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 1 Mar 2024 22:51:40 +0100 Subject: [PATCH 54/69] Revert previous commit --- .../vscode-java-code-completion-extension-plugin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-java-code-completion-extension-plugin/package.json b/packages/vscode-java-code-completion-extension-plugin/package.json index 7196c372b3f..639541c2b64 100644 --- a/packages/vscode-java-code-completion-extension-plugin/package.json +++ b/packages/vscode-java-code-completion-extension-plugin/package.json @@ -20,7 +20,7 @@ ], "scripts": { "build:dev": "pnpm install:mvnw && mvn clean install -DskipTests", - "build:prod": "echo 'Disabled'", + "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "pnpm install:mvnw && mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", "build:prod:win32": "pnpm install:mvnw && pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", "install": "node install.js", From a6609286235c568b3f3c5db67199027cbbbd6294 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Sat, 2 Mar 2024 09:20:24 +0100 Subject: [PATCH 55/69] Fixed prettier warnings --- .../sonataflow-serverless-workflow-devui-parent/pom.xml | 9 ++++++--- .../pom.xml | 9 ++++++--- .../sonataflow-serverless-workflow-devui/pom.xml | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml index 19dadecaa9c..d38fe58abf8 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml index 98f8de6225b..d0c6573605c 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml index 6fae52e302f..6a76bd9cf66 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml +++ b/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 org.kie.kogito From 983bef9e124fdf159795a1b1f97e5660bcb5afdc Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Tue, 5 Mar 2024 00:32:29 -0300 Subject: [PATCH 56/69] Use volumes for container volumes for dev deployments --- packages/dev-deployment-base-image/Containerfile | 11 ++++++++--- packages/dev-deployment-base-image/package.json | 2 +- .../Containerfile | 10 +++++----- .../README.md | 10 ++++++++++ .../package.json | 2 +- .../kogitoQuarkusBlankApp/DeploymentYaml.ts | 6 ++++++ 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/packages/dev-deployment-base-image/Containerfile b/packages/dev-deployment-base-image/Containerfile index 19222f3ce3b..d8a444c002b 100644 --- a/packages/dev-deployment-base-image/Containerfile +++ b/packages/dev-deployment-base-image/Containerfile @@ -23,16 +23,21 @@ FROM --platform=linux/amd64 ${BUILDER_IMAGE_ARG} ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_EXTRACT_TO_DIR=$HOME/app ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_PORT=8080 -USER 1000 +RUN mkdir -p -m 777 $HOME/app && mkdir -p -m 777 /tmp/app -RUN mkdir -p -m 777 $HOME/app +COPY dist-dev/dev-deployment-upload-service /usr/local/bin -COPY --chown=1000:1000 dist-dev/dev-deployment-upload-service /usr/local/bin +USER root + +RUN chgrp -R 0 $HOME/app && \ + chmod -R 777 $HOME/app WORKDIR $HOME/app/ EXPOSE 8080 +USER 185 + ENTRYPOINT ["/bin/bash", "-c"] CMD ["dev-deployment-upload-service && pwd && ls -la"] diff --git a/packages/dev-deployment-base-image/package.json b/packages/dev-deployment-base-image/package.json index bf3101afe6a..4e6e4dffc81 100644 --- a/packages/dev-deployment-base-image/package.json +++ b/packages/dev-deployment-base-image/package.json @@ -23,7 +23,7 @@ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" --kind-cluster-name kie-sandbox-dev-cluster", "create-test-image:minikube": "kie-tools--image-builder minikube -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", "create-test-image:openshift": "kie-tools--image-builder openshift -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", - "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", + "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" -p", "image:podman:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" -e podman", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile index 02c9c48fe24..7612658158b 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/Containerfile @@ -24,15 +24,15 @@ ENV ROOT_PATH="" ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_EXTRACT_TO_DIR=$HOME/app/src/main/resources ENV DEV_DEPLOYMENT__UPLOAD_SERVICE_PORT=8080 -USER 1000 +COPY --chown=185:185 dist-dev/quarkus-app $HOME/app/ -COPY --chown=1000:1000 --chmod=777 dist-dev/quarkus-app $HOME/app/ +RUN ./mvnw dependency:go-offline -Dmaven.repo.local=/tmp/kogito/.m2/repository && ./mvnw clean package -B -ntp -Dmaven.test.skip -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH} \ + && chgrp -R 0 $HOME/app && chmod -R g=u $HOME/app && chgrp -R 0 /tmp/kogito && chmod -R g=u /tmp/kogito -RUN ./mvnw clean package -B -ntp -Dmaven.test.skip -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH} \ - && chmod -R 777 /tmp/kogito/ && chmod -R 777 $HOME/app +USER 185 EXPOSE 8080 ENTRYPOINT ["/bin/bash", "-c"] -CMD ["dev-deployment-upload-service && ./mvnw quarkus:dev -Ddebug=false -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH}"] +CMD ["dev-deployment-upload-service && cp -r $HOME/app/. /tmp/app && cd /tmp/app && ./mvnw quarkus:dev -Ddebug=false -Dmaven.repo.local=/tmp/kogito/.m2/repository -Dquarkus.http.non-application-root-path=${ROOT_PATH}/q -Dquarkus.http.root-path=${ROOT_PATH}"] diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md b/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md index 0aa0317d790..334169ca607 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/README.md @@ -23,3 +23,13 @@ These files can decisions or processes, all of them will be used as resources fo ### Optional - `DEV_DEPLOYMENT__UPLOAD_SERVICE_ROOT_PATH`: If the Upload Service is not running in the root path of the URL, this variable should be specified. (Usually follows the same value as `ROOT_PATH`). + +## Test locally + +Run the image with: + +- `docker run -p 8080:8080 -e DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY=123 quay.io/kie-tools/dev-deployment-kogito-quarkus-blank-app-image:latest` + +Then upload a zip file containing the resources (DMN, BPMN, etc) + +- `curl -X POST -H "Content-Type: multipart/form-data" -F "myFile=@" http://localhost:8080/upload?apiKey=123` diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json index d3b9852e89c..04fbc695079 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json @@ -23,7 +23,7 @@ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ --kind-cluster-name kie-sandbox-dev-cluster", "create-test-image:minikube": "kie-tools--image-builder minikube -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", "create-test-image:openshift": "kie-tools--image-builder openshift -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", - "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", + "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ -p", "image:podman:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ -e podman", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts b/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts index 2095e2cf6d0..b466859382c 100644 --- a/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts +++ b/packages/online-editor/src/devDeployments/services/deploymentOptions/kogitoQuarkusBlankApp/DeploymentYaml.ts @@ -43,6 +43,9 @@ spec: app: \${{ devDeployment.uniqueName }} deploymentconfig: \${{ devDeployment.uniqueName }} spec: + volumes: + - name: \${{ devDeployment.uniqueName }}-volume + emptyDir: {} containers: - name: \${{ devDeployment.uniqueName }} image: ${args.kogitoQuarkusBlankAppImageUrl} @@ -53,5 +56,8 @@ spec: env: - name: DEV_DEPLOYMENT__UPLOAD_SERVICE_API_KEY value: \${{ devDeployment.uploadService.apiKey }} + volumeMounts: + - mountPath: /tmp/app + name: \${{ devDeployment.uniqueName }}-volume `; } From 43fd54afb6fd03a4b55781e806c3365a41687dbf Mon Sep 17 00:00:00 2001 From: Thiago Lugli Date: Tue, 5 Mar 2024 11:04:37 -0300 Subject: [PATCH 57/69] Remove push command --- packages/dev-deployment-base-image/package.json | 2 +- .../dev-deployment-kogito-quarkus-blank-app-image/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dev-deployment-base-image/package.json b/packages/dev-deployment-base-image/package.json index 4e6e4dffc81..bf3101afe6a 100644 --- a/packages/dev-deployment-base-image/package.json +++ b/packages/dev-deployment-base-image/package.json @@ -23,7 +23,7 @@ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" --kind-cluster-name kie-sandbox-dev-cluster", "create-test-image:minikube": "kie-tools--image-builder minikube -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", "create-test-image:openshift": "kie-tools--image-builder openshift -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", - "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" -p", + "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\"", "image:podman:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentBaseImage.registry)\" -a \"$(build-env devDeploymentBaseImage.account)\" -n \"$(build-env devDeploymentBaseImage.name)\" -t \"$(build-env devDeploymentBaseImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentBaseImage.builderImage)\" -e podman", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json index 04fbc695079..d3b9852e89c 100644 --- a/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json +++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/package.json @@ -23,7 +23,7 @@ "create-test-image:kind": "kie-tools--image-builder kind -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ --kind-cluster-name kie-sandbox-dev-cluster", "create-test-image:minikube": "kie-tools--image-builder minikube -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", "create-test-image:openshift": "kie-tools--image-builder openshift -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", - "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ -p", + "image:docker:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/", "image:podman:build": "kie-tools--image-builder build -r \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.registry)\" -a \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.account)\" -n \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.name)\" -t \"$(build-env devDeploymentKogitoQuarkusBlankAppImage.tags)\" --build-arg BUILDER_IMAGE_ARG=\"$(build-env devDeploymentKogitoQuarkusBlankAppImage.builderImage)\" --build-arg ROOT_PATH=/ -e podman", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command" }, From 71b996db8b5ba8058fef8cc0c294ccbe4c293e5e Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Tue, 5 Mar 2024 12:32:57 +0100 Subject: [PATCH 58/69] Sonataflow Quarkus devui renaming GAV following https://github.com/apache/incubator-kie-kogito-apps/pull/2008 --- .../env/index.js | 0 .../install.js | 0 .../package.json | 2 +- .../pom.xml | 8 ++++---- .../sonataflow-quarkus-devui-deployment}/pom.xml | 8 ++++---- .../kogito/swf/tools/deployment/DevConsoleProcessor.java | 4 ++-- .../ServerlessWorkflowQuarkusExtensionProcessor.java | 2 +- .../src/main/resources/dev-templates/embedded.html | 0 .../src/main/resources/dev-templates/monitoring.html | 0 .../main/resources/dev-templates/workflowInstances.html | 0 .../src/main/resources/static/index.html | 0 .../sonataflow-quarkus-devui}/pom.xml | 6 +++--- .../tools/custom/dashboard/CustomDashboardService.java | 0 .../tools/custom/dashboard/CustomDashboardStorage.java | 0 .../converter/CustomDashboardFilterParamConverter.java | 0 .../CustomDashboardFilterParamConverterProvider.java | 0 .../custom/dashboard/impl/CustomDashboardStorageImpl.java | 0 .../custom/dashboard/model/CustomDashboardFilter.java | 0 .../tools/custom/dashboard/model/CustomDashboardInfo.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../src/main/resources/META-INF/quarkus-extension.yaml | 0 .../custom/dashboard/impl/CustomDashboardStorageTest.java | 0 .../dashboard/impl/CustomDashboardStorageTestProfile.java | 0 .../test/resources/custom/dashboards/products.dash.yaml | 0 .../test/resources/custom/dashboards/subdir/age.dash.yml | 0 pnpm-lock.yaml | 2 +- repo/graph.dot | 4 ++-- repo/graph.json | 6 +++--- 28 files changed, 21 insertions(+), 21 deletions(-) rename packages/{sonataflow-serverless-workflow-devui-parent => sonataflow-quarkus-devui-parent}/env/index.js (100%) rename packages/{sonataflow-serverless-workflow-devui-parent => sonataflow-quarkus-devui-parent}/install.js (100%) rename packages/{sonataflow-serverless-workflow-devui-parent => sonataflow-quarkus-devui-parent}/package.json (95%) rename packages/{sonataflow-serverless-workflow-devui-parent => sonataflow-quarkus-devui-parent}/pom.xml (93%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/pom.xml (95%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java (98%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java (93%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/resources/dev-templates/embedded.html (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/resources/dev-templates/monitoring.html (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/resources/dev-templates/workflowInstances.html (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment}/src/main/resources/static/index.html (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/pom.xml (95%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/resources/META-INF/beans.xml (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/main/resources/META-INF/quarkus-extension.yaml (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/test/resources/custom/dashboards/products.dash.yaml (100%) rename packages/{sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui => sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui}/src/test/resources/custom/dashboards/subdir/age.dash.yml (100%) diff --git a/packages/sonataflow-serverless-workflow-devui-parent/env/index.js b/packages/sonataflow-quarkus-devui-parent/env/index.js similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/env/index.js rename to packages/sonataflow-quarkus-devui-parent/env/index.js diff --git a/packages/sonataflow-serverless-workflow-devui-parent/install.js b/packages/sonataflow-quarkus-devui-parent/install.js similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/install.js rename to packages/sonataflow-quarkus-devui-parent/install.js diff --git a/packages/sonataflow-serverless-workflow-devui-parent/package.json b/packages/sonataflow-quarkus-devui-parent/package.json similarity index 95% rename from packages/sonataflow-serverless-workflow-devui-parent/package.json rename to packages/sonataflow-quarkus-devui-parent/package.json index d65be2da950..a12e372cf53 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/package.json +++ b/packages/sonataflow-quarkus-devui-parent/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@kie-tools/sonataflow-serverless-workflow-devui-parent", + "name": "@kie-tools/sonataflow-quarkus-devui-parent", "version": "0.0.0", "description": "", "license": "Apache-2.0", diff --git a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml b/packages/sonataflow-quarkus-devui-parent/pom.xml similarity index 93% rename from packages/sonataflow-serverless-workflow-devui-parent/pom.xml rename to packages/sonataflow-quarkus-devui-parent/pom.xml index d38fe58abf8..eee5b898be3 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/pom.xml @@ -26,10 +26,10 @@ > 4.0.0 - KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension + KIE Tools :: SonataFlow Quarkus Dev UI Extension org.kie.kogito ${revision} - sonataflow-serverless-workflow-devui-parent + sonataflow-quarkus-devui-parent pom @@ -45,8 +45,8 @@ - sonataflow-serverless-workflow-devui-deployment - sonataflow-serverless-workflow-devui + sonataflow-quarkus-devui-deployment + sonataflow-quarkus-devui diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml similarity index 95% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml index d0c6573605c..33a6d70e8a9 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml @@ -28,13 +28,13 @@ org.kie.kogito - sonataflow-serverless-workflow-devui-parent + sonataflow-quarkus-devui-parent ${revision} ../pom.xml - sonataflow-serverless-workflow-devui-deployment - KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension :: Deployment + sonataflow-quarkus-devui-deployment + KIE Tools :: SonataFlow Quarkus Dev UI Extension :: Deployment ../../serverless-workflow-dev-ui-webapp @@ -96,7 +96,7 @@ org.kie.kogito - sonataflow-serverless-workflow-devui + sonataflow-quarkus-devui ${project.version} diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java similarity index 98% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java index a494df7c8d0..79a442e5dd1 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java @@ -50,7 +50,7 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; - private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.sonataflow-serverless-workflow-devui"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.sonataflow-quarkus-devui"; private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @BuildStep(onlyIf = IsDevelopment.class) @@ -93,7 +93,7 @@ public void deployStaticResources(final DevConsoleRecorder recorder, final BuildProducer routeBuildItemBuildProducer) throws IOException { ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, "org.kie.kogito", - "sonataflow-serverless-workflow-devui-deployment"); + "sonataflow-quarkus-devui-deployment"); Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( liveReloadBuildItem, diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java similarity index 93% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java index 3ccc8dcf1f6..2f9c2e33651 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java @@ -23,7 +23,7 @@ class ServerlessWorkflowQuarkusExtensionProcessor { - private static final String FEATURE = "sonataflow-serverless-workflow-devui"; + private static final String FEATURE = "sonataflow-quarkus-devui"; @BuildStep FeatureBuildItem feature() { diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/embedded.html similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/embedded.html diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/monitoring.html similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/monitoring.html diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/workflowInstances.html similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/workflowInstances.html diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/static/index.html similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui-deployment/src/main/resources/static/index.html rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/static/index.html diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml similarity index 95% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml index 6a76bd9cf66..f52825fbed1 100644 --- a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml @@ -27,12 +27,12 @@ 4.0.0 org.kie.kogito - sonataflow-serverless-workflow-devui-parent + sonataflow-quarkus-devui-parent ${revision} ../pom.xml - sonataflow-serverless-workflow-devui - KIE Tools :: SonataFlow Serverless Workflow Quarkus Dev UI Extension :: Extension + sonataflow-quarkus-devui + KIE Tools :: SonataFlow Quarkus Dev UI Extension :: Runtime Runtime development tools for Serverless Workflows diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/beans.xml similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/beans.xml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/beans.xml diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/products.dash.yaml similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/products.dash.yaml diff --git a/packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml similarity index 100% rename from packages/sonataflow-serverless-workflow-devui-parent/sonataflow-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml rename to packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ac2112e88a..b746c1ee527 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9212,7 +9212,7 @@ importers: specifier: ^5.9.0 version: 5.9.0 - packages/sonataflow-serverless-workflow-devui-parent: + packages/sonataflow-quarkus-devui-parent: devDependencies: "@kie-tools/maven-config-setup-helper": specifier: workspace:* diff --git a/repo/graph.dot b/repo/graph.dot index 733871919e7..ba4b35960f9 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -150,7 +150,7 @@ digraph G { "@kie-tools/serverless-workflow-service-catalog" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/serverless-workflow-language-service" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "swf-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; - "@kie-tools/sonataflow-serverless-workflow-devui-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/sonataflow-quarkus-devui-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/stunner-editors-dmn-loader" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/unitables" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "vscode-extension-dashbuilder-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -463,7 +463,7 @@ digraph G { "swf-vscode-extension" -> "@kie-tools/vscode-extension-common-test-helpers" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools-core/react-hooks" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools/runtime-tools-webapp-components" [ style = "dashed", color = "blue" ]; - "@kie-tools/sonataflow-serverless-workflow-devui-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; + "@kie-tools/sonataflow-quarkus-devui-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ]; "@kie-tools/storybook-base" -> "@kie-tools/tsconfig" [ style = "dashed", color = "blue" ]; "@kie-tools/stunner-editors" -> "@kie-tools/stunner-editors-dmn-loader" [ style = "solid", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index 0e1c16cbba0..272d7b4ae35 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -155,7 +155,7 @@ { "id": "@kie-tools/serverless-workflow-jq-expressions" }, { "id": "@kie-tools/serverless-workflow-service-catalog" }, { "id": "swf-vscode-extension" }, - { "id": "@kie-tools/sonataflow-serverless-workflow-devui-parent" }, + { "id": "@kie-tools/sonataflow-quarkus-devui-parent" }, { "id": "vscode-extension-dashbuilder-editor" }, { "id": "vscode-extension-kie-ba-bundle" }, { "id": "vscode-extension-kogito-bundle" }, @@ -965,7 +965,7 @@ }, { "source": "swf-vscode-extension", "target": "@kie-tools/vscode-extension-common-test-helpers", "weight": 1 }, { - "source": "@kie-tools/sonataflow-serverless-workflow-devui-parent", + "source": "@kie-tools/sonataflow-quarkus-devui-parent", "target": "@kie-tools/serverless-workflow-dev-ui-webapp", "weight": 1 }, @@ -1147,7 +1147,7 @@ ["@kie-tools/serverless-workflow-text-editor", "packages/serverless-workflow-text-editor"], ["swf-vscode-extension", "packages/serverless-workflow-vscode-extension"], ["sonataflow-deployment-webapp", "packages/sonataflow-deployment-webapp"], - ["@kie-tools/sonataflow-serverless-workflow-devui-parent", "packages/sonataflow-serverless-workflow-devui-parent"], + ["@kie-tools/sonataflow-quarkus-devui-parent", "packages/sonataflow-quarkus-devui-parent"], ["@kie-tools/storybook-base", "packages/storybook-base"], ["@kie-tools/stunner-editors", "packages/stunner-editors"], ["@kie-tools/stunner-editors-dmn-loader", "packages/stunner-editors-dmn-loader"], From 284676152a89e53d3ede4a33cd184c1ea20d8ae8 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Tue, 5 Mar 2024 18:38:45 +0100 Subject: [PATCH 59/69] Used buid:prod:win32 configuration from dashbuilder package --- packages/sonataflow-quarkus-devui-parent/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sonataflow-quarkus-devui-parent/package.json b/packages/sonataflow-quarkus-devui-parent/package.json index a12e372cf53..f35bb6cfcda 100644 --- a/packages/sonataflow-quarkus-devui-parent/package.json +++ b/packages/sonataflow-quarkus-devui-parent/package.json @@ -18,7 +18,7 @@ "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests \"", "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", - "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests=$(build-env tests.run --not) `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", + "build:prod:win32": "pnpm powershell \"mvn clean install -DskipTests -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", "install": "node install.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", From 4e10c09bea5220b1d2b6a3dcc5ad36115d5e35c1 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Wed, 6 Mar 2024 15:33:31 +0100 Subject: [PATCH 60/69] Renamed groupId according to the new requirements --- packages/sonataflow-quarkus-devui-parent/pom.xml | 2 +- .../sonataflow-quarkus-devui-deployment/pom.xml | 4 ++-- .../kie/kogito/swf/tools/deployment/DevConsoleProcessor.java | 4 ++-- .../sonataflow-quarkus-devui/pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/sonataflow-quarkus-devui-parent/pom.xml b/packages/sonataflow-quarkus-devui-parent/pom.xml index eee5b898be3..de5c72dd854 100644 --- a/packages/sonataflow-quarkus-devui-parent/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/pom.xml @@ -27,7 +27,7 @@ 4.0.0 KIE Tools :: SonataFlow Quarkus Dev UI Extension - org.kie.kogito + org.apache.kie.sonataflow ${revision} sonataflow-quarkus-devui-parent pom diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml index 33a6d70e8a9..f5c1318b4bc 100644 --- a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui-parent ${revision} ../pom.xml @@ -95,7 +95,7 @@ test - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui ${project.version} diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java index 79a442e5dd1..8f402c06f76 100644 --- a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java @@ -50,7 +50,7 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; - private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.kie.kogito.sonataflow-quarkus-devui"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.apache.kie.sonataflow.sonataflow-quarkus-devui"; private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @BuildStep(onlyIf = IsDevelopment.class) @@ -92,7 +92,7 @@ public void deployStaticResources(final DevConsoleRecorder recorder, final ShutdownContextBuildItem shutdownContext, final BuildProducer routeBuildItemBuildProducer) throws IOException { ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, - "org.kie.kogito", + "org.apache.kie.sonataflow", "sonataflow-quarkus-devui-deployment"); Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml index f52825fbed1..d383314febe 100644 --- a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml +++ b/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml @@ -26,7 +26,7 @@ > 4.0.0 - org.kie.kogito + org.apache.kie.sonataflow sonataflow-quarkus-devui-parent ${revision} ../pom.xml From 6e328b4b14ea4eb48810f343f95378e68fc39c26 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Wed, 6 Mar 2024 16:21:39 +0100 Subject: [PATCH 61/69] Fix CI err: Unknown lifecycle phase --- packages/sonataflow-quarkus-devui-parent/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sonataflow-quarkus-devui-parent/package.json b/packages/sonataflow-quarkus-devui-parent/package.json index f35bb6cfcda..e04aac362fd 100644 --- a/packages/sonataflow-quarkus-devui-parent/package.json +++ b/packages/sonataflow-quarkus-devui-parent/package.json @@ -18,7 +18,7 @@ "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests \"", "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", - "build:prod:win32": "pnpm powershell \"mvn clean install -DskipTests -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", + "build:prod:win32": "pnpm powershell \"mvn clean install -DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `\"", "install": "node install.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", From 180f17308535f5e02fb7ecd8a277ab1a5e2089ea Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Thu, 7 Mar 2024 10:58:19 +0100 Subject: [PATCH 62/69] Fix: Incomplete string token. --- packages/sonataflow-quarkus-devui-parent/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sonataflow-quarkus-devui-parent/package.json b/packages/sonataflow-quarkus-devui-parent/package.json index e04aac362fd..f001fab8149 100644 --- a/packages/sonataflow-quarkus-devui-parent/package.json +++ b/packages/sonataflow-quarkus-devui-parent/package.json @@ -15,16 +15,16 @@ "scripts": { "build:dev": "run-script-os", "build:dev:darwin:linux": "mvn clean install -DskipTests", - "build:dev:win32": "pnpm powershell \"mvn clean install `-DskipTests \"", + "build:dev:win32": "pnpm powershell \"mvn clean install -DskipTests \"", "build:prod": "pnpm lint && run-script-os", "build:prod:darwin:linux": "mvn clean install -DskipTests=$(build-env tests.run --not) -Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)", - "build:prod:win32": "pnpm powershell \"mvn clean install -DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures) `\"", + "build:prod:win32": "pnpm powershell \"mvn clean install `-DskipTests `-Dmaven.test.failure.ignore=$(build-env tests.ignoreFailures)\"", "install": "node install.js", "lint": "echo 'Linting'", "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command", "quarkus:dev": "run-script-os", "quarkus:dev:darwin:linux": "mvn clean package quarkus:dev -DskipTests", - "quarkus:dev:win32": "mvn clean package quarkus:dev `-DskipTests" + "quarkus:dev:win32": "mvn clean package quarkus:dev -DskipTests" }, "devDependencies": { "@kie-tools/maven-config-setup-helper": "workspace:*", From 4b15ee0e7a7f439213b40b77d4a7c29904a5f01b Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 8 Mar 2024 09:43:13 +0100 Subject: [PATCH 63/69] Dir renaming --- .../env/index.js | 0 .../install.js | 0 .../package.json | 0 .../pom.xml | 0 .../sonataflow-quarkus-devui-extension-deployment}/pom.xml | 0 .../org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java | 0 .../deployment/ServerlessWorkflowQuarkusExtensionProcessor.java | 0 .../src/main/resources/dev-templates/embedded.html | 0 .../src/main/resources/dev-templates/monitoring.html | 0 .../src/main/resources/dev-templates/workflowInstances.html | 0 .../src/main/resources/static/index.html | 0 .../sonataflow-quarkus-devui-extension}/pom.xml | 0 .../kogito/swf/tools/custom/dashboard/CustomDashboardService.java | 0 .../kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java | 0 .../dashboard/converter/CustomDashboardFilterParamConverter.java | 0 .../converter/CustomDashboardFilterParamConverterProvider.java | 0 .../tools/custom/dashboard/impl/CustomDashboardStorageImpl.java | 0 .../swf/tools/custom/dashboard/model/CustomDashboardFilter.java | 0 .../swf/tools/custom/dashboard/model/CustomDashboardInfo.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../src/main/resources/META-INF/quarkus-extension.yaml | 0 .../tools/custom/dashboard/impl/CustomDashboardStorageTest.java | 0 .../custom/dashboard/impl/CustomDashboardStorageTestProfile.java | 0 .../src/test/resources/custom/dashboards/products.dash.yaml | 0 .../src/test/resources/custom/dashboards/subdir/age.dash.yml | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename packages/{sonataflow-quarkus-devui-parent => sonataflow-quarkus-devui-extension-parent}/env/index.js (100%) rename packages/{sonataflow-quarkus-devui-parent => sonataflow-quarkus-devui-extension-parent}/install.js (100%) rename packages/{sonataflow-quarkus-devui-parent => sonataflow-quarkus-devui-extension-parent}/package.json (100%) rename packages/{sonataflow-quarkus-devui-parent => sonataflow-quarkus-devui-extension-parent}/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/resources/dev-templates/embedded.html (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/resources/dev-templates/monitoring.html (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/resources/dev-templates/workflowInstances.html (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment}/src/main/resources/static/index.html (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/resources/META-INF/beans.xml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/main/resources/META-INF/quarkus-extension.yaml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/test/resources/custom/dashboards/products.dash.yaml (100%) rename packages/{sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui => sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension}/src/test/resources/custom/dashboards/subdir/age.dash.yml (100%) diff --git a/packages/sonataflow-quarkus-devui-parent/env/index.js b/packages/sonataflow-quarkus-devui-extension-parent/env/index.js similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/env/index.js rename to packages/sonataflow-quarkus-devui-extension-parent/env/index.js diff --git a/packages/sonataflow-quarkus-devui-parent/install.js b/packages/sonataflow-quarkus-devui-extension-parent/install.js similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/install.js rename to packages/sonataflow-quarkus-devui-extension-parent/install.js diff --git a/packages/sonataflow-quarkus-devui-parent/package.json b/packages/sonataflow-quarkus-devui-extension-parent/package.json similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/package.json rename to packages/sonataflow-quarkus-devui-extension-parent/package.json diff --git a/packages/sonataflow-quarkus-devui-parent/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/pom.xml rename to packages/sonataflow-quarkus-devui-extension-parent/pom.xml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/pom.xml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/embedded.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/embedded.html rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/monitoring.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/monitoring.html rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/workflowInstances.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/dev-templates/workflowInstances.html rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/static/index.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui-deployment/src/main/resources/static/index.html rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/pom.xml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/beans.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/beans.xml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/quarkus-extension.yaml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/main/resources/META-INF/quarkus-extension.yaml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/products.dash.yaml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/products.dash.yaml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml diff --git a/packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml similarity index 100% rename from packages/sonataflow-quarkus-devui-parent/sonataflow-quarkus-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml From 7c673f4624402b33080c97a814d0e8eeda366402 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 8 Mar 2024 13:16:24 +0100 Subject: [PATCH 64/69] Fixes comments: https://github.com/apache/incubator-kie-tools/pull/2167#pullrequestreview-1923548117 https://github.com/apache/incubator-kie-tools/pull/2167#discussion_r1516830853 --- .../sonataflow-quarkus-devui-extension-parent/env/index.js | 2 +- .../sonataflow-quarkus-devui-extension-parent/install.js | 2 +- .../sonataflow-quarkus-devui-extension-parent/package.json | 2 +- packages/sonataflow-quarkus-devui-extension-parent/pom.xml | 6 +++--- .../sonataflow-quarkus-devui-extension-deployment/pom.xml | 6 +++--- .../kogito/swf/tools/deployment/DevConsoleProcessor.java | 4 ++-- .../ServerlessWorkflowQuarkusExtensionProcessor.java | 2 +- .../sonataflow-quarkus-devui-extension/pom.xml | 4 ++-- .../src/main/resources/META-INF/quarkus-extension.yaml | 2 +- pnpm-lock.yaml | 2 +- repo/graph.dot | 4 ++-- repo/graph.json | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/env/index.js b/packages/sonataflow-quarkus-devui-extension-parent/env/index.js index d2fb5a077ef..33ffd575a68 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/env/index.js +++ b/packages/sonataflow-quarkus-devui-extension-parent/env/index.js @@ -23,7 +23,7 @@ module.exports = composeEnv([require("@kie-tools/root-env/env")], { vars: varsWithName({}), get env() { return { - sonataflowServerlessWorkflowDevui: { + sonataflowQuarkusDevuiExtension: { version: require("../package.json").version, }, }; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/install.js b/packages/sonataflow-quarkus-devui-extension-parent/install.js index c26349eea4d..99bfadb8cf8 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/install.js +++ b/packages/sonataflow-quarkus-devui-extension-parent/install.js @@ -21,5 +21,5 @@ const buildEnv = require("./env"); const { setup } = require("@kie-tools/maven-config-setup-helper"); setup(` - -Drevision=${buildEnv.env.sonataflowServerlessWorkflowDevui.version} + -Drevision=${buildEnv.env.sonataflowQuarkusDevuiExtension.version} `); diff --git a/packages/sonataflow-quarkus-devui-extension-parent/package.json b/packages/sonataflow-quarkus-devui-extension-parent/package.json index f001fab8149..04e53b3f9cc 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/package.json +++ b/packages/sonataflow-quarkus-devui-extension-parent/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@kie-tools/sonataflow-quarkus-devui-parent", + "name": "@kie-tools/sonataflow-quarkus-devui-extension-parent", "version": "0.0.0", "description": "", "license": "Apache-2.0", diff --git a/packages/sonataflow-quarkus-devui-extension-parent/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/pom.xml index de5c72dd854..b263cea5dcc 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/pom.xml @@ -29,7 +29,7 @@ KIE Tools :: SonataFlow Quarkus Dev UI Extension org.apache.kie.sonataflow ${revision} - sonataflow-quarkus-devui-parent + sonataflow-quarkus-devui-extension-parent pom @@ -45,8 +45,8 @@ - sonataflow-quarkus-devui-deployment - sonataflow-quarkus-devui + sonataflow-quarkus-devui-extension-deployment + sonataflow-quarkus-devui-extension diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml index f5c1318b4bc..5076788a9e4 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml @@ -28,12 +28,12 @@ org.apache.kie.sonataflow - sonataflow-quarkus-devui-parent + sonataflow-quarkus-devui-extension-parent ${revision} ../pom.xml - sonataflow-quarkus-devui-deployment + sonataflow-quarkus-devui-extension-deployment KIE Tools :: SonataFlow Quarkus Dev UI Extension :: Deployment @@ -96,7 +96,7 @@ org.apache.kie.sonataflow - sonataflow-quarkus-devui + sonataflow-quarkus-devui-extension ${project.version} diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java index 8f402c06f76..abea9c0b974 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java @@ -50,7 +50,7 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; - private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.apache.kie.sonataflow.sonataflow-quarkus-devui"; + private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.apache.kie.sonataflow.sonataflow-quarkus-devui-extension"; private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @BuildStep(onlyIf = IsDevelopment.class) @@ -93,7 +93,7 @@ public void deployStaticResources(final DevConsoleRecorder recorder, final BuildProducer routeBuildItemBuildProducer) throws IOException { ResolvedDependency devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, "org.apache.kie.sonataflow", - "sonataflow-quarkus-devui-deployment"); + "sonataflow-quarkus-devui-extension-deployment"); Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest( liveReloadBuildItem, diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java index 2f9c2e33651..223925e4496 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java @@ -23,7 +23,7 @@ class ServerlessWorkflowQuarkusExtensionProcessor { - private static final String FEATURE = "sonataflow-quarkus-devui"; + private static final String FEATURE = "sonataflow-quarkus-devui-extension"; @BuildStep FeatureBuildItem feature() { diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml index d383314febe..87e8bf44fe4 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml @@ -27,11 +27,11 @@ 4.0.0 org.apache.kie.sonataflow - sonataflow-quarkus-devui-parent + sonataflow-quarkus-devui-extension-parent ${revision} ../pom.xml - sonataflow-quarkus-devui + sonataflow-quarkus-devui-extension KIE Tools :: SonataFlow Quarkus Dev UI Extension :: Runtime Runtime development tools for Serverless Workflows diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml index f94bcb9779c..06ec65f1e4c 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml @@ -20,7 +20,7 @@ name: Serverless Workflow Tools metadata: keywords: - - "kogito" + - "sonataflow" - "workflows" guide: "https://quarkus.io/guides/kogito" categories: diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b746c1ee527..f7816539fec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9212,7 +9212,7 @@ importers: specifier: ^5.9.0 version: 5.9.0 - packages/sonataflow-quarkus-devui-parent: + packages/sonataflow-quarkus-devui-extension-parent: devDependencies: "@kie-tools/maven-config-setup-helper": specifier: workspace:* diff --git a/repo/graph.dot b/repo/graph.dot index ba4b35960f9..1aebc31a02e 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -150,7 +150,7 @@ digraph G { "@kie-tools/serverless-workflow-service-catalog" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/serverless-workflow-language-service" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "swf-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; - "@kie-tools/sonataflow-quarkus-devui-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/sonataflow-quarkus-devui-extension-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/stunner-editors-dmn-loader" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/unitables" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "vscode-extension-dashbuilder-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -463,7 +463,7 @@ digraph G { "swf-vscode-extension" -> "@kie-tools/vscode-extension-common-test-helpers" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools-core/react-hooks" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools/runtime-tools-webapp-components" [ style = "dashed", color = "blue" ]; - "@kie-tools/sonataflow-quarkus-devui-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; + "@kie-tools/sonataflow-quarkus-devui-extension-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ]; "@kie-tools/storybook-base" -> "@kie-tools/tsconfig" [ style = "dashed", color = "blue" ]; "@kie-tools/stunner-editors" -> "@kie-tools/stunner-editors-dmn-loader" [ style = "solid", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index 272d7b4ae35..eb0f26a95fe 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -155,7 +155,7 @@ { "id": "@kie-tools/serverless-workflow-jq-expressions" }, { "id": "@kie-tools/serverless-workflow-service-catalog" }, { "id": "swf-vscode-extension" }, - { "id": "@kie-tools/sonataflow-quarkus-devui-parent" }, + { "id": "@kie-tools/sonataflow-quarkus-devui-extension-parent" }, { "id": "vscode-extension-dashbuilder-editor" }, { "id": "vscode-extension-kie-ba-bundle" }, { "id": "vscode-extension-kogito-bundle" }, @@ -965,7 +965,7 @@ }, { "source": "swf-vscode-extension", "target": "@kie-tools/vscode-extension-common-test-helpers", "weight": 1 }, { - "source": "@kie-tools/sonataflow-quarkus-devui-parent", + "source": "@kie-tools/sonataflow-quarkus-devui-extension-parent", "target": "@kie-tools/serverless-workflow-dev-ui-webapp", "weight": 1 }, @@ -1147,7 +1147,7 @@ ["@kie-tools/serverless-workflow-text-editor", "packages/serverless-workflow-text-editor"], ["swf-vscode-extension", "packages/serverless-workflow-vscode-extension"], ["sonataflow-deployment-webapp", "packages/sonataflow-deployment-webapp"], - ["@kie-tools/sonataflow-quarkus-devui-parent", "packages/sonataflow-quarkus-devui-parent"], + ["@kie-tools/sonataflow-quarkus-devui-extension-parent", "packages/sonataflow-quarkus-devui-extension-parent"], ["@kie-tools/storybook-base", "packages/storybook-base"], ["@kie-tools/stunner-editors", "packages/stunner-editors"], ["@kie-tools/stunner-editors-dmn-loader", "packages/stunner-editors-dmn-loader"], From a372b6b1651187b54992d9bb638b463dd98d0e16 Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 8 Mar 2024 13:30:09 +0100 Subject: [PATCH 65/69] Fixes comment: https://github.com/apache/incubator-kie-tools/pull/2167#discussion_r1516835107 --- .../swf/tools/deployment/DevConsoleProcessor.java | 2 +- .../ServerlessWorkflowQuarkusExtensionProcessor.java | 4 ++-- .../tools/custom/dashboard/CustomDashboardService.java | 4 ++-- .../tools/custom/dashboard/CustomDashboardStorage.java | 6 +++--- .../converter/CustomDashboardFilterParamConverter.java | 4 ++-- .../CustomDashboardFilterParamConverterProvider.java | 4 ++-- .../custom/dashboard/impl/CustomDashboardStorageImpl.java | 8 ++++---- .../custom/dashboard/model/CustomDashboardFilter.java | 2 +- .../tools/custom/dashboard/model/CustomDashboardInfo.java | 2 +- .../custom/dashboard/impl/CustomDashboardStorageTest.java | 8 ++++---- .../dashboard/impl/CustomDashboardStorageTestProfile.java | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/deployment/DevConsoleProcessor.java (99%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java (91%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/CustomDashboardService.java (95%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/CustomDashboardStorage.java (84%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java (90%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java (90%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java (96%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/model/CustomDashboardFilter.java (95%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/model/CustomDashboardInfo.java (97%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java (93%) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/{kogito => sonataflow}/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java (89%) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java similarity index 99% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java index abea9c0b974..2dc1c77d899 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.deployment; +package org.kie.sonataflow.swf.tools.deployment; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java similarity index 91% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java index 223925e4496..d4b529941ea 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.deployment; +package org.kie.sonataflow.swf.tools.deployment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -class ServerlessWorkflowQuarkusExtensionProcessor { +class ServerlessWorkflowQuarkusExtensionProcessor { private static final String FEATURE = "sonataflow-quarkus-devui-extension"; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java similarity index 95% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java index 7dcc95128a3..530819d4cae 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard; +package org.kie.sonataflow.swf.tools.custom.dashboard; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java similarity index 84% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java index 7d9c3a3d218..29f6096ad69 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard; +package org.kie.sonataflow.swf.tools.custom.dashboard; import java.io.IOException; import java.util.Collection; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardInfo; public interface CustomDashboardStorage { diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java similarity index 90% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java index 7ee3476df97..fe648a586ad 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.converter; +package org.kie.sonataflow.swf.tools.custom.dashboard.converter; import java.util.Collections; import java.util.StringTokenizer; import java.util.stream.Collectors; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; import jakarta.ws.rs.ext.ParamConverter; import jakarta.ws.rs.ext.Provider; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java similarity index 90% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java index a6043248ad8..dcf1487657b 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.converter; +package org.kie.sonataflow.swf.tools.custom.dashboard.converter; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; import jakarta.ws.rs.ext.ParamConverter; import jakarta.ws.rs.ext.ParamConverterProvider; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java similarity index 96% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java index a2a00437c09..5060c20f749 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.impl; +package org.kie.sonataflow.swf.tools.custom.dashboard.impl; import java.io.File; import java.io.FileInputStream; @@ -47,9 +47,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.microprofile.config.ConfigProvider; -import org.kie.kogito.swf.tools.custom.dashboard.CustomDashboardStorage; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; +import org.kie.sonataflow.swf.tools.custom.dashboard.CustomDashboardStorage; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java similarity index 95% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java index d3982535ce4..e4a59b5917e 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.model; +package org.kie.sonataflow.swf.tools.custom.dashboard.model; import java.util.ArrayList; import java.util.List; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java similarity index 97% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java index a7f80ac6afa..7c873cbd136 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.model; +package org.kie.sonataflow.swf.tools.custom.dashboard.model; import java.time.LocalDateTime; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java similarity index 93% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java index 88a398014a8..912c021d9a6 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.impl; +package org.kie.sonataflow.swf.tools.custom.dashboard.impl; import java.io.File; import java.io.IOException; @@ -30,9 +30,9 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.kie.kogito.swf.tools.custom.dashboard.CustomDashboardStorage; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter; -import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardInfo; +import org.kie.sonataflow.swf.tools.custom.dashboard.CustomDashboardStorage; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardFilter; +import org.kie.sonataflow.swf.tools.custom.dashboard.model.CustomDashboardInfo; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java similarity index 89% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java index a901f732291..9b9e3350be9 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.kie.kogito.swf.tools.custom.dashboard.impl; +package org.kie.sonataflow.swf.tools.custom.dashboard.impl; import java.io.File; import java.io.IOException; @@ -26,7 +26,7 @@ import io.quarkus.test.junit.QuarkusTestProfile; -import static org.kie.kogito.swf.tools.custom.dashboard.impl.CustomDashboardStorageImpl.PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP; +import static org.kie.sonataflow.swf.tools.custom.dashboard.impl.CustomDashboardStorageImpl.PROJECT_CUSTOM_DASHBOARD_STORAGE_PROP; public class CustomDashboardStorageTestProfile implements QuarkusTestProfile { From 7c6d7d7ec001ac6a858ff5f592ac9c8b9394a39a Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 8 Mar 2024 15:13:53 +0100 Subject: [PATCH 66/69] Finalized renaming --- ...nProcessor.java => SonataFlowQuarkusExtensionProcessor.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/{ServerlessWorkflowQuarkusExtensionProcessor.java => SonataFlowQuarkusExtensionProcessor.java} (95%) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java similarity index 95% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java rename to packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java index d4b529941ea..60d10d1853b 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java @@ -21,7 +21,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; -class ServerlessWorkflowQuarkusExtensionProcessor { +class SonataFlowQuarkusExtensionProcessor { private static final String FEATURE = "sonataflow-quarkus-devui-extension"; From 49e5e5674ae4b75627249ec5f79b32ab6ef14e31 Mon Sep 17 00:00:00 2001 From: Paulo Martins Date: Fri, 8 Mar 2024 12:21:19 -0300 Subject: [PATCH 67/69] Add Apache repository and remove outdated dependency --- .../pom.xml | 30 +++++++++++++++++++ .../pom.xml | 6 ---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/pom.xml index b263cea5dcc..cded104b09b 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/pom.xml @@ -32,6 +32,36 @@ sonataflow-quarkus-devui-extension-parent pom + + + + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + apache-public-repository-group + Apache Public Repository Group + https://repository.apache.org/content/groups/public/ + + true + never + + + true + daily + + + + 3.12.1 17 diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml index 5076788a9e4..49ab6c61c95 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml @@ -104,12 +104,6 @@ quarkus-junit5-internal test - - org.kie.kogito - kogito-apps-ui-packages - ${version.org.kie.kogito} - pom - From b692c1360ce81e23277bc6fbce4e9abd673d0acf Mon Sep 17 00:00:00 2001 From: Paulo Martins Date: Fri, 15 Mar 2024 10:48:18 -0300 Subject: [PATCH 68/69] kie-issues#1009: Remove check for data index availability on legacy Quarkus Dev UI extensions --- .../pom.xml | 5 ----- .../swf/tools/deployment/DevConsoleProcessor.java | 15 --------------- .../main/resources/dev-templates/embedded.html | 5 ----- .../main/resources/dev-templates/monitoring.html | 2 +- .../dev-templates/workflowInstances.html | 2 +- 5 files changed, 2 insertions(+), 27 deletions(-) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml index 49ab6c61c95..e319b361962 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml @@ -70,11 +70,6 @@ io.quarkus quarkus-resteasy-multipart-deployment - - org.kie.kogito - kogito-quarkus-extension-spi - ${version.org.kie.kogito} - diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java index 2dc1c77d899..721a00c4e2e 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java @@ -22,11 +22,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.file.Path; -import java.util.Optional; -import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoDataIndexServiceAvailableBuildItem; - -import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.IsDevelopment; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -38,7 +34,6 @@ import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.deployment.util.WebJarUtil; -import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; import io.quarkus.maven.dependency.ResolvedDependency; @@ -51,7 +46,6 @@ public class DevConsoleProcessor { private static final String STATIC_RESOURCES_PATH = "dev-static/"; private static final String BASE_RELATIVE_URL = "/q/dev-v1/org.apache.kie.sonataflow.sonataflow-quarkus-devui-extension"; - private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index"; @BuildStep(onlyIf = IsDevelopment.class) public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, @@ -110,15 +104,6 @@ public void deployStaticResources(final DevConsoleRecorder recorder, .build()); } - @SuppressWarnings("unused") - @BuildStep(onlyIf = IsDevelopment.class) - public void isDataIndexAvailable(BuildProducer devConsoleTemplateInfoBuildItemBuildProducer, - Optional dataIndexServiceAvailableBuildItem, - Capabilities capabilities) { - devConsoleTemplateInfoBuildItemBuildProducer.produce(new DevConsoleTemplateInfoBuildItem("isDataIndexAvailable", - dataIndexServiceAvailableBuildItem.isPresent() || capabilities.isPresent(DATA_INDEX_CAPABILITY))); - } - private static String getProperty(ConfigurationBuildItem configurationBuildItem, String propertyKey) { diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html index d61c149e66d..da2e7069430 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html @@ -18,7 +18,6 @@ under the License. --> -{#if info:isDataIndexAvailable} Workflow Instances @@ -28,9 +27,6 @@ Monitoring -{/if} {#if info:isDataIndexAvailable == false} -

No Kogito addons detected.

-{/if} {#if info:isDataIndexAvailable} -{/if} diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html index d89e93894c0..2132fd4c35c 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html @@ -27,7 +27,7 @@ const devUIUrl= {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if}; const devUI = RuntimeToolsDevUI.open({ container: document.getElementById("envelope-app"), - isDataIndexAvailable: {info:isDataIndexAvailable}, + isDataIndexAvailable: true, dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql", page: "Monitoring", devUIUrl, diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html index 4da80a78e74..90370483336 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html +++ b/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html @@ -28,7 +28,7 @@ const devUI = RuntimeToolsDevUI.open({ container: document.getElementById("envelope-app"), - isDataIndexAvailable: {info:isDataIndexAvailable}, + isDataIndexAvailable: true, dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql", devUIUrl, page: "Workflows", From 40809bb8038031e6e3c62564702599b184aad56a Mon Sep 17 00:00:00 2001 From: fantonangeli Date: Fri, 22 Mar 2024 14:54:33 +0100 Subject: [PATCH 69/69] Fixes comment: https://github.com/apache/incubator-kie-tools/pull/2167#pullrequestreview-1954793322 --- .../env/index.js | 0 .../install.js | 0 .../package.json | 2 +- .../pom.xml | 0 .../sonataflow-quarkus-devui-extension-deployment/pom.xml | 0 .../swf/tools/deployment/DevConsoleProcessor.java | 0 .../deployment/SonataFlowQuarkusExtensionProcessor.java | 0 .../src/main/resources/dev-templates/embedded.html | 0 .../src/main/resources/dev-templates/monitoring.html | 0 .../src/main/resources/dev-templates/workflowInstances.html | 0 .../src/main/resources/static/index.html | 0 .../sonataflow-quarkus-devui-extension/pom.xml | 0 .../swf/tools/custom/dashboard/CustomDashboardService.java | 0 .../swf/tools/custom/dashboard/CustomDashboardStorage.java | 0 .../converter/CustomDashboardFilterParamConverter.java | 0 .../CustomDashboardFilterParamConverterProvider.java | 0 .../custom/dashboard/impl/CustomDashboardStorageImpl.java | 0 .../tools/custom/dashboard/model/CustomDashboardFilter.java | 0 .../tools/custom/dashboard/model/CustomDashboardInfo.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../src/main/resources/META-INF/quarkus-extension.yaml | 0 .../custom/dashboard/impl/CustomDashboardStorageTest.java | 0 .../dashboard/impl/CustomDashboardStorageTestProfile.java | 0 .../src/test/resources/custom/dashboards/products.dash.yaml | 0 .../test/resources/custom/dashboards/subdir/age.dash.yml | 0 pnpm-lock.yaml | 2 +- repo/graph.dot | 4 ++-- repo/graph.json | 6 +++--- 28 files changed, 7 insertions(+), 7 deletions(-) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/env/index.js (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/install.js (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/package.json (95%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/pom.xml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml (100%) rename packages/{sonataflow-quarkus-devui-extension-parent => sonataflow-quarkus-devui-extension}/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml (100%) diff --git a/packages/sonataflow-quarkus-devui-extension-parent/env/index.js b/packages/sonataflow-quarkus-devui-extension/env/index.js similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/env/index.js rename to packages/sonataflow-quarkus-devui-extension/env/index.js diff --git a/packages/sonataflow-quarkus-devui-extension-parent/install.js b/packages/sonataflow-quarkus-devui-extension/install.js similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/install.js rename to packages/sonataflow-quarkus-devui-extension/install.js diff --git a/packages/sonataflow-quarkus-devui-extension-parent/package.json b/packages/sonataflow-quarkus-devui-extension/package.json similarity index 95% rename from packages/sonataflow-quarkus-devui-extension-parent/package.json rename to packages/sonataflow-quarkus-devui-extension/package.json index 04e53b3f9cc..9407dfdba19 100644 --- a/packages/sonataflow-quarkus-devui-extension-parent/package.json +++ b/packages/sonataflow-quarkus-devui-extension/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@kie-tools/sonataflow-quarkus-devui-extension-parent", + "name": "@kie-tools/sonataflow-quarkus-devui-extension", "version": "0.0.0", "description": "", "license": "Apache-2.0", diff --git a/packages/sonataflow-quarkus-devui-extension-parent/pom.xml b/packages/sonataflow-quarkus-devui-extension/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/pom.xml rename to packages/sonataflow-quarkus-devui-extension/pom.xml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/pom.xml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/pom.xml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/DevConsoleProcessor.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/java/org/kie/sonataflow/swf/tools/deployment/SonataFlowQuarkusExtensionProcessor.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/embedded.html diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/monitoring.html diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/dev-templates/workflowInstances.html diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension-deployment/src/main/resources/static/index.html diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/pom.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/pom.xml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/pom.xml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardService.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/CustomDashboardStorage.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardFilter.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/java/org/kie/sonataflow/swf/tools/custom/dashboard/model/CustomDashboardInfo.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/beans.xml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/java/org/kie/sonataflow/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/products.dash.yaml diff --git a/packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml b/packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml similarity index 100% rename from packages/sonataflow-quarkus-devui-extension-parent/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml rename to packages/sonataflow-quarkus-devui-extension/sonataflow-quarkus-devui-extension/src/test/resources/custom/dashboards/subdir/age.dash.yml diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7816539fec..1308a8fde1b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9212,7 +9212,7 @@ importers: specifier: ^5.9.0 version: 5.9.0 - packages/sonataflow-quarkus-devui-extension-parent: + packages/sonataflow-quarkus-devui-extension: devDependencies: "@kie-tools/maven-config-setup-helper": specifier: workspace:* diff --git a/repo/graph.dot b/repo/graph.dot index 1aebc31a02e..ec49e8db3f4 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -150,7 +150,7 @@ digraph G { "@kie-tools/serverless-workflow-service-catalog" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/serverless-workflow-language-service" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "swf-vscode-extension" [ color = "blue", fontcolor = "blue", style = "rounded" ]; - "@kie-tools/sonataflow-quarkus-devui-extension-parent" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/sonataflow-quarkus-devui-extension" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/stunner-editors-dmn-loader" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "@kie-tools/unitables" [ color = "blue", fontcolor = "blue", style = "rounded" ]; "vscode-extension-dashbuilder-editor" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -463,7 +463,7 @@ digraph G { "swf-vscode-extension" -> "@kie-tools/vscode-extension-common-test-helpers" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools-core/react-hooks" [ style = "dashed", color = "blue" ]; "sonataflow-deployment-webapp" -> "@kie-tools/runtime-tools-webapp-components" [ style = "dashed", color = "blue" ]; - "@kie-tools/sonataflow-quarkus-devui-extension-parent" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; + "@kie-tools/sonataflow-quarkus-devui-extension" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ]; "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ]; "@kie-tools/storybook-base" -> "@kie-tools/tsconfig" [ style = "dashed", color = "blue" ]; "@kie-tools/stunner-editors" -> "@kie-tools/stunner-editors-dmn-loader" [ style = "solid", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index eb0f26a95fe..7014bcd673e 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -155,7 +155,7 @@ { "id": "@kie-tools/serverless-workflow-jq-expressions" }, { "id": "@kie-tools/serverless-workflow-service-catalog" }, { "id": "swf-vscode-extension" }, - { "id": "@kie-tools/sonataflow-quarkus-devui-extension-parent" }, + { "id": "@kie-tools/sonataflow-quarkus-devui-extension" }, { "id": "vscode-extension-dashbuilder-editor" }, { "id": "vscode-extension-kie-ba-bundle" }, { "id": "vscode-extension-kogito-bundle" }, @@ -965,7 +965,7 @@ }, { "source": "swf-vscode-extension", "target": "@kie-tools/vscode-extension-common-test-helpers", "weight": 1 }, { - "source": "@kie-tools/sonataflow-quarkus-devui-extension-parent", + "source": "@kie-tools/sonataflow-quarkus-devui-extension", "target": "@kie-tools/serverless-workflow-dev-ui-webapp", "weight": 1 }, @@ -1147,7 +1147,7 @@ ["@kie-tools/serverless-workflow-text-editor", "packages/serverless-workflow-text-editor"], ["swf-vscode-extension", "packages/serverless-workflow-vscode-extension"], ["sonataflow-deployment-webapp", "packages/sonataflow-deployment-webapp"], - ["@kie-tools/sonataflow-quarkus-devui-extension-parent", "packages/sonataflow-quarkus-devui-extension-parent"], + ["@kie-tools/sonataflow-quarkus-devui-extension", "packages/sonataflow-quarkus-devui-extension"], ["@kie-tools/storybook-base", "packages/storybook-base"], ["@kie-tools/stunner-editors", "packages/stunner-editors"], ["@kie-tools/stunner-editors-dmn-loader", "packages/stunner-editors-dmn-loader"],