kie-issues#982: On the DMN Editor it should be possible Associate a T…

…ext Annotation node to a Group node (apache#2528)
fantonangeli · Aug 9, 2024 · 6f9dca5 · 6f9dca5
1 parent 6f5c8e8
commit 6f9dca5
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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/...e/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png b/...e/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
diff --git a/...m/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png b/...m/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
diff --git a/...t/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png b/...t/drdArtifacts/add-association-edge-from-text-annotation-node-to-group-node.png
diff --git 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();