Merge pull request #407 from KxSystems/KXI-52704

KXI-52704 - label issues
KxSystems · Aug 21, 2024 · ed4060d · ed4060d
2 parents e3fc833 + 845577f
commit ed4060d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/services/connectionManagerService.ts b/src/services/connectionManagerService.ts
@@ -32,6 +32,7 @@ import { Insights } from "../models/insights";
 import { Server } from "../models/server";
 import { refreshDataSourcesPanel } from "../utils/dataSource";
 import { MetaInfoType } from "../models/meta";
+import { retrieveConnLabelsNames } from "../utils/connLabel";
 
 export class ConnectionManagementService {
   public retrieveConnection(
@@ -232,6 +233,8 @@ export class ConnectionManagementService {
   }
 
   public isConnectedBehaviour(connNode: KdbNode | InsightsNode): void {
+    ext.latestLblsChanged.length = 0;
+    ext.latestLblsChanged.push(...retrieveConnLabelsNames(connNode));
     ext.connectedContextStrings.push(connNode.label);
     commands.executeCommand(
       "setContext",

diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts
@@ -161,7 +161,7 @@ export class KdbNewConnectionView extends LitElement {
       : serverType === ServerType.KDB
         ? html`<vscode-text-field
             class="text-field larger option-title"
-            placeholder="Server 1"
+            placeholder="Server-1"
             value="${this.kdbServer.serverAlias}"
             @input="${(event: Event) =>
               (this.kdbServer.serverAlias = (
@@ -171,7 +171,7 @@ export class KdbNewConnectionView extends LitElement {
           </vscode-text-field>`
         : html`<vscode-text-field
             class="text-field larger option-title"
-            placeholder="Insights 1"
+            placeholder="Insights-1"
             value="${this.insightsServer.alias}"
             @input="${(event: Event) =>
               (this.insightsServer.alias = (
@@ -360,7 +360,7 @@ export class KdbNewConnectionView extends LitElement {
             <vscode-text-field
               class="text-field larger option-title"
               value="${this.newLblName}"
-              @change="${(event: Event) => {
+              @keyup="${(event: Event) => {
                 this.newLblName = (event.target as HTMLInputElement).value;
                 this.requestUpdate();
               }}"

diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts
@@ -334,19 +334,19 @@ describe("KdbNewConnectionView", () => {
   describe("renderServerNameField", () => {
     it("should render server name field for bundled q", () => {
       const result = view.renderServerNameField(ServerType.KDB, true);
-      assert.strictEqual(result.strings[0].includes("Server 1"), false);
+      assert.strictEqual(result.strings[0].includes("Server-1"), false);
     });
 
     it("should render server name field for KDB", () => {
       view.isBundledQ = false;
       const result = view.renderServerNameField(ServerType.KDB);
-      assert.strictEqual(result.strings[0].includes("Server 1"), true);
+      assert.strictEqual(result.strings[0].includes("Server-1"), true);
     });
 
     it("should render server name field for Insights", () => {
       view.isBundledQ = false;
       const result = view.renderServerNameField(ServerType.INSIGHTS, false);
-      assert.strictEqual(result.strings[0].includes("Insights 1"), true);
+      assert.strictEqual(result.strings[0].includes("Insights-1"), true);
     });
   });