Merge branch 'develop' into MAT-6310

MeasureAuthoringTool · Nov 13, 2023 · d0d5740 · d0d5740
2 parents e5616ab + 2b5af55
commit d0d5740
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 62 deletions.
diff --git a/local-dev-env/hosted-importmap.json b/local-dev-env/hosted-importmap.json
@@ -4,7 +4,6 @@
     "@madie/madie-layout": "//localhost:8500/madie-madie-layout.js",
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
-    "@madie/madie-public": "//localhost:8503/madie-madie-public.js",
     "@madie/madie-components": "//localhost:8504/madie-madie-components.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
     "@madie/madie-patient": "//localhost:8507/madie-madie-patient.js",

diff --git a/local-dev-env/importmap.json b/local-dev-env/importmap.json
@@ -4,7 +4,6 @@
     "@madie/madie-layout": "//localhost:8500/madie-madie-layout.js",
     "@madie/madie-editor": "//localhost:8501/madie-madie-editor.js",
     "@madie/madie-auth": "//localhost:8502/madie-madie-auth.js",
-    "@madie/madie-public": "//localhost:8503/madie-madie-public.js",
     "@madie/madie-components": "//localhost:8504/madie-madie-components.js",
     "@madie/madie-measure": "//localhost:8505/madie-madie-measure.js",
     "@madie/madie-patient": "//localhost:8506/madie-madie-patient.js",

diff --git a/local-dev-env/serviceConfig.json b/local-dev-env/serviceConfig.json
@@ -27,6 +27,8 @@
     "qdmVersioning": false,
     "qiCoreElementsTab": false,
     "highlightingTabs": false,
-    "exportQiCoreBundleType": false
+    "exportQiCoreBundleType": false,
+    "disableRunTestCaseWithObservStrat": true,
+    "qdmHideJson": true
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.ejs b/src/index.ejs
@@ -77,7 +77,6 @@
   <div id="application-registry" style="display:none;">
     <div id="madie-editor"></div>
     <div id="madie-auth"></div>
-    <div id="madie-public"></div>  
     <div id="madie-components"></div>
     <div id="madie-patient"></div>
     <div id="madie-cql-library"></div>

diff --git a/src/madie-root-config.ts b/src/madie-root-config.ts
@@ -3,7 +3,6 @@ import { ApplicationProps } from "./ApplicationConfig";
 import layoutConfig from "./layout-config";
 import editorConfig from "./editor-config";
 import authConfig from "./auth-config";
-import publicConfig from "./public-config";
 import componentsConfig from "./components-config";
 import measureConfig from "./measure-config";
 import patientConfig from "./patient-config";
@@ -12,7 +11,6 @@ import cqllibraryConfig from "./cql-library-config";
 registerApplication<ApplicationProps>(layoutConfig);
 registerApplication<ApplicationProps>(editorConfig);
 registerApplication<ApplicationProps>(authConfig);
-registerApplication<ApplicationProps>(publicConfig);
 registerApplication<ApplicationProps>(componentsConfig);
 registerApplication<ApplicationProps>(measureConfig);
 registerApplication<ApplicationProps>(patientConfig);

diff --git a/src/public-config.test.ts b/src/public-config.test.ts
diff --git a/src/public-config.ts b/src/public-config.ts
diff --git a/webpack.config.js b/webpack.config.js
@@ -34,13 +34,6 @@ module.exports = (webpackConfigEnv, argv) => {
           ),
           publicPath: "/madie-editor",
         },
-        {
-          directory: path.join(
-            __dirname,
-            "node_modules/@madie/madie-public/dist/"
-          ),
-          publicPath: "/madie-public",
-        },
         {
           directory: path.join(
             __dirname,