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

Fix tree refresh (#8625)

Browse Source 
* first part

* remove another refresh collapse expand

* Fix scriptable nodes

* Fix test
This commit is contained in:
Charles Gagnon
2019-12-11 16:34:03 -08:00
committed by GitHub
parent 808ce4366d
commit 7e970d04ca
4 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/sql/workbench/contrib/scripting/browser/scriptingActions.ts
View File

@@ -311,34 +311,18 @@ CommandsRegistry.registerCommand({
CommandsRegistry.registerCommand({
id: OE_REFRESH_COMMAND_ID,
handler: async (accessor, args: ObjectExplorerActionsContext): Promise<void> => {
const connectionManagementService = accessor.get(IConnectionManagementService);
const capabilitiesService = accessor.get(ICapabilitiesService);
const objectExplorerService = accessor.get(IObjectExplorerService);
const logService = accessor.get(ILogService);
const notificationService = accessor.get(INotificationService);
const connection = new ConnectionProfile(capabilitiesService, args.connectionProfile);
if (connectionManagementService.isConnected(undefined, connection)) {
let treeNode = await getTreeNode(args, objectExplorerService);
if (!treeNode) {
await objectExplorerService.updateObjectExplorerNodes(connection.toIConnectionProfile());
treeNode = objectExplorerService.getObjectExplorerNode(connection);
}
if (treeNode) {
const tree = objectExplorerService.getServerTreeView().tree;
try {
await tree.collapse(treeNode);
await objectExplorerService.refreshTreeNode(treeNode.getSession(), treeNode);
await tree.refresh(treeNode);
await tree.expand(treeNode);
} catch (err) {
// Display message to the user but also log the entire error to the console for the stack trace
notificationService.error(localize('refreshError', "An error occurred refreshing node '{0}': {1}", args.nodeInfo.label, getErrorMessage(err)));
logService.error(err);
}
} else {
logService.error(`Could not find tree node for node ${args.nodeInfo.label}`);
}
const treeNode = await getTreeNode(args, objectExplorerService);
const tree = objectExplorerService.getServerTreeView().tree;
try {
await objectExplorerService.refreshTreeNode(treeNode.getSession(), treeNode);
await tree.refresh(treeNode);
} catch (err) {
// Display message to the user but also log the entire error to the console for the stack trace
notificationService.error(localize('refreshError', "An error occurred refreshing node '{0}': {1}", args.nodeInfo.label, getErrorMessage(err)));
logService.error(err);
}
}
});