update key and use map instead of object

containers/ecr-viewer/src/app/view-data/utils/evaluate.ts

@@ -6,7 +6,7 @@ import {
   UserInvocationTable,
 } from "fhirpath";
 
-let evaluateCache: { [key: string]: any } = {};
+let evaluateCache: Map<string, any> = new Map();
 
 /**
  * Evaluates a FHIRPath expression on the provided FHIR data.
@@ -31,30 +31,26 @@ export const evaluate = (
     userInvocationTable?: UserInvocationTable;
   },
 ): any[] => {
+  // In case a resource does not have an ID fall back to entire object
   const key =
-    (fhirData?.resourceType === "Bundle"
-      ? "bundle"
-      : (fhirData?.id ?? JSON.stringify(fhirData))) +
+    (fhirData?.id ?? JSON.stringify(fhirData)) +
     ",,,,," +
     JSON.stringify(context) +
     ",,,,," +
     JSON.stringify(path);
-  if (evaluateCache.hasOwnProperty(key)) {
-    return evaluateCache[key];
+  if (evaluateCache.has(key)) {
+    return evaluateCache.get(key);
   }
-  evaluateCache[key] = fhirPathEvaluate(
-    fhirData,
-    path,
-    context,
-    model,
-    options,
+  evaluateCache.set(
+    key,
+    fhirPathEvaluate(fhirData, path, context, model, options),
   );
-  return evaluateCache[key];
+  return evaluateCache.get(key);
 };
 
 /**
  * Reset the evaluate cache map
  */
 export const clearEvaluateCache = () => {
-  evaluateCache = {};
+  evaluateCache.clear();
 };