Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HealthSamurai Aidbox FHIRPath engine #43

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions helpers/user_settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ export namespace settings {
export function mapper_server_java(): string {
return serverConnections.mapper_server_java;
}
export function clojure_server_r4(): string {
return serverConnections.clojure_server_r4;
}
export function clojure_server_r5(): string {
return serverConnections.clojure_server_r5;
}

export function getSearchData(type: string): ConformanceSearchData | undefined {
const sdJson = localStorage.getItem(`search_${type}`);
Expand Down
17 changes: 17 additions & 0 deletions pages/FhirPath/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2572,10 +2572,25 @@ export default Vue.extend<FhirPathData, IFhirPathMethods, IFhirPathComputed, IFh

(this as any).$appInsights?.trackEvent({ name: 'evaluate IBM' });
}
else if (this.selectedEngine == "Clojure (Aidbox)") {
url = settings.clojure_server_r4();
if (!this.getResourceJson() && this.resourceId) {
await this.downloadTestResource();
resourceJson = this.getResourceJson();
}
}
else if (this.selectedEngine == "Clojure (Aidbox-R5)") {
url = settings.clojure_server_r5();
if (!this.getResourceJson() && this.resourceId) {
await this.downloadTestResource();
resourceJson = this.getResourceJson();
}
}
else {
(this as any).$appInsights?.trackEvent({ name: 'evaluate FirelySDK' });
}


if (resourceJson) {
p.parameter?.push({ name: "resource", resource: JSON.parse(resourceJson) });
}
Expand Down Expand Up @@ -2704,6 +2719,8 @@ export default Vue.extend<FhirPathData, IFhirPathMethods, IFhirPathComputed, IFh
results: [],
selectedEngine: "fhirpath.js",
executionEngines: [
"Clojure (Aidbox)",
"Clojure (Aidbox-R5)",
".NET (firely)",
"fhirpath.js",
"java (HAPI)",
Expand Down
4 changes: 3 additions & 1 deletion pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
(defaulting test resource ID "example")
</p>
<p>
<b>Note:</b> As the .net and java fhirpath engines don't run in the browser this data is sent to a cloud
<b>Note:</b> As the .net and java and clojure fhirpath engines don't run in the browser this data is sent to a cloud
service to process these requests. None of this data is persisted outside the call itself.
Using individually identifiable data with this test utility is prohibited.<br/>
These are the versions of each of the fhirpath engines in use:
Expand All @@ -77,6 +77,8 @@
<li>HAPI FHIRPath v7.0.2 <i>(server side)</i></li>
<li>IBM FHIRPath v4.11.1 (LinuxForHealth) <i>(server side)</i></li>
<li>Dotnet FHIRMappingLanguage Engine v5.1.0 <i>(server side)</i></li>
<li>HealthSamurai Aidbox FHIRPath Engine v1.0.0<i>(server side)</i></li>

</ul>
<br />
<h5>Disclaimers:</h5>
Expand Down
6 changes: 4 additions & 2 deletions static/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"java_server_r5": "https://fhirpath-lab-java2.azurewebsites.net/fhir5/$fhirpath-r5",
"ibm_server_r4b": "https://fhirpath-lab-java2.azurewebsites.net/fhir/$fhirpath-ibm",
"mapper_server": "https://fhir-mapping-lab2.azurewebsites.net/StructureMap/$transform?debug=true",
"mapper_server_java": "https://fhirpath-lab-java2.azurewebsites.net/fhir/$transform?debug=true"
}
"mapper_server_java": "https://fhirpath-lab-java2.azurewebsites.net/fhir/$transform?debug=true",
"clojure_server_r4": "https://fhir-validator.aidbox.app/r4",
"clojure_server_r5": "https://fhir-validator.aidbox.app/r5"
}
6 changes: 4 additions & 2 deletions static/config.local.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@
"java_server_r5": "http://localhost:8080/fhir5/$fhirpath-r5",
"ibm_server_r4b": "http://localhost:8080/fhir/$fhirpath-ibm",
"mapper_server": "https://localhost:7089/StructureMap/$transform?debug=true",
"mapper_server_java": "http://localhost:8080/fhir/$transform?debug=true"
}
"mapper_server_java": "http://localhost:8080/fhir/$transform?debug=true",
"clojure_server_r4": "https://fhir-validator.aidbox.app/r4",
"clojure_server_r5": "https://fhir-validator.aidbox.app/r5"
}