mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-22 17:22:59 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* 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:
@@ -80,7 +80,7 @@ class AccountPanel extends ViewPane {
|
||||
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
||||
}
|
||||
|
||||
protected renderBody(container: HTMLElement): void {
|
||||
protected override renderBody(container: HTMLElement): void {
|
||||
this.accountList = new List<azdata.Account>('AccountList', container, new AccountListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(AccountListRenderer)]);
|
||||
this.tenantList = new List<Tenant>('TenantList', container, new TenantListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(TenantListRenderer)]);
|
||||
this._register(attachListStyler(this.accountList, this.themeService));
|
||||
@@ -90,7 +90,7 @@ class AccountPanel extends ViewPane {
|
||||
this.tenantList.getHTMLElement().tabIndex = -1;
|
||||
}
|
||||
|
||||
protected layoutBody(size: number): void {
|
||||
protected override layoutBody(size: number): void {
|
||||
this.accountList?.layout(size);
|
||||
this.tenantList?.layout(size);
|
||||
}
|
||||
@@ -99,7 +99,7 @@ class AccountPanel extends ViewPane {
|
||||
return this.accountList!.length;
|
||||
}
|
||||
|
||||
public focus() {
|
||||
public override focus() {
|
||||
this.accountList!.domFocus();
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ export class AccountDialog extends Modal {
|
||||
this._splitView!.layout(DOM.getContentHeight(this._container!));
|
||||
}
|
||||
|
||||
public render() {
|
||||
public override render() {
|
||||
super.render();
|
||||
attachModalDialogStyler(this, this._themeService);
|
||||
this._closeButton = this.addFooterButton(localize('accountDialog.close', "Close"), () => this.close());
|
||||
@@ -270,12 +270,12 @@ export class AccountDialog extends Modal {
|
||||
}
|
||||
|
||||
/* Overwrite escape key behavior */
|
||||
protected onClose() {
|
||||
protected override onClose() {
|
||||
this.close();
|
||||
}
|
||||
|
||||
/* Overwrite enter key behavior */
|
||||
protected onAccept() {
|
||||
protected override onAccept() {
|
||||
this.close('ok');
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ export class AccountDialog extends Modal {
|
||||
return true;
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
public override dispose(): void {
|
||||
super.dispose();
|
||||
for (const provider of this._providerViewsMap.values()) {
|
||||
if (provider.addAccountAction) {
|
||||
|
||||
@@ -99,11 +99,11 @@ export class AccountListRenderer extends AccountPickerListRenderer {
|
||||
super();
|
||||
}
|
||||
|
||||
public get templateId(): string {
|
||||
public override get templateId(): string {
|
||||
return AccountListRenderer.TEMPLATE_ID;
|
||||
}
|
||||
|
||||
public renderTemplate(container: HTMLElement): AccountListTemplate {
|
||||
public override renderTemplate(container: HTMLElement): AccountListTemplate {
|
||||
const tableTemplate = super.renderTemplate(container) as AccountListTemplate;
|
||||
tableTemplate.content = DOM.append(tableTemplate.label, DOM.$('div.content'));
|
||||
tableTemplate.actions = new ActionBar(tableTemplate.root, { animated: false });
|
||||
@@ -111,7 +111,7 @@ export class AccountListRenderer extends AccountPickerListRenderer {
|
||||
return tableTemplate;
|
||||
}
|
||||
|
||||
public renderElement(account: azdata.Account, index: number, templateData: AccountListTemplate): void {
|
||||
public override renderElement(account: azdata.Account, index: number, templateData: AccountListTemplate): void {
|
||||
super.renderElement(account, index, templateData);
|
||||
if (account.isStale) {
|
||||
templateData.content.innerText = localize('refreshCredentials', "You need to refresh the credentials for this account.");
|
||||
|
||||
@@ -191,7 +191,7 @@ export class AccountPicker extends Disposable {
|
||||
});
|
||||
}
|
||||
|
||||
public dispose() {
|
||||
public override dispose() {
|
||||
super.dispose();
|
||||
if (this._accountList) {
|
||||
this._accountList.dispose();
|
||||
|
||||
@@ -71,7 +71,7 @@ export class AutoOAuthDialog extends Modal {
|
||||
);
|
||||
}
|
||||
|
||||
public render() {
|
||||
public override render() {
|
||||
super.render();
|
||||
attachModalDialogStyler(this, this._themeService);
|
||||
this.backButton!.onDidClick(() => this.cancel());
|
||||
@@ -117,12 +117,12 @@ export class AutoOAuthDialog extends Modal {
|
||||
}
|
||||
|
||||
/* Overwrite escape key behavior */
|
||||
protected onClose() {
|
||||
protected override onClose() {
|
||||
this.cancel();
|
||||
}
|
||||
|
||||
/* Overwrite enter key behavior */
|
||||
protected onAccept() {
|
||||
protected override onAccept() {
|
||||
this.addAccount();
|
||||
}
|
||||
|
||||
|
||||
@@ -65,18 +65,18 @@ export class TenantListRenderer extends TenantPickerListRenderer {
|
||||
super();
|
||||
}
|
||||
|
||||
public get templateId(): string {
|
||||
public override get templateId(): string {
|
||||
return TenantPickerListRenderer.TEMPLATE_ID;
|
||||
}
|
||||
|
||||
public renderTemplate(container: HTMLElement): PickerListTemplate {
|
||||
public override renderTemplate(container: HTMLElement): PickerListTemplate {
|
||||
const tableTemplate = super.renderTemplate(container) as PickerListTemplate;
|
||||
tableTemplate.content = DOM.append(tableTemplate.label, DOM.$('div.content'));
|
||||
|
||||
return tableTemplate;
|
||||
}
|
||||
|
||||
public renderElement(tenant: Tenant, index: number, templateData: PickerListTemplate): void {
|
||||
public override renderElement(tenant: Tenant, index: number, templateData: PickerListTemplate): void {
|
||||
super.renderElement(tenant, index, templateData);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user