ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 17:52:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes azure sql expansion (#4185)

Browse Source 
* fixes azure sql expansion

* remove unneeded changes

* remove unused code
This commit is contained in:
Anthony Dresser
2019-02-26 15:29:02 -08:00
committed by GitHub
parent b11a8e9c0c
commit 2e9b5f3a2b
6 changed files with 371 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
View File

@@ -5,20 +5,13 @@
import { Disposable } from 'vs/base/common/lifecycle';
import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
// {{SQL CARBON EDIT}}
import { ITreeViewDataProvider, ITreeItem, IViewsService, ITreeView, ViewsRegistry, ICustomViewDescriptor, IRevealOptions, TreeItemCollapsibleState } from 'vs/workbench/common/views';
import { ITreeViewDataProvider, ITreeItem, IViewsService, ITreeView, ViewsRegistry, ICustomViewDescriptor, IRevealOptions } from 'vs/workbench/common/views';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { distinct } from 'vs/base/common/arrays';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { isUndefinedOrNull, isNumber } from 'vs/base/common/types';
import { IMarkdownString } from 'vs/base/common/htmlContent';
// {{SQL CARBON EDIT}}
import * as sqlops from 'sqlops';
import { Emitter } from 'vs/base/common/event';
import { generateUuid } from 'vs/base/common/uuid';
import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
@extHostNamedCustomer(MainContext.MainThreadTreeViews)
export class MainThreadTreeViews extends Disposable implements MainThreadTreeViewsShape {
@@ -29,8 +22,6 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
extHostContext: IExtHostContext,
@IViewsService private viewsService: IViewsService,
@INotificationService private notificationService: INotificationService,
// {{SQL CARBON EDIT}}
@IObjectExplorerService private objectExplorerService: IObjectExplorerService
) {
super();
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTreeViews);
@@ -39,10 +30,6 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
$registerTreeViewDataProvider(treeViewId: string, options: { showCollapseAll: boolean }): void {
const dataProvider = new TreeViewDataProvider(treeViewId, this._proxy, this.notificationService);
this._dataProviders.set(treeViewId, dataProvider);
// {{SQL CARBON EDIT}}
if (this.checkForDataExplorer(treeViewId)) {
return;
}
const viewer = this.getTreeView(treeViewId);
if (viewer) {
viewer.dataProvider = dataProvider;
@@ -127,25 +114,6 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
return viewDescriptor ? viewDescriptor.treeView : null;
}
// {{SQL CARBON EDIT}}
private checkForDataExplorer(treeViewId: string): boolean {
const viewDescriptor: ICustomViewDescriptor = <ICustomViewDescriptor>ViewsRegistry.getView(treeViewId);
if (viewDescriptor.container.id === 'workbench.view.dataExplorer') {
const dataProvider = new OETreeViewDataProvider(treeViewId, this._proxy);
this.objectExplorerService.registerProvider(treeViewId, dataProvider);
dataProvider.registerOnExpandCompleted(e => this.objectExplorerService.onNodeExpanded({
errorMessage: e.errorMessage,
nodePath: e.nodePath,
nodes: e.nodes,
sessionId: e.sessionId,
providerId: treeViewId
}));
dataProvider.registerOnSessionCreated(e => this.objectExplorerService.onSessionCreated(undefined, e));
viewDescriptor.treeView.refresh();
}
return false;
}
dispose(): void {
this._dataProviders.forEach((dataProvider, treeViewId) => {
const treeView = this.getTreeView(treeViewId);
@@ -239,100 +207,3 @@ export class TreeViewDataProvider implements ITreeViewDataProvider {
}
}
}
// {{SQL CARBON EDIT}}
export class OETreeViewDataProvider implements sqlops.ObjectExplorerProvider {
protected itemsMap: Map<TreeItemHandle, ITreeItem> = new Map<TreeItemHandle, ITreeItem>();
private onExpandComplete = new Emitter<sqlops.ObjectExplorerExpandInfo>();
private onSessionCreated = new Emitter<sqlops.ObjectExplorerSession>();
private sessionId: string;
handle: number;
readonly providerId = this.treeViewId;
constructor(protected treeViewId: string,
protected _proxy: ExtHostTreeViewsShape
) {
}
public createNewSession(connInfo: sqlops.ConnectionInfo): Thenable<sqlops.ObjectExplorerSessionResponse> {
// no op
this.sessionId = generateUuid();
setTimeout(() => {
this.onSessionCreated.fire({
sessionId: this.sessionId,
errorMessage: undefined,
rootNode: {
errorMessage: undefined,
iconType: undefined,
isLeaf: undefined,
label: undefined,
metadata: undefined,
nodePath: undefined,
nodeStatus: undefined,
nodeSubType: undefined,
nodeType: undefined
},
success: true
});
});
return Promise.resolve({ sessionId: this.sessionId });
}
public expandNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable<boolean> {
this._proxy.$getChildren(this.treeViewId, nodeInfo.nodePath).then(e => {
this.onExpandComplete.fire({
errorMessage: undefined,
nodePath: nodeInfo.nodePath,
nodes: e.map(e => {
return <sqlops.NodeInfo>{
nodePath: e.handle,
label: e.label.label,
iconType: e.icon.path,
// this is just needed since we don't have this
nodeSubType: e.iconDark.path,
isLeaf: e.collapsibleState === TreeItemCollapsibleState.None,
childProvider: e.childProvider,
payload: e.payload,
nodeType: e.contextValue
};
}),
sessionId: this.sessionId
});
});
return Promise.resolve(true);
}
public refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable<boolean> {
// no op
return Promise.resolve(true);
}
public closeSession(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable<sqlops.ObjectExplorerCloseSessionResponse> {
// no op
return Promise.resolve({ sessionId: undefined, success: true });
}
public findNodes(findNodesInfo: sqlops.FindNodesInfo): Thenable<sqlops.ObjectExplorerFindNodesResponse> {
// no op
return Promise.resolve({ nodes: [] });
}
public registerOnSessionCreated(handler: (response: sqlops.ObjectExplorerSession) => any): void {
// no op
this.onSessionCreated.event(handler);
return;
}
public registerOnSessionDisconnected?(handler: (response: sqlops.ObjectExplorerSession) => any): void {
// no op
return;
}
public registerOnExpandCompleted(handler: (response: sqlops.ObjectExplorerExpandInfo) => any): void {
this.onExpandComplete.event(handler);
return;
}
}