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

handle unsupported connection provider (#20577)

Browse Source 
* handle unknown connection provider

* fix error
This commit is contained in:
Alan Ren
2022-09-09 14:14:33 -07:00
committed by GitHub
parent b9cb3de85b
commit be8bf7fcdc
10 changed files with 85 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
View File

@@ -43,12 +43,8 @@ import { AsyncServerTree } from 'sql/workbench/services/objectExplorer/browser/a
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ConnectionBrowseTab } from 'sql/workbench/services/connection/browser/connectionBrowseTab';
import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
import { ConnectionProviderAndExtensionMap, ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { VIEWLET_ID as ExtensionsViewletID } from 'vs/workbench/contrib/extensions/common/extensions';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
import { ViewContainerLocation } from 'vs/workbench/common/views';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import { onUnexpectedError } from 'vs/base/common/errors';
export interface OnShowUIResponse {
selectedProviderDisplayName: string;
@@ -129,10 +125,7 @@ export class ConnectionDialogWidget extends Modal {
@ILogService logService: ILogService,
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService,
@IConfigurationService private _configurationService: IConfigurationService,
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
@INotificationService private _notificationService: INotificationService,
@IPaneCompositePartService private _paneCompositeService: IPaneCompositePartService,
@ICommandService private _commandService: ICommandService
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService
) {
super(
localize('connection', "Connection"),
@@ -227,7 +220,7 @@ export class ConnectionDialogWidget extends Modal {
this._register(this.browsePanel.view.onSelectedConnectionChanged(e => {
this._connectionSource = e.source;
this.onConnectionClick(e.connectionProfile, e.connect);
this.onConnectionClick(e.connectionProfile, e.connect).catch(onUnexpectedError);
}));
this._panel.pushTab(this.browsePanel);
@@ -355,7 +348,7 @@ export class ConnectionDialogWidget extends Modal {
if (element instanceof ConnectionProfile) {
const isDoubleClick = origin === 'mouse' && (eventish as MouseEvent).detail === 2;
this._connectionSource = 'recent';
this.onConnectionClick(element, isDoubleClick);
this.onConnectionClick(element, isDoubleClick).catch(onUnexpectedError);
}
};
const actionProvider = this.instantiationService.createInstance(RecentConnectionActionsProvider);
@@ -377,13 +370,13 @@ export class ConnectionDialogWidget extends Modal {
this._recentConnectionTree.onMouseClick(e => {
if (e.element instanceof ConnectionProfile) {
this._connectionSource = 'recent';
this.onConnectionClick(e.element, false);
this.onConnectionClick(e.element, false).catch(onUnexpectedError);
}
});
this._recentConnectionTree.onMouseDblClick(e => {
if (e.element instanceof ConnectionProfile) {
this._connectionSource = 'recent';
this.onConnectionClick(e.element, true);
this.onConnectionClick(e.element, true).catch(onUnexpectedError);
}
});
}
@@ -399,9 +392,8 @@ export class ConnectionDialogWidget extends Modal {
DOM.append(noRecentConnectionContainer, DOM.$('.no-recent-connections')).innerText = noRecentHistoryLabel;
}
private onConnectionClick(element: IConnectionProfile, connect: boolean = false): void {
const isProviderAvailable = this._capabilitiesService.providers[element.providerName] !== undefined;
if (isProviderAvailable) {
private async onConnectionClick(element: IConnectionProfile, connect: boolean = false): Promise<void> {
if (this._capabilitiesService.providers[element.providerName] !== undefined) {
if (connect) {
this.connect(element);
} else {
@@ -409,27 +401,8 @@ export class ConnectionDialogWidget extends Modal {
}
}
else {
const extensionId = ConnectionProviderAndExtensionMap.get(element.providerName);
if (extensionId) {
this._notificationService.prompt(Severity.Error,
localize('connectionDialog.extensionNotInstalled', "The extension '{0}' is required in order to connect to this resource. Please install it and try again.", extensionId),
[{
label: localize('connectionDialog.viewExtension', "View Extension"),
run: async () => {
this.close();
await this._commandService.executeCommand('extension.open', extensionId);
}
}]);
} else {
this._notificationService.prompt(Severity.Error,
localize('connectionDialog.connectionProviderNotSupported', "The extension that supports provider type '{0}' is not currently installed. Please install it and try again.", element.providerName),
[{
label: localize('connectionDialog.viewExtensions', "View Extensions"),
run: async () => {
this.close();
await this._paneCompositeService.openPaneComposite(ExtensionsViewletID, ViewContainerLocation.Sidebar);
}
}]);
if (await this.connectionManagementService.handleUnsupportedProvider(element.providerName)) {
this.close();
}
}
}

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

@@ -14,7 +14,7 @@ import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'
import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo';
import * as Utils from 'sql/platform/connection/common/utils';
import * as Constants from 'sql/platform/connection/common/constants';
import { ICapabilitiesService, ConnectionProviderProperties, ProviderFeatures } from 'sql/platform/capabilities/common/capabilitiesService';
import { ICapabilitiesService, ConnectionProviderProperties, ProviderFeatures, ConnectionProviderAndExtensionMap } from 'sql/platform/capabilities/common/capabilitiesService';
import * as ConnectionContracts from 'sql/workbench/services/connection/browser/connection';
import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager';
import { DashboardInput } from 'sql/workbench/browser/editor/profiler/dashboardInput';
@@ -51,6 +51,11 @@ import { toErrorMessage } from 'vs/base/common/errorMessage';
import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
import { URI } from 'vs/base/common/uri';
import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
import { ViewContainerLocation } from 'vs/workbench/common/views';
import { VIEWLET_ID as ExtensionsViewletID } from 'vs/workbench/contrib/extensions/common/extensions';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
export class ConnectionManagementService extends Disposable implements IConnectionManagementService {
@@ -94,7 +99,10 @@ export class ConnectionManagementService extends Disposable implements IConnecti
@IAccountManagementService private _accountManagementService: IAccountManagementService,
@ILogService private _logService: ILogService,
@IStorageService private _storageService: IStorageService,
@IExtensionService private readonly extensionService: IExtensionService
@IExtensionService private readonly _extensionService: IExtensionService,
@ICommandService private readonly _commandService: ICommandService,
@IPaneCompositePartService private readonly _paneCompositePartService: IPaneCompositePartService,
@IDialogService private readonly _dialogService: IDialogService
) {
super();
@@ -981,7 +989,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
options: connection.options
});
await this.extensionService.activateByEvent(`onConnect:${connection.providerName}`);
await this._extensionService.activateByEvent(`onConnect:${connection.providerName}`);
return this._providers.get(connection.providerName).onReady.then((provider) => {
provider.connect(uri, connectionInfo);
@@ -1649,4 +1657,22 @@ export class ConnectionManagementService extends Disposable implements IConnecti
}
return connections;
}
async handleUnsupportedProvider(providerName: string): Promise<boolean> {
const extensionId = ConnectionProviderAndExtensionMap.get(providerName);
const message = extensionId ? nls.localize('connection.extensionNotInstalled', "The extension '{0}' is required in order to connect to this resource. Do you want to install it?", extensionId) :
nls.localize('connectionDialog.connectionProviderNotSupported', "The extension that supports provider type '{0}' is not currently installed. Do you want to view the extensions?", providerName);
const result = await this._dialogService.confirm({
message: message,
type: 'question'
});
if (result.confirmed) {
if (extensionId) {
await this._commandService.executeCommand('extension.open', extensionId);
} else {
await this._paneCompositePartService.openPaneComposite(ExtensionsViewletID, ViewContainerLocation.Sidebar);
}
}
return result.confirmed;
}
}