From 23034cd1bd9c83364327163b820a5473bc118b76 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Tue, 19 Jul 2022 15:42:34 -0700 Subject: [PATCH] Fix restore dialog null references (#20096) * Fix restore dialog null references * Make database field optional like other properties in viewmodel class --- src/sql/workbench/services/restore/browser/restoreDialog.ts | 4 ++-- .../workbench/services/restore/browser/restoreViewModel.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sql/workbench/services/restore/browser/restoreDialog.ts b/src/sql/workbench/services/restore/browser/restoreDialog.ts index 467e9251d0..771def7a20 100644 --- a/src/sql/workbench/services/restore/browser/restoreDialog.ts +++ b/src/sql/workbench/services/restore/browser/restoreDialog.ts @@ -287,7 +287,7 @@ export class RestoreDialog extends Modal { ariaLabel: LocalizedStrings.TARGETDATABASE, placeholder: localize('targetDatabaseTooltip', "Please enter target database name"), validationOptions: { - validation: (value: string) => this.viewModel.databases.includes(value) ? ({ type: MessageType.ERROR, content: localize('restoreDialog.targetDatabaseAlreadyExists', "Target database already exists") }) : null + validation: (value: string) => this.viewModel.databases?.includes(value) ? ({ type: MessageType.ERROR, content: localize('restoreDialog.targetDatabaseAlreadyExists', "Target database already exists") }) : null }, })); @@ -666,7 +666,7 @@ export class RestoreDialog extends Modal { this._register(attachTableStyler(this._restorePlanTable!, this._themeService)); this._register(this._targetDatabaseInputBox.onDidChange(dbName => { - if (!this.viewModel.databases.includes(dbName)) { + if (!this.viewModel.databases?.includes(dbName)) { if (this.viewModel.targetDatabaseName !== dbName) { this.viewModel.targetDatabaseName = dbName; this.validateRestore(); diff --git a/src/sql/workbench/services/restore/browser/restoreViewModel.ts b/src/sql/workbench/services/restore/browser/restoreViewModel.ts index e705b93da5..fac34a74a1 100644 --- a/src/sql/workbench/services/restore/browser/restoreViewModel.ts +++ b/src/sql/workbench/services/restore/browser/restoreViewModel.ts @@ -48,7 +48,7 @@ export class RestoreViewModel { public selectedBackupSets?: string[]; public defaultBackupFolder?: string; public deviceType?: MediaDeviceType; - public databases: string[]; + public databases?: string[]; private _onSetLastBackupTaken = new Emitter(); public onSetLastBackupTaken: Event = this._onSetLastBackupTaken.event;