ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5809: Data-tier wizard "Source Server" shouldn't show database name (#6125)

Browse Source 
* Removing database name from server connection and adding required asterisk to database dropdowns

* also remove database name in flat file import wizard
This commit is contained in:
Kim Santiago
2019-06-24 11:44:26 -07:00
committed by GitHub
parent 4fe81d8449
commit cf85bb14f5
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/dacpac/src/wizard/api/basePage.ts
View File

@@ -67,19 +67,14 @@ export abstract class BasePage {
} }
} }
let db = c.options.databaseDisplayName;
let usr = c.options.user; let usr = c.options.user;
let srv = c.options.server; let srv = c.options.server;
if (!db) {
db = localize('basePage.defaultDb', '<default>');
}
if (!usr) { if (!usr) {
usr = localize('basePage.defaultUser', 'default'); usr = localize('basePage.defaultUser', 'default');
} }
let finalName = `${srv}, ${db} (${usr})`; let finalName = `${srv} (${usr})`;
return { return {
connection: c, connection: c,
displayName: finalName, displayName: finalName,

8
extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
View File

@@ -96,9 +96,7 @@ export abstract class DacFxConfigPage extends BasePage {
} }
protected async createDatabaseDropdown(): Promise<azdata.FormComponent> { protected async createDatabaseDropdown(): Promise<azdata.FormComponent> {
this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ this.databaseDropdown = this.view.modelBuilder.dropDown().component();
required: true
}).component();
// Handle database changes // Handle database changes
this.databaseDropdown.onValueChanged(async () => { this.databaseDropdown.onValueChanged(async () => {
@@ -107,7 +105,9 @@ export abstract class DacFxConfigPage extends BasePage {
this.model.filePath = this.fileTextBox.value; this.model.filePath = this.fileTextBox.value;
}); });
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component(); this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({
required: true
}).component();
return { return {
component: this.databaseLoader, component: this.databaseLoader,

11
extensions/dacpac/src/wizard/pages/deployConfigPage.ts
View File

@@ -157,14 +157,17 @@ export class DeployConfigPage extends DacFxConfigPage {
} }
protected async createDeployDatabaseDropdown(): Promise<azdata.FormComponent> { protected async createDeployDatabaseDropdown(): Promise<azdata.FormComponent> {
this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ this.databaseDropdown = this.view.modelBuilder.dropDown().component();
required: true
}).component();
//Handle database changes //Handle database changes
this.databaseDropdown.onValueChanged(async () => { this.databaseDropdown.onValueChanged(async () => {
this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name; this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name;
}); });
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component();
this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).withProperties({
required: true
}).component();
return { return {
component: this.databaseLoader, component: this.databaseLoader,
title: localize('dacFx.targetDatabaseDropdownTitle', 'Database Name') title: localize('dacFx.targetDatabaseDropdownTitle', 'Database Name')

7
extensions/import/src/wizard/api/basePage.ts
View File

@@ -64,19 +64,14 @@ export abstract class BasePage {
} }
} }
let db = c.options.databaseDisplayName;
let usr = c.options.user; let usr = c.options.user;
let srv = c.options.server; let srv = c.options.server;
if (!db) {
db = '<default>';
}
if (!usr) { if (!usr) {
usr = 'default'; usr = 'default';
} }
let finalName = `${srv}, ${db} (${usr})`; let finalName = `${srv} (${usr})`;
return { return {
connection: c, connection: c,
displayName: finalName, displayName: finalName,