latest

Author: Marco

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Presto/PrestoResultsVirtualTable/typings.ts

@@ -1,9 +1,11 @@
+import type {PrestoRowObject} from "../../../../../../../../common/index.js";
+
+
 /**
  * Structure of dynamic Presto search results data.
  */
-interface PrestoSearchResult {
+interface PrestoSearchResult extends PrestoRowObject {
     _id: string;
-    row: Record<string, unknown>;
 }
 
 export type {PrestoSearchResult};

components/webui/client/src/pages/SearchPage/SearchResults/SearchResultsTable/Presto/PrestoResultsVirtualTable/utils.ts

@@ -1,4 +1,5 @@
 import {TableProps} from "antd";
+
 import {PrestoSearchResult} from "./typings";
 
 

components/webui/common/index.ts

@@ -129,12 +129,21 @@ interface SearchResultsMetadataDocument {
     numTotalResults?: number;
     queryEngine: CLP_QUERY_ENGINES;
 }
+
+/**
+ * Presto row wrapped in a `row` property to prevent conflicts with MongoDB's `_id` field.
+ */
+interface PrestoRowObject {
+    row: Record<string, unknown>;
+}
+
 export {
     CLP_QUERY_ENGINES,
     SEARCH_SIGNAL,
 };
 export type {
     PRESTO_SEARCH_SIGNAL,
+    PrestoRowObject,
     SearchResultsMetadataDocument,
     ClientToServerEvents,
     Err,

components/webui/server/src/routes/api/presto-search/utils.ts

@@ -3,6 +3,7 @@ import type {
     InsertManyResult,
 } from "mongodb";
 
+import type {PrestoRowObject} from "../../../../../common/index.js";
 
 /**
  * Converts a Presto result row (array of values) into an object, using the provided column
@@ -15,7 +16,7 @@ import type {
 const prestoRowToObject = (
     row: unknown[],
     columns: {name: string}[]
-): Record<string, unknown> => {
+): PrestoRowObject => {
     const obj: Record<string, unknown> = {};
     columns.forEach((col, idx) => {
         obj[col.name] = row[idx];