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 5948348b1c8 kie-issues#1999: DMN Editor: Boxed Contexts result row
should not be part of xml when its expression is undefined (#3175)
5948348b1c8 is described below
commit 5948348b1c8e3bea49bb1ac9410e92fd97db349e
Author: Jozef Marko <[email protected]>
AuthorDate: Wed Jun 11 21:15:52 2025 +0200
kie-issues#1999: DMN Editor: Boxed Contexts result row should not be part
of xml when its expression is undefined (#3175)
---
.../boxedExpressions/getDefaultBoxedExpression.tsx | 12 ++--
...kContextExpressionResultRowInitialValue.spec.ts | 70 ++++++++++++++++++++++
2 files changed, 77 insertions(+), 5 deletions(-)
diff --git
a/packages/dmn-editor/src/boxedExpressions/getDefaultBoxedExpression.tsx
b/packages/dmn-editor/src/boxedExpressions/getDefaultBoxedExpression.tsx
index f1918d29bea..4a7d054cba0 100644
--- a/packages/dmn-editor/src/boxedExpressions/getDefaultBoxedExpression.tsx
+++ b/packages/dmn-editor/src/boxedExpressions/getDefaultBoxedExpression.tsx
@@ -131,11 +131,13 @@ export function getDefaultBoxedExpression({
});
}
- // context <result> cell
- contextEntries.push({
- "@_id": generateUuid(),
- expression: undefined!, // SPEC DISCREPANCY: Starting without an
expression gives users the ability to select the expression type.
- });
+ // context <result> cell is not created by default, so we do not add it
here.
+ // this is because context evaluation should collect all context entries
until <result> is explicitely added by the user.
+ // if we do like below, the validation would always fail and the
evaluation would return null
+ // contextEntries.push({
+ // "@_id": generateUuid(),
+ // expression: undefined!, // SPEC DISCREPANCY: Starting without an
expression gives users the ability to select the expression type.
+ // });
const contextExpression: Normalized<BoxedContext> = {
__$$element: "context",
diff --git
a/packages/dmn-editor/tests-e2e/checkContextExpressionResultRowInitialValue.spec.ts
b/packages/dmn-editor/tests-e2e/checkContextExpressionResultRowInitialValue.spec.ts
new file mode 100644
index 00000000000..d351436e845
--- /dev/null
+++
b/packages/dmn-editor/tests-e2e/checkContextExpressionResultRowInitialValue.spec.ts
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+import { test, expect } from "./__fixtures__/base";
+import { DefaultNodeName, NodeType } from "./__fixtures__/nodes";
+import { DMN15__tContext } from
"@kie-tools/dmn-marshaller/dist/schemas/dmn-1_5/ts-gen/types";
+
+test.beforeEach(async ({ editor }) => {
+ await editor.open();
+});
+
+test.describe("Check Context Result Row Initial Value", () => {
+ test.describe("Decision node", () => {
+ // Drag Decision node to the diagram and select the context expression menu
+ test.beforeEach(async ({ bee, palette, nodes }) => {
+ await palette.dragNewNode({ type: NodeType.DECISION, targetPosition: {
x: 100, y: 100 } });
+
+ await nodes.edit({ name: DefaultNodeName.DECISION });
+ await bee.selectExpressionMenu.selectContext();
+ });
+
+ test("result row of the root context should be absent", async ({ jsonModel
}) => {
+ // JSON model assertions
+ const decision = await jsonModel.drgElements.getDecision({
drgElementIndex: 0, drdIndex: 0 });
+ expect((decision.expression as
DMN15__tContext).contextEntry?.length).toEqual(1);
+ });
+
+ test("result row of the nested context should be absent", async ({ bee,
jsonModel }) => {
+ await
bee.expression.asContext().entry(0).selectExpressionMenu.selectContext();
+
+ // JSON model assertions
+ const decision = await jsonModel.drgElements.getDecision({
drgElementIndex: 0, drdIndex: 0 });
+ expect(
+ ((decision.expression as DMN15__tContext).contextEntry![0].expression
as DMN15__tContext).contextEntry?.length
+ ).toEqual(1);
+ });
+ });
+
+ test.describe("BKM node", () => {
+ // Drag Decision node to the diagram and select the context expression menu
+ test.beforeEach(async ({ bee, palette, nodes }) => {
+ await palette.dragNewNode({ type: NodeType.BKM, targetPosition: { x:
100, y: 100 } });
+
+ await nodes.edit({ name: DefaultNodeName.BKM });
+ await
bee.expression.asFunction().entry(0).selectExpressionMenu.selectContext();
+ });
+
+ test("result row of the context in function should be absent", async ({
jsonModel }) => {
+ // JSON model assertions
+ const bkm = await jsonModel.drgElements.getBkm({ drgElementIndex: 0,
drdIndex: 0 });
+ expect((bkm.encapsulatedLogic?.expression as
DMN15__tContext).contextEntry?.length).toEqual(1);
+ });
+ });
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
