Merge pull request #22 from mcode/patient-portal-integrate

clickable responses

src/components/Dashboard/Dashboard.jsx

@@ -30,7 +30,7 @@ const Dashboard = (props) => {
     <div className={classes.dashboardArea}>
         {resources.length > 0?
         resources.map((e) => {
-          return <DashboardElement key = {e.id} resource = {e}/>
+          return <DashboardElement key = {e.id} resource = {e} client={props.client}/>
         }): <div>{message}</div>}
     </div>
   );

src/components/Dashboard/DashboardElement.jsx

@@ -1,13 +1,26 @@
-import React, { memo } from 'react';
+import React, { memo, useState, useEffect } from 'react';
+import { retrieveLaunchContext } from '../../util/util';
+import { headers } from '../../util/data.js';
 
 import useStyles from './styles';
 const DashboardElement = (props) => {
   const classes = useStyles();
   const resource = props.resource;
+  const clientState = props.client.state;
+  const relaunch = () => {
+    const link = {
+      appContext: encodeURIComponent(`response=QuestionnaireResponse/${resource.id}`),
+      type: "smart",
+      url: headers.launchUrl.value
+    }
+    retrieveLaunchContext(link, clientState.tokenResponse.accessToken, clientState.tokenResponse.patient, clientState.serverUrl, 'r4').then((e) => {
+      window.open(e.url, "_blank");
+    })
+  }
 
   return (
-    <div className = {classes.dashboardElement}>
-        <div>ID:{resource.id}</div>
+    <div className = {classes.dashboardElement} onClick={relaunch}>
+        <div>ID: {resource.id}</div>
         <div>Questionnaire: {resource.questionnaire}</div>
     </div>
   );

src/components/DisplayBox/DisplayBox.js

@@ -8,6 +8,7 @@ import PropTypes from 'prop-types';
 import axios from 'axios';
 import SMARTBox from '../SMARTBox/SMARTBox';
 import ReactMarkdown from 'react-markdown';
+import { retrieveLaunchContext } from '../../util/util';
 import './displayBox.css';
 
 const propTypes = {
@@ -202,7 +203,7 @@ export default class DisplayBox extends Component{
         let linkCopy = Object.assign({}, link);
 
         if (link.type === 'smart' && (this.props.fhirAccessToken || this.props.ehrLaunch) && !this.state.smartLink) {
-          this.props.retrieveLaunchContext(
+          retrieveLaunchContext(
             linkCopy, this.props.fhirAccessToken,
             this.props.patientId, this.props.fhirServerUrl, this.props.fhirVersion
           ).then((result) => {

src/components/RequestBox/RequestBox.js

@@ -8,6 +8,7 @@ import { getAge } from "../../util/fhir";
 import _ from "lodash";
 import "./request.css";
 import { PrefetchTemplate } from "../../PrefetchTemplate";
+import { retrieveLaunchContext } from "../../util/util";
 import axios from 'axios';
 
 export default class RequestBox extends Component {
@@ -317,7 +318,7 @@ export default class RequestBox extends Component {
 
     let linkCopy = Object.assign({}, link);
 
-    return this.props.retrieveLaunchContext(
+    return retrieveLaunchContext(
       linkCopy, this.props.fhirAccessToken,
         this.state.patient.id, this.props.fhirServerUrl, this.props.fhirVersion
     ).then((result) => {

src/containers/PatientPortal.jsx

@@ -24,7 +24,6 @@ const PatientPortal = () => {
 
       }, [token])
 
-
     return (
         <div className={classes.background}>
 

src/containers/RequestBuilder.js

@@ -11,7 +11,6 @@ import RequestBox from '../components/RequestBox/RequestBox';
 import buildRequest from '../util/buildRequest.js';
 import { types, headers, defaultValues } from '../util/data.js';
 import { createJwt, login, setupKeys } from '../util/auth';
-import axios from 'axios';
 
 export default class RequestBuilder extends Component {
     constructor(props) {
@@ -198,65 +197,6 @@ export default class RequestBuilder extends Component {
         this.setState({ openPatient: false })
     }
 
-     /**
- * Retrieves a SMART launch context from an endpoint to append as a "launch" query parameter to a SMART app launch URL (see SMART docs for more about launch context).
- * This applies mainly if a SMART app link on a card is to be launched. The link needs a "launch" query param with some opaque value from the SMART server entity.
- * This function generates the launch context (for HSPC Sandboxes only) for a SMART application by pinging a specific endpoint on the FHIR base URL and returns
- * a Promise to resolve the newly modified link.
- * @param {*} link - The SMART app launch URL
- * @param {*} accessToken - The access token provided to the CDS Hooks Sandbox by the FHIR server
- * @param {*} patientId - The identifier of the patient in context
- * @param {*} fhirBaseUrl - The base URL of the FHIR server in context
- */
-retrieveLaunchContext(link, accessToken, patientId, fhirBaseUrl, fhirVersion) {
-    return new Promise((resolve, reject) => {
-      const headers = accessToken ?
-      {
-        "Accept": 'application/json',
-        "Authorization": `Bearer ${accessToken.access_token}`
-      }
-      :
-      {        
-        "Accept": 'application/json'
-      };
-      const launchParameters = {
-        patient: patientId,
-      };
-
-      if (link.appContext) {
-        launchParameters.appContext = link.appContext;
-      }
-
-      // May change when the launch context creation endpoint becomes a standard endpoint for all EHR providers
-      axios({
-        method: 'post',
-        url: `${fhirBaseUrl}/_services/smart/Launch`,
-        headers,
-        data: {
-          launchUrl: link.url,
-          parameters: launchParameters,
-        },
-      }).then((result) => {
-        if (result.data && Object.prototype.hasOwnProperty.call(result.data, 'launch_id')) {
-          if (link.url.indexOf('?') < 0) {
-            link.url += '?';
-          } else {
-            link.url += '&';
-          }
-          link.url += `launch=${result.data.launch_id}`;
-          link.url += `&iss=${fhirBaseUrl}`;
-          return resolve(link);
-        }
-        console.error('FHIR server endpoint did not return a launch_id to launch the SMART app. See network calls to the Launch endpoint for more details');
-        link.error = true;
-        return reject(link);
-      }).catch((err) => {
-        console.error('Cannot grab launch context from the FHIR server endpoint to launch the SMART app. See network calls to the Launch endpoint for more details', err);
-        link.error = true;
-        return reject(link);
-      });
-    });
-  }
 
     render() {
         const header =
@@ -361,7 +301,6 @@ retrieveLaunchContext(link, accessToken, patientId, fhirBaseUrl, fhirVersion) {
                             fhirServerUrl={this.state.baseUrl}
                             fhirVersion={'r4'}
                             patientId={this.state.patient.id}
-                            retrieveLaunchContext={this.retrieveLaunchContext}
                             launchUrl={this.state.launchUrl}
                             responseExpirationDays={this.state.responseExpirationDays}
                             ref={this.requestBox}
@@ -398,8 +337,7 @@ retrieveLaunchContext(link, accessToken, patientId, fhirBaseUrl, fhirVersion) {
                         fhirVersion={'r4'}
                         ehrUrl={this.state.ehrUrl}
                         access_token={this.state.token}
-                        takeSuggestion={this.takeSuggestion}
-                        retrieveLaunchContext={this.retrieveLaunchContext} />
+                        takeSuggestion={this.takeSuggestion} />
                 </div>
 
             </div>

src/util/util.js

@@ -0,0 +1,65 @@
+import axios from 'axios';
+
+/**
+ * Retrieves a SMART launch context from an endpoint to append as a "launch" query parameter to a SMART app launch URL (see SMART docs for more about launch context).
+ * This applies mainly if a SMART app link on a card is to be launched. The link needs a "launch" query param with some opaque value from the SMART server entity.
+ * This function generates the launch context (for HSPC Sandboxes only) for a SMART application by pinging a specific endpoint on the FHIR base URL and returns
+ * a Promise to resolve the newly modified link.
+ * @param {*} link - The SMART app launch URL
+ * @param {*} accessToken - The access token provided to the CDS Hooks Sandbox by the FHIR server
+ * @param {*} patientId - The identifier of the patient in context
+ * @param {*} fhirBaseUrl - The base URL of the FHIR server in context
+ */
+function retrieveLaunchContext(link, accessToken, patientId, fhirBaseUrl, fhirVersion) {
+    return new Promise((resolve, reject) => {
+        const headers = accessToken ?
+        {
+        "Accept": 'application/json',
+        "Authorization": `Bearer ${accessToken.access_token}`
+        }
+        :
+        {        
+        "Accept": 'application/json'
+        };
+        const launchParameters = {
+        patient: patientId,
+        };
+
+        if (link.appContext) {
+        launchParameters.appContext = link.appContext;
+        }
+
+        // May change when the launch context creation endpoint becomes a standard endpoint for all EHR providers
+        axios({
+        method: 'post',
+        url: `${fhirBaseUrl}/_services/smart/Launch`,
+        headers,
+        data: {
+            launchUrl: link.url,
+            parameters: launchParameters,
+        },
+        }).then((result) => {
+        if (result.data && Object.prototype.hasOwnProperty.call(result.data, 'launch_id')) {
+            if (link.url.indexOf('?') < 0) {
+            link.url += '?';
+            } else {
+            link.url += '&';
+            }
+            link.url += `launch=${result.data.launch_id}`;
+            link.url += `&iss=${fhirBaseUrl}`;
+            return resolve(link);
+        }
+        console.error('FHIR server endpoint did not return a launch_id to launch the SMART app. See network calls to the Launch endpoint for more details');
+        link.error = true;
+        return reject(link);
+        }).catch((err) => {
+        console.error('Cannot grab launch context from the FHIR server endpoint to launch the SMART app. See network calls to the Launch endpoint for more details', err);
+        link.error = true;
+        return reject(link);
+        });
+    });
+}
+
+export {
+    retrieveLaunchContext
+}