Merge pull request intersystems-community#499 from intersystems-community/fix-498

daimor · web-flow · commit dbfc345a2ad2 · 2020-11-11T15:29:24.000+03:00
correct work status bar with docker
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -32,6 +32,8 @@ export interface ConnectionSettings {
   ns: string;
   username: string;
   password: string;
+  docker: boolean;
+  dockerService?: string;
 }
 
 export class AtelierAPI {
@@ -60,6 +62,8 @@ export class AtelierAPI {
       : workspaceState.get(this.configName + ":port", this._config.port);
     const password = workspaceState.get(this.configName + ":password", this._config.password);
     const apiVersion = workspaceState.get(this.configName + ":apiVersion", DEFAULT_API_VERSION);
+    const docker = workspaceState.get(this.configName + ":docker", false);
+    const dockerService = workspaceState.get<string>(this.configName + ":dockerService");
     return {
       serverName,
       active,
@@ -71,6 +75,8 @@ export class AtelierAPI {
       ns,
       username,
       password,
+      docker,
+      dockerService,
     };
   }
 
@@ -179,6 +185,7 @@ export class AtelierAPI {
         username,
         password,
         pathPrefix,
+        docker: false,
       };
 
       // Report server as inactive when no namespace has been determined,
@@ -199,6 +206,12 @@ export class AtelierAPI {
     return new Cache(extensionContext, `API:${host}:${port}`);
   }
 
+  public get connInfo(): string {
+    const { host, port, docker, dockerService } = this.config;
+    const ns = this.ns.toUpperCase();
+    return (docker ? "docker" + (dockerService ? `:${dockerService}:${port}` : "") : `${host}:${port}`) + `[${ns}]`;
+  }
+
   public async request(
     minVersion: number,
     method: string,
@@ -276,7 +289,6 @@ export class AtelierAPI {
       }
       auth = authRequest;
     }
-    const connInfo = `${host}:${port}[${this.ns}]`;
 
     try {
       const cookie = await auth;
@@ -302,7 +314,7 @@ export class AtelierAPI {
         throw { statusCode: response.status, message: response.statusText };
       }
       await this.updateCookies(response.headers.raw()["set-cookie"] || []);
-      panel.text = `${connInfo}`;
+      panel.text = `${this.connInfo}`;
       panel.tooltip = `Connected as ${username}`;
       if (method === "HEAD") {
         authRequestMap.delete(target);
@@ -346,7 +358,7 @@ export class AtelierAPI {
       }
     } catch (error) {
       if (error.error && error.error.code === "ECONNREFUSED") {
-        panel.text = `${connInfo} $(debug-disconnect)`;
+        panel.text = `${this.connInfo} $(debug-disconnect)`;
         panel.tooltip = "Disconnected";
         workspaceState.update(this.configName + ":host", undefined);
         workspaceState.update(this.configName + ":port", undefined);
diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts
@@ -1,5 +1,12 @@
 import * as vscode from "vscode";
-import { config, workspaceState, checkConnection, FILESYSTEM_SCHEMA, FILESYSTEM_READONLY_SCHEMA } from "../extension";
+import {
+  config,
+  workspaceState,
+  checkConnection,
+  FILESYSTEM_SCHEMA,
+  FILESYSTEM_READONLY_SCHEMA,
+  explorerProvider,
+} from "../extension";
 import { connectionTarget, terminalWithDocker, currentFile } from "../utils";
 import { mainCommandMenu, mainSourceControlMenu } from "./studio";
 import { AtelierAPI } from "../api";
@@ -8,9 +15,10 @@ type ServerAction = { detail: string; id: string; label: string };
 export async function serverActions(): Promise<void> {
   const { apiTarget, configName: workspaceFolder } = connectionTarget();
   const api = new AtelierAPI(apiTarget);
-  const { active, host = "", ns = "", https, port = 0, username, password } = api.config;
-  if (host === "") {
-    return vscode.commands.executeCommand("workbench.view.extension.ObjectScriptView");
+  const { active, host = "", ns = "", https, port = 0, username, password, docker } = api.config;
+  const explorerCount = (await explorerProvider.getChildren()).length;
+  if (!explorerCount && (!docker || host === "")) {
+    await vscode.commands.executeCommand("ObjectScriptExplorer.focus");
   }
   const { links } = config("conn");
   const nsEncoded = encodeURIComponent(ns);
diff --git a/src/explorer/explorer.ts b/src/explorer/explorer.ts
@@ -64,7 +64,8 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
           placeHolder: `Choose a namespace on ${api.config.host}:${api.config.port} to add to ObjectScript Explorer`,
         })
       )
-      .then((ns) => this.showExtra4Workspace(workspaceFolder, ns.label));
+      .then((ns) => this.showExtra4Workspace(workspaceFolder, ns.label))
+      .catch(() => null);
   }
 
   public showExtra4Workspace(workspaceFolder: string, ns: string): void {
diff --git a/src/explorer/models/nodeBase.ts b/src/explorer/models/nodeBase.ts
@@ -35,10 +35,6 @@ export class NodeBase {
     this.extraNode = extraNode;
   }
 
-  public get connInfo(): string {
-    return `${this.conn.host}:${this.conn.port}[${this.namespace}]`;
-  }
-
   public getTreeItem(): vscode.TreeItem {
     return {
       collapsibleState: vscode.TreeItemCollapsibleState.None,
diff --git a/src/explorer/models/workspaceNode.ts b/src/explorer/models/workspaceNode.ts
@@ -19,12 +19,17 @@ export class WorkspaceNode extends NodeBase {
     const flags = [];
     this.options.generated && flags.push(":generated:");
     this.options.system && flags.push(":system:");
+    const { host, port, docker, dockerService } = this.conn;
+    const serverInfo = docker
+      ? "docker" + (dockerService ? `:${dockerService}:${port}` : "")
+      : `${host}${port ? ":" + port : ""}`;
+    const connInfo = this.extraNode
+      ? `[${this.namespace}] on ${serverInfo}`
+      : `${this.label} (${serverInfo}[${this.namespace}])`;
     return {
       collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
       contextValue: `${this.uniqueId}${flags.join("")}`,
-      label: this.extraNode
-        ? `[${this.namespace}] on ${this.conn.host}:${this.conn.port}`
-        : `${this.label} (${this.connInfo})`,
+      label: connInfo,
       iconPath: new vscode.ThemeIcon(this.extraNode ? "database" : "server-environment"),
     };
   }
diff --git a/src/extension.ts b/src/extension.ts
@@ -201,12 +201,15 @@ export async function checkConnection(clearCookies = false, uri?: vscode.Uri): P
   let api = new AtelierAPI(apiTarget, false);
   const { active, host = "", port = 0, username, ns = "" } = api.config;
   vscode.commands.executeCommand("setContext", "vscode-objectscript.connectActive", active);
+  if (!panel.text) {
+    panel.text = `${PANEL_LABEL}`;
+  }
   if (!host.length && !port && !ns.length) {
     panel.text = `${PANEL_LABEL}`;
     panel.tooltip = `No connection configured`;
     return;
   }
-  let connInfo = `${host}:${port}[${ns}]`;
+  let connInfo = api.connInfo;
   if (!active) {
     if (!host.length || !port || !ns.length) {
       connInfo = `incompletely specified server ${connInfo}`;
@@ -215,12 +218,12 @@ export async function checkConnection(clearCookies = false, uri?: vscode.Uri): P
     panel.tooltip = `Connection to ${connInfo} is disabled`;
     return;
   }
-  panel.text = connInfo;
-  panel.tooltip = `Connected as ${username}`;
+
   if (!workspaceState.get(configName + ":port") && !api.externalServer) {
     try {
-      const { port: dockerPort, docker: withDocker } = await portFromDockerCompose();
+      const { port: dockerPort, docker: withDocker, service } = await portFromDockerCompose();
       workspaceState.update(configName + ":docker", withDocker);
+      workspaceState.update(configName + ":dockerService", service);
       if (withDocker) {
         if (!dockerPort) {
           const errorMessage = `Something is wrong with your docker-compose connection settings, or your service is not running.`;
@@ -241,6 +244,8 @@ export async function checkConnection(clearCookies = false, uri?: vscode.Uri): P
     } catch (error) {
       outputChannel.appendError(error);
       workspaceState.update(configName + ":docker", true);
+      panel.text = `${PANEL_LABEL} $(error)`;
+      panel.tooltip = error;
       return;
     }
   }
@@ -262,6 +267,8 @@ export async function checkConnection(clearCookies = false, uri?: vscode.Uri): P
   api
     .serverInfo()
     .then((info) => {
+      panel.text = api.connInfo;
+      panel.tooltip = `Connected as ${username}`;
       const hasHS = info.result.content.features.find((el) => el.name === "HEALTHSHARE" && el.enabled) !== undefined;
       reporter &&
         reporter.sendTelemetryEvent("connected", {
@@ -454,12 +461,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
   posPanel.show();
 
   panel = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1);
-
-  const debugAdapterFactory = new ObjectScriptDebugAdapterDescriptorFactory();
-
+  panel.text = `${PANEL_LABEL}`;
   panel.command = "vscode-objectscript.serverActions";
   panel.show();
 
+  const debugAdapterFactory = new ObjectScriptDebugAdapterDescriptorFactory();
+
   // Check one time (flushing cookies) each connection that is used by the workspace.
   // This gets any prompting for missing credentials done upfront, for simplicity.
   const toCheck = new Map<string, vscode.Uri>();
@@ -675,6 +682,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
 
   context.subscriptions.push(
     reporter,
+    panel,
+    posPanel,
     vscode.extensions.onDidChange(async () => {
       const languageServerExt2 = languageServer(false);
       if (typeof languageServerExt !== typeof languageServerExt2) {
diff --git a/src/providers/FileSystemPovider/TextSearchProvider.ts b/src/providers/FileSystemPovider/TextSearchProvider.ts
@@ -2,6 +2,7 @@ import * as vscode from "vscode";
 import { SearchResult, SearchMatch } from "../../api/atelier";
 import { AtelierAPI } from "../../api";
 import { DocumentContentProvider } from "../DocumentContentProvider";
+import { outputChannel } from "../../utils";
 
 export class TextSearchProvider implements vscode.TextSearchProvider {
   /**
@@ -34,12 +35,16 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
         files.map(async (file) => {
           const fileName = file.doc;
           const uri = DocumentContentProvider.getUri(fileName, "", "", true, options.folder);
-          const document = await vscode.workspace.openTextDocument(uri);
-          return {
-            ...file,
-            uri,
-            document,
-          };
+          try {
+            const document = await vscode.workspace.openTextDocument(uri);
+            return {
+              ...file,
+              uri,
+              document,
+            };
+          } catch (_ex) {
+            return null;
+          }
         })
       )
       .then((files) => Promise.all(files))
@@ -70,6 +75,10 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
           });
         });
         return { limitHit: counter >= options.maxResults };
+      })
+      .catch((error) => {
+        outputChannel.appendLine(error);
+        return null;
       });
   }
 }
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -255,13 +255,13 @@ export function notNull(el: any): boolean {
   return el !== null;
 }
 
-export async function portFromDockerCompose(): Promise<{ port: number; docker: boolean }> {
+export async function portFromDockerCompose(): Promise<{ port: number; docker: boolean; service?: string }> {
   const { "docker-compose": dockerCompose = {} } = config("conn");
   const { service, file = "docker-compose.yml", internalPort = 52773, envFile } = dockerCompose;
   if (!internalPort || !file || !service || service === "") {
     return { docker: false, port: null };
   }
-  const result = { port: null, docker: true };
+  const result = { port: null, docker: true, service };
   const workspaceFolderPath = workspaceFolderUri().fsPath;
   const workspaceRootPath = vscode.workspace.workspaceFolders[0].uri.fsPath;
 
@@ -305,7 +305,7 @@ export async function portFromDockerCompose(): Promise<{ port: number; docker: b
         if (!port) {
           reject(`Port ${internalPort} not published for service '${service}'.`);
         }
-        resolve({ port: parseInt(port, 10), docker: true });
+        resolve({ port: parseInt(port, 10), docker: true, service });
       });
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod`
`64`	`64`	placeHolder: `Choose a namespace on ${api.config.host}:${api.config.port} to add to ObjectScript Explorer`,
`65`	`65`	`})`
`66`	`66`	`)`
`67`		`- .then((ns) => this.showExtra4Workspace(workspaceFolder, ns.label));`
	`67`	`+ .then((ns) => this.showExtra4Workspace(workspaceFolder, ns.label))`
	`68`	`+ .catch(() => null);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`public showExtra4Workspace(workspaceFolder: string, ns: string): void {`