ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-03 01:25:38 -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

6
extensions/arc/src/ui/components/keyValueContainer.ts
View File

@@ -88,7 +88,7 @@ export class TextKeyValue extends KeyValue {
this.container.addItem(this.text, this.valueFlex);
}
public setValue(newValue: string) {
public override setValue(newValue: string) {
super.setValue(newValue);
this.text.value = newValue;
}
@@ -125,7 +125,7 @@ export abstract class BaseInputKeyValue extends KeyValue {
this.container.addItem(inputContainer, this.valueFlex);
}
public setValue(newValue: string) {
public override setValue(newValue: string) {
super.setValue(newValue);
this.input.value = newValue;
}
@@ -161,7 +161,7 @@ export class LinkKeyValue extends KeyValue {
this.container.addItem(this.link, this.valueFlex);
}
public setValue(newValue: string) {
public override setValue(newValue: string) {
super.setValue(newValue);
this.link.label = newValue;
}

2
extensions/arc/src/ui/dashboards/controller/controllerDashboard.ts
View File

@@ -15,7 +15,7 @@ export class ControllerDashboard extends Dashboard {
super(loc.arcControllerDashboard(_controllerModel.info.name), 'ArcDataControllerDashboard');
}
public async showDashboard(): Promise<void> {
public override async showDashboard(): Promise<void> {
await super.showDashboard();
// Kick off the model refresh but don't wait on it since that's all handled with callbacks anyways
this._controllerModel.refresh(false).catch(err => console.log(`Error refreshing Controller dashboard ${err}`));

2
extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
View File

@@ -32,7 +32,7 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
private readonly _azdataApi: azdataExt.IExtension;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _miaaModel: MiaaModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _miaaModel: MiaaModel) {
super(modelView, dashboard);
this._azdataApi = vscode.extensions.getExtension(azdataExt.extension.name)?.exports;

2
extensions/arc/src/ui/dashboards/miaa/miaaDashboard.ts
View File

@@ -18,7 +18,7 @@ export class MiaaDashboard extends Dashboard {
super(loc.miaaDashboard(_miaaModel.info.name), 'ArcMiaaDashboard');
}
public async showDashboard(): Promise<void> {
public override async showDashboard(): Promise<void> {
await super.showDashboard();
// Kick off the model refreshes but don't wait on it since that's all handled with callbacks anyways
this._controllerModel.refresh().catch(err => console.log(`Error refreshing controller model for MIAA dashboard ${err}`));

2
extensions/arc/src/ui/dashboards/postgres/postgresComputeAndStoragePage.ts
View File

@@ -47,7 +47,7 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
private readonly _azdataApi: azdataExt.IExtension;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
this._azdataApi = vscode.extensions.getExtension(azdataExt.extension.name)?.exports;

2
extensions/arc/src/ui/dashboards/postgres/postgresConnectionStringsPage.ts
View File

@@ -14,7 +14,7 @@ export class PostgresConnectionStringsPage extends DashboardPage {
private keyValueContainer?: KeyValueContainer;
private connectionStringsLoading!: azdata.LoadingComponent;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
this.disposables.push(this._postgresModel.onConfigUpdated(

2
extensions/arc/src/ui/dashboards/postgres/postgresDashboard.ts
View File

@@ -24,7 +24,7 @@ export class PostgresDashboard extends Dashboard {
super(loc.postgresDashboard(_postgresModel.info.name), 'ArcPgDashboard');
}
public async showDashboard(): Promise<void> {
public override async showDashboard(): Promise<void> {
await super.showDashboard();
// Kick off the model refresh but don't wait on it since that's all handled with callbacks anyways

2
extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
View File

@@ -37,7 +37,7 @@ export class PostgresOverviewPage extends DashboardPage {
private readonly _azdataApi: azdataExt.IExtension;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
this._azdataApi = vscode.extensions.getExtension(azdataExt.extension.name)?.exports;

2
extensions/arc/src/ui/dashboards/postgres/postgresParameters.ts
View File

@@ -39,7 +39,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
protected readonly _azdataApi: azdataExt.IExtension;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, protected _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, protected _postgresModel: PostgresModel) {
super(modelView, dashboard);
this._azdataApi = vscode.extensions.getExtension(azdataExt.extension.name)?.exports;

2
extensions/arc/src/ui/dashboards/postgres/postgresPropertiesPage.ts
View File

@@ -17,7 +17,7 @@ export class PostgresPropertiesPage extends DashboardPage {
private loading?: azdata.LoadingComponent;
private keyValueContainer?: KeyValueContainer;
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
this.disposables.push(this._postgresModel.onConfigUpdated(

2
extensions/arc/src/ui/dashboards/postgres/postgresResourceHealthPage.ts
View File

@@ -36,7 +36,7 @@ export class PostgresResourceHealthPage extends DashboardPage {
private coordinatorData: PodHealthModel[] = [];
private podsData: PodHealthModel[] = [];
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
this.disposables.push(

2
extensions/arc/src/ui/dashboards/postgres/postgresSupportRequestPage.ts
View File

@@ -13,7 +13,7 @@ import { ResourceType } from 'arc';
import { PostgresModel } from '../../../models/postgresModel';
export class PostgresSupportRequestPage extends DashboardPage {
constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
super(modelView, dashboard);
}

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;

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

@@ -37,7 +37,7 @@ export class ControllerTreeNode extends TreeNode {
});
}
public async getChildren(): Promise<TreeNode[]> {
public override async getChildren(): Promise<TreeNode[]> {
try {
await this.model.refresh(false);
this.updateChildren(this.model.registrations);
@@ -60,7 +60,7 @@ export class ControllerTreeNode extends TreeNode {
return this._children.length > 0 ? this._children : [new NoInstancesTreeNode()];
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const controllerDashboard = new ControllerDashboard(this.model);
await controllerDashboard.showDashboard();
}

2
extensions/arc/src/ui/tree/miaaTreeNode.ts
View File

@@ -19,7 +19,7 @@ export class MiaaTreeNode extends ResourceTreeNode<MiaaModel> {
super(model.info.name, vscode.TreeItemCollapsibleState.None, ResourceType.sqlManagedInstances, model);
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const miaaDashboard = new MiaaDashboard(this._controllerModel, this.model);
await miaaDashboard.showDashboard();
}

2
extensions/arc/src/ui/tree/postgresTreeNode.ts
View File

@@ -19,7 +19,7 @@ export class PostgresTreeNode extends ResourceTreeNode<PostgresModel> {
super(model.info.name, vscode.TreeItemCollapsibleState.None, ResourceType.postgresInstances, model);
}
public async openDashboard(): Promise<void> {
public override async openDashboard(): Promise<void> {
const postgresDashboard = new PostgresDashboard(this._context, this._controllerModel, this.model);
await postgresDashboard.showDashboard();
}

2
extensions/arc/src/ui/tree/refreshTreeNode.ts
View File

@@ -17,7 +17,7 @@ export class RefreshTreeNode extends TreeNode {
super(loc.refreshToEnterCredentials, vscode.TreeItemCollapsibleState.None, '');
}
public command: vscode.Command = {
public override command: vscode.Command = {
command: refreshActionId,
title: loc.refreshToEnterCredentials,
arguments: [this._parent]

4
extensions/arc/src/ui/tree/treeNode.ts
View File

@@ -20,6 +20,6 @@ export abstract class TreeNode extends vscode.TreeItem {
public async openDashboard(): Promise<void> { }
iconPath = getResourceTypeIcon(this.resourceType);
contextValue = this.resourceType;
override iconPath = getResourceTypeIcon(this.resourceType);
override contextValue = this.resourceType;
}