Remove demoQueries + cleanup (#2737)

remove demoQueries + cleanup
CDCgov · Oct 9, 2024 · f40a735 · f40a735
1 parent b2d65b1
commit f40a735
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 90 deletions.
diff --git a/containers/tefca-viewer/src/app/constants.ts b/containers/tefca-viewer/src/app/constants.ts
@@ -1,5 +1,3 @@
-import * as dq from "./demoQueries";
-
 /**
  * The use cases that can be used in the app
  */
@@ -24,17 +22,6 @@ export const UseCaseToQueryName: {
   cancer: "Cancer (Leukemia)",
 };
 
-export const UseCaseToStructMap: {
-  [key in USE_CASES]: dq.QueryStruct;
-} = {
-  "social-determinants": dq.SOCIAL_DETERMINANTS_QUERY,
-  "newborn-screening": dq.NEWBORN_SCREENING_QUERY,
-  syphilis: dq.SYPHILIS_QUERY,
-  gonorrhea: dq.GONORRHEA_QUERY,
-  chlamydia: dq.CHLAMYDIA_QUERY,
-  cancer: dq.CANCER_QUERY,
-};
-
 /**
  * Labels and values for the query options dropdown on the query page
  */

diff --git a/containers/tefca-viewer/src/app/demoQueries.ts b/containers/tefca-viewer/src/app/demoQueries.ts
diff --git a/containers/tefca-viewer/src/app/format-service.tsx b/containers/tefca-viewer/src/app/format-service.tsx
@@ -7,7 +7,7 @@ import {
   Identifier,
 } from "fhir/r4";
 import { ValueSetItem } from "./constants";
-import { QueryStruct } from "./demoQueries";
+import { QueryStruct } from "./query-service";
 
 /**
  * Formats a string.

diff --git a/containers/tefca-viewer/src/app/query-service.ts b/containers/tefca-viewer/src/app/query-service.ts
@@ -14,7 +14,6 @@ import {
 
 import FHIRClient from "./fhir-servers";
 import { USE_CASES, FHIR_SERVERS, ValueSetItem } from "./constants";
-import * as dq from "./demoQueries";
 import { CustomQuery } from "./CustomQuery";
 import { GetPhoneQueryFormats } from "./format-service";
 import { formatValueSetItemsAsQuerySpec } from "./format-service";
@@ -45,15 +44,15 @@ export type UseCaseQueryRequest = {
   phone?: string;
 };
 
-const UseCaseToStructMap: {
-  [key in USE_CASES]: dq.QueryStruct;
-} = {
-  "social-determinants": dq.SOCIAL_DETERMINANTS_QUERY,
-  "newborn-screening": dq.NEWBORN_SCREENING_QUERY,
-  syphilis: dq.SYPHILIS_QUERY,
-  gonorrhea: dq.GONORRHEA_QUERY,
-  chlamydia: dq.CHLAMYDIA_QUERY,
-  cancer: dq.CANCER_QUERY,
+/**
+ * Expected structure of a query object
+ */
+export type QueryStruct = {
+  labCodes: string[];
+  snomedCodes: string[];
+  rxnormCodes: string[];
+  classTypeCodes: string[];
+  hasSecondEncounterQuery: boolean;
 };
 
 // Expected responses from the FHIR server