Set tree label from optional server label

src/providers/ServerConnectionPanelTreeProvider.ts

@@ -32,10 +32,15 @@ export class ServerConnectionPanelTreeProvider extends TreeDataProviderBase<Serv
       return getPanelVariableTreeItem(connectionOrVariable);
     }
 
+    const serverLabel = this.serverManager.getServer(
+      connectionOrVariable.serverUrl,
+      false
+    )?.label;
+
     return getPanelConnectionTreeItem(
       connectionOrVariable,
       getFirstSupportedConsoleType,
-      'demo.deephaven.io'
+      serverLabel
     );
   };
 

src/providers/ServerConnectionTreeProvider.ts

@@ -46,7 +46,12 @@ export class ServerConnectionTreeProvider extends TreeDataProviderBase<ServerCon
     }
 
     const hasUris = this.serverManager.hasConnectionUris(connectionOrUri);
-    const serverLabel = 'demo.deephaven.io';
+
+    const serverLabel = this.serverManager.getServer(
+      connectionOrUri.serverUrl,
+      false
+    )?.label;
+
     const label =
       serverLabel == null
         ? connectionOrUri.serverUrl.host

src/services/ServerManager.ts

@@ -401,10 +401,22 @@ export class ServerManager implements IServerManager {
   /**
    * Get the server state for the given URL.
    * @param serverUrl The URL of the server to get.
+   * @param matchPort If `true`, include the port when matching the server URL. Defaults to `true`.
    * @returns The server state, or `undefined` if no server with the given URL exists.
    */
-  getServer = (serverUrl: URL): ServerState | undefined => {
-    return this._serverMap.get(serverUrl);
+  getServer = (
+    serverUrl: URL,
+    matchPort: boolean = true
+  ): ServerState | undefined => {
+    if (matchPort) {
+      return this._serverMap.get(serverUrl);
+    }
+
+    for (const server of this._serverMap.values()) {
+      if (server.url.hostname === serverUrl.hostname) {
+        return server;
+      }
+    }
   };
 
   getServers = ({

src/types/serviceTypes.d.ts

@@ -167,7 +167,7 @@ export interface IServerManager extends Disposable {
     dhService: ConnectionState
   ) => Promise<void>;
 
-  getServer: (serverUrl: URL) => ServerState | undefined;
+  getServer: (serverUrl: URL, matchPort?: boolean) => ServerState | undefined;
   getServers: (filter?: {
     isRunning?: boolean;
     hasConnections?: boolean;