-
+
|
|
RUNNING
|
|
|
-
-
+ |
+
${nodeResult.status}
-
- ${nodeResult | result}
- |
+ ${nodeResult | result}
+
+
+
+ |
+
+
+ Loading...
+
+ |
+
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
index b29e6cb56..dc47fe354 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.js
@@ -1,77 +1,85 @@
import { inject, computedFrom } from 'aurelia-framework';
import { QueryViewerService } from 'views/query-viewer/query-viewer.service';
import { I2B2Service } from 'common/i2b2.service.js';
import {TabsModel} from 'common/tabs.model';
import {QueryViewerModel } from './query-viewer.model';
import {ScrollService} from './scroll.service';
import {QueryViewerConfig} from './query-viewer.config';
@inject(QueryViewerService, I2B2Service, QueryViewerModel, TabsModel)
export class QueryViewer {
constructor(service, i2b2Svc, model, tabs) {
// -- init -- //
this.screenIndex = 0;
this.showCircles = false;
this.showLoader = true;
this.runningQuery = null;
this.service = service;
this.vertStyle = tabs.mode();
this.scrollRatio = 0;
+ this.queriesToLoad = model.moreToLoad;
+ this.loadingInfiniteScroll = false;
// -- fetch queries -- //
const parseResultToScreens = result => {
model.totalQueries = result.rowCount;
model.loadedCount = result.queryResults.length;
+ this.queriesToLoad = model.moreToLoad;
return this.service.getScreens(result.adapters, result.queryResults);
}
const setVM = screens => {
this.showLoader = false;
this.runningQuery = null;
this.screens = screens;
this.showCircles = this.screens.length > 1;
model.screens = screens;
model.processing = false;
+ this.loadingInfiniteScroll = model.processing;
};
const refresh = () => this.service
.fetchPreviousQueries(model.loadedCount + QueryViewerConfig.maxQueriesPerScroll)
.then(parseResultToScreens)
.then(setVM)
.catch(error => console.log(error));
- const addQuery = (event, data) => this.runningQuery = data[0].name;
+ const addQuery = (event, data) => {
+ this.runningQuery = data[0].name;
+ }
const init = () => (model.hasData) ? setVM(model.screens) : refresh();
- const loadMoreQueries = e => ScrollService.scrollRatio(e).value === 1 && model.moreToLoad && !model.processing;
+
+ const loadMoreQueries = e => ScrollService.scrollRatio(e).value === 1 && model.moreToLoad && !model.processing;
// -- scroll event -- //
this.onScroll = e => {
if(loadMoreQueries(e)){
refresh();
model.processing = true;
+ this.loadingInfiniteScroll = model.processing;
}
}
// -- add i2b2 event listener -- //
const isMinimized = e => e.action !== 'ADD';
const setVertStyle = (a, b) => this.vertStyle = b.find(isMinimized) ? 'v-min' : 'v-full';
this.errorDetail = i2b2Svc.errorDetail;
i2b2Svc.onResize(setVertStyle);
i2b2Svc.onHistory(refresh);
i2b2Svc.onQuery(addQuery);
init();
}
getContext(event, result) {
return {
x: event.pageX,
y: event.pageY,
id: result.id,
class: 'show'
};
}
}
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss
index 84099e2f0..292ecb174 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/query-viewer.scss
@@ -1,138 +1,135 @@
@import url(http://fonts.googleapis.com/css?family=Roboto:400,500,300,700);
body{
overflow: hidden;
background: rgba(255, 255, 255, 0.9);
font-family: 'Roboto', sans-serif;
}
html,
body,
.box-wrapper{
width: 100%;
height: 100%;
margin: 0;
}
.box-wrapper{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.box-wrapper > .box {
margin-top: 1%;
width: 100%;
transition: all .2s ease;
.hideextra {
white-space: nowrap;
overflow: hidden;
text-overflow:ellipsis;
}
section{
margin: 20 0 6 0;
.v-full {
height: 90vh;
}
- .v-full > table{
- padding-bottom: 10%;
- }
.v-min{
height: 100px;
}
.v-min > table {
padding-bottom: 1%;
}
.tbl-content{
overflow: auto;
margin-top: 0px;
border: 1px solid rgba(98,108,146,0.3);
}
}
table{
width:100%;
table-layout: fixed;
.tbl-header{
background-color: rgba(98,108,146, .3);
div.tbl-header{
max-width: 5rem;
}
}
tr{
background: white;
cursor: pointer;
&:hover{
background: rgba(98,108,146, .3) !important;
}
&:nth-child(odd) {background: rgba(98,108,146, .1)}
}
th{
padding: 2px 4px 4px 2px;
text-align: left;
font-weight: 500;
font-size: .75rem;
color: #626C92;
text-transform: uppercase;
border-bottom: solid 1px rgba(98,108,146,0.1);
border-left: solid 1px rgba(98,108,146,0.1);
}
td{
transition: all .5s ease;
padding: 2px;
text-align: left;
vertical-align: top;
font-weight: 300;
font-size: 12px;
color: black;
border-bottom: solid 1px rgba(98,108,146,0.1);
border-left: solid 1px rgba(98,108,146,0.1);
}
}
}
.circle-pagination {
position: absolute;
z-index: 1000;
list-style-type: none;
margin: 0;
top: -.3rem;
li {
border-radius: 50%;
border: 2px solid #626C92;
width: 12px;
height: 12px;
padding: 4px;
margin: 6px;
cursor: pointer;
float: left;
transition: all .2s ease;
&.active,
&:hover{
background: #626C92;
width: 14px;
height:14px;
}
&.active div,
& div:hover{
color:white;
}
div {
font-size: .6rem;
width: 24px;
position: relative;
left: -6px;
top: 1px;
color: #626C92;
font-weight: 600;
text-transform: capitalize;
}
}
}
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/server/data/async-queries.js b/shrine-webclient/src/main/js/server/data/async-queries.js
index 34c15891d..dd0306627 100644
--- a/shrine-webclient/src/main/js/server/data/async-queries.js
+++ b/shrine-webclient/src/main/js/server/data/async-queries.js
@@ -1,62 +1,70 @@
const institutions = require('./institutions').sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
module.exports = {
getQueryResults: getQueryResults
};
-function getQueryResults(numberOfResults = 100, numberOfInstitutions = 100) {
- let queryResults = [];
- const results = getInstutionResults(numberOfInstitutions);
- for (let i = 0; i < numberOfResults; i++) {
- let query = {
- id: i,
- name: 'Query' + i,
- results: results
- }
- queryResults.push(query);
+function getQueryResults (skip=0, numberOfQueries = 100, numberOfNodes = 100, rowCount = 500){
+ const length = numberOfNodes < institutions.length ? numberOfNodes: institutions.length;
+ const queryResults = [];
+ const adapters = institutions.slice(0, length);
+ for(let i =0; i < numberOfQueries; i ++) {
+ queryResults.push({
+ "query": {
+ "expression": "Term(\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\)",
+ "queryName": `${i} Female@19:46:33`,
+ "deleted": false,
+ "changeDate": 1490571996396,
+ "userName": "ij22",
+ "networkId": (2226563841174084000 + i),
+ "queryXml": "
SHRINE180000i2b2demoij22SessionKey:Gv6xaK4AQNjQipmypc7p22265638411740849533medication only_27th marchPATIENT_AGE_COUNT_XMLtrueAge patient breakdownCATNUM4PATIENT_COUNT_XMLfalseNumber of patientsCATNUMPATIENT_GENDER_COUNT_XMLtrueGender patient breakdownCATNUMPATIENT_RACE_COUNT_XMLtrueRace patient breakdownCATNUMPATIENT_VITALSTATUS_COUNT_XMLtrueVital Status patient breakdownCATNUMFemale@19:46:33\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\",
+ "dateCreated": 1490571996395,
+ "userDomain": "i2b2demo"
+ },
+ "adaptersToResults": getInstutionResults(adapters)
+ });
}
return {
- 'queries': queryResults
+ "adapters": adapters,
+ "queryResults": queryResults,
+ "flags": {},
+ "rowCount": rowCount
};
}
-function getInstutionResults(numberOfInstitutions = 100, resultBase = 10000000) {
- const length = numberOfInstitutions < institutions.length ? numberOfInstitutions : institutions.length;
- const resultSet = [];
- for (let i = 0; i < length; i++) {
- const institution = institutions[i];
- const result = resultBase + i;
-
- resultSet.push(getInstitutionResult(
- institution, resultBase, i,
- ind => ind % 9 === 0,
- ind => ind % 4 === 0));
- }
- return resultSet;
+const getInstutionResults = (adapters) => {
+ const adaptersToResults = [];
+ const status = i => i % 7 === 0? 'ERROR' : 'FINISHED';
+ adapters.forEach((e, i) => {
+ adaptersToResults.push({
+ "startDate": 1490984964085,
+ "count": i,
+ "networkQueryId": (7768019175359370000 + i),
+ "statusMessage": status(i),
+ "changeDate": 1490984965845,
+ "instanceId": (1000 + i),
+ "resultId": (2000 + i),
+ "status": status(i),
+ "endDate": 1490984964917,
+ "adapterNode": e,
+ "resultType": {
+ "isBreakdown": false,
+ "name": "PATIENT_COUNT_XML",
+ "id": 4,
+ "i2b2Options": {
+ "description": "Number of patients",
+ "displayType": "CATNUM"
+ }
+ }
+ });
+
+ });
+
+ return adaptersToResults;
}
-function getInstitutionResult(institution, resultBase, index, isErrorFn, isPendingFn) {
-
- let result = {
- node: institution,
- result: resultBase + index
- };
-
- if (isErrorFn(index)) {
- result.result = 'ERROR';
- }
-
- else if (isPendingFn(index)) {
- result.result = 'PENDING';
- }
-
- console.log(result);
-
- return result;
-}
-
diff --git a/shrine-webclient/src/main/js/server/data/curl-async-queries.js b/shrine-webclient/src/main/js/server/data/curl-async-queries.js
index a259e2a56..ccb969e39 100644
--- a/shrine-webclient/src/main/js/server/data/curl-async-queries.js
+++ b/shrine-webclient/src/main/js/server/data/curl-async-queries.js
@@ -1,411 +1,402 @@
module.exports = {
"adapters": [
"SHRINE QA Hub",
"SHRINE QA Node 2",
"SHRINE QA Node 3",
"SHRINE QA Node 4",
"SHRINE QA Node 5",
"SHRINE QA Node 6",
"SHRINE QA Node 7",
"SHRINE QA Node 8",
"SHRINE QA Node 9",
"SHRINE QA Node 10",
"SHRINE QA Node 11",
"shrine-qa1",
"shrine-qa2",
"shrine-qa3"
],
"queryResults": [
{
"adaptersToResults": [
{
"startDate": 1490984964085,
"count": -1,
"networkQueryId": 7768019175359373000,
"statusMessage": "ERROR",
"changeDate": 1490984965845,
"instanceId": 1899,
"resultId": 2181,
"status": "ERROR",
- "resultType": {
- "isBreakdown": false,
- "name": "PATIENT_COUNT_XML",
- "id": 4,
- "i2b2Options": {
- "description": "Number of patients",
- "displayType": "CATNUM"
- }
- },
"endDate": 1490984964917,
"adapterNode": "shrine-qa3"
},
{
"startDate": 1490984962460,
"count": -1,
"networkQueryId": 7768019175359373000,
"statusMessage": "ERROR",
"changeDate": 1490984965908,
"instanceId": 875,
"resultId": 1072,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490984963403,
"adapterNode": "shrine-qa2"
},
{
"startDate": 1490984962368,
"count": -1,
"networkQueryId": 7768019175359373000,
"statusMessage": "ERROR",
"changeDate": 1490984965923,
"instanceId": 1133,
"resultId": 1330,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490984963324,
"adapterNode": "shrine-qa1"
}
],
"query": {
"expression": "Constrained(Term(\\\\SHRINE\\SHRINE\\Diagnoses\\Certain conditions originating in the perinatal period (760-779.99)\\),Some(Modifiers(Admit Diagnosis,\\SHRINE\\Diagnoses\\Certain conditions originating in the perinatal period (760-779.99)\\%,\\\\SHRINE\\Admit Diagnosis\\)),None)",
"queryName": "Admit Diagnosis@14:29:22",
"deleted": false,
"changeDate": 1490984963326,
"userName": "ij22",
"networkId": 7768019175359373000,
"queryXml": "
SHRINE180000i2b2demoij22SessionKey:U9v3LeZcEkbdTCfWLQi777680191753593728863medication only_27th march4PATIENT_COUNT_XMLfalseNumber of patientsCATNUMAdmit Diagnosis@14:29:22\\\\SHRINE\\SHRINE\\Diagnoses\\Certain conditions originating in the perinatal period (760-779.99)\\Admit Diagnosis\\SHRINE\\Diagnoses\\Certain conditions originating in the perinatal period (760-779.99)\\%\\\\SHRINE\\Admit Diagnosis\\",
"dateCreated": 1490984963326,
"userDomain": "i2b2demo"
}
},
{
"adaptersToResults": [
{
"startDate": 1490571995243,
"count": 60,
"networkQueryId": 2226563841174084900,
"statusMessage": "ERROR",
"changeDate": 1490572000244,
"instanceId": 832,
"resultId": 1018,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571996337,
"adapterNode": "SHRINE QA Node 2"
},
{
"startDate": 1490571995232,
"count": 50,
"networkQueryId": 2226563841174084900,
"statusMessage": "FINISHED",
"changeDate": 1490572000263,
"instanceId": 1058,
"resultId": 1244,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571996293,
"adapterNode": "SHRINE QA Hub"
},
{
"startDate": 1490571997183,
"count": 60,
"networkQueryId": 2226563841174084900,
"statusMessage": "FINISHED",
"changeDate": 1490572000275,
"instanceId": 1856,
"resultId": 2127,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571998202,
"adapterNode": "SHRINE QA Node 3"
}
],
"query": {
"expression": "Term(\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\)",
"queryName": "Female@19:46:33",
"deleted": false,
"changeDate": 1490571996396,
"userName": "ij22",
"networkId": 2226563841174084900,
"queryXml": "
SHRINE180000i2b2demoij22SessionKey:Gv6xaK4AQNjQipmypc7p22265638411740849533medication only_27th marchPATIENT_AGE_COUNT_XMLtrueAge patient breakdownCATNUM4PATIENT_COUNT_XMLfalseNumber of patientsCATNUMPATIENT_GENDER_COUNT_XMLtrueGender patient breakdownCATNUMPATIENT_RACE_COUNT_XMLtrueRace patient breakdownCATNUMPATIENT_VITALSTATUS_COUNT_XMLtrueVital Status patient breakdownCATNUMFemale@19:46:33\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\",
"dateCreated": 1490571996395,
"userDomain": "i2b2demo"
}
},
{
"adaptersToResults": [
{
"startDate": 1490571983703,
"count": -1,
"networkQueryId": 6386518509045377000,
"statusMessage": "FINISHED",
"changeDate": 1490571987946,
"instanceId": 831,
"resultId": 1016,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571985231,
"adapterNode": "SHRINE QA Node 2"
},
{
"startDate": 1490571983939,
"count": -1,
"networkQueryId": 6386518509045377000,
"statusMessage": "FINISHED",
"changeDate": 1490571987953,
"instanceId": 1057,
"resultId": 1242,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571985580,
"adapterNode": "SHRINE QA Hub"
},
{
"startDate": 1490571985806,
"count": -1,
"networkQueryId": 6386518509045377000,
"statusMessage": "FINISHED",
"changeDate": 1490571987957,
"instanceId": 1855,
"resultId": 2125,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571987400,
"adapterNode": "SHRINE QA Node 3"
}
],
"query": {
"expression": "Term(\\\\SHRINE\\SHRINE\\Demographics\\Age\\0-9 years old\\)",
"queryName": "0-9 years old@19:46:24",
"deleted": false,
"changeDate": 1490571985154,
"userName": "ij22",
"networkId": 6386518509045377000,
"queryXml": "
SHRINE180000i2b2demoij22SessionKey:Gv6xaK4AQNjQipmypc7p63865185090453774103medication only_27th march4PATIENT_COUNT_XMLfalseNumber of patientsCATNUM0-9 years old@19:46:24\\\\SHRINE\\SHRINE\\Demographics\\Age\\0-9 years old\\",
"dateCreated": 1490571985154,
"userDomain": "i2b2demo"
}
},
{
"adaptersToResults": [
{
"startDate": 1490571976696,
"count": 40,
"networkQueryId": 2400531532595122000,
"statusMessage": "FINISHED",
"changeDate": 1490571979929,
"instanceId": 830,
"resultId": 1015,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571977377,
"adapterNode": "SHRINE QA Node 2"
},
{
"startDate": 1490571976829,
"count": 55,
"networkQueryId": 2400531532595122000,
"statusMessage": "FINISHED",
"changeDate": 1490571979935,
"instanceId": 1056,
"resultId": 1241,
"status": "FINISHED",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571977623,
"adapterNode": "SHRINE QA Hub"
},
{
"startDate": 1490571978660,
"count": 40,
"networkQueryId": 2400531532595122000,
"statusMessage": "ERROR",
"changeDate": 1490571979942,
"instanceId": 1854,
"resultId": 2124,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571979396,
"adapterNode": "SHRINE QA Node 3"
}
],
"query": {
"expression": "Term(\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\)",
"queryName": "Female@19:46:17",
"deleted": false,
"changeDate": 1490571978065,
"userName": "ij22",
"networkId": 2400531532595122000,
"queryXml": "
SHRINE180000i2b2demoij22SessionKey:Gv6xaK4AQNjQipmypc7p24005315325951223363medication only_27th march4PATIENT_COUNT_XMLfalseNumber of patientsCATNUMFemale@19:46:17\\\\SHRINE\\SHRINE\\Demographics\\Gender\\Female\\",
"dateCreated": 1490571978064,
"userDomain": "i2b2demo"
}
},
{
"adaptersToResults": [
{
"startDate": 1490571965504,
"count": -1,
"networkQueryId": 1813286953364395500,
"statusMessage": "ERROR",
"changeDate": 1490571967830,
"instanceId": 1853,
"resultId": 2123,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571966969,
"adapterNode": "SHRINE QA Node 3"
},
{
"startDate": 1490571963634,
"count": -1,
"networkQueryId": 1813286953364395500,
"statusMessage": "ERROR",
"changeDate": 1490571967857,
"instanceId": 829,
"resultId": 1014,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571965423,
"adapterNode": "SHRINE QA Node 2"
},
{
"startDate": 1490571963687,
"count": -1,
"networkQueryId": 1813286953364395500,
"statusMessage": "ERROR",
"changeDate": 1490571967872,
"instanceId": 1055,
"resultId": 1240,
"status": "ERROR",
"resultType": {
"isBreakdown": false,
"name": "PATIENT_COUNT_XML",
"id": 4,
"i2b2Options": {
"description": "Number of patients",
"displayType": "CATNUM"
}
},
"endDate": 1490571965339,
"adapterNode": "SHRINE QA Hub"
}
],
"query": {
"expression": "Term(\\\\SHRINE\\SHRINE\\Demographics\\Age\\0-9 years old\\)",
"queryName": "0-9 years old@19:46:03",
"deleted": false,
"changeDate": 1490571964673,
"userName": "ij22",
"networkId": 1813286953364395500,
"queryXml": "
SHRINE180000i2b2demoij22SessionKey:Gv6xaK4AQNjQipmypc7p1813286953364395437226th march 20174PATIENT_COUNT_XMLfalseNumber of patientsCATNUM0-9 years old@19:46:03\\\\SHRINE\\SHRINE\\Demographics\\Age\\0-9 years old\\",
"dateCreated": 1490571964672,
"userDomain": "i2b2demo"
}
}
],
"flags": {}
}
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/server/pm-mock.js b/shrine-webclient/src/main/js/server/pm-mock.js
index 0d3c4884b..c2ee6160e 100644
--- a/shrine-webclient/src/main/js/server/pm-mock.js
+++ b/shrine-webclient/src/main/js/server/pm-mock.js
@@ -1,93 +1,98 @@
/*
This is a first stab at a i2b2 pm-mock
@todo: refactor/cleanup this module.
*/
var express = require('express');
var cors = require('cors');
var bodyParser = require('body-parser');
require('body-parser-xml')(bodyParser);
var app = express();
var bodyParser = require('body-parser');
var port = process.env.PORT || 6443;
var router = express.Router();
var fs = require('fs');
var isAuthorized = false;
function start(dir) {
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());
app.use(bodyParser.xml({
limit: '1GB', // Reject payload bigger than 1 MB
xmlParseOptions: {
normalize: true, // Trim whitespace inside text nodes
normalizeTags: true, // Transform tags to lowercase
explicitArray: false // Only put nodes in array if >1
}
}));
app.use(cors());
app.use('/', router);
app.listen(port);
console.log('I2B2SERVER Mock Server started on port: ' + port);
// -- routes --//
router.post('/shrine-proxy/request', function (req, res) {
var requestType = parseRequest(req);
var fileName = getFilename(requestType);
var xml = fs.readFileSync('./' + dir+ '/i2b2-xml/' + fileName);
res.header('Content-Type', 'text/xml').send(xml);
});
router.get('/shrine-metadata/data', function(req, res) {
res.json('steward@steward.com');
});
router.get('/shrine-metadata/qep/queryResults', (req, res) => {
- const result = require('./data/curl-async-queries');
+ //todo: cleanup.
+ const service = require('./data/async-queries');
+ const url = require('url');
+ const query = url.parse(req.url, true).query;
+ console.log(query);
+ const result = service.getQueryResults(query.skip, query.limit);
res.json(result);
})
}
/*
Any request with an XML payload will be parsed and a JavaScript requestect produced on req.body
corresponding to the request payload.
This is messy refactor.
*/
function parseRequest(request) {
request = request.body;
var requestTypes = ['i2b2:request', 'ns2:request', 'ns3:request', 'ns6:request'];
var requestType = requestTypes.find(t => request[t] !== undefined);
request = (request[requestType] && request[requestType].message_body) ?
request[requestType].message_body : null;
return parseBodyRequest(request);
}
function parseBodyRequest(request) {
var bodyTypes = ['pm:get_user_configuration', 'ns4:get_categories', 'ns4:get_schemes', 'ns7:sheriff_header', 'ns4:psmheader'];
var bodyType = bodyTypes.find(t => request[t] !== undefined);
if (bodyType == 'ns4:psmheader') {
bodyType = request['ns4:psmheader'].request_type;
}
return bodyType;
}
function getFilename(value) {
let fileMap = {
'pm:get_user_configuration': 'getUserAuth.xml',
'ns4:get_categories': 'GetCategories.xml',
'ns4:get_schemes': 'GetSchemes.xml',
'ns7:sheriff_header': 'getUserAuth.xml',
'CRC_QRY_getResultType': 'getQRY_getResultType.xml',
'CRC_QRY_getQueryMasterList_fromUserId': 'getQueryMasterList_fromUserId.xml'
};
return fileMap[value];
}
module.exports = {start: start};
\ No newline at end of file