ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move create new option for publish to top and filter out system dbs (#16908)

Browse Source 
* Move create new option for publish to top

* Move New tag to description

* fix
This commit is contained in:
Charles Gagnon
2021-08-26 15:52:08 -07:00
committed by GitHub
parent 3dd212c90d
commit 6a0a185cbd
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/sql-database-projects/src/common/constants.ts
View File

@@ -119,9 +119,9 @@ export const chooseAction = localize('chooseAction', "Choose action");
export const chooseSqlcmdVarsToModify = localize('chooseSqlcmdVarsToModify', "Choose SQLCMD variables to modify"); export const chooseSqlcmdVarsToModify = localize('chooseSqlcmdVarsToModify', "Choose SQLCMD variables to modify");
export const enterNewValueForVar = (varName: string) => localize('enterNewValueForVar', "Enter new value for variable '{0}'", varName); export const enterNewValueForVar = (varName: string) => localize('enterNewValueForVar', "Enter new value for variable '{0}'", varName);
export const resetAllVars = localize('resetAllVars', "Reset all variables"); export const resetAllVars = localize('resetAllVars', "Reset all variables");
export const createNew = localize('createNew', "<Create New>"); export const createNew = localize('createNew', "Create New");
export const enterNewDatabaseName = localize('enterNewDatabaseName', "Enter new database name"); export const enterNewDatabaseName = localize('enterNewDatabaseName', "Enter new database name");
export const newDatabaseTitle = (name: string) => localize({ key: 'newDatabaseTitle', comment: ['Name is the name of a new database being created'] }, "{0} (new)", name); export const newText = localize('new', "New");
export const selectDatabase = localize('selectDatabase', "Select database"); export const selectDatabase = localize('selectDatabase', "Select database");
export const done = localize('done', "Done"); export const done = localize('done', "Done");
export const nameMustNotBeEmpty = localize('nameMustNotBeEmpty', "Name must not be empty"); export const nameMustNotBeEmpty = localize('nameMustNotBeEmpty', "Name must not be empty");

20
extensions/sql-database-projects/src/dialogs/publishDatabaseQuickpick.ts
View File

@@ -100,23 +100,25 @@ export async function getPublishDatabaseSettings(project: Project, promptForConn
} }
// 3. Select database // 3. Select database
const dbQuickpicks = dbs.map(db => { const dbQuickpicks = dbs
.filter(db => !constants.systemDbs.includes(db))
.map(db => {
return { return {
label: db, label: db
dbName: db } as vscode.QuickPickItem & { isCreateNew?: boolean };
} as vscode.QuickPickItem & { dbName: string, isCreateNew?: boolean };
}); });
// Add Create New at the top now so it'll show second to top below the suggested name of the current project
dbQuickpicks.unshift({ label: `$(add) ${constants.createNew}`, isCreateNew: true });
// Ensure the project name is an option, either adding it if it doesn't already exist or moving it to the top if it does // Ensure the project name is an option, either adding it if it doesn't already exist or moving it to the top if it does
const projectNameIndex = dbs.findIndex(db => db === project.projectFileName); const projectNameIndex = dbs.findIndex(db => db === project.projectFileName);
if (projectNameIndex === -1) { if (projectNameIndex === -1) {
dbQuickpicks.unshift({ label: constants.newDatabaseTitle(project.projectFileName), dbName: project.projectFileName }); dbQuickpicks.unshift({ label: project.projectFileName, description: constants.newText });
} else { } else {
dbQuickpicks.splice(projectNameIndex, 1); dbQuickpicks.splice(projectNameIndex, 1);
dbQuickpicks.unshift({ label: project.projectFileName, dbName: project.projectFileName }); dbQuickpicks.unshift({ label: project.projectFileName });
} }
dbQuickpicks.push({ label: constants.createNew, dbName: '', isCreateNew: true });
let databaseName: string | undefined = undefined; let databaseName: string | undefined = undefined;
while (!databaseName) { while (!databaseName) {
const selectedDatabase = await vscode.window.showQuickPick( const selectedDatabase = await vscode.window.showQuickPick(
@@ -126,7 +128,7 @@ export async function getPublishDatabaseSettings(project: Project, promptForConn
// User cancelled // User cancelled
return; return;
} }
databaseName = selectedDatabase.dbName; databaseName = selectedDatabase.label;
if (selectedDatabase.isCreateNew) { if (selectedDatabase.isCreateNew) {
databaseName = await vscode.window.showInputBox( databaseName = await vscode.window.showInputBox(
{ {