ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Azure pane in connection dialog (#11736)

Browse Source 
* azure pane in connection dialog

* fix layering

* fix issues

* fix test

* more test fixes

* add back double click to connect for non-contributed views
This commit is contained in:
Anthony Dresser
2020-08-13 17:02:42 -07:00
committed by GitHub
parent a69b4bf662
commit 8cf82c1f8b
19 changed files with 272 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/azurecore/package.json
View File

@@ -175,10 +175,18 @@
}
],
"dataExplorer": {
"azureResource": [
"dialog/connection": [
{
"id": "azureResourceExplorer_dialog",
"name": "%azure.resource.explorer.title%",
"when": "config.workbench.enablePreviewFeatures"
}
],
"dataExplorer": [
{
"id": "azureResourceExplorer",
"name": "%azure.resource.explorer.title%"
"name": "%azure.resource.explorer.title%",
"when": "!config.workbench.enablePreviewFeatures"
}
]
},

8
extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { TreeItem, ExtensionNodeType, Account } from 'azdata';
import { TreeItemCollapsibleState, ExtensionContext } from 'vscode';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle();
@@ -21,7 +21,7 @@ export class AzureResourceDatabaseTreeDataProvider extends ResourceTreeDataProvi
public constructor(
databaseService: IAzureResourceService<azureResource.AzureResourceDatabase>,
private _extensionContext: ExtensionContext
private _extensionContext: vscode.ExtensionContext
) {
super(databaseService);
}
@@ -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: TreeItemCollapsibleState.Collapsed,
collapsibleState: vscode.workspace.getConfiguration('workbench').get<boolean>('enablePreviewFeatures') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed,
contextValue: AzureResourceItemType.database,
payload: {
id: generateGuid(),
@@ -71,7 +71,7 @@ export class AzureResourceDatabaseTreeDataProvider extends ResourceTreeDataProvi
dark: this._extensionContext.asAbsolutePath('resources/dark/folder_inverse.svg'),
light: this._extensionContext.asAbsolutePath('resources/light/folder.svg')
},
collapsibleState: TreeItemCollapsibleState.Collapsed,
collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
contextValue: AzureResourceItemType.databaseContainer
}
};

8
extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { ExtensionNodeType, TreeItem, Account } from 'azdata';
import { TreeItemCollapsibleState, ExtensionContext } from 'vscode';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
const localize = nls.loadMessageBundle();
@@ -20,7 +20,7 @@ export class AzureResourceDatabaseServerTreeDataProvider extends ResourceTreeDat
public constructor(
databaseServerService: IAzureResourceService<azureResource.AzureResourceDatabaseServer>,
private _extensionContext: ExtensionContext
private _extensionContext: vscode.ExtensionContext
) {
super(databaseServerService);
}
@@ -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: TreeItemCollapsibleState.Collapsed,
collapsibleState: vscode.workspace.getConfiguration('workbench').get<boolean>('enablePreviewFeatures') ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed,
contextValue: AzureResourceItemType.databaseServer,
payload: {
id: generateGuid(),
@@ -72,7 +72,7 @@ export class AzureResourceDatabaseServerTreeDataProvider extends ResourceTreeDat
dark: this._extensionContext.asAbsolutePath('resources/dark/folder_inverse.svg'),
light: this._extensionContext.asAbsolutePath('resources/light/folder.svg')
},
collapsibleState: TreeItemCollapsibleState.Collapsed,
collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
contextValue: AzureResourceItemType.databaseServerContainer
}
};

1
extensions/azurecore/src/extension.ts
View File

@@ -82,6 +82,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<azurec
registerAzureServices(appContext);
const azureResourceTree = new AzureResourceTreeProvider(appContext);
pushDisposable(vscode.window.registerTreeDataProvider('azureResourceExplorer', azureResourceTree));
pushDisposable(vscode.window.registerTreeDataProvider('azureResourceExplorer_dialog', azureResourceTree));
pushDisposable(vscode.workspace.onDidChangeConfiguration(e => onDidChangeConfiguration(e), this));
registerAzureResourceCommands(appContext, azureResourceTree);