mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
load name and options from publish profile for vscode publish quickpick (#18044)
* load name and options from publihs profile for vscode publish quickpick * fix when a publish profile doesn't have the target db name * update condition * simplify
This commit is contained in:
@@ -109,13 +109,17 @@ export async function getPublishDatabaseSettings(project: Project, promptForConn
|
|||||||
// Add Create New at the top now so it'll show second to top below the suggested name of the current project
|
// 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 });
|
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
|
// if a publish profile was loaded and had a database name, use that instead of the project file name
|
||||||
const projectNameIndex = dbs.findIndex(db => db === project.projectFileName);
|
const dbName = publishProfile?.databaseName || project.projectFileName;
|
||||||
|
|
||||||
|
// Ensure the project name or name specified in the publish profile 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 === dbName);
|
||||||
if (projectNameIndex === -1) {
|
if (projectNameIndex === -1) {
|
||||||
dbQuickpicks.unshift({ label: project.projectFileName, description: constants.newText });
|
dbQuickpicks.unshift({ label: dbName, description: constants.newText });
|
||||||
} else {
|
} else {
|
||||||
dbQuickpicks.splice(projectNameIndex, 1);
|
dbQuickpicks.splice(projectNameIndex, 1);
|
||||||
dbQuickpicks.unshift({ label: project.projectFileName });
|
dbQuickpicks.unshift({ label: dbName });
|
||||||
}
|
}
|
||||||
|
|
||||||
let databaseName: string | undefined = undefined;
|
let databaseName: string | undefined = undefined;
|
||||||
@@ -196,7 +200,7 @@ export async function getPublishDatabaseSettings(project: Project, promptForConn
|
|||||||
serverName: connectionProfile?.server || '',
|
serverName: connectionProfile?.server || '',
|
||||||
connectionUri: connectionUri || '',
|
connectionUri: connectionUri || '',
|
||||||
sqlCmdVariables: sqlCmdVariables,
|
sqlCmdVariables: sqlCmdVariables,
|
||||||
deploymentOptions: await getDefaultPublishDeploymentOptions(project),
|
deploymentOptions: publishProfile?.options ?? await getDefaultPublishDeploymentOptions(project),
|
||||||
profileUsed: !!publishProfile
|
profileUsed: !!publishProfile
|
||||||
};
|
};
|
||||||
return settings;
|
return settings;
|
||||||
|
|||||||
Reference in New Issue
Block a user