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

Respect 'showDashboard' disabled by default (#22907)

Browse Source
This commit is contained in:
Cheena Malhotra
2023-05-01 11:55:38 -07:00
committed by GitHub
parent ea6bb41f45
commit 7b2a07befd
15 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/services/connection/browser/connectionDialogService.ts
View File

@@ -265,7 +265,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
let options: IConnectionCompletionOptions = this._options || {
params: params,
saveTheConnection: !isTemporaryConnection,
showDashboard: params && params.showDashboard !== undefined ? params.showDashboard : !fromEditor && !isTemporaryConnection,
showDashboard: params?.showDashboard ?? false,
showConnectionDialogOnError: false,
showFirewallRuleOnError: true
};

3
src/sql/workbench/services/connection/browser/connectionManagementService.ts
View File

@@ -492,7 +492,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
saveTheConnection: saveConnection,
showConnectionDialogOnError: true,
showDashboard: purpose === 'dashboard',
params: undefined,
showFirewallRuleOnError: true,
};
return this.connect(connection, ownerUri, options).then(connectionResult => {
@@ -524,7 +523,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
options = {
saveTheConnection: true,
showDashboard: false,
params: undefined,
showConnectionDialogOnError: false,
showFirewallRuleOnError: true
};
@@ -574,7 +572,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
options = {
saveTheConnection: false,
showDashboard: false,
params: undefined,
showConnectionDialogOnError: false,
showFirewallRuleOnError: true
};

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

@@ -179,7 +179,12 @@ export class AddServerAction extends Action {
saveProfile: true,
id: element.id!
} as Partial<IConnectionProfile>;
await this._connectionManagementService.showConnectionDialog(undefined, undefined, connection);
await this._connectionManagementService.showConnectionDialog(undefined, {
showDashboard: true,
saveTheConnection: true,
showConnectionDialogOnError: true,
showFirewallRuleOnError: true
}, connection);
}
}

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

@@ -87,7 +87,7 @@ export class OEShimService extends Disposable implements IOEShimService {
private async connectOrPrompt(connProfile: ConnectionProfile): Promise<ConnectionProfile> {
connProfile = await new Promise(async (resolve, reject) => {
let result = await this.cm.connect(connProfile, undefined, { showConnectionDialogOnError: true, showFirewallRuleOnError: true, saveTheConnection: false, showDashboard: false, params: undefined }, {
let result = await this.cm.connect(connProfile, undefined, { showConnectionDialogOnError: true, showFirewallRuleOnError: true, saveTheConnection: false, showDashboard: false }, {
onConnectSuccess: async (e, profile) => {
let existingConnection = this.cm.findExistingConnection(profile);
connProfile = new ConnectionProfile(this.capabilities, existingConnection);

1
src/sql/workbench/services/objectExplorer/browser/treeSelectionHandler.ts
View File

@@ -142,7 +142,6 @@ export class TreeSelectionHandler {
doubleClickHandler(selectedNode);
} else if (selectedNode instanceof ConnectionProfile) {
let options: IConnectionCompletionOptions = {
params: undefined,
saveTheConnection: true,
showConnectionDialogOnError: true,
showFirewallRuleOnError: true,

1
src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts
View File

@@ -305,7 +305,6 @@ export class TreeUpdateUtils {
return rootNode.children ?? [];
} else {
const options: IConnectionCompletionOptions = {
params: undefined,
saveTheConnection: true,
showConnectionDialogOnError: true,
showFirewallRuleOnError: true,