Merge pull request #446 from KxSystems/KXI-55598

migrate from vscode ui to sl
KxSystems · Oct 29, 2024 · 9dd4f8a · 9dd4f8a
2 parents 95932b6 + 4ad7c32
commit 9dd4f8a
Show file tree

Hide file tree

Showing 6 changed files with 327 additions and 260 deletions.
diff --git a/src/models/connectionsModels.ts b/src/models/connectionsModels.ts
@@ -11,7 +11,11 @@
  * specific language governing permissions and limitations under the License.
  */
 
-//TODO: start to migrate all connections models to here
+export const enum ConnectionType {
+  BundledQ,
+  Kdb,
+  Insights,
+}
 
 export enum ServerType {
   INSIGHTS,

diff --git a/src/models/messages.ts b/src/models/messages.ts
@@ -11,6 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
+import { ConnectionType } from "./connectionsModels";
 import { DataSourceFiles } from "./dataSource";
 import { MetaObjectPayload } from "./meta";
 
@@ -44,12 +45,6 @@ export interface DataSourceMessage2 {
   dataSourceFile: DataSourceFiles;
 }
 
-export const enum ConnectionType {
-  BundledQ,
-  Kdb,
-  Insights,
-}
-
 export interface EditConnectionMessage {
   connType: ConnectionType;
   serverName: string;

diff --git a/src/panels/newConnection.ts b/src/panels/newConnection.ts
@@ -16,8 +16,9 @@ import { getUri } from "../utils/getUri";
 import { getNonce } from "../utils/getNonce";
 import { ext } from "../extensionVariables";
 import { InsightsNode, KdbNode } from "../services/kdbTreeProvider";
-import { ConnectionType, EditConnectionMessage } from "../models/messages";
+import { EditConnectionMessage } from "../models/messages";
 import { retrieveConnLabelsNames } from "../utils/connLabel";
+import { ConnectionType } from "../models/connectionsModels";
 
 export class NewConnectionPannel {
   public static currentPanel: NewConnectionPannel | undefined;
@@ -176,17 +177,25 @@ export class NewConnectionPannel {
     webview: vscode.Webview,
     extensionUri: vscode.Uri,
   ) {
-    const webviewUri = getUri(webview, extensionUri, ["out", "webview.js"]);
-    const nonce = getNonce();
+    const getResource = (resource: string) =>
+      getUri(webview, extensionUri, ["out", resource]);
 
     return /* html */ `
         <!DOCTYPE html>
-        <html lang="en">
+        <html lang="en" class="${
+          vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Light ||
+          vscode.window.activeColorTheme.kind ===
+            vscode.ColorThemeKind.HighContrastLight
+            ? "sl-theme-light"
+            : "sl-theme-dark"
+        }">
         <head>
             <meta charset="UTF-8">
             <meta name="viewport" content="width=device-width, initial-scale=1.0">
             <title>New Connection</title>
-            <script type="module" nonce="${nonce}" src="${webviewUri}"></script>
+            <link rel="stylesheet" href="${getResource("light.css")}" />
+            <link rel="stylesheet" href="${getResource("style.css")}" />
+            <script type="module" nonce="${getNonce()}" src="${getResource("webview.js")}"></script>
         </head>
         <body>
             <kdb-new-connection-view/>