fix: recompute connections on datagraph when device is re-added (#109)

Depends on #98

Author: MegaRedHand

src/types/graphs/datagraph.ts

@@ -140,6 +140,9 @@ export class DataGraph {
       return;
     }
     this.devices.set(idDevice, deviceInfo);
+    deviceInfo.connections.forEach((connectedId) => {
+      this.devices.get(connectedId)?.connections.add(idDevice);
+    });
     if (this.idCounter <= idDevice) {
       this.idCounter = idDevice + 1;
     }

src/types/graphs/viewgraph.ts

@@ -36,44 +36,58 @@ export class ViewGraph {
     this.datagraph.getDevices().forEach((graphNode, deviceId) => {
       if (layerIncluded(layerFromType(graphNode.type), this.layer)) {
         const deviceInfo = { id: deviceId, node: graphNode };
-        this.addDevice(deviceInfo);
-
-        this.layer_dfs(
-          this.datagraph.getDevices(),
-          deviceId,
-          deviceId,
-          new Set([deviceId]),
-          connections,
-        );
+        this.createDevice(deviceInfo);
+
+        this.computeLayerConnections(deviceId, connections);
       }
     });
 
-    connections.forEach((key) => {
-      const connection = parseConnectionKey(key);
-      const device1 = this.getDevice(connection.id1);
-      const device2 = this.getDevice(connection.id2);
-      this.drawEdge(device1, device2);
-      device1.addConnection(device2.id);
-      device2.addConnection(device1.id);
-    });
+    this.addConnections(connections);
     console.log("Finished constructing ViewGraph");
   }
 
+  addDevice(deviceData: CreateDevice) {
+    const device = this.createDevice(deviceData);
+    if (deviceData.node.connections.size !== 0) {
+      const connections = new Set<string>();
+      this.computeLayerConnections(deviceData.id, connections);
+
+      this.addConnections(connections);
+    }
+    return device;
+  }
+
   // Add a device to the graph
-  addDevice(deviceData: CreateDevice): Device {
-    if (!this.devices.has(deviceData.id)) {
-      const device = createDevice(deviceData, this);
-      this.devices.set(device.id, device);
-      this.viewport.addChild(device);
-      console.log(`Device added with ID ${device.id}`);
-    } else {
+  private createDevice(deviceData: CreateDevice): Device {
+    if (this.devices.has(deviceData.id)) {
       console.warn(
         `Device with ID ${deviceData.id} already exists in the graph.`,
       );
+      return this.devices.get(deviceData.id);
     }
+    const device = createDevice(deviceData, this);
+
+    this.devices.set(device.id, device);
+    this.viewport.addChild(device);
+    console.log(`Device added with ID ${device.id}`);
     return this.devices.get(deviceData.id);
   }
 
+  private addConnections(connections: Set<string>) {
+    connections.forEach((key) => {
+      const connection = parseConnectionKey(key);
+      const device1 = this.getDevice(connection.id1);
+      const device2 = this.getDevice(connection.id2);
+      if (!(device1 && device2)) {
+        console.warn("At least one device in connection does not exist");
+        return;
+      }
+      this.drawEdge(device1, device2);
+      device1.addConnection(device2.id);
+      device2.addConnection(device1.id);
+    });
+  }
+
   drawEdge(device1: Device, device2: Device): Edge {
     const connectedNodes: EdgeEdges = { n1: device1.id, n2: device2.id };
     const id = Edge.generateConnectionKey(connectedNodes);
@@ -333,6 +347,16 @@ export class ViewGraph {
     return path.reverse();
   }
 
+  private computeLayerConnections(source: DeviceId, connections: Set<string>) {
+    this.layer_dfs(
+      this.datagraph.getDevices(),
+      source,
+      source,
+      new Set([source]),
+      connections,
+    );
+  }
+
   private layer_dfs(
     graph: Map<DeviceId, GraphNode>,
     s: DeviceId, // source node

src/types/undo-redo/moves/addRemoveDevice.ts

@@ -35,7 +35,6 @@ export abstract class AddRemoveDeviceMove implements Move {
 // "Move" is here because it conflicts with AddDevice from viewportManager
 export class AddDeviceMove extends AddRemoveDeviceMove {
   type = TypeMove.AddDevice;
-  data: CreateDevice;
 
   undo(viewgraph: ViewGraph): void {
     this.removeDevice(viewgraph);
@@ -49,7 +48,6 @@ export class AddDeviceMove extends AddRemoveDeviceMove {
 // Check if the viewgraph is the best place to load the move into the manager
 export class RemoveDeviceMove extends AddRemoveDeviceMove {
   type: TypeMove = TypeMove.RemoveDevice;
-  data: CreateDevice; // Data of the removed device
 
   undo(viewgraph: ViewGraph): void {
     this.addDevice(viewgraph);