ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing unnecessary tree expansions causing errors to popup again (#23932)

Browse Source
This commit is contained in:
Aasim Khan
2023-07-19 15:42:56 -07:00
committed by GitHub
parent 38312de87b
commit 760ccfdef3
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,8 +332,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
const movedConnection = <ConnectionProfile>e.source; const movedConnection = <ConnectionProfile>e.source;
const oldParent = <ConnectionProfileGroup>this._tree.getElementById(e.oldGroupId); const oldParent = <ConnectionProfileGroup>this._tree.getElementById(e.oldGroupId);
const newParent = <ConnectionProfileGroup>this._tree.getElementById(e.newGroupId); const newParent = <ConnectionProfileGroup>this._tree.getElementById(e.newGroupId);
// Storing the expanded state of children of the moved connection so that they can be expanded after the move.
const profileExpandedState = this._tree.getExpandedState(movedConnection);
if (oldParent) { if (oldParent) {
oldParent.removeConnections([movedConnection]); oldParent.removeConnections([movedConnection]);
await this._tree.updateChildren(oldParent); await this._tree.updateChildren(oldParent);
@@ -348,8 +346,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
const newConnection = this._tree.getElementById(movedConnection.id); const newConnection = this._tree.getElementById(movedConnection.id);
if (newConnection) { if (newConnection) {
await this._tree.revealSelectFocusElement(newConnection); await this._tree.revealSelectFocusElement(newConnection);
// Expanding the previously expanded children of the moved connection after the move.
await this._tree.expandElements(profileExpandedState);
} }
} }
})); }));
@@ -401,8 +397,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
const movedGroup = <ConnectionProfileGroup>e.source; const movedGroup = <ConnectionProfileGroup>e.source;
const oldParent = <ConnectionProfileGroup>this._tree.getElementById(e.oldGroupId); const oldParent = <ConnectionProfileGroup>this._tree.getElementById(e.oldGroupId);
const newParent = <ConnectionProfileGroup>this._tree.getElementById(e.newGroupId); const newParent = <ConnectionProfileGroup>this._tree.getElementById(e.newGroupId);
// Storing the expanded state of children of the moved group so that they can be expanded after the move.
const profileExpandedState = this._tree.getExpandedState(movedGroup);
oldParent.children = oldParent.children.filter(c => c.id !== movedGroup.id); oldParent.children = oldParent.children.filter(c => c.id !== movedGroup.id);
await this._tree.updateChildren(oldParent); await this._tree.updateChildren(oldParent);
newParent.children.push(movedGroup); newParent.children.push(movedGroup);
@@ -410,8 +404,6 @@ export class ServerTreeView extends Disposable implements IServerTreeView {
(<ConnectionProfileGroup>movedGroup).parentId = newParent.id; (<ConnectionProfileGroup>movedGroup).parentId = newParent.id;
await this._tree.updateChildren(newParent); await this._tree.updateChildren(newParent);
await this._tree.revealSelectFocusElement(movedGroup); await this._tree.revealSelectFocusElement(movedGroup);
// Expanding the previously expanded children of the moved group after the move.
this._tree.expandElements(profileExpandedState);
} }
})); }));

15
src/sql/workbench/services/objectExplorer/browser/asyncServerTree.ts
View File

@@ -120,19 +120,10 @@ export class AsyncServerTree extends WorkbenchAsyncDataTree<ConnectionProfileGro
return node; return node;
} }
public override async updateChildren(element?: ServerTreeElement, recursive?: boolean, rerender?: boolean, options?: IAsyncDataTreeUpdateChildrenOptions<ServerTreeElement>): Promise<void> { public override async updateChildren(element?: ServerTreeElement, recursive: boolean = false, rerender: boolean = false, options: IAsyncDataTreeUpdateChildrenOptions<ServerTreeElement> = {
const expandedChildren = this.getExpandedState(element); diffDepth: 0
}): Promise<void> {
await super.updateChildren(element, recursive, rerender, options); await super.updateChildren(element, recursive, rerender, options);
await this.expandElements(expandedChildren);
}
public async expandElements(elements: ServerTreeElement[]): Promise<void> {
for (let element of elements) {
const node = this.getDataNode(element, false);
if (node) {
await this.expand(node.element);
}
}
} }
/** /**