-
-
@@ -118,25 +120,30 @@ const Dashboard = (props) => {
-
-
-
);
};
diff --git a/src/components/Dashboard/DashboardElement.jsx b/src/components/Dashboard/DashboardElement.jsx
index d086a2cd..5a424bdf 100644
--- a/src/components/Dashboard/DashboardElement.jsx
+++ b/src/components/Dashboard/DashboardElement.jsx
@@ -7,50 +7,57 @@ import CalendarTodayIcon from '@mui/icons-material/CalendarToday';
import AssignmentIcon from '@mui/icons-material/Assignment';
import env from 'env-var';
-const DashboardElement = (props) => {
+const DashboardElement = props => {
const classes = useStyles();
const resource = props.resource;
const clientState = props.client.state;
const status = props.status;
const date = new Date(resource.meta.lastUpdated).toUTCString();
const [questionnaireId] = resource.questionnaire.split('/').slice(-1);
- const splitCamelCaseWithAbbreviations = (s) =>{
- return s.split(/([A-Z][a-z]+)/).filter(function(e){return e});
- }
-
+ const splitCamelCaseWithAbbreviations = s => {
+ return s.split(/([A-Z][a-z]+)/).filter(function (e) {
+ return e;
+ });
+ };
+
const relaunch = () => {
const link = {
appContext: encodeURIComponent(`response=QuestionnaireResponse/${resource.id}`),
- type: "smart",
+ type: 'smart',
url: env.get('REACT_APP_LAUNCH_URL').asString()
- }
- retrieveLaunchContext(link, clientState.tokenResponse.accessToken, clientState.tokenResponse.patient, clientState.serverUrl, 'r4').then((e) => {
- window.open(e.url, "_blank");
- })
- }
+ };
+ retrieveLaunchContext(
+ link,
+ clientState.tokenResponse.accessToken,
+ clientState.tokenResponse.patient,
+ clientState.serverUrl,
+ 'r4'
+ ).then(e => {
+ window.open(e.url, '_blank');
+ });
+ };
const renderStatus = () => {
let bColor = {};
- if(status === 'in-progress') {
- bColor = {backgroundColor: '#fdbe14'};
- } else if(status === 'completed') {
- bColor = {backgroundColor: '#20c997'};
+ if (status === 'in-progress') {
+ bColor = { backgroundColor: '#fdbe14' };
+ } else if (status === 'completed') {
+ bColor = { backgroundColor: '#20c997' };
}
- return (
-
- )
- }
+ return ;
+ };
return (
);
};
diff --git a/src/components/Dashboard/styles.jsx b/src/components/Dashboard/styles.jsx
index 7283b349..e2a2437f 100644
--- a/src/components/Dashboard/styles.jsx
+++ b/src/components/Dashboard/styles.jsx
@@ -17,7 +17,7 @@ export default makeStyles(
padding: '20px',
overflowY: 'auto',
overflowX: 'hidden',
- height: '75vh',
+ height: '75vh'
},
dashboardElement: {
height: '100px',
@@ -25,20 +25,21 @@ export default makeStyles(
padding: '10px',
margin: '5px',
fontSize: '18px',
- cursor:'pointer',
+ cursor: 'pointer',
'&:hover': {
- boxShadow: '0px 2px 1px 1px rgb(0 0 0 / 40%), 0px 1px 1px 0px rgb(0 0 0 / 28%), 0px 1px 3px 0px rgb(0 0 0 / 24%)'
+ boxShadow:
+ '0px 2px 1px 1px rgb(0 0 0 / 40%), 0px 1px 1px 0px rgb(0 0 0 / 28%), 0px 1px 3px 0px rgb(0 0 0 / 24%)'
}
},
elementHeader: {
marginLeft: '5px',
- display: 'inline-block',
+ display: 'inline-block'
},
elementIcon: {
verticalAlign: 'middle'
},
- listItemText:{
- fontSize:'4.2em',//Insert your required size
+ listItemText: {
+ fontSize: '4.2em' //Insert your required size
},
progressBubble: {
height: '12px',
@@ -46,9 +47,7 @@ export default makeStyles(
borderRadius: '12px',
float: 'right'
},
- spacer: {
-
- }
+ spacer: {}
}),
{ name: 'Dashboard', index: 1 }
diff --git a/src/components/DisplayBox/DisplayBox.js b/src/components/DisplayBox/DisplayBox.js
index d7682c80..8a6eec70 100644
--- a/src/components/DisplayBox/DisplayBox.js
+++ b/src/components/DisplayBox/DisplayBox.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import FHIR from "fhirclient";
+import FHIR from 'fhirclient';
import './card-list.css';
import { Button, Card, CardActions, CardContent, Typography } from '@mui/material';
import PropTypes from 'prop-types';
@@ -10,77 +10,82 @@ import { retrieveLaunchContext } from '../../util/util';
import './displayBox.css';
const propTypes = {
- /**
- * A boolean to determine if the context of this component is under the Demo Card feature of the Sandbox, or in the actual
- * hook views that render cards themselves. This flag is necessary to make links and suggestions unactionable in the Card Demo view.
- */
- isDemoCard: PropTypes.bool,
- /**
- * The FHIR access token retrieved from the authorization server. Used to retrieve a launch context for a SMART app
- */
- fhirAccessToken: PropTypes.object,
- /**
- * Function callback to take a specific suggestion from a card
- */
- takeSuggestion: PropTypes.func.isRequired,
- /**
- * Identifier of the Patient resource for the patient in context
- */
- patientId: PropTypes.string,
- /**
- * The FHIR server URL in context
- */
- fhirServerUrl: PropTypes.string,
- /**
- * The FHIR version in use
- */
- fhirVersion: PropTypes.string,
- /**
- * JSON response from a CDS service containing potential cards to display
- */
- cardResponses: PropTypes.object,
- };
+ /**
+ * A boolean to determine if the context of this component is under the Demo Card feature of the Sandbox, or in the actual
+ * hook views that render cards themselves. This flag is necessary to make links and suggestions unactionable in the Card Demo view.
+ */
+ isDemoCard: PropTypes.bool,
+ /**
+ * The FHIR access token retrieved from the authorization server. Used to retrieve a launch context for a SMART app
+ */
+ fhirAccessToken: PropTypes.object,
+ /**
+ * Function callback to take a specific suggestion from a card
+ */
+ takeSuggestion: PropTypes.func.isRequired,
+ /**
+ * Identifier of the Patient resource for the patient in context
+ */
+ patientId: PropTypes.string,
+ /**
+ * The FHIR server URL in context
+ */
+ fhirServerUrl: PropTypes.string,
+ /**
+ * The FHIR version in use
+ */
+ fhirVersion: PropTypes.string,
+ /**
+ * JSON response from a CDS service containing potential cards to display
+ */
+ cardResponses: PropTypes.object
+};
-export default class DisplayBox extends Component{
- constructor(props){
- super(props);
- this.launchLink = this.launchLink.bind(this);
- this.launchSource = this.launchSource.bind(this);
- this.renderSource = this.renderSource.bind(this);
- this.modifySmartLaunchUrls = this.modifySmartLaunchUrls.bind(this);
- this.exitSmart = this.exitSmart.bind(this);
- this.state={
- value: "",
- smartLink: "",
- response: {}
- };
- }
+export default class DisplayBox extends Component {
+ constructor(props) {
+ super(props);
+ this.launchLink = this.launchLink.bind(this);
+ this.launchSource = this.launchSource.bind(this);
+ this.renderSource = this.renderSource.bind(this);
+ this.modifySmartLaunchUrls = this.modifySmartLaunchUrls.bind(this);
+ this.exitSmart = this.exitSmart.bind(this);
+ this.state = {
+ value: '',
+ smartLink: '',
+ response: {}
+ };
+ }
- static getDerivedStateFromProps(nextProps, prevState) {
- if(JSON.stringify(nextProps.response) !== JSON.stringify(prevState.response)) {
- return {"response":nextProps.response}
- }else{
- return null;
- }
+ static getDerivedStateFromProps(nextProps, prevState) {
+ if (JSON.stringify(nextProps.response) !== JSON.stringify(prevState.response)) {
+ return { response: nextProps.response };
+ } else {
+ return null;
}
+ }
- shouldComponentUpdate(nextProps, prevState) {
- if(JSON.stringify(nextProps.response) !== JSON.stringify(this.state.response) || this.state.smartLink !== prevState.smartLink) {
- return true;
- }else{
- return false;
- }
+ shouldComponentUpdate(nextProps, prevState) {
+ if (
+ JSON.stringify(nextProps.response) !== JSON.stringify(this.state.response) ||
+ this.state.smartLink !== prevState.smartLink
+ ) {
+ return true;
+ } else {
+ return false;
}
+ }
- supportedRequesType(resource) {
- let resourceType = resource.resourceType.toUpperCase();
- if ( (resourceType === "DEVICEREQUEST")
- || (resourceType === "SERVICEREQUEST")
- || (resourceType === "MEDICATIONREQUEST")
- || (resourceType === "MEDICATIONDISPENSE") ) {
- return true;
- }
+ supportedRequesType(resource) {
+ let resourceType = resource.resourceType.toUpperCase();
+ if (
+ resourceType === 'DEVICEREQUEST' ||
+ resourceType === 'SERVICEREQUEST' ||
+ resourceType === 'MEDICATIONREQUEST' ||
+ resourceType === 'MEDICATIONDISPENSE'
+ ) {
+ return true;
}
+ }
/**
* Take a suggestion from a CDS service based on action on from a card. Also pings the analytics endpoint (if any) of the
* CDS service to notify that a suggestion was taken
@@ -92,12 +97,12 @@ export default class DisplayBox extends Component{
if (selectionBehavior === 'at-most-one') {
// disable all suggestion buttons for this card
for (var i = 0; i < suggestionCount; i++) {
- let bId = "suggestion_button-"+cardNum+"-"+i;
- document.getElementById(bId).setAttribute("disabled", "true");
+ let bId = 'suggestion_button-' + cardNum + '-' + i;
+ document.getElementById(bId).setAttribute('disabled', 'true');
}
} else {
// disable this suggestion button if any are allowed
- document.getElementById(buttonId).setAttribute("disabled", "true");
+ document.getElementById(buttonId).setAttribute('disabled', 'true');
}
if (suggestion.label) {
@@ -105,33 +110,32 @@ export default class DisplayBox extends Component{
axios({
method: 'POST',
url: `${url}/analytics/${suggestion.uuid}`,
- data: {},
+ data: {}
});
}
const client = FHIR.client({
serverUrl: this.props.ehrUrl,
tokenResponse: {
- access_token: this.props.access_token.access_token,
- },
+ access_token: this.props.access_token.access_token
+ }
});
// handle each action from the suggestion
var uri = '';
- suggestion.actions.forEach((action) => {
- if (action.type.toUpperCase() === "DELETE") {
- uri = action.resource.resourceType + "/" + action.resource.id;
- console.log("completing suggested action DELETE: " + uri);
- client.delete(uri).then((result) => {
- console.log("suggested action DELETE result:");
+ suggestion.actions.forEach(action => {
+ if (action.type.toUpperCase() === 'DELETE') {
+ uri = action.resource.resourceType + '/' + action.resource.id;
+ console.log('completing suggested action DELETE: ' + uri);
+ client.delete(uri).then(result => {
+ console.log('suggested action DELETE result:');
console.log(result);
});
-
- } else if (action.type.toUpperCase() === "CREATE") {
+ } else if (action.type.toUpperCase() === 'CREATE') {
uri = action.resource.resourceType;
- console.log("completing suggested action CREATE: " + uri);
- client.create(action.resource).then((result) => {
- console.log("suggested action CREATE result:");
+ console.log('completing suggested action CREATE: ' + uri);
+ client.create(action.resource).then(result => {
+ console.log('suggested action CREATE result:');
console.log(result);
if (this.supportedRequesType(result)) {
@@ -139,20 +143,17 @@ export default class DisplayBox extends Component{
this.props.takeSuggestion(result);
}
});
-
- } else if (action.type.toUpperCase() === "UPDATE") {
- uri = action.resource.resourceType + "/" + action.resource.id;
- console.log("completing suggested action UPDATE: " + uri);
- client.update(action.resource).then((result) => {
- console.log("suggested action UPDATE result:");
+ } else if (action.type.toUpperCase() === 'UPDATE') {
+ uri = action.resource.resourceType + '/' + action.resource.id;
+ console.log('completing suggested action UPDATE: ' + uri);
+ client.update(action.resource).then(result => {
+ console.log('suggested action UPDATE result:');
console.log(result);
});
-
} else {
- console.log("WARNING: unknown action");
+ console.log('WARNING: unknown action');
}
});
-
} else {
console.error('There was no label on this suggestion', suggestion);
}
@@ -169,7 +170,7 @@ export default class DisplayBox extends Component{
}
exitSmart(e) {
- this.setState({"smartLink":""});
+ this.setState({ smartLink: '' });
}
/**
* Open the absolute or SMART link in a new tab and display an error if a SMART link does not have
@@ -184,8 +185,7 @@ export default class DisplayBox extends Component{
// TODO: Create an error modal to display for SMART link that cannot be launched securely
return;
}
- window.open(link.url, '_blank');
-
+ window.open(link.url, '_blank');
}
}
@@ -197,14 +197,21 @@ export default class DisplayBox extends Component{
*/
modifySmartLaunchUrls(card) {
if (!this.props.isDemoCard) {
- return card.links.map((link) => {
+ return card.links.map(link => {
let linkCopy = Object.assign({}, link);
- if (link.type === 'smart' && (this.props.fhirAccessToken || this.props.ehrLaunch) && !this.state.smartLink) {
+ if (
+ link.type === 'smart' &&
+ (this.props.fhirAccessToken || this.props.ehrLaunch) &&
+ !this.state.smartLink
+ ) {
retrieveLaunchContext(
- linkCopy, this.props.fhirAccessToken,
- this.props.patientId, this.props.fhirServerUrl, this.props.fhirVersion
- ).then((result) => {
+ linkCopy,
+ this.props.fhirAccessToken,
+ this.props.patientId,
+ this.props.fhirServerUrl,
+ this.props.fhirVersion
+ ).then(result => {
linkCopy = result;
return linkCopy;
});
@@ -227,165 +234,185 @@ export default class DisplayBox extends Component{
* Helper function to build out the UI for the source of the Card
* @param {*} source - Object as part of the card to build the UI for
*/
- renderSource(source) {
- if (!source.label) { return null; }
- let icon;
- if (source.icon) {
- icon =
- {this.props.logs.map(element => {
- i++;
- return
+ {element.content}
- }) }
-
+
+
+ );
}
-}
\ No newline at end of file
+}
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index 779bb607..6c6acbef 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -23,28 +23,28 @@ import SettingsIcon from '@mui/icons-material/Settings';
import MedicalInformationIcon from '@mui/icons-material/MedicalInformation';
import { Paper } from '@mui/material';
-const Dashboard = (props) => {
+const Dashboard = props => {
const classes = useStyles();
const [resources, setResources] = useState([]);
- const [message, setMessage] = useState("Loading...")
- const [checked, setChecked] = useState(true)
+ const [message, setMessage] = useState('Loading...');
+ const [checked, setChecked] = useState(true);
const drawerWidth = '340px';
- const handleChange = (event) => {
+ const handleChange = event => {
setChecked(event.target.checked);
};
- const addResources = (bundle) => {
+ const addResources = bundle => {
if (bundle.entry) {
- bundle.entry.forEach((e) => {
+ bundle.entry.forEach(e => {
const resource = e.resource;
- setResources(resources => [...resources, resource])
- })
+ setResources(resources => [...resources, resource]);
+ });
}
- }
+ };
const createIcons = () => {
const icons = [];
const style = { fontSize: '40px' };
- const itemStyle = { height: '80px' }
+ const itemStyle = { height: '80px' };
const qStyle = { height: '80px', backgroundColor: '#f5f5fa' };
icons.push(['Notifications',
+ {this.props.logs.map(element => {
+ i++;
+ return (
+
-
- )
+
+ {' '}
+ {element.content}
+
+ );
+ })}
-
+
-
- {createIcons().map((option) => (
+ {createIcons().map(option => (
- {message} }
+ {message}
+ )}
- Available Forms -
-Available Forms
+
-
+
{renderStatus()}
-
- Last Updated: {date}
+
- Questionnaire: {splitCamelCaseWithAbbreviations(questionnaireId).join(' ')}
-
+
- Source: this.launchSource(e, source)}>{source.label}
- {icon}
-
- );
- }
- return (
-
- Source:
- this.launchSource(e, source)}
- >
- {source.label}
-
- {icon}
-
- );
- }
+ renderSource(source) {
+ if (!source.label) {
+ return null;
+ }
+ let icon;
+ if (source.icon) {
+ icon = (
+
+ Source:{' '}
+ this.launchSource(e, source)}
+ >
+ {source.label}
+
+ {icon}
+
+ );
+ }
+ return (
+
+ Source:
+ this.launchSource(e, source)}>
+ {source.label}
+
+ {icon}
+
+ );
+ }
- render() {
- this.buttonList = [];
- const indicators = {
- info: 0,
- warning: 1,
- 'hard-stop': 2,
- error: 3,
- };
-
- const summaryColors = {
- info: '#0079be',
- warning: '#ffae42',
- 'hard-stop': '#c00',
- error: '#333',
- };
- const renderedCards = [];
- // Iterate over each card in the cards array
- if(this.state.response!=null && this.state.response.cards!=null){
- this.state.response.cards
- .sort((b, a) => indicators[a.indicator] - indicators[b.indicator])
- .forEach((c, cardInd) => {
- const card = JSON.parse(JSON.stringify(c));
-
- // -- Summary --
- const summarySection = {card.summary}
; + render() { + this.buttonList = []; + const indicators = { + info: 0, + warning: 1, + 'hard-stop': 2, + error: 3 + }; - // -- Source -- - const sourceSection = card.source && Object.keys(card.source).length ? this.renderSource(card.source) : ''; + const summaryColors = { + info: '#0079be', + warning: '#ffae42', + 'hard-stop': '#c00', + error: '#333' + }; + const renderedCards = []; + // Iterate over each card in the cards array + if (this.state.response != null && this.state.response.cards != null) { + this.state.response.cards + .sort((b, a) => indicators[a.indicator] - indicators[b.indicator]) + .forEach((c, cardInd) => { + const card = JSON.parse(JSON.stringify(c)); - // -- Detail (ReactMarkdown supports Github-flavored markdown) -- - const detailSection = card.detail ?None
; - - // -- Suggestions -- - let suggestionsSection = []; - if (card.suggestions) { - card.suggestions.forEach((item, ind) => { - var buttonId = "suggestion_button-"+cardInd+"-"+ind; - this.buttonList.push(buttonId); + // -- Summary -- + const summarySection ={card.summary}
; - suggestionsSection.push( - - ); - }); - } - - // -- Links -- - let linksSection; - if (card.links) { - card.links = this.modifySmartLaunchUrls(card) || card.links; - linksSection = card.links.map((link, ind) => { - if (link.type === 'smart') { - return ( - + // -- Source -- + const sourceSection = + card.source && Object.keys(card.source).length ? this.renderSource(card.source) : ''; + + // -- Detail (ReactMarkdown supports Github-flavored markdown) -- + const detailSection = card.detail ? ( +
+
+ ) : (
+ None
+ ); + + // -- Suggestions -- + let suggestionsSection = []; + if (card.suggestions) { + card.suggestions.forEach((item, ind) => { + var buttonId = 'suggestion_button-' + cardInd + '-' + ind; + this.buttonList.push(buttonId); + + suggestionsSection.push( + + ); + }); + } + + // -- Links -- + let linksSection; + if (card.links) { + card.links = this.modifySmartLaunchUrls(card) || card.links; + linksSection = card.links.map((link, ind) => { + if (link.type === 'smart') { + return ( + ); } - - const cardSectionHeaderStyle = { marginBottom: '2px', color: 'black' }; - - const builtCard = ( --
-
- Notification Cards ({renderedCards.length})
-
;
- }
- return
- Notification Cards ({renderedCards.length})
-
;
- } else {
- return
- {renderedCards}
-
-
-
;
}
- }
- componentDidUpdate() {
- // clear the suggestion buttons
- console.log(this.buttonList);
- this.buttonList.forEach((requestButton, id) => {
- document.getElementById(requestButton).removeAttribute("disabled");
- });
- }
+ const cardSectionHeaderStyle = { marginBottom: '2px', color: 'black' };
+
+ const builtCard = (
+ +
+
Notification Cards ({renderedCards.length})
;
}
+ return (
+
+ Notification Cards ({renderedCards.length})
+ );
+ } else {
+ return ;
+ }
+ }
+
+ componentDidUpdate() {
+ // clear the suggestion buttons
+ console.log(this.buttonList);
+ this.buttonList.forEach((requestButton, id) => {
+ document.getElementById(requestButton).removeAttribute('disabled');
+ });
+ }
+}
diff --git a/src/components/Inputs/CheckBox.js b/src/components/Inputs/CheckBox.js
index 764ef4c2..16858b0c 100644
--- a/src/components/Inputs/CheckBox.js
+++ b/src/components/Inputs/CheckBox.js
@@ -1,26 +1,29 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
export default class CheckBox extends Component {
- constructor(props){
- super(props);
- this.onInputChange = this.onInputChange.bind(this);
- }
+ constructor(props) {
+ super(props);
+ this.onInputChange = this.onInputChange.bind(this);
+ }
- onInputChange(_event) {
- this.props.updateCB(this.props.elementName, !this.props.toggle);
- }
+ onInputChange(_event) {
+ this.props.updateCB(this.props.elementName, !this.props.toggle);
+ }
- render() {
- const toggleClass = (this.props.toggle ? "checkBoxClicked" : "checkBox");
- const indicatorClass = this.props.toggle ? "onOffActive" : "onOff";
- return (
-
-
-
- )
- }
+ render() {
+ const toggleClass = this.props.toggle ? 'checkBoxClicked' : 'checkBox';
+ const indicatorClass = this.props.toggle ? 'onOffActive' : 'onOff';
+ return (
+
+
+
+ );
+ }
}
diff --git a/src/components/Inputs/InputBox.js b/src/components/Inputs/InputBox.js
index 98245486..9f5bbe90 100644
--- a/src/components/Inputs/InputBox.js
+++ b/src/components/Inputs/InputBox.js
@@ -1,26 +1,25 @@
-import React, {Component} from 'react';
-
+import React, { Component } from 'react';
export default class InputBox extends Component {
- constructor(props){
- super(props);
- this.onInputChange = this.onInputChange.bind(this);
- }
+ constructor(props) {
+ super(props);
+ this.onInputChange = this.onInputChange.bind(this);
+ }
- onInputChange(event){
- this.props.updateCB(this.props.elementName, event.target.value);
- }
+ onInputChange(event) {
+ this.props.updateCB(this.props.elementName, event.target.value);
+ }
- render() {
- return (
- {renderedCards}
+
-
-
- )
- }
-}
\ No newline at end of file
+ render() {
+ return (
+
+
+
+ );
+ }
+}
diff --git a/src/components/Inputs/Toggle.js b/src/components/Inputs/Toggle.js
index d4b1a5e6..49936f43 100644
--- a/src/components/Inputs/Toggle.js
+++ b/src/components/Inputs/Toggle.js
@@ -1,57 +1,62 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
import { connect } from 'react-redux';
-
export default class Toggle extends Component {
- constructor(props){
- super(props);
- this.state={
- value: "",
- option1class: "genderBlockMaleUnselected",
- option2class: "genderBlockFemaleUnselected"
- };
+ constructor(props) {
+ super(props);
+ this.state = {
+ value: '',
+ option1class: 'genderBlockMaleUnselected',
+ option2class: 'genderBlockFemaleUnselected'
+ };
this.clickedOption1 = this.clickedOption1.bind(this);
this.clickedOption2 = this.clickedOption2.bind(this);
+ }
+ clickedOption1() {
+ if (this.props.value !== this.props.options.option1.value) {
+ this.props.updateCB(this.props.elementName, this.props.options.option1.value);
+ } else {
+ this.props.updateCB(this.props.elementName, '');
}
- clickedOption1(){
- if(this.props.value!==this.props.options.option1.value){
- this.props.updateCB(this.props.elementName, this.props.options.option1.value);
- }else{
- this.props.updateCB(this.props.elementName, "");
- }
-
+ }
+ clickedOption2() {
+ if (this.props.value !== this.props.options.option2.value) {
+ this.props.updateCB(this.props.elementName, this.props.options.option2.value);
+ } else {
+ this.props.updateCB(this.props.elementName, '');
}
- clickedOption2(){
- if(this.props.value!==this.props.options.option2.value){
- this.props.updateCB(this.props.elementName, this.props.options.option2.value);
- }else{
- this.props.updateCB(this.props.elementName, "");
- }
-
- }
- render() {
- let option1class, option2class = "";
- if(this.props.value==this.props.options.option1.value) {
- option1class = "genderBlockMaleSelected";
- option2class = "genderBlockFemaleUnselected"
- }else if(this.props.value==this.props.options.option2.value){
- option1class = "genderBlockMaleUnselected";
- option2class = "genderBlockFemaleSelected";
- }else{
- option1class = "genderBlockMaleUnselected";
- option2class = "genderBlockFemaleUnselected";
- }
- return (
-
-
- )
-
+ }
+ render() {
+ let option1class,
+ option2class = '';
+ if (this.props.value == this.props.options.option1.value) {
+ option1class = 'genderBlockMaleSelected';
+ option2class = 'genderBlockFemaleUnselected';
+ } else if (this.props.value == this.props.options.option2.value) {
+ option1class = 'genderBlockMaleUnselected';
+ option2class = 'genderBlockFemaleSelected';
+ } else {
+ option1class = 'genderBlockMaleUnselected';
+ option2class = 'genderBlockFemaleUnselected';
}
+ return (
+
-
-
-
-
+
+ );
+ }
}
diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js
index 7290cba2..244f8f7f 100644
--- a/src/components/RequestBox/RequestBox.js
+++ b/src/components/RequestBox/RequestBox.js
@@ -1,13 +1,13 @@
-import React, { Component } from "react";
-import FHIR from "fhirclient";
-import PatientBox from "../SMARTBox/PatientBox";
-import { types, defaultValues, shortNameMap } from "../../util/data";
-import { getAge } from "../../util/fhir";
+import React, { Component } from 'react';
+import FHIR from 'fhirclient';
+import PatientBox from '../SMARTBox/PatientBox';
+import { types, defaultValues, shortNameMap } from '../../util/data';
+import { getAge } from '../../util/fhir';
import buildNewRxRequest from '../../util/buildScript.2017071.js';
-import _ from "lodash";
-import "./request.css";
-import { PrefetchTemplate } from "../../PrefetchTemplate";
-import { retrieveLaunchContext } from "../../util/util";
+import _ from 'lodash';
+import './request.css';
+import { PrefetchTemplate } from '../../PrefetchTemplate';
+import { retrieveLaunchContext } from '../../util/util';
import PersonIcon from '@mui/icons-material/Person';
import { Button, ButtonGroup, Modal, Box } from '@mui/material';
const style = {
@@ -23,7 +23,7 @@ const style = {
borderBottom: '2px solid black',
boxShadow: 24,
p: 4,
- padding:'0px'
+ padding: '0px'
};
export default class RequestBox extends Component {
constructor(props) {
@@ -66,14 +66,14 @@ export default class RequestBox extends Component {
prepPrefetch() {
const preppedResources = new Map();
- Object.keys(this.state.prefetchedResources).forEach((resourceKey) => {
- let resourceList = []
- if(Array.isArray(this.state.prefetchedResources[resourceKey])){
- resourceList = this.state.prefetchedResources[resourceKey].map((resource) => {
+ Object.keys(this.state.prefetchedResources).forEach(resourceKey => {
+ let resourceList = [];
+ if (Array.isArray(this.state.prefetchedResources[resourceKey])) {
+ resourceList = this.state.prefetchedResources[resourceKey].map(resource => {
return resource;
- })
+ });
} else {
- resourceList = this.state.prefetchedResources[resourceKey]
+ resourceList = this.state.prefetchedResources[resourceKey];
}
preppedResources.set(resourceKey, resourceList);
@@ -82,12 +82,7 @@ export default class RequestBox extends Component {
}
submitPatientView = () => {
- this.props.submitInfo(
- this.prepPrefetch(),
- null,
- this.state.patient,
- "patient-view"
- );
+ this.props.submitInfo(this.prepPrefetch(), null, this.state.patient, 'patient-view');
};
submitOrderSelect = () => {
@@ -96,18 +91,13 @@ export default class RequestBox extends Component {
this.prepPrefetch(),
this.state.request,
this.state.patient,
- "order-select"
+ 'order-select'
);
}
};
- submitOrderSign = (request) => {
- this.props.submitInfo(
- this.prepPrefetch(),
- request,
- this.state.patient,
- "order-sign"
- );
+ submitOrderSign = request => {
+ this.props.submitInfo(this.prepPrefetch(), request, this.state.patient, 'order-sign');
};
submit = () => {
@@ -118,8 +108,10 @@ export default class RequestBox extends Component {
componentDidUpdate(prevProps, prevState) {
// if prefetch completed
- if ((prevState.prefetchCompleted != this.state.prefetchCompleted)
- && (this.state.prefetchCompleted)) {
+ if (
+ prevState.prefetchCompleted != this.state.prefetchCompleted &&
+ this.state.prefetchCompleted
+ ) {
// if the prefetch contains a medicationRequests bundle
if (this.state.prefetchedResources.medicationRequests) {
this.submitPatientView();
@@ -137,17 +129,17 @@ export default class RequestBox extends Component {
};
updateStateList = (elementName, text) => {
- this.setState((prevState) => {
- return {[elementName]: [...prevState[elementName], text]}
+ this.setState(prevState => {
+ return { [elementName]: [...prevState[elementName], text] };
});
};
updateStateMap = (elementName, key, text) => {
- this.setState((prevState) => {
- if(!prevState[elementName][key]){
+ this.setState(prevState => {
+ if (!prevState[elementName][key]) {
prevState[elementName][key] = [];
}
- return {[elementName]: {...prevState[elementName], [key]: text}};
+ return { [elementName]: { ...prevState[elementName], [key]: text } };
});
};
@@ -162,50 +154,43 @@ export default class RequestBox extends Component {
getPatients = () => {
this.setState({ openPatient: true });
- const params = {serverUrl: this.props.ehrUrl};
+ const params = { serverUrl: this.props.ehrUrl };
if (this.props.access_token.access_token) {
- params["tokenResponse"] = {access_token: this.props.access_token.access_token}
+ params['tokenResponse'] = { access_token: this.props.access_token.access_token };
}
- const client = FHIR.client(
- params
- );
+ const client = FHIR.client(params);
client
- .request("Patient?_sort=identifier&_count=12", { flat: true })
- .then((result) => {
+ .request('Patient?_sort=identifier&_count=12', { flat: true })
+ .then(result => {
this.setState({
- patientList: result,
+ patientList: result
});
})
- .catch((e) => {
+ .catch(e => {
this.setState({
- patientList: e,
+ patientList: e
});
});
};
- emptyField = empty;
+ emptyField = (empty);
renderPatientInfo() {
const patient = this.state.patient;
if (Object.keys(patient).length === 0) {
- return (
-
+
+
+
+
-
- );
+ return ;
}
let name;
if (patient.name) {
- name = (
- {`${patient.name[0].given[0]} ${patient.name[0].family}`}
- );
+ name = {`${patient.name[0].given[0]} ${patient.name[0].family}`} ;
} else {
name = this.emptyField;
}
return (
- Demographics
+ Demographics
Name: {name}
@@ -227,14 +212,13 @@ export default class RequestBox extends Component {
return (
);
}
@@ -278,14 +264,14 @@ export default class RequestBox extends Component {
var renderedPrefetches = new Map();
requestResources.forEach((resourceList, resourceKey) => {
const renderedList = [];
- if(Array.isArray(resourceList)){
- resourceList.forEach((resource) => {
- console.log("Request resources:" + JSON.stringify(requestResources));
- console.log("Request key:" + resourceKey);
- renderedList.push(this.renderResource(resource))
+ if (Array.isArray(resourceList)) {
+ resourceList.forEach(resource => {
+ console.log('Request resources:' + JSON.stringify(requestResources));
+ console.log('Request key:' + resourceKey);
+ renderedList.push(this.renderResource(resource));
});
} else {
- renderedList.push(this.renderResource(resourceList))
+ renderedList.push(this.renderResource(resourceList));
}
renderedPrefetches.set(resourceKey, renderedList);
@@ -295,10 +281,14 @@ export default class RequestBox extends Component {
return (
);
+ return (
+
);
@@ -314,16 +304,15 @@ export default class RequestBox extends Component {
var resourceType = resource.resourceType;
value = (
-
- {label}
-
-
-
- )
+
+ {label}
+
+
+
+ );
}
makeOption(request, options) {
let code = this.getCoding(request);
let option = {
key: request.id,
- text: code.display + " (Medication request: " + code.code + ")",
+ text: code.display + ' (Medication request: ' + code.code + ')',
value: JSON.stringify(request)
- }
+ };
options.push(option);
}
updateValues(patient) {
- this.props.callback("patient", patient);
- this.props.callback("openPatient", false);
+ this.props.callback('patient', patient);
+ this.props.callback('openPatient', false);
this.props.clearCallback();
if (this.state.request) {
const request = JSON.parse(this.state.request);
- if (request.resourceType === "DeviceRequest" || request.resourceType === "ServiceRequest" || request.resourceType === "MedicationRequest" || request.resourceType === "MedicationDispense") {
+ if (
+ request.resourceType === 'DeviceRequest' ||
+ request.resourceType === 'ServiceRequest' ||
+ request.resourceType === 'MedicationRequest' ||
+ request.resourceType === 'MedicationDispense'
+ ) {
this.updatePrefetchRequest(request, patient, this.props.defaultUser);
} else {
this.props.clearCallback();
}
- }
- else {
+ } else {
this.updatePrefetchRequest(null, patient, this.props.defaultUser);
}
@@ -129,50 +138,69 @@ export default class PatientBox extends Component {
}
updateQRResponse(patient, response) {
- this.props.callback("response", response);
+ this.props.callback('response', response);
}
fetchResources(queries) {
console.log(queries);
var requests = [];
- this.props.callback("prefetchCompleted", false);
+ this.props.callback('prefetchCompleted', false);
queries.forEach((query, queryKey) => {
const urlQuery = this.props.ehrUrl + '/' + query;
- requests.push(fetch(urlQuery, {
- method: "GET",
- }).then((response) => {
- const responseJson = response.json()
- return responseJson;
- }).then((resource) => {
- this.props.callbackMap("prefetchedResources", queryKey, resource);
- }));
+ requests.push(
+ fetch(urlQuery, {
+ method: 'GET'
+ })
+ .then(response => {
+ const responseJson = response.json();
+ return responseJson;
+ })
+ .then(resource => {
+ this.props.callbackMap('prefetchedResources', queryKey, resource);
+ })
+ );
});
Promise.all(requests)
- .then((results) => {
- console.log("fetchResourcesSync: finished")
- this.props.callback("prefetchCompleted", true);
- }).catch(function(err) {
- console.log("fetchResourcesSync: failed to wait for all the prefetch to populate");
- console.log(err);
- })
+ .then(results => {
+ console.log('fetchResourcesSync: finished');
+ this.props.callback('prefetchCompleted', true);
+ })
+ .catch(function (err) {
+ console.log('fetchResourcesSync: failed to wait for all the prefetch to populate');
+ console.log(err);
+ });
}
updatePrefetchRequest(request, patient, user) {
- const patientReference = "Patient/"+patient?.id;
- const userReference = "Practitioner/"+user;
+ const patientReference = 'Patient/' + patient?.id;
+ const userReference = 'Practitioner/' + user;
if (request) {
this.props.callback(request.resourceType, request);
- var queries = this.props.updatePrefetchCallback(request, patientReference, userReference, "request", "patient", "practitioner");
+ const queries = this.props.updatePrefetchCallback(
+ request,
+ patientReference,
+ userReference,
+ 'request',
+ 'patient',
+ 'practitioner'
+ );
this.fetchResources(queries);
- this.props.callback("request", request);
+ this.props.callback('request', request);
const coding = this.getCoding(request);
- this.props.callback("code", coding.code);
- this.props.callback("codeSystem", coding.system);
- this.props.callback("display", coding.display);
+ this.props.callback('code', coding.code);
+ this.props.callback('codeSystem', coding.system);
+ this.props.callback('display', coding.display);
} else {
- var queries = this.props.updatePrefetchCallback(request, patientReference, userReference, "patient", "practitioner", "medicationRequests");
+ const queries = this.props.updatePrefetchCallback(
+ request,
+ patientReference,
+ userReference,
+ 'patient',
+ 'practitioner',
+ 'medicationRequests'
+ );
this.fetchResources(queries);
}
}
@@ -180,11 +208,11 @@ export default class PatientBox extends Component {
getDeviceRequest(patientId, client) {
client
.request(`DeviceRequest?subject=Patient/${patientId}`, {
- resolveReferences: ["subject", "performer"],
+ resolveReferences: ['subject', 'performer'],
graph: false,
- flat: true,
+ flat: true
})
- .then((result) => {
+ .then(result => {
this.setState({ deviceRequests: result });
});
}
@@ -192,11 +220,11 @@ export default class PatientBox extends Component {
getServiceRequest(patientId, client) {
client
.request(`ServiceRequest?subject=Patient/${patientId}`, {
- resolveReferences: ["subject", "performer"],
+ resolveReferences: ['subject', 'performer'],
graph: false,
- flat: true,
+ flat: true
})
- .then((result) => {
+ .then(result => {
this.setState({ serviceRequests: result });
});
}
@@ -204,11 +232,11 @@ export default class PatientBox extends Component {
getMedicationRequest(patientId, client) {
client
.request(`MedicationRequest?subject=Patient/${patientId}`, {
- resolveReferences: ["subject", "performer"],
+ resolveReferences: ['subject', 'performer'],
graph: false,
- flat: true,
+ flat: true
})
- .then((result) => {
+ .then(result => {
this.setState({ medicationRequests: result });
});
}
@@ -216,11 +244,11 @@ export default class PatientBox extends Component {
getMedicationDispense(patientId, client) {
client
.request(`MedicationDispense?subject=Patient/${patientId}`, {
- resolveReferences: ["subject", "performer"],
+ resolveReferences: ['subject', 'performer'],
graph: false,
- flat: true,
+ flat: true
})
- .then((result) => {
+ .then(result => {
this.setState({ medicationDispenses: result });
});
}
@@ -234,11 +262,11 @@ export default class PatientBox extends Component {
code: coding.code,
system: coding.system,
display: coding.display,
- response: ""
+ response: ''
});
} else {
this.setState({
- request: ""
+ request: ''
});
}
}
@@ -251,15 +279,13 @@ export default class PatientBox extends Component {
});
} else {
this.setState({
- response: ""
+ response: ''
});
}
}
getRequests() {
- const client = FHIR.client(
- this.props.params
- );
+ const client = FHIR.client(this.props.params);
const patientId = this.props.patient.id;
this.getDeviceRequest(patientId, client);
this.getServiceRequest(patientId, client);
@@ -268,127 +294,145 @@ export default class PatientBox extends Component {
}
/**
- * Retrieve QuestionnaireResponse
+ * Retrieve QuestionnaireResponse
*/
getResponses() {
- const client = FHIR.client(
- this.props.params
- );
+ const client = FHIR.client(this.props.params);
const patientId = this.props.patient.id;
let updateDate = new Date();
updateDate.setDate(updateDate.getDate() - this.props.responseExpirationDays);
+ const searchParameters = [
+ `_lastUpdated=gt${updateDate.toISOString().split('T')[0]}`,
+ 'status=in-progress',
+ `subject=Patient/${patientId}`,
+ '_sort=-authored'
+ ];
client
- .request(`QuestionnaireResponse?_lastUpdated=gt${updateDate.toISOString().split('T')[0]}&status=in-progress&subject=Patient/${patientId}`, {
- resolveReferences: ["subject"],
+ .request(`QuestionnaireResponse?${searchParameters.join('&')}`, {
+ resolveReferences: ['subject'],
graph: false,
- flat: true,
+ flat: true
})
- .then((result) => {
+ .then(result => {
this.setState({ questionnaireResponses: result });
});
}
- makeQROption(qr, options) {
+ makeQROption(qr) {
const display = `${qr.questionnaire}: created at ${qr.authored}`;
- let option = {
+ return {
key: qr.id,
text: display,
value: JSON.stringify(qr)
- }
- options.push(option);
+ };
}
render() {
const patient = this.props.patient;
- let name = "";
+ let name = '';
if (patient.name) {
- name = (
- {`${patient.name[0].given[0]} ${patient.name[0].family}`}
- );
+ name = {`${patient.name[0].given[0]} ${patient.name[0].family}`} ;
}
// add all of the requests to the list of options
- let options = []
+ let options = [];
let responseOptions = [];
let returned = false;
if (this.state.deviceRequests.data) {
returned = true;
- this.state.deviceRequests.data.forEach((e) => {
+ this.state.deviceRequests.data.forEach(e => {
this.makeOption(e, options);
});
}
if (this.state.serviceRequests.data) {
returned = true;
- this.state.serviceRequests.data.forEach((e) => {
+ this.state.serviceRequests.data.forEach(e => {
this.makeOption(e, options);
});
}
if (this.state.medicationRequests.data) {
returned = true;
- this.state.medicationRequests.data.forEach((e) => {
+ this.state.medicationRequests.data.forEach(e => {
this.makeOption(e, options);
});
}
if (this.state.medicationDispenses.data) {
returned = true;
- this.state.medicationDispenses.data.forEach((e) => {
+ this.state.medicationDispenses.data.forEach(e => {
this.makeOption(e, options);
- })
- };
+ });
+ }
if (this.state.questionnaireResponses.data) {
- this.state.questionnaireResponses.data.forEach(qr => this.makeQROption(qr, responseOptions));
+ responseOptions = this.state.questionnaireResponses.data.map(qr => this.makeQROption(qr));
returned = true;
}
- let noResults = 'No results found.'
+ let noResults = 'No results found.';
if (!returned) {
noResults = 'Loading...';
}
return (
-
- Coding
+ Coding
Code: {this.state.code ? this.state.code : this.emptyField}
- System:{" "}
- {this.state.codeSystem ? shortNameMap[this.state.codeSystem] : this.emptyField}
+ System: {this.state.codeSystem ? shortNameMap[this.state.codeSystem] : this.emptyField}
Display: {this.state.display ? this.state.display : this.emptyField}
@@ -247,12 +231,14 @@ export default class RequestBox extends Component {
const qrResponse = this.state.response;
return (
+ ) : (
+
+ )}
+
- {qrResponse.questionnaire ?
+ {qrResponse.questionnaire ? (
<>
- :
-
- }
-
- In Progress Form
+ In Progress Form
+
+
+ Form: {qrResponse.questionnaire ? qrResponse.questionnaire : this.emptyField}
- Form: { qrResponse.questionnaire ? qrResponse.questionnaire : this.emptyField}
Author: {qrResponse.author ? qrResponse.author.reference : this.emptyField}
@@ -260,10 +246,10 @@ export default class RequestBox extends Component {
Date: {qrResponse.authored ? qrResponse.authored : this.emptyField}
Prefetched
- {Array.from(renderedPrefetches.keys()).map((resourceKey) => {
+ {Array.from(renderedPrefetches.keys()).map(resourceKey => {
const currentRenderedPrefetch = renderedPrefetches.get(resourceKey);
- return ({resourceKey + " Resources"}
- {currentRenderedPrefetch}
+
+ );
})}
{resourceKey + ' Resources'}
+ {currentRenderedPrefetch}
+
- {resourceType}:{" "}
- {resourceType}/{resourceId}{" "}
- .....
+ {resourceType}: {resourceType}/
+ {resourceId} .....
);
} else {
value = (
-
- {"UNKNOWN"}{" "}
- .....
+
- {this.state.patient.id ?
-
);
}
diff --git a/src/components/SMARTBox/EHRLaunchBox.js b/src/components/SMARTBox/EHRLaunchBox.js
index 3fee286a..d7095727 100644
--- a/src/components/SMARTBox/EHRLaunchBox.js
+++ b/src/components/SMARTBox/EHRLaunchBox.js
@@ -1,36 +1,33 @@
-import React, {Component} from 'react';
-import {fhir} from '../../util/fhir';
+import React, { Component } from 'react';
+import { fhir } from '../../util/fhir';
import './smart.css';
import env from 'env-var';
export default class EHRLaunchBox extends Component {
- constructor(props){
- super(props);
- this.state={
- };
- }
+ constructor(props) {
+ super(props);
+ this.state = {};
+ }
- render() {
- return (
-
+ {'UNKNOWN'} .....
+
);
}
@@ -331,52 +320,57 @@ export default class RequestBox extends Component {
}
renderError() {
- return (
- {this.state.patientList.message}
- );
+ return {this.state.patientList.message};
}
launchSmartOnFhirApp = () => {
- console.log("Launch SMART on FHIR App");
+ console.log('Launch SMART on FHIR App');
let userId = this.state.prefetchedResources?.practitioner?.id;
if (!userId) {
- console.log("Practitioner not populated from prefetch, using default from config: " + this.props.defaultUser);
+ console.log(
+ 'Practitioner not populated from prefetch, using default from config: ' +
+ this.props.defaultUser
+ );
userId = this.props.defaultUser;
}
let link = {
- appContext: "user=" + userId + "&patient=" + this.state.patient.id,
- type: "smart",
+ appContext: 'user=' + userId + '&patient=' + this.state.patient.id,
+ type: 'smart',
url: this.props.smartAppUrl
- }
+ };
retrieveLaunchContext(
- link, this.props.fhirAccessToken,
- this.state.patient.id, this.props.fhirServerUrl, this.props.fhirVersion
- ).then((result) => {
- link = result;
- console.log(link);
- // launch the application in a new window
- window.open(link.url, '_blank');
+ link,
+ this.props.fhirAccessToken,
+ this.state.patient.id,
+ this.props.fhirServerUrl,
+ this.props.fhirVersion
+ ).then(result => {
+ link = result;
+ console.log(link);
+ // launch the application in a new window
+ window.open(link.url, '_blank');
});
- }
+ };
/**
* Relaunch DTR using the available context
*/
- relaunch = (e) => {
- this.buildLaunchLink()
- .then(link => {
- //e.preventDefault();
- window.open(link.url, "_blank");
- });
- }
+ relaunch = e => {
+ this.buildLaunchLink().then(link => {
+ //e.preventDefault();
+ window.open(link.url, '_blank');
+ });
+ };
buildLaunchLink() {
// build appContext and URL encode it
- let appContext = "";
- let order = undefined, coverage = undefined, response = undefined;
+ let appContext = '';
+ let order = undefined,
+ coverage = undefined,
+ response = undefined;
if (!this.isOrderNotSelected()) {
if (Object.keys(this.state.request).length > 0) {
@@ -387,78 +381,82 @@ export default class RequestBox extends Component {
}
}
- if(order) {
- appContext += `order=${order}`
+ if (order) {
+ appContext += `order=${order}`;
- if(coverage) {
- appContext += `&coverage=${coverage}`
+ if (coverage) {
+ appContext += `&coverage=${coverage}`;
}
}
-
- if(Object.keys(this.state.response).length > 0) {
+
+ if (Object.keys(this.state.response).length > 0) {
response = `QuestionnaireResponse/${this.state.response.id}`;
}
-
- if(order && response) {
- appContext += `&response=${response}`
+
+ if (order && response) {
+ appContext += `&response=${response}`;
} else if (!order && response) {
- appContext += `response=${response}`
- }
+ appContext += `response=${response}`;
+ }
const link = {
appContext: encodeURIComponent(appContext),
- type: "smart",
+ type: 'smart',
url: this.props.launchUrl
- }
+ };
let linkCopy = Object.assign({}, link);
-
+
return retrieveLaunchContext(
- linkCopy, this.props.fhirAccessToken,
- this.state.patient.id, this.props.fhirServerUrl, this.props.fhirVersion
- ).then((result) => {
- linkCopy = result;
- return linkCopy;
+ linkCopy,
+ this.props.fhirAccessToken,
+ this.state.patient.id,
+ this.props.fhirServerUrl,
+ this.props.fhirVersion
+ ).then(result => {
+ linkCopy = result;
+ return linkCopy;
});
}
/**
* Send the NewRxRequestMessage to the Pharmacy Information System (PIMS)
*/
- sendRx = (e) => {
- console.log("sendRx: " + this.props.pimsUrl);
+ sendRx = e => {
+ console.log('sendRx: ' + this.props.pimsUrl);
// build the NewRx Message
- var newRx = buildNewRxRequest(this.state.prefetchedResources.patient,
+ var newRx = buildNewRxRequest(
+ this.state.prefetchedResources.patient,
this.state.prefetchedResources.practitioner,
- this.state.request);
+ this.state.request
+ );
console.log(newRx);
const serializer = new XMLSerializer();
-
+
// send the message to the prescriber
- this.props.consoleLog("Sending Rx to PIMS", types.info);
+ this.props.consoleLog('Sending Rx to PIMS', types.info);
fetch(this.props.pimsUrl, {
method: 'POST',
//mode: 'no-cors',
headers: {
- 'Accept': 'application/xml',
+ Accept: 'application/xml',
'Content-Type': 'application/xml'
},
body: serializer.serializeToString(newRx)
})
- .then(response => {
- console.log("sendRx response: ");
- console.log(response);
- this.props.consoleLog("Successfully sent Rx to PIMS", types.info);
- })
- .catch(error => {
- console.log("sendRx error: ");
- this.props.consoleLog("Server returned error sending Rx to PIMS: ", types.error);
- this.props.consoleLog(error.message);
- console.log(error);
- });
-
- }
+ .then(response => {
+ console.log('sendRx response: ');
+ console.log(response);
+ this.props.consoleLog('Successfully sent Rx to PIMS', types.info);
+ })
+ .catch(error => {
+ console.log('sendRx error: ');
+ this.props.consoleLog('Server returned error sending Rx to PIMS: ', types.error);
+ this.props.consoleLog(error.message);
+ console.log(error);
+ });
+ };
isOrderNotSelected() {
return Object.keys(this.state.request).length === 0;
@@ -472,68 +470,81 @@ export default class RequestBox extends Component {
const params = {};
params['serverUrl'] = this.props.ehrUrl;
if (this.props.access_token) {
- params['tokenResponse'] = {access_token: this.props.access_token.access_token};
+ params['tokenResponse'] = { access_token: this.props.access_token.access_token };
}
- const disableSendToCRD = this.isOrderNotSelected() || this.props.loading ;
+ const disableSendToCRD = this.isOrderNotSelected() || this.props.loading;
const disableLaunchDTR = !this.state.response.questionnaire;
const disableSendRx = this.isOrderNotSelected() || this.props.loading;
const disableLaunchSmartOnFhir = this.isPatientNotSelected();
return (
-
-
- {this.state.patientList instanceof Error
- ? this.renderError()
- : this.state.patientList.map((patient) => {
- return (
-
-
+ aria-describedby="modal-modal-description"
+ >
+
+ {this.state.patientList instanceof Error
+ ? this.renderError()
+ : this.state.patientList.map(patient => {
+ return (
+
- }>
- Select a patient
+ }>
+ Select a patient
- {this.state.patient.id ? Patient ID: {this.state.patient.id} : No patient selected}
+ {this.state.patient.id ? (
+ Patient ID: {this.state.patient.id}
+ ) : (
+ No patient selected
+ )}
{this.renderPatientInfo()}
{this.renderPrefetchedResources()}
-
+
-
-
-
-
-
-
-
- : }
+ {this.state.patient.id ? (
+
+
+
+
+
+
+
+
+ ) : (
+
+ )}
-
+ );
+ }
+}
diff --git a/src/components/SMARTBox/PatientBox.js b/src/components/SMARTBox/PatientBox.js
index 5ba5c9ca..6331e304 100644
--- a/src/components/SMARTBox/PatientBox.js
+++ b/src/components/SMARTBox/PatientBox.js
@@ -1,7 +1,7 @@
-import React, { Component } from "react";
-import { getAge } from "../../util/fhir";
-import FHIR from "fhirclient";
-import "./smart.css";
+import React, { Component } from 'react';
+import { getAge } from '../../util/fhir';
+import FHIR from 'fhirclient';
+import './smart.css';
import { Button, IconButton } from '@mui/material';
import RefreshIcon from '@mui/icons-material/Refresh';
import Box from '@mui/material/Box';
@@ -10,17 +10,16 @@ import MenuItem from '@mui/material/MenuItem';
import FormControl from '@mui/material/FormControl';
import Select, { SelectChangeEvent } from '@mui/material/Select';
-
export default class PatientBox extends Component {
constructor(props) {
super(props);
this.state = {
- request: "",
+ request: '',
deviceRequests: {},
medicationRequests: {},
serviceRequests: {},
medicationDispenses: {},
- response: "",
+ response: '',
questionnaireResponses: {},
openRequests: false,
openQuestionnaires: false
@@ -42,34 +41,36 @@ export default class PatientBox extends Component {
componentDidMount() {
// get requests and responses on open of patients
- this.getRequests()
+ this.getRequests();
this.getResponses();
}
getCoding(request) {
let code = null;
- if (request.resourceType === "DeviceRequest") {
+ if (request.resourceType === 'DeviceRequest') {
code = request.codeCodeableConcept.coding[0];
- } else if (request.resourceType === "ServiceRequest") {
+ } else if (request.resourceType === 'ServiceRequest') {
code = request.code.coding[0];
- } else if (request.resourceType === "MedicationRequest"
- || request.resourceType === "MedicationDispense") {
+ } else if (
+ request.resourceType === 'MedicationRequest' ||
+ request.resourceType === 'MedicationDispense'
+ ) {
code = request.medicationCodeableConcept.coding[0];
}
if (code) {
if (!code.code) {
- code.code = "Unknown";
+ code.code = 'Unknown';
}
if (!code.display) {
- code.display = "Unknown";
+ code.display = 'Unknown';
}
if (!code.system) {
- code.system = "Unknown";
+ code.system = 'Unknown';
}
} else {
- code.code = "Unknown";
- code.display = "Unknown";
- code.system = "Unknown";
+ code.code = 'Unknown';
+ code.display = 'Unknown';
+ code.system = 'Unknown';
}
return code;
}
@@ -78,47 +79,55 @@ export default class PatientBox extends Component {
console.log(options);
return (
- EHR Launch Settings
-
-
-
-
-
+
- Note: Only the local EHR is supported at this time for EHR launch
-
-
-
+ render() {
+ return (
+
+
- )
- }
-}
\ No newline at end of file
+
+
+ EHR Launch Settings
+
+
+
+
-
+ Note: Only the local EHR is supported at this time for EHR launch
+
+
+
-
-
-
+
- {name ? name : "N/A"} {`(ID: ${patient.id})`}
+ {name ? name : 'N/A'}{' '}
+ {`(ID: ${patient.id})`}
-
+
);
diff --git a/src/components/SettingsBox/SettingsBox.js b/src/components/SettingsBox/SettingsBox.js
index 0905e407..e3760c88 100644
--- a/src/components/SettingsBox/SettingsBox.js
+++ b/src/components/SettingsBox/SettingsBox.js
@@ -2,149 +2,177 @@ import React, { Component } from 'react';
import './SettingsBox.css';
import InputBox from '../Inputs/InputBox';
import CheckBox from '../Inputs/CheckBox';
-import { headerDefinitions, types } from '../../util/data'
-import FHIR from "fhirclient";
+import { headerDefinitions, types } from '../../util/data';
+import FHIR from 'fhirclient';
-const clearQuestionnaireResponses = ({ ehrUrl, defaultUser, access_token }, consoleLog) => (_event) => {
- console.log("Clear QuestionnaireResponses from the EHR: " + ehrUrl + " for author " + defaultUser);
- const client = FHIR.client({
- serverUrl: ehrUrl,
- ...(access_token ? { tokenResponse: access_token } : {})
+const clearQuestionnaireResponses =
+ ({ ehrUrl, defaultUser, access_token }, consoleLog) =>
+ _event => {
+ console.log(
+ 'Clear QuestionnaireResponses from the EHR: ' + ehrUrl + ' for author ' + defaultUser
+ );
+ const client = FHIR.client({
+ serverUrl: ehrUrl,
+ ...(access_token ? { tokenResponse: access_token } : {})
});
client
- .request("QuestionnaireResponse?author=" + defaultUser, { flat: true })
- .then((result) => {
- console.log(result);
- result.forEach((resource) => {
- console.log(resource.id);
- client
- .delete("QuestionnaireResponse/" + resource.id)
- .then((result) => {
- consoleLog("Successfully deleted QuestionnaireResponse " + resource.id + " from EHR", types.info);
- console.log(result);
- })
- .catch((e) => {
- console.log("Failed to delete QuestionnaireResponse " + resource.id);
- console.log(e);
- });
+ .request('QuestionnaireResponse?author=' + defaultUser, { flat: true })
+ .then(result => {
+ console.log(result);
+ result.forEach(resource => {
+ console.log(resource.id);
+ client
+ .delete('QuestionnaireResponse/' + resource.id)
+ .then(result => {
+ consoleLog(
+ 'Successfully deleted QuestionnaireResponse ' + resource.id + ' from EHR',
+ types.info
+ );
+ console.log(result);
+ })
+ .catch(e => {
+ console.log('Failed to delete QuestionnaireResponse ' + resource.id);
+ console.log(e);
});
- })
- .catch((e) => {
- console.log("Failed to retrieve list of QuestionnaireResponses");
- console.log(e);
});
-};
+ })
+ .catch(e => {
+ console.log('Failed to retrieve list of QuestionnaireResponses');
+ console.log(e);
+ });
+ };
-const resetPims = ({ pimsUrl }, consoleLog) => (_event) => {
+const resetPims =
+ ({ pimsUrl }, consoleLog) =>
+ _event => {
let url = new URL(pimsUrl);
- const resetUrl = url.origin + "/doctorOrders/api/deleteAll";
- console.log("reset pims: " + resetUrl);
-
+ const resetUrl = url.origin + '/doctorOrders/api/deleteAll';
+ console.log('reset pims: ' + resetUrl);
+
fetch(resetUrl, {
- method: 'DELETE',
+ method: 'DELETE'
})
- .then(response => {
- console.log("Reset pims: ");
+ .then(response => {
+ console.log('Reset pims: ');
console.log(response);
- consoleLog("Successfully reset pims database", types.info);
- })
- .catch(error => {
- console.log("Reset pims error: ");
- consoleLog("Server returned error when resetting pims: ", types.error);
+ consoleLog('Successfully reset pims database', types.info);
+ })
+ .catch(error => {
+ console.log('Reset pims error: ');
+ consoleLog('Server returned error when resetting pims: ', types.error);
consoleLog(error.message);
console.log(error);
- });
-}
+ });
+ };
-const resetRemsAdmin = ({ cdsUrl } , consoleLog) => (_event) => {
+const resetRemsAdmin =
+ ({ cdsUrl }, consoleLog) =>
+ _event => {
let url = new URL(cdsUrl);
- const resetUrl = url.origin + "/etasu/reset";
+ const resetUrl = url.origin + '/etasu/reset';
fetch(resetUrl, {
- method: 'POST',
+ method: 'POST'
})
- .then(response => {
- console.log("Reset rems admin etasu: ");
+ .then(response => {
+ console.log('Reset rems admin etasu: ');
console.log(response);
- consoleLog("Successfully reset rems admin etasu", types.info);
- })
- .catch(error => {
- console.log("Reset rems admin error: ");
- consoleLog("Server returned error when resetting rems admin etasu: ", types.error);
+ consoleLog('Successfully reset rems admin etasu', types.info);
+ })
+ .catch(error => {
+ console.log('Reset rems admin error: ');
+ consoleLog('Server returned error when resetting rems admin etasu: ', types.error);
consoleLog(error.message);
console.log(error);
- });
-}
+ });
+ };
const resetHeaderDefinitions = [
- {
- display: "Clear EHR QuestionnaireResponses",
- key: "clearQuestionnaireResponses",
- reset: clearQuestionnaireResponses
- },
- {
- display: "Reset PIMS Database",
- key: "resetPims",
- reset: resetPims
- },
- {
- display: "Reset REMS-Admin Database",
- key: "resetRemsAdmin",
- reset: resetRemsAdmin
- },
+ {
+ display: 'Clear EHR QuestionnaireResponses',
+ key: 'clearQuestionnaireResponses',
+ reset: clearQuestionnaireResponses
+ },
+ {
+ display: 'Reset PIMS Database',
+ key: 'resetPims',
+ reset: resetPims
+ },
+ {
+ display: 'Reset REMS-Admin Database',
+ key: 'resetRemsAdmin',
+ reset: resetRemsAdmin
+ }
];
export default class SettingsBox extends Component {
- constructor(props) {
- super(props);
- }
+ constructor(props) {
+ super(props);
+ }
- componentDidMount() { }
+ componentDidMount() {}
- render() {
- const { state, consoleLog, updateCB } = this.props;
+ render() {
+ const { state, consoleLog, updateCB } = this.props;
- const headers = Object.keys(headerDefinitions)
- .map(key => ({ ...headerDefinitions[key], key }))
- // Display the fields in descending order of type. If two fields are the same type, then sort by ascending order of display text.
- .sort((self, other) => -self.type.localeCompare(other.type) || self.display.localeCompare(other.display));
+ const headers = Object.keys(headerDefinitions)
+ .map(key => ({ ...headerDefinitions[key], key }))
+ // Display the fields in descending order of type. If two fields are the same type, then sort by ascending order of display text.
+ .sort(
+ (self, other) =>
+ -self.type.localeCompare(other.type) || self.display.localeCompare(other.display)
+ );
- return (
-
- Gender:{" "}
- {patient.gender}
+ Gender: {patient.gender}
- Age:{" "}
- {getAge(patient.birthDate)}
+ Age: {getAge(patient.birthDate)}
-
- Request:
-
- { !options.length && returned ?
+ Request:
+ {!options.length && returned ? (
No requests
- :
- this.makeDropdown(options, "Choose a patient", this.state.request, this.handleRequestChange)
- }
+ ) : (
+ this.makeDropdown(
+ options,
+ 'Choose a patient',
+ this.state.request,
+ this.handleRequestChange
+ )
+ )}
-
+
In Progress Form:
-
+
+
- { !responseOptions.length && returned ?
- No in progress forms :
- this.makeDropdown(responseOptions, "Choose an in-progress form", this.state.response, this.handleResponseChange)
- }
+ {!responseOptions.length && returned ? (
+ No in progress forms
+ ) : (
+ this.makeDropdown(
+ responseOptions,
+ 'Choose an in-progress form',
+ this.state.response,
+ this.handleResponseChange
+ )
+ )}
-
+
- {headers.map(({ key, type, display }) => {
- switch(type) {
- case "input":
- return
- }
- })}
- {resetHeaderDefinitions.map(({ key, display, reset }) => {
- return
-
-
- case "check":
- return {display}
-
-
- default:
- return {display}
-
-
{display}
-
-
- })}
+ return (
+
+ {headers.map(({ key, type, display }) => {
+ switch (type) {
+ case 'input':
+ return (
+
+ );
+ }
+}
diff --git a/src/containers/PatientPortal.jsx b/src/containers/PatientPortal.jsx
index 2f7c2220..d8bf2bc1 100644
--- a/src/containers/PatientPortal.jsx
+++ b/src/containers/PatientPortal.jsx
@@ -1,6 +1,6 @@
import React, { memo, useState, useEffect } from 'react';
import useStyles from './styles/styles';
-import FHIR from "fhirclient";
+import FHIR from 'fhirclient';
import Login from '../components/Auth/Login';
import Dashboard from '../components/Dashboard/Dashboard';
import AccountBoxIcon from '@mui/icons-material/AccountBox';
@@ -10,65 +10,62 @@ import Typography from '@mui/material/Typography';
import env from 'env-var';
const PatientPortal = () => {
- const classes = useStyles();
- const [token, setToken] = useState(null);
- const [client, setClient] = useState(null);
- const [patientName, setPatientName] = useState(null);
+ const classes = useStyles();
+ const [token, setToken] = useState(null);
+ const [client, setClient] = useState(null);
+ const [patientName, setPatientName] = useState(null);
- useEffect(() => {
- if(token) {
- const data = JSON.parse(Buffer.from(token.split('.')[1], 'base64'))
- const client = FHIR.client({
- serverUrl: env.get('REACT_APP_EHR_BASE').asString(),
- tokenResponse: {
- type: 'bearer',
- access_token: token,
- patient: data.patientId
- },
- });
- client.request(`Patient/${client.patient.id}`).then((patient) => {
- setPatientName(getName(patient));
- });
- setClient(client);
+ useEffect(() => {
+ if (token) {
+ const data = JSON.parse(Buffer.from(token.split('.')[1], 'base64'));
+ const client = FHIR.client({
+ serverUrl: env.get('REACT_APP_EHR_BASE').asString(),
+ tokenResponse: {
+ type: 'bearer',
+ access_token: token,
+ patient: data.patientId
}
+ });
+ client.request(`Patient/${client.patient.id}`).then(patient => {
+ setPatientName(getName(patient));
+ });
+ setClient(client);
+ }
+ }, [token]);
- }, [token])
-
- const getName = (patient) => {
- const name = [];
- if(patient.name) {
- if(patient.name[0].given) {
- name.push(patient.name[0].given[0]);
- }
- if(patient.name[0].family){
- name.push(patient.name[0].family);
- }
- }
- return name.join(' ');
+ const getName = patient => {
+ const name = [];
+ if (patient.name) {
+ if (patient.name[0].given) {
+ name.push(patient.name[0].given[0]);
+ }
+ if (patient.name[0].family) {
+ name.push(patient.name[0].family);
+ }
}
- return (
-
+
+ );
+ case 'check':
+ return (
+ {display}
+
+
+ );
+ default:
+ return (
+
+ {display}
+
+
+
+ );
+ }
+ })}
+ {resetHeaderDefinitions.map(({ key, display, reset }) => {
+ return (
+ {display}
+
+
-
- )
- }
-}
\ No newline at end of file
+ );
+ })}
+
-
-
-
- EHR Patient Portal
-
- {patientName ?
-
-
-
- {token && client ?
-
- );
+ return name.join(' ');
+ };
+ return (
+
+
+
+
+ EHR Patient Portal
+
+ {patientName ? (
+
+
+
+ {token && client ? (
+
+ );
};
export default memo(PatientPortal);
diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js
index 1d455a77..b685610e 100644
--- a/src/containers/RequestBuilder.js
+++ b/src/containers/RequestBuilder.js
@@ -12,204 +12,222 @@ import { createJwt, login, setupKeys } from '../util/auth';
import env from 'env-var';
export default class RequestBuilder extends Component {
- constructor(props) {
- super(props);
- this.state = {
- keypair: null,
- loading: false,
- logs: [],
- patient: {},
- response: null,
- showSettings: false,
- token: null,
- // Configurable values
- alternativeTherapy: env.get('REACT_APP_ALT_DRUG').asBool(),
- baseUrl: env.get('REACT_APP_EHR_BASE').asString(),
- cdsUrl: env.get('REACT_APP_CDS_SERVICE').asString(),
- defaultUser: env.get('REACT_APP_DEFAULT_USER').asString(),
- ehrUrl: env.get('REACT_APP_EHR_SERVER').asString(),
- includeConfig: true,
- launchUrl: env.get('REACT_APP_LAUNCH_URL').asString(),
- orderSelect: env.get('REACT_APP_ORDER_SELECT').asString(),
- orderSign: env.get('REACT_APP_ORDER_SIGN').asString(),
- patientView: env.get('REACT_APP_PATIENT_VIEW').asString(),
- pimsUrl: env.get('REACT_APP_PIMS_SERVER').asString(),
- responseExpirationDays: env.get('REACT_APP_RESPONSE_EXPIRATION_DAYS').asInt(),
- sendPrefetch: true,
- smartAppUrl: env.get('REACT_APP_SMART_LAUNCH_URL').asString(),
- };
-
- this.updateStateElement = this.updateStateElement.bind(this);
- this.submit_info = this.submit_info.bind(this);
- this.consoleLog = this.consoleLog.bind(this);
- this.takeSuggestion = this.takeSuggestion.bind(this);
- this.requestBox = React.createRef();
+ constructor(props) {
+ super(props);
+ this.state = {
+ keypair: null,
+ loading: false,
+ logs: [],
+ patient: {},
+ response: null,
+ showSettings: false,
+ token: null,
+ // Configurable values
+ alternativeTherapy: env.get('REACT_APP_ALT_DRUG').asBool(),
+ baseUrl: env.get('REACT_APP_EHR_BASE').asString(),
+ cdsUrl: env.get('REACT_APP_CDS_SERVICE').asString(),
+ defaultUser: env.get('REACT_APP_DEFAULT_USER').asString(),
+ ehrUrl: env.get('REACT_APP_EHR_SERVER').asString(),
+ includeConfig: true,
+ launchUrl: env.get('REACT_APP_LAUNCH_URL').asString(),
+ orderSelect: env.get('REACT_APP_ORDER_SELECT').asString(),
+ orderSign: env.get('REACT_APP_ORDER_SIGN').asString(),
+ patientView: env.get('REACT_APP_PATIENT_VIEW').asString(),
+ pimsUrl: env.get('REACT_APP_PIMS_SERVER').asString(),
+ responseExpirationDays: env.get('REACT_APP_RESPONSE_EXPIRATION_DAYS').asInt(),
+ sendPrefetch: true,
+ smartAppUrl: env.get('REACT_APP_SMART_LAUNCH_URL').asString()
+ };
+
+ this.updateStateElement = this.updateStateElement.bind(this);
+ this.submit_info = this.submit_info.bind(this);
+ this.consoleLog = this.consoleLog.bind(this);
+ this.takeSuggestion = this.takeSuggestion.bind(this);
+ this.requestBox = React.createRef();
+ }
+
+ componentDidMount() {
+ const callback = keypair => {
+ this.setState({ keypair });
+ };
+
+ setupKeys(callback);
+
+ login()
+ .then(response => {
+ return response.json();
+ })
+ .then(token => {
+ this.setState({ token });
+ })
+ .catch(error => {
+ // fails when keycloak isn't running, add dummy token
+ this.setState({ token: { access_token: '' } });
+ });
+ }
+
+ consoleLog(content, type) {
+ console.log(content);
+ let jsonContent = {
+ content: content,
+ type: type
+ };
+ this.setState(prevState => ({
+ logs: [...prevState.logs, jsonContent]
+ }));
+ }
+
+ updateStateElement = (elementName, text) => {
+ this.setState({ [elementName]: text });
+ };
+
+ timeout = time => {
+ let controller = new AbortController();
+ setTimeout(() => controller.abort(), time * 1000);
+ return controller;
+ };
+
+ submit_info(prefetch, request, patient, hook) {
+ this.setState({ loading: true });
+ this.consoleLog('Initiating form submission', types.info);
+ this.setState({ patient });
+ const hookConfig = {
+ includeConfig: this.state.includeConfig,
+ alternativeTherapy: this.state.alternativeTherapy
+ };
+ let user = this.state.defaultUser;
+ let json_request = buildRequest(
+ request,
+ user,
+ patient,
+ this.state.ehrUrl,
+ this.state.token,
+ prefetch,
+ this.state.sendPrefetch,
+ hook,
+ hookConfig
+ );
+ let cdsUrl = this.state.cdsUrl;
+ if (hook === 'order-sign') {
+ cdsUrl = cdsUrl + '/' + this.state.orderSign;
+ } else if (hook === 'order-select') {
+ cdsUrl = cdsUrl + '/' + this.state.orderSelect;
+ } else if (hook === 'patient-view') {
+ cdsUrl = cdsUrl + '/' + this.state.patientView;
+ } else {
+ this.consoleLog("ERROR: unknown hook type: '", hook, "'");
+ return;
}
-
- componentDidMount() {
- const callback = (keypair) => {
- this.setState({ keypair });
- }
-
- setupKeys(callback);
-
- login().then((response) => { return response.json() }).then((token) => {
- this.setState({ token })
- }).catch((error) =>{
- // fails when keycloak isn't running, add dummy token
- this.setState({ token: {access_token: ""}})
+ let baseUrl = this.state.baseUrl;
+ const jwt = 'Bearer ' + createJwt(this.state.keypair, baseUrl, cdsUrl);
+ const headers = new Headers({
+ 'Content-Type': 'application/json',
+ authorization: jwt
+ });
+ try {
+ fetch(cdsUrl, {
+ method: 'POST',
+ headers: headers,
+ body: JSON.stringify(json_request),
+ signal: this.timeout(10).signal //Timeout set to 10 seconds
+ })
+ .then(response => {
+ clearTimeout(this.timeout);
+ response.json().then(fhirResponse => {
+ console.log(fhirResponse);
+ if (fhirResponse?.status) {
+ this.consoleLog(
+ 'Server returned status ' + fhirResponse.status + ': ' + fhirResponse.error,
+ types.error
+ );
+ this.consoleLog(fhirResponse.message, types.error);
+ } else {
+ this.setState({ response: fhirResponse });
+ }
+ this.setState({ loading: false });
+ });
})
- }
-
- consoleLog(content, type) {
- console.log(content);
- let jsonContent = {
- content: content,
- type: type
- }
- this.setState(prevState => ({
- logs: [...prevState.logs, jsonContent]
- }))
- }
-
- updateStateElement = (elementName, text) => {
- this.setState({ [elementName]: text });
- }
-
- timeout = (time) => {
- let controller = new AbortController();
- setTimeout(()=>controller.abort(), time * 1000);
- return controller;
- }
-
- submit_info(prefetch, request, patient, hook) {
- this.setState({loading: true});
- this.consoleLog("Initiating form submission", types.info);
- this.setState({patient});
- const hookConfig = {
- "includeConfig": this.state.includeConfig,
- "alternativeTherapy": this.state.alternativeTherapy
- }
- let user = this.state.defaultUser;
- let json_request = buildRequest(request, user, patient, this.state.ehrUrl, this.state.token, prefetch, this.state.sendPrefetch, hook, hookConfig);
- let cdsUrl = this.state.cdsUrl;
- if (hook === "order-sign") {
- cdsUrl = cdsUrl + "/" + this.state.orderSign;
- } else if (hook === "order-select") {
- cdsUrl = cdsUrl + "/" + this.state.orderSelect;
- } else if (hook === "patient-view") {
- cdsUrl = cdsUrl + "/" + this.state.patientView;
- } else {
- this.consoleLog("ERROR: unknown hook type: '", hook, "'");
- return;
- }
- let baseUrl = this.state.baseUrl;
- const jwt = "Bearer " + createJwt(this.state.keypair, baseUrl, cdsUrl);
- const headers = new Headers({
- "Content-Type": "application/json",
- "authorization": jwt
+ .catch(() => {
+ this.consoleLog('No response received from the server', types.error);
+ this.setState({ response: null });
+ this.setState({ loading: false });
});
- try {
- fetch(cdsUrl, {
- method: "POST",
- headers: headers,
- body: JSON.stringify(json_request),
- signal: this.timeout(10).signal //Timeout set to 10 seconds
- }).then(response => {
- clearTimeout(this.timeout)
- response.json().then((fhirResponse) => {
- console.log(fhirResponse);
- if (fhirResponse?.status) {
- this.consoleLog("Server returned status "
- + fhirResponse.status + ": "
- + fhirResponse.error, types.error);
- this.consoleLog(fhirResponse.message, types.error);
- } else {
- this.setState({ response: fhirResponse });
- }
- this.setState({ loading: false });
- })
- }).catch(() => {
- this.consoleLog("No response received from the server", types.error);
- this.setState({ response: null });
- this.setState({loading: false});
- });
- } catch (error) {
- this.setState({ loading: false });
- this.consoleLog("Unexpected error occurred", types.error)
- if (error instanceof TypeError) {
- this.consoleLog(error.name + ": " + error.message, types.error);
- }
- }
- }
-
- takeSuggestion(resource) {
- // when a suggestion is taken, call into the requestBox to resubmit the CRD request with the new request
- this.requestBox.current.replaceRequestAndSubmit(resource);
- }
-
- render() {
- return (
-
-
- )
+ } catch (error) {
+ this.setState({ loading: false });
+ this.consoleLog('Unexpected error occurred', types.error);
+ if (error instanceof TypeError) {
+ this.consoleLog(error.name + ': ' + error.message, types.error);
+ }
}
+ }
+
+ takeSuggestion(resource) {
+ // when a suggestion is taken, call into the requestBox to resubmit the CRD request with the new request
+ this.requestBox.current.replaceRequestAndSubmit(resource);
+ }
+
+ render() {
+ return (
+
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- {this.state.showSettings &&
-
- {/*for the ehr launch */}
-
- - -
-
-
-
-
-
-
+
+ );
+ }
}
-
-
-
diff --git a/src/index.js b/src/index.js
index b1ecc448..4c4b3f6c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,4 @@ import ReactDOM from 'react-dom';
import './index.css';
import App from './components/App';
-ReactDOM.render(
-
+
+
+
+
+ {this.state.showSettings && (
+
+ +
+
+
+
+
+
+ {/*for the ehr launch */}
+
+ + +
+
+
+
+
+