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

Improve handling of connection errors for arc controllers (#11139)

Browse Source 
* some fixes for failed connections

* cleanup

* add back in prompt
This commit is contained in:
Charles Gagnon
2020-06-29 19:50:27 -07:00
committed by GitHub
parent 93a88e38fe
commit 749c42ce41
5 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/arc/src/ui/dialogs/connectControllerDialog.ts
View File

@@ -24,7 +24,7 @@ export class ConnectToControllerDialog {
constructor(private _treeDataProvider: AzureArcTreeDataProvider) { }
public showDialog(controllerInfo?: ControllerInfo): void {
public showDialog(controllerInfo?: ControllerInfo, password?: string): void {
const dialog = azdata.window.createModelViewDialog(loc.connectToController);
dialog.cancelButton.onClick(() => this.handleCancel());
dialog.registerContent(async view => {
@@ -43,6 +43,7 @@ export class ConnectToControllerDialog {
this.passwordInputBox = this.modelBuilder.inputBox()
.withProperties<azdata.InputBoxProperties>({
inputType: 'password',
value: password
})
.component();
this.rememberPwCheckBox = this.modelBuilder.checkBox()

20
extensions/arc/src/ui/tree/controllerTreeNode.ts
View File

@@ -11,12 +11,13 @@ import { PostgresTreeNode } from './postgresTreeNode';
import { ControllerModel, Registration, ResourceInfo } from '../../models/controllerModel';
import { ControllerDashboard } from '../dashboards/controller/controllerDashboard';
import { PostgresModel } from '../../models/postgresModel';
import { parseInstanceName } from '../../common/utils';
import { parseInstanceName, UserCancelledError } from '../../common/utils';
import { MiaaModel } from '../../models/miaaModel';
import { Deferred } from '../../common/promise';
import { RefreshTreeNode } from './refreshTreeNode';
import { ResourceTreeNode } from './resourceTreeNode';
import { AzureArcTreeDataProvider } from './azureArcTreeDataProvider';
import * as loc from '../../localizedConstants';
/**
* The TreeNode for displaying an Azure Arc Controller
@@ -38,10 +39,19 @@ export class ControllerTreeNode extends TreeNode {
await this.model.refresh(false);
await this._childrenRefreshPromise.promise;
} catch (err) {
// Couldn't get the children and TreeView doesn't have a way to collapse a node
// in a way that will refetch its children when expanded again so instead we
// display a tempory node that will prompt the user to re-enter credentials
return [new RefreshTreeNode(this)];
vscode.window.showErrorMessage(loc.errorConnectingToController(err));
try {
await this.model.refresh(false, true);
await this._childrenRefreshPromise.promise;
} catch (err) {
if (!(err instanceof UserCancelledError)) {
vscode.window.showErrorMessage(loc.errorConnectingToController(err));
}
// Couldn't get the children and TreeView doesn't have a way to collapse a node
// in a way that will refetch its children when expanded again so instead we
// display a tempory node that will prompt the user to re-enter credentials
return [new RefreshTreeNode(this)];
}
}
return this._children;