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

Fix up data explorer contributed actions on OE nodes (#11685)

Browse Source 
* Fix up data explorer contributed actions on OE nodes

* sql carbon edit

* add Database node
This commit is contained in:
Charles Gagnon
2020-08-11 10:25:38 -07:00
committed by GitHub
parent 86fcd05eff
commit aecb0efbc0
7 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sql/workbench/api/common/extHostObjectExplorer.ts
View File

@@ -7,15 +7,39 @@ import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
import { ExtHostObjectExplorerShape, SqlMainContext, MainThreadObjectExplorerShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
import { TreeViewItemHandleArg, NodeType } from 'sql/workbench/common/views';
export class ExtHostObjectExplorer implements ExtHostObjectExplorerShape {
private _proxy: MainThreadObjectExplorerShape;
constructor(
mainContext: IMainContext
mainContext: IMainContext,
commands: ExtHostCommands
) {
this._proxy = mainContext.getProxy(SqlMainContext.MainThreadObjectExplorer);
function isDataExplorerTreeViewItemHandleArg(arg: any): boolean {
return arg?.$treeItem?.payload;
}
function convertDataExplorerArgument(arg: TreeViewItemHandleArg): any {
return <azdata.ObjectExplorerContext>{
connectionProfile: arg.$treeItem.payload,
isConnectionNode: arg.$treeItem?.type === NodeType.Server || arg.$treeItem?.type === NodeType.Database,
nodeInfo: arg.$treeItem.nodeInfo
};
}
commands.registerArgumentProcessor({
processArgument: arg => {
if (isDataExplorerTreeViewItemHandleArg(arg)) {
return convertDataExplorerArgument(arg);
}
return arg;
}
});
}
public $getNode(connectionId: string, nodePath?: string): Thenable<azdata.objectexplorer.ObjectExplorerNode> {

4
src/sql/workbench/api/common/sqlExtHost.api.impl.ts
View File

@@ -33,6 +33,7 @@ import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransf
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
import { ILogService } from 'vs/platform/log/common/log';
import { IExtensionApiFactory as vsIApiFactory, createApiFactoryAndRegisterActors as vsApiFactory } from 'vs/workbench/api/common/extHost.api.impl';
import { IExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
export interface IAzdataExtensionApiFactory {
(extension: IExtensionDescription): typeof azdata;
@@ -71,13 +72,14 @@ export function createAdsApiFactory(accessor: ServicesAccessor): IAdsExtensionAp
const rpcProtocol = accessor.get(IExtHostRpcService);
const extHostLogService = accessor.get(ILogService);
const logService = accessor.get(ILogService);
const commands = accessor.get(IExtHostCommands);
// Addressable instances
const extHostAccountManagement = rpcProtocol.set(SqlExtHostContext.ExtHostAccountManagement, new ExtHostAccountManagement(rpcProtocol));
const extHostConnectionManagement = rpcProtocol.set(SqlExtHostContext.ExtHostConnectionManagement, new ExtHostConnectionManagement(rpcProtocol));
const extHostCredentialManagement = rpcProtocol.set(SqlExtHostContext.ExtHostCredentialManagement, new ExtHostCredentialManagement(rpcProtocol));
const extHostDataProvider = rpcProtocol.set(SqlExtHostContext.ExtHostDataProtocol, new ExtHostDataProtocol(rpcProtocol, uriTransformer));
const extHostObjectExplorer = rpcProtocol.set(SqlExtHostContext.ExtHostObjectExplorer, new ExtHostObjectExplorer(rpcProtocol));
const extHostObjectExplorer = rpcProtocol.set(SqlExtHostContext.ExtHostObjectExplorer, new ExtHostObjectExplorer(rpcProtocol, commands));
const extHostResourceProvider = rpcProtocol.set(SqlExtHostContext.ExtHostResourceProvider, new ExtHostResourceProvider(rpcProtocol));
const extHostModalDialogs = rpcProtocol.set(SqlExtHostContext.ExtHostModalDialogs, new ExtHostModalDialogs(rpcProtocol));
const extHostTasks = rpcProtocol.set(SqlExtHostContext.ExtHostTasks, new ExtHostTasks(rpcProtocol, extHostLogService));