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

Fix console error for new connection dialog (#23612)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-06-30 14:15:20 -07:00
committed by GitHub
parent bc515e8f45
commit dda9c2b9f0
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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