KXI-35930 for local q

KxSystems · Jan 23, 2024 · c53dde8 · c53dde8
1 parent dc51644
commit c53dde8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/src/models/connection.ts b/src/models/connection.ts
@@ -23,6 +23,7 @@ export class Connection {
   private options: nodeq.ConnectionParameters;
   private connection?: nodeq.Connection;
   public connected: boolean;
+  private isError: boolean = false;
   private result?: string;
 
   constructor(connectionString: string, creds?: string[], tls?: boolean) {
@@ -109,6 +110,7 @@ export class Connection {
       !!stringify,
       (err: Error, res: QueryResult) => {
         if (err) {
+          this.isError = true;
           this.result = handleQueryResults(
             err.toString(),
             QueryResultType.Error,
@@ -123,6 +125,10 @@ export class Connection {
     const result = await this.waitForResult();
 
     if (ext.resultsViewProvider.isVisible() && stringify) {
+      if (this.isError) {
+        this.isError = false;
+        return result;
+      }
       return convertStringToArray(result);
     }
 
@@ -142,6 +148,7 @@ export class Connection {
 
   private handleQueryResult = (res: QueryResult): void => {
     if (res.errored) {
+      this.isError = true;
       this.result = handleQueryResults(
         res.error + (res.backtrace ? "\n" + res.backtrace : ""),
         QueryResultType.Error,

diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts
@@ -128,6 +128,12 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
         });
       }
     } else {
+      if (typeof results[0] === "string") {
+        return results.map((key: string) => {
+          const sanitizedKey = this.sanitizeString(key);
+          return { field: sanitizedKey, headerName: sanitizedKey };
+        });
+      }
       return Object.keys(results[0]).map((key: string) => {
         const sanitizedKey = this.sanitizeString(key);
         return { field: sanitizedKey, headerName: sanitizedKey };
@@ -140,17 +146,22 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
     const queryResult = isInsights ? results.rows : results;
 
     const columnDefs = this.generateCoumnDefs(results, isInsights);
-    const rowData = queryResult.map((row: any) => {
-      for (const key in row) {
-        if (Object.prototype.hasOwnProperty.call(row, key)) {
-          row[key] =
-            row[key] !== undefined && row[key] !== null
-              ? this.sanitizeString(row[key])
-              : "";
+    let rowData = [];
+    if (!isInsights && typeof results[0] === "string") {
+      rowData = [];
+    } else {
+      rowData = queryResult.map((row: any) => {
+        for (const key in row) {
+          if (Object.prototype.hasOwnProperty.call(row, key)) {
+            row[key] =
+              row[key] !== undefined && row[key] !== null
+                ? this.sanitizeString(row[key])
+                : "";
+          }
         }
-      }
-      return row;
-    });
+        return row;
+      });
+    }
     if (rowData.length > 0) {
       ext.resultPanelCSV = this.convertToCsv(rowData).join("\n");
     }
@@ -224,7 +235,9 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
       if (typeof queryResult === "string" || typeof queryResult === "number") {
         result =
           queryResult !== ""
-            ? `<p>${queryResult}</p>`
+            ? `<p class="results-txt">${queryResult
+                .toString()
+                .replace(/\n/g, "<br/>")}</p>`
             : "<p>No results to show</p>";
       } else if (queryResult) {
         isGrid = true;

diff --git a/src/utils/execution.ts b/src/utils/execution.ts
@@ -42,7 +42,7 @@ export function runQFileTerminal(filename?: string): void {
 
 export function handleQueryResults(
   results: any,
-  type: QueryResultType
+  type: QueryResultType,
 ): string {
   let handledResult: string;
   switch (type) {
@@ -177,7 +177,7 @@ function processLine(
   line: string,
   index: number,
   fieldLengths: number[],
-  fieldNames: string[]
+  fieldNames: string[],
 ): object {
   let start = 0;
   const obj: { [key: string]: any } = { Index: index + 1 };
@@ -207,10 +207,15 @@ export function convertStringToArray(str: string): any[] {
     return lines.flatMap((line, index) =>
       fieldLengths.length > 0
         ? processLine(line, index, fieldLengths, fieldNames)
-        : []
+        : [],
     );
   }
 
+  if (lines.length === 2 && lines[1].startsWith("---")) {
+    lines.splice(1, 1);
+    return lines[0].split(" ").filter((part) => part !== "");
+  }
+
   return lines
     .flatMap((line, index) => {
       const parts = line.split("|").map((part) => part.trim());
@@ -219,6 +224,6 @@ export function convertStringToArray(str: string): any[] {
         : processLineWithoutSeparator(line, index);
     })
     .filter(
-      (obj) => !("Value" in obj && (obj.Value as string).startsWith("-"))
+      (obj) => !("Value" in obj && (obj.Value as string).startsWith("-")),
     );
 }
diff --git a/src/webview/styles/resultsPanel.css b/src/webview/styles/resultsPanel.css
@@ -23,3 +23,7 @@ body {
 .results-header-datagrid {
   background: #00000050;
 }
+
+.results-txt {
+  white-space: pre;
+}