ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Edit Connection Feature added, edit existing connection in connection tree. (#10214)

Browse Source 
* Added Edit Connection Command

* Wip changes for new connection dialog

* Testing

* WIP commit

* added ID check to ensure connection

* wip commit

* model id check implemented

* addfooterbutton now accepts events

* wip commit

* message explaining check

* temporary change

* connectionManagementService restored

* Revert "connectionManagementService restored"

This reverts commit 9704a63184a06a33bee2648ef0a899229d117cc0.

* formatting test

* editConnection promise testing

* edit existing connection command added

* WIP Connection Edit

* disconnect added to editConnection promise

* WIP on editExistingConnection

* changed isEdit to true

* Amir/edit connection (#10112)

* Get edit connection working

* Delete unused code

* check for isEdit as well

* connection tree test added

* WIP connection management tests

* comment out test to find out what's wrong

* fix for one error

* added note about test skipped

* changed signature of saveprofile

* saveprofile fixed

* wrote working test

* added additional test

* changed message

* Fixes made

* fix for matcher

Co-authored-by: Amir Omidi <amomidi@microsoft.com>
This commit is contained in:
Alex Ma
2020-05-05 13:21:05 -07:00
committed by GitHub
parent 5fe72d318b
commit 921e546fd7
12 changed files with 234 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sql/workbench/services/connection/browser/connectionDialogService.ts
View File

@@ -89,7 +89,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
@IConfigurationService private _configurationService: IConfigurationService,
@IClipboardService private _clipboardService: IClipboardService,
@ICommandService private _commandService: ICommandService,
@ILogService private _logService: ILogService
@ILogService private _logService: ILogService,
) {
this.initializeConnectionProviders();
}
@@ -355,6 +355,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}
private updateModelServerCapabilities(model: IConnectionProfile) {
if (this._model) {
this._model.dispose();
}
@@ -410,32 +411,32 @@ export class ConnectionDialogService implements IConnectionDialogService {
return this._dialogDeferredPromise.promise;
}
public showDialog(
public async showDialog(
connectionManagementService: IConnectionManagementService,
params?: INewConnectionParams,
model?: IConnectionProfile,
connectionResult?: IConnectionResult,
connectionOptions?: IConnectionCompletionOptions): Promise<void> {
connectionOptions?: IConnectionCompletionOptions,
): Promise<void> {
this._connectionManagementService = connectionManagementService;
this._options = connectionOptions;
this._params = params;
this._inputModel = model;
return new Promise<void>((resolve, reject) => {
this.updateModelServerCapabilities(model);
// If connecting from a query editor set "save connection" to false
if (params && (params.input && params.connectionType === ConnectionType.editor ||
params.connectionType === ConnectionType.temporary)) {
this._model.saveProfile = false;
}
resolve(this.showDialogWithModel().then(() => {
if (connectionResult && connectionResult.errorMessage) {
this.showErrorDialog(Severity.Error, this._connectionErrorTitle, connectionResult.errorMessage, connectionResult.callStack);
}
}));
});
this.updateModelServerCapabilities(model);
// If connecting from a query editor set "save connection" to false
if (params && (params.input && params.connectionType === ConnectionType.editor ||
params.connectionType === ConnectionType.temporary)) {
this._model.saveProfile = false;
}
await this.showDialogWithModel();
if (connectionResult && connectionResult.errorMessage) {
this.showErrorDialog(Severity.Error, this._connectionErrorTitle, connectionResult.errorMessage, connectionResult.callStack);
}
}
private async doShowDialog(params: INewConnectionParams): Promise<void> {

46
src/sql/workbench/services/connection/browser/connectionManagementService.ts
View File

@@ -225,6 +225,26 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
/**
* Opens the edit connection dialog
* @param model the existing connection profile to edit on.
*/
public async showEditConnectionDialog(model: interfaces.IConnectionProfile): Promise<void> {
if (!model) {
throw new Error('Connection Profile is undefined');
}
let params = {
connectionType: ConnectionType.default,
isEditConnection: true
};
try {
return await this._connectionDialogService.showDialog(this, params, model);
} catch (dialogError) {
this._logService.warn('failed to open the connection dialog. error: ' + dialogError);
}
}
/**
* Load the password for the profile
* @param connectionProfile Connection Profile
@@ -420,6 +440,8 @@ export class ConnectionManagementService extends Disposable implements IConnecti
connection.options['groupId'] = connection.groupId;
connection.options['databaseDisplayName'] = connection.databaseName;
let isEdit = options?.params?.isEditConnection ?? false;
if (!uri) {
uri = Utils.generateUri(connection);
}
@@ -449,6 +471,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
if (!tokenFillSuccess) {
throw new Error(nls.localize('connection.noAzureAccount', "Failed to get Azure account token for connection"));
}
return this.createNewConnection(uri, connection).then(async connectionResult => {
if (connectionResult && connectionResult.connected) {
// The connected succeeded so add it to our active connections now, optionally adding it to the MRU based on
@@ -459,8 +482,15 @@ export class ConnectionManagementService extends Disposable implements IConnecti
if (callbacks.onConnectSuccess) {
callbacks.onConnectSuccess(options.params, connectionResult.connectionProfile);
}
if (options.saveTheConnection) {
await this.saveToSettings(uri, connection).then(value => {
if (options.saveTheConnection || isEdit) {
let matcher: interfaces.ProfileMatcher;
if (isEdit) {
matcher = (a: interfaces.IConnectionProfile, b: interfaces.IConnectionProfile) => {
return a.id === b.id;
};
}
await this.saveToSettings(uri, connection, matcher).then(value => {
this._onAddConnectionProfile.fire(connection);
this.doActionsAfterConnectionComplete(value, options);
});
@@ -496,6 +526,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
private handleConnectionError(connection: interfaces.IConnectionProfile, uri: string, options: IConnectionCompletionOptions, callbacks: IConnectionCallbacks, connectionResult: IConnectionResult) {
let connectionNotAcceptedError = nls.localize('connectionNotAcceptedError', "Connection Not Accepted");
if (options.showFirewallRuleOnError && connectionResult.errorCode) {
@@ -529,7 +560,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
private doActionsAfterConnectionComplete(uri: string, options: IConnectionCompletionOptions,) {
private doActionsAfterConnectionComplete(uri: string, options: IConnectionCompletionOptions): void {
let connectionManagementInfo = this._connectionStatusManager.findConnection(uri);
if (options.showDashboard) {
this.showDashboardForConnectionManagementInfo(connectionManagementInfo.connectionProfile);
@@ -873,11 +904,10 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
private saveToSettings(id: string, connection: interfaces.IConnectionProfile): Promise<string> {
return this._connectionStore.saveProfile(connection).then(savedProfile => {
let newId = this._connectionStatusManager.updateConnectionProfile(savedProfile, id);
return newId;
});
private async saveToSettings(id: string, connection: interfaces.IConnectionProfile, matcher?: interfaces.ProfileMatcher): Promise<string> {
const savedProfile = await this._connectionStore.saveProfile(connection, undefined, matcher);
return this._connectionStatusManager.updateConnectionProfile(savedProfile, id);
}
/**