ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -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

16
src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts
View File

@@ -62,14 +62,14 @@ export class CmsConnectionWidget extends ConnectionWidget {
}
}
protected registerListeners(): void {
protected override registerListeners(): void {
super.registerListeners();
if (this._serverDescriptionInputBox) {
this._register(styler.attachInputBoxStyler(this._serverDescriptionInputBox, this._themeService));
}
}
protected fillInConnectionForm(authTypeChanged: boolean = false): void {
protected override fillInConnectionForm(authTypeChanged: boolean = false): void {
// Server Name
this.addServerNameOption();
@@ -89,7 +89,7 @@ export class CmsConnectionWidget extends ConnectionWidget {
this.addAdvancedOptions();
}
protected addAuthenticationTypeOption(authTypeChanged: boolean = false): void {
protected override addAuthenticationTypeOption(authTypeChanged: boolean = false): void {
super.addAuthenticationTypeOption(authTypeChanged);
let authTypeOption = this._optionsMaps[ConnectionOptionSpecialType.authType];
let newAuthTypes = authTypeOption.categoryValues;
@@ -124,7 +124,7 @@ export class CmsConnectionWidget extends ConnectionWidget {
}
}
public createConnectionWidget(container: HTMLElement, authTypeChanged: boolean = false): void {
public override createConnectionWidget(container: HTMLElement, authTypeChanged: boolean = false): void {
this._container = DOM.append(container, DOM.$('div.connection-table'));
this._tableContainer = DOM.append(this._container, DOM.$('table.connection-table-content'));
this.fillInConnectionForm(authTypeChanged);
@@ -138,14 +138,14 @@ export class CmsConnectionWidget extends ConnectionWidget {
});
}
public handleOnConnecting(): void {
public override handleOnConnecting(): void {
super.handleOnConnecting();
if (this._serverDescriptionInputBox) {
this._serverDescriptionInputBox.disable();
}
}
public handleResetConnection(): void {
public override handleResetConnection(): void {
super.handleResetConnection();
if (this._serverDescriptionInputBox) {
this._serverDescriptionInputBox.enable();
@@ -156,7 +156,7 @@ export class CmsConnectionWidget extends ConnectionWidget {
return this._serverDescriptionInputBox.value;
}
public connect(model: IConnectionProfile): boolean {
public override connect(model: IConnectionProfile): boolean {
let validInputs = super.connect(model);
if (this._serverDescriptionInputBox) {
model.options.registeredServerDescription = this._serverDescriptionInputBox.value;
@@ -165,7 +165,7 @@ export class CmsConnectionWidget extends ConnectionWidget {
return validInputs;
}
public fillInConnectionInputs(connectionInfo: IConnectionProfile) {
public override fillInConnectionInputs(connectionInfo: IConnectionProfile) {
super.fillInConnectionInputs(connectionInfo);
if (connectionInfo) {
let description = connectionInfo.options.registeredServerDescription ? connectionInfo.options.registeredServerDescription : '';