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

Removing preview flag from OE filtering (#23486)

Browse Source 
* Removing preview flag from OE filtering

* Fixing double node path bug

* Cleaning header
This commit is contained in:
Aasim Khan
2023-06-28 10:25:38 -07:00
committed by GitHub
parent dd0bc9d0f3
commit e52aa01cf0
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts
View File

@@ -606,8 +606,8 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
public async filterElementChildren(node: TreeNode): Promise<void> {
await FilterDialog.getFiltersForProperties(
node.filterProperties,
localize('objectExplorer.filterDialogTitle', "(Preview) Filter Settings: {0}", node.getConnectionProfile().title),
localize('objectExplorer.nodePath', "Node Path: {0}", node.nodePath),
localize('objectExplorer.filterDialogTitle', "Filter Settings"),
node.nodePath,
node.filters,
async (filters) => {
let errorListener;

2
src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts
View File

@@ -390,7 +390,7 @@ export class DeleteConnectionAction extends Action {
export class FilterChildrenAction extends Action {
public static ID = 'objectExplorer.filterChildren';
public static LABEL = localize('objectExplorer.filterChildren', "Filter (Preview)");
public static LABEL = localize('objectExplorer.filterChildren', "Filter");
constructor(
id: string,

2
src/sql/workbench/services/objectExplorer/browser/filterDialog/filterDialog.ts
View File

@@ -67,7 +67,7 @@ const CLEAR_COLUMN_HEADER = localize('objectExplorer.clearColumnHeader', "Clear"
const TRUE_SELECT_BOX = localize('objectExplorer.trueSelectBox', "True");
const FALSE_SELECT_BOX = localize('objectExplorer.falseSelectBox', "False");
function nodePathDisplayString(nodepath: string): string { return localize('objectExplorer.nodePath', "Node Path: {0}", nodepath) }
function nodePathDisplayString(nodepath: string): string { return localize('objectExplorer.nodePath', "Path: {0}", nodepath) }
const PROPERTY_COLUMN_ID = 'property';
const OPERATOR_COLUMN_ID = 'operator';

5
src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts
View File

@@ -27,8 +27,6 @@ import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewIt
import { AsyncServerTree, ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import { ILogService } from 'vs/platform/log/common/log';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { CONFIG_WORKBENCH_ENABLEPREVIEWFEATURES } from 'sql/workbench/common/constants';
/**
* Provides actions for the server tree elements
@@ -45,7 +43,6 @@ export class ServerTreeActionProvider {
@IContextKeyService private _contextKeyService: IContextKeyService,
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
@ILogService private _logService: ILogService,
@IConfigurationService private _configurationService: IConfigurationService
) {
}
@@ -252,7 +249,7 @@ export class ServerTreeActionProvider {
// Contribute refresh action for scriptable objects via contribution
if (!this.isScriptableObject(context)) {
// Adding filter action if the node has filter properties
if (treeNode?.filterProperties?.length > 0 && this._configurationService.getValue<boolean>(CONFIG_WORKBENCH_ENABLEPREVIEWFEATURES)) {
if (treeNode?.filterProperties?.length > 0) {
actions.push(this._instantiationService.createInstance(FilterChildrenAction, FilterChildrenAction.ID, FilterChildrenAction.LABEL, context.treeNode));
}
// Adding remove filter action if the node has filters applied to it and the action is not inline only.