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

Dev/brih/feature/public preview sql db (#20644)

Browse Source 
* sql db preview updates

* update readme release notes
This commit is contained in:
brian-harris
2022-09-26 12:50:04 -07:00
committed by GitHub
parent 11fbf5f147
commit d2fbda362c
6 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/sql-migration/src/wizard/databaseBackupPage.ts
View File

@@ -76,7 +76,7 @@ export class DatabaseBackupPage extends MigrationWizardPage {
private _migrationTableSection!: azdata.FlexContainer;
constructor(wizard: azdata.window.Wizard, migrationStateModel: MigrationStateModel) {
super(wizard, azdata.window.createWizardPage(constants.DATABASE_BACKUP_PAGE_TITLE), migrationStateModel);
super(wizard, azdata.window.createWizardPage(constants.DATA_SOURCE_CONFIGURATION_PAGE_TITLE), migrationStateModel);
}
protected async registerContent(view: azdata.ModelView): Promise<void> {
@@ -1021,6 +1021,7 @@ export class DatabaseBackupPage extends MigrationWizardPage {
return true;
}
this.wizard.message = { text: '' };
const errors: string[] = [];
switch (this.migrationStateModel._databaseBackup.networkContainerType) {
case NetworkContainerType.NETWORK_SHARE:
@@ -1458,6 +1459,7 @@ export class DatabaseBackupPage extends MigrationWizardPage {
private async _loadTableData(): Promise<void> {
this._refreshLoading.loading = true;
this.wizard.message = { text: '' };
const data: any[][] = [];
this.migrationStateModel._sourceTargetMapping.forEach((targetDatabaseInfo, sourceDatabaseName) => {

2
extensions/sql-migration/src/wizard/summaryPage.ts
View File

@@ -127,7 +127,7 @@ export class SummaryPage extends MigrationWizardPage {
this._flexContainer.addItems([
await createHeadingTextComponent(
this._view,
constants.DATABASE_BACKUP_PAGE_TITLE),
constants.DATA_SOURCE_CONFIGURATION_PAGE_TITLE),
await this.createNetworkContainerRows()]);
}

34
extensions/sql-migration/src/wizard/targetSelectionPage.ts
View File

@@ -117,11 +117,6 @@ export class TargetSelectionPage extends MigrationWizardPage {
await this.populateLocationDropdown();
}
if (this.migrationStateModel._didUpdateDatabasesForMigration) {
this._initializeSourceTargetDatabaseMap();
this._updateConnectionButtonState();
}
this.wizard.registerNavigationValidator((pageChangeInfo) => {
this.wizard.message = { text: '' };
if (pageChangeInfo.newPage < pageChangeInfo.lastPage) {
@@ -402,11 +397,10 @@ export class TargetSelectionPage extends MigrationWizardPage {
this._disposables.push(
this._targetUserNameInputBox.onTextChanged(
(value: string) => this.migrationStateModel._targetUserName = value ?? ''));
this._disposables.push(
this._targetUserNameInputBox.onValidityChanged(
valid => this._updateConnectionButtonState()));
async (value: string) => {
this.migrationStateModel._targetUserName = value ?? '';
await this._resetTargetMapping();
}));
// target password
const targetPasswordLabel = this._view.modelBuilder.text()
@@ -426,11 +420,10 @@ export class TargetSelectionPage extends MigrationWizardPage {
}).component();
this._disposables.push(
this._targetPasswordInputBox.onTextChanged(
(value: string) => { this.migrationStateModel._targetPassword = value ?? ''; }));
this._disposables.push(
this._targetPasswordInputBox.onValidityChanged(
valid => this._updateConnectionButtonState()));
async (value: string) => {
this.migrationStateModel._targetPassword = value ?? '';
await this._resetTargetMapping();
}));
// test connection button
this._testConectionButton = this._view.modelBuilder.button()
@@ -540,6 +533,13 @@ export class TargetSelectionPage extends MigrationWizardPage {
.component();
}
private async _resetTargetMapping(): Promise<void> {
this._initializeSourceTargetDatabaseMap();
this._updateConnectionButtonState();
await this._azureResourceTable.setDataValues([]);
await utils.updateControlDisplay(this._connectionResultsInfoBox, false);
}
private async _showConnectionResults(
databases: TargetDatabaseInfo[],
errorMessage?: string): Promise<void> {
@@ -671,10 +671,8 @@ export class TargetSelectionPage extends MigrationWizardPage {
this.migrationStateModel._sqlMigrationServices = undefined!;
if (isSqlDbTarget) {
await this._azureResourceTable.setDataValues([]);
await this._resetTargetMapping();
this._targetPasswordInputBox.value = '';
this._initializeSourceTargetDatabaseMap();
this._updateConnectionButtonState();
}
}));