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

Dev/brih/bugs/merge rtm hotfix changes (#16792)

Browse Source 
* improves migration context loading error handling

* remove secrets and encode uris
This commit is contained in:
brian-harris
2021-08-16 16:24:41 -07:00
committed by GitHub
parent a92ba424ac
commit c12cdffe9b
5 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/sql-migration/src/dialog/migrationCutover/migrationCutoverDialogModel.ts
View File

@@ -18,27 +18,25 @@ export class MigrationCutoverDialogModel {
public async fetchStatus(): Promise<void> {
if (this._migration.asyncUrl) {
this.migrationOpStatus = (await getMigrationAsyncOperationDetails(
this.migrationOpStatus = await getMigrationAsyncOperationDetails(
this._migration.azureAccount,
this._migration.subscription,
this._migration.asyncUrl,
this._migration.sessionId!
));
this._migration.sessionId!);
}
this.migrationStatus = (await getMigrationStatus(
this.migrationStatus = await getMigrationStatus(
this._migration.azureAccount,
this._migration.subscription,
this._migration.migrationContext,
this._migration.sessionId!,
this._migration.asyncUrl
));
this._migration.sessionId!);
sendSqlMigrationActionEvent(
TelemetryViews.MigrationCutoverDialog,
TelemetryAction.MigrationStatus,
{
'sessionId': this._migration.sessionId!,
'migrationStatus': this.migrationStatus.properties.migrationStatus
'migrationStatus': this.migrationStatus.properties?.migrationStatus
},
{}
);

2
extensions/sql-migration/src/dialog/migrationStatus/migrationStatusDialog.ts
View File

@@ -316,7 +316,7 @@ export class MigrationStatusDialog {
this._searchBox.value!);
migrations.sort((m1, m2) => {
return new Date(m1.migrationContext.properties.startedOn) > new Date(m2.migrationContext.properties.startedOn) ? -1 : 1;
return new Date(m1.migrationContext.properties?.startedOn) > new Date(m2.migrationContext.properties?.startedOn) ? -1 : 1;
});
const data: azdata.DeclarativeTableCellValue[][] = migrations.map((migration, index) => {