Update server tree action contributions (#15525)

* Update server tree action contributions * Fix test
2026-01-19 01:25:36 -05:00 · 2021-05-20 12:41:56 -07:00
parent c61c53976a
commit 2ec720d5b9
19 changed files with 176 additions and 213 deletions
--- a/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts
+++ b/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts
@@ -10,7 +10,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
-import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
+import { IObjectExplorerService, ServerTreeViewView } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
 import { TreeNode } from 'sql/workbench/services/objectExplorer/common/treeNode';
 import Severity from 'vs/base/common/severity';
 import { ObjectExplorerActionsContext } from 'sql/workbench/services/objectExplorer/browser/objectExplorerActions';
@@ -19,6 +19,7 @@ import { UNSAVED_GROUP_ID } from 'sql/platform/connection/common/constants';
 import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController';
 import { ILogService } from 'vs/platform/log/common/log';
 import { AsyncServerTree, ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree';
+import { SqlIconId } from 'sql/base/common/codicons';

 export interface IServerView {
 	showFilteredTree(filter: string): void;
@@ -158,8 +159,7 @@ export class AddServerAction extends Action {
 		label: string,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService
 	) {
-		super(id, label);
-		this.class = 'add-server-action';
+		super(id, label, SqlIconId.addServerAction);
 	}

 	public async run(element: ConnectionProfileGroup): Promise<boolean> {
@@ -187,7 +187,7 @@ export class AddServerAction extends Action {
 }

 /**
- * Actions to add a server to the group
+ * Action to open up the dialog to create a new server group
 */
 export class AddServerGroupAction extends Action {
 	public static ID = 'registeredServers.addServerGroup';
@@ -198,8 +198,7 @@ export class AddServerGroupAction extends Action {
 		label: string,
 		@IServerGroupController private readonly serverGroupController: IServerGroupController
 	) {
-		super(id, label);
-		this.class = 'add-server-group-action';
+		super(id, label, SqlIconId.addServerGroupAction);
 	}

 	public async run(): Promise<boolean> {
@@ -232,96 +231,33 @@ export class EditServerGroupAction extends Action {
 }

 /**
- * Display active connections in the tree
+ * Action to toggle filtering the server connections tree to only show
+ * active connections or not.
 */
 export class ActiveConnectionsFilterAction extends Action {
 	public static ID = 'registeredServers.recentConnections';
-	public static LABEL = localize('activeConnections', "Show Active Connections");
-	private static enabledClass = 'active-connections-action';
-	private static disabledClass = 'icon server-page';
-	private static showAllConnectionsLabel = localize('showAllConnections', "Show All Connections");
-	private _isSet: boolean = false;
+	public static SHOW_ACTIVE_CONNECTIONS_LABEL = localize('activeConnections', "Show Active Connections");
+	public static SHOW_ALL_CONNECTIONS_LABEL = localize('showAllConnections', "Show All Connections");
 	public static readonly ACTIVE = 'active';
-	public get isSet(): boolean {
-		return this._isSet;
-	}
-	public set isSet(value: boolean) {
-		this._isSet = value;
-		this.class = (!this._isSet) ?
-			ActiveConnectionsFilterAction.enabledClass : ActiveConnectionsFilterAction.disabledClass;
-	}

 	constructor(
 		id: string,
 		label: string,
-		private view: IServerView
+		@IObjectExplorerService private _objectExplorerService: IObjectExplorerService
 	) {
-		super(id, label);
-		this.class = ActiveConnectionsFilterAction.enabledClass;
+		super(id, label, SqlIconId.activeConnectionsAction);
 	}

-	public run(): Promise<boolean> {
-		if (!this.view) {
-			// return without doing anything
-			return Promise.resolve(true);
-		}
-		if (this.class === ActiveConnectionsFilterAction.enabledClass) {
+	public async run(): Promise<boolean> {
+		const serverTreeView = this._objectExplorerService.getServerTreeView();
+		if (serverTreeView.view !== ServerTreeViewView.active) {
 			// show active connections in the tree
-			this.view.showFilteredTree(ActiveConnectionsFilterAction.ACTIVE);
-			this.isSet = true;
-			this.label = ActiveConnectionsFilterAction.showAllConnectionsLabel;
+			serverTreeView.showFilteredTree(ServerTreeViewView.active);
 		} else {
 			// show full tree
-			this.view.refreshTree();
-			this.isSet = false;
-			this.label = ActiveConnectionsFilterAction.LABEL;
+			await serverTreeView.refreshTree();
 		}
-		return Promise.resolve(true);
-	}
-}
-
-/**
- * Display recent connections in the tree
- */
-export class RecentConnectionsFilterAction extends Action {
-	public static ID = 'registeredServers.recentConnections';
-	public static LABEL = localize('recentConnections', "Recent Connections");
-	private static enabledClass = 'recent-connections-action';
-	private static disabledClass = 'recent-connections-action-set';
-	private _isSet: boolean;
-	public get isSet(): boolean {
-		return this._isSet;
-	}
-	public set isSet(value: boolean) {
-		this._isSet = value;
-		this.class = (!this._isSet) ?
-			RecentConnectionsFilterAction.enabledClass : RecentConnectionsFilterAction.disabledClass;
-	}
-	constructor(
-		id: string,
-		label: string,
-		private view: IServerView
-	) {
-		super(id, label);
-		this.class = RecentConnectionsFilterAction.enabledClass;
-		this._isSet = false;
-	}
-
-	public run(): Promise<boolean> {
-		if (!this.view) {
-			// return without doing anything
-			return Promise.resolve(true);
-		}
-		if (this.class === RecentConnectionsFilterAction.enabledClass) {
-			// show recent connections in the tree
-			this.view.showFilteredTree('recent');
-			this.isSet = true;
-		} else {
-			// show full tree
-			this.view.refreshTree();
-			this.isSet = false;
-		}
-		return Promise.resolve(true);
+		return true;
 	}
 }

--- a/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts
+++ b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts
@@ -20,7 +20,6 @@ import { entries } from 'sql/base/common/collections';
 import { values } from 'vs/base/common/collections';
 import { startsWith } from 'vs/base/common/strings';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
-import { IAction } from 'vs/base/common/actions';
 import { ServerTreeActionProvider } from 'sql/workbench/services/objectExplorer/browser/serverTreeActionProvider';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { AsyncServerTree, ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree';
@@ -33,6 +32,11 @@ export interface NodeExpandInfoWithProviderId extends azdata.ObjectExplorerExpan
 	providerId: string;
 }

+export const enum ServerTreeViewView {
+	all = 'all',
+	active = 'active'
+}
+
 export interface IServerTreeView {
 	readonly tree: ITree | AsyncServerTree;
 	readonly onSelectionOrFocusChange: Event<void>;
@@ -47,9 +51,10 @@ export interface IServerTreeView {
 	setExpandedState(node: ServerTreeElement, state?: TreeItemCollapsibleState): Promise<void>;
 	setSelected(node: ServerTreeElement, selected?: boolean, clearOtherSelections?: boolean): Promise<void>;
 	refreshTree(): Promise<void>;
-	readonly activeConnectionsFilterAction: IAction;
 	renderBody(container: HTMLElement): Promise<void>;
 	layout(size: number): void;
+	showFilteredTree(view: ServerTreeViewView): void;
+	view: ServerTreeViewView;
 }

 export interface IObjectExplorerService {
--- a/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts
+++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts
@@ -9,8 +9,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';

 import {
-	DisconnectConnectionAction, AddServerAction, EditConnectionAction,
-	DeleteConnectionAction, RefreshAction, EditServerGroupAction
+	DisconnectConnectionAction, EditConnectionAction,
+	DeleteConnectionAction, RefreshAction, EditServerGroupAction, AddServerAction
 } from 'sql/workbench/services/objectExplorer/browser/connectionTreeAction';
 import { TreeNode } from 'sql/workbench/services/objectExplorer/common/treeNode';
 import { NodeType } from 'sql/workbench/services/objectExplorer/common/nodeType';
@@ -157,6 +157,7 @@ export class ServerTreeActionProvider {
 	 * Return actions for connection group elements
 	 */
 	private getConnectionProfileGroupActions(element: ConnectionProfileGroup): IAction[] {
+		// TODO: Should look into using the MenuRegistry for this
 		return [
 			this._instantiationService.createInstance(AddServerAction, AddServerAction.ID, AddServerAction.LABEL),
 			this._instantiationService.createInstance(EditServerGroupAction, EditServerGroupAction.ID, EditServerGroupAction.LABEL, element),