kie-issues#886: On the DMN Editor, adding waypoints to edges that don't have a corresponding DMNEdge associated with it should create the DMNEdge and add the waypoint normally

packages/dmn-editor/src/diagram/Diagram.tsx

@@ -568,6 +568,58 @@ export const Diagram = React.forwardRef<DiagramRef, { container: React.RefObject
                   },
                 },
               });
+
+              const nodesById = state.computed(state).getDiagramData(externalModelsByNamespace).nodesById;
+              state
+                .computed(state)
+                .getDiagramData(externalModelsByNamespace)
+                .edgesById.forEach((edge, key) => {
+                  const sourceData = nodesById.get(edge.source)?.data;
+                  const sourceType = nodesById.get(edge.source)?.type;
+                  const targetData = nodesById.get(edge.target)?.data;
+                  const targetType = nodesById.get(edge.target)?.type;
+
+                  // We want to add Edge only if both Source and Target are already present in DRD
+                  if (
+                    edge.data?.dmnShapeSource !== undefined &&
+                    edge.data?.dmnShapeSource["dc:Bounds"] !== undefined &&
+                    edge.data?.dmnShapeSource["@_id"] !== undefined &&
+                    edge.data?.dmnShapeTarget &&
+                    edge.data?.dmnShapeTarget["dc:Bounds"] !== undefined &&
+                    edge.data?.dmnShapeTarget["@_id"] !== undefined &&
+                    sourceData !== undefined &&
+                    sourceType !== undefined &&
+                    targetData !== undefined &&
+                    targetType !== undefined
+                  ) {
+                    addEdge({
+                      definitions: state.dmn.model.definitions,
+                      drdIndex: state.computed(state).getDrdIndex(),
+                      edge: {
+                        type: edge.type as EdgeType,
+                        targetHandle: PositionalNodeHandleId.Center,
+                        sourceHandle: PositionalNodeHandleId.Center,
+                        autoPositionedEdgeMarker: undefined,
+                      },
+                      sourceNode: {
+                        type: sourceType as NodeType,
+                        data: sourceData,
+                        href: edge.source.replace("#", ""),
+                        bounds: edge.data?.dmnShapeSource["dc:Bounds"],
+                        shapeId: edge.data?.dmnShapeSource["@_id"],
+                      },
+                      targetNode: {
+                        type: targetType as NodeType,
+                        href: edge.target.replace("#", ""),
+                        data: targetData,
+                        bounds: edge.data?.dmnShapeTarget["dc:Bounds"],
+                        index: nodesById.get(edge.target)?.data.index ?? 0,
+                        shapeId: edge.data?.dmnShapeTarget["@_id"],
+                      },
+                      keepWaypoints: false,
+                    });
+                  }
+                });
             });
           }
           console.debug(`DMN DIAGRAM: Adding DRG node`, JSON.stringify(drgElement));

packages/dmn-editor/src/mutations/addEdge.ts

@@ -27,7 +27,6 @@ import {
   DMN15__tInformationRequirement,
   DMN15__tKnowledgeRequirement,
   DMNDI15__DMNEdge,
-  DMNDI15__DMNShape,
 } from "@kie-tools/dmn-marshaller/dist/schemas/dmn-1_5/ts-gen/types";
 import { PositionalNodeHandleId } from "../diagram/connections/PositionalNodeHandles";
 import { EdgeType, NodeType } from "../diagram/connections/graphStructure";
@@ -195,20 +194,22 @@ export function addEdge({
 
 function doesInformationRequirementsPointTo(a: Normalized<DMN15__tInformationRequirement>, nodeId: string) {
   return (
-    a.requiredInput?.["@_href"] === `${nodeId}` || //
-    a.requiredDecision?.["@_href"] === `${nodeId}`
+    // use endsWith because @_href is sometimes prefixed with '#' and sometimes it is not
+    a.requiredInput?.["@_href"].endsWith(`${nodeId}`) || a.requiredDecision?.["@_href"].endsWith(`${nodeId}`)
   );
 }
 
 function doesKnowledgeRequirementsPointTo(a: Normalized<DMN15__tKnowledgeRequirement>, nodeId: string) {
-  return a.requiredKnowledge?.["@_href"] === `${nodeId}`;
+  // use endsWith because @_href is sometimes prefixed with '#' and sometimes it is not
+  return a.requiredKnowledge?.["@_href"].endsWith(`${nodeId}`);
 }
 
 function doesAuthorityRequirementsPointTo(a: Normalized<DMN15__tAuthorityRequirement>, nodeId: string) {
+  // use endsWith because @_href is sometimes prefixed with '#' and sometimes it is not
   return (
-    a.requiredInput?.["@_href"] === `${nodeId}` ||
-    a.requiredDecision?.["@_href"] === `${nodeId}` ||
-    a.requiredAuthority?.["@_href"] === `${nodeId}`
+    a.requiredInput?.["@_href"].endsWith(`${nodeId}`) ||
+    a.requiredDecision?.["@_href"].endsWith(`${nodeId}`) ||
+    a.requiredAuthority?.["@_href"].endsWith(`${nodeId}`)
   );
 }
 

packages/dmn-editor/src/mutations/addShape.ts

@@ -20,7 +20,6 @@
 import {
   DC__Point,
   DMN15__tDefinitions,
-  DMNDI15__DMNDecisionServiceDividerLine,
   DMNDI15__DMNShape,
 } from "@kie-tools/dmn-marshaller/dist/schemas/dmn-1_5/ts-gen/types";
 import { NodeType } from "../diagram/connections/graphStructure";

packages/dmn-editor/src/mutations/addStandaloneNode.ts

@@ -18,7 +18,7 @@
  */
 
 import { switchExpression } from "@kie-tools-core/switch-expression-ts";
-import { DmnBuiltInDataType, generateUuid } from "@kie-tools/boxed-expression-component/dist/api";
+import { generateUuid } from "@kie-tools/boxed-expression-component/dist/api";
 import { DC__Bounds, DMN15__tDefinitions } from "@kie-tools/dmn-marshaller/dist/schemas/dmn-1_5/ts-gen/types";
 import { NodeType } from "../diagram/connections/graphStructure";
 import { NODE_TYPES } from "../diagram/nodes/NodeTypes";