This is an automated email from the ASF dual-hosted git repository.
tiagobento 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 187a6e5d929 NO-ISSUE: BPMN Editor can't change/delete process
variables being used - No error or alert message (#2426)
187a6e5d929 is described below
commit 187a6e5d929b0b0ea1529b113fd2195a2f246a12
Author: Jozef Marko <[email protected]>
AuthorDate: Thu Jun 20 19:43:50 2024 +0200
NO-ISSUE: BPMN Editor can't change/delete process variables being used - No
error or alert message (#2426)
---
.../variablesEditor/VariablesEditorFieldRenderer.java | 14 ++++++++++++--
.../variablesEditor/VariablesEditorFieldRendererTest.java | 10 ++++++++--
2 files changed, 20 insertions(+), 4 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/main/java/org/kie/workbench/common/stunner/bpmn/client/forms/fields/variablesEditor/VariablesEditorFieldRenderer.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/variablesEdito
[...]
index 3306cbad31a..2927dac7da9 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/variablesEditor/VariablesEditorFieldRenderer.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/variablesEditor/VariablesEditorFieldRenderer.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import javax.enterprise.context.Dependent;
+import javax.enterprise.event.Event;
import javax.inject.Inject;
import org.gwtbootstrap3.client.ui.Button;
@@ -38,19 +39,21 @@ import
org.kie.workbench.common.forms.dynamic.client.rendering.FieldRenderer;
import
org.kie.workbench.common.forms.dynamic.client.rendering.formGroups.FormGroup;
import
org.kie.workbench.common.forms.dynamic.client.rendering.formGroups.impl.def.DefaultFormGroup;
import org.kie.workbench.common.forms.dynamic.service.shared.RenderMode;
+import
org.kie.workbench.common.stunner.bpmn.client.forms.fields.i18n.StunnerFormsClientFieldsConstants;
import
org.kie.workbench.common.stunner.bpmn.client.forms.fields.model.Variable;
import
org.kie.workbench.common.stunner.bpmn.client.forms.fields.model.VariableRow;
import org.kie.workbench.common.stunner.bpmn.client.forms.util.ListBoxValues;
import org.kie.workbench.common.stunner.bpmn.client.forms.util.StringUtils;
import org.kie.workbench.common.stunner.bpmn.client.util.VariableUtils;
+import
org.kie.workbench.common.stunner.bpmn.client.util.VariableUtils.FindVariableUsagesFlag;
import
org.kie.workbench.common.stunner.bpmn.forms.model.VariablesEditorFieldDefinition;
import
org.kie.workbench.common.stunner.bpmn.forms.model.VariablesEditorFieldType;
import org.kie.workbench.common.stunner.core.client.api.SessionManager;
import org.kie.workbench.common.stunner.core.diagram.Diagram;
import org.kie.workbench.common.stunner.core.graph.Graph;
import org.uberfire.backend.vfs.Path;
+import org.uberfire.workbench.events.NotificationEvent;
-import static
org.kie.workbench.common.stunner.bpmn.client.util.VariableUtils.FindVariableUsagesFlag;
import static
org.kie.workbench.common.stunner.bpmn.client.util.VariableUtils.FindVariableUsagesFlag.CASE_FILE_VARIABLE;
@Dependent
@@ -74,6 +77,9 @@ public class VariablesEditorFieldRenderer extends
FieldRenderer<VariablesEditorF
private static Set<String> defaultTagsSet = new
HashSet<>(Arrays.asList("internal", "required", "readonly", "input", "output",
"business_relevant", "tracked"));
+ @Inject
+ protected Event<NotificationEvent> notification;
+
@Inject
public VariablesEditorFieldRenderer(final VariablesEditorWidgetView
variablesEditor,
final SessionManager sessionManager) {
@@ -272,13 +278,17 @@ public class VariablesEditorFieldRenderer extends
FieldRenderer<VariablesEditorF
public void removeVariable(final VariableRow variableRow) {
if (isBoundToNodes(variableRow.getName())) {
- // error popup was here
+ fireDeleteDiagramVariableError();
} else {
view.getVariableRows().remove(variableRow);
doSave();
}
}
+ protected void fireDeleteDiagramVariableError() {
+ notification.fire(new
NotificationEvent(StunnerFormsClientFieldsConstants.CONSTANTS.DeleteDiagramVariableError(),
NotificationEvent.NotificationType.ERROR));
+ }
+
@Override
public ListBoxValues.ValueTester dataTypesTester() {
return dataTypeDisplayName -> {
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/variablesEditor/VariablesEditorFieldRendererTest.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/variablesE
[...]
index bbbceef35ea..31207995b8d 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/variablesEditor/VariablesEditorFieldRendererTest.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/variablesEditor/VariablesEditorFieldRendererTest.java
@@ -62,8 +62,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -117,12 +119,14 @@ public class VariablesEditorFieldRendererTest {
@Before
public void setup() {
when(formGroupsInstanceMock.get()).thenReturn(formGroup);
- variablesEditor = new
VariablesEditorFieldRenderer(variablesEditorWidgetView,
+ variablesEditor = spy(new
VariablesEditorFieldRenderer(variablesEditorWidgetView,
abstractClientSessionManager) {
{
formGroupsInstance = formGroupsInstanceMock;
}
- };
+ });
+
+ doNothing().when(variablesEditor).fireDeleteDiagramVariableError();
}
@Test
@@ -150,6 +154,7 @@ public class VariablesEditorFieldRendererTest {
variablesEditor.removeVariable(variableRow);
verify(variablesEditorWidgetView).getVariableRows();
verify(variablesEditorWidgetView, never()).doSave();
+ verify(variablesEditor).fireDeleteDiagramVariableError();
}
@Test
@@ -158,6 +163,7 @@ public class VariablesEditorFieldRendererTest {
variablesEditor.removeVariable(variableRow);
verify(variablesEditorWidgetView, times(2)).getVariableRows();
verify(variablesEditorWidgetView).doSave();
+ verify(variablesEditor, never()).fireDeleteDiagramVariableError();
}
private void prepareRemoveVariableTest(boolean makeVariableBounded) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
