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

only show confirmation message for apply all changes, not for view changes in schema compare (#18520)

Browse Source
This commit is contained in:
Kim Santiago
2022-02-22 13:33:24 -08:00
committed by GitHub
parent 5547c2baba
commit 7b92c9eb65
2 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -1382,6 +1382,8 @@ export class ProjectsController {
if (model.action === UpdateProjectAction.Compare) { if (model.action === UpdateProjectAction.Compare) {
await vscode.commands.executeCommand(constants.schemaCompareRunComparisonCommand, model.sourceEndpointInfo, model.targetEndpointInfo, true, undefined); await vscode.commands.executeCommand(constants.schemaCompareRunComparisonCommand, model.sourceEndpointInfo, model.targetEndpointInfo, true, undefined);
} else if (model.action === UpdateProjectAction.Update) { } else if (model.action === UpdateProjectAction.Update) {
await vscode.window.showWarningMessage(constants.applyConfirmation, { modal: true }, constants.yesString).then(async (result) => {
if (result === constants.yesString) {
await vscode.window.withProgress( await vscode.window.withProgress(
{ {
location: vscode.ProgressLocation.Notification, location: vscode.ProgressLocation.Notification,
@@ -1393,6 +1395,8 @@ export class ProjectsController {
void vscode.commands.executeCommand(constants.refreshDataWorkspaceCommand); void vscode.commands.executeCommand(constants.refreshDataWorkspaceCommand);
utils.getDataWorkspaceExtensionApi().showProjectsView(); utils.getDataWorkspaceExtensionApi().showProjectsView();
}
});
} else { } else {
throw new Error(`Unknown UpdateProjectAction: ${model.action}`); throw new Error(`Unknown UpdateProjectAction: ${model.action}`);
} }

6
extensions/sql-database-projects/src/dialogs/updateProjectFromDatabaseDialog.ts
View File

@@ -497,8 +497,6 @@ export class UpdateProjectFromDatabaseDialog {
} }
public async handleUpdateButtonClick(): Promise<void> { public async handleUpdateButtonClick(): Promise<void> {
await vscode.window.showWarningMessage(constants.applyConfirmation, { modal: true }, constants.yesString).then(async (result) => {
if (result === constants.yesString) {
const serverDropdownValue = this.serverDropdown!.value! as azdata.CategoryValue as ConnectionDropdownValue; const serverDropdownValue = this.serverDropdown!.value! as azdata.CategoryValue as ConnectionDropdownValue;
const ownerUri = await getAzdataApi()!.connection.getUriForConnection(serverDropdownValue.connection.connectionId); const ownerUri = await getAzdataApi()!.connection.getUriForConnection(serverDropdownValue.connection.connectionId);
@@ -560,11 +558,9 @@ export class UpdateProjectFromDatabaseDialog {
targetEndpointInfo: targetEndpointInfo, targetEndpointInfo: targetEndpointInfo,
action: this.action! action: this.action!
}; };
void this.updateProjectFromDatabaseCallback!(model);
}
void this.updateProjectFromDatabaseCallback!(model);
this.dispose(); this.dispose();
});
} }
async validate(): Promise<boolean> { async validate(): Promise<boolean> {