diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js b/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
index a760b9d82..88579fd41 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
@@ -1,2 +1,2 @@
 "bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging().feature("resources").feature("views"),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),System.register("resources/converters/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),System.register("resources/converters/count-value-converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("CountValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a<0?"10 patients or fewer":a+" +-10 patients"},a}()),a("CountValueConverter",d)}}}),System.register("resources/converters/datetime.value.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateTimeValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY h:mm:ss a")},a}()),a("DateTimeValueConverter",e)}}}),System.register("resources/converters/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("resources/converters/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?"":a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}}),System.register("resources/converters/truncate.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("TruncateValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=20;return a.length>b?a.substring(0,b)+"...":a},a}()),a("TruncateValueConverter",d)}}}),function(){var a=System.amdDefine;a("resources/custom/breakdown/breakdown.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px"><br><font>${data.resultType.i2b2Options.description}:</font></div><div style="clear: both; margin-left: 40px; float: left; height: 16px; line-height: 16px"></div><div repeat.for="result of data.results" style="clear: both; margin-left: 40px; float: left; height: 16px; line-height: 16px">${result.dataKey}: <font color="#0000dd">${result.value | count}</font></div></template>'})}(),System.register("resources/custom/breakdown/breakdown.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable,g=a.customElement}],execute:function(){a("Breakdown",(h=g("breakdown"),l=h((j=function b(){d(this,b),c(this,"data",k,this)},k=e(j.prototype,"data",[f],{enumerable:!0,initializer:null}),i=j))||i)),a("Breakdown",l)}}}),function(){var a=System.amdDefine;a("resources/custom/node-result/error.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span><b><a class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)"><b><span color="#ff0000">${result.statusMessage}</span></b></a></b></span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/node-result.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear:both"><br><div style="float:left; font-weight:bold; margin-left:20px">${result.adapterNode} "${queryName}"</div></div><compose view.bind="component"></compose></template>'})}(),System.register("resources/custom/node-result/node-result.js",["aurelia-framework","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p;return{setters:[function(a){h=a.customElement,i=a.bindable},function(a){j=a.PubSub}],execute:function(){a("NodeResult",(k=h("node-result"),p=k((m=function(a){function b(){d(this,b);for(var f=arguments.length,g=Array(f),h=0;h<f;h++)g[h]=arguments[h];var i=e(this,a.call.apply(a,[this].concat(g)));return c(i,"result",n,i),c(i,"queryName",o,i),i}return f(b,a),b.prototype.attached=function(){var a=this.result.status;this.component="./submitted.html","ERROR"===a?this.component="./error.html":"COMPLETED,FINISHED".includes(a)?this.component="./patient-count.html":"PROCESSING,INCOMPLETE,COMPLETE".includes(a)?this.component="./status.html":a.toLowerCase().includes("queue")&&(this.component="./queued.html")},b}(j),n=g(m.prototype,"result",[i],{enumerable:!0,initializer:null}),o=g(m.prototype,"queryName",[i],{enumerable:!0,initializer:null}),l=m))||l)),a("NodeResult",p)}}}),function(){var a=System.amdDefine;a("resources/custom/node-result/patient-count.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px">Patient Count: <font color="#0000dd">- ${result.count | count}</font></div><breakdown repeat.for="breakdown of result.breakdowns" data.one-way="breakdown"></breakdown></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/queued.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span style="color: #000">QUEUED</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span style="color: #000">${result.status}</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/submitted.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;-<span style="color: #00dd00">SUBMITTED</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-status/node-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="display: flex"><div style="flex:1">${result.adapterNode}</div><div style="flex: 1"><span if.one-way="\'STATUS,FINISHED,PROCESSING,INCOMPLETE,COMPLETE\'.includes(result.status)" style="display: inline-block; color: #0000dd"><span style="color: black">${result.status}</span> </span><span if.one-way="result.status.toLowerCase().includes(\'queue\')"><span style="color: black">QUEUED</span> </span><span><a if.one-way="result.status === \'ERROR\'" class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)">ERROR </a></span><span if.one-way="result.status.toLowerCase().includes(\'submit\')"><span style="color: green">SUBMITTED</span></span></div><div style="flex:1"><span if.one-way="\'STATUS,FINISHED\'.includes(result.status)" style="display: inline-block; color: #0000dd">Patient Count:&nbsp;${result.count | count}</span></div></div></template>'})}(),System.register("resources/custom/node-status/node-status.js",["aurelia-framework","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o;return{setters:[function(a){h=a.customElement,i=a.bindable},function(a){j=a.PubSub}],execute:function(){a("NodeStatus",(k=h("node-status"),o=k((m=function(a){function b(){d(this,b);for(var f=arguments.length,g=Array(f),h=0;h<f;h++)g[h]=arguments[h];var i=e(this,a.call.apply(a,[this].concat(g)));return c(i,"result",n,i),i}return f(b,a),b}(j),n=g(m.prototype,"result",[i],{enumerable:!0,initializer:null}),l=m))||l)),a("NodeStatus",o)}}}),function(){var a=System.amdDefine;a("resources/custom/node-status/temp.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<div style="display: flex"><div style="flex:1">${result.adapterNode}</div><div style="flex: 1"><span if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" style="display: inline-block; color: #0000dd">&nbsp; <span style="color: black">${result.statusMessage}</span> </span><span>&nbsp; <a if.one-way="result.statusMessage === \'ERROR\'" class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)">ERROR: ${result.statusDescription} </a></span><span if.one-way="[\'ERROR\',\'COMPLETED\',\'FINISHED\'].indexOf(result.statusMessage) === -1">&nbsp; <span style="color: #00dd00">${result.statusMessage}</span></span></div><div style="flex:1"><span if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" style="display: inline-block; color: #0000dd">&nbsp; ${result.count | count}</span></div></div><patient-count if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" result.one-way="result"><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px">Patient Count: <font color="#0000dd">- ${result.count | count}</font></div></patient-count><error if.one-way="result.statusMessage === \'ERROR\'" result.one-way="result">&nbsp;- <span title="${result.statusDescription}"><b><a class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)"><b><span color="#ff0000">ERROR: ${result.statusDescription}</span></b></a></b></span></error><span if.one-way="[\'ERROR\',\'COMPLETED\',\'FINISHED\'].indexOf(result.statusMessage) === -1">&nbsp;- <span style="color: #00dd00">${result.statusMessage}</span></span>'})}(),System.register("resources/index.js",[],function(a,b){"use strict";function c(a){var b="converters",c=["box-style.converter","count-value-converter","datetime.value.converter","result-style.converter","result-value.converter","truncate.converter"];a.globalResources.apply(a,c.map(function(a){return"./"+b+"/"+a}));var d="custom",e=["breakdown/breakdown","node-result/node-result","node-status/node-status"];a.globalResources.apply(a,e.map(function(a){return"./"+d+"/"+a}))}return a("configure",c),{setters:[],execute:function(){}}}),System.register("services/queries.model.js",["aurelia-event-aggregator","repository/qep.repository","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QEPRepository},function(a){f=a.notifications}],execute:function(){a("QueriesModel",(h=g=function b(a,d,e){var f=this;c(this,b);var g=d,h=40,i=0,j=0,k=null;b.prototype.load=function(){return g.fetchPreviousQueries(f.maxQueriesPerFetch()+f.loadedCount()).then(function(a){return j=a.rowCount,i=a.queryResults.length,a})["catch"](function(a){return console.log(a)}).then(l).then(function(b){k=b,a.publish(e.shrine.queriesReceived,k)})},b.prototype.totalQueries=function(){return j},b.prototype.loadedCount=function(){return i},b.prototype.maxQueriesPerFetch=function(){return h},b.prototype.moreToLoad=function(){return i<j},b.prototype.hasData=function(){return null!==k&&void 0!==k};var l=function(a){arguments.length>1&&void 0!==arguments[1]?arguments[1]:6;return new Promise(function(b,c){for(var d=[],e=6,f=a.adapters,g=f.length,h=a.queryResults,i=0;i<g;i+=e){var j=m(f,i,e),k=f.slice(i,j),l=n(k,h);d.push({nodes:k,results:l})}b(d)})},m=function(a,b,c){var d=b+c;return d<a.length?d:a.length},n=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,date:b.query.dateCreated,flagged:b.query.flagged===!0,flagMessage:b.query.flagMessage||null,nodeResults:[],status:b.adaptersToResults.reduce(function(a,c){var d="FINISHED"===c.status?a.finished+1:a.finished,e="ERROR"===c.status?a.error+1:a.error;return{error:e,finished:d,total:b.adaptersToResults.length}},{error:0,finished:0,total:b.adaptersToResults.length})};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c}},g.inject=[d,e,f],i=h)),a("QueriesModel",i)}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><query-status></query-status></template>"})}(),System.register("services/container.js",["ramda"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f;return{setters:[function(a){d=a}],execute:function(){e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Container",f=function(){function a(b){c(this,a),this.__value=b}return a.of=function(b){return new a(function(){return b})},a.prototype.map=function(b){return this.hasNothing()?a.of(null):a.of(b(this.value))},a.prototype.join=function(){return this.hasNothing()?a.of(null):this.value},a.prototype.chain=function(a){return this.map(a).join()},a.prototype.hasNothing=function(){return null===this.value||void 0===this.value},a.prototype.ap=function(a){a.map(this.value)},e(a,[{key:"value",get:function(){return this.__value()}}]),a}()),a("Container",f)}}}),System.register("services/i2b2.service.js",["ramda","./container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("I2B2Service",(g=f=function b(a){c(this,b);var f=a?e.of(a):e.of(null),g=d.curry(function(a,b){return b.value?e.of(d.prop(a,b.value)):e.of(null)}),h=d.compose(g("i2b2"),g("window"),g("parent")),i=d.compose(g("CRC"),h),j=d.compose(g("events"),h),k=d.compose(g("SHRINE"),h);b.prototype.onResize=function(a){return j(f).map(function(b){return b.changedZoomWindows.subscribe(a)})},b.prototype.onHistory=function(a){return i(f).map(function(b){return b.ctrlr.history.events.onDataUpdate.subscribe(a)})},b.prototype.onQuery=function(a){return j(f).map(function(b){return b.afterQueryInit.subscribe(a)})},b.prototype.onNetworkId=function(a){return j(f).map(function(b){return b.networkIdReceived.subscribe(a)})},b.prototype.onViewSelected=function(a){return g("addEventListener",f).value?e.of(f.value.addEventListener("message",a,!1)):e.of(null)},b.prototype.onExport=function(a){return j(f).map(function(b){return b.exportQueryResult.subscribe(a)})},b.prototype.onClearQuery=function(a){return j(f).map(function(b){return b.clearQuery.subscribe(a)})},b.prototype.loadHistory=function(){return i(f).map(function(a){return a.view.history.doRefreshAll()})},b.prototype.loadQuery=function(a){return i(f).map(function(b){return b.ctrlr.QT.doQueryLoad(a)})},b.prototype.errorDetail=function(a){return k(f).map(function(b){b.plugin.errorDetail(a)})},b.prototype.renameQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.queryRename(a,!1)})},b.prototype.flagQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.Flag({queryId:a,message:""})})},b.prototype.unflagQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.Unflag({queryId:a})})},b.prototype.publishQueryUnavailable=function(){return j(f).map(function(a){return a.queryResultUnavailable.fire()})},b.prototype.publishQueryAvailable=function(){return j(f).map(function(a){return a.queryResultAvailable.fire()})}},f.inject=[window],h=g)),a("I2B2Service",h)}}}),System.register("services/i2b2.pub-sub.js",["./pub-sub","./i2b2.service"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function d(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function e(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var f,g,h,i,j;return{setters:[function(a){f=a.PubSub},function(a){g=a.I2B2Service}],execute:function(){a("I2B2PubSub",(i=h=function(a){function b(e){c(this,b);for(var f=arguments.length,g=Array(f>1?f-1:0),h=1;h<f;h++)g[h-1]=arguments[h];var i=d(this,a.call.apply(a,[this].concat(g)));return i.listen=function(){e.onResize(function(a,b){return b.find(function(a){return"ADD"===a.action})?function(){return i.publish(i.notifications.i2b2.tabMax)}:function(){return i.publish(i.notifications.i2b2.tabMin)}}),e.onHistory(function(){return i.publish(i.notifications.i2b2.historyRefreshed)}),e.onQuery(function(a,b){return i.publish(i.notifications.i2b2.queryStarted,b[0].name)}),e.onNetworkId(function(a,b){return i.publish(i.notifications.i2b2.networkIdReceived,b[0])}),e.onViewSelected(function(a){return i.publish(i.notifications.i2b2.viewSelected,a.data)}),e.onExport(function(){return i.publish(i.notifications.i2b2.exportQuery)}),e.onClearQuery(function(){return i.publish(i.notifications.i2b2.clearQuery)}),i.subscribe(i.commands.i2b2.cloneQuery,function(a){return e.loadQuery(a)}),i.subscribe(i.commands.i2b2.showError,function(a){e.errorDetail(a)}),i.subscribe(i.commands.i2b2.renameQuery,function(a){return e.renameQuery(a)}),i.subscribe(i.commands.i2b2.flagQuery,function(a){return e.flagQuery(a)}),i.subscribe(i.commands.i2b2.unflagQuery,function(a){return e.unflagQuery(a)}),i.subscribe(i.notifications.shrine.queryUnavailable,function(){return e.publishQueryUnavailable()}),i.subscribe(i.notifications.shrine.queryAvailable,function(){return e.publishQueryAvailable()})},i}return e(b,a),b}(f),h.inject=[g],j=i)),a("I2B2PubSub",j)}}}),System.register("services/query-export.js",["./pub-sub"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function d(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function e(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var f,g,h;return{setters:[function(a){f=a.PubSub}],execute:function(){a("QueryExport",g=function(a){function b(){c(this,b);for(var e=arguments.length,f=Array(e),g=0;g<e;g++)f[g]=arguments[g];return d(this,a.call.apply(a,[this].concat(f)))}return e(b,a),b.prototype.listen=function(){this.subscribe(this.commands.shrine.exportResult,h)},b}(f)),a("QueryExport",g),h=function(a){var b=a.nodes.sort(),c=new Map,d=function(a){var b=a.resultType.i2b2Options.description;return b},e=function(a,b){return d(a)<=d(b)?-1:1};b.forEach(function(a){var b=a.breakdowns,d=void 0===b?[]:b;d.sort(e).forEach(function(a){var b,d=a.resultType.i2b2Options.description,e=a.results;return c.has(d)?(b=c.get(d)).add.apply(b,e.map(function(a){return a.dataKey}).sort()):c.set(d,new Set(e.map(function(a){return a.dataKey}).sort()))})});var f="data:text/csv;charset=utf-8,SHRINE QUERY RESULTS (OBFUSCATED PATIENT COUNTS),"+[""].concat(b.map(function(a){return a.adapterNode}).join(",")),g="\nAll Patients,"+[""].concat(b.map(function(a){return a.count?a.count>0?a.count:0:"unavailable"}).join(",")),h=[];c.forEach(function(a,c){h.push.apply(h,[""].concat(Array.from(a).map(function(a){var d=c.split(" ").shift()+","+a,e=b.map(function(b){var d=b.breakdowns,e=void 0===d?[]:d,f=e.find(function(a){var b=a.resultType.i2b2Options.description;a.results;return b===c}),g=f?f.results.find(function(b){return b.dataKey===a}):void 0;return g?g.value>0?g.value:0:"unavailable"});return d+","+e.join(",")})))});var i=encodeURI(""+f+g+h.join("\n")),j=document.createElement("a");j.setAttribute("href",i),j.setAttribute("download","export.csv"),document.body.appendChild(j),j.click(),document.body.removeChild(j)}}}}),System.register("shell.js",["services/i2b2.pub-sub","services/query-export"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.I2B2PubSub},function(a){e=a.QueryExport}],execute:function(){a("Shell",(g=f=function b(a,d){c(this,b),a.listen(),d.listen()},f.inject=[d,e],h=g)),a("Shell",h)}}}),System.register("views/index.js",[],function(a,b){"use strict";function c(a){var b=["views/query-status/query-status"];a.globalResources.apply(a,b)}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[function(a){d=a.QEPRepository}],execute:function(){a("MailToService",(f=e=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}(),e.inject=[d],g=f)),a("MailToService",g)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n        \n\n***Never send patient information, passwords, or other sensitive information by email****\n        \nName:\n        \nTitle:\n        \nUser name (to log into SHRINE):\n        \nTelephone Number (optional):\n        \nPreferred email address (optional):\n        \n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.MailToService},function(a){e=a.MailConfig}],execute:function(){a("MailTo",(g=f=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){window.top.location="mailto:"+b+"?subject="+a.config.subject+"&body="+a.config.body})},a}(),f.inject=[d,e],h=g)),a("MailTo",h)}}}),function(){var a=System.amdDefine;a("views/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="height: 100%; overflow: auto" class="query-status"><div style="display: flex" if.one-way="status.query.queryName"><div style="flex:1">Status of Query ${status.query.queryName | truncate} <span if.one-way="nodes.length"><br>at Each Institution:</span></div><div style="flex:1" if.one-way="nodes.length">Last Updated on: ${status.updated | dateTime}</div><div style="flex:1" if.one-way="!nodes.length">Waiting on response from network...</div></div><br><node-status repeat.for="node of nodes" result.one-way="node"></node-status><span if.one-way="nodes.length"><br><span>Completed query counts and breakdowns are shown below:</span><br></span><node-result repeat.for="node of nodes" result.one-way="node" query-name.one-way="status.query.queryName"></node-result></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.HttpClient},function(a){}],execute:function(){e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=f=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return this.http.fetch("qep/queryResults?limit="+a+"&skip="+b,{method:"get"}).then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchNetworkId=function(a){return this.http.fetch("qep/networkId?queryName='"+a+"'",{method:"get"}).then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchQuery=function(a,b,c){return this.http.fetch("qep/queryResult/"+a+"?timeoutSeconds="+b+"&afterVersion="+c,{method:"get"}).then(function(a){var b=a.url,c=a.statusText,d=a.status,e=a.ok;return console.log("fetchQuery: "+b+" - "+e+" - "+d+" - "+c),a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail",{method:"get"}).then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},e(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}(),f.inject=[d],h=g)),a("QEPRepository",h)}}}),System.register("services/query-status.model.js",["aurelia-event-aggregator","repository/qep.repository","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QEPRepository},function(a){f=a.commands,g=a.notifications}],execute:function(){h=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatusModel",(j=i=function b(a,d,e){c(this,b);var g=function(b){return a.publish(e.shrine.queryReceived,b)},i=function(a){return new Promise(function(b,c){var d=a.results,e=a.dataVersion,f=a.query,g=function(a,b){return a.adapterNode.toUpperCase()<=b.adapterNode.toUpperCase()?-1:1},i=0===d.length?[]:[].concat(d.sort(g)),j=a.isComplete,k=h({},f,{complete:j});b({query:k,nodes:i,dataVersion:e})})},j=function(a){d.fetchQuery(a.networkId,a.timeoutSeconds,a.dataVersion).then(function(a){return i(a)})["catch"](function(a){return console.log("ERROR: "+a)}).then(function(a){return g(a)})},k=function(){a.subscribe(f.shrine.fetchQuery,j)};k()},i.inject=[d,e,g],k=j)),a("QueryStatusModel",k)}}}),System.register("services/shrine.messages.js",[],function(a,b){"use strict";var c,d;return{setters:[],execute:function(){a("notifications",c={i2b2:{tabMax:"notification.from.i2b2.tab.max",tabMin:"notification.from.i2b2.tab.min",viewSelected:"notification.from.i2b2.tab.selected",historyRefreshed:"notification.from.i2b2.history.refreshed",queryStarted:"notification.from.i2b2.query.started",messageReceived:"notification.from.i2b2.message.received",networkIdReceived:"notification.from.i2b2.networkId.receieved",exportQuery:"notification.from.i2b2.export.query",clearQuery:"notification.from.i2b2.clear.query"
-},shrine:{queriesReceived:"notification.from.shrine.queries.received",queryReceived:"notification.from.shrine.query.recieved",queryUnavailable:"notification.from.shrine.query.unavailable",queryAvailable:"notification.from.shrine.query.available"}}),a("notifications",c),a("commands",d={i2b2:{cloneQuery:"command.to.i2b2.clone.query",showError:"command.to.i2b2.show.error",flagQuery:"command.to.i2b2.flag.query",unflagQuery:"command.to.i2b2.unflag.query",renameQuery:"command.to.i2b2.rename.query"},shrine:{fetchQuery:"command.to.shrine.fetch.query",exportResult:"command.to.shrine.export.result"}}),a("commands",d)}}}),System.register("services/pub-sub.js",["aurelia-event-aggregator","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.commands,f=a.notifications}],execute:function(){a("PubSub",(h=g=function b(a,d,e){c(this,b),this.commands=d,this.notifications=e,this.publish=function(b,c){return a.publish(b,c)},this.subscribe=function(b,c){return a.subscribe(b,c)}},g.inject=[d,e,f],i=h)),a("PubSub",i)}}}),System.register("views/query-status/query-status.js",["aurelia-framework","services/query-status.model","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w;return{setters:[function(a){h=a.customElement,i=a.observable},function(a){j=a.QueryStatusModel},function(a){k=a.PubSub}],execute:function(){l=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatus",(m=h("query-status"),s=m((r=q=function(a){function b(f){d(this,b);for(var g=arguments.length,h=Array(g>1?g-1:0),i=1;i<g;i++)h[i-1]=arguments[i];var j=e(this,a.call.apply(a,[this].concat(h)));return c(j,"nodes",p,j),v.set(j,{isDevEnv:document.location.href.includes("http://localhost:8000/"),exportAvailable:!1}),j}return f(b,a),b.prototype.nodesChanged=function(a,b){return a&&a.length?(v.get(this).exportAvailable=!0,void this.publish(this.notifications.shrine.queryAvailable)):(v.get(this).exportAvailable=!1,void this.publish(this.notifications.shrine.queryUnavailable))},b.prototype.attached=function(){var a=this;this.subscribe(this.notifications.i2b2.queryStarted,function(b){a.status=w().status,a.nodes=w().nodes,a.status.query.queryName=b}),this.subscribe(this.notifications.i2b2.networkIdReceived,function(b){if(!a.status||!a.status.canceled){var c=b.networkId;a.status.query.networkId=c,a.nodes=w().nodes,a.publish(a.commands.shrine.fetchQuery,{networkId:c,timeoutSeconds:t,dataVersion:u})}}),this.subscribe(this.notifications.i2b2.exportQuery,function(){var b=a.nodes;a.publish(a.commands.shrine.exportResult,{nodes:b})}),this.subscribe(this.notifications.i2b2.clearQuery,function(){a.status=l({},w(),{canceled:!0})}),this.subscribe(this.notifications.shrine.queryReceived,function(b){var c=b.query,d=b.nodes,e=b.dataVersion,f=void 0===e?u:e,g=b.complete,h=b.query.networkId,i=t;if(h===a.status.query.networkId&&!a.status.canceled){var j=Number(new Date);Object.assign(a.status,{query:c,updated:j}),a.nodes=d,g||a.publish(a.commands.shrine.fetchQuery,{networkId:h,dataVersion:f,timeoutSeconds:i})}}),v.get(this).isDevEnv&&(this.publish(this.notifications.i2b2.queryStarted,"started query"),window.setTimeout(function(){return a.publish(a.notifications.i2b2.networkIdReceived,{networkId:"2421519216383772161",name:"started query"})},2e3))},b}(k),q.inject=[j],o=r,p=g(o.prototype,"nodes",[i],{enumerable:!0,initializer:null}),n=o))||n)),a("QueryStatus",s),t=15,u=-1,v=new WeakMap,w=function(a){return{status:{query:{networkId:null,queryName:null,updated:null,complete:!1,canceled:!1}},nodes:[]}}}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li if.bind="context.isCount"><a click.delegate="refreshHistory()" href="#"><i class="fa fa-bar-chart-o"></i>Breakdown</a></li><li click.delegate="cloneQuery(context.query.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="renameQuery(context.query.id)" href="#"><i class="fa fa-edit"></i> Rename</a></li><!--li><a click.delegate="flagQuery(context.query.id)" href="#"><i class="fa fa-flag"></i> Flag</a></li--><!--li><a click.delegate="unflagQuery(context.query.id)" href="#"><i class="fa fa-flag-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","aurelia-event-aggregator","common/shrine.messages"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m,n;return{setters:[function(a){f=a.bindable},function(a){g=a.EventAggregator},function(a){h=a.commands}],execute:function(){a("ContextMenu",(l=k=function b(a,c){var e=this;d(this,b),m.call(this),b.prototype.cloneQuery=function(b){a.publish(c.i2b2.cloneQuery,b),e.context["class"]="hide"},b.prototype.renameQuery=function(b){a.publish(c.i2b2.renameQuery,b),e.context["class"]="hide"},b.prototype.flagQuery=function(b){a.publish(c.i2b2.flagQuery,b),e.context["class"]="hide"},b.prototype.unflagQuery=function(b){a.publish(c.i2b2.unflagQuery,b),e.context["class"]="hide"}},k.inject=[g,h],m=function(){c(this,"context",j,this)},i=l,j=e(i.prototype,"context",[f],{enumerable:!0,initializer:null}),n=i)),a("ContextMenu",n)}}}),System.register("views/query-viewer/date.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY")},a}()),a("DateValueConverter",e)}}}),function(){var a=System.amdDefine;a("views/query-viewer/paginator/paginator.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"><div class="paginator"><ol class="btn-group"><li class="btn-group__item" click.delegate="pageIndex = index - 1"><i class="i-chevron-left"></i></li><li repeat.for="page of pages" class="btn-group__item" click.delegate="pageIndex = $index"><button class="btn btn--basic ${index === $index? \'current\' : \'\'}">${$index + 1}</button></li><li class="btn-group__item" click.delegate="pageIndex = index + 1"><i class="i-chevron-right"></i></li></ol></div></template>'})}(),System.register("views/query-viewer/paginator/paginator.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable}],execute:function(){g=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Paginator",(k=j=function(){function a(b){var e=this;d(this,a),c(this,"pages",i,this),a.prototype.init=function(){e.index=0,e.element=b},this.init()}return g(a,[{key:"pageIndex",set:function(a){var b=this.pages.length-1;this.index=a<0?0:a>b?b:a,this.element.dispatchEvent(new CustomEvent("paginator-click",{detail:{index:this.index},bubbles:!0,cancelable:!0}))}}]),a}(),j.inject=[Element],h=k,i=e(h.prototype,"pages",[f],{enumerable:!0,initializer:null}),l=h)),a("Paginator",l)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="tooltip"><span ref="tooltipContent" data-line1="Total: ${total}" data-line2="Available: ${finished}, Error: ${error}, Pending: ${pending}"><svg viewbox="0 0 35 35" class="query-status"><circle cx="18" cy="16" r="12" class="countdown__background"/><circle cx="18" cy="16" r="12" class="error__progress" css="stroke-dashoffset: ${errorOffset}"/><circle cx="18" cy="16" r="12" class="ready__progress" css="stroke-dashoffset: ${readyOffset}"/></svg></span></div></template>'})}(),System.register("views/query-viewer/query-status/query-status.js",["aurelia-framework","ramda"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.bindable},function(a){g=a}],execute:function(){a("QueryStatus",(k=j=function(){function a(b){d(this,a),l.call(this),this.floor=b.floor}return a.prototype.attached=function(){var a=75,b=g.curry(function(a,b,c,d){return a(d/c*b)})(this.floor,a,this.status.total),c=this.status,d=b(c.finished),e=b(c.error);this.readyOffset=100-d,this.errorOffset=this.readyOffset-e,this.finished=c.finished,this.error=c.error,this.pending=c.total-(c.finished+c.error),this.total=c.total},a}(),j.inject=[Math],l=function(){c(this,"status",i,this)},h=k,i=e(h.prototype,"status",[f],{enumerable:!0,initializer:null}),m=h)),a("QueryStatus",m)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10,maxQueriesPerScroll:40}),a("QueryViewerConfig",c)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><require from="views/query-viewer/paginator/paginator"></require><require from="views/query-viewer/date.converter"></require><require from="views/query-viewer/query-status/query-status"></require><span class="query-viewer"><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><paginator pages.bind="pages" paginator-click.delegate="updatePage($event)" if.bind="pages.length > 1"></paginator></div><div class="flex-table"><div class="flex-table-row node-header"><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div repeat.for="node of page.nodes" class="flex-table-item">${node}</div></div></div><div class="flex-table query-viewer ${vertStyle}" scroll.trigger="onScroll($event)"><div><!-- @todo: create running query component --><div class="flex-table-row" if.bind="runningQueryName"><div class="flex-table-item"></div><div class="flex-table-item">${runningQueryName}</div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item" repeat.for="node of page.nodes" style="color: #00FF00">RUNNING</div></div><div repeat.for="result of page.results" class="flex-table-row"><div class="flex-table-item"><i if.bind="result.flagged" class="fa fa-flag"></i> <i if.bind="!result.flagged" class="fa fa-flag-o"></i></div><div class="flex-table-item" click.delegate="context = getContext($event, result)"><div class="ellipses">${result.name}</div></div><div class="flex-table-item" click.delegate="context = getContext($event, result)">${result.date | date}</div><div class="flex-table-item"><query-status status.bind="result.status"></query-status></div><div repeat.for="nodeResult of result.nodeResults" class="flex-table-item" click.delegate="context = getContext($event, result)"><a if.bind="nodeResult.status === \'ERROR\'" style="text-decoration: underline; color:red" click.delegate="publishError($event, nodeResult)">${nodeResult.status} </a>${nodeResult}</div></div><div class="flex-table-row" if.bind="loadingInfiniteScroll"><div style="width: 100%; text-align: center; font-size: 1.5rem; background:rgba(217, 236, 240, .05); text-align:center; color: rgba(0, 0, 0, .20)"><i class="fa fa-spinner fa-spin" style="color: inherit"></i> Loading...</div></div></div></div><!-- context menu --><context-menu context.bind="context"></context-menu></span></template>'})}(),System.register("views/query-viewer/scroll.service.js",["ramda","common/container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("ScrollService",(g=f=function b(){c(this,b)},f.either=d.curry(function(a,b,c){return e.of(d.prop(a,c)||b)}),f.target=function(a,b){return h.either("target",b,b).chain(function(b){return h.either(a,0,b)})},f.clientHeight=function(a){return h.target("clientHeight",a)},f.scrollHeight=function(a){return h.target("scrollHeight",a)},f.scrollTop=function(a){return h.target("scrollTop",a)},f.userScroll=function(a){return h.clientHeight(a).map(function(b){return b+h.scrollTop(a).value})},f.scrollRatio=function(a){return h.userScroll(a).map(function(b){return b/h.scrollHeight(a).value})},h=g)),a("ScrollService",h)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-event-aggregator","common/queries.model","./scroll.service","common/shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QueriesModel},function(a){f=a.ScrollService},function(a){g=a.notifications,h=a.commands}],execute:function(){a("QueryViewer",(j=i=function(){function a(b,d,e,g){var h=this;c(this,a),a.prototype.init=function(){h.pageIndex=0,h.showLoader=!0,h.vertStyle="v-min",h.runningQueryName=null},this.init(),a.prototype.setToPage=function(a){h.pageIndex=a,h.page=h.pages[h.pageIndex]};var i=function(a){return 1===f.scrollRatio(a).value};a.prototype.onScroll=function(a){i(a)&&!h.loadingInfiniteScroll&&d.moreToLoad()&&(h.loadingInfiniteScroll=!0,d.load())},a.prototype.publishError=function(a,c){return a.stopPropagation(),b.publish(g.i2b2.showError,c)},a.prototype.getContext=function(a,b,c){return{x:a.pageX,y:a.pageY,"class":"show",query:b,isCount:void 0!==c,count:c}},b.subscribe(e.i2b2.historyRefreshed,function(){return d.load()}),b.subscribe(e.i2b2.tabMax,function(){return h.vertStyle="v-full"}),b.subscribe(e.i2b2.tabMin,function(){return h.vertStyle="v-min"}),b.subscribe(e.i2b2.queryStarted,function(a){return h.runningQueryName=a}),b.subscribe(e.shrine.queriesReceived,function(a){h.pages=a,h.page=h.pages[0],h.runningQueryName=null,h.loadingInfiniteScroll=!1,h.showLoader=!1})}return a.prototype.updatePage=function(a){a.stopPropagation();var b=event.detail.index;this.page=this.pages[b]},a}(),i.inject=[d,e,g,h],k=j)),a("QueryViewer",k)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/result-row/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/row-loader.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return""})}();
\ No newline at end of file
+},shrine:{queriesReceived:"notification.from.shrine.queries.received",queryReceived:"notification.from.shrine.query.recieved",queryUnavailable:"notification.from.shrine.query.unavailable",queryAvailable:"notification.from.shrine.query.available"}}),a("notifications",c),a("commands",d={i2b2:{cloneQuery:"command.to.i2b2.clone.query",showError:"command.to.i2b2.show.error",flagQuery:"command.to.i2b2.flag.query",unflagQuery:"command.to.i2b2.unflag.query",renameQuery:"command.to.i2b2.rename.query"},shrine:{fetchQuery:"command.to.shrine.fetch.query",exportResult:"command.to.shrine.export.result"}}),a("commands",d)}}}),System.register("services/pub-sub.js",["aurelia-event-aggregator","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.commands,f=a.notifications}],execute:function(){a("PubSub",(h=g=function b(a,d,e){c(this,b),this.commands=d,this.notifications=e,this.publish=function(b,c){return a.publish(b,c)},this.subscribe=function(b,c){return a.subscribe(b,c)}},g.inject=[d,e,f],i=h)),a("PubSub",i)}}}),System.register("views/query-status/query-status.js",["aurelia-framework","services/query-status.model","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w;return{setters:[function(a){h=a.customElement,i=a.observable},function(a){j=a.QueryStatusModel},function(a){k=a.PubSub}],execute:function(){l=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatus",(m=h("query-status"),s=m((r=q=function(a){function b(f){d(this,b);for(var g=arguments.length,h=Array(g>1?g-1:0),i=1;i<g;i++)h[i-1]=arguments[i];var j=e(this,a.call.apply(a,[this].concat(h)));return c(j,"nodes",p,j),v.set(j,{isDevEnv:document.location.href.includes("http://localhost:8000/"),exportAvailable:!1}),j}return f(b,a),b.prototype.nodesChanged=function(a,b){return a&&a.length?(v.get(this).exportAvailable=!0,void this.publish(this.notifications.shrine.queryAvailable)):(v.get(this).exportAvailable=!1,void this.publish(this.notifications.shrine.queryUnavailable))},b.prototype.attached=function(){var a=this;this.subscribe(this.notifications.i2b2.queryStarted,function(b){a.status=w().status,a.nodes=w().nodes,a.status.query.queryName=b}),this.subscribe(this.notifications.i2b2.networkIdReceived,function(b){var c=!a.status;if(c&&(a.status=w()),!a.status.canceled){var d=b.networkId;a.status.query.networkId=d,a.nodes=w().nodes,a.publish(a.commands.shrine.fetchQuery,{networkId:d,timeoutSeconds:t,dataVersion:u})}}),this.subscribe(this.notifications.i2b2.exportQuery,function(){var b=a.nodes;a.publish(a.commands.shrine.exportResult,{nodes:b})}),this.subscribe(this.notifications.i2b2.clearQuery,function(){a.status=l({},w(),{canceled:!0})}),this.subscribe(this.notifications.shrine.queryReceived,function(b){var c=b.query,d=b.nodes,e=b.dataVersion,f=void 0===e?u:e,g=b.complete,h=b.query.networkId,i=t;if(h===a.status.query.networkId&&!a.status.canceled){var j=Number(new Date);Object.assign(a.status,{query:c,updated:j}),a.nodes=d,g||a.publish(a.commands.shrine.fetchQuery,{networkId:h,dataVersion:f,timeoutSeconds:i})}}),v.get(this).isDevEnv&&(this.publish(this.notifications.i2b2.queryStarted,"started query"),window.setTimeout(function(){return a.publish(a.notifications.i2b2.networkIdReceived,{networkId:"2421519216383772161",name:"started query"})},2e3))},b}(k),q.inject=[j],o=r,p=g(o.prototype,"nodes",[i],{enumerable:!0,initializer:null}),n=o))||n)),a("QueryStatus",s),t=15,u=-1,v=new WeakMap,w=function(a){return{status:{query:{networkId:null,queryName:null,updated:null,complete:!1,canceled:!1}},nodes:[]}}}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li if.bind="context.isCount"><a click.delegate="refreshHistory()" href="#"><i class="fa fa-bar-chart-o"></i>Breakdown</a></li><li click.delegate="cloneQuery(context.query.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="renameQuery(context.query.id)" href="#"><i class="fa fa-edit"></i> Rename</a></li><!--li><a click.delegate="flagQuery(context.query.id)" href="#"><i class="fa fa-flag"></i> Flag</a></li--><!--li><a click.delegate="unflagQuery(context.query.id)" href="#"><i class="fa fa-flag-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","aurelia-event-aggregator","common/shrine.messages"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m,n;return{setters:[function(a){f=a.bindable},function(a){g=a.EventAggregator},function(a){h=a.commands}],execute:function(){a("ContextMenu",(l=k=function b(a,c){var e=this;d(this,b),m.call(this),b.prototype.cloneQuery=function(b){a.publish(c.i2b2.cloneQuery,b),e.context["class"]="hide"},b.prototype.renameQuery=function(b){a.publish(c.i2b2.renameQuery,b),e.context["class"]="hide"},b.prototype.flagQuery=function(b){a.publish(c.i2b2.flagQuery,b),e.context["class"]="hide"},b.prototype.unflagQuery=function(b){a.publish(c.i2b2.unflagQuery,b),e.context["class"]="hide"}},k.inject=[g,h],m=function(){c(this,"context",j,this)},i=l,j=e(i.prototype,"context",[f],{enumerable:!0,initializer:null}),n=i)),a("ContextMenu",n)}}}),System.register("views/query-viewer/date.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY")},a}()),a("DateValueConverter",e)}}}),function(){var a=System.amdDefine;a("views/query-viewer/paginator/paginator.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"><div class="paginator"><ol class="btn-group"><li class="btn-group__item" click.delegate="pageIndex = index - 1"><i class="i-chevron-left"></i></li><li repeat.for="page of pages" class="btn-group__item" click.delegate="pageIndex = $index"><button class="btn btn--basic ${index === $index? \'current\' : \'\'}">${$index + 1}</button></li><li class="btn-group__item" click.delegate="pageIndex = index + 1"><i class="i-chevron-right"></i></li></ol></div></template>'})}(),System.register("views/query-viewer/paginator/paginator.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable}],execute:function(){g=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Paginator",(k=j=function(){function a(b){var e=this;d(this,a),c(this,"pages",i,this),a.prototype.init=function(){e.index=0,e.element=b},this.init()}return g(a,[{key:"pageIndex",set:function(a){var b=this.pages.length-1;this.index=a<0?0:a>b?b:a,this.element.dispatchEvent(new CustomEvent("paginator-click",{detail:{index:this.index},bubbles:!0,cancelable:!0}))}}]),a}(),j.inject=[Element],h=k,i=e(h.prototype,"pages",[f],{enumerable:!0,initializer:null}),l=h)),a("Paginator",l)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="tooltip"><span ref="tooltipContent" data-line1="Total: ${total}" data-line2="Available: ${finished}, Error: ${error}, Pending: ${pending}"><svg viewbox="0 0 35 35" class="query-status"><circle cx="18" cy="16" r="12" class="countdown__background"/><circle cx="18" cy="16" r="12" class="error__progress" css="stroke-dashoffset: ${errorOffset}"/><circle cx="18" cy="16" r="12" class="ready__progress" css="stroke-dashoffset: ${readyOffset}"/></svg></span></div></template>'})}(),System.register("views/query-viewer/query-status/query-status.js",["aurelia-framework","ramda"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.bindable},function(a){g=a}],execute:function(){a("QueryStatus",(k=j=function(){function a(b){d(this,a),l.call(this),this.floor=b.floor}return a.prototype.attached=function(){var a=75,b=g.curry(function(a,b,c,d){return a(d/c*b)})(this.floor,a,this.status.total),c=this.status,d=b(c.finished),e=b(c.error);this.readyOffset=100-d,this.errorOffset=this.readyOffset-e,this.finished=c.finished,this.error=c.error,this.pending=c.total-(c.finished+c.error),this.total=c.total},a}(),j.inject=[Math],l=function(){c(this,"status",i,this)},h=k,i=e(h.prototype,"status",[f],{enumerable:!0,initializer:null}),m=h)),a("QueryStatus",m)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10,maxQueriesPerScroll:40}),a("QueryViewerConfig",c)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><require from="views/query-viewer/paginator/paginator"></require><require from="views/query-viewer/date.converter"></require><require from="views/query-viewer/query-status/query-status"></require><span class="query-viewer"><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><paginator pages.bind="pages" paginator-click.delegate="updatePage($event)" if.bind="pages.length > 1"></paginator></div><div class="flex-table"><div class="flex-table-row node-header"><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div repeat.for="node of page.nodes" class="flex-table-item">${node}</div></div></div><div class="flex-table query-viewer ${vertStyle}" scroll.trigger="onScroll($event)"><div><!-- @todo: create running query component --><div class="flex-table-row" if.bind="runningQueryName"><div class="flex-table-item"></div><div class="flex-table-item">${runningQueryName}</div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item" repeat.for="node of page.nodes" style="color: #00FF00">RUNNING</div></div><div repeat.for="result of page.results" class="flex-table-row"><div class="flex-table-item"><i if.bind="result.flagged" class="fa fa-flag"></i> <i if.bind="!result.flagged" class="fa fa-flag-o"></i></div><div class="flex-table-item" click.delegate="context = getContext($event, result)"><div class="ellipses">${result.name}</div></div><div class="flex-table-item" click.delegate="context = getContext($event, result)">${result.date | date}</div><div class="flex-table-item"><query-status status.bind="result.status"></query-status></div><div repeat.for="nodeResult of result.nodeResults" class="flex-table-item" click.delegate="context = getContext($event, result)"><a if.bind="nodeResult.status === \'ERROR\'" style="text-decoration: underline; color:red" click.delegate="publishError($event, nodeResult)">${nodeResult.status} </a>${nodeResult}</div></div><div class="flex-table-row" if.bind="loadingInfiniteScroll"><div style="width: 100%; text-align: center; font-size: 1.5rem; background:rgba(217, 236, 240, .05); text-align:center; color: rgba(0, 0, 0, .20)"><i class="fa fa-spinner fa-spin" style="color: inherit"></i> Loading...</div></div></div></div><!-- context menu --><context-menu context.bind="context"></context-menu></span></template>'})}(),System.register("views/query-viewer/scroll.service.js",["ramda","common/container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("ScrollService",(g=f=function b(){c(this,b)},f.either=d.curry(function(a,b,c){return e.of(d.prop(a,c)||b)}),f.target=function(a,b){return h.either("target",b,b).chain(function(b){return h.either(a,0,b)})},f.clientHeight=function(a){return h.target("clientHeight",a)},f.scrollHeight=function(a){return h.target("scrollHeight",a)},f.scrollTop=function(a){return h.target("scrollTop",a)},f.userScroll=function(a){return h.clientHeight(a).map(function(b){return b+h.scrollTop(a).value})},f.scrollRatio=function(a){return h.userScroll(a).map(function(b){return b/h.scrollHeight(a).value})},h=g)),a("ScrollService",h)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-event-aggregator","common/queries.model","./scroll.service","common/shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QueriesModel},function(a){f=a.ScrollService},function(a){g=a.notifications,h=a.commands}],execute:function(){a("QueryViewer",(j=i=function(){function a(b,d,e,g){var h=this;c(this,a),a.prototype.init=function(){h.pageIndex=0,h.showLoader=!0,h.vertStyle="v-min",h.runningQueryName=null},this.init(),a.prototype.setToPage=function(a){h.pageIndex=a,h.page=h.pages[h.pageIndex]};var i=function(a){return 1===f.scrollRatio(a).value};a.prototype.onScroll=function(a){i(a)&&!h.loadingInfiniteScroll&&d.moreToLoad()&&(h.loadingInfiniteScroll=!0,d.load())},a.prototype.publishError=function(a,c){return a.stopPropagation(),b.publish(g.i2b2.showError,c)},a.prototype.getContext=function(a,b,c){return{x:a.pageX,y:a.pageY,"class":"show",query:b,isCount:void 0!==c,count:c}},b.subscribe(e.i2b2.historyRefreshed,function(){return d.load()}),b.subscribe(e.i2b2.tabMax,function(){return h.vertStyle="v-full"}),b.subscribe(e.i2b2.tabMin,function(){return h.vertStyle="v-min"}),b.subscribe(e.i2b2.queryStarted,function(a){return h.runningQueryName=a}),b.subscribe(e.shrine.queriesReceived,function(a){h.pages=a,h.page=h.pages[0],h.runningQueryName=null,h.loadingInfiniteScroll=!1,h.showLoader=!1})}return a.prototype.updatePage=function(a){a.stopPropagation();var b=event.detail.index;this.page=this.pages[b]},a}(),i.inject=[d,e,g,h],k=j)),a("QueryViewer",k)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/result-row/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/row-loader.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return""})}();
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js
index 325f3c0e1..3c192b813 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js
@@ -1,204 +1,206 @@
 System.register(['aurelia-framework', 'services/query-status.model', 'services/pub-sub'], function (_export, _context) {
     "use strict";
 
     var customElement, observable, QueryStatusModel, PubSub, _extends, _dec, _class, _desc, _value, _class2, _descriptor, _class3, _temp, QueryStatus, TIMEOUT_SECONDS, DEFAULT_VERSION, me, initialState;
 
     function _initDefineProp(target, property, descriptor, context) {
         if (!descriptor) return;
         Object.defineProperty(target, property, {
             enumerable: descriptor.enumerable,
             configurable: descriptor.configurable,
             writable: descriptor.writable,
             value: descriptor.initializer ? descriptor.initializer.call(context) : void 0
         });
     }
 
     function _classCallCheck(instance, Constructor) {
         if (!(instance instanceof Constructor)) {
             throw new TypeError("Cannot call a class as a function");
         }
     }
 
     function _possibleConstructorReturn(self, call) {
         if (!self) {
             throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
         }
 
         return call && (typeof call === "object" || typeof call === "function") ? call : self;
     }
 
     function _inherits(subClass, superClass) {
         if (typeof superClass !== "function" && superClass !== null) {
             throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
         }
 
         subClass.prototype = Object.create(superClass && superClass.prototype, {
             constructor: {
                 value: subClass,
                 enumerable: false,
                 writable: true,
                 configurable: true
             }
         });
         if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
     }
 
     function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
         var desc = {};
         Object['ke' + 'ys'](descriptor).forEach(function (key) {
             desc[key] = descriptor[key];
         });
         desc.enumerable = !!desc.enumerable;
         desc.configurable = !!desc.configurable;
 
         if ('value' in desc || desc.initializer) {
             desc.writable = true;
         }
 
         desc = decorators.slice().reverse().reduce(function (desc, decorator) {
             return decorator(target, property, desc) || desc;
         }, desc);
 
         if (context && desc.initializer !== void 0) {
             desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
             desc.initializer = undefined;
         }
 
         if (desc.initializer === void 0) {
             Object['define' + 'Property'](target, property, desc);
             desc = null;
         }
 
         return desc;
     }
 
     function _initializerWarningHelper(descriptor, context) {
         throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
     }
 
     return {
         setters: [function (_aureliaFramework) {
             customElement = _aureliaFramework.customElement;
             observable = _aureliaFramework.observable;
         }, function (_servicesQueryStatusModel) {
             QueryStatusModel = _servicesQueryStatusModel.QueryStatusModel;
         }, function (_servicesPubSub) {
             PubSub = _servicesPubSub.PubSub;
         }],
         execute: function () {
             _extends = Object.assign || function (target) {
                 for (var i = 1; i < arguments.length; i++) {
                     var source = arguments[i];
 
                     for (var key in source) {
                         if (Object.prototype.hasOwnProperty.call(source, key)) {
                             target[key] = source[key];
                         }
                     }
                 }
 
                 return target;
             };
 
             _export('QueryStatus', QueryStatus = (_dec = customElement('query-status'), _dec(_class = (_class2 = (_temp = _class3 = function (_PubSub) {
                 _inherits(QueryStatus, _PubSub);
 
                 function QueryStatus(queryStatus) {
                     _classCallCheck(this, QueryStatus);
 
                     for (var _len = arguments.length, rest = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
                         rest[_key - 1] = arguments[_key];
                     }
 
                     var _this = _possibleConstructorReturn(this, _PubSub.call.apply(_PubSub, [this].concat(rest)));
 
                     _initDefineProp(_this, 'nodes', _descriptor, _this);
 
                     me.set(_this, {
                         isDevEnv: document.location.href.includes('http://localhost:8000/'),
                         exportAvailable: false
                     });
                     return _this;
                 }
 
                 QueryStatus.prototype.nodesChanged = function nodesChanged(newValue, oldValue) {
                     if (!newValue || !newValue.length) {
                         me.get(this).exportAvailable = false;
                         this.publish(this.notifications.shrine.queryUnavailable);
                         return;
                     }
                     me.get(this).exportAvailable = true;
                     this.publish(this.notifications.shrine.queryAvailable);
                 };
 
                 QueryStatus.prototype.attached = function attached() {
                     var _this2 = this;
 
                     this.subscribe(this.notifications.i2b2.queryStarted, function (n) {
                         _this2.status = initialState().status;
                         _this2.nodes = initialState().nodes;
                         _this2.status.query.queryName = n;
                     });
 
                     this.subscribe(this.notifications.i2b2.networkIdReceived, function (d) {
-                        if (_this2.status && _this2.status.canceled) return;
+                        var runningPreviousQuery = !_this2.status;
+                        if (runningPreviousQuery) _this2.status = initialState();
+                        if (_this2.status.canceled) return;
                         var networkId = d.networkId;
 
                         _this2.status.query.networkId = networkId;
                         _this2.nodes = initialState().nodes;
                         _this2.publish(_this2.commands.shrine.fetchQuery, { networkId: networkId, timeoutSeconds: TIMEOUT_SECONDS, dataVersion: DEFAULT_VERSION });
                     });
 
                     this.subscribe(this.notifications.i2b2.exportQuery, function () {
                         var nodes = _this2.nodes;
                         _this2.publish(_this2.commands.shrine.exportResult, { nodes: nodes });
                     });
 
                     this.subscribe(this.notifications.i2b2.clearQuery, function () {
                         _this2.status = _extends({}, initialState(), { canceled: true });
                     });
                     this.subscribe(this.notifications.shrine.queryReceived, function (data) {
                         var query = data.query,
                             nodes = data.nodes,
                             _data$dataVersion = data.dataVersion,
                             dataVersion = _data$dataVersion === undefined ? DEFAULT_VERSION : _data$dataVersion,
                             complete = data.complete,
                             networkId = data.query.networkId;
 
                         var timeoutSeconds = TIMEOUT_SECONDS;
                         if (networkId !== _this2.status.query.networkId || _this2.status.canceled) return;
                         var updated = Number(new Date());
                         Object.assign(_this2.status, { query: query, updated: updated });
                         _this2.nodes = nodes;
                         if (!complete) {
                             _this2.publish(_this2.commands.shrine.fetchQuery, { networkId: networkId, dataVersion: dataVersion, timeoutSeconds: timeoutSeconds });
                         }
                     });
 
                     if (me.get(this).isDevEnv) {
                         this.publish(this.notifications.i2b2.queryStarted, "started query");
                         window.setTimeout(function () {
                             return _this2.publish(_this2.notifications.i2b2.networkIdReceived, { networkId: '2421519216383772161', name: "started query" });
                         }, 2000);
                     }
                 };
 
                 return QueryStatus;
             }(PubSub), _class3.inject = [QueryStatusModel], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'nodes', [observable], {
                 enumerable: true,
                 initializer: null
             })), _class2)) || _class));
 
             _export('QueryStatus', QueryStatus);
 
             TIMEOUT_SECONDS = 15;
             DEFAULT_VERSION = -1;
             me = new WeakMap();
 
             initialState = function initialState(n) {
                 return { status: { query: { networkId: null, queryName: null, updated: null, complete: false, canceled: false } }, nodes: [] };
             };
         }
     };
 });
 //# sourceMappingURL=query-status.js.map
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js.map b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js.map
index 5c18104a1..4cec12e53 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js.map
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-status/query-status.js.map
@@ -1 +1 @@
-{"version":3,"sources":["views/query-status/query-status.js"],"names":["customElement","observable","QueryStatusModel","PubSub","QueryStatus","queryStatus","rest","me","set","isDevEnv","document","location","href","includes","exportAvailable","nodesChanged","newValue","oldValue","length","get","publish","notifications","shrine","queryUnavailable","queryAvailable","attached","subscribe","i2b2","queryStarted","n","status","initialState","nodes","query","queryName","networkIdReceived","canceled","networkId","d","commands","fetchQuery","timeoutSeconds","TIMEOUT_SECONDS","dataVersion","DEFAULT_VERSION","exportQuery","exportResult","clearQuery","queryReceived","data","complete","updated","Number","Date","Object","assign","window","setTimeout","name","inject","WeakMap"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAASA,yB,qBAAAA,a;AAAeC,sB,qBAAAA,U;;AACfC,4B,6BAAAA,gB;;AACAC,kB,mBAAAA,M;;;;;;;;;;;;;;;;;mCAEIC,W,WADZJ,cAAc,cAAd,C;;;AAIG,qCAAYK,WAAZ,EAAkC;AAAA;;AAAA,sDAANC,IAAM;AAANA,4BAAM;AAAA;;AAAA,iEAC9B,0CAASA,IAAT,EAD8B;;AAAA;;AAE9BC,uBAAGC,GAAH,QAAa;AACTC,kCAAUC,SAASC,QAAT,CAAkBC,IAAlB,CAAuBC,QAAvB,CAAgC,wBAAhC,CADD;AAETC,yCAAiB;AAFR,qBAAb;AAF8B;AAMjC;;sCACDC,Y,yBAAaC,Q,EAAUC,Q,EAAU;AAC7B,wBAAG,CAACD,QAAD,IAAa,CAACA,SAASE,MAA1B,EAAkC;AAC9BX,2BAAGY,GAAH,CAAO,IAAP,EAAaL,eAAb,GAA+B,KAA/B;AACA,6BAAKM,OAAL,CAAa,KAAKC,aAAL,CAAmBC,MAAnB,CAA0BC,gBAAvC;AACA;AACH;AACDhB,uBAAGY,GAAH,CAAO,IAAP,EAAaL,eAAb,GAA+B,IAA/B;AACA,yBAAKM,OAAL,CAAa,KAAKC,aAAL,CAAmBC,MAAnB,CAA0BE,cAAvC;AACH,iB;;sCACDC,Q,uBAAW;AAAA;;AAEP,yBAAKC,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBC,YAAvC,EAAqD,UAACC,CAAD,EAAO;AACxD,+BAAKC,MAAL,GAAcC,eAAeD,MAA7B;AACA,+BAAKE,KAAL,GAAaD,eAAeC,KAA5B;AACA,+BAAKF,MAAL,CAAYG,KAAZ,CAAkBC,SAAlB,GAA8BL,CAA9B;AACH,qBAJD;;AAMA,yBAAKH,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBQ,iBAAvC,EAA0D,aAAK;AAC3D,4BAAG,OAAKL,MAAL,IAAe,OAAKA,MAAL,CAAYM,QAA9B,EAAwC;AADmB,4BAEpDC,SAFoD,GAEvCC,CAFuC,CAEpDD,SAFoD;;AAG3D,+BAAKP,MAAL,CAAYG,KAAZ,CAAkBI,SAAlB,GAA8BA,SAA9B;AACA,+BAAKL,KAAL,GAAaD,eAAeC,KAA5B;AACA,+BAAKZ,OAAL,CAAa,OAAKmB,QAAL,CAAcjB,MAAd,CAAqBkB,UAAlC,EAA8C,EAACH,oBAAD,EAAYI,gBAAgBC,eAA5B,EAA6CC,aAAaC,eAA1D,EAA9C;AACH,qBAND;;AAQA,yBAAKlB,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBkB,WAAvC,EAAoD,YAAM;AACtD,4BAAMb,QAAQ,OAAKA,KAAnB;AACA,+BAAKZ,OAAL,CAAa,OAAKmB,QAAL,CAAcjB,MAAd,CAAqBwB,YAAlC,EAAgD,EAACd,YAAD,EAAhD;AACH,qBAHD;;AAKA,yBAAKN,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBoB,UAAvC,EAAmD,YAAM;AACrD,+BAAKjB,MAAL,gBAAkBC,cAAlB,EAAqC,EAACK,UAAU,IAAX,EAArC;AACH,qBAFD;AAGA,yBAAKV,SAAL,CAAe,KAAKL,aAAL,CAAmBC,MAAnB,CAA0B0B,aAAzC,EAAwD,gBAAQ;AAAA,4BACrDf,KADqD,GACuBgB,IADvB,CACrDhB,KADqD;AAAA,4BAC9CD,KAD8C,GACuBiB,IADvB,CAC9CjB,KAD8C;AAAA,gDACuBiB,IADvB,CACvCN,WADuC;AAAA,4BACvCA,WADuC,qCACzBC,eADyB;AAAA,4BACRM,QADQ,GACuBD,IADvB,CACRC,QADQ;AAAA,4BACSb,SADT,GACuBY,IADvB,CACEhB,KADF,CACSI,SADT;;AAE5D,4BAAMI,iBAAiBC,eAAvB;AACA,4BAAGL,cAAc,OAAKP,MAAL,CAAYG,KAAZ,CAAkBI,SAAhC,IAA6C,OAAKP,MAAL,CAAYM,QAA5D,EAAsE;AACtE,4BAAMe,UAAUC,OAAO,IAAIC,IAAJ,EAAP,CAAhB;AACAC,+BAAOC,MAAP,CAAc,OAAKzB,MAAnB,EAA2B,EAACG,YAAD,EAAQkB,gBAAR,EAA3B;AACA,+BAAKnB,KAAL,GAAaA,KAAb;AACA,4BAAI,CAACkB,QAAL,EAAe;AACX,mCAAK9B,OAAL,CAAa,OAAKmB,QAAL,CAAcjB,MAAd,CAAqBkB,UAAlC,EAA8C,EAACH,oBAAD,EAAYM,wBAAZ,EAAyBF,8BAAzB,EAA9C;AACH;AACJ,qBAVD;;AAYA,wBAAIlC,GAAGY,GAAH,CAAO,IAAP,EAAaV,QAAjB,EAA2B;AACvB,6BAAKW,OAAL,CAAa,KAAKC,aAAL,CAAmBM,IAAnB,CAAwBC,YAArC,EAAmD,eAAnD;AACA4B,+BAAOC,UAAP,CAAkB;AAAA,mCACd,OAAKrC,OAAL,CAAa,OAAKC,aAAL,CAAmBM,IAAnB,CAAwBQ,iBAArC,EAAwD,EAACE,WAAW,qBAAZ,EAAmCqB,MAAM,eAAzC,EAAxD,CADc;AAAA,yBAAlB,EACwH,IADxH;AAEH;AACJ,iB;;;cA5D4BvD,M,WAEtBwD,M,GAAS,CAACzD,gBAAD,C,gFADfD,U;;;;;;;AA6DCyC,2B,GAAkB,E;AAClBE,2B,GAAkB,CAAC,C;AACnBrC,c,GAAK,IAAIqD,OAAJ,E;;AACL7B,wB,GAAe,SAAfA,YAAe,CAACF,CAAD;AAAA,uBAAQ,EAACC,QAAQ,EAAEG,OAAO,EAAEI,WAAW,IAAb,EAAmBH,WAAW,IAA9B,EAAoCiB,SAAS,IAA7C,EAAmDD,UAAU,KAA7D,EAAoEd,UAAU,KAA9E,EAAT,EAAT,EAAyGJ,OAAO,EAAhH,EAAR;AAAA,a","file":"query-status.js","sourceRoot":"/src"}
\ No newline at end of file
+{"version":3,"sources":["views/query-status/query-status.js"],"names":["customElement","observable","QueryStatusModel","PubSub","QueryStatus","queryStatus","rest","me","set","isDevEnv","document","location","href","includes","exportAvailable","nodesChanged","newValue","oldValue","length","get","publish","notifications","shrine","queryUnavailable","queryAvailable","attached","subscribe","i2b2","queryStarted","n","status","initialState","nodes","query","queryName","networkIdReceived","runningPreviousQuery","canceled","networkId","d","commands","fetchQuery","timeoutSeconds","TIMEOUT_SECONDS","dataVersion","DEFAULT_VERSION","exportQuery","exportResult","clearQuery","queryReceived","data","complete","updated","Number","Date","Object","assign","window","setTimeout","name","inject","WeakMap"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAASA,yB,qBAAAA,a;AAAeC,sB,qBAAAA,U;;AACfC,4B,6BAAAA,gB;;AACAC,kB,mBAAAA,M;;;;;;;;;;;;;;;;;mCAEIC,W,WADZJ,cAAc,cAAd,C;;;AAIG,qCAAYK,WAAZ,EAAkC;AAAA;;AAAA,sDAANC,IAAM;AAANA,4BAAM;AAAA;;AAAA,iEAC9B,0CAASA,IAAT,EAD8B;;AAAA;;AAE9BC,uBAAGC,GAAH,QAAa;AACTC,kCAAUC,SAASC,QAAT,CAAkBC,IAAlB,CAAuBC,QAAvB,CAAgC,wBAAhC,CADD;AAETC,yCAAiB;AAFR,qBAAb;AAF8B;AAMjC;;sCACDC,Y,yBAAaC,Q,EAAUC,Q,EAAU;AAC7B,wBAAG,CAACD,QAAD,IAAa,CAACA,SAASE,MAA1B,EAAkC;AAC9BX,2BAAGY,GAAH,CAAO,IAAP,EAAaL,eAAb,GAA+B,KAA/B;AACA,6BAAKM,OAAL,CAAa,KAAKC,aAAL,CAAmBC,MAAnB,CAA0BC,gBAAvC;AACA;AACH;AACDhB,uBAAGY,GAAH,CAAO,IAAP,EAAaL,eAAb,GAA+B,IAA/B;AACA,yBAAKM,OAAL,CAAa,KAAKC,aAAL,CAAmBC,MAAnB,CAA0BE,cAAvC;AACH,iB;;sCACDC,Q,uBAAW;AAAA;;AAEP,yBAAKC,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBC,YAAvC,EAAqD,UAACC,CAAD,EAAO;AACxD,+BAAKC,MAAL,GAAcC,eAAeD,MAA7B;AACA,+BAAKE,KAAL,GAAaD,eAAeC,KAA5B;AACA,+BAAKF,MAAL,CAAYG,KAAZ,CAAkBC,SAAlB,GAA8BL,CAA9B;AACH,qBAJD;;AAMA,yBAAKH,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBQ,iBAAvC,EAA0D,aAAK;AAC3D,4BAAMC,uBAAuB,CAAC,OAAKN,MAAnC;AACA,4BAAGM,oBAAH,EAAyB,OAAKN,MAAL,GAAcC,cAAd;AACzB,4BAAG,OAAKD,MAAL,CAAYO,QAAf,EAAyB;AAHkC,4BAIpDC,SAJoD,GAIvCC,CAJuC,CAIpDD,SAJoD;;AAK3D,+BAAKR,MAAL,CAAYG,KAAZ,CAAkBK,SAAlB,GAA8BA,SAA9B;AACA,+BAAKN,KAAL,GAAaD,eAAeC,KAA5B;AACA,+BAAKZ,OAAL,CAAa,OAAKoB,QAAL,CAAclB,MAAd,CAAqBmB,UAAlC,EAA8C,EAACH,oBAAD,EAAYI,gBAAgBC,eAA5B,EAA6CC,aAAaC,eAA1D,EAA9C;AACH,qBARD;;AAUA,yBAAKnB,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBmB,WAAvC,EAAoD,YAAM;AACtD,4BAAMd,QAAQ,OAAKA,KAAnB;AACA,+BAAKZ,OAAL,CAAa,OAAKoB,QAAL,CAAclB,MAAd,CAAqByB,YAAlC,EAAgD,EAACf,YAAD,EAAhD;AACH,qBAHD;;AAKA,yBAAKN,SAAL,CAAe,KAAKL,aAAL,CAAmBM,IAAnB,CAAwBqB,UAAvC,EAAmD,YAAM;AACrD,+BAAKlB,MAAL,gBAAkBC,cAAlB,EAAqC,EAACM,UAAU,IAAX,EAArC;AACH,qBAFD;AAGA,yBAAKX,SAAL,CAAe,KAAKL,aAAL,CAAmBC,MAAnB,CAA0B2B,aAAzC,EAAwD,gBAAQ;AAAA,4BACrDhB,KADqD,GACuBiB,IADvB,CACrDjB,KADqD;AAAA,4BAC9CD,KAD8C,GACuBkB,IADvB,CAC9ClB,KAD8C;AAAA,gDACuBkB,IADvB,CACvCN,WADuC;AAAA,4BACvCA,WADuC,qCACzBC,eADyB;AAAA,4BACRM,QADQ,GACuBD,IADvB,CACRC,QADQ;AAAA,4BACSb,SADT,GACuBY,IADvB,CACEjB,KADF,CACSK,SADT;;AAE5D,4BAAMI,iBAAiBC,eAAvB;AACA,4BAAGL,cAAc,OAAKR,MAAL,CAAYG,KAAZ,CAAkBK,SAAhC,IAA6C,OAAKR,MAAL,CAAYO,QAA5D,EAAsE;AACtE,4BAAMe,UAAUC,OAAO,IAAIC,IAAJ,EAAP,CAAhB;AACAC,+BAAOC,MAAP,CAAc,OAAK1B,MAAnB,EAA2B,EAACG,YAAD,EAAQmB,gBAAR,EAA3B;AACA,+BAAKpB,KAAL,GAAaA,KAAb;AACA,4BAAI,CAACmB,QAAL,EAAe;AACX,mCAAK/B,OAAL,CAAa,OAAKoB,QAAL,CAAclB,MAAd,CAAqBmB,UAAlC,EAA8C,EAACH,oBAAD,EAAYM,wBAAZ,EAAyBF,8BAAzB,EAA9C;AACH;AACJ,qBAVD;;AAYA,wBAAInC,GAAGY,GAAH,CAAO,IAAP,EAAaV,QAAjB,EAA2B;AACvB,6BAAKW,OAAL,CAAa,KAAKC,aAAL,CAAmBM,IAAnB,CAAwBC,YAArC,EAAmD,eAAnD;AACA6B,+BAAOC,UAAP,CAAkB;AAAA,mCACd,OAAKtC,OAAL,CAAa,OAAKC,aAAL,CAAmBM,IAAnB,CAAwBQ,iBAArC,EAAwD,EAACG,WAAW,qBAAZ,EAAmCqB,MAAM,eAAzC,EAAxD,CADc;AAAA,yBAAlB,EACwH,IADxH;AAEH;AACJ,iB;;;cA9D4BxD,M,WAEtByD,M,GAAS,CAAC1D,gBAAD,C,gFADfD,U;;;;;;;AA+DC0C,2B,GAAkB,E;AAClBE,2B,GAAkB,CAAC,C;AACnBtC,c,GAAK,IAAIsD,OAAJ,E;;AACL9B,wB,GAAe,SAAfA,YAAe,CAACF,CAAD;AAAA,uBAAQ,EAACC,QAAQ,EAAEG,OAAO,EAAEK,WAAW,IAAb,EAAmBJ,WAAW,IAA9B,EAAoCkB,SAAS,IAA7C,EAAmDD,UAAU,KAA7D,EAAoEd,UAAU,KAA9E,EAAT,EAAT,EAAyGL,OAAO,EAAhH,EAAR;AAAA,a","file":"query-status.js","sourceRoot":"/src"}
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js b/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
index a760b9d82..88579fd41 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
@@ -1,2 +1,2 @@
 "bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging().feature("resources").feature("views"),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),System.register("resources/converters/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),System.register("resources/converters/count-value-converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("CountValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a<0?"10 patients or fewer":a+" +-10 patients"},a}()),a("CountValueConverter",d)}}}),System.register("resources/converters/datetime.value.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateTimeValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY h:mm:ss a")},a}()),a("DateTimeValueConverter",e)}}}),System.register("resources/converters/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("resources/converters/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?"":a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}}),System.register("resources/converters/truncate.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("TruncateValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=20;return a.length>b?a.substring(0,b)+"...":a},a}()),a("TruncateValueConverter",d)}}}),function(){var a=System.amdDefine;a("resources/custom/breakdown/breakdown.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px"><br><font>${data.resultType.i2b2Options.description}:</font></div><div style="clear: both; margin-left: 40px; float: left; height: 16px; line-height: 16px"></div><div repeat.for="result of data.results" style="clear: both; margin-left: 40px; float: left; height: 16px; line-height: 16px">${result.dataKey}: <font color="#0000dd">${result.value | count}</font></div></template>'})}(),System.register("resources/custom/breakdown/breakdown.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable,g=a.customElement}],execute:function(){a("Breakdown",(h=g("breakdown"),l=h((j=function b(){d(this,b),c(this,"data",k,this)},k=e(j.prototype,"data",[f],{enumerable:!0,initializer:null}),i=j))||i)),a("Breakdown",l)}}}),function(){var a=System.amdDefine;a("resources/custom/node-result/error.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span><b><a class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)"><b><span color="#ff0000">${result.statusMessage}</span></b></a></b></span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/node-result.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear:both"><br><div style="float:left; font-weight:bold; margin-left:20px">${result.adapterNode} "${queryName}"</div></div><compose view.bind="component"></compose></template>'})}(),System.register("resources/custom/node-result/node-result.js",["aurelia-framework","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p;return{setters:[function(a){h=a.customElement,i=a.bindable},function(a){j=a.PubSub}],execute:function(){a("NodeResult",(k=h("node-result"),p=k((m=function(a){function b(){d(this,b);for(var f=arguments.length,g=Array(f),h=0;h<f;h++)g[h]=arguments[h];var i=e(this,a.call.apply(a,[this].concat(g)));return c(i,"result",n,i),c(i,"queryName",o,i),i}return f(b,a),b.prototype.attached=function(){var a=this.result.status;this.component="./submitted.html","ERROR"===a?this.component="./error.html":"COMPLETED,FINISHED".includes(a)?this.component="./patient-count.html":"PROCESSING,INCOMPLETE,COMPLETE".includes(a)?this.component="./status.html":a.toLowerCase().includes("queue")&&(this.component="./queued.html")},b}(j),n=g(m.prototype,"result",[i],{enumerable:!0,initializer:null}),o=g(m.prototype,"queryName",[i],{enumerable:!0,initializer:null}),l=m))||l)),a("NodeResult",p)}}}),function(){var a=System.amdDefine;a("resources/custom/node-result/patient-count.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px">Patient Count: <font color="#0000dd">- ${result.count | count}</font></div><breakdown repeat.for="breakdown of result.breakdowns" data.one-way="breakdown"></breakdown></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/queued.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span style="color: #000">QUEUED</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;- <span style="color: #000">${result.status}</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-result/submitted.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template>&nbsp;-<span style="color: #00dd00">SUBMITTED</span></template>'})}(),function(){var a=System.amdDefine;a("resources/custom/node-status/node-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="display: flex"><div style="flex:1">${result.adapterNode}</div><div style="flex: 1"><span if.one-way="\'STATUS,FINISHED,PROCESSING,INCOMPLETE,COMPLETE\'.includes(result.status)" style="display: inline-block; color: #0000dd"><span style="color: black">${result.status}</span> </span><span if.one-way="result.status.toLowerCase().includes(\'queue\')"><span style="color: black">QUEUED</span> </span><span><a if.one-way="result.status === \'ERROR\'" class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)">ERROR </a></span><span if.one-way="result.status.toLowerCase().includes(\'submit\')"><span style="color: green">SUBMITTED</span></span></div><div style="flex:1"><span if.one-way="\'STATUS,FINISHED\'.includes(result.status)" style="display: inline-block; color: #0000dd">Patient Count:&nbsp;${result.count | count}</span></div></div></template>'})}(),System.register("resources/custom/node-status/node-status.js",["aurelia-framework","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o;return{setters:[function(a){h=a.customElement,i=a.bindable},function(a){j=a.PubSub}],execute:function(){a("NodeStatus",(k=h("node-status"),o=k((m=function(a){function b(){d(this,b);for(var f=arguments.length,g=Array(f),h=0;h<f;h++)g[h]=arguments[h];var i=e(this,a.call.apply(a,[this].concat(g)));return c(i,"result",n,i),i}return f(b,a),b}(j),n=g(m.prototype,"result",[i],{enumerable:!0,initializer:null}),l=m))||l)),a("NodeStatus",o)}}}),function(){var a=System.amdDefine;a("resources/custom/node-status/temp.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<div style="display: flex"><div style="flex:1">${result.adapterNode}</div><div style="flex: 1"><span if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" style="display: inline-block; color: #0000dd">&nbsp; <span style="color: black">${result.statusMessage}</span> </span><span>&nbsp; <a if.one-way="result.statusMessage === \'ERROR\'" class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)">ERROR: ${result.statusDescription} </a></span><span if.one-way="[\'ERROR\',\'COMPLETED\',\'FINISHED\'].indexOf(result.statusMessage) === -1">&nbsp; <span style="color: #00dd00">${result.statusMessage}</span></span></div><div style="flex:1"><span if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" style="display: inline-block; color: #0000dd">&nbsp; ${result.count | count}</span></div></div><patient-count if.one-way="result.statusMessage === \'COMPLETED\' || result.statusMessage === \'FINISHED\'" result.one-way="result"><div style="clear: both; margin-left: 30px; float: left; height: 16px; line-height: 16px">Patient Count: <font color="#0000dd">- ${result.count | count}</font></div></patient-count><error if.one-way="result.statusMessage === \'ERROR\'" result.one-way="result">&nbsp;- <span title="${result.statusDescription}"><b><a class="query-error-anchor" href="#" style="color:#ff0000" click.delegate="publish(commands.i2b2.showError, result)"><b><span color="#ff0000">ERROR: ${result.statusDescription}</span></b></a></b></span></error><span if.one-way="[\'ERROR\',\'COMPLETED\',\'FINISHED\'].indexOf(result.statusMessage) === -1">&nbsp;- <span style="color: #00dd00">${result.statusMessage}</span></span>'})}(),System.register("resources/index.js",[],function(a,b){"use strict";function c(a){var b="converters",c=["box-style.converter","count-value-converter","datetime.value.converter","result-style.converter","result-value.converter","truncate.converter"];a.globalResources.apply(a,c.map(function(a){return"./"+b+"/"+a}));var d="custom",e=["breakdown/breakdown","node-result/node-result","node-status/node-status"];a.globalResources.apply(a,e.map(function(a){return"./"+d+"/"+a}))}return a("configure",c),{setters:[],execute:function(){}}}),System.register("services/queries.model.js",["aurelia-event-aggregator","repository/qep.repository","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QEPRepository},function(a){f=a.notifications}],execute:function(){a("QueriesModel",(h=g=function b(a,d,e){var f=this;c(this,b);var g=d,h=40,i=0,j=0,k=null;b.prototype.load=function(){return g.fetchPreviousQueries(f.maxQueriesPerFetch()+f.loadedCount()).then(function(a){return j=a.rowCount,i=a.queryResults.length,a})["catch"](function(a){return console.log(a)}).then(l).then(function(b){k=b,a.publish(e.shrine.queriesReceived,k)})},b.prototype.totalQueries=function(){return j},b.prototype.loadedCount=function(){return i},b.prototype.maxQueriesPerFetch=function(){return h},b.prototype.moreToLoad=function(){return i<j},b.prototype.hasData=function(){return null!==k&&void 0!==k};var l=function(a){arguments.length>1&&void 0!==arguments[1]?arguments[1]:6;return new Promise(function(b,c){for(var d=[],e=6,f=a.adapters,g=f.length,h=a.queryResults,i=0;i<g;i+=e){var j=m(f,i,e),k=f.slice(i,j),l=n(k,h);d.push({nodes:k,results:l})}b(d)})},m=function(a,b,c){var d=b+c;return d<a.length?d:a.length},n=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,date:b.query.dateCreated,flagged:b.query.flagged===!0,flagMessage:b.query.flagMessage||null,nodeResults:[],status:b.adaptersToResults.reduce(function(a,c){var d="FINISHED"===c.status?a.finished+1:a.finished,e="ERROR"===c.status?a.error+1:a.error;return{error:e,finished:d,total:b.adaptersToResults.length}},{error:0,finished:0,total:b.adaptersToResults.length})};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c}},g.inject=[d,e,f],i=h)),a("QueriesModel",i)}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><query-status></query-status></template>"})}(),System.register("services/container.js",["ramda"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f;return{setters:[function(a){d=a}],execute:function(){e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Container",f=function(){function a(b){c(this,a),this.__value=b}return a.of=function(b){return new a(function(){return b})},a.prototype.map=function(b){return this.hasNothing()?a.of(null):a.of(b(this.value))},a.prototype.join=function(){return this.hasNothing()?a.of(null):this.value},a.prototype.chain=function(a){return this.map(a).join()},a.prototype.hasNothing=function(){return null===this.value||void 0===this.value},a.prototype.ap=function(a){a.map(this.value)},e(a,[{key:"value",get:function(){return this.__value()}}]),a}()),a("Container",f)}}}),System.register("services/i2b2.service.js",["ramda","./container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("I2B2Service",(g=f=function b(a){c(this,b);var f=a?e.of(a):e.of(null),g=d.curry(function(a,b){return b.value?e.of(d.prop(a,b.value)):e.of(null)}),h=d.compose(g("i2b2"),g("window"),g("parent")),i=d.compose(g("CRC"),h),j=d.compose(g("events"),h),k=d.compose(g("SHRINE"),h);b.prototype.onResize=function(a){return j(f).map(function(b){return b.changedZoomWindows.subscribe(a)})},b.prototype.onHistory=function(a){return i(f).map(function(b){return b.ctrlr.history.events.onDataUpdate.subscribe(a)})},b.prototype.onQuery=function(a){return j(f).map(function(b){return b.afterQueryInit.subscribe(a)})},b.prototype.onNetworkId=function(a){return j(f).map(function(b){return b.networkIdReceived.subscribe(a)})},b.prototype.onViewSelected=function(a){return g("addEventListener",f).value?e.of(f.value.addEventListener("message",a,!1)):e.of(null)},b.prototype.onExport=function(a){return j(f).map(function(b){return b.exportQueryResult.subscribe(a)})},b.prototype.onClearQuery=function(a){return j(f).map(function(b){return b.clearQuery.subscribe(a)})},b.prototype.loadHistory=function(){return i(f).map(function(a){return a.view.history.doRefreshAll()})},b.prototype.loadQuery=function(a){return i(f).map(function(b){return b.ctrlr.QT.doQueryLoad(a)})},b.prototype.errorDetail=function(a){return k(f).map(function(b){b.plugin.errorDetail(a)})},b.prototype.renameQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.queryRename(a,!1)})},b.prototype.flagQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.Flag({queryId:a,message:""})})},b.prototype.unflagQuery=function(a){return i(f).map(function(b){return b.ctrlr.history.Unflag({queryId:a})})},b.prototype.publishQueryUnavailable=function(){return j(f).map(function(a){return a.queryResultUnavailable.fire()})},b.prototype.publishQueryAvailable=function(){return j(f).map(function(a){return a.queryResultAvailable.fire()})}},f.inject=[window],h=g)),a("I2B2Service",h)}}}),System.register("services/i2b2.pub-sub.js",["./pub-sub","./i2b2.service"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function d(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function e(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var f,g,h,i,j;return{setters:[function(a){f=a.PubSub},function(a){g=a.I2B2Service}],execute:function(){a("I2B2PubSub",(i=h=function(a){function b(e){c(this,b);for(var f=arguments.length,g=Array(f>1?f-1:0),h=1;h<f;h++)g[h-1]=arguments[h];var i=d(this,a.call.apply(a,[this].concat(g)));return i.listen=function(){e.onResize(function(a,b){return b.find(function(a){return"ADD"===a.action})?function(){return i.publish(i.notifications.i2b2.tabMax)}:function(){return i.publish(i.notifications.i2b2.tabMin)}}),e.onHistory(function(){return i.publish(i.notifications.i2b2.historyRefreshed)}),e.onQuery(function(a,b){return i.publish(i.notifications.i2b2.queryStarted,b[0].name)}),e.onNetworkId(function(a,b){return i.publish(i.notifications.i2b2.networkIdReceived,b[0])}),e.onViewSelected(function(a){return i.publish(i.notifications.i2b2.viewSelected,a.data)}),e.onExport(function(){return i.publish(i.notifications.i2b2.exportQuery)}),e.onClearQuery(function(){return i.publish(i.notifications.i2b2.clearQuery)}),i.subscribe(i.commands.i2b2.cloneQuery,function(a){return e.loadQuery(a)}),i.subscribe(i.commands.i2b2.showError,function(a){e.errorDetail(a)}),i.subscribe(i.commands.i2b2.renameQuery,function(a){return e.renameQuery(a)}),i.subscribe(i.commands.i2b2.flagQuery,function(a){return e.flagQuery(a)}),i.subscribe(i.commands.i2b2.unflagQuery,function(a){return e.unflagQuery(a)}),i.subscribe(i.notifications.shrine.queryUnavailable,function(){return e.publishQueryUnavailable()}),i.subscribe(i.notifications.shrine.queryAvailable,function(){return e.publishQueryAvailable()})},i}return e(b,a),b}(f),h.inject=[g],j=i)),a("I2B2PubSub",j)}}}),System.register("services/query-export.js",["./pub-sub"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function d(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function e(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}var f,g,h;return{setters:[function(a){f=a.PubSub}],execute:function(){a("QueryExport",g=function(a){function b(){c(this,b);for(var e=arguments.length,f=Array(e),g=0;g<e;g++)f[g]=arguments[g];return d(this,a.call.apply(a,[this].concat(f)))}return e(b,a),b.prototype.listen=function(){this.subscribe(this.commands.shrine.exportResult,h)},b}(f)),a("QueryExport",g),h=function(a){var b=a.nodes.sort(),c=new Map,d=function(a){var b=a.resultType.i2b2Options.description;return b},e=function(a,b){return d(a)<=d(b)?-1:1};b.forEach(function(a){var b=a.breakdowns,d=void 0===b?[]:b;d.sort(e).forEach(function(a){var b,d=a.resultType.i2b2Options.description,e=a.results;return c.has(d)?(b=c.get(d)).add.apply(b,e.map(function(a){return a.dataKey}).sort()):c.set(d,new Set(e.map(function(a){return a.dataKey}).sort()))})});var f="data:text/csv;charset=utf-8,SHRINE QUERY RESULTS (OBFUSCATED PATIENT COUNTS),"+[""].concat(b.map(function(a){return a.adapterNode}).join(",")),g="\nAll Patients,"+[""].concat(b.map(function(a){return a.count?a.count>0?a.count:0:"unavailable"}).join(",")),h=[];c.forEach(function(a,c){h.push.apply(h,[""].concat(Array.from(a).map(function(a){var d=c.split(" ").shift()+","+a,e=b.map(function(b){var d=b.breakdowns,e=void 0===d?[]:d,f=e.find(function(a){var b=a.resultType.i2b2Options.description;a.results;return b===c}),g=f?f.results.find(function(b){return b.dataKey===a}):void 0;return g?g.value>0?g.value:0:"unavailable"});return d+","+e.join(",")})))});var i=encodeURI(""+f+g+h.join("\n")),j=document.createElement("a");j.setAttribute("href",i),j.setAttribute("download","export.csv"),document.body.appendChild(j),j.click(),document.body.removeChild(j)}}}}),System.register("shell.js",["services/i2b2.pub-sub","services/query-export"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.I2B2PubSub},function(a){e=a.QueryExport}],execute:function(){a("Shell",(g=f=function b(a,d){c(this,b),a.listen(),d.listen()},f.inject=[d,e],h=g)),a("Shell",h)}}}),System.register("views/index.js",[],function(a,b){"use strict";function c(a){var b=["views/query-status/query-status"];a.globalResources.apply(a,b)}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[function(a){d=a.QEPRepository}],execute:function(){a("MailToService",(f=e=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}(),e.inject=[d],g=f)),a("MailToService",g)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n        \n\n***Never send patient information, passwords, or other sensitive information by email****\n        \nName:\n        \nTitle:\n        \nUser name (to log into SHRINE):\n        \nTelephone Number (optional):\n        \nPreferred email address (optional):\n        \n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.MailToService},function(a){e=a.MailConfig}],execute:function(){a("MailTo",(g=f=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){window.top.location="mailto:"+b+"?subject="+a.config.subject+"&body="+a.config.body})},a}(),f.inject=[d,e],h=g)),a("MailTo",h)}}}),function(){var a=System.amdDefine;a("views/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div style="height: 100%; overflow: auto" class="query-status"><div style="display: flex" if.one-way="status.query.queryName"><div style="flex:1">Status of Query ${status.query.queryName | truncate} <span if.one-way="nodes.length"><br>at Each Institution:</span></div><div style="flex:1" if.one-way="nodes.length">Last Updated on: ${status.updated | dateTime}</div><div style="flex:1" if.one-way="!nodes.length">Waiting on response from network...</div></div><br><node-status repeat.for="node of nodes" result.one-way="node"></node-status><span if.one-way="nodes.length"><br><span>Completed query counts and breakdowns are shown below:</span><br></span><node-result repeat.for="node of nodes" result.one-way="node" query-name.one-way="status.query.queryName"></node-result></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.HttpClient},function(a){}],execute:function(){e=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=f=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return this.http.fetch("qep/queryResults?limit="+a+"&skip="+b,{method:"get"}).then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchNetworkId=function(a){return this.http.fetch("qep/networkId?queryName='"+a+"'",{method:"get"}).then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchQuery=function(a,b,c){return this.http.fetch("qep/queryResult/"+a+"?timeoutSeconds="+b+"&afterVersion="+c,{method:"get"}).then(function(a){var b=a.url,c=a.statusText,d=a.status,e=a.ok;return console.log("fetchQuery: "+b+" - "+e+" - "+d+" - "+c),a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail",{method:"get"}).then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},e(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}(),f.inject=[d],h=g)),a("QEPRepository",h)}}}),System.register("services/query-status.model.js",["aurelia-event-aggregator","repository/qep.repository","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QEPRepository},function(a){f=a.commands,g=a.notifications}],execute:function(){h=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatusModel",(j=i=function b(a,d,e){c(this,b);var g=function(b){return a.publish(e.shrine.queryReceived,b)},i=function(a){return new Promise(function(b,c){var d=a.results,e=a.dataVersion,f=a.query,g=function(a,b){return a.adapterNode.toUpperCase()<=b.adapterNode.toUpperCase()?-1:1},i=0===d.length?[]:[].concat(d.sort(g)),j=a.isComplete,k=h({},f,{complete:j});b({query:k,nodes:i,dataVersion:e})})},j=function(a){d.fetchQuery(a.networkId,a.timeoutSeconds,a.dataVersion).then(function(a){return i(a)})["catch"](function(a){return console.log("ERROR: "+a)}).then(function(a){return g(a)})},k=function(){a.subscribe(f.shrine.fetchQuery,j)};k()},i.inject=[d,e,g],k=j)),a("QueryStatusModel",k)}}}),System.register("services/shrine.messages.js",[],function(a,b){"use strict";var c,d;return{setters:[],execute:function(){a("notifications",c={i2b2:{tabMax:"notification.from.i2b2.tab.max",tabMin:"notification.from.i2b2.tab.min",viewSelected:"notification.from.i2b2.tab.selected",historyRefreshed:"notification.from.i2b2.history.refreshed",queryStarted:"notification.from.i2b2.query.started",messageReceived:"notification.from.i2b2.message.received",networkIdReceived:"notification.from.i2b2.networkId.receieved",exportQuery:"notification.from.i2b2.export.query",clearQuery:"notification.from.i2b2.clear.query"
-},shrine:{queriesReceived:"notification.from.shrine.queries.received",queryReceived:"notification.from.shrine.query.recieved",queryUnavailable:"notification.from.shrine.query.unavailable",queryAvailable:"notification.from.shrine.query.available"}}),a("notifications",c),a("commands",d={i2b2:{cloneQuery:"command.to.i2b2.clone.query",showError:"command.to.i2b2.show.error",flagQuery:"command.to.i2b2.flag.query",unflagQuery:"command.to.i2b2.unflag.query",renameQuery:"command.to.i2b2.rename.query"},shrine:{fetchQuery:"command.to.shrine.fetch.query",exportResult:"command.to.shrine.export.result"}}),a("commands",d)}}}),System.register("services/pub-sub.js",["aurelia-event-aggregator","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.commands,f=a.notifications}],execute:function(){a("PubSub",(h=g=function b(a,d,e){c(this,b),this.commands=d,this.notifications=e,this.publish=function(b,c){return a.publish(b,c)},this.subscribe=function(b,c){return a.subscribe(b,c)}},g.inject=[d,e,f],i=h)),a("PubSub",i)}}}),System.register("views/query-status/query-status.js",["aurelia-framework","services/query-status.model","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w;return{setters:[function(a){h=a.customElement,i=a.observable},function(a){j=a.QueryStatusModel},function(a){k=a.PubSub}],execute:function(){l=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatus",(m=h("query-status"),s=m((r=q=function(a){function b(f){d(this,b);for(var g=arguments.length,h=Array(g>1?g-1:0),i=1;i<g;i++)h[i-1]=arguments[i];var j=e(this,a.call.apply(a,[this].concat(h)));return c(j,"nodes",p,j),v.set(j,{isDevEnv:document.location.href.includes("http://localhost:8000/"),exportAvailable:!1}),j}return f(b,a),b.prototype.nodesChanged=function(a,b){return a&&a.length?(v.get(this).exportAvailable=!0,void this.publish(this.notifications.shrine.queryAvailable)):(v.get(this).exportAvailable=!1,void this.publish(this.notifications.shrine.queryUnavailable))},b.prototype.attached=function(){var a=this;this.subscribe(this.notifications.i2b2.queryStarted,function(b){a.status=w().status,a.nodes=w().nodes,a.status.query.queryName=b}),this.subscribe(this.notifications.i2b2.networkIdReceived,function(b){if(!a.status||!a.status.canceled){var c=b.networkId;a.status.query.networkId=c,a.nodes=w().nodes,a.publish(a.commands.shrine.fetchQuery,{networkId:c,timeoutSeconds:t,dataVersion:u})}}),this.subscribe(this.notifications.i2b2.exportQuery,function(){var b=a.nodes;a.publish(a.commands.shrine.exportResult,{nodes:b})}),this.subscribe(this.notifications.i2b2.clearQuery,function(){a.status=l({},w(),{canceled:!0})}),this.subscribe(this.notifications.shrine.queryReceived,function(b){var c=b.query,d=b.nodes,e=b.dataVersion,f=void 0===e?u:e,g=b.complete,h=b.query.networkId,i=t;if(h===a.status.query.networkId&&!a.status.canceled){var j=Number(new Date);Object.assign(a.status,{query:c,updated:j}),a.nodes=d,g||a.publish(a.commands.shrine.fetchQuery,{networkId:h,dataVersion:f,timeoutSeconds:i})}}),v.get(this).isDevEnv&&(this.publish(this.notifications.i2b2.queryStarted,"started query"),window.setTimeout(function(){return a.publish(a.notifications.i2b2.networkIdReceived,{networkId:"2421519216383772161",name:"started query"})},2e3))},b}(k),q.inject=[j],o=r,p=g(o.prototype,"nodes",[i],{enumerable:!0,initializer:null}),n=o))||n)),a("QueryStatus",s),t=15,u=-1,v=new WeakMap,w=function(a){return{status:{query:{networkId:null,queryName:null,updated:null,complete:!1,canceled:!1}},nodes:[]}}}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li if.bind="context.isCount"><a click.delegate="refreshHistory()" href="#"><i class="fa fa-bar-chart-o"></i>Breakdown</a></li><li click.delegate="cloneQuery(context.query.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="renameQuery(context.query.id)" href="#"><i class="fa fa-edit"></i> Rename</a></li><!--li><a click.delegate="flagQuery(context.query.id)" href="#"><i class="fa fa-flag"></i> Flag</a></li--><!--li><a click.delegate="unflagQuery(context.query.id)" href="#"><i class="fa fa-flag-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","aurelia-event-aggregator","common/shrine.messages"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m,n;return{setters:[function(a){f=a.bindable},function(a){g=a.EventAggregator},function(a){h=a.commands}],execute:function(){a("ContextMenu",(l=k=function b(a,c){var e=this;d(this,b),m.call(this),b.prototype.cloneQuery=function(b){a.publish(c.i2b2.cloneQuery,b),e.context["class"]="hide"},b.prototype.renameQuery=function(b){a.publish(c.i2b2.renameQuery,b),e.context["class"]="hide"},b.prototype.flagQuery=function(b){a.publish(c.i2b2.flagQuery,b),e.context["class"]="hide"},b.prototype.unflagQuery=function(b){a.publish(c.i2b2.unflagQuery,b),e.context["class"]="hide"}},k.inject=[g,h],m=function(){c(this,"context",j,this)},i=l,j=e(i.prototype,"context",[f],{enumerable:!0,initializer:null}),n=i)),a("ContextMenu",n)}}}),System.register("views/query-viewer/date.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY")},a}()),a("DateValueConverter",e)}}}),function(){var a=System.amdDefine;a("views/query-viewer/paginator/paginator.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"><div class="paginator"><ol class="btn-group"><li class="btn-group__item" click.delegate="pageIndex = index - 1"><i class="i-chevron-left"></i></li><li repeat.for="page of pages" class="btn-group__item" click.delegate="pageIndex = $index"><button class="btn btn--basic ${index === $index? \'current\' : \'\'}">${$index + 1}</button></li><li class="btn-group__item" click.delegate="pageIndex = index + 1"><i class="i-chevron-right"></i></li></ol></div></template>'})}(),System.register("views/query-viewer/paginator/paginator.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable}],execute:function(){g=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Paginator",(k=j=function(){function a(b){var e=this;d(this,a),c(this,"pages",i,this),a.prototype.init=function(){e.index=0,e.element=b},this.init()}return g(a,[{key:"pageIndex",set:function(a){var b=this.pages.length-1;this.index=a<0?0:a>b?b:a,this.element.dispatchEvent(new CustomEvent("paginator-click",{detail:{index:this.index},bubbles:!0,cancelable:!0}))}}]),a}(),j.inject=[Element],h=k,i=e(h.prototype,"pages",[f],{enumerable:!0,initializer:null}),l=h)),a("Paginator",l)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="tooltip"><span ref="tooltipContent" data-line1="Total: ${total}" data-line2="Available: ${finished}, Error: ${error}, Pending: ${pending}"><svg viewbox="0 0 35 35" class="query-status"><circle cx="18" cy="16" r="12" class="countdown__background"/><circle cx="18" cy="16" r="12" class="error__progress" css="stroke-dashoffset: ${errorOffset}"/><circle cx="18" cy="16" r="12" class="ready__progress" css="stroke-dashoffset: ${readyOffset}"/></svg></span></div></template>'})}(),System.register("views/query-viewer/query-status/query-status.js",["aurelia-framework","ramda"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.bindable},function(a){g=a}],execute:function(){a("QueryStatus",(k=j=function(){function a(b){d(this,a),l.call(this),this.floor=b.floor}return a.prototype.attached=function(){var a=75,b=g.curry(function(a,b,c,d){return a(d/c*b)})(this.floor,a,this.status.total),c=this.status,d=b(c.finished),e=b(c.error);this.readyOffset=100-d,this.errorOffset=this.readyOffset-e,this.finished=c.finished,this.error=c.error,this.pending=c.total-(c.finished+c.error),this.total=c.total},a}(),j.inject=[Math],l=function(){c(this,"status",i,this)},h=k,i=e(h.prototype,"status",[f],{enumerable:!0,initializer:null}),m=h)),a("QueryStatus",m)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10,maxQueriesPerScroll:40}),a("QueryViewerConfig",c)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><require from="views/query-viewer/paginator/paginator"></require><require from="views/query-viewer/date.converter"></require><require from="views/query-viewer/query-status/query-status"></require><span class="query-viewer"><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><paginator pages.bind="pages" paginator-click.delegate="updatePage($event)" if.bind="pages.length > 1"></paginator></div><div class="flex-table"><div class="flex-table-row node-header"><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div repeat.for="node of page.nodes" class="flex-table-item">${node}</div></div></div><div class="flex-table query-viewer ${vertStyle}" scroll.trigger="onScroll($event)"><div><!-- @todo: create running query component --><div class="flex-table-row" if.bind="runningQueryName"><div class="flex-table-item"></div><div class="flex-table-item">${runningQueryName}</div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item" repeat.for="node of page.nodes" style="color: #00FF00">RUNNING</div></div><div repeat.for="result of page.results" class="flex-table-row"><div class="flex-table-item"><i if.bind="result.flagged" class="fa fa-flag"></i> <i if.bind="!result.flagged" class="fa fa-flag-o"></i></div><div class="flex-table-item" click.delegate="context = getContext($event, result)"><div class="ellipses">${result.name}</div></div><div class="flex-table-item" click.delegate="context = getContext($event, result)">${result.date | date}</div><div class="flex-table-item"><query-status status.bind="result.status"></query-status></div><div repeat.for="nodeResult of result.nodeResults" class="flex-table-item" click.delegate="context = getContext($event, result)"><a if.bind="nodeResult.status === \'ERROR\'" style="text-decoration: underline; color:red" click.delegate="publishError($event, nodeResult)">${nodeResult.status} </a>${nodeResult}</div></div><div class="flex-table-row" if.bind="loadingInfiniteScroll"><div style="width: 100%; text-align: center; font-size: 1.5rem; background:rgba(217, 236, 240, .05); text-align:center; color: rgba(0, 0, 0, .20)"><i class="fa fa-spinner fa-spin" style="color: inherit"></i> Loading...</div></div></div></div><!-- context menu --><context-menu context.bind="context"></context-menu></span></template>'})}(),System.register("views/query-viewer/scroll.service.js",["ramda","common/container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("ScrollService",(g=f=function b(){c(this,b)},f.either=d.curry(function(a,b,c){return e.of(d.prop(a,c)||b)}),f.target=function(a,b){return h.either("target",b,b).chain(function(b){return h.either(a,0,b)})},f.clientHeight=function(a){return h.target("clientHeight",a)},f.scrollHeight=function(a){return h.target("scrollHeight",a)},f.scrollTop=function(a){return h.target("scrollTop",a)},f.userScroll=function(a){return h.clientHeight(a).map(function(b){return b+h.scrollTop(a).value})},f.scrollRatio=function(a){return h.userScroll(a).map(function(b){return b/h.scrollHeight(a).value})},h=g)),a("ScrollService",h)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-event-aggregator","common/queries.model","./scroll.service","common/shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QueriesModel},function(a){f=a.ScrollService},function(a){g=a.notifications,h=a.commands}],execute:function(){a("QueryViewer",(j=i=function(){function a(b,d,e,g){var h=this;c(this,a),a.prototype.init=function(){h.pageIndex=0,h.showLoader=!0,h.vertStyle="v-min",h.runningQueryName=null},this.init(),a.prototype.setToPage=function(a){h.pageIndex=a,h.page=h.pages[h.pageIndex]};var i=function(a){return 1===f.scrollRatio(a).value};a.prototype.onScroll=function(a){i(a)&&!h.loadingInfiniteScroll&&d.moreToLoad()&&(h.loadingInfiniteScroll=!0,d.load())},a.prototype.publishError=function(a,c){return a.stopPropagation(),b.publish(g.i2b2.showError,c)},a.prototype.getContext=function(a,b,c){return{x:a.pageX,y:a.pageY,"class":"show",query:b,isCount:void 0!==c,count:c}},b.subscribe(e.i2b2.historyRefreshed,function(){return d.load()}),b.subscribe(e.i2b2.tabMax,function(){return h.vertStyle="v-full"}),b.subscribe(e.i2b2.tabMin,function(){return h.vertStyle="v-min"}),b.subscribe(e.i2b2.queryStarted,function(a){return h.runningQueryName=a}),b.subscribe(e.shrine.queriesReceived,function(a){h.pages=a,h.page=h.pages[0],h.runningQueryName=null,h.loadingInfiniteScroll=!1,h.showLoader=!1})}return a.prototype.updatePage=function(a){a.stopPropagation();var b=event.detail.index;this.page=this.pages[b]},a}(),i.inject=[d,e,g,h],k=j)),a("QueryViewer",k)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/result-row/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/row-loader.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return""})}();
\ No newline at end of file
+},shrine:{queriesReceived:"notification.from.shrine.queries.received",queryReceived:"notification.from.shrine.query.recieved",queryUnavailable:"notification.from.shrine.query.unavailable",queryAvailable:"notification.from.shrine.query.available"}}),a("notifications",c),a("commands",d={i2b2:{cloneQuery:"command.to.i2b2.clone.query",showError:"command.to.i2b2.show.error",flagQuery:"command.to.i2b2.flag.query",unflagQuery:"command.to.i2b2.unflag.query",renameQuery:"command.to.i2b2.rename.query"},shrine:{fetchQuery:"command.to.shrine.fetch.query",exportResult:"command.to.shrine.export.result"}}),a("commands",d)}}}),System.register("services/pub-sub.js",["aurelia-event-aggregator","./shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.commands,f=a.notifications}],execute:function(){a("PubSub",(h=g=function b(a,d,e){c(this,b),this.commands=d,this.notifications=e,this.publish=function(b,c){return a.publish(b,c)},this.subscribe=function(b,c){return a.subscribe(b,c)}},g.inject=[d,e,f],i=h)),a("PubSub",i)}}}),System.register("views/query-status/query-status.js",["aurelia-framework","services/query-status.model","services/pub-sub"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b){if(!a)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!b||"object"!=typeof b&&"function"!=typeof b?a:b}function f(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}function g(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w;return{setters:[function(a){h=a.customElement,i=a.observable},function(a){j=a.QueryStatusModel},function(a){k=a.PubSub}],execute:function(){l=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},a("QueryStatus",(m=h("query-status"),s=m((r=q=function(a){function b(f){d(this,b);for(var g=arguments.length,h=Array(g>1?g-1:0),i=1;i<g;i++)h[i-1]=arguments[i];var j=e(this,a.call.apply(a,[this].concat(h)));return c(j,"nodes",p,j),v.set(j,{isDevEnv:document.location.href.includes("http://localhost:8000/"),exportAvailable:!1}),j}return f(b,a),b.prototype.nodesChanged=function(a,b){return a&&a.length?(v.get(this).exportAvailable=!0,void this.publish(this.notifications.shrine.queryAvailable)):(v.get(this).exportAvailable=!1,void this.publish(this.notifications.shrine.queryUnavailable))},b.prototype.attached=function(){var a=this;this.subscribe(this.notifications.i2b2.queryStarted,function(b){a.status=w().status,a.nodes=w().nodes,a.status.query.queryName=b}),this.subscribe(this.notifications.i2b2.networkIdReceived,function(b){var c=!a.status;if(c&&(a.status=w()),!a.status.canceled){var d=b.networkId;a.status.query.networkId=d,a.nodes=w().nodes,a.publish(a.commands.shrine.fetchQuery,{networkId:d,timeoutSeconds:t,dataVersion:u})}}),this.subscribe(this.notifications.i2b2.exportQuery,function(){var b=a.nodes;a.publish(a.commands.shrine.exportResult,{nodes:b})}),this.subscribe(this.notifications.i2b2.clearQuery,function(){a.status=l({},w(),{canceled:!0})}),this.subscribe(this.notifications.shrine.queryReceived,function(b){var c=b.query,d=b.nodes,e=b.dataVersion,f=void 0===e?u:e,g=b.complete,h=b.query.networkId,i=t;if(h===a.status.query.networkId&&!a.status.canceled){var j=Number(new Date);Object.assign(a.status,{query:c,updated:j}),a.nodes=d,g||a.publish(a.commands.shrine.fetchQuery,{networkId:h,dataVersion:f,timeoutSeconds:i})}}),v.get(this).isDevEnv&&(this.publish(this.notifications.i2b2.queryStarted,"started query"),window.setTimeout(function(){return a.publish(a.notifications.i2b2.networkIdReceived,{networkId:"2421519216383772161",name:"started query"})},2e3))},b}(k),q.inject=[j],o=r,p=g(o.prototype,"nodes",[i],{enumerable:!0,initializer:null}),n=o))||n)),a("QueryStatus",s),t=15,u=-1,v=new WeakMap,w=function(a){return{status:{query:{networkId:null,queryName:null,updated:null,complete:!1,canceled:!1}},nodes:[]}}}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li if.bind="context.isCount"><a click.delegate="refreshHistory()" href="#"><i class="fa fa-bar-chart-o"></i>Breakdown</a></li><li click.delegate="cloneQuery(context.query.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="renameQuery(context.query.id)" href="#"><i class="fa fa-edit"></i> Rename</a></li><!--li><a click.delegate="flagQuery(context.query.id)" href="#"><i class="fa fa-flag"></i> Flag</a></li--><!--li><a click.delegate="unflagQuery(context.query.id)" href="#"><i class="fa fa-flag-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","aurelia-event-aggregator","common/shrine.messages"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m,n;return{setters:[function(a){f=a.bindable},function(a){g=a.EventAggregator},function(a){h=a.commands}],execute:function(){a("ContextMenu",(l=k=function b(a,c){var e=this;d(this,b),m.call(this),b.prototype.cloneQuery=function(b){a.publish(c.i2b2.cloneQuery,b),e.context["class"]="hide"},b.prototype.renameQuery=function(b){a.publish(c.i2b2.renameQuery,b),e.context["class"]="hide"},b.prototype.flagQuery=function(b){a.publish(c.i2b2.flagQuery,b),e.context["class"]="hide"},b.prototype.unflagQuery=function(b){a.publish(c.i2b2.unflagQuery,b),e.context["class"]="hide"}},k.inject=[g,h],m=function(){c(this,"context",j,this)},i=l,j=e(i.prototype,"context",[f],{enumerable:!0,initializer:null}),n=i)),a("ContextMenu",n)}}}),System.register("views/query-viewer/date.converter.js",["moment"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e;return{setters:[function(a){d=a["default"]}],execute:function(){a("DateValueConverter",e=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return d(a).format("MM/DD/YYYY")},a}()),a("DateValueConverter",e)}}}),function(){var a=System.amdDefine;a("views/query-viewer/paginator/paginator.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css"><div class="paginator"><ol class="btn-group"><li class="btn-group__item" click.delegate="pageIndex = index - 1"><i class="i-chevron-left"></i></li><li repeat.for="page of pages" class="btn-group__item" click.delegate="pageIndex = $index"><button class="btn btn--basic ${index === $index? \'current\' : \'\'}">${$index + 1}</button></li><li class="btn-group__item" click.delegate="pageIndex = index + 1"><i class="i-chevron-right"></i></li></ol></div></template>'})}(),System.register("views/query-viewer/paginator/paginator.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l;return{setters:[function(a){f=a.bindable}],execute:function(){g=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("Paginator",(k=j=function(){function a(b){var e=this;d(this,a),c(this,"pages",i,this),a.prototype.init=function(){e.index=0,e.element=b},this.init()}return g(a,[{key:"pageIndex",set:function(a){var b=this.pages.length-1;this.index=a<0?0:a>b?b:a,this.element.dispatchEvent(new CustomEvent("paginator-click",{detail:{index:this.index},bubbles:!0,cancelable:!0}))}}]),a}(),j.inject=[Element],h=k,i=e(h.prototype,"pages",[f],{enumerable:!0,initializer:null}),l=h)),a("Paginator",l)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-status/query-status.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="tooltip"><span ref="tooltipContent" data-line1="Total: ${total}" data-line2="Available: ${finished}, Error: ${error}, Pending: ${pending}"><svg viewbox="0 0 35 35" class="query-status"><circle cx="18" cy="16" r="12" class="countdown__background"/><circle cx="18" cy="16" r="12" class="error__progress" css="stroke-dashoffset: ${errorOffset}"/><circle cx="18" cy="16" r="12" class="ready__progress" css="stroke-dashoffset: ${readyOffset}"/></svg></span></div></template>'})}(),System.register("views/query-viewer/query-status/query-status.js",["aurelia-framework","ramda"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.bindable},function(a){g=a}],execute:function(){a("QueryStatus",(k=j=function(){function a(b){d(this,a),l.call(this),this.floor=b.floor}return a.prototype.attached=function(){var a=75,b=g.curry(function(a,b,c,d){return a(d/c*b)})(this.floor,a,this.status.total),c=this.status,d=b(c.finished),e=b(c.error);this.readyOffset=100-d,this.errorOffset=this.readyOffset-e,this.finished=c.finished,this.error=c.error,this.pending=c.total-(c.finished+c.error),this.total=c.total},a}(),j.inject=[Math],l=function(){c(this,"status",i,this)},h=k,i=e(h.prototype,"status",[f],{enumerable:!0,initializer:null}),m=h)),a("QueryStatus",m)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10,maxQueriesPerScroll:40}),a("QueryViewerConfig",c)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><require from="views/query-viewer/paginator/paginator"></require><require from="views/query-viewer/date.converter"></require><require from="views/query-viewer/query-status/query-status"></require><span class="query-viewer"><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><paginator pages.bind="pages" paginator-click.delegate="updatePage($event)" if.bind="pages.length > 1"></paginator></div><div class="flex-table"><div class="flex-table-row node-header"><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item"></div><div repeat.for="node of page.nodes" class="flex-table-item">${node}</div></div></div><div class="flex-table query-viewer ${vertStyle}" scroll.trigger="onScroll($event)"><div><!-- @todo: create running query component --><div class="flex-table-row" if.bind="runningQueryName"><div class="flex-table-item"></div><div class="flex-table-item">${runningQueryName}</div><div class="flex-table-item"></div><div class="flex-table-item"></div><div class="flex-table-item" repeat.for="node of page.nodes" style="color: #00FF00">RUNNING</div></div><div repeat.for="result of page.results" class="flex-table-row"><div class="flex-table-item"><i if.bind="result.flagged" class="fa fa-flag"></i> <i if.bind="!result.flagged" class="fa fa-flag-o"></i></div><div class="flex-table-item" click.delegate="context = getContext($event, result)"><div class="ellipses">${result.name}</div></div><div class="flex-table-item" click.delegate="context = getContext($event, result)">${result.date | date}</div><div class="flex-table-item"><query-status status.bind="result.status"></query-status></div><div repeat.for="nodeResult of result.nodeResults" class="flex-table-item" click.delegate="context = getContext($event, result)"><a if.bind="nodeResult.status === \'ERROR\'" style="text-decoration: underline; color:red" click.delegate="publishError($event, nodeResult)">${nodeResult.status} </a>${nodeResult}</div></div><div class="flex-table-row" if.bind="loadingInfiniteScroll"><div style="width: 100%; text-align: center; font-size: 1.5rem; background:rgba(217, 236, 240, .05); text-align:center; color: rgba(0, 0, 0, .20)"><i class="fa fa-spinner fa-spin" style="color: inherit"></i> Loading...</div></div></div></div><!-- context menu --><context-menu context.bind="context"></context-menu></span></template>'})}(),System.register("views/query-viewer/scroll.service.js",["ramda","common/container"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a},function(a){e=a.Container}],execute:function(){a("ScrollService",(g=f=function b(){c(this,b)},f.either=d.curry(function(a,b,c){return e.of(d.prop(a,c)||b)}),f.target=function(a,b){return h.either("target",b,b).chain(function(b){return h.either(a,0,b)})},f.clientHeight=function(a){return h.target("clientHeight",a)},f.scrollHeight=function(a){return h.target("scrollHeight",a)},f.scrollTop=function(a){return h.target("scrollTop",a)},f.userScroll=function(a){return h.clientHeight(a).map(function(b){return b+h.scrollTop(a).value})},f.scrollRatio=function(a){return h.userScroll(a).map(function(b){return b/h.scrollHeight(a).value})},h=g)),a("ScrollService",h)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-event-aggregator","common/queries.model","./scroll.service","common/shrine.messages"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.EventAggregator},function(a){e=a.QueriesModel},function(a){f=a.ScrollService},function(a){g=a.notifications,h=a.commands}],execute:function(){a("QueryViewer",(j=i=function(){function a(b,d,e,g){var h=this;c(this,a),a.prototype.init=function(){h.pageIndex=0,h.showLoader=!0,h.vertStyle="v-min",h.runningQueryName=null},this.init(),a.prototype.setToPage=function(a){h.pageIndex=a,h.page=h.pages[h.pageIndex]};var i=function(a){return 1===f.scrollRatio(a).value};a.prototype.onScroll=function(a){i(a)&&!h.loadingInfiniteScroll&&d.moreToLoad()&&(h.loadingInfiniteScroll=!0,d.load())},a.prototype.publishError=function(a,c){return a.stopPropagation(),b.publish(g.i2b2.showError,c)},a.prototype.getContext=function(a,b,c){return{x:a.pageX,y:a.pageY,"class":"show",query:b,isCount:void 0!==c,count:c}},b.subscribe(e.i2b2.historyRefreshed,function(){return d.load()}),b.subscribe(e.i2b2.tabMax,function(){return h.vertStyle="v-full"}),b.subscribe(e.i2b2.tabMin,function(){return h.vertStyle="v-min"}),b.subscribe(e.i2b2.queryStarted,function(a){return h.runningQueryName=a}),b.subscribe(e.shrine.queriesReceived,function(a){h.pages=a,h.page=h.pages[0],h.runningQueryName=null,h.loadingInfiniteScroll=!1,h.showLoader=!1})}return a.prototype.updatePage=function(a){a.stopPropagation();var b=event.detail.index;this.page=this.pages[b]},a}(),i.inject=[d,e,g,h],k=j)),a("QueryViewer",k)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/result-row/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/result-row/loading-bar/row-loader.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return""})}();
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.js b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.js
index 9e95c179e..6e3b7f5a7 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.js
@@ -1,70 +1,72 @@
 import { customElement, observable} from 'aurelia-framework';
 import { QueryStatusModel } from 'services/query-status.model';
 import { PubSub } from 'services/pub-sub';
 @customElement('query-status')
 export class QueryStatus extends PubSub {
     @observable nodes
     static inject = [QueryStatusModel];
     constructor(queryStatus, ...rest) {
         super(...rest);
         me.set(this, {
             isDevEnv: document.location.href.includes('http://localhost:8000/'),
             exportAvailable: false
         });
     }
     nodesChanged(newValue, oldValue) {
         if(!newValue || !newValue.length) {
             me.get(this).exportAvailable = false;
             this.publish(this.notifications.shrine.queryUnavailable);
             return;
         }
         me.get(this).exportAvailable = true;
         this.publish(this.notifications.shrine.queryAvailable);
     }
     attached() {
         // -- subscribers -- //
         this.subscribe(this.notifications.i2b2.queryStarted, (n) => {
             this.status = initialState().status;
             this.nodes = initialState().nodes;
             this.status.query.queryName = n;
         });
 
         this.subscribe(this.notifications.i2b2.networkIdReceived, d => {
-            if(this.status && this.status.canceled) return;
+            const runningPreviousQuery = !this.status;
+            if(runningPreviousQuery) this.status = initialState();
+            if(this.status.canceled) return;
             const {networkId} = d;
             this.status.query.networkId = networkId;
             this.nodes = initialState().nodes;
             this.publish(this.commands.shrine.fetchQuery, {networkId, timeoutSeconds: TIMEOUT_SECONDS, dataVersion: DEFAULT_VERSION})
         });
 
         this.subscribe(this.notifications.i2b2.exportQuery, () => {
             const nodes = this.nodes;
             this.publish(this.commands.shrine.exportResult, {nodes});
         })
 
         this.subscribe(this.notifications.i2b2.clearQuery, () => {
             this.status = {...initialState(), ...{canceled: true}};
         })
         this.subscribe(this.notifications.shrine.queryReceived, data => {
             const {query, nodes, dataVersion = DEFAULT_VERSION, complete, query:{networkId}} = data; 
             const timeoutSeconds = TIMEOUT_SECONDS;
             if(networkId !== this.status.query.networkId || this.status.canceled) return;
             const updated = Number(new Date());
             Object.assign(this.status, {query, updated});
             this.nodes = nodes;
             if (!complete) {
                 this.publish(this.commands.shrine.fetchQuery, {networkId, dataVersion, timeoutSeconds});
             }
         });
 
         if (me.get(this).isDevEnv) {
             this.publish(this.notifications.i2b2.queryStarted, "started query");
             window.setTimeout(() => 
                 this.publish(this.notifications.i2b2.networkIdReceived, {networkId: '2421519216383772161', name: "started query"}), 2000);
         }
     }
 }
 const TIMEOUT_SECONDS = 15;
 const DEFAULT_VERSION = -1;
 const me = new WeakMap();
 const initialState = (n) => ({status: { query: { networkId: null, queryName: null, updated: null, complete: false, canceled: false}}, nodes: [] });