Merge branch 'develop' into MAT-7896-update-github-actions-to-v4

MeasureAuthoringTool · Dec 3, 2024 · c854ecf · c854ecf
2 parents 7eb2b30 + 34c1181
commit c854ecf
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 68 deletions.
diff --git a/local-dev-env/hosted-importmap.json b/local-dev-env/hosted-importmap.json
@@ -5,7 +5,6 @@
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
-    "@madie/madie-patient": "//localhost:8507/madie-madie-patient.js",
     "@madie/madie-cql-library": "//localhots:8507/madie-madie-cql-library.js",
     "@madie/madie-util": "//localhost:8508/madie-madie-util.js",
     "rxjs": "https://unpkg.com/@esm-bundle/rxjs/system/rxjs.min.js",

diff --git a/local-dev-env/importmap.json b/local-dev-env/importmap.json
@@ -5,7 +5,6 @@
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
-    "@madie/madie-patient": "//localhost:8506/madie-madie-patient.js",
     "@madie/madie-cql-library": "//localhost:8507/madie-madie-cql-library.js",
     "@madie/madie-util": "//localhost:8508/madie-madie-util.js",
     "rxjs": "https://unpkg.com/@esm-bundle/rxjs/system/rxjs.min.js",

diff --git a/local-dev-env/serviceConfig.json b/local-dev-env/serviceConfig.json
@@ -30,13 +30,15 @@
   "features": {
     "CQLBuilderIncludes": false,
     "CQLBuilderParameters": false,
+    "CQLBuilderFunctions": false,
     "qiCore6": false,
     "qiCoreElementsTab": true,
     "qiCoreBonnieTestCases": false,
     "qdmHideJson": false,
     "enableQdmRepeatTransfer": false,
     "CQLBuilderDefinitions": true,
     "TestCaseListSearch": true,
-    "TestCaseID": false
+    "TestCaseID": false,
+    "MeasureButtons": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.ejs b/src/index.ejs
@@ -73,11 +73,10 @@
     You need to enable JavaScript to run this app.
   </noscript>
   <main id="main"></main>
-  
+
   <div id="application-registry" style="display:none;">
     <div id="madie-editor"></div>
     <div id="madie-auth"></div>
-    <div id="madie-patient"></div>
     <div id="madie-cql-library"></div>
   </div>
   <script>

diff --git a/src/madie-root-config.ts b/src/madie-root-config.ts
@@ -4,14 +4,12 @@ import layoutConfig from "./layout-config";
 import editorConfig from "./editor-config";
 import authConfig from "./auth-config";
 import measureConfig from "./measure-config";
-import patientConfig from "./patient-config";
 import cqllibraryConfig from "./cql-library-config";
 
 registerApplication<ApplicationProps>(layoutConfig);
 registerApplication<ApplicationProps>(editorConfig);
 registerApplication<ApplicationProps>(authConfig);
 registerApplication<ApplicationProps>(measureConfig);
-registerApplication<ApplicationProps>(patientConfig);
 registerApplication<ApplicationProps>(cqllibraryConfig);
 
 start({

diff --git a/src/patient-config.test.ts b/src/patient-config.test.ts
diff --git a/src/patient-config.ts b/src/patient-config.ts