names

query-connector/src/app/database-service.ts

@@ -18,9 +18,9 @@ import {
 import { UUID } from "crypto";
 import {
   CategoryToConditionIdToNameArrayMap,
-  CategoryToConditionIdToTemplateMap,
+  CategoryNameToConditionDetailsMap,
   ConditionIdToNameMap,
-  ConditionIdToTemplateMap,
+  ConditionDetailsMap,
 } from "./queryBuilding/utils";
 
 const getQuerybyNameSQL = `
@@ -585,7 +585,7 @@ export async function getConditionsData() {
   const rows = result.rows;
 
   // 1. Grouped by category with id:name pairs
-  const conditionCategoryToIdNameMap: CategoryToConditionIdToNameArrayMap =
+  const conditionCategoryToIdNameArrayMap: CategoryToConditionIdToNameArrayMap =
     rows.reduce((acc, row) => {
       const { category, id, name } = row;
       if (!acc[category]) {
@@ -602,7 +602,7 @@ export async function getConditionsData() {
   }, {} as ConditionIdToNameMap);
 
   return {
-    conditionCategoryToIdNameMap,
+    conditionCategoryToIdNameArrayMap,
     conditionIdToNameMap,
   } as const;
 }

query-connector/src/app/queryBuilding/buildFromTemplates/ConditionColumnDisplay.tsx

@@ -1,17 +1,17 @@
 import { Dispatch, SetStateAction, useEffect, useState } from "react";
 import {
-  CategoryToConditionIdToTemplateMap,
+  CategoryNameToConditionDetailsMap,
   filterSearchByCategoryAndCondition,
 } from "../utils";
 import styles from "./buildfromTemplate.module.scss";
 import ConditionOption from "./ConditionOption";
 import classNames from "classnames";
 
 type ConditionColumnDisplayProps = {
-  fetchedConditions: CategoryToConditionIdToTemplateMap;
+  fetchedConditions: CategoryNameToConditionDetailsMap;
   searchFilter: string | undefined;
   setFetchedConditions: Dispatch<
-    SetStateAction<CategoryToConditionIdToTemplateMap | undefined>
+    SetStateAction<CategoryNameToConditionDetailsMap | undefined>
   >;
 };
 /**

query-connector/src/app/queryBuilding/buildFromTemplates/ConditionOption.tsx

@@ -1,9 +1,9 @@
 import Checkbox from "../../query/designSystem/checkbox/Checkbox";
-import { ConditionNameAndInclude, formatDiseaseDisplay } from "../utils";
+import { ConditionDetails, formatDiseaseDisplay } from "../utils";
 
 type ConditionOptionProps = {
   conditionId: string;
-  conditionNameAndInclude: ConditionNameAndInclude;
+  conditionNameAndInclude: ConditionDetails;
   handleConditionSelection: (conditionId: string) => void;
 };
 

query-connector/src/app/queryBuilding/buildFromTemplates/page.tsx

@@ -8,8 +8,8 @@ import { useEffect, useState } from "react";
 import classNames from "classnames";
 import { getConditionsData } from "@/app/database-service";
 import {
-  CategoryToConditionIdToTemplateMap,
-  mapFetchedDataToConditionIdToTemplateStructure,
+  CategoryNameToConditionDetailsMap,
+  mapFetchedDataToFrontendStructure,
 } from "../utils";
 import ConditionColumnDisplay from "./ConditionColumnDisplay";
 import SearchField from "@/app/query/designSystem/searchField/SearchField";
@@ -23,19 +23,17 @@ export default function QueryTemplateSelection() {
   const [queryName, setQueryName] = useState<string>();
   const [searchFilter, setSearchFilter] = useState<string>();
   const [fetchedConditions, setFetchedConditions] =
-    useState<CategoryToConditionIdToTemplateMap>();
+    useState<CategoryNameToConditionDetailsMap>();
 
   useEffect(() => {
     let isSubscribed = true;
 
     async function fetchConditionsAndUpdateState() {
-      const { conditionCategoryToIdNameMap } = await getConditionsData();
+      const { conditionCategoryToIdNameArrayMap } = await getConditionsData();
 
       if (isSubscribed) {
         setFetchedConditions(
-          mapFetchedDataToConditionIdToTemplateStructure(
-            conditionCategoryToIdNameMap,
-          ),
+          mapFetchedDataToFrontendStructure(conditionCategoryToIdNameArrayMap),
         );
       }
     }

query-connector/src/app/queryBuilding/utils.ts

@@ -5,25 +5,25 @@ export type ConditionIdToNameMap = {
 export type CategoryToConditionIdToNameArrayMap = {
   [categoryName: string]: ConditionIdToNameMap[];
 };
-export type ConditionNameAndInclude = {
+export type ConditionDetails = {
   name: string;
   include: boolean;
 };
-export type ConditionIdToTemplateMap = {
-  [conditionId: string]: ConditionNameAndInclude;
+export type ConditionDetailsMap = {
+  [conditionId: string]: ConditionDetails;
 };
 
-export type CategoryToConditionIdToTemplateMap = {
-  [categoryName: string]: ConditionIdToTemplateMap;
+export type CategoryNameToConditionDetailsMap = {
+  [categoryName: string]: ConditionDetailsMap;
 };
 
-export function mapFetchedDataToConditionIdToTemplateStructure(fetchedData: {
+export function mapFetchedDataToFrontendStructure(fetchedData: {
   [categoryName: string]: ConditionIdToNameMap[];
 }) {
-  const result: CategoryToConditionIdToTemplateMap = {};
+  const result: CategoryNameToConditionDetailsMap = {};
   Object.entries(fetchedData).forEach(
     ([categoryName, conditionIdToNameMapArray]) => {
-      const curCategoryMap: ConditionIdToTemplateMap = {};
+      const curCategoryMap: ConditionDetailsMap = {};
       conditionIdToNameMapArray.forEach((e) => {
         (curCategoryMap[Object.keys(e)[0]] = {
           name: Object.values(e)[0],
@@ -44,9 +44,9 @@ export function mapFetchedDataToConditionIdToTemplateStructure(fetchedData: {
  */
 export function filterSearchByCategoryAndCondition(
   filterString: string,
-  fetchedConditions: CategoryToConditionIdToTemplateMap,
-): CategoryToConditionIdToTemplateMap {
-  const result: CategoryToConditionIdToTemplateMap = {};
+  fetchedConditions: CategoryNameToConditionDetailsMap,
+): CategoryNameToConditionDetailsMap {
+  const result: CategoryNameToConditionDetailsMap = {};
 
   Object.entries(fetchedConditions).forEach(
     ([categoryName, conditionNameArray]) => {