Merge pull request #67 from mcode/fix-null-alert

fixes null alert due to https/http variance in vsac
mcode · Jan 11, 2024 · b9e3618 · b9e3618
2 parents ccd5785 + 8454ff0
commit b9e3618
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/views/Questionnaire/SmartApp.tsx b/src/views/Questionnaire/SmartApp.tsx
@@ -525,10 +525,17 @@ export function SmartApp(props: SmartAppProps) {
       // iterate over valueSet definitions
       elm.library.valueSets.def.forEach(valueSetDef => {
         // find FHIR value set artifact
-        const valueSetDefId = valueSetDef.id.replace(/https:\/\//, 'http://'); // vsac only returns urls with http in the resource
-        const valueSet = artifacts.valueSets.find(
-          valueSet => valueSet.id == valueSetDefId || valueSet.url == valueSetDefId
-        );
+        const valueSetDefId = valueSetDef.id;
+        const valueSet = artifacts.valueSets.find(valueSet => {
+          if (valueSet.id && valueSetDefId.includes(valueSet.id)) {
+            return true;
+          } else {
+            if (valueSet.url && valueSetDefId.includes(valueSet.url)) {
+              return true;
+            }
+          }
+          return false;
+        });
         if (valueSet != null) {
           // make sure it has an expansion
           if (valueSet.expansion != null) {