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

Fixing adding connections on a new ads install (#22760)

Browse Source 
* Fixing stuff

* Fixing connection groups as well
This commit is contained in:
Aasim Khan
2023-04-18 08:39:53 -07:00
committed by GitHub
parent b7d24dcecd
commit fe086dc778
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts
View File

@@ -251,6 +251,14 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
// Add connection profile to parent group and update group children. Then reveal and expand the new connection // Add connection profile to parent group and update group children. Then reveal and expand the new connection
this._register(this._connectionManagementService.onConnectionProfileCreated(async (newConnection) => { this._register(this._connectionManagementService.onConnectionProfileCreated(async (newConnection) => {
if (this._tree instanceof AsyncServerTree) { if (this._tree instanceof AsyncServerTree) {
/**
* On a fresh install of ads, the default group in connection tree is not created until the first conneciton is
* created. In that case, the tree input is null and this handles that edge case. When we find the tree input undefined,
* we get the default group and set it as the tree input so that the new connection can be added to it.
*/
if (!this._tree.getInput()) {
this._tree.setInput(TreeUpdateUtils.getTreeInput(this._connectionManagementService));
}
const connectionParentGroup = this._tree.getElementById(newConnection.groupId) as ConnectionProfileGroup; const connectionParentGroup = this._tree.getElementById(newConnection.groupId) as ConnectionProfileGroup;
if (connectionParentGroup) { if (connectionParentGroup) {
connectionParentGroup.addOrReplaceConnection(newConnection); connectionParentGroup.addOrReplaceConnection(newConnection);
@@ -345,6 +353,14 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
this._register(this._connectionManagementService.onConnectionProfileGroupCreated(async (e) => { this._register(this._connectionManagementService.onConnectionProfileGroupCreated(async (e) => {
if (this._tree instanceof AsyncServerTree) { if (this._tree instanceof AsyncServerTree) {
/**
* On a fresh install of ads, the default group in connection tree is not created until the first conneciton is
* created. In that case, the tree input is null and this handles that edge case. When we find the tree input undefined,
* we get the default group and set it as the tree input so that the new connection group can be added to it.
*/
if (!this._tree.getInput()) {
this._tree.setInput(TreeUpdateUtils.getTreeInput(this._connectionManagementService));
}
let parent = <ConnectionProfileGroup>this._tree.getElementById(e.parentId); let parent = <ConnectionProfileGroup>this._tree.getElementById(e.parentId);
if (!parent) { if (!parent) {
parent = this._tree.getInput(); // If the parent is not found then add the group to the root. parent = this._tree.getInput(); // If the parent is not found then add the group to the root.