Merge pull request #45 from rddill-IBM/events

Events
rddill-IBM · Oct 16, 2018 · 60dbb1d · 60dbb1d
2 parents 585dd98 + dc75870
commit 60dbb1d
Show file tree

Hide file tree

Showing 190 changed files with 8,646 additions and 4,998 deletions.
diff --git a/Chapter04/favicon.ico b/Chapter04/favicon.ico
diff --git a/Chapter05/Documentation/answers/composer/hlcAdmin_complete.js b/Chapter05/Documentation/answers/composer/hlcAdmin_complete.js
@@ -24,8 +24,7 @@ const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefi
 const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
 const config = require('../../../env.json');
 const NS = 'org.acme.Z2BTestNetwork';
-// const svc = require('./Z2B_Services');
-// const mod = 'hlcAdmin.js';
+
 
 /**
  * display the admin and network info

diff --git a/Chapter05/Documentation/answers/js/z2b-admin_complete.js b/Chapter05/Documentation/answers/js/z2b-admin_complete.js
@@ -18,7 +18,6 @@
 
 let creds;
 let connection;
-let msgPort = null;
 let _blctr = 0;
 
 /**
@@ -34,19 +33,6 @@ function loadAdminUX ()
         listMemRegistries();
     });
 }
-/**
- * connect to the provided web socket
- * @param {String} _target - location to post messages
- * @param {Integer} _port - web socket port #
- */
-function wsDisplay(_target, _port)
-{
-    let content = $('#'+_target);
-    let wsSocket = new WebSocket('ws://localhost:'+_port);
-    wsSocket.onopen = function () {wsSocket.send('connected to client');};
-    wsSocket.onmessage = function (message) {content.append(formatMessage(message.data));};
-    wsSocket.onerror = function (error) {console.log('WebSocket error on wsSocket: ' + error);};
-}
 /**
  * list the available business networks
  */
@@ -361,7 +347,7 @@ function preLoad()
     $('#body').empty();
     let options = {};
     $.when($.post('/setup/autoLoad', options)).done(function (_results)
-    { msgPort = _results.port; wsDisplay('body', msgPort); });
+    { console.log('Autoload Initiated'); $('#body').append('<h2>Autoload Initiated</h2>'); });
 }
 
 /**
@@ -754,28 +740,9 @@ function getHistorian()
  */
 function getChainEvents()
 {
-    $.when($.get('fabric/getChainEvents')).done(function(_res)
-    { let _str = '<h2> Get Chain events requested. Sending to port: '+_res.port+'</h2>';
-        let content = $('#blockchain');
-        let csSocket = new WebSocket('ws://localhost:'+_res.port);
-        csSocket.onopen = function () {csSocket.send('connected to client');};
-        csSocket.onmessage = function (message) {
-            _blctr ++;
-            if (message.data !== 'connected')
-            {$(content).append('<span class="block">block '+JSON.parse(message.data).header.number+'<br/>Hash: '+JSON.parse(message.data).header.data_hash+'</span>');
-                if (_blctr > 4) {let leftPos = $(content).scrollLeft(); $(content).animate({scrollLeft: leftPos + 300}, 250);}
-            }
-        };
-        csSocket.onerror = function (error) {console.log('WebSocket error: ' + error);};
-        $('#admin-forms').empty();
-        $('#admin-forms').append(_str);
+    $.when($.get('/fabric/getChainEvents')).done(function(_res)
+    { $('#body').append('<h2> Get Chain events requested. </h2>');
+        let _host = (host_address.slice(0,9) === 'localhost') ? 'localhost' : host_address;
+        console.log('getChainEvents host_address: '+_host);
     });
-}
-/**
- * display blockchain updates
- */
-function displayAdminUpdate()
-{
-    let toLoad = 'adminHelp.html';
-    $.when($.get(toLoad)).done(function(_page){$('#admin-forms').empty(); $('#admin-forms').append(_page);});
 }
diff --git a/Chapter05/HTML/favicon.ico b/Chapter05/HTML/favicon.ico
diff --git a/Chapter05/HTML/js/z2b-admin.js b/Chapter05/HTML/js/z2b-admin.js
@@ -18,7 +18,6 @@
 
 let creds;
 let connection;
-let msgPort = null;
 let _blctr = 0;
 
 /**
@@ -34,19 +33,6 @@ function loadAdminUX ()
         listMemRegistries();
     });
 }
-/**
- * connect to the provided web socket
- * @param {String} _target - location to post messages
- * @param {Integer} _port - web socket port #
- */
-function wsDisplay(_target, _port)
-{
-    let content = $('#'+_target);
-    let wsSocket = new WebSocket('ws://localhost:'+_port);
-    wsSocket.onopen = function () {wsSocket.send('connected to client');};
-    wsSocket.onmessage = function (message) {content.append(formatMessage(message.data));};
-    wsSocket.onerror = function (error) {console.log('WebSocket error on wsSocket: ' + error);};
-}
 /**
  * list the available business networks
  */
@@ -339,7 +325,7 @@ function preLoad()
     $('#body').empty();
     let options = {};
     $.when($.post('/setup/autoLoad', options)).done(function (_results)
-    { msgPort = _results.port; wsDisplay('body', msgPort); });
+    { console.log('Autoload Initiated'); $('#body').append('<h2>Autoload Initiated</h2>'); });
 }
 
 /**
@@ -732,21 +718,10 @@ function getHistorian()
  */
 function getChainEvents()
 {
-    $.when($.get('fabric/getChainEvents')).done(function(_res)
-    { let _str = '<h2> Get Chain events requested. Sending to port: '+_res.port+'</h2>';
-        let content = $('#blockchain');
-        let csSocket = new WebSocket('ws://localhost:'+_res.port);
-        csSocket.onopen = function () {csSocket.send('connected to client');};
-        csSocket.onmessage = function (message) {
-            _blctr ++;
-            if (message.data !== 'connected')
-            {$(content).append('<span class="block">block '+JSON.parse(message.data).header.number+'<br/>Hash: '+JSON.parse(message.data).header.data_hash+'</span>');
-                if (_blctr > 4) {let leftPos = $(content).scrollLeft(); $(content).animate({scrollLeft: leftPos + 300}, 250);}
-            }
-        };
-        csSocket.onerror = function (error) {console.log('WebSocket error: ' + error);};
-        $('#admin-forms').empty();
-        $('#admin-forms').append(_str);
+    $.when($.get('/fabric/getChainEvents')).done(function(_res)
+    { $('#body').append('<h2> Get Chain events requested. </h2>');
+        let _host = (host_address.slice(0,9) === 'localhost') ? 'localhost' : host_address;
+        console.log('getChainEvents host_address: '+_host);
     });
 }
 /**