From 3b20e8a61c14489be0714438ac0d485abe663031 Mon Sep 17 00:00:00 2001 From: Leila Lali Date: Mon, 23 Nov 2020 13:03:50 -0800 Subject: [PATCH] Fixed an issue when azure account is expired or not valid (#13483) --- extensions/machine-learning/src/common/constants.ts | 2 +- .../src/views/models/azureModelsComponent.ts | 2 +- .../src/views/models/azureResourceFilterComponent.ts | 4 ++++ .../machine-learning/src/views/models/modelBrowsePage.ts | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/extensions/machine-learning/src/common/constants.ts b/extensions/machine-learning/src/common/constants.ts index 39fb9dce66..4e60780307 100644 --- a/extensions/machine-learning/src/common/constants.ts +++ b/extensions/machine-learning/src/common/constants.ts @@ -173,7 +173,7 @@ export const modelFrameworkVersion = localize('models.frameworkVersion', "Framew export const modelVersion = localize('models.version', "Version"); export const browseModels = localize('models.browseButton', "..."); export const azureAccount = localize('models.azureAccount', "Azure account"); -export const azureSignIn = localize('models.azureSignIn', "Sign in to Azure"); +export const azureSignIn = localize('models.azureSignIn', "Azure sign in or refresh account"); export const columnDatabase = localize('predict.columnDatabase', "Source database"); export const columnDatabaseInfo = localize('predict.columnDatabaseInfo', "Select the database containing the dataset to apply the prediction."); export const columnTable = localize('predict.columnTable', "Source table"); diff --git a/extensions/machine-learning/src/views/models/azureModelsComponent.ts b/extensions/machine-learning/src/views/models/azureModelsComponent.ts index 2055fc260f..7a715125df 100644 --- a/extensions/machine-learning/src/views/models/azureModelsComponent.ts +++ b/extensions/machine-learning/src/views/models/azureModelsComponent.ts @@ -93,7 +93,7 @@ export class AzureModelsComponent extends ModelViewBase implements IDataComponen public addComponents(formBuilder: azdata.FormBuilder) { this.removeComponents(formBuilder); - if (this.azureFilterComponent?.data?.account) { + if (this.azureFilterComponent?.accountIsValid) { this.addAzureComponents(formBuilder); } else { this.addAzureSignInComponents(formBuilder); diff --git a/extensions/machine-learning/src/views/models/azureResourceFilterComponent.ts b/extensions/machine-learning/src/views/models/azureResourceFilterComponent.ts index 93f72f471d..ea1896facf 100644 --- a/extensions/machine-learning/src/views/models/azureResourceFilterComponent.ts +++ b/extensions/machine-learning/src/views/models/azureResourceFilterComponent.ts @@ -136,6 +136,10 @@ export class AzureResourceFilterComponent extends ModelViewBase implements IData await this.onAccountSelected(); } + public get accountIsValid(): boolean { + return this._azureAccounts !== undefined && this._azureAccounts.length > 0 && this._azureSubscriptions !== undefined && this._azureSubscriptions.length > 0; + } + /** * refreshes the view */ diff --git a/extensions/machine-learning/src/views/models/modelBrowsePage.ts b/extensions/machine-learning/src/views/models/modelBrowsePage.ts index a8cfb45a3a..a97113da6f 100644 --- a/extensions/machine-learning/src/views/models/modelBrowsePage.ts +++ b/extensions/machine-learning/src/views/models/modelBrowsePage.ts @@ -80,24 +80,24 @@ export class ModelBrowsePage extends ModelViewBase implements IPageView, IDataCo if (this.localModelsComponent && this.azureModelsComponent && this.registeredModelsComponent) { this.azureModelsComponent.removeComponents(this._formBuilder); this.registeredModelsComponent.removeComponents(this._formBuilder); - this.localModelsComponent.addComponents(this._formBuilder); await this.localModelsComponent.refresh(); + this.localModelsComponent.addComponents(this._formBuilder); } } else if (this.modelSourceType === ModelSourceType.Azure) { if (this.localModelsComponent && this.azureModelsComponent && this.registeredModelsComponent) { this.localModelsComponent.removeComponents(this._formBuilder); + await this.azureModelsComponent.refresh(); this.azureModelsComponent.addComponents(this._formBuilder); this.registeredModelsComponent.removeComponents(this._formBuilder); - await this.azureModelsComponent.refresh(); } } else if (this.modelSourceType === ModelSourceType.RegisteredModels) { if (this.localModelsComponent && this.azureModelsComponent && this.registeredModelsComponent) { this.localModelsComponent.removeComponents(this._formBuilder); this.azureModelsComponent.removeComponents(this._formBuilder); - this.registeredModelsComponent.addComponents(this._formBuilder); await this.registeredModelsComponent.refresh(); + this.registeredModelsComponent.addComponents(this._formBuilder); } } }