KXI-38118 - Minor connection page issues

src/panels/newConnection.ts

@@ -35,7 +35,7 @@ export class NewConnectionPannel {
       if (message.command === "kdb.newConnection.createNewBundledConnection") {
         if (ext.isBundleQCreated) {
           vscode.window.showErrorMessage(
-            "Bundle Q is already created, please remove it first",
+            "Bundled Q is already created, please remove it first",
           );
         } else {
           vscode.commands.executeCommand(

src/validators/kdbValidator.ts

@@ -32,15 +32,15 @@ export function validateServerAlias(
       return `Input value must be between 1 and ${MAX_STR_LEN} alphanumeric characters in length.`;
     }
     if (!validateUtils.isAlphanumericWithHypens(input)) {
-      return "Input value must contain only alphanumeric characters and hypens only";
+      return "Input value must contain only alphanumeric characters and hypens";
     }
 
     if (input === "InsightsEnterprise") {
       return "Input value using restricted keywords of Insights Enterprise";
     }
 
     if (!isLocal && input.toLowerCase() === "local") {
-      return "Input value using restricted keywords of Local for Bundle q Server";
+      return "The server name “local” is reserved for connections to the Bundled q process";
     }
   }
   return undefined;
@@ -65,7 +65,7 @@ export function validateServerPort(
       return "Input value must be a number.";
     }
     const parsedNumber = Number(input);
-    return parsedNumber > 0 && parsedNumber < 65536
+    return parsedNumber > 0 && parsedNumber < 65537
       ? undefined
       : "Invalid port number, valid range is 1-65536";
   }

src/webview/components/kdbNewConnectionView.ts

@@ -88,9 +88,9 @@ export class KdbNewConnectionView extends LitElement {
           <b>Bundled q.</b></span
         >`
       : html`<span
-          >Name the server,<u>but do not use "local";</u> "local" has been
+          >Name the server, <u>but do not use "local";</u> "local" has been
           reserved for use by the pre-packaged q in the kdb VS Code
-          extension</span
+          extension.</span
         >`;
   }
 
@@ -134,6 +134,18 @@ export class KdbNewConnectionView extends LitElement {
     `;
   }
 
+  renderPortNumberDesc() {
+    return this.isBundledQ
+      ? html`<span
+          >Ensure the port number you use does not conflict with another
+          port.</span
+        >`
+      : html`<span
+          >Ensure <b>Set port number</b> matches the assigned port of your q
+          process, and doesn’t conflict with another port.</span
+        >`;
+  }
+
   renderPortNumber() {
     return html`
       <div class="row">
@@ -152,11 +164,7 @@ export class KdbNewConnectionView extends LitElement {
         >
       </div>
       <div class="row option-description option-help">
-        <span
-          >${this.isBundledQ
-            ? "Ensure the port number you use does not conflict with another port."
-            : "Ensure <b>Set port number</b> matches the assigned port of your q process, and doesn’t conflict with another port."}</span
-        >
+        ${this.renderPortNumberDesc()}
       </div>
     `;
   }
@@ -254,7 +262,7 @@ export class KdbNewConnectionView extends LitElement {
               <vscode-panel-tab
                   id="tab-1"
                   @click="${() => this.tabClickAction(1)}"
-                  >Bundle q</vscode-panel-tab
+                  >Bundled q</vscode-panel-tab
                 >
                 <vscode-panel-tab
                   id="tab-2"
@@ -310,7 +318,11 @@ export class KdbNewConnectionView extends LitElement {
                         <div class="row">
                           <vscode-text-field
                             class="text-field larger option-title"
-                            value="${this.kdbServer.username}"
+                            value="${
+                              this.kdbServer.username
+                                ? this.kdbServer.username
+                                : ""
+                            }"   
                             @input="${(event: Event) =>
                               (this.kdbServer.username = (
                                 event.target as HTMLSelectElement
@@ -322,7 +334,11 @@ export class KdbNewConnectionView extends LitElement {
                           <vscode-text-field
                             type="password"
                             class="text-field larger option-title"
-                            value="${this.kdbServer.password}"
+                            value="${
+                              this.kdbServer.password
+                                ? this.kdbServer.password
+                                : ""
+                            }"
                             @input="${(event: Event) =>
                               (this.kdbServer.password = (
                                 event.target as HTMLSelectElement

test/suite/validators.test.ts

@@ -88,7 +88,7 @@ describe("kdbValidator", () => {
     const result = kdbValidators.validateServerAlias("test!", false);
     assert.strictEqual(
       result,
-      "Input value must contain only alphanumeric characters and hypens only",
+      "Input value must contain only alphanumeric characters and hypens",
       "Input contained special chars",
     );
   });
@@ -109,7 +109,7 @@ describe("kdbValidator", () => {
     const result = kdbValidators.validateServerAlias("local", false);
     assert.strictEqual(
       result,
-      "Input value using restricted keywords of Local for Bundle q Server",
+      "The server name “local” is reserved for connections to the Bundled q process",
       "Input contained restricted keyword.",
     );
   });
@@ -118,7 +118,7 @@ describe("kdbValidator", () => {
     const result = kdbValidators.validateServerAlias("local", false);
     assert.strictEqual(
       result,
-      "Input value using restricted keywords of Local for Bundle q Server",
+      "The server name “local” is reserved for connections to the Bundled q process",
       "Input contained restricted keyword.",
     );
   });

test/suite/webview.test.ts

@@ -447,12 +447,33 @@ describe("KdbNewConnectionView", () => {
     });
   });
 
+  describe("renderPortNumberDesc", () => {
+    it("should render port number desc for bundled q", () => {
+      view.isBundledQ = true;
+      const result = view.renderPortNumberDesc(ServerType.KDB);
+      assert.strictEqual(
+        JSON.stringify(result).includes(
+          "Ensure the port number you use does not conflict with another",
+        ),
+        true,
+      );
+    });
+
+    it("should render port number desc for KDB server", () => {
+      view.isBundledQ = false;
+      const result = view.renderPortNumberDesc(ServerType.KDB);
+      assert.strictEqual(
+        JSON.stringify(result).includes("<b>Set port number</b>"),
+        true,
+      );
+    });
+  });
   describe("renderPortNumber", () => {
-    it("should render port number for bundle q", () => {
+    it("should render port number for bundled q", () => {
       const result = view.renderPortNumber(ServerType.KDB);
       assert.strictEqual(
         JSON.stringify(result).includes(
-          "Ensure the port number you use does not conflict with another port.",
+          "Ensure the port number you use does not conflict with another",
         ),
         true,
       );