have the prefetch pharmacy setting work

Author: smalho01

src/PrefetchTemplate.js

@@ -1,16 +1,19 @@
 // Prefetch Template Source:
 // https://build.fhir.org/ig/HL7/davinci-crd/hooks.html#prefetch
 export class PrefetchTemplate {
-  static generatePrefetchMap(includePharmacy = true, pharmacyId = 'pharm0111') {
+  static generatePrefetchMap(settings = null) {
+    // If no settings provided, use defaults from data.js
+    const includePharmacy = settings?.includePharmacyInPreFetch ?? 
+                           headerDefinitions.includePharmacyInPreFetch.default;
+    const pharmacyId = 'pharm0111';
+
     const prefetchMap = new Map();
 
     const PRACTITIONER_PREFETCH = new PrefetchTemplate('{{context.userId}}');
-
     const REQUEST_PREFETCH = new PrefetchTemplate(
       'MedicationRequest/{{context.medications.MedicationRequest.id}}'
     );
     const PATIENT_PREFETCH = new PrefetchTemplate('{{context.patientId}}');
-
     const ALL_REQUESTS_PREFETCH = new PrefetchTemplate(
       'MedicationRequest?subject={{context.patientId}}&_include=MedicationRequest:medication'
     );
@@ -21,7 +24,7 @@ export class PrefetchTemplate {
     prefetchMap.set('patient', PATIENT_PREFETCH);
     prefetchMap.set('medicationRequests', ALL_REQUESTS_PREFETCH);
 
-    // Optional pharmacy prefetch (only if explicitly requested and pharmacyId provided)
+    // Optional pharmacy prefetch based on settings
     if (includePharmacy && pharmacyId) {
       const PHARMACY_PREFETCH = new PrefetchTemplate(`HealthcareService/${pharmacyId}`);
       prefetchMap.set('pharmacy', PHARMACY_PREFETCH);
@@ -55,23 +58,30 @@ export class PrefetchTemplate {
     requestBundle,
     patientReference,
     userReference,
+    settings = null,
     ...prefetchKeys
   ) {
+    const prefetchMap = PrefetchTemplate.generatePrefetchMap(settings);
+    const paramElementMap = PrefetchTemplate.generateParamElementMap();
+    
     var resolvedQueries = new Map();
     for (var i = 0; i < prefetchKeys.length; i++) {
       var prefetchKey = prefetchKeys[i];
+      if (!prefetchKey || !prefetchMap.has(prefetchKey)) continue;
       var query = prefetchMap.get(prefetchKey).getQuery();
       // Regex source: https://regexland.com/all-between-specified-characters/
       var parametersToFill = query.match(/(?<={{).*?(?=}})/gs);
       var resolvedQuery = query.slice();
+      
       if (parametersToFill) {
         for (var j = 0; j < parametersToFill.length; j++) {
           var unresolvedParameter = parametersToFill[j];
           var resolvedParameter;
           if (requestBundle) {
             resolvedParameter = PrefetchTemplate.resolveParameter(
               unresolvedParameter,
-              requestBundle
+              requestBundle,
+              paramElementMap
             );
           } else {
             if (unresolvedParameter === 'context.patientId') {
@@ -108,8 +118,9 @@ export class PrefetchTemplate {
     }
   }
 
-  static resolveParameter(unresolvedParameter, requestBundle) {
+  static resolveParameter(unresolvedParameter, requestBundle, paramElementMap) {
     const paramField = paramElementMap.get(unresolvedParameter);
+    if (!paramField) return null;
     const resolvedParameter = PrefetchTemplate.getProp(requestBundle, paramField);
     return resolvedParameter;
   }
@@ -123,7 +134,4 @@ export class PrefetchTemplate {
   getQuery() {
     return this.query;
   }
-}
-
-const prefetchMap = PrefetchTemplate.generatePrefetchMap();
-const paramElementMap = PrefetchTemplate.generateParamElementMap();
+}

src/components/SMARTBox/PatientBox.jsx

@@ -1,5 +1,6 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useContext } from 'react';
 import { getAge, getDrugCodeFromMedicationRequest } from '../../util/fhir';
+import { SettingsContext } from '../../containers/ContextProvider/SettingsProvider';
 import './smart.css';
 import { Button } from '@mui/material';
 import Tooltip from '@mui/material/Tooltip';
@@ -18,6 +19,8 @@ import {
 } from '../../util/util';
 
 const PatientBox = props => {
+  const [globalState] = useContext(SettingsContext);
+  
   const [state, setState] = useState({
     request: '',
     deviceRequests: {},
@@ -167,27 +170,16 @@ const PatientBox = props => {
   const fetchResources = queries => {
     let requests = [];
     callback('prefetchCompleted', false);
-    console.log('🔍 PHARMACY DEBUG - All queries to fetch:', queries); // ADD THIS
-
     queries.forEach((query, queryKey) => {
-      console.log(`🔍 PHARMACY DEBUG - Processing ${queryKey}: ${query}`); // ADD THIS
       const urlQuery = '/' + query;
       requests.push(
         client
           .request(urlQuery)
           .then(response => {
-            console.log(`🔍 PHARMACY DEBUG - SUCCESS for ${queryKey}:`, response); // ADD THIS
             return response;
           })
-          .catch(error => {
-            console.log(`🔍 PHARMACY DEBUG - FAILED for ${queryKey}:`, error); // ADD THIS
-            return null; // Return null so Promise.all doesn't fail completely
-          })
           .then(resource => {
-            if (resource) {
-              console.log(`🔍 PHARMACY DEBUG - Calling callbackMap for ${queryKey}`); // ADD THIS
-              callbackMap('prefetchedResources', queryKey, resource);
-            }
+            callbackMap('prefetchedResources', queryKey, resource);
           })
       );
     });
@@ -212,11 +204,11 @@ const PatientBox = props => {
         request,
         patientReference,
         userReference,
-        'pharm0111',
+        globalState,
         'request',
         'patient',
         'practitioner',
-        'pharmacy'
+        globalState.includePharmacyInPreFetch ? 'pharmacy' : undefined
       );
       fetchResources(queries);
 
@@ -230,11 +222,11 @@ const PatientBox = props => {
         request,
         patientReference,
         userReference,
-        'pharm0111',
+        globalState,
         'patient',
         'practitioner',
         'medicationRequests',
-        'pharmacy'
+        globalState.includePharmacyInPreFetch ? 'pharmacy' : undefined
       );
       fetchResources(queries);
     }