Merge branch 'develop' into MAT-7855

MeasureAuthoringTool · Nov 18, 2024 · bedb7bb · bedb7bb
2 parents 38fb20e + ebe3e66
commit bedb7bb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "fhir": "^4.11.1",
     "file-saver": "^2.0.5",
     "formik": "^2.2.9",
-    "fqm-execution": "^1.5.0",
+    "fqm-execution": "1.6.0",
     "html-react-parser": "^1.4.12",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",

diff --git a/src/api/CalculationService.ts b/src/api/CalculationService.ts
@@ -431,8 +431,8 @@ export class CalculationService {
               (strata) =>
                 // TODO: workaround because fqm execution doesn't provide IDs for all cases
                 (strata.strataCode &&
-                  strata.strataCode === strataResult.strataCode) ||
-                (strata.strataId && strata.strataId === strataResult.strataId)
+                  strata.strataCode === strataResult?.strataCode) ||
+                (strata.strataId && strata.strataId === strataResult?.strataId)
             );
             return population?.result && stratification?.result;
           }

diff --git a/src/components/editor/Editor.tsx b/src/components/editor/Editor.tsx
@@ -68,7 +68,7 @@ const Editor = ({
   return (
     <div
       data-testid="test-case-json-editor"
-      style={{ height: "calc(100% - 64px)" }}
+      style={{ height: "calc(100% - 48px)" }}
     >
       <AceEditor
         value={value}