Merge branch 'dev' into readme-changelog-1.7

KxSystems · Aug 13, 2024 · bb6a548 · bb6a548
2 parents dd37cec + 5576e11
commit bb6a548
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/webview/components/kdbNewConnectionView.ts b/src/webview/components/kdbNewConnectionView.ts
@@ -637,6 +637,7 @@ export class KdbNewConnectionView extends LitElement {
       this.connectionData.connType === 2 ? ServerType.INSIGHTS : ServerType.KDB;
     return html`
       <div class="row mt-1 mb-1 content-wrapper">
+        ${this.isModalOpen ? this.renderNewLabelModal() : ""}
         <div class="col form-wrapper">
           <div class="header-text-wrapper">
             <div class="row">

diff --git a/test/suite/webview.test.ts b/test/suite/webview.test.ts
@@ -601,11 +601,10 @@ describe("KdbNewConnectionView", () => {
       view.connectionData = { connType: 0, serverName: "testServer" };
 
       const result = view.renderEditConnectionForm();
-
       assert.strictEqual(view.isBundledQ, true);
       assert.strictEqual(view.oldAlias, "testServer");
       assert.strictEqual(view.serverType, ServerType.KDB);
-      assert.strictEqual(result.values[0].includes("Bundled q"), true);
+      assert.strictEqual(result.values[1].includes("Bundled q"), true);
     });
 
     it("should set isBundledQ to false and return correct HTML when connType is 1", () => {
@@ -616,7 +615,7 @@ describe("KdbNewConnectionView", () => {
       assert.strictEqual(view.isBundledQ, false);
       assert.strictEqual(view.oldAlias, "testServer");
       assert.strictEqual(view.serverType, ServerType.KDB);
-      assert.strictEqual(result.values[0].includes("My q"), true);
+      assert.strictEqual(result.values[1].includes("My q"), true);
     });
 
     it("should set serverType to INSIGHTS and return correct HTML when connType is 2", () => {
@@ -627,7 +626,21 @@ describe("KdbNewConnectionView", () => {
       assert.strictEqual(view.isBundledQ, false);
       assert.strictEqual(view.oldAlias, "testServer");
       assert.strictEqual(view.serverType, ServerType.INSIGHTS);
-      assert.strictEqual(result.values[0].includes("Insights"), true);
+      assert.strictEqual(result.values[1].includes("Insights"), true);
+    });
+
+    it("should set serverType to INSIGHTS and open labels modal", () => {
+      view.connectionData = { connType: 2, serverName: "testServer" };
+      view.openModal();
+
+      const result = view.renderEditConnectionForm();
+      const resultsStrings = JSON.stringify(result);
+
+      assert.strictEqual(view.isBundledQ, false);
+      assert.strictEqual(view.oldAlias, "testServer");
+      assert.strictEqual(view.serverType, ServerType.INSIGHTS);
+      assert.strictEqual(result.values[1].includes("Insights"), true);
+      assert.strictEqual(resultsStrings.includes("Add a New Label"), true);
     });
   });