Fixes for Save & Close (#17341)

* wip

* wip

* fixes

* cleanup

* cleanup
This commit is contained in:
Christopher Suh
2021-10-12 10:08:36 -07:00
committed by GitHub
parent c15b50282a
commit 95db579902
5 changed files with 151 additions and 25 deletions

View File

@@ -115,12 +115,18 @@ export interface SavedInfo {
selectedDatabases: azdata.DeclarativeTableCellValue[][];
migrationTargetType: MigrationTargetType | null;
migrationDatabases: azdata.DeclarativeTableCellValue[][];
databaseList: string[];
subscription: azureResource.AzureResourceSubscription | null;
location: azureResource.AzureLocation | null;
resourceGroup: azureResource.AzureResourceResourceGroup | null;
targetServerInstance: azureResource.AzureSqlManagedInstance | SqlVMServer | null;
migrationMode: MigrationMode | null;
databaseAssessment: string[] | null;
networkContainerType: NetworkContainerType | null;
networkShare: NetworkShare | null;
targetSubscription: azureResource.AzureResourceSubscription | null;
blobs: Blob[];
targetDatabaseNames: string[];
}
@@ -1019,12 +1025,18 @@ export class MigrationStateModel implements Model, vscode.Disposable {
selectedDatabases: [],
migrationTargetType: null,
migrationDatabases: [],
databaseList: [],
subscription: null,
location: null,
resourceGroup: null,
targetServerInstance: null,
migrationMode: null,
databaseAssessment: null
databaseAssessment: null,
networkContainerType: null,
networkShare: null,
targetSubscription: null,
blobs: [],
targetDatabaseNames: []
};
switch (currentPage) {
case Page.Summary:
@@ -1032,7 +1044,11 @@ export class MigrationStateModel implements Model, vscode.Disposable {
case Page.IntegrationRuntime:
case Page.DatabaseBackup:
saveInfo.networkContainerType = this._databaseBackup.networkContainerType;
saveInfo.networkShare = this._databaseBackup.networkShare;
saveInfo.targetSubscription = this._databaseBackup.subscription;
saveInfo.blobs = this._databaseBackup.blobs;
saveInfo.targetDatabaseNames = this._targetDatabaseNames;
case Page.MigrationMode:
saveInfo.migrationMode = this._databaseBackup.migrationMode;
case Page.SKURecommendation:
@@ -1040,6 +1056,7 @@ export class MigrationStateModel implements Model, vscode.Disposable {
saveInfo.databaseAssessment = this._databaseAssessment;
saveInfo.serverAssessment = this._assessmentResults;
saveInfo.migrationDatabases = this._databaseSelection;
saveInfo.databaseList = this._migrationDbs;
saveInfo.subscription = this._targetSubscription;
saveInfo.location = this._location;
saveInfo.resourceGroup = this._resourceGroup;