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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ export class ConnectToControllerDialog extends ControllerDialogBase {
return this.namespaceInputBox;
}
protected getComponents() {
protected override getComponents() {
return [
...super.getComponents(),
{
@@ -221,7 +221,7 @@ export class ConnectToControllerDialog extends ControllerDialogBase {
}];
}
protected initializeFields(controllerInfo: ControllerInfo | undefined, password: string | undefined) {
protected override initializeFields(controllerInfo: ControllerInfo | undefined, password: string | undefined) {
super.initializeFields(controllerInfo, password);
this.rememberPwCheckBox = this.modelBuilder.checkBox()
.withProperties<azdata.CheckBoxProperties>({
@@ -282,7 +282,7 @@ export class PasswordToControllerDialog extends ControllerDialogBase {
return this.passwordInputBox;
}
protected readonlyFields(): azdata.Component[] {
protected override readonlyFields(): azdata.Component[] {
return [
this.urlInputBox,
...this.kubeConfigInputBox.items,
@@ -331,7 +331,7 @@ export class PasswordToControllerDialog extends ControllerDialogBase {
return true;
}
public showDialog(controllerInfo?: ControllerInfo): azdata.window.Dialog {
public override showDialog(controllerInfo?: ControllerInfo): azdata.window.Dialog {
const dialog = super.showDialog(controllerInfo);
dialog.okButton.label = loc.ok;
return dialog;