commit c616e17aff8f0962e0ef56daa1f777f6b08af110
author Thomas Vachuska <tom@opennetworking.org> Tue Apr 17 16:57:12 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Wed Apr 18 15:56:17 2018 +0000
tree 01ee705032b0b4407411bda3fa0b06b5cc67d18d
parent 39057874798f28353f7a09dfdf3de2b980feb418

Fixing GUI to respond to server-side layout changes.

Change-Id: Ida1052d6bec4a92d29774ede47942410db189732

web/gui/src/main/webapp/app/view/topo/topoForce.js

diff --git a/web/gui/src/main/webapp/app/view/topo/topoForce.js b/web/gui/src/main/webapp/app/view/topo/topoForce.js
index 6f77bed..b7cc07c 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoForce.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoForce.js
@@ -111,6 +111,13 @@
     // ==========================
     // === EVENT HANDLERS
 
+    function mergeNodeData(o, n) {
+        angular.extend(o, n);
+        if (!n.location) {
+            delete o.location;
+        }
+    }
+
     function addDevice(data) {
         var id = data.id,
             d;
@@ -138,15 +145,17 @@
 
         if (d) {
             wasOnline = d.online;
-            angular.extend(d, data);
+            mergeNodeData(d, data);
             if (tms.positionNode(d, true)) {
                 sendUpdateMeta(d);
             }
             updateNodes();
+            tick();
             if (wasOnline !== d.online) {
                 tms.findAttachedLinks(d.id).forEach(restyleLinkElement);
                 updateOfflineVisibility(d);
             }
+            fStart();
         }
     }
 
@@ -187,11 +196,13 @@
         var id = data.id,
             d = lu[id];
         if (d) {
-            angular.extend(d, data);
+            mergeNodeData(d, data);
             if (tms.positionNode(d, true)) {
                 sendUpdateMeta(d);
             }
             updateNodes();
+            tick();
+            fStart();
         }
     }
 
@@ -726,6 +737,7 @@
         // exiting node specifics:
         exiting.filter('.host').each(td3.hostExit);
         exiting.filter('.device').each(td3.deviceExit);
+        tick();
     }
 
     // ==========================