${result.adapterNode}
-
+
+
+ ${result.count | count}
+
+
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.html b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.html
index 88295d1a6..98ef2e663 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.html
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-status/query-status.html
@@ -1,26 +1,26 @@
Status of Query: ${status.query.queryName}
Last Updated: ${status.updated | dateTime}
Waiting on response from network...
- Query results are shown below
- **************************************************************************
+ Query results are shown below:
+
\ 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 6a280ae5a..4d4070226 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,33 +1,33 @@
import {EventAggregator} from 'aurelia-event-aggregator';
import {notifications, commands} from 'common/shrine.messages';
import {QueryStatusModel} from 'common/query-status.model';
export class QueryStatus {
static inject = [EventAggregator, notifications, commands, QueryStatusModel];
constructor(evtAgg, notifications, commands, queryStatus) {
const initialState = () => ({query: {queryName: null, updated: null, complete: false}, nodes: null});
this.status = initialState();
// -- publishers -- //
const publishFetchQuery = id => evtAgg.publish(commands.shrine.fetchQuery, id);
// -- subscribers -- //
evtAgg.subscribe(notifications.i2b2.queryStarted, (n) => {
// -- @todo: centralize the logic, investigate adding a new "status" every time -- //
this.status.query.queryName = n;
});
evtAgg.subscribe(notifications.i2b2.networkIdReceived, id => publishFetchQuery(id));
evtAgg.subscribe(notifications.shrine.queryReceived, data => {
// -- @todo: centralize the logic, investigate adding a new "status" every time -- //
this.status.query = {...this.status.query, ...data.query};
this.status.nodes = data.nodes;
this.status.updated = Number(new Date());
const complete = data.query.complete;
const networkId = data.query.networkId;
if(!complete) {
window.setTimeout(() => publishFetchQuery(networkId), 10000);
}
});
// -- for testing only -- //
- /*evtAgg.publish(notifications.i2b2.queryStarted, "started query");
- evtAgg.publish(notifications.i2b2.networkIdReceived, 1);*/
+ evtAgg.publish(notifications.i2b2.queryStarted, "started query");
+ evtAgg.publish(notifications.i2b2.networkIdReceived, 1);
}
}
\ No newline at end of file