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

Azure extension changes (#4987)

Browse Source 
* removed search box

* removed commented code
This commit is contained in:
Aditya Bist
2019-04-11 09:44:43 -07:00
committed by GitHub
parent c725f6f572
commit fe12233954
8 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts
View File

@@ -32,10 +32,8 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
private _root: HTMLElement;
private _searchBox: InputBox;
private _toDisposeViewlet: IDisposable[] = [];
private _serverTreeView: ServerTreeView;
private _clearSearchAction: ClearSearchAction;
private _addServerAction: IAction;
private _addServerGroupAction: IAction;
private _activeConnectionsFilterAction: ActiveConnectionsFilterAction;
@@ -53,7 +51,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
super(VIEWLET_ID, configurationService, layoutService, telemetryService, _themeService, storageService);
this._clearSearchAction = this._instantiationService.createInstance(ClearSearchAction, ClearSearchAction.ID, ClearSearchAction.LABEL, this);
this._addServerAction = this._instantiationService.createInstance(AddServerAction,
AddServerAction.ID,
AddServerAction.LABEL);
@@ -79,24 +76,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
super.create(parent);
this._root = parent;
const viewletContainer = DOM.append(parent, DOM.$('div.server-explorer-viewlet'));
const searchBoxContainer = DOM.append(viewletContainer, DOM.$('div.search-box'));
this._searchBox = new InputBox(
searchBoxContainer,
null,
{
placeholder: localize('Search server names', 'Search server names'),
actions: [this._clearSearchAction],
ariaLabel: localize('Search server names', 'Search server names')
}
);
this._searchBox.onDidChange(() => {
this.search(this._searchBox.value);
});
// Theme styler
this._toDisposeViewlet.push(attachInputBoxStyler(this._searchBox, this._themeService));
const viewContainer = DOM.append(viewletContainer, DOM.$('div.object-explorer-view'));
this._serverTreeView.renderBody(viewContainer).then(undefined, error => {
warn('render registered servers: ' + error);
@@ -105,7 +84,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
public search(value: string): void {
if (value) {
this._clearSearchAction.enabled = true;
this._serverTreeView.searchTree(value);
} else {
this.clearSearch();
@@ -129,7 +107,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
}
public layout({ height, width }: DOM.Dimension): void {
this._searchBox.layout();
this._serverTreeView.layout(height - 36); // account for search box
DOM.toggleClass(this._root, 'narrow', width <= 350);
}
@@ -140,9 +117,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
public clearSearch() {
this._serverTreeView.refreshTree();
this._searchBox.value = '';
this._clearSearchAction.enabled = false;
this._searchBox.focus();
}
public dispose(): void {

27
src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts
View File

@@ -31,10 +31,8 @@ import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/com
export class ConnectionViewletPanel extends ViewletPanel {
private _root: HTMLElement;
private _searchBox: InputBox;
private _toDisposeViewlet: IDisposable[] = [];
private _serverTreeView: ServerTreeView;
private _clearSearchAction: ClearSearchAction;
private _addServerAction: IAction;
private _addServerGroupAction: IAction;
private _activeConnectionsFilterAction: ActiveConnectionsFilterAction;
@@ -54,7 +52,7 @@ export class ConnectionViewletPanel extends ViewletPanel {
@IObjectExplorerService private objectExplorerService: IObjectExplorerService
) {
super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: options.title }, keybindingService, contextMenuService, configurationService);
this._clearSearchAction = this.instantiationService.createInstance(ClearSearchAction, ClearSearchAction.ID, ClearSearchAction.LABEL, this);
//this._clearSearchAction = this.instantiationService.createInstance(ClearSearchAction, ClearSearchAction.ID, ClearSearchAction.LABEL, this);
this._addServerAction = this.instantiationService.createInstance(AddServerAction,
AddServerAction.ID,
AddServerAction.LABEL);
@@ -77,24 +75,6 @@ export class ConnectionViewletPanel extends ViewletPanel {
renderBody(container: HTMLElement): void {
const viewletContainer = DOM.append(container, DOM.$('div.server-explorer-viewlet'));
const searchBoxContainer = DOM.append(viewletContainer, DOM.$('div.search-box'));
this._searchBox = new InputBox(
searchBoxContainer,
null,
{
placeholder: localize('Search server names', 'Search server names'),
actions: [this._clearSearchAction],
ariaLabel: localize('Search server names', 'Search server names')
}
);
this._searchBox.onDidChange(() => {
this.search(this._searchBox.value);
});
// Theme styler
this._toDisposeViewlet.push(attachInputBoxStyler(this._searchBox, this.themeService));
const viewContainer = DOM.append(viewletContainer, DOM.$('div.object-explorer-view'));
this._serverTreeView.renderBody(viewContainer).then(undefined, error => {
console.warn('render registered servers: ' + error);
@@ -103,7 +83,6 @@ export class ConnectionViewletPanel extends ViewletPanel {
}
layoutBody(size: number): void {
this._searchBox.layout();
this._serverTreeView.layout(size - 46); // account for search box and horizontal scroll bar
DOM.toggleClass(this._root, 'narrow', this._root.clientWidth < 300);
}
@@ -140,14 +119,10 @@ export class ConnectionViewletPanel extends ViewletPanel {
public clearSearch() {
this._serverTreeView.refreshTree();
this._searchBox.value = '';
this._clearSearchAction.enabled = false;
this._searchBox.focus();
}
public search(value: string): void {
if (value) {
this._clearSearchAction.enabled = true;
this._serverTreeView.searchTree(value);
} else {
this.clearSearch();

5
src/sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contribution.ts
View File

@@ -10,7 +10,7 @@ import { DISCONNECT_COMMAND_ID, MANAGE_COMMAND_ID, NEW_QUERY_COMMAND_ID, REFRESH
MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
group: 'connection',
order: 4,
order: 3,
command: {
id: DISCONNECT_COMMAND_ID,
title: localize('disconnect', 'Disconnect')
@@ -20,6 +20,7 @@ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
group: 'connection',
order: 2,
command: {
id: NEW_QUERY_COMMAND_ID,
title: localize('newQuery', 'New Query')
@@ -29,7 +30,7 @@ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
group: 'connection',
order: 4,
order: 1,
command: {
id: MANAGE_COMMAND_ID,
title: localize('manage', 'Manage')