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 6f9dca53e4a kie-issues#982: On the DMN Editor it should be possible
Associate a Text Annotation node to a Group node (#2528)
6f9dca53e4a is described below
commit 6f9dca53e4ab8e4cfe5c51c3442cf7bb71decc95
Author: Jozef Marko <[email protected]>
AuthorDate: Fri Aug 9 17:06:20 2024 +0200
kie-issues#982: On the DMN Editor it should be possible Associate a Text
Annotation node to a Group node (#2528)
---
.../src/diagram/connections/graphStructure.ts | 1 +
packages/dmn-editor/src/diagram/nodes/Nodes.tsx | 2 +-
...ion-edge-from-text-annotation-node-to-group-node.png | Bin 0 -> 39549 bytes
...ion-edge-from-text-annotation-node-to-group-node.png | Bin 0 -> 35998 bytes
...ion-edge-from-text-annotation-node-to-group-node.png | Bin 0 -> 36343 bytes
.../tests-e2e/drdArtifacts/addAssociation.spec.ts | 4 ++--
6 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/dmn-editor/src/diagram/connections/graphStructure.ts
b/packages/dmn-editor/src/diagram/connections/graphStructure.ts
index b4e155ece35..a77b1961d97 100644
--- a/packages/dmn-editor/src/diagram/connections/graphStructure.ts
+++ b/packages/dmn-editor/src/diagram/connections/graphStructure.ts
@@ -72,6 +72,7 @@ export const graphStructure: Map<NodeType, Map<EdgeType,
Set<NodeType>>> = new M
NODE_TYPES.decision,
NODE_TYPES.bkm,
NODE_TYPES.decisionService,
+ NODE_TYPES.group,
NODE_TYPES.knowledgeSource,
]),
],
diff --git a/packages/dmn-editor/src/diagram/nodes/Nodes.tsx
b/packages/dmn-editor/src/diagram/nodes/Nodes.tsx
index 724e8a7a4a0..043ff69f967 100644
--- a/packages/dmn-editor/src/diagram/nodes/Nodes.tsx
+++ b/packages/dmn-editor/src/diagram/nodes/Nodes.tsx
@@ -1151,7 +1151,7 @@ export const GroupNode = React.memo(
strokeColor={shapeStyle.strokeColor}
/>
</svg>
-
+ <PositionalNodeHandles isTargeted={isTargeted &&
isValidConnectionTarget} nodeId={id} />
<div
className={`kie-dmn-editor--node kie-dmn-editor--group-node
${className}`}
tabIndex={-1}
diff --git
a/packages/dmn-editor/tests-e2e/__screenshots__/Google-Chrome/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
b/packages/dmn-editor/tests-e2e/__screenshots__/Google-Chrome/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
new file mode 100644
index 00000000000..e03fc096032
Binary files /dev/null and
b/packages/dmn-editor/tests-e2e/__screenshots__/Google-Chrome/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
differ
diff --git
a/packages/dmn-editor/tests-e2e/__screenshots__/chromium/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
b/packages/dmn-editor/tests-e2e/__screenshots__/chromium/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
new file mode 100644
index 00000000000..e579c0ead3d
Binary files /dev/null and
b/packages/dmn-editor/tests-e2e/__screenshots__/chromium/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
differ
diff --git
a/packages/dmn-editor/tests-e2e/__screenshots__/webkit/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
b/packages/dmn-editor/tests-e2e/__screenshots__/webkit/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
new file mode 100644
index 00000000000..01b13cdb892
Binary files /dev/null and
b/packages/dmn-editor/tests-e2e/__screenshots__/webkit/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
differ
diff --git a/packages/dmn-editor/tests-e2e/drdArtifacts/addAssociation.spec.ts
b/packages/dmn-editor/tests-e2e/drdArtifacts/addAssociation.spec.ts
index 6419c9f4a60..25b09449bb3 100644
--- a/packages/dmn-editor/tests-e2e/drdArtifacts/addAssociation.spec.ts
+++ b/packages/dmn-editor/tests-e2e/drdArtifacts/addAssociation.spec.ts
@@ -305,16 +305,16 @@ test.describe("Add edge - Association", () => {
nodes,
edges,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/982";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
description:
"https://github.com/apache/incubator-kie-issues/issues/982";,
});
- await palette.dragNewNode({ type: NodeType.GROUP, targetPosition: { x:
300, y: 300 } });
+ await palette.dragNewNode({ type: NodeType.GROUP, targetPosition: { x:
400, y: 400 } });
await nodes.dragNewConnectedEdge({
type: EdgeType.ASSOCIATION,
from: DefaultNodeName.TEXT_ANNOTATION,
to: DefaultNodeName.GROUP,
+ position: NodePosition.TOP,
});
expect(await edges.get({ from: DefaultNodeName.TEXT_ANNOTATION, to:
DefaultNodeName.GROUP })).toBeAttached();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
