Remove/comment out connection title generation from all areas. (#23873)

extensions/mssql/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.8.1.3",
+	"version": "4.8.1.4",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",

extensions/mssql/src/tableDesigner/tableDesigner.ts

@@ -26,18 +26,11 @@ export function registerTableDesignerCommands(appContext: AppContext) {
 			if (!connectionString) {
 				throw new Error(FailedToGetConnectionStringError);
 			}
-			let titleString = `${context.connectionProfile!.serverName} - ${context.connectionProfile!.databaseName} - ${NewTableText}`;
-			// append distinguishing options to end to let users know exact connection.
-			let distinguishingOptions = await azdata.connection.getEditorConnectionProfileTitle(context.connectionProfile, true);
-			if (distinguishingOptions !== '') {
-				distinguishingOptions = distinguishingOptions.replace('(', '[').replace(')', ']');
-				titleString += `${distinguishingOptions}`;
-			}
 			const tableIcon = context.nodeInfo!.nodeSubType as azdata.designers.TableIcon;
 			const telemetryInfo = await getTelemetryInfo(context, tableIcon);
 			await azdata.designers.openTableDesigner(sqlProviderName, {
 				title: NewTableText,
-				tooltip: titleString,
+				tooltip: `${context.connectionProfile!.serverName} - ${context.connectionProfile!.databaseName} - ${NewTableText}`,
 				server: context.connectionProfile!.serverName,
 				database: context.connectionProfile!.databaseName,
 				isNewTable: true,
@@ -63,18 +56,11 @@ export function registerTableDesignerCommands(appContext: AppContext) {
 			if (!connectionString) {
 				throw new Error(FailedToGetConnectionStringError);
 			}
-			let titleString = `${server} - ${database} - ${schema}.${name}`;
-			// append distinguishing options to end to let users know exact connection.
-			let distinguishingOptions = await azdata.connection.getEditorConnectionProfileTitle(context.connectionProfile, true);
-			if (distinguishingOptions !== '') {
-				distinguishingOptions = distinguishingOptions.replace('(', '[').replace(')', ']');
-				titleString += `${distinguishingOptions}`;
-			}
 			const tableIcon = context.nodeInfo!.nodeSubType as azdata.designers.TableIcon;
 			const telemetryInfo = await getTelemetryInfo(context, tableIcon);
 			await azdata.designers.openTableDesigner(sqlProviderName, {
 				title: `${schema}.${name}`,
-				tooltip: titleString,
+				tooltip: `${server} - ${database} - ${schema}.${name}`,
 				server: server,
 				database: database,
 				isNewTable: false,

src/sql/azdata.proposed.d.ts

@@ -508,15 +508,6 @@ declare module 'azdata' {
 		 * @returns The new password that is returned from the operation or undefined if unsuccessful.
 		 */
 		export function openChangePasswordDialog(profile: IConnectionProfile): Thenable<string | undefined>;
-
-		/**
-		 * Gets the formatted title of the connection profile for display
-		 * @param profile The connection profile we want to get the full display info for.
-		 * @param getOptionsOnly Provide if you only want to get the differing advanced options (for some titles).
-		 * @param includeGroupName Provide if you want to include the groupName as well (in areas that do not display the groupName).
-		 * @returns The title formatted with server info in front, with non default options at the end.
-		 */
-		export function getEditorConnectionProfileTitle(profile: IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): Thenable<string>;
 	}
 
 	/*

src/sql/platform/connection/common/connectionManagement.ts

@@ -381,15 +381,6 @@ export interface IConnectionManagementService {
 	 * @returns the new valid password that is entered, or undefined if cancelled or errored.
 	 */
 	openChangePasswordDialog(profile: IConnectionProfile): Promise<string | undefined>;
-
-	/**
-	 * Gets the formatted title of the connection profile for display.
-	 * @param profile The connection profile we want to get the full display info for.
-	 * @param getOptionsOnly Provide if you only want to get the differing advanced options (for some titles).
-	 * @param includeGroupName Provide if you want to include the groupName as well (in areas that do not display the groupName).
-	 * @returns The title formatted with server info in front, with non default options at the end.
-	 */
-	getEditorConnectionProfileTitle(profile: IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): string;
 }
 
 export enum RunQueryOnConnectionMode {

src/sql/platform/connection/common/connectionStore.ts

@@ -326,12 +326,6 @@ export class ConnectionStore {
 		return this.convertToConnectionGroup(groups, profilesInConfiguration);
 	}
 
-	public getAllConnectionsFromConfig(): ConnectionProfile[] {
-		let profilesInConfiguration: ConnectionProfile[] | undefined;
-		profilesInConfiguration = this.connectionConfig.getConnections(true);
-		return profilesInConfiguration;
-	}
-
 	private convertToConnectionGroup(groups: IConnectionProfileGroup[], connections?: ConnectionProfile[], parent?: ConnectionProfileGroup): ConnectionProfileGroup[] {
 		const result: ConnectionProfileGroup[] = [];
 		const children = groups.filter(g => g.parentId === (parent ? parent.id : undefined));

src/sql/platform/connection/common/providerConnectionInfo.ts

@@ -134,7 +134,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo {
 		this.options[name] = value;
 	}
 
-	public getServerInfo() {
+	private getServerInfo() {
 		let title = '';
 		if (this.serverCapabilities) {
 			title = this.serverName;
@@ -169,7 +169,7 @@ export class ProviderConnectionInfo implements azdata.ConnectionInfo {
 		return label;
 	}
 
-	public hasLoaded(): boolean {
+	private hasLoaded(): boolean {
 		return Object.keys(this.capabilitiesService.providers).length > 0;
 	}
 

src/sql/platform/connection/test/common/testConnectionManagementService.ts

@@ -355,10 +355,6 @@ export class TestConnectionManagementService implements IConnectionManagementSer
 		return undefined;
 	}
 
-	getEditorConnectionProfileTitle(profile: IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): string {
-		return undefined!;
-	}
-
 	openCustomErrorDialog(options: azdata.window.IErrorDialogOptions): Promise<string | undefined> {
 		return undefined;
 	}

src/sql/workbench/api/browser/mainThreadConnectionManagement.ts

@@ -185,10 +185,6 @@ export class MainThreadConnectionManagement extends Disposable implements MainTh
 		return this._connectionManagementService.openChangePasswordDialog(convertedProfile);
 	}
 
-	public $getEditorConnectionProfileTitle(profile: IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): Thenable<string | undefined> {
-		return Promise.resolve(this._connectionManagementService.getEditorConnectionProfileTitle(profile, getOptionsOnly, includeGroupName));
-	}
-
 	public async $listDatabases(connectionId: string): Promise<string[]> {
 		let connectionUri = await this.$getUriForConnection(connectionId);
 		let result = await this._connectionManagementService.listDatabases(connectionUri);

src/sql/workbench/api/common/extHostConnectionManagement.ts

@@ -78,10 +78,6 @@ export class ExtHostConnectionManagement extends ExtHostConnectionManagementShap
 		return this._proxy.$openChangePasswordDialog(profile);
 	}
 
-	public $getEditorConnectionProfileTitle(profile: azdata.IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): Thenable<string> {
-		return this._proxy.$getEditorConnectionProfileTitle(profile, getOptionsOnly, includeGroupName);
-	}
-
 	public $listDatabases(connectionId: string): Thenable<string[]> {
 		return this._proxy.$listDatabases(connectionId);
 	}

src/sql/workbench/api/common/sqlExtHost.api.impl.ts

@@ -141,9 +141,6 @@ export function createAdsApiFactory(accessor: ServicesAccessor): IAdsExtensionAp
 				openChangePasswordDialog(profile: azdata.IConnectionProfile): Thenable<string | undefined> {
 					return extHostConnectionManagement.$openChangePasswordDialog(profile);
 				},
-				getEditorConnectionProfileTitle(profile: azdata.IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): Thenable<string> {
-					return extHostConnectionManagement.$getEditorConnectionProfileTitle(profile, getOptionsOnly, includeGroupName);
-				},
 				listDatabases(connectionId: string): Thenable<string[]> {
 					return extHostConnectionManagement.$listDatabases(connectionId);
 				},

src/sql/workbench/api/common/sqlExtHost.protocol.ts

@@ -729,7 +729,6 @@ export interface MainThreadConnectionManagementShape extends IDisposable {
 	$getServerInfo(connectedId: string): Thenable<azdata.ServerInfo>;
 	$openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable<azdata.connection.Connection>;
 	$openChangePasswordDialog(profile: azdata.IConnectionProfile): Thenable<string | undefined>;
-	$getEditorConnectionProfileTitle(profile: azdata.IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): Thenable<string>;
 	$listDatabases(connectionId: string): Thenable<string[]>;
 	$getConnectionString(connectionId: string, includePassword: boolean): Thenable<string>;
 	$getUriForConnection(connectionId: string): Thenable<string>;

src/sql/workbench/browser/editor/profiler/dashboardInput.ts

@@ -85,14 +85,11 @@ export class DashboardInput extends EditorInput {
 		}
 
 		let name = this.connectionProfile.connectionName ? this.connectionProfile.connectionName : this.connectionProfile.serverName
-
-		if (!this.connectionProfile.connectionName && this.connectionProfile.databaseName
+		if (this.connectionProfile.databaseName
 			&& !this.isMasterMssql()) {
 			// Only add DB name if this is a non-default, non-master connection
 			name = name + ':' + this.connectionProfile.databaseName;
 		}
-		// Append any differing options if needed.
-		name += this._connectionService.getEditorConnectionProfileTitle(this.connectionProfile, true, true)
 		return name;
 	}
 

src/sql/workbench/common/editor/query/queryEditorInput.ts

@@ -243,17 +243,11 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
 				title = this._description + ' ';
 			}
 			if (profile) {
-				let distinguishedTitle = this.connectionManagementService.getEditorConnectionProfileTitle(profile);
-				if (distinguishedTitle !== '') {
-					title += distinguishedTitle;
-				}
-				else {
-					title += `${profile.serverName}`;
-					if (profile.databaseName) {
-						title += `.${profile.databaseName}`;
-					}
-					title += ` (${profile.userName || profile.authenticationType})`;
+				title += `${profile.serverName}`;
+				if (profile.databaseName) {
+					title += `.${profile.databaseName}`;
 				}
+				title += ` (${profile.userName || profile.authenticationType})`;
 			} else {
 				title += localize('disconnected', "disconnected");
 			}

src/sql/workbench/contrib/connection/browser/connectionStatus.ts

@@ -68,30 +68,20 @@ export class ConnectionStatusbarItem extends Disposable implements IWorkbenchCon
 
 	// Set connection info to connection status bar
 	private _setConnectionText(connectionProfile: IConnectionProfile): void {
-		let distinguishedTitle = this.connectionManagementService.getEditorConnectionProfileTitle(connectionProfile);
-		let text: string = '';
-		let tooltip: string = '';
-		if (distinguishedTitle === '') {
-			text = connectionProfile.serverName;
-			if (text) {
-				if (connectionProfile.databaseName && connectionProfile.databaseName !== '') {
-					text = text + ' : ' + connectionProfile.databaseName;
-				} else {
-					text = text + ' : ' + '<default>';
-				}
+		let text: string = connectionProfile.serverName;
+		if (text) {
+			if (connectionProfile.databaseName && connectionProfile.databaseName !== '') {
+				text = text + ' : ' + connectionProfile.databaseName;
+			} else {
+				text = text + ' : ' + '<default>';
 			}
+		}
 
+		let tooltip = 'Server: ' + connectionProfile.serverName + '\r\n' +
+			'Database: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
 
-			tooltip = 'Server: ' + connectionProfile.serverName + '\r\n' +
-				'Database: ' + (connectionProfile.databaseName ? connectionProfile.databaseName : '<default>') + '\r\n';
-
-			if (connectionProfile.userName && connectionProfile.userName !== '') {
-				tooltip = tooltip + 'Login: ' + connectionProfile.userName + '\r\n';
-			}
-		}
-		else {
-			text = distinguishedTitle;
-			tooltip = (connectionProfile as any).serverInfo;
+		if (connectionProfile.userName && connectionProfile.userName !== '') {
+			tooltip = tooltip + 'Login: ' + connectionProfile.userName + '\r\n';
 		}
 
 		this.statusItem.update({

src/sql/workbench/contrib/dashboard/browser/services/breadcrumb.service.ts

@@ -57,9 +57,7 @@ export class BreadcrumbService implements IBreadcrumbService {
 	}
 
 	private getServerBreadcrumb(profile: ConnectionProfile): MenuItem {
-		let formattedProfileName = profile.connectionName ? profile.connectionName : profile.serverName;
-		formattedProfileName += this.commonService.connectionManagementService.getEditorConnectionProfileTitle(profile, true, true);
-		return { label: formattedProfileName, routerLink: ['server-dashboard'] };
+		return profile.connectionName ? { label: profile.connectionName, routerLink: ['server-dashboard'] } : { label: profile.serverName, routerLink: ['server-dashboard'] };
 	}
 
 	private getDbBreadcrumb(profile: ConnectionProfile): MenuItem {

src/sql/workbench/contrib/notebook/browser/notebookActions.ts

@@ -756,10 +756,7 @@ export class AttachToDropdown extends SelectBox {
 		} else {
 			let connections: string[] = [];
 			if (model.context && model.context.title && (connProviderIds.includes(this.model.context.providerName))) {
-				let textResult = model.context.title;
-				let fullTitleText = this._connectionManagementService.getEditorConnectionProfileTitle(model.context);
-				textResult = fullTitleText.length !== 0 ? fullTitleText : textResult;
-				connections.push(textResult);
+				connections.push(model.context.title);
 			} else if (this._configurationService.getValue(saveConnectionNameConfigName) && model.savedConnectionName) {
 				connections.push(model.savedConnectionName);
 			} else {

src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts

@@ -126,7 +126,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 			// get the full ConnectionProfiles with the server info updated properly
 			const treeInput = TreeUpdateUtils.getTreeInput(this._connectionManagementService)!;
 			await this._tree.setInput(treeInput);
-			await this.refreshConnectionTreeTitles();
 			this._treeSelectionHandler.onTreeActionStateChange(false);
 		} else {
 			if (this._connectionManagementService.hasRegisteredServers()) {
@@ -273,7 +272,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				if (connectionParentGroup) {
 					connectionParentGroup.addOrReplaceConnection(newConnection);
 					await this._tree.updateChildren(connectionParentGroup);
-					await this.refreshConnectionTreeTitles();
 					await this._tree.revealSelectFocusElement(newConnection);
 					await this._tree.expand(newConnection);
 				}
@@ -288,7 +286,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 					await this._tree.rerender(connectionInTree);
 					await this._tree.revealSelectFocusElement(connectionInTree);
 					await this._tree.updateChildren(connectionInTree);
-					await this.refreshConnectionTreeTitles();
 					await this._tree.expand(connectionInTree);
 				}
 			}
@@ -301,7 +298,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				if (parentGroup) {
 					parentGroup.removeConnections([e]);
 					await this._tree.updateChildren(parentGroup);
-					await this.refreshConnectionTreeTitles();
 					await this._tree.revealSelectFocusElement(parentGroup);
 				}
 			}
@@ -319,14 +315,12 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 					const newProfileParent = <ConnectionProfileGroup>this._tree.getElementById(e.profile.groupId);
 					newProfileParent.addOrReplaceConnection(e.profile);
 					await this._tree.updateChildren(newProfileParent);
-					await this.refreshConnectionTreeTitles();
 					await this._tree.revealSelectFocusElement(e.profile);
 					await this._tree.expand(e.profile);
 				} else {
 					// If the profile was not moved to a different group then just update the profile in the group.
 					oldProfileParent.replaceConnection(e.profile, e.oldProfileId);
-					await this._tree.updateChildren(oldProfileParent)
-					await this.refreshConnectionTreeTitles();
+					await this._tree.updateChildren(oldProfileParent);
 					await this._tree.revealSelectFocusElement(e.profile);
 					await this._tree.expand(e.profile);
 				}
@@ -351,7 +345,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 					await this._tree.updateChildren(newParent);
 					await this._tree.expand(newParent);
 				}
-				await this.refreshConnectionTreeTitles();
 				const newConnection = this._tree.getElementById(movedConnection.id);
 				if (newConnection) {
 					await this._tree.revealSelectFocusElement(newConnection);
@@ -366,7 +359,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				const parent = <ConnectionProfileGroup>this._tree.getElementById(e.parentId);
 				parent.children = parent.children.filter(c => c.id !== e.id);
 				await this._tree.updateChildren(parent);
-				await this.refreshConnectionTreeTitles();
 				await this._tree.revealSelectFocusElement(parent);
 			}
 		}));
@@ -389,7 +381,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				e.parent = parent;
 				e.parentId = parent.id;
 				await this._tree.updateChildren(parent);
-				await this.refreshConnectionTreeTitles();
 				await this._tree.revealSelectFocusElement(e);
 			}
 		}));
@@ -400,7 +391,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				if (newParent) {
 					newParent.children[newParent.children.findIndex(c => c.id === e.id)] = e;
 					await this._tree.updateChildren(newParent);
-					await this.refreshConnectionTreeTitles();
 					await this._tree.revealSelectFocusElement(e);
 				}
 			}
@@ -419,7 +409,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				(<ConnectionProfileGroup>movedGroup).parent = newParent;
 				(<ConnectionProfileGroup>movedGroup).parentId = newParent.id;
 				await this._tree.updateChildren(newParent);
-				await this.refreshConnectionTreeTitles();
 				await this._tree.revealSelectFocusElement(movedGroup);
 				// Expanding the previously expanded children of the moved group after the move.
 				this._tree.expandElements(profileExpandedState);
@@ -706,7 +695,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 				return;
 			}
 			await this._tree.setInput(treeInput!);
-			await this.refreshConnectionTreeTitles();
 			if (isHidden(this.messages!)) {
 				this._tree.getFocus();
 				if (this._tree instanceof AsyncServerTree) {
@@ -972,13 +960,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
 		return actionContext;
 	}
 
-	private async refreshConnectionTreeTitles(): Promise<void> {
-		let treeInput = this._tree.getInput();
-		let treeArray = TreeUpdateUtils.alterTreeChildrenTitles([treeInput], this._connectionManagementService, false);
-		treeInput = treeArray[0];
-		await this._tree!.setInput(treeInput);
-	}
-
 	public collapseAllConnections(): void {
 		const root = TreeUpdateUtils.getTreeInput(this._connectionManagementService)!;
 		const connections = ConnectionProfileGroup.getConnectionsInGroup(root);

src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts

@@ -61,10 +61,6 @@ export class SingleConnectionManagementService {
 	public get connectionInfo(): ConnectionManagementInfo {
 		return this._connectionService.getConnectionInfo(this._uri);
 	}
-
-	public getEditorConnectionProfileTitle(profile: IConnectionProfile, getOptionsOnly?: boolean, includeGroupName?: boolean): string {
-		return this._connectionService.getEditorConnectionProfileTitle(profile, getOptionsOnly, includeGroupName);
-	}
 }
 
 export class SingleAdminService {

src/sql/workbench/services/connection/browser/connectionBrowseTab.ts

@@ -553,12 +553,7 @@ class SavedConnectionNode {
 	}
 
 	getChildren() {
-		let input = TreeUpdateUtils.getTreeInput(this.connectionManagementService);
-		let newInput = [input];
-		if (input instanceof ConnectionProfileGroup) {
-			newInput = TreeUpdateUtils.alterTreeChildrenTitles([input], this.connectionManagementService);
-		}
-		return this.dataSource.getChildren(newInput[0]);
+		return this.dataSource.getChildren(TreeUpdateUtils.getTreeInput(this.connectionManagementService));
 	}
 }