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

Fix node update in bdc dashboard on reconnect (#8138)

Browse Source 
* Fix node update in bdc dashboard on reconnect

* Fix no floating promises

* Fix opening from dashboard to always save controller node
This commit is contained in:
Charles Gagnon
2019-10-31 14:42:15 -07:00
committed by GitHub
parent 333f634e94
commit 7569f7fa32
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/big-data-cluster/src/bigDataCluster/controller/clusterControllerApi.ts
View File

@@ -311,7 +311,6 @@ export class ClusterController {
this._connectionPromise = this._dialog.showDialog();
}
const controller = await this._connectionPromise;
this._connectionPromise = undefined;
if (controller) {
this._username = controller._username;
this._password = controller._password;
@@ -325,6 +324,8 @@ export class ClusterController {
}
} catch (error) {
throw new ControllerError(error, errorMessage);
} finally {
this._connectionPromise = undefined;
}
}
}

12
extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardModel.ts
View File

@@ -12,7 +12,7 @@ import { AuthType } from '../constants';
import { ConnectControllerDialog, ConnectControllerModel } from './connectControllerDialog';
import { ControllerTreeDataProvider } from '../tree/controllerTreeDataProvider';
export type BdcDashboardOptions = { url: string, auth: AuthType, username: string, password: string };
export type BdcDashboardOptions = { url: string, auth: AuthType, username: string, password: string, rememberPassword: boolean };
export type BdcErrorType = 'bdcStatus' | 'bdcEndpoints' | 'general';
export type BdcErrorEvent = { error: Error, errorType: BdcErrorType };
@@ -121,12 +121,20 @@ export class BdcDashboardModel {
*/
private async promptReconnect(): Promise<void> {
this._clusterController = await new ConnectControllerDialog(new ConnectControllerModel(this._options)).showDialog();
await this.updateController();
}
private async updateController(): Promise<void> {
if (!this._clusterController) {
return;
}
this._treeDataProvider.addOrUpdateController(
this._clusterController.url,
this._clusterController.authType,
this._clusterController.username,
this._clusterController.password,
/* Remember password */false);
this._options.rememberPassword);
await this._treeDataProvider.saveControllers();
}
}