Merge pull request #514 from KxSystems/rc-philip-fixes

Fixes for bugs found by Peter

Author: Philip-Carneiro-KX

src/services/resultsPanelProvider.ts

@@ -499,13 +499,19 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
                     maxConcurrentDatasourceRequests: 1,
                     infiniteInitialRowCount: 10000,
                     maxBlocksInCache: 10,
+                    overlayNoRowsTemplate: '<span class="ag-overlay-loading-center">No results to show</span>',
                     datasource: {
                       rowCount: undefined,
                       getRows: function(params) {
                         showOverlay();
                         const results = message.results;
                         setTimeout(() => {
                           const lastRow = results.length;
+                          if (lastRow === 0) {
+                            gridApi.showNoRowsOverlay();
+                          } else {
+                            gridApi.hideOverlay();
+                          }
                           const rowsThisPage = results.slice(params.startRow, params.endRow);
                           params.successCallback(rowsThisPage, lastRow);
                           hideOverlay();

src/webview/components/kdbNewConnectionView.ts

@@ -63,6 +63,7 @@ export class KdbNewConnectionView extends LitElement {
   isBundledQ: boolean = true;
   oldAlias: string = "";
   editAuth: boolean = false;
+  renderId: string = "";
   private isModalOpen = false;
   private _connectionData: EditConnectionMessage | undefined = undefined;
   private readonly vscode = acquireVsCodeApi();
@@ -144,7 +145,6 @@ export class KdbNewConnectionView extends LitElement {
 
   handleMessage(event: { data: any }) {
     const message = event.data;
-    console.log(message);
     if (message.command === "editConnection") {
       this.connectionData = message.data;
       this.labels = message.labels;
@@ -397,15 +397,12 @@ export class KdbNewConnectionView extends LitElement {
   }
 
   renderLblDropdownOptions(pos: number) {
-    console.log(this.labels);
     return html`
       <sl-option> No Label Selected </sl-option>
       ${repeat(
         this.lblNamesList,
         (lbl) => lbl,
         (lbl) => {
-          console.log(lbl.name);
-          console.log(lbl.name === this.labels[pos]);
           return html`
             <sl-option .value="${encodeURIComponent(lbl.name)}">
               <span>
@@ -749,7 +746,13 @@ export class KdbNewConnectionView extends LitElement {
       return html`<div>No connection found to be edited</div>`;
     }
     this.isBundledQ = this.connectionData.connType === ConnectionType.BundledQ;
-    this.oldAlias = this.connectionData.serverName;
+    if (
+      this.renderId === "" ||
+      this.oldAlias !== this.connectionData.serverName
+    ) {
+      this.oldAlias = this.connectionData.serverName;
+      this.renderId = "";
+    }
     const connTypeName = this.defineConnTypeName(this.connectionData.connType);
     this.serverType =
       this.connectionData.connType === ConnectionType.Insights
@@ -813,9 +816,14 @@ export class KdbNewConnectionView extends LitElement {
     if (!this.connectionData) {
       return html`<div>No connection found to be edited</div>`;
     }
-    this.bundledServer.serverAlias = "local";
-    this.bundledServer.serverPort = this.connectionData.port ?? "";
-    this.bundledServer.serverName = this.connectionData.serverAddress;
+
+    if (this.renderId === "") {
+      this.renderId = this.generateRenderId();
+      this.bundledServer.serverAlias = "local";
+      this.bundledServer.serverPort = this.connectionData.port ?? "";
+      this.bundledServer.serverName = this.connectionData.serverAddress;
+    }
+
     return html`
       <div class="col">
         <div class="row">
@@ -839,11 +847,16 @@ export class KdbNewConnectionView extends LitElement {
     if (!this.connectionData) {
       return html`<div>No connection found to be edited</div>`;
     }
-    this.kdbServer.serverAlias = this.connectionData.serverName;
-    this.kdbServer.serverPort = this.connectionData.port ?? "";
-    this.kdbServer.serverName = this.connectionData.serverAddress;
-    this.kdbServer.auth = this.connectionData.auth ?? false;
-    this.kdbServer.tls = this.connectionData.tls ?? false;
+
+    if (this.renderId === "") {
+      this.renderId = this.generateRenderId();
+      this.kdbServer.serverAlias = this.connectionData.serverName;
+      this.kdbServer.serverPort = this.connectionData.port ?? "";
+      this.kdbServer.serverName = this.connectionData.serverAddress;
+      this.kdbServer.auth = this.connectionData.auth ?? false;
+      this.kdbServer.tls = this.connectionData.tls ?? false;
+    }
+
     return html`
       <div class="col">
         <div class="row">
@@ -926,9 +939,14 @@ export class KdbNewConnectionView extends LitElement {
     if (!this.connectionData) {
       return html`<div>No connection found to be edited</div>`;
     }
-    this.insightsServer.alias = this.connectionData.serverName;
-    this.insightsServer.server = this.connectionData.serverAddress;
-    this.insightsServer.realm = this.connectionData.realm ?? "";
+
+    if (this.renderId === "") {
+      this.renderId = this.generateRenderId();
+      this.insightsServer.alias = this.connectionData.serverName;
+      this.insightsServer.server = this.connectionData.serverAddress;
+      this.insightsServer.realm = this.connectionData.realm ?? "";
+    }
+
     return html`
       <div class="col">
         <div class="row">
@@ -1042,6 +1060,13 @@ export class KdbNewConnectionView extends LitElement {
       });
     }
   }
+
+  private generateRenderId(): string {
+    let counter = 0;
+    const timestamp = Date.now().toString(36);
+    const uniqueCounter = (counter++).toString(36);
+    return `render-${timestamp}-${uniqueCounter}`;
+  }
 }
 
 declare global {

test/suite/webview.test.ts

@@ -682,18 +682,31 @@ describe("KdbNewConnectionView", () => {
     });
 
     it("should set isBundledQ to true and return correct HTML when connType is 0", () => {
-      view.connectionData = { connType: 0, serverName: "testServer" };
+      view.connectionData = { connType: 0, serverName: "local" };
 
       const result = view.renderEditConnectionForm();
       assert.strictEqual(view.isBundledQ, true);
-      assert.strictEqual(view.oldAlias, "testServer");
+      assert.strictEqual(view.oldAlias, "local");
       assert.strictEqual(view.serverType, ServerType.KDB);
       assert.strictEqual(result.values[1].includes("Bundled q"), true);
     });
 
-    it("should set isBundledQ to false and return correct HTML when connType is 1", () => {
+    it("should set MyQ to false and return correct HTML when connType is 1  and render is filled", () => {
       view.connectionData = { connType: 1, serverName: "testServer" };
+      view.oldAlias = "testServer";
+      view.renderId = "test";
+      const result = view.renderEditConnectionForm();
+
+      assert.strictEqual(view.isBundledQ, false);
+      assert.strictEqual(view.oldAlias, "testServer");
+      assert.strictEqual(view.serverType, ServerType.KDB);
+      assert.strictEqual(result.values[1].includes("My q"), true);
+    });
 
+    it("should set MyQ to false and return correct HTML when connType is 1", () => {
+      view.connectionData = { connType: 1, serverName: "testServer" };
+      view.oldAlias = "";
+      view.renderId = "";
       const result = view.renderEditConnectionForm();
 
       assert.strictEqual(view.isBundledQ, false);
@@ -702,8 +715,23 @@ describe("KdbNewConnectionView", () => {
       assert.strictEqual(result.values[1].includes("My q"), true);
     });
 
+    it("should set serverType to INSIGHTS and return correct HTML when connType is 2 and render is filled", () => {
+      view.connectionData = { connType: 2, serverName: "testServer" };
+      view.oldAlias = "testServer";
+      view.renderId = "test";
+
+      const result = view.renderEditConnectionForm();
+
+      assert.strictEqual(view.isBundledQ, false);
+      assert.strictEqual(view.oldAlias, "testServer");
+      assert.strictEqual(view.serverType, ServerType.INSIGHTS);
+      assert.strictEqual(result.values[1].includes("Insights"), true);
+    });
+
     it("should set serverType to INSIGHTS and return correct HTML when connType is 2", () => {
       view.connectionData = { connType: 2, serverName: "testServer" };
+      view.oldAlias = "";
+      view.renderId = "";
 
       const result = view.renderEditConnectionForm();