remove extraArg

apache · Sep 19, 2024 · 63c9187 · 63c9187
1 parent cb56865
commit 63c9187
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/packages/dmn-editor/src/diagram/connections/isValidConnection.ts b/packages/dmn-editor/src/diagram/connections/isValidConnection.ts
@@ -50,8 +50,8 @@ export function _checkIsValidConnection(
 
   // External nodes cannot be targeted by default
   // However there are exceptions, for example adding a waypoint on the edge
-  const isExternalNode = targetNode.data.dmnObjectQName.prefix != undefined;
-  if (!extraArg?.allowExternalTarget && isExternalNode) {
+  const isTargetExternalNode = targetNode.data.dmnObjectQName.prefix != undefined;
+  if (!extraArg?.allowExternalTarget && isTargetExternalNode) {
     return false;
   }
 

diff --git a/packages/dmn-editor/src/diagram/edges/usePotentialWaypointControls.ts b/packages/dmn-editor/src/diagram/edges/usePotentialWaypointControls.ts
@@ -119,7 +119,7 @@ export function usePotentialWaypointControls(
           return;
         }
 
-        const isExternalNode = targetNode.data.dmnObjectQName.prefix !== undefined;
+        const isTargetExternalNode = targetNode.data.dmnObjectQName.prefix !== undefined;
 
         addEdge({
           definitions: state.dmn.model.definitions,
@@ -148,9 +148,7 @@ export function usePotentialWaypointControls(
             shapeId: edge.data?.dmnShapeTarget["@_id"],
           },
           keepWaypoints: false,
-          extraArg: {
-            requirementEdgeTargetingExternalNodeId: isExternalNode ? edgeId : undefined,
-          },
+          requirementEdgeTargetingExternalNodeId: isTargetExternalNode ? edgeId : undefined,
         });
 
         console.debug(`DMN MUTATION: DMNEdge for '${edgeId}' edge was added into diagram.`);

diff --git a/packages/dmn-editor/src/mutations/addEdge.ts b/packages/dmn-editor/src/mutations/addEdge.ts
@@ -48,7 +48,7 @@ export function addEdge({
   targetNode,
   edge,
   keepWaypoints,
-  extraArg,
+  requirementEdgeTargetingExternalNodeId,
 }: {
   definitions: Normalized<DMN15__tDefinitions>;
   drdIndex: number;
@@ -74,20 +74,16 @@ export function addEdge({
     autoPositionedEdgeMarker: AutoPositionedEdgeMarker | undefined;
   };
   keepWaypoints: boolean;
-  extraArg?: {
-    requirementEdgeTargetingExternalNodeId: string | undefined;
-  };
+  requirementEdgeTargetingExternalNodeId?: string;
 }) {
-  const externalTargetAllowed = extraArg !== undefined && extraArg.requirementEdgeTargetingExternalNodeId !== undefined;
+  const externalTargetAllowed = requirementEdgeTargetingExternalNodeId !== undefined;
   if (!_checkIsValidConnection(sourceNode, targetNode, edge.type, { allowExternalTarget: externalTargetAllowed })) {
     throw new Error(`DMN MUTATION: Invalid structure: (${sourceNode.type}) --${edge.type}--> (${targetNode.type}) `);
   }
 
   const newEdgeId = generateUuid();
 
-  let existingEdgeId: string | undefined = externalTargetAllowed
-    ? extraArg!.requirementEdgeTargetingExternalNodeId
-    : undefined;
+  let existingEdgeId: string | undefined = requirementEdgeTargetingExternalNodeId;
 
   // Associations
   if (edge.type === EDGE_TYPES.association) {