Revert 'Add profile section in Publish project UI (#21906)' (#22047)

This reverts commit cb58286247.

extensions/dacpac/src/test/testDacFxService.ts

@@ -89,8 +89,4 @@ export class DacFxTestService implements mssql.IDacFxService {
 	parseTSqlScript(filePath: string, databaseSchemaProvider: string): Thenable<mssql.ParseTSqlScriptResult> {
 		return Promise.resolve({ containsCreateTableStatement: true });
 	}
-
-	savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>): Thenable<azdata.ResultStatus> {
-		return Promise.resolve(this.dacfxResult);
-	}
 }

extensions/mssql/src/contracts.ts

@@ -551,14 +551,6 @@ export interface ParseTSqlScriptParams {
 	databaseSchemaProvider: string;
 }
 
-export interface SavePublishProfileParams {
-	profilePath: string;
-	databaseName: string;
-	connectionString: string;
-	sqlCommandVariableValues?: Record<string, string>;
-	deploymentOptions?: mssql.DeploymentOptions;
-}
-
 export namespace ExportRequest {
 	export const type = new RequestType<ExportParams, mssql.DacFxResult, void, void>('dacfx/export');
 }
@@ -595,10 +587,6 @@ export namespace ParseTSqlScriptRequest {
 	export const type = new RequestType<ParseTSqlScriptParams, mssql.ParseTSqlScriptResult, void, void>('dacfx/parseTSqlScript');
 }
 
-export namespace SavePublishProfileRequest {
-	export const type = new RequestType<SavePublishProfileParams, azdata.ResultStatus, void, void>('dacfx/savePublishProfile');
-}
-
 // ------------------------------- </ DacFx > ------------------------------------
 
 // ------------------------------- < Sql Projects > ------------------------------------

extensions/mssql/src/dacfx/dacFxService.ts

@@ -141,15 +141,4 @@ export class DacFxService implements mssql.IDacFxService {
 			throw e;
 		}
 	}
-
-	public async savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<azdata.ResultStatus> {
-		const params: contracts.SavePublishProfileParams = { profilePath, databaseName, connectionString, sqlCommandVariableValues, deploymentOptions };
-		try {
-			const result = await this.client.sendRequest(contracts.SavePublishProfileRequest.type, params);
-			return result;
-		} catch (e) {
-			this.client.logFailedRequest(contracts.SavePublishProfileRequest.type, e);
-			throw e;
-		}
-	}
 }

extensions/mssql/src/mssql.d.ts

@@ -242,7 +242,6 @@ declare module 'mssql' {
 		getOptionsFromProfile(profilePath: string): Thenable<DacFxOptionsResult>;
 		validateStreamingJob(packageFilePath: string, createStreamingJobTsql: string): Thenable<ValidateStreamingJobResult>;
 		parseTSqlScript(filePath: string, databaseSchemaProvider: string): Thenable<ParseTSqlScriptResult>;
-		savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>, deploymentOptions?: DeploymentOptions): Thenable<azdata.ResultStatus>;
 	}
 
 	export interface DacFxResult extends azdata.ResultStatus {

extensions/sql-database-projects/src/common/constants.ts

@@ -136,8 +136,6 @@ export const server = localize('server', "Server");
 export const defaultUser = localize('default', "default");
 export const selectProfileToUse = localize('selectProfileToUse', "Select publish profile to load");
 export const selectProfile = localize('selectProfile', "Select Profile");
-export const saveProfileAsButtonText = localize('saveProfileAsButtonText', "Save Profile As...");
-export const save = localize('save', "Save");
 export const dontUseProfile = localize('dontUseProfile', "Don't use profile");
 export const browseForProfileWithIcon = `$(folder) ${localize('browseForProfile', "Browse for profile")}`;
 export const chooseAction = localize('chooseAction', "Choose action");

extensions/sql-database-projects/src/controllers/projectController.ts

@@ -26,7 +26,7 @@ import { ImportDataModel } from '../models/api/import';
 import { NetCoreTool, DotNetError } from '../tools/netcoreTool';
 import { ShellCommandOptions } from '../tools/shellExecutionHelper';
 import { BuildHelper } from '../tools/buildHelper';
-import { readPublishProfile, savePublishProfile } from '../models/publishProfile/publishProfile';
+import { readPublishProfile } from '../models/publishProfile/publishProfile';
 import { AddDatabaseReferenceDialog } from '../dialogs/addDatabaseReferenceDialog';
 import { ISystemDatabaseReferenceSettings, IDacpacReferenceSettings, IProjectReferenceSettings } from '../models/IDatabaseReferenceSettings';
 import { DatabaseReferenceTreeItem } from '../models/tree/databaseReferencesTreeItem';
@@ -411,7 +411,6 @@ export class ProjectsController {
 			publishDatabaseDialog.publishToContainer = async (proj, prof) => this.publishToDockerContainer(proj, prof);
 			publishDatabaseDialog.generateScript = async (proj, prof) => this.publishOrScriptProject(proj, prof, false);
 			publishDatabaseDialog.readPublishProfile = async (profileUri) => readPublishProfile(profileUri);
-			publishDatabaseDialog.savePublishProfile = async (profilePath, databaseName, connectionString, sqlCommandVariableValues, deploymentOptions) => savePublishProfile(profilePath, databaseName, connectionString, sqlCommandVariableValues, deploymentOptions);
 
 			publishDatabaseDialog.openDialog();
 

extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts

@@ -8,7 +8,6 @@ import * as vscode from 'vscode';
 import * as constants from '../common/constants';
 import * as utils from '../common/utils';
 import * as uiUtils from './utils';
-import * as path from 'path';
 
 import { Project } from '../models/project';
 import { SqlConnectionDataSource } from '../models/dataSources/sqlConnectionStringSource';
@@ -63,7 +62,6 @@ export class PublishDatabaseDialog {
 	protected optionsButton: azdataType.ButtonComponent | undefined;
 	private publishOptionsDialog: PublishOptionsDialog | undefined;
 	public publishOptionsModified: boolean = false;
-	private publishProfileUri: vscode.Uri | undefined;
 
 	private completionPromise: Deferred = new Deferred();
 
@@ -73,7 +71,6 @@ export class PublishDatabaseDialog {
 	public publishToContainer: ((proj: Project, profile: IPublishToDockerSettings) => any) | undefined;
 	public generateScript: ((proj: Project, profile: ISqlProjectPublishSettings) => any) | undefined;
 	public readPublishProfile: ((profileUri: vscode.Uri) => any) | undefined;
-	public savePublishProfile: ((profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>, deploymentOptions?: DeploymentOptions) => any) | undefined;
 
 	constructor(private project: Project) {
 		this.dialog = utils.getAzdataApi()!.window.createModelViewDialog(constants.publishDialogName, 'sqlProjectPublishDialog');
@@ -147,14 +144,13 @@ export class PublishDatabaseDialog {
 			const options = await this.getDefaultDeploymentOptions();
 			this.setDeploymentOptions(options);
 
-			const profileRow = this.createProfileSection(view);
+			const profileRow = this.createProfileRow(view);
-
 			this.connectionRow = this.createConnectionRow(view);
 			this.databaseRow = this.createDatabaseRow(view);
 			const displayOptionsButton = this.createOptionsButton(view);
 
 			const horizontalFormSection = view.modelBuilder.flexContainer().withLayout({ flexFlow: 'column' }).component();
-			horizontalFormSection.addItems([this.databaseRow]);
+			horizontalFormSection.addItems([profileRow, this.databaseRow]);
 
 			this.formBuilder = <azdataType.FormBuilder>view.modelBuilder.formContainer()
 				.withFormItems([
@@ -165,10 +161,6 @@ export class PublishDatabaseDialog {
 								component: flexRadioButtonsModel,
 								title: ''
 							},
-							{
-								component: profileRow,
-								title: constants.profile
-							},
 							{
 								component: this.connectionRow,
 								title: ''
@@ -440,20 +432,18 @@ export class PublishDatabaseDialog {
 		this.createDatabaseRow(view);
 		this.tryEnableGenerateScriptAndOkButtons();
 		if (existingServer) {
+			if (this.connectionRow) {
+				this.formBuilder!.insertFormItem({
+					title: '',
+					component: this.connectionRow
+				}, 2);
+			}
 			if (this.localDbSection) {
 				this.formBuilder!.removeFormItem({
 					title: '',
 					component: this.localDbSection
 				});
 			}
-
-			if (this.connectionRow) {
-				this.formBuilder!.insertFormItem({
-					title: '',
-					component: this.connectionRow
-				}, 3);
-			}
-
 		} else {
 			if (this.connectionRow) {
 				this.formBuilder!.removeFormItem({
@@ -461,7 +451,6 @@ export class PublishDatabaseDialog {
 					component: this.connectionRow
 				});
 			}
-
 			if (this.localDbSection) {
 				this.formBuilder!.insertFormItem({
 					title: '',
@@ -535,10 +524,8 @@ export class PublishDatabaseDialog {
 		}
 	}
 
-	private createProfileSection(view: azdataType.ModelView): azdataType.FlexContainer {
+	private createProfileRow(view: azdataType.ModelView): azdataType.FlexContainer {
-		const selectProfileButton = this.createSelectProfileButton(view);
+		const loadProfileButton = this.createLoadProfileButton(view);
-		const saveProfileAsButton = this.createSaveProfileAsButton(view);
-
 		this.loadProfileTextBox = view.modelBuilder.inputBox().withProps({
 			placeHolder: constants.loadProfilePlaceholderText,
 			ariaLabel: constants.profile,
@@ -546,7 +533,13 @@ export class PublishDatabaseDialog {
 			enabled: false
 		}).component();
 
-		const profileRow = view.modelBuilder.flexContainer().withItems([this.loadProfileTextBox, selectProfileButton, saveProfileAsButton], { flex: '0 0 auto', CSSStyles: { 'margin-right': '10px' } }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component();
+		const profileLabel = view.modelBuilder.text().withProps({
+			value: constants.profile,
+			width: cssStyles.publishDialogLabelWidth
+		}).component();
+
+		const profileRow = view.modelBuilder.flexContainer().withItems([profileLabel, this.loadProfileTextBox], { flex: '0 0 auto', CSSStyles: { 'margin-right': '10px' } }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component();
+		profileRow.insertItem(loadProfileButton, 2, { CSSStyles: { 'margin-right': '0px' } });
 
 		return profileRow;
 	}
@@ -849,14 +842,12 @@ export class PublishDatabaseDialog {
 		}
 	}
 
-	private createSelectProfileButton(view: azdataType.ModelView): azdataType.ButtonComponent {
+	private createLoadProfileButton(view: azdataType.ModelView): azdataType.ButtonComponent {
 		let loadProfileButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({
-			label: constants.selectProfile,
+			ariaLabel: constants.loadProfilePlaceholderText,
-			title: constants.selectProfile,
+			iconPath: IconPathHelper.folder_blue,
-			ariaLabel: constants.selectProfile,
+			height: '18px',
-			width: cssStyles.PublishingOptionsButtonWidth,
+			width: '18px'
-			height: '25px',
-			secondary: true,
 		}).component();
 
 		loadProfileButton.onDidClick(async () => {
@@ -904,57 +895,12 @@ export class PublishDatabaseDialog {
 				await this.loadProfileTextBox!.updateProperty('title', fileUris[0].fsPath);
 
 				this.profileUsed = true;
-				this.publishProfileUri = fileUris[0];
-
-				this.tryEnableGenerateScriptAndOkButtons();
 			}
 		});
 
 		return loadProfileButton;
 	}
 
-	private createSaveProfileAsButton(view: azdataType.ModelView): azdataType.ButtonComponent {
-		let saveProfileAsButton: azdataType.ButtonComponent = view.modelBuilder.button().withProps({
-			label: constants.saveProfileAsButtonText,
-			title: constants.saveProfileAsButtonText,
-			ariaLabel: constants.saveProfileAsButtonText,
-			width: cssStyles.PublishingOptionsButtonWidth,
-			height: '25px',
-			secondary: true
-		}).component();
-
-		saveProfileAsButton.onDidClick(async () => {
-			const filePath = await vscode.window.showSaveDialog(
-				{
-					defaultUri: this.publishProfileUri ?? vscode.Uri.file(path.join(this.project.projectFolderPath, `${this.project.projectFileName}_1`)),
-					saveLabel: constants.save,
-					filters: {
-						'Publish Settings Files': ['publish.xml'],
-					}
-				}
-			);
-
-			if (!filePath) {
-				return;
-			}
-
-			if (this.savePublishProfile) {
-				const targetConnectionString = this.connectionId ? await utils.getAzdataApi()!.connection.getConnectionString(this.connectionId, false) : '';
-				const targetDatabaseName = this.targetDatabaseName ?? '';
-				const deploymentOptions = await this.getDeploymentOptions();
-				await this.savePublishProfile(filePath.fsPath, targetDatabaseName, targetConnectionString, this.getSqlCmdVariablesForPublish(), deploymentOptions);
-			}
-
-			this.profileUsed = true;
-			this.publishProfileUri = filePath;
-
-			await this.project.addPublishProfileToProjFile(filePath.fsPath);
-			void vscode.commands.executeCommand(constants.refreshDataWorkspaceCommand);		//refresh data workspace to load the newly added profile to the tree
-		});
-
-		return saveProfileAsButton;
-	}
-
 	private convertSqlCmdVarsToTableFormat(sqlCmdVars: Record<string, string>): azdataType.DeclarativeTableCellValue[][] {
 		let data = [];
 		for (let key in sqlCmdVars) {

extensions/sql-database-projects/src/models/publishProfile/publishProfile.ts

@@ -125,11 +125,3 @@ async function readConnectionString(xmlDoc: any): Promise<{ connectionId: string
 		server: server
 	};
 }
-
-/**
- * saves publish settings to the specified profile file
- */
-export async function savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<void> {
-	const dacFxService = await utils.getDacFxService();
-	await dacFxService.savePublishProfile(profilePath, databaseName, connectionString, sqlCommandVariableValues, deploymentOptions);
-}

extensions/sql-database-projects/src/test/testContext.ts

@@ -22,11 +22,6 @@ export const mockDacFxResult = {
 	report: ''
 };
 
-export const mockSavePublishResult = {
-	success: true,
-	errorMessage: ''
-};
-
 /* Get the deployment options sample model */
 export function getDeploymentOptions(): mssql.DeploymentOptions {
 	const sampleDesc = 'Sample Description text';
@@ -62,7 +57,6 @@ export class MockDacFxService implements mssql.IDacFxService {
 	public getOptionsFromProfile(_: string): Thenable<mssql.DacFxOptionsResult> { return Promise.resolve(mockDacFxOptionsResult); }
 	public validateStreamingJob(_: string, __: string): Thenable<mssql.ValidateStreamingJobResult> { return Promise.resolve(mockDacFxResult); }
 	public parseTSqlScript(_: string, __: string): Thenable<mssql.ParseTSqlScriptResult> { return Promise.resolve({ containsCreateTableStatement: true }); }
-	public savePublishProfile(_: string, __: string, ___: string, ______?: Record<string, string>): Thenable<azdata.ResultStatus> { return Promise.resolve(mockSavePublishResult); }
 }
 
 export function createContext(): TestContext {

extensions/types/vscode-mssql.d.ts

@@ -431,7 +431,6 @@ declare module 'vscode-mssql' {
 		generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: TaskExecutionMode): Thenable<GenerateDeployPlanResult>;
 		getOptionsFromProfile(profilePath: string): Thenable<DacFxOptionsResult>;
 		validateStreamingJob(packageFilePath: string, createStreamingJobTsql: string): Thenable<ValidateStreamingJobResult>;
-		savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Record<string, string>, deploymentOptions?: DeploymentOptions): Thenable<ResultStatus>;
 	}
 
 	/**
@@ -1018,14 +1017,6 @@ declare module 'vscode-mssql' {
 		defaultDeploymentOptions: DeploymentOptions;
 	}
 
-	export interface SavePublishProfileParams {
-		profilePath: string;
-		databaseName: string;
-		connectionString: string;
-		sqlCommandVariableValues?: Record<string, string>;
-		deploymentOptions?: DeploymentOptions;
-	}
-
 	//#region ISqlProjectsService
 
 	//#region Parameters