You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ya...@apache.org on 2025/01/09 14:14:20 UTC
(incubator-kie-tools) branch main updated: [incubator-kie-issues#1733] Remove JavaScript language option from Script Editor in BPMN Editor (#2830)
This is an automated email from the ASF dual-hosted git repository.
yamer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 4f079d75b64 [incubator-kie-issues#1733] Remove JavaScript language option from Script Editor in BPMN Editor (#2830)
4f079d75b64 is described below
commit 4f079d75b645b96b23a3e6ceb91a66d4cd37d0f3
Author: Pere Fernández <pe...@users.noreply.github.com>
AuthorDate: Thu Jan 9 15:14:16 2025 +0100
[incubator-kie-issues#1733] Remove JavaScript language option from Script Editor in BPMN Editor (#2830)
---
.../e2e-tests/extension-editors-bpmn.test.ts | 4 +--
.../monaco_editor/MonacoEditorLanguage.java | 11 ------
.../ScriptTypeFieldEditorPresenter.java | 3 +-
.../monaco_editor/MonacoEditorLanguageTest.java | 13 -------
.../ConditionEditorFieldEditorPresenterTest.java | 2 +-
.../ScriptTypeFieldEditorPresenterTest.java | 4 ---
.../converters/tostunner/properties/Scripts.java | 42 ++++++----------------
7 files changed, 15 insertions(+), 64 deletions(-)
diff --git a/packages/kie-editors-dev-vscode-extension/e2e-tests/extension-editors-bpmn.test.ts b/packages/kie-editors-dev-vscode-extension/e2e-tests/extension-editors-bpmn.test.ts
index c4204bbfc7a..d4757a342dc 100644
--- a/packages/kie-editors-dev-vscode-extension/e2e-tests/extension-editors-bpmn.test.ts
+++ b/packages/kie-editors-dev-vscode-extension/e2e-tests/extension-editors-bpmn.test.ts
@@ -269,12 +269,12 @@ describe("KIE Editors End to End Test Suite - BPMN Editor", () => {
await bpmnEditorTester.scrollElementIntoView(onExitActionSection);
const newOnEntryAction = "console.log('On Entry Action test log');";
- const newOnEntryLanguage = "javascript";
+ const newOnEntryLanguage = "mvel";
await propertiesPanel.changeWidgetedProperty("On Entry Action", newOnEntryAction, "textarea");
await propertiesPanel.changeWidgetedProperty("On Entry Action", newOnEntryLanguage, "select");
const newOnExitAction = "console.log('On Exit Action test log');";
- const newOnExitLanguage = "javascript";
+ const newOnExitLanguage = "mvel";
await propertiesPanel.changeWidgetedProperty("On Exit Action", newOnExitAction, "textarea");
await propertiesPanel.changeWidgetedProperty("On Exit Action", newOnExitLanguage, "select");
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/main/java/org/kie/workbench/common/stunner/bpmn/client/components/monaco_editor/MonacoEditorLanguage.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/main/java/org/kie/workbench/common/stunner/bpmn/client/components/monaco_editor/MonacoEditorLa [...]
index 181155edee3..a58cb93aef3 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/main/java/org/kie/workbench/common/stunner/bpmn/client/components/monaco_editor/MonacoEditorLanguage.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/main/java/org/kie/workbench/common/stunner/bpmn/client/components/monaco_editor/MonacoEditorLanguage.java
@@ -24,8 +24,6 @@ public class MonacoEditorLanguage {
static final String LANG_JAVA = "java";
static final String TITLE_JAVA = "Java";
- static final String LANG_JAVASCRIPT = "javascript";
- static final String TITLE_JAVASCRIPT = "JavaScript";
static final String LANG_MVEL = "mvel";
static final String TITLE_MVEL = "MVEL";
static final String LANG_DROOLS = "drools";
@@ -33,9 +31,6 @@ public class MonacoEditorLanguage {
static final String LANG_FEEL = "feel";
static final String TITLE_FEEL = "FEEL";
static final String JAVA_MODULE = "vs/basic-languages/java/java";
- static final String JAVASCRIPT_MODULE = "vs/basic-languages/javascript/javascript";
- static final String TYPESCRIPT_MODULE = "vs/basic-languages/typescript/typescript";
- static final String TYPESCRIPT_MODE_MODULE = "vs/language/typescript/tsMode";
public static MonacoEditorLanguage JAVA =
new MonacoEditorLanguage(LANG_JAVA,
@@ -43,12 +38,6 @@ public class MonacoEditorLanguage {
LANG_JAVA,
new String[]{JAVA_MODULE});
- public static MonacoEditorLanguage JAVA_SCRIPT =
- new MonacoEditorLanguage(LANG_JAVASCRIPT,
- TITLE_JAVASCRIPT,
- LANG_JAVASCRIPT,
- new String[]{JAVASCRIPT_MODULE, TYPESCRIPT_MODULE, TYPESCRIPT_MODE_MODULE});
-
// Let's assume use of Java syntax for MVEL.
public static MonacoEditorLanguage MVEL =
new MonacoEditorLanguage(LANG_MVEL,
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/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/scriptEditor/ScriptTypeFieldEditorPresenter.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/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/scriptEditor/Sc [...]
index 2c9b089fced..8adbf5763c1 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/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/scriptEditor/ScriptTypeFieldEditorPresenter.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/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/scriptEditor/ScriptTypeFieldEditorPresenter.java
@@ -131,7 +131,6 @@ public class ScriptTypeFieldEditorPresenter
if (mode == ACTION_SCRIPT) {
languages = new ArrayList<>(3);
languages.add(MonacoEditorLanguage.JAVA);
- languages.add(MonacoEditorLanguage.JAVA_SCRIPT);
languages.add(MonacoEditorLanguage.MVEL);
} else if (mode == COMPLETION_CONDITION) {
languages = new ArrayList<>(2);
@@ -140,7 +139,6 @@ public class ScriptTypeFieldEditorPresenter
} else if (mode == FLOW_CONDITION) {
languages = new ArrayList<>(5);
languages.add(MonacoEditorLanguage.JAVA);
- languages.add(MonacoEditorLanguage.JAVA_SCRIPT);
languages.add(MonacoEditorLanguage.MVEL);
languages.add(MonacoEditorLanguage.DROOLS);
languages.add(MonacoEditorLanguage.FEEL);
@@ -159,6 +157,7 @@ public class ScriptTypeFieldEditorPresenter
true);
value.setScript(view.getValue());
value.setLanguage(view.getLanguageId());
+
notifyChange(oldValue,
value);
}
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/components/monaco_editor/MonacoEditorLanguageTest.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/components/monaco_editor/MonacoEdit [...]
index b55683be56d..2cc71ed206c 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/components/monaco_editor/MonacoEditorLanguageTest.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/components/monaco_editor/MonacoEditorLanguageTest.java
@@ -52,19 +52,6 @@ public class MonacoEditorLanguageTest {
assertEquals(MonacoEditorLanguage.LANG_JAVA, language.buildOptions().getLanguage());
}
- @Test
- public void testJavaScriptOptions() {
- MonacoEditorLanguage language = MonacoEditorLanguage.JAVA_SCRIPT;
- assertEquals(MonacoEditorLanguage.LANG_JAVASCRIPT, language.getId());
- assertEquals(MonacoEditorLanguage.TITLE_JAVASCRIPT, language.getTitle());
- assertEquals(MonacoEditorLanguage.LANG_JAVASCRIPT, language.getLanguageCode());
- assertEquals(3, language.getModules().length);
- assertEquals(MonacoEditorLanguage.JAVASCRIPT_MODULE, language.getModules()[0]);
- assertEquals(MonacoEditorLanguage.TYPESCRIPT_MODULE, language.getModules()[1]);
- assertEquals(MonacoEditorLanguage.TYPESCRIPT_MODE_MODULE, language.getModules()[2]);
- assertEquals(MonacoEditorLanguage.LANG_JAVASCRIPT, language.buildOptions().getLanguage());
- }
-
@Test
public void testMVELOptions() {
MonacoEditorLanguage language = MonacoEditorLanguage.MVEL;
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/conditionEditor/ConditionEditorFieldEditorPresenterTest.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/con [...]
index 50b5964bd15..35b9b4fa825 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/conditionEditor/ConditionEditorFieldEditorPresenterTest.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/conditionEditor/ConditionEditorFieldEditorPresenterTest.java
@@ -158,7 +158,7 @@ public class ConditionEditorFieldEditorPresenterTest {
@Test
public void testSetValueWithScriptNonInJava() {
- ScriptTypeValue value = new ScriptTypeValue("javascript", SCRIPT_VALUE);
+ ScriptTypeValue value = new ScriptTypeValue("mvel", SCRIPT_VALUE);
presenter.setValue(value);
verifySetValueCommonActions(value);
verifyShowScriptEditor();
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/scriptEditor/ScriptTypeFieldEditorPresenterTest.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/scriptEdito [...]
index 118a26d6fa6..11ce084e64e 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/scriptEditor/ScriptTypeFieldEditorPresenterTest.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/scriptEditor/ScriptTypeFieldEditorPresenterTest.java
@@ -82,7 +82,6 @@ public class ScriptTypeFieldEditorPresenterTest
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.MVEL));
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.DROOLS));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.JAVA));
- verify(view, never()).addLanguage(eq(MonacoEditorLanguage.JAVA_SCRIPT));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.FEEL));
}
@@ -90,7 +89,6 @@ public class ScriptTypeFieldEditorPresenterTest
public void testSetFlowConditionMode() {
editor.setMode(ScriptTypeMode.FLOW_CONDITION);
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.JAVA));
- verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.JAVA_SCRIPT));
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.MVEL));
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.DROOLS));
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.FEEL));
@@ -100,7 +98,6 @@ public class ScriptTypeFieldEditorPresenterTest
public void testSetActionScriptMode() {
editor.setMode(ScriptTypeMode.ACTION_SCRIPT);
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.JAVA));
- verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.JAVA_SCRIPT));
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.MVEL));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.DROOLS));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.FEEL));
@@ -111,7 +108,6 @@ public class ScriptTypeFieldEditorPresenterTest
editor.setMode(ScriptTypeMode.DROOLS_CONDITION);
verify(view, times(1)).addLanguage(eq(MonacoEditorLanguage.DROOLS));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.JAVA));
- verify(view, never()).addLanguage(eq(MonacoEditorLanguage.JAVA_SCRIPT));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.MVEL));
verify(view, never()).addLanguage(eq(MonacoEditorLanguage.FEEL));
}
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-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/Scripts.java b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostun [...]
index 19b554571f1..a597f07a426 100644
--- a/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/Scripts.java
+++ b/packages/stunner-editors/kie-wb-common-stunner/kie-wb-common-stunner-sets/kie-wb-common-stunner-bpmn/kie-wb-common-stunner-bpmn-marshalling/src/main/java/org/kie/workbench/common/stunner/bpmn/client/marshall/converters/tostunner/properties/Scripts.java
@@ -22,6 +22,7 @@ package org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunn
import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.eclipse.bpmn2.Bpmn2Factory;
import org.eclipse.bpmn2.ExtensionAttributeValue;
@@ -42,17 +43,12 @@ import org.kie.workbench.common.stunner.bpmn.definition.property.task.ScriptType
import static org.jboss.drools.DroolsPackage.Literals.DOCUMENT_ROOT__ON_ENTRY_SCRIPT;
import static org.jboss.drools.DroolsPackage.Literals.DOCUMENT_ROOT__ON_EXIT_SCRIPT;
import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.fromstunner.Factories.droolsFactory;
-import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts.LANGUAGE.DROOLS;
-import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts.LANGUAGE.FEEL;
import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts.LANGUAGE.JAVA;
-import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts.LANGUAGE.JAVASCRIPT;
-import static org.kie.workbench.common.stunner.bpmn.client.marshall.converters.tostunner.properties.Scripts.LANGUAGE.MVEL;
public class Scripts {
public enum LANGUAGE {
JAVA("java", "http://www.java.com/java"),
- JAVASCRIPT("javascript", "http://www.javascript.com/javascript"),
MVEL("mvel", "http://www.mvel.org/2.0"),
DROOLS("drools", "http://www.jboss.org/drools/rule"),
FEEL("feel", "http://www.omg.org/spec/FEEL/20140401");
@@ -116,19 +112,11 @@ public class Scripts {
return defaultValue;
}
- if (JAVA.language().equals(language)) {
- return JAVA.format();
- } else if (MVEL.language().equals(language)) {
- return MVEL.format();
- } else if (JAVASCRIPT.language().equals(language)) {
- return JAVASCRIPT.format();
- } else if (DROOLS.language().equals(language)) {
- return DROOLS.format();
- } else if (FEEL.language().equals(language)) {
- return FEEL.format();
- } else {
- return defaultValue;
- }
+ return Stream.of(LANGUAGE.values())
+ .filter(lang -> lang.language().equals(language))
+ .findFirst()
+ .map(LANGUAGE::format)
+ .orElse(defaultValue);
}
public static String scriptLanguageFromUri(String format) {
@@ -140,19 +128,11 @@ public class Scripts {
return defaultValue;
}
- if (JAVA.format().equals(format)) {
- return JAVA.language();
- } else if (MVEL.format().equals(format)) {
- return MVEL.language();
- } else if (JAVASCRIPT.format().equals(format)) {
- return JAVASCRIPT.language();
- } else if (DROOLS.format().equals(format)) {
- return DROOLS.language();
- } else if (FEEL.format().equals(format)) {
- return FEEL.language();
- } else {
- return defaultValue;
- }
+ return Stream.of(LANGUAGE.values())
+ .filter(lang -> lang.format().equals(format))
+ .findFirst()
+ .map(LANGUAGE::language)
+ .orElse(defaultValue);
}
public static ScriptTypeListValue onExit(List<ExtensionAttributeValue> extensions) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org