simplified null checks

apache · Sep 18, 2024 · 1b7d807 · 1b7d807
1 parent b28961d
commit 1b7d807
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/packages/dmn-editor/src/diagram/Diagram.tsx b/packages/dmn-editor/src/diagram/Diagram.tsx
@@ -216,7 +216,7 @@ export const Diagram = React.forwardRef<DiagramRef, { container: React.RefObject
           const sourceBounds = sourceNode.data.shape["dc:Bounds"];
           const targetBounds = targetNode.data.shape["dc:Bounds"];
           if (!sourceBounds || !targetBounds) {
-            throw new Error("Cannot create connection without target bounds!");
+            throw new Error("Cannot create connection without source and target bounds!");
           }
 
           // --------- This is where we draw the line between the diagram and the model.

diff --git a/packages/dmn-editor/src/diagram/edges/usePotentialWaypointControls.ts b/packages/dmn-editor/src/diagram/edges/usePotentialWaypointControls.ts
@@ -93,15 +93,9 @@ export function usePotentialWaypointControls(
       dmnEditorStoreApi.setState((state) => {
         const nodesById = state.computed(state).getDiagramData(externalModelsByNamespace).nodesById;
         const edge = state.computed(state).getDiagramData(externalModelsByNamespace).edgesById.get(edgeId);
-        if (
-          edge === undefined ||
-          edge.type === undefined ||
-          edge.data === undefined ||
-          edge.data?.dmnShapeSource === undefined ||
-          edge.data?.dmnShapeTarget == undefined
-        ) {
+        if (edge === undefined || edge.data?.dmnShapeSource === undefined || edge.data?.dmnShapeTarget == undefined) {
           console.debug(
-            `DMN MUTATION: We can not add DMNEdge for '${edgeId}' edge into diagram. There are missing data edge: ${edge}, edge.type: ${edge?.type}, edge.data: ${edge?.data}`
+            `DMN MUTATION: We can not add DMNEdge for '${edgeId}' edge into diagram. There are missing data edge: ${edge}, edge.data: ${edge?.data}`
           );
           return;
         }
@@ -115,19 +109,12 @@ export function usePotentialWaypointControls(
           return;
         }
 
-        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;
+        const sourceNode = nodesById.get(edge.source);
+        const targetNode = nodesById.get(edge.target);
 
-        if (
-          sourceData === undefined ||
-          sourceType === undefined ||
-          targetData === undefined ||
-          targetType === undefined
-        ) {
+        if (sourceNode === undefined || targetNode === undefined) {
           console.debug(
-            `DMN MUTATION: We can not add DMNEdge for '${edgeId}' edge into diagram. There are missing data sourceData: ${sourceData}, sourceType: ${sourceType}, targetData: ${targetData}, targetType: ${targetType}`
+            `DMN MUTATION: We can not add DMNEdge for '${edgeId}' edge into diagram. There are missing data sourceNode: ${sourceNode}, targetNode: ${targetNode}`
           );
           return;
         }
@@ -144,22 +131,24 @@ export function usePotentialWaypointControls(
             autoPositionedEdgeMarker: undefined,
           },
           sourceNode: {
-            type: sourceType as NodeType,
-            data: sourceData,
+            type: sourceNode.type as NodeType,
+            data: sourceNode.data,
             href: edge.source,
             bounds: edgeSourceBounds,
             shapeId: edge.data?.dmnShapeSource["@_id"],
           },
           targetNode: {
-            type: targetType as NodeType,
+            type: targetNode.type as NodeType,
             href: edge.target,
-            data: targetData,
+            data: targetNode.data,
             bounds: edgeTargetBounds,
             index: nodesById.get(edge.target)?.data.index ?? 0,
             shapeId: edge.data?.dmnShapeTarget["@_id"],
           },
           keepWaypoints: false,
-          extraArg: { requirementEdgeTargetingExternalNodeId: targetData.dmnObjectQName.prefix ? edgeId : undefined },
+          extraArg: {
+            requirementEdgeTargetingExternalNodeId: targetNode.data.dmnObjectQName.prefix ? edgeId : undefined,
+          },
         });
 
         console.debug(`DMN MUTATION: DMNEdge for '${edgeId}' edge was added into diagram.`);