From c989d809cbea3399c43087d156c02491f76a731b Mon Sep 17 00:00:00 2001
From: "Blake J. Harnden" <bharnden@users.noreply.github.com>
Date: Tue, 15 May 2018 16:40:41 -0700
Subject: [PATCH] web app updated node context to use async

---
 webapp/static/coreui.js     | 98 +++++++++++++++++--------------------
 webapp/templates/index.html |  5 +-
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/webapp/static/coreui.js b/webapp/static/coreui.js
index 896ee97a..09c99393 100644
--- a/webapp/static/coreui.js
+++ b/webapp/static/coreui.js
@@ -174,74 +174,64 @@ class NodeContext {
         this.nodeEditModal = nodeEditModal;
         this.servicesModal = servicesModal;
         this.$nodeContext = $('#node-context');
+        this.$nodeContext.click(this.onClick.bind(this));
         this.$linkRfButton = $('#node-linkrf-button');
         this.$deleteButton = $('#node-delete-button');
-        this.onClick();
     }
 
-    show(nodeId, x, y) {
+    async show(nodeId, x, y) {
         const node = this.coreNetwork.getCoreNode(nodeId);
         console.log('context node: ', node);
-        this.coreRest.isRunning()
-            .then(isRunning => {
-                if (isRunning) {
-                    this.$deleteButton.attr('disabled', 'disabled');
-                } else {
-                    this.$deleteButton.removeAttr('disabled');
-                }
+        if (await this.coreRest.isRunning()) {
+            this.$deleteButton.attr('disabled', 'disabled');
+        } else {
+            this.$deleteButton.removeAttr('disabled');
+        }
 
-                console.log('node type: ', node.type);
-                if (node.type === CoreNodeHelper.wlanNode) {
-                    this.$linkRfButton.removeClass('d-none');
-                } else {
-                    this.$linkRfButton.addClass('d-none');
-                }
+        console.log('node type: ', node.type);
+        if (node.type === CoreNodeHelper.wlanNode) {
+            this.$linkRfButton.removeClass('d-none');
+        } else {
+            this.$linkRfButton.addClass('d-none');
+        }
 
-                this.$nodeContext.data('node', nodeId);
-                this.$nodeContext.css({
-                    position: 'absolute',
-                    left: x,
-                    top: y
-                });
-                this.$nodeContext.removeClass('d-none');
-            })
-            .catch(function (err) {
-                console.log('error checking is session is running: ', err);
-            });
+        this.$nodeContext.data('node', nodeId);
+        this.$nodeContext.css({
+            position: 'absolute',
+            left: x,
+            top: y
+        });
+        this.$nodeContext.removeClass('d-none');
     }
 
     hide() {
         this.$nodeContext.addClass('d-none');
     }
 
-    onClick() {
-        const self = this;
-        this.$nodeContext.click(function (event) {
-            self.$nodeContext.addClass('d-none');
-            console.log('node context click: ', event);
-            const nodeId = self.$nodeContext.data('node');
-            const $target = $(event.target);
-            const option = $target.data('option');
-            console.log('node context: ', nodeId, option);
-            switch (option) {
-                case 'edit':
-                    self.nodeEditModal.show(nodeId);
-                    break;
-                case 'services':
-                    self.servicesModal.show(nodeId)
-                        .catch(function (err) {
-                            console.log('error showing services modal: ', err);
-                        });
-                    break;
-                case 'linkrf':
-                    console.log('linking all routers');
-                    self.coreNetwork.linkAllRouters(nodeId);
-                    break;
-                case 'delete':
-                    self.coreNetwork.deleteNode(nodeId);
-                    break;
-            }
-        });
+    async onClick(event) {
+        this.$nodeContext.addClass('d-none');
+        console.log('node context click: ', event);
+        const nodeId = this.$nodeContext.data('node');
+        const $target = $(event.target);
+        const option = $target.data('option');
+        console.log('node context: ', nodeId, option);
+        switch (option) {
+            case 'edit':
+                this.nodeEditModal.show(nodeId);
+                break;
+            case 'services':
+                await this.servicesModal.show(nodeId);
+                break;
+            case 'linkrf':
+                console.log('linking all routers');
+                this.coreNetwork.linkAllRouters(nodeId);
+                break;
+            case 'delete':
+                this.coreNetwork.deleteNode(nodeId);
+                break;
+        }
+
+        return false;
     }
 }
 
diff --git a/webapp/templates/index.html b/webapp/templates/index.html
index 26f3378e..fefd8bf9 100644
--- a/webapp/templates/index.html
+++ b/webapp/templates/index.html
@@ -245,7 +245,10 @@
 
         const nodeId = coreNetwork.network.getNodeAt(location);
         if (nodeId) {
-            nodeContext.show(nodeId, x, y);
+            nodeContext.show(nodeId, x, y)
+                    .catch(function(err) {
+                        console.log('error showing node context: ', err);
+                    });
         } else {
             const edgeId = coreNetwork.network.getEdgeAt(location);
             if (edgeId) {