ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Skip getting icon if we don't have a server info (#13017)

Browse Source
This commit is contained in:
Charles Gagnon
2020-10-21 15:56:22 -07:00
committed by GitHub
parent 4184c28ce7
commit 656d727854
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/services/connection/browser/connectionManagementService.ts
View File

@@ -573,8 +573,12 @@ export class ConnectionManagementService extends Disposable implements IConnecti
let iconProvider = this._iconProviders.get(connectionManagementInfo.providerId); let iconProvider = this._iconProviders.get(connectionManagementInfo.providerId);
if (iconProvider) { if (iconProvider) {
let serverInfo: azdata.ServerInfo = this.getServerInfo(connectionProfile.id); const serverInfo: azdata.ServerInfo | undefined = this.getServerInfo(connectionProfile.id);
let profile: interfaces.IConnectionProfile = connectionProfile.toIConnectionProfile(); if (!serverInfo) {
this._logService.warn(`Could not find ServerInfo for connection ${connectionProfile.id} when updating icon`);
return;
}
const profile: interfaces.IConnectionProfile = connectionProfile.toIConnectionProfile();
iconProvider.getConnectionIconId(profile, serverInfo).then(iconId => { iconProvider.getConnectionIconId(profile, serverInfo).then(iconId => {
if (iconId && this._mementoObj && this._mementoContext) { if (iconId && this._mementoObj && this._mementoContext) {
if (!this._mementoObj.CONNECTION_ICON_ID) { if (!this._mementoObj.CONNECTION_ICON_ID) {
@@ -1376,10 +1380,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
if (!profile) { if (!profile) {
return undefined; return undefined;
} }
return profile.serverInfo;
let serverInfo = profile.serverInfo;
return serverInfo;
} }
public getConnectionProfileById(profileId: string): interfaces.IConnectionProfile { public getConnectionProfileById(profileId: string): interfaces.IConnectionProfile {