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

fix azdata connection API for dashboard connections (#9311)

Browse Source
This commit is contained in:
Aditya Bist
2020-02-24 16:32:38 -08:00
committed by GitHub
parent eeae87ea32
commit d7ea1123ef
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/workbench/browser/taskUtilities.ts
View File

@@ -11,6 +11,7 @@ import {
} from 'sql/platform/connection/common/connectionManagement';
import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { DashboardInput } from 'sql/workbench/browser/editor/profiler/dashboardInput';
export function replaceConnection(oldUri: string, newUri: string, connectionService: IConnectionManagementService): Promise<IConnectionResult> {
return new Promise<IConnectionResult>((resolve, reject) => {
@@ -58,7 +59,7 @@ export function replaceConnection(oldUri: string, newUri: string, connectionServ
*/
export function getCurrentGlobalConnection(objectExplorerService: IObjectExplorerService, connectionManagementService: IConnectionManagementService, workbenchEditorService: IEditorService, topLevelOnly: boolean = false): IConnectionProfile {
let connection: IConnectionProfile;
// object Explorer Connection
let objectExplorerSelection = objectExplorerService.getSelectedProfileAndDatabase();
if (objectExplorerSelection) {
let objectExplorerProfile = objectExplorerSelection.profile;
@@ -76,7 +77,13 @@ export function getCurrentGlobalConnection(objectExplorerService: IObjectExplore
let activeInput = workbenchEditorService.activeEditor;
if (activeInput) {
connection = connectionManagementService.getConnectionProfile(activeInput.resource.toString());
// dashboard Connection
if (activeInput instanceof DashboardInput) {
connection = connectionManagementService.getConnectionProfile(activeInput.uri.toString());
} else {
// editor Connection
connection = connectionManagementService.getConnectionProfile(activeInput.resource.toString());
}
}
return connection;