query building write functionality pt 2 (#259)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: fzhao99

query-connector/src/app/backend/query-building.ts

@@ -1,7 +1,11 @@
 "use server";
 
 import { getDbClient } from "./dbClient";
-import { NestedQuery, QueryDetailsResult } from "../queryBuilding/utils";
+import {
+  NestedQuery,
+  QueryDetailsResult,
+  QueryUpdateResult,
+} from "../queryBuilding/utils";
 import { DibbsValueSet } from "../constants";
 import { DEFAULT_TIME_WINDOW } from "../utils";
 import { randomUUID } from "crypto";
@@ -56,7 +60,7 @@ export async function saveCustomQuery(
         query_data = EXCLUDED.query_data,
         author = EXCLUDED.author,
         date_last_modified = EXCLUDED.date_last_modified
-      RETURNING id, query_name;
+      RETURNING id, query_name,  CASE WHEN xmax = 0 THEN 'INSERT' ELSE 'UPDATE' END AS operation;
     `;
   const { queryDataInsert, conditionInsert } =
     formatQueryDataForDatabase(queryInput);
@@ -76,7 +80,7 @@ export async function saveCustomQuery(
     ];
     const result = await dbClient.query(queryString, dataToWrite);
     if (result.rows.length > 0) {
-      return result.rows as unknown as QueryDetailsResult[];
+      return result.rows as QueryUpdateResult[];
     }
     console.error("Query save failed:", dataToWrite);
     return [];

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

@@ -14,8 +14,8 @@ import {
   CustomUserQuery,
 } from "./query-building";
 import {
-  CategoryToConditionToNameMap,
-  ConditionIdToNameMap,
+  CategoryToConditionArrayMap,
+  ConditionsMap,
 } from "./queryBuilding/utils";
 import {
   CategoryStruct,
@@ -489,25 +489,24 @@ export async function getConditionsData() {
   const rows = result.rows;
 
   // 1. Grouped by category with id:name pairs
-  const categoryToConditionArrayMap: CategoryToConditionToNameMap = rows.reduce(
-    (acc, row) => {
+  const categoryToConditionNameArrayMap: CategoryToConditionArrayMap =
+    rows.reduce((acc, row) => {
       const { category, id, name } = row;
       if (!acc[category]) {
         acc[category] = [];
       }
-      acc[category].push({ [id]: name });
+      acc[category].push({ id: id, name: name });
       return acc;
-    },
-    {} as CategoryToConditionToNameMap,
-  );
+    }, {} as CategoryToConditionArrayMap);
 
   // 2. ID-Name mapping
-  const conditionIdToNameMap: ConditionIdToNameMap = rows.reduce((acc, row) => {
-    acc[row.id] = row.name;
+  const conditionIdToNameMap: ConditionsMap = rows.reduce((acc, row) => {
+    acc[row.id] = { name: row.name, category: row.category };
     return acc;
-  }, {} as ConditionIdToNameMap);
+  }, {} as ConditionsMap);
+
   return {
-    categoryToConditionArrayMap,
+    categoryToConditionNameArrayMap,
     conditionIdToNameMap,
   } as const;
 }

query-connector/src/app/query/designSystem/drawer/Drawer.tsx

@@ -12,7 +12,6 @@ type DrawerProps = {
   onSave: () => void;
   onClose: () => void;
   onSearch?: () => void;
-  hasChanges: boolean;
 };
 
 /**