From 74f959da0c90e2a4a9b1d1b8c5e343f0d058ee94 Mon Sep 17 00:00:00 2001 From: Liu Date: Thu, 7 Apr 2022 10:18:02 -0400 Subject: [PATCH 1/5] display temp message for relaunch --- src/App.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/App.jsx b/src/App.jsx index 001eb83c..4e7e8503 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -101,6 +101,12 @@ export default class App extends Component { } ehrLaunch(isContainedQuestionnaire, questionnaire) { + // Temporary indication before full supports for relaunch is implemented + if(!this.appContext.request) { + alert("Supports for relaunch will be added in the near future!"); + this.consoleLog("Supports for relaunch will be added in the near future!", "errorClass"); + return; + } const deviceRequest = JSON.parse(this.appContext.request.replace(/\\/g,"")); this.consoleLog("fetching artifacts", "infoClass"); this.setState({ From 6fcdb1b766ef07de24ef86418a3bd3210205062a Mon Sep 17 00:00:00 2001 From: Liu Date: Tue, 19 Apr 2022 15:00:33 -0400 Subject: [PATCH 2/5] add context to QR when send to EHR --- .../QuestionnaireForm/QuestionnaireForm.jsx | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/src/components/QuestionnaireForm/QuestionnaireForm.jsx b/src/components/QuestionnaireForm/QuestionnaireForm.jsx index de291f5b..3c0afdb7 100644 --- a/src/components/QuestionnaireForm/QuestionnaireForm.jsx +++ b/src/components/QuestionnaireForm/QuestionnaireForm.jsx @@ -914,9 +914,33 @@ export default class QuestionnaireForm extends Component { }; this.addAuthorToResponse(qr, this.getPractitioner()); - qr.questionnaire = this.props.qform.id; + qr.questionnaire = `${this.FHIR_PREFIX}${this.fhirVersion}/Questionnaire/${this.props.qform.id}`; console.log("GetQuestionnaireResponse final QuestionnaireResponse: ", qr); + const request = this.props.deviceRequest; + // add context extension + qr.extension = []; + if(request !== undefined) { + const contextExtensionUrl = "http://hl7.org/fhir/us/davinci-dtr/StructureDefinition/context"; + qr.extension.push({ + url: contextExtensionUrl, + valueReference: { + reference: `${request.resourceType}/${request.id}`, + type: `${request.resourceType}` + } + }) + + if(request.insurance !== null && request.insurance.length > 0) { + const coverage = request.insurance[0]; + qr.extension.push({ + url: contextExtensionUrl, + valueReference: { + reference: `${coverage.reference}`, + type: "Coverage" + } + }) + } + } console.log(this.props.attested); const aa = searchQuestionnaire(qr, this.props.attested); console.log(aa); @@ -1291,14 +1315,16 @@ export default class QuestionnaireForm extends Component { if (newItem.item == undefined) { //find the corresponding linkId in savedItem and replace it const findSavedParentItem = (parentLinkId, savedItem) => { - if (savedItem.linkId == parentLinkId) { + if (savedItem.linkId === parentLinkId) { return savedItem; } else { - const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId); - if (parentIndex != -1) { - return savedItem.item[parentIndex]; - } else { - findSavedParentItem(parentLinkId, savedItem.item); + if (savedItem.item) { + const parentIndex = savedItem.item.findIndex(item => item.linkId == parentLinkId); + if (parentIndex != -1) { + return savedItem.item[parentIndex]; + } else { + findSavedParentItem(parentLinkId, savedItem.item); + } } } }; From 360d4d7491b5d76de4b82602b5bed45ed726b4b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:49:32 +0000 Subject: [PATCH 3/5] Bump url-parse from 1.5.4 to 1.5.10 Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5ce5552..c6ea647f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16147,9 +16147,9 @@ } }, "url-parse": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" From a08118aa45eeb9cc610c5e766cbe0842763705f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 21:03:54 +0000 Subject: [PATCH 4/5] Bump node-fetch from 2.6.6 to 2.6.7 Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6ea647f..f92587ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10328,9 +10328,9 @@ } }, "node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "requires": { "whatwg-url": "^5.0.0" } diff --git a/package.json b/package.json index 3ac36c7b..a10c1b32 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.21", "lowdb": "^1.0.0", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "pdfmake": "^0.1.56", "pem": "^1.14.4", "react": "^16.8.4", From d6e1379fd6380e01c477b6d25f32c742e1c86fdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 21:05:49 +0000 Subject: [PATCH 5/5] Bump follow-redirects from 1.14.6 to 1.14.9 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.9. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.9) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f92587ea..0540cf8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6606,9 +6606,9 @@ } }, "follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "fontkit": { "version": "1.8.1",