ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address console warnings with new connection dialog (#22293)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-03-22 12:31:25 -07:00
committed by GitHub
parent 94b3261276
commit a3e77c674c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/services/connection/browser/connectionWidget.ts
View File

@@ -957,7 +957,7 @@ export class ConnectionWidget extends lifecycle.Disposable {
await this.onAzureAccountSelected(); await this.onAzureAccountSelected();
let tenantId = connectionInfo.azureTenantId; let tenantId = connectionInfo.azureTenantId;
if (account && account.properties.tenants && account.properties.tenants.length > 1) { if (account && tenantId && account.properties.tenants && account.properties.tenants.length > 1) {
let tenant = account.properties.tenants.find(tenant => tenant.id === tenantId); let tenant = account.properties.tenants.find(tenant => tenant.id === tenantId);
if (tenant) { if (tenant) {
this._azureTenantDropdown.selectWithOptionName(tenant.displayName); this._azureTenantDropdown.selectWithOptionName(tenant.displayName);
@@ -966,7 +966,9 @@ export class ConnectionWidget extends lifecycle.Disposable {
// This should ideally never ever happen! // This should ideally never ever happen!
this._logService.error(`fillInConnectionInputs : Could not find tenant with ID ${this._azureTenantId} for account ${accountName}`); this._logService.error(`fillInConnectionInputs : Could not find tenant with ID ${this._azureTenantId} for account ${accountName}`);
} }
this.onAzureTenantSelected(this._azureTenantDropdown.values.indexOf(this._azureTenantDropdown.value)); if (this._azureTenantDropdown.value) {
this.onAzureTenantSelected(this._azureTenantDropdown.values.indexOf(this._azureTenantDropdown.value));
}
} }
else if (account && account.properties.tenants && account.properties.tenants.length === 1) { else if (account && account.properties.tenants && account.properties.tenants.length === 1) {
this._azureTenantId = account.properties.tenants[0].id; this._azureTenantId = account.properties.tenants[0].id;