Merge branch 'dev' into 1.6DocUpdates

KxSystems · Jul 2, 2024 · fbde768 · fbde768
2 parents 021f4f9 + e06b93f
commit fbde768
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -196,8 +196,12 @@ Set the following from the Advanced properties if necessary:
 
 ![connecttoinsights](https://github.com/KxSystems/kx-vscode/blob/main/img/insightsconnectionadvanced.png?raw=true)
 
+<<<<<<< 1.6DocUpdates
 !!!note "For kdb Insights Enterprise Free Trial instances"
 The realm is configured as `insights-{URL}` where {URL} is the 10 digit code in the trial URL. For example: if your trial url is https://fstc83yi5b.ft1.cld.kx.com/ the realm is `insights-fstc83yi5b`.
+=======
+  **Note** For kdb Insights Enterprise Free Trial instances the realm is configured as `insights-{URL}` where {URL} is the 10 digit code in the trial URL. For example: if your trial url is https://fstc83yi5b.ft1.cld.kx.com/ the realm should be `insights-fstc83yi5b`.
+>>>>>>> dev
 
 1. Click **Create Connection** and the **kdb Insights Enterprise** connection appears under **CONNECTIONS** in the primary sidebar.
 

diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts
@@ -36,7 +36,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
       this._colorTheme = window.activeColorTheme;
       this.updateResults(this._results);
     });
-    // this.resolveWebviewView(webviewView);
+    ext.isResultsTabVisible = true;
   }
 
   /* istanbul ignore next */

diff --git a/test/suite/commands.test.ts b/test/suite/commands.test.ts
@@ -689,7 +689,7 @@ describe("dataSourceCommand2", () => {
       dummyFileContent.dataSource.selectedType = DataSourceTypes.API;
       getMetaStub.resolves(dummyMeta);
       getDataInsightsStub.resolves({ arrayBuffer: ab, error: "" });
-      isVisibleStub.returns(false);
+      ext.isResultsTabVisible = false;
       await dataSourceCommand.runDataSource(
         dummyFileContent as DataSourceFiles,
         insightsConn.connLabel,
@@ -708,7 +708,7 @@ describe("dataSourceCommand2", () => {
       dummyFileContent.dataSource.selectedType = DataSourceTypes.SQL;
       getMetaStub.resolves(dummyMeta);
       getDataInsightsStub.resolves({ arrayBuffer: ab, error: "" });
-      isVisibleStub.returns(false);
+      ext.isResultsTabVisible = false;
       await dataSourceCommand.runDataSource(
         dummyFileContent as DataSourceFiles,
         insightsConn.connLabel,