Merge branch 'develop' into MAT-8070

MeasureAuthoringTool · Jan 14, 2025 · 837ae63 · 837ae63
2 parents bdefe80 + adf8a6a
commit 837ae63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/components/editMeasure/testCases/api/TerminologyServiceApi.test.ts b/src/components/editMeasure/testCases/api/TerminologyServiceApi.test.ts
@@ -100,7 +100,6 @@ describe("TerminologyServiceApi Tests", () => {
           id: "mu2-update-2015-05-01",
         },
         activeOnly: "true",
-        profile: "",
         valueSetParams: [
           { oid: "2.16.840.1.113883.3.666.5.307" },
           { oid: "2.16.840.1.113883.3.464.1003.103.12.1001" },
@@ -125,7 +124,6 @@ describe("TerminologyServiceApi Tests", () => {
         includeDraft: "yes",
         manifestExpansion: null,
         activeOnly: "false",
-        profile: "",
         valueSetParams: [
           { oid: "2.16.840.1.113883.3.666.5.307" },
           { oid: "2.16.840.1.113883.3.464.1003.103.12.1001" },
@@ -153,7 +151,6 @@ describe("TerminologyServiceApi Tests", () => {
               id: "mu2-update-2015-05-01",
             },
             activeOnly: "true",
-            profile: "",
             valueSetParams: [
               { oid: "2.16.840.1.113883.3.666.5.307" },
               { oid: "2.16.840.1.113883.3.464.1003.103.12.1001" },
@@ -252,8 +249,8 @@ describe("TerminologyServiceApi Tests", () => {
     }
   });
 
-  it("test getQdmValueSetsExpansion no search param", () => {
-    const result = terminologyService.getQdmValueSetsExpansion(
+  it("test getQdmValueSetsExpansion no search param", async () => {
+    const result = await terminologyService.getQdmValueSetsExpansion(
       testCqmMeasure,
       testManifestExpansion,
       true

diff --git a/src/components/editMeasure/testCases/api/useTerminologyServiceApi.ts b/src/components/editMeasure/testCases/api/useTerminologyServiceApi.ts
@@ -15,7 +15,6 @@ type ValueSetSearchParams = {
 };
 
 type ValueSetsSearchCriteria = {
-  profile: string;
   includeDraft: "yes" | "no";
   activeOnly: string;
   manifestExpansion: ManifestExpansion;
@@ -36,6 +35,8 @@ export class TerminologyServiceApi {
     }
     const searchCriteria = {
       includeDraft: "yes", // always yes for now
+      activeOnly: "false",
+      manifestExpansion: null, // always latest until we support manifest for QICore
       valueSetParams: this.getValueSetsOIdsFromBundle(measureBundle),
     } as ValueSetsSearchCriteria;
     if (searchCriteria.valueSetParams.length == 0) {
@@ -44,7 +45,7 @@ export class TerminologyServiceApi {
 
     try {
       const response = await axios.put(
-        `${this.baseUrl}/vsac/value-sets/searches`,
+        `${this.baseUrl}/terminology/value-sets/expansion/fhir`,
         searchCriteria,
         {
           headers: {
@@ -80,7 +81,6 @@ export class TerminologyServiceApi {
     const searchCriteria: ValueSetsSearchCriteria = {
       includeDraft: "yes", // always yes for now
       activeOnly: manifestExpansion ? "true" : "false",
-      profile: "",
       manifestExpansion: manifestExpansion,
       valueSetParams: this.getValueSetsOIDsFromCqmMeasure(
         JSON.parse(JSON.stringify(cqmMeasure))