Merge pull request #490 from KxSystems/ee-struct

Client support for structuredText for kdb+ connections
KxSystems · Jan 6, 2025 · 3d52088 · 3d52088
2 parents 35df1fb + 22e22f8
commit 3d52088
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/classes/localConnection.ts b/src/classes/localConnection.ts
@@ -187,7 +187,7 @@ export class LocalConnection {
     if (isPython) {
       args.push(!!stringify, command);
     } else {
-      args.push(context ?? ".", command, !!stringify);
+      args.push(context ?? ".", command, stringify ? "text" : "structuredText");
     }
 
     args.push((err: Error, res: QueryResult) => {
@@ -219,6 +219,10 @@ export class LocalConnection {
       return { base64, result };
     }
 
+    if (!stringify) {
+      return JSON.parse(result);
+    }
+
     if (ext.isResultsTabVisible && stringify) {
       if (this.isError) {
         this.isError = false;

diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts
@@ -197,9 +197,9 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
     );
 
     columns.forEach((column) => {
-      const { name, values, order } = column;
-      order.forEach((pos, index) => {
-        rowData[index][name] = decodeQUTF(values[pos]);
+      const { name, values } = column;
+      values.forEach((value, index) => {
+        rowData[index][name] = decodeQUTF(value);
       });
     });
 
@@ -235,7 +235,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
     let rowData = [];
     let columnDefs = [];
 
-    if (connVersion && compareVersions(connVersion, 1.12)) {
+    if (!isInsights || (connVersion && compareVersions(connVersion, 1.12))) {
       rowData = this.updatedExtractRowData(results);
       columnDefs = this.updatedExtractColumnDefs(results);
     } else {

diff --git a/test/suite/panels.test.ts b/test/suite/panels.test.ts
@@ -249,13 +249,13 @@ describe("WebPanels", () => {
               name: "prop1",
               type: "type1",
               values: ["value1", "value2"],
-              order: [1, 2],
+              order: [1, 0],
             },
             {
               name: "prop2",
               type: "type2",
               values: ["value3", "value4"],
-              order: [1, 2],
+              order: [1, 0],
             },
           ],
           count: 2,
@@ -270,8 +270,8 @@ describe("WebPanels", () => {
             minWidth: 100,
           },
           rowData: [
-            { index: 1, prop1: "value2", prop2: "value4" },
-            { index: 2 },
+            { index: 1, prop1: "value1", prop2: "value3" },
+            { index: 2, prop1: "value2", prop2: "value4" },
           ],
           columnDefs: [
             { field: "index", headerName: "Index", cellDataType: "number" },