Part 2 - Make Model view components disposable + dispose all emitters (#24097)

This commit is contained in:
Cheena Malhotra
2023-08-23 12:46:09 -07:00
committed by GitHub
parent 25a658775c
commit 6c6464e772
58 changed files with 435 additions and 195 deletions

View File

@@ -117,7 +117,7 @@
"mocha": "^7.1.1",
"should": "^13.2.3",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "41",

View File

@@ -203,10 +203,10 @@
tmp "^0.0.33"
yauzl "^2.10.0"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -94,7 +94,7 @@
"should": "^13.2.1",
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "10",

View File

@@ -182,10 +182,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -886,8 +886,7 @@
"defaultValue": "2",
"optionsType": "radio"
},
"dynamicOptions":
{
"dynamicOptions": {
"target": "AZDATA_NB_VAR_SQL_REPLICAS",
"alternates": [
{
@@ -949,8 +948,7 @@
"defaultValue": "-1",
"optionsType": "radio"
},
"dynamicOptions":
{
"dynamicOptions": {
"target": "AZDATA_NB_VAR_SQL_REPLICAS",
"alternates": [
{
@@ -1414,7 +1412,10 @@
"type": "options",
"required": true,
"options": {
"values": ["NodePort", "LoadBalancer"],
"values": [
"NodePort",
"LoadBalancer"
],
"defaultValue": "NodePort",
"optionsType": "radio"
}
@@ -1599,7 +1600,7 @@
"@types/sinon": "^9.0.4",
"@types/uuid": "^8.3.0",
"@types/yamljs": "^0.2.31",
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/azdata-test": "^3.0.3",
"mocha": "^7.1.1",
"should": "^13.2.3",
"sinon": "^9.0.2",

View File

@@ -182,10 +182,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -107,7 +107,7 @@
"sinon": "^9.0.2",
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "84",

View File

@@ -181,10 +181,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -122,8 +122,11 @@
"items": {
"type": "object",
"description": "%config.providerSettingsTitle%",
"required": ["name", "settings"],
"properties":{
"required": [
"name",
"settings"
],
"properties": {
"name": {
"type": "string",
"default": "Azure Public",
@@ -132,11 +135,16 @@
"settings": {
"type": "object",
"description": "%config.providerSettingsDescription%",
"required": ["metadata"],
"required": [
"metadata"
],
"properties": {
"metadata": {
"type": "object",
"required": ["displayName", "id"],
"required": [
"displayName",
"id"
],
"properties": {
"displayName": {
"type": "string",
@@ -150,7 +158,16 @@
},
"endpoints": {
"type": "object",
"required": ["host", "clientId", "scopes", "sqlResource", "microsoftResource", "armResource", "graphResource", "azureStorageResource"],
"required": [
"host",
"clientId",
"scopes",
"sqlResource",
"microsoftResource",
"armResource",
"graphResource",
"azureStorageResource"
],
"properties": {
"type": "object",
"host": {
@@ -516,8 +533,8 @@
"ws": "^7.4.6"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/keytar": "4.4.0",
"@types/lockfile": "^1.0.2",
"@types/mocha": "^7.0.2",

View File

@@ -334,10 +334,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -787,7 +787,7 @@
"should": "^13.2.1",
"@microsoft/vscodetestcover": "^1.2.2",
"typemoq": "^2.1.0",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "40",

View File

@@ -182,10 +182,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -97,8 +97,8 @@
"vscode-nls": "^4.0.0"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/htmlparser2": "^3.10.1",
"@types/mocha": "^7.0.2",
"@types/node": "^12.11.7",

View File

@@ -82,7 +82,8 @@ export function createViewContext(): ViewTestContext {
onValidityChanged: undefined!,
valid: true,
validate: undefined!,
focus: () => Promise.resolve()
focus: () => Promise.resolve(),
dispose() { }
};
let button: azdata.ButtonComponent = Object.assign({}, componentBase, {
onDidClick: onClick.event
@@ -283,6 +284,7 @@ export function createViewContext(): ViewTestContext {
onValidityChanged: undefined!,
validate: undefined!,
initializeModel: () => { return Promise.resolve(); },
dispose() { },
modelBuilder: {
listView: undefined!,
radioCardGroup: undefined!,

View File

@@ -189,10 +189,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -190,6 +190,6 @@
"sinon": "^9.0.2",
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
}
}

View File

@@ -189,10 +189,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -111,8 +111,8 @@
"vscode-nls": "^5.2.0"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.2",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"should": "^13.2.1",
"typemoq": "^2.1.0"
}

View File

@@ -115,7 +115,7 @@ export class MockWizardPage implements azdata.window.WizardPage {
modelView: azdata.ModelView;
valid: boolean;
onValidityChanged: vscode.Event<boolean>;
dispose() { }
registerContent(handler: (view: azdata.ModelView) => void): void {
throw new Error('Method not implemented.');
}
@@ -221,6 +221,18 @@ export class MockDataSourceService implements DataSourceWizardService {
}
export class MockUIComponent implements azdata.Component {
height?: string | number;
width?: string | number;
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
id: string;
enabled: boolean;
onValidityChanged: vscode.Event<boolean>;
@@ -245,6 +257,17 @@ export class MockUIComponent implements azdata.Component {
}
export class MockInputBoxComponent extends MockUIComponent implements azdata.InputBoxComponent {
display?: azdata.DisplayType;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
dispose() {
throw new Error('Method not implemented.');
}
validationErrorMessage?: string;
readOnly?: boolean;
title?: string;
maxLength?: number;
onEnterKeyPressed: vscode.Event<string>;
value?: string;
ariaLabel?: string;
@@ -266,6 +289,25 @@ export class MockInputBoxComponent extends MockUIComponent implements azdata.Inp
}
export class MockDropdownComponent extends MockUIComponent implements azdata.DropDownComponent {
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
fireOnTextChange?: boolean;
required?: boolean;
placeholder?: string;
validationErrorMessages?: string[];
strictSelection?: boolean;
loading?: boolean;
showText?: boolean;
loadingText?: string;
loadingCompletedText?: string;
onValueChanged: vscode.Event<any>;
value: string | azdata.CategoryValue;
values: string[] | azdata.CategoryValue[];
@@ -275,6 +317,9 @@ export class MockDropdownComponent extends MockUIComponent implements azdata.Dro
}
export class MockTableComponent extends MockUIComponent implements azdata.TableComponent {
dispose() {
throw new Error('Method not implemented.');
}
display?: azdata.DisplayType;
ariaLabel?: string;
ariaSelected?: boolean;
@@ -307,6 +352,9 @@ export class MockTableComponent extends MockUIComponent implements azdata.TableC
}
export class MockDeclarativeTableComponent extends MockUIComponent implements azdata.DeclarativeTableComponent {
dispose() {
throw new Error('Method not implemented.');
}
enableRowSelection?: boolean;
selectedRow?: number;
onRowSelected: vscode.Event<azdata.DeclarativeTableRowSelectedEvent>;
@@ -333,6 +381,16 @@ export class MockDeclarativeTableComponent extends MockUIComponent implements az
}
export class MockTreeComponent extends MockUIComponent implements azdata.TreeComponent<any> {
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
withCheckbox: boolean;
height?: number | string;
width?: number | string;
@@ -349,6 +407,25 @@ export class MockTreeComponentView extends vscode.Disposable implements azdata.T
}
export class MockTextComponent extends MockUIComponent implements azdata.TextComponent {
height?: string | number;
width?: string | number;
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
links?: azdata.LinkArea[];
description?: string;
requiredIndicator?: boolean;
headingLevel?: azdata.HeadingLevel;
textType?: azdata.TextType;
ariaLive?: azdata.AriaLiveValue;
title?: string;
value: string;
id: string;
enabled: boolean;
@@ -358,6 +435,9 @@ export class MockTextComponent extends MockUIComponent implements azdata.TextCom
}
export class MockContainer<TLayout, TItemLayout> extends MockUIComponent implements azdata.Container<TLayout, TItemLayout> {
dispose() {
throw new Error('Method not implemented.');
}
setItemLayout(component: azdata.Component, layout: TItemLayout): void {
throw new Error('Method not implemented.');
}
@@ -391,6 +471,9 @@ export class MockContainer<TLayout, TItemLayout> extends MockUIComponent impleme
}
}
export class MockToolbarContainer extends MockContainer<any, any> implements azdata.ToolbarContainer {
dispose() {
throw new Error('Method not implemented.');
}
setItemLayout(component: azdata.Component, layout: any): void {
throw new Error('Method not implemented.');
}
@@ -406,6 +489,10 @@ export class MockToolbarContainer extends MockContainer<any, any> implements azd
}
export class MockDivContainer extends MockContainer<azdata.DivLayout, azdata.DivItemLayout> implements azdata.DivContainer {
dispose() {
throw new Error('Method not implemented.');
}
ariaLive?: azdata.AriaLiveValue;
setItemLayout(component: azdata.Component, layout: azdata.DivItemLayout): void {
throw new Error('Method not implemented.');
}
@@ -425,6 +512,9 @@ export class MockDivContainer extends MockContainer<azdata.DivLayout, azdata.Div
}
export class MockFlexContainer extends MockContainer<azdata.FlexLayout, azdata.FlexItemLayout> implements azdata.FlexContainer {
dispose() {
throw new Error('Method not implemented.');
}
setItemLayout(component: azdata.Component, layout: azdata.FlexItemLayout): void {
throw new Error('Method not implemented.');
}
@@ -440,6 +530,9 @@ export class MockFlexContainer extends MockContainer<azdata.FlexLayout, azdata.F
}
export class MockFormContainer extends MockContainer<azdata.FormLayout, azdata.FormItemLayout> implements azdata.FormContainer {
dispose() {
throw new Error('Method not implemented.');
}
setItemLayout(component: azdata.Component, layout: azdata.FormItemLayout): void {
throw new Error('Method not implemented.');
}
@@ -455,6 +548,21 @@ export class MockFormContainer extends MockContainer<azdata.FormLayout, azdata.F
}
export class MockLoadingComponent extends MockUIComponent implements azdata.LoadingComponent {
height?: string | number;
width?: string | number;
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
showText?: boolean;
loadingText?: string;
loadingCompletedText?: string;
loading: boolean;
component: azdata.Component;
}
@@ -588,6 +696,9 @@ export class MockModelBuilder implements azdata.ModelBuilder {
}
export class MockModelViewEditor implements azdata.workspace.ModelViewEditor {
dispose() {
throw new Error('Method not implemented.');
}
contentHandler: (view: azdata.ModelView) => void;
saveHandler: () => Thenable<boolean>;
openEditor(position?: vscode.ViewColumn): Thenable<void> {
@@ -606,6 +717,9 @@ export class MockModelViewEditor implements azdata.workspace.ModelViewEditor {
}
export class MockModelView implements azdata.ModelView {
dispose() {
throw new Error('Method not implemented.');
}
private onClosedEmitter = new vscode.EventEmitter<any>();
public get onClosed(): vscode.Event<any> {
return this.onClosedEmitter.event;
@@ -634,6 +748,20 @@ export class MockModelView implements azdata.ModelView {
}
export class MockButtonComponent extends MockUIComponent implements azdata.ButtonComponent {
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
CSSStyles?: azdata.CssStyles;
dispose() {
throw new Error('Method not implemented.');
}
buttonType?: azdata.ButtonType;
description?: string;
secondary?: boolean;
fileType?: string;
label: string;
title: string;
iconPath: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri; };
@@ -650,6 +778,17 @@ export class MockButtonComponent extends MockUIComponent implements azdata.Butto
}
export class MockEditorComponent extends MockUIComponent implements azdata.EditorComponent {
height?: string | number;
width?: string | number;
position?: azdata.PositionType;
display?: azdata.DisplayType;
ariaLabel?: string;
ariaRole?: string;
ariaSelected?: boolean;
ariaHidden?: boolean;
dispose() {
throw new Error('Method not implemented.');
}
content: string;
languageMode: string;
editorUri: string;

View File

@@ -227,10 +227,10 @@
tmp "^0.0.33"
yauzl "^2.10.0"
"@microsoft/azdata-test@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.2.tgz#71cfbbc2ee9c1805311f3a5828b50679a5e6d73c"
integrity sha512-NMoSKp/Zgs+1ZIe07w+FeKhqMaxgViLGmLTQHPfYN7RRTFErJBd8JgskxYoLZbgcctfVsV+Yw+zQEn1+g2mPKg==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -92,7 +92,7 @@
"sinon": "^9.0.2",
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "23",

View File

@@ -203,10 +203,10 @@
tmp "^0.0.33"
yauzl "^2.10.0"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -42,7 +42,7 @@
"chai": "3.5.0",
"mocha": "^7.1.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"resolutions": {
"jsonwebtoken": "9.0.0"

View File

@@ -354,10 +354,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -153,7 +153,7 @@
"should": "^13.2.1",
"typemoq": "^2.1.0",
"lodash": "^4.17.21",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"__metadata": {
"id": "65",

View File

@@ -27,7 +27,8 @@ export function createViewContext(): ViewTestContext {
onValidityChanged: undefined!,
valid: true,
validate: undefined!,
focus: undefined!
focus: undefined!,
dispose() { }
};
let button: azdata.ButtonComponent = Object.assign({}, componentBase, {
onDidClick: onClick.event
@@ -266,7 +267,8 @@ export function createViewContext(): ViewTestContext {
infoBox: undefined!,
slider: undefined!,
executionPlan: undefined!,
}
},
dispose() { }
};
let tab: azdata.window.DialogTab = {
title: '',
@@ -280,7 +282,8 @@ export function createViewContext(): ViewTestContext {
},
onValidityChanged: undefined!,
valid: true,
modelView: undefined!
modelView: undefined!,
dispose() { }
};
let dialogButton: azdata.window.Button = {
@@ -310,7 +313,8 @@ export function createViewContext(): ViewTestContext {
valid: true,
loading: false,
loadingText: '',
loadingCompletedText: ''
loadingCompletedText: '',
dispose() { }
};
let wizard: azdata.window.Wizard = {
title: '',
@@ -351,7 +355,8 @@ export function createViewContext(): ViewTestContext {
}
},
modelView: undefined!,
valid: true
valid: true,
dispose() { }
};
apiWrapper.setup(x => x.createButton(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => dialogButton);
apiWrapper.setup(x => x.createTab(TypeMoq.It.isAny())).returns(() => tab);

View File

@@ -230,10 +230,10 @@
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -1566,7 +1566,7 @@
"devDependencies": {
"@types/mocha": "^7.0.2",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/azdata-test": "^3.0.3",
"mocha": "^7.1.1",
"should": "^13.2.3",
"typemoq": "^2.1.0"

View File

@@ -81,6 +81,7 @@ export abstract class DialogBase<DialogResult> {
this.dialogObject.registerContent(async view => {
this._modelView = view;
this._formContainer = this.createFormContainer([]);
this.disposables.push(this._formContainer);
this._loadingComponent = view.modelBuilder.loadingComponent().withItem(this._formContainer).withProps({
loading: true,
loadingText: uiLoc.LoadingDialogText,

View File

@@ -203,10 +203,10 @@
tmp "^0.0.33"
yauzl "^2.10.0"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -700,7 +700,7 @@
"sinon": "^9.0.2",
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
},
"resolutions": {
"url-parse": "^1.5.8",

View File

@@ -335,6 +335,7 @@ class TestComponentBase implements azdata.Component {
focus(): Thenable<void> {
return Promise.resolve();
}
dispose() { }
}
export class TestDropdownComponent extends TestComponentBase implements azdata.DropDownComponent {
@@ -528,6 +529,7 @@ export function createViewContext(): TestContext {
onValidityChanged: undefined!,
validate: undefined!,
initializeModel: () => { return Promise.resolve(); },
dispose() { },
modelBuilder: <azdata.ModelBuilder>{
radioButton: () => radioButtonBuilder,
text: () => textBuilder,

View File

@@ -127,7 +127,8 @@ describe('Manage Package Dialog', () => {
onValidityChanged: undefined!,
valid: true,
validate: undefined!,
focus: undefined!
focus: undefined!,
dispose() { }
};
let button: azdata.ButtonComponent = Object.assign({}, componentBase, {
onDidClick: onClick.event
@@ -269,6 +270,7 @@ describe('Manage Package Dialog', () => {
onValidityChanged: undefined!,
validate: undefined!,
initializeModel: () => { return Promise.resolve(); },
dispose() { },
modelBuilder: {
listView: undefined!,
radioCardGroup: undefined!,

View File

@@ -228,10 +228,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -25,7 +25,7 @@
"supported": true
}
},
"extensionDependencies": [ ],
"extensionDependencies": [],
"contributes": {
"configuration": [
{
@@ -212,8 +212,8 @@
"vscode-nls": "^4.1.2"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/mocha": "^7.0.2",
"@types/node": "^12.11.7",
"should": "^13.2.3",

View File

@@ -235,10 +235,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -44,20 +44,17 @@
}
],
"menus": {
"objectExplorer/item/context": [
],
"dataExplorer/context": [
],
"commandPalette": [
]
"objectExplorer/item/context": [],
"dataExplorer/context": [],
"commandPalette": []
}
},
"dependencies": {
"vscode-nls": "^4.0.0"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/mocha": "^7.0.2",
"should": "^13.2.1",
"typemoq": "^2.1.0"

View File

@@ -19,7 +19,8 @@ export function createViewContext(): TestContext {
onValidityChanged: undefined!,
valid: true,
validate: undefined!,
focus: undefined!
focus: undefined!,
dispose() { }
};
const components: azdata.Component[] = [];
@@ -67,6 +68,7 @@ export function createViewContext(): TestContext {
onValidityChanged: undefined!,
validate: undefined!,
initializeModel: () => { return Promise.resolve(); },
dispose() { },
modelBuilder: {
listView: undefined!,
radioCardGroup: undefined!,

View File

@@ -233,10 +233,10 @@
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
"@microsoft/azdata-test@^3.0.1":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.2.tgz#71cfbbc2ee9c1805311f3a5828b50679a5e6d73c"
integrity sha512-NMoSKp/Zgs+1ZIe07w+FeKhqMaxgViLGmLTQHPfYN7RRTFErJBd8JgskxYoLZbgcctfVsV+Yw+zQEn1+g2mPKg==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -538,7 +538,7 @@
"@types/semver": "^7.3.1",
"@types/sinon": "^9.0.8",
"@types/yamljs": "0.2.30",
"@microsoft/azdata-test": "^3.0.2",
"@microsoft/azdata-test": "^3.0.3",
"mocha": "^7.1.1",
"should": "^13.2.3",
"sinon": "^9.2.0",

View File

@@ -196,10 +196,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.2.tgz#71cfbbc2ee9c1805311f3a5828b50679a5e6d73c"
integrity sha512-NMoSKp/Zgs+1ZIe07w+FeKhqMaxgViLGmLTQHPfYN7RRTFErJBd8JgskxYoLZbgcctfVsV+Yw+zQEn1+g2mPKg==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -115,8 +115,8 @@
"vscode-nls": "^4.0.0"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/mocha": "^7.0.2",
"@types/node": "^12.11.7",
"@types/sinon": "^9.0.4",

View File

@@ -81,7 +81,8 @@ export function createViewContext(): ViewTestContext {
onValidityChanged: undefined!,
valid: true,
validate: undefined!,
focus: () => Promise.resolve()
focus: () => Promise.resolve(),
dispose() { }
};
let container = {
@@ -325,6 +326,7 @@ export function createViewContext(): ViewTestContext {
onValidityChanged: undefined!,
validate: undefined!,
initializeModel: () => { return Promise.resolve(); },
dispose() { },
modelBuilder: {
listView: undefined!,
radioCardGroup: undefined!,

View File

@@ -189,10 +189,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -79,6 +79,6 @@
"typemoq": "^2.1.0",
"@microsoft/vscodetestcover": "^1.2.2",
"mocha": "^7.1.1",
"@microsoft/azdata-test": "^3.0.1"
"@microsoft/azdata-test": "^3.0.3"
}
}

View File

@@ -229,10 +229,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"

View File

@@ -542,8 +542,8 @@
"xml-formatter": "2.1.0"
},
"devDependencies": {
"@microsoft/azdata-test": "^3.0.1",
"@microsoft/vscodetestcover": "^1.2.2",
"@microsoft/azdata-test": "^3.0.3",
"@types/fs-extra": "^5.0.0",
"@types/mocha": "^7.0.2",
"@types/request": "^2.48.8",

View File

@@ -229,10 +229,10 @@
dependencies:
"@vscode/extension-telemetry" "0.6.1"
"@microsoft/azdata-test@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.1.tgz#a8b89a12de42f277d33aae71c277d0c8efcfbee0"
integrity sha512-Zrctm/zKufwIRF9jfw8TOBzr5woLdKXAGNTlbAQl0IGLzVoIGULj9Gqdc1Ikhrov3rM0NkbAF/PY6j6BHiW8Tw==
"@microsoft/azdata-test@^3.0.3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@microsoft/azdata-test/-/azdata-test-3.0.3.tgz#a1b5bbead5412ac7925129e6199d724bfc8117ee"
integrity sha512-Whit8+MpNN/Kkx3R9CGT26FhYNzkjNyOb6dsaqkMq1scpO3JCeNJqhcSqTTsSbkRVdAKoYrJcpLZdoO9D1X/yw==
dependencies:
http-proxy-agent "^5.0.0"
https-proxy-agent "^5.0.0"