From 9dde80ce1c07207f35db6af11caaa3250b6381db Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Tue, 1 Sep 2020 17:26:54 -0700 Subject: [PATCH] add check for preview features on children providers on all azure tree providers (#12068) --- .../azureResource/providers/kusto/kustoTreeDataProvider.ts | 4 ++-- .../postgresArcServer/postgresServerTreeDataProvider.ts | 4 ++-- .../postgresServer/postgresServerTreeDataProvider.ts | 4 ++-- .../providers/sqlinstance/sqlInstanceTreeDataProvider.ts | 4 ++-- .../sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts index 7902cc63fc..841e65e1ee 100644 --- a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionNodeType, TreeItem, Account } from 'azdata'; -import { TreeItemCollapsibleState, ExtensionContext } from 'vscode'; +import { TreeItemCollapsibleState, ExtensionContext, workspace } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -34,7 +34,7 @@ export class KustoTreeDataProvider extends ResourceTreeDataProviderBase('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.azureDataExplorer, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts index c3f2462f6d..89f1dd276a 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionNodeType, TreeItem, Account } from 'azdata'; -import { TreeItemCollapsibleState, ExtensionContext } from 'vscode'; +import { TreeItemCollapsibleState, ExtensionContext, workspace } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -34,7 +34,7 @@ export class PostgresServerArcTreeDataProvider extends ResourceTreeDataProviderB dark: this._extensionContext.asAbsolutePath('resources/dark/sql_server_inverse.svg'), light: this._extensionContext.asAbsolutePath('resources/light/sql_server.svg') }, - collapsibleState: TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts index 4ba16c4842..979054af1e 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionNodeType, TreeItem, Account } from 'azdata'; -import { TreeItemCollapsibleState, ExtensionContext } from 'vscode'; +import { TreeItemCollapsibleState, ExtensionContext, workspace } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -34,7 +34,7 @@ export class PostgresServerTreeDataProvider extends ResourceTreeDataProviderBase dark: this._extensionContext.asAbsolutePath('resources/dark/sql_server_inverse.svg'), light: this._extensionContext.asAbsolutePath('resources/light/sql_server.svg') }, - collapsibleState: TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts index 607dfe04ca..66c6c73617 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionNodeType, TreeItem, Account } from 'azdata'; -import { TreeItemCollapsibleState, ExtensionContext } from 'vscode'; +import { TreeItemCollapsibleState, ExtensionContext, workspace } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -34,7 +34,7 @@ export class SqlInstanceTreeDataProvider extends ResourceTreeDataProviderBase('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts index decbbd0126..926c979504 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionNodeType, TreeItem, Account } from 'azdata'; -import { TreeItemCollapsibleState, ExtensionContext } from 'vscode'; +import { TreeItemCollapsibleState, ExtensionContext, workspace } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -34,7 +34,7 @@ export class SqlInstanceArcTreeDataProvider extends ResourceTreeDataProviderBase dark: this._extensionContext.asAbsolutePath('resources/dark/sql_instance_inverse.svg'), light: this._extensionContext.asAbsolutePath('resources/light/sql_instance.svg') }, - collapsibleState: TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(),