From 2caff8f1cc9e20aac32bdfc552cb4116e43fcff4 Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Thu, 31 Oct 2024 11:39:29 -0400
Subject: [PATCH 1/2] MAT-7830: Removed QDMCodeSearch

---
 src/CqlBuilderPanel/CqlBuilderPanel.tsx                       | 2 --
 src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx         | 4 +---
 .../CqlEditorWithTerminology.test.tsx                         | 1 -
 src/madie-madie-util.d.ts                                     | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/CqlBuilderPanel/CqlBuilderPanel.tsx b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
index 416eacb4..b0206c2a 100644
--- a/src/CqlBuilderPanel/CqlBuilderPanel.tsx
+++ b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
@@ -41,7 +41,6 @@ export default function CqlBuilderPanel({
     QDMValueSetSearch,
     CQLBuilderDefinitions,
     CQLBuilderIncludes,
-    qdmCodeSearch,
     CQLBuilderParameters,
   } = featureFlags;
   // we have multiple flags and need to select a starting value based off of what's available and canEdit.
@@ -147,7 +146,6 @@ export default function CqlBuilderPanel({
           setActiveTab={setActiveTab}
           QDMValueSetSearch={QDMValueSetSearch}
           CQLBuilderDefinitions={CQLBuilderDefinitions}
-          qdmCodeSearch={qdmCodeSearch}
           isQDM={measureModel?.includes("QDM")}
           CQLBuilderParameters={CQLBuilderParameters}
           CQLBuilderIncludes={CQLBuilderIncludes}
diff --git a/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx b/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
index f470537f..5161cadc 100644
--- a/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
+++ b/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
@@ -7,7 +7,6 @@ export interface NavTabProps {
   CQLBuilderParameters: boolean;
   QDMValueSetSearch: boolean;
   CQLBuilderDefinitions: boolean;
-  qdmCodeSearch: boolean;
   isQDM: boolean;
 }
 
@@ -19,7 +18,6 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
     CQLBuilderDefinitions,
     CQLBuilderIncludes,
     CQLBuilderParameters,
-    qdmCodeSearch,
     isQDM,
   } = props;
 
@@ -52,7 +50,7 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
           value="valueSets"
         />
       )}
-      {qdmCodeSearch && isQDM && (
+      {isQDM && (
         <Tab
           tabIndex={0}
           aria-label="Codes"
diff --git a/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx b/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
index 7e050a3c..0becc02b 100644
--- a/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
+++ b/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
@@ -17,7 +17,6 @@ jest.mock("@madie/madie-util", () => ({
       QDMValueSetSearch: true,
       CQLBuilderDefinitions: true,
       CQLBuilderIncludes: true,
-      qdmCodeSearch: true,
     };
   }),
   useOktaTokens: () => ({
diff --git a/src/madie-madie-util.d.ts b/src/madie-madie-util.d.ts
index c55f6df4..073f7f49 100644
--- a/src/madie-madie-util.d.ts
+++ b/src/madie-madie-util.d.ts
@@ -6,7 +6,6 @@ declare module "@madie/madie-util" {
     QDMValueSetSearch: boolean;
     CQLBuilderDefinitions: boolean;
     CQLBuilderParameters: boolean;
-    qdmCodeSearch: boolean;
   }
 
   export const useOktaTokens: (storageKey?: string) => {

From 715e8a7b034ab5e508013c544b3741ec2ba6633a Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Thu, 31 Oct 2024 13:42:24 -0400
Subject: [PATCH 2/2] MAT-7830: Removed ValueSetSearch

---
 src/CqlBuilderPanel/CqlBuilderPanel.tsx        | 18 ++++--------------
 .../CqlBuilderSectionPanelNavTabs.tsx          |  4 +---
 .../CqlEditorWithTerminology.test.tsx          |  1 -
 src/madie-madie-util.d.ts                      |  1 -
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/CqlBuilderPanel/CqlBuilderPanel.tsx b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
index b0206c2a..f6ea9c7a 100644
--- a/src/CqlBuilderPanel/CqlBuilderPanel.tsx
+++ b/src/CqlBuilderPanel/CqlBuilderPanel.tsx
@@ -37,19 +37,13 @@ export default function CqlBuilderPanel({
   makeExpanded,
 }) {
   const featureFlags = useFeatureFlags();
-  const {
-    QDMValueSetSearch,
-    CQLBuilderDefinitions,
-    CQLBuilderIncludes,
-    CQLBuilderParameters,
-  } = featureFlags;
+  const { CQLBuilderDefinitions, CQLBuilderIncludes, CQLBuilderParameters } =
+    featureFlags;
   // we have multiple flags and need to select a starting value based off of what's available and canEdit.
   const getStartingPage = (() => {
     // if cqlBuilderIncludes -> includes
     // if BuilderDefs -> definitions
-    // if QDM, then
-    //  if qdmValueSetSearch -> valueSets
-    //  else, codes
+    // if QDM -> valueSets
     if (CQLBuilderIncludes) {
       return "includes";
     }
@@ -57,10 +51,7 @@ export default function CqlBuilderPanel({
       return "definitions";
     }
     if (measureModel?.includes("QDM")) {
-      if (QDMValueSetSearch) {
-        return "valueSets";
-      }
-      return "codes";
+      return "valueSets";
     }
   })();
 
@@ -144,7 +135,6 @@ export default function CqlBuilderPanel({
         <CqlBuilderSectionPanelNavTabs
           activeTab={activeTab}
           setActiveTab={setActiveTab}
-          QDMValueSetSearch={QDMValueSetSearch}
           CQLBuilderDefinitions={CQLBuilderDefinitions}
           isQDM={measureModel?.includes("QDM")}
           CQLBuilderParameters={CQLBuilderParameters}
diff --git a/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx b/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
index 5161cadc..73e71c83 100644
--- a/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
+++ b/src/CqlBuilderPanel/CqlBuilderSectionPanelNavTabs.tsx
@@ -5,7 +5,6 @@ export interface NavTabProps {
   setActiveTab: (value: string) => void;
   CQLBuilderIncludes: boolean;
   CQLBuilderParameters: boolean;
-  QDMValueSetSearch: boolean;
   CQLBuilderDefinitions: boolean;
   isQDM: boolean;
 }
@@ -14,7 +13,6 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
   const {
     activeTab,
     setActiveTab,
-    QDMValueSetSearch,
     CQLBuilderDefinitions,
     CQLBuilderIncludes,
     CQLBuilderParameters,
@@ -40,7 +38,7 @@ export default function CqlBuilderSectionPanelNavTabs(props: NavTabProps) {
           value="includes"
         />
       )}
-      {QDMValueSetSearch && isQDM && (
+      {isQDM && (
         <Tab
           tabIndex={0}
           aria-label="Value Sets"
diff --git a/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx b/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
index 0becc02b..a4adc38f 100644
--- a/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
+++ b/src/cqlEditorWithTerminology/CqlEditorWithTerminology.test.tsx
@@ -14,7 +14,6 @@ jest.mock("../api/axios-instance");
 jest.mock("@madie/madie-util", () => ({
   useFeatureFlags: jest.fn(() => {
     return {
-      QDMValueSetSearch: true,
       CQLBuilderDefinitions: true,
       CQLBuilderIncludes: true,
     };
diff --git a/src/madie-madie-util.d.ts b/src/madie-madie-util.d.ts
index 073f7f49..110e10e6 100644
--- a/src/madie-madie-util.d.ts
+++ b/src/madie-madie-util.d.ts
@@ -3,7 +3,6 @@ declare module "@madie/madie-util" {
 
   interface FeatureFlags {
     CQLBuilderIncludes: boolean;
-    QDMValueSetSearch: boolean;
     CQLBuilderDefinitions: boolean;
     CQLBuilderParameters: boolean;
   }