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

fix azure account corenes case handling (#10428)

Browse Source
This commit is contained in:
Arvind Ranasaria
2020-05-15 08:47:09 -07:00
committed by GitHub
parent 9680b1e2cf
commit 19fab3fc9c
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/resource-deployment/src/ui/modelViewUtils.ts
View File

@@ -701,16 +701,20 @@ function handleSelectedAccountChanged(
subscriptionValueToSubscriptionMap.clear(); subscriptionValueToSubscriptionMap.clear();
subscriptionDropdown.values = []; subscriptionDropdown.values = [];
handleSelectedSubscriptionChanged(context, selectedAccount, undefined, resourceGroupDropdown); handleSelectedSubscriptionChanged(context, selectedAccount, undefined, resourceGroupDropdown);
if (!selectedAccount) {
subscriptionDropdown.values = [''];
if (locationDropdown) {
locationDropdown.values = [''];
}
return;
}
if (locationDropdown) { if (locationDropdown) {
if (selectedAccount) { if (locationDropdown.values && locationDropdown.values.length === 0) {
if (locationDropdown.values && locationDropdown.values.length === 0) { locationDropdown.values = context.fieldInfo.locations;
locationDropdown.values = context.fieldInfo.locations;
}
} else {
locationDropdown.values = [];
return;
} }
} }
vscode.commands.executeCommand<azurecore.GetSubscriptionsResult>('azure.accounts.getSubscriptions', selectedAccount, true /*ignoreErrors*/).then(response => { vscode.commands.executeCommand<azurecore.GetSubscriptionsResult>('azure.accounts.getSubscriptions', selectedAccount, true /*ignoreErrors*/).then(response => {
if (!response) { if (!response) {
return; return;
@@ -765,7 +769,7 @@ function createAzureResourceGroupsDropdown(
} }
function handleSelectedSubscriptionChanged(context: AzureAccountFieldContext, selectedAccount: azdata.Account | undefined, selectedSubscription: azureResource.AzureResourceSubscription | undefined, resourceGroupDropdown: azdata.DropDownComponent): void { function handleSelectedSubscriptionChanged(context: AzureAccountFieldContext, selectedAccount: azdata.Account | undefined, selectedSubscription: azureResource.AzureResourceSubscription | undefined, resourceGroupDropdown: azdata.DropDownComponent): void {
resourceGroupDropdown.values = []; resourceGroupDropdown.values = [''];
if (!selectedAccount || !selectedSubscription) { if (!selectedAccount || !selectedSubscription) {
// Don't need to execute command if we don't have both an account and subscription selected // Don't need to execute command if we don't have both an account and subscription selected
return; return;
@@ -781,7 +785,9 @@ function handleSelectedSubscriptionChanged(context: AzureAccountFieldContext, se
level: azdata.window.MessageLevel.Warning level: azdata.window.MessageLevel.Warning
}; };
} }
resourceGroupDropdown.values = response.resourceGroups.map(resourceGroup => resourceGroup.name).sort((a: string, b: string) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase())); resourceGroupDropdown.values = (response.resourceGroups.length !== 0)
? response.resourceGroups.map(resourceGroup => resourceGroup.name).sort((a: string, b: string) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase()))
: [''];
}, err => { vscode.window.showErrorMessage(localize('azure.accounts.unexpectedResourceGroupsError', "Unexpected error fetching resource groups for subscription {0} ({1}): {2}", selectedSubscription?.name, selectedSubscription?.id, err.message)); }); }, err => { vscode.window.showErrorMessage(localize('azure.accounts.unexpectedResourceGroupsError', "Unexpected error fetching resource groups for subscription {0} ({1}): {2}", selectedSubscription?.name, selectedSubscription?.id, err.message)); });
} }