From a6314b57b7a70cd77f1366ff1bb149d80ede9fed Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Wed, 2 Sep 2020 13:35:36 -0700 Subject: [PATCH] Add different flag for azure dialog (#12073) * add different flag for azure dialog * missing code change * rename browser to browse --- extensions/azurecore/package.json | 4 ++-- .../providers/database/databaseTreeDataProvider.ts | 2 +- .../databaseServer/databaseServerTreeDataProvider.ts | 2 +- .../azureResource/providers/kusto/kustoTreeDataProvider.ts | 2 +- .../postgresArcServer/postgresServerTreeDataProvider.ts | 2 +- .../postgresServer/postgresServerTreeDataProvider.ts | 2 +- .../providers/sqlinstance/sqlInstanceTreeDataProvider.ts | 2 +- .../sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts | 2 +- .../contrib/connection/browser/connection.contribution.ts | 5 +++++ 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index f177f85655..d70b75d5cd 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -179,14 +179,14 @@ { "id": "azureResourceExplorer_dialog", "name": "%azure.resource.explorer.title%", - "when": "config.workbench.enablePreviewFeatures" + "when": "config.connection.dialog.browse" } ], "dataExplorer": [ { "id": "azureResourceExplorer", "name": "%azure.resource.explorer.title%", - "when": "!config.workbench.enablePreviewFeatures" + "when": "!config.connection.dialog.browse" } ] }, diff --git a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts index 0d4700e4fc..1693d37bc7 100644 --- a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts @@ -33,7 +33,7 @@ export class AzureResourceDatabaseTreeDataProvider extends ResourceTreeDataProvi dark: this._extensionContext.asAbsolutePath('resources/dark/sql_database_inverse.svg'), light: this._extensionContext.asAbsolutePath('resources/light/sql_database.svg') }, - collapsibleState: vscode.workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed, + collapsibleState: vscode.workspace.getConfiguration('connection').get('dialog.browse') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.database, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts index 95acf8fc49..acf4d102a2 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts @@ -34,7 +34,7 @@ export class AzureResourceDatabaseServerTreeDataProvider extends ResourceTreeDat dark: this._extensionContext.asAbsolutePath('resources/dark/sql_server_inverse.svg'), light: this._extensionContext.asAbsolutePath('resources/light/sql_server.svg') }, - collapsibleState: vscode.workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed, + collapsibleState: vscode.workspace.getConfiguration('connection').get('dialog.browse') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(), diff --git a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts index 841e65e1ee..4af9ed14a2 100644 --- a/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/kusto/kustoTreeDataProvider.ts @@ -34,7 +34,7 @@ export class KustoTreeDataProvider extends ResourceTreeDataProviderBase('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('connection').get('dialog.browse') ? 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 89f1dd276a..915fa61705 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/postgresArcServer/postgresServerTreeDataProvider.ts @@ -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: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('connection').get('dialog.browse') ? 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 979054af1e..a3c4c2b147 100644 --- a/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts @@ -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: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('connection').get('dialog.browse') ? 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 66c6c73617..ab99d93ce9 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/sqlinstance/sqlInstanceTreeDataProvider.ts @@ -34,7 +34,7 @@ export class SqlInstanceTreeDataProvider extends ResourceTreeDataProviderBase('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('connection').get('dialog.browse') ? 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 926c979504..9c3def0783 100644 --- a/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/sqlinstanceArc/sqlInstanceArcTreeDataProvider.ts @@ -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: workspace.getConfiguration('workbench').get('enablePreviewFeatures') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, + collapsibleState: workspace.getConfiguration('connection').get('dialog.browse') ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed, contextValue: AzureResourceItemType.databaseServer, payload: { id: generateGuid(), diff --git a/src/sql/workbench/contrib/connection/browser/connection.contribution.ts b/src/sql/workbench/contrib/connection/browser/connection.contribution.ts index ffc1adaf84..e100ee4040 100644 --- a/src/sql/workbench/contrib/connection/browser/connection.contribution.ts +++ b/src/sql/workbench/contrib/connection/browser/connection.contribution.ts @@ -130,6 +130,11 @@ configurationRegistry.registerConfiguration({ 'type': 'boolean', 'default': true, 'description': localize('connection.parseClipboardForConnectionStringDescription', "Attempt to parse the contents of the clipboard when the connection dialog is opened or a paste is performed.") + }, + 'connection.dialog.browse': { + 'type': 'boolean', + 'default': false, + 'description': localize('connection.dialog.browse', "(Experimental) Show the browser tab in the connection dialog for discovering new connections") } } });