diff --git a/extensions/dacpac/src/test/testContext.ts b/extensions/dacpac/src/test/testContext.ts index 635ec4f793..6e3996dc6a 100644 --- a/extensions/dacpac/src/test/testContext.ts +++ b/extensions/dacpac/src/test/testContext.ts @@ -285,7 +285,6 @@ export function createViewContext(): ViewTestContext { divContainer: () => divBuilder, flexContainer: () => flexBuilder, splitViewContainer: undefined!, - dom: undefined!, card: () => undefined!, inputBox: () => inputBoxBuilder, checkBox: () => checkBoxBuilder!, diff --git a/extensions/machine-learning/src/test/views/utils.ts b/extensions/machine-learning/src/test/views/utils.ts index 2e758f0607..b4d8b61e64 100644 --- a/extensions/machine-learning/src/test/views/utils.ts +++ b/extensions/machine-learning/src/test/views/utils.ts @@ -236,7 +236,6 @@ export function createViewContext(): ViewTestContext { divContainer: () => divBuilder, flexContainer: () => flexBuilder, splitViewContainer: undefined!, - dom: undefined!, card: () => cardBuilder, inputBox: () => inputBoxBuilder, checkBox: () => checkBoxBuilder!, diff --git a/extensions/notebook/src/test/managePackages/managePackagesDialog.test.ts b/extensions/notebook/src/test/managePackages/managePackagesDialog.test.ts index 34263d61ea..f4f4d5d457 100644 --- a/extensions/notebook/src/test/managePackages/managePackagesDialog.test.ts +++ b/extensions/notebook/src/test/managePackages/managePackagesDialog.test.ts @@ -275,7 +275,6 @@ describe('Manage Package Dialog', () => { divContainer: undefined!, flexContainer: () => flexBuilder, splitViewContainer: undefined!, - dom: undefined!, card: undefined!, inputBox: () => inputBoxBuilder, checkBox: undefined!, diff --git a/extensions/schema-compare/src/test/testContext.ts b/extensions/schema-compare/src/test/testContext.ts index 85d0b22c97..fb2f60b2cd 100644 --- a/extensions/schema-compare/src/test/testContext.ts +++ b/extensions/schema-compare/src/test/testContext.ts @@ -327,7 +327,6 @@ export function createViewContext(): ViewTestContext { divContainer: () => divBuilder, flexContainer: () => flexBuilder, splitViewContainer: () => splitViewBuilder, - dom: undefined!, card: () => undefined!, inputBox: () => inputBoxBuilder, checkBox: () => checkBoxBuilder!, diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts index edac4e7e60..c5592b778c 100644 --- a/src/sql/azdata.d.ts +++ b/src/sql/azdata.d.ts @@ -2587,7 +2587,6 @@ declare module 'azdata' { divContainer(): DivBuilder; flexContainer(): FlexBuilder; splitViewContainer(): SplitViewBuilder; - dom(): ComponentBuilder; /** * @deprecated please use radioCardGroup component. */ @@ -3370,13 +3369,6 @@ declare module 'azdata' { options?: vscode.WebviewOptions; } - export interface DomProperties extends ComponentProperties { - /** - * Contents of the DOM component. - */ - html?: string; - } - /** * Editor properties for the editor component */ @@ -3478,9 +3470,6 @@ declare module 'azdata' { onCardSelectedChanged: vscode.Event; } - export interface DomComponent extends Component, DomProperties { - } - export interface TextComponent extends Component, TextComponentProperties { } diff --git a/src/sql/platform/dashboard/browser/interfaces.ts b/src/sql/platform/dashboard/browser/interfaces.ts index cc0ee8e08c..d5d6b25476 100644 --- a/src/sql/platform/dashboard/browser/interfaces.ts +++ b/src/sql/platform/dashboard/browser/interfaces.ts @@ -138,7 +138,6 @@ export enum ModelComponentTypes { FileBrowserTree, Editor, DiffEditor, - Dom, Hyperlink, Image, RadioCardGroup, diff --git a/src/sql/workbench/api/common/extHostModelView.ts b/src/sql/workbench/api/common/extHostModelView.ts index 01828266f0..791c10c1f7 100644 --- a/src/sql/workbench/api/common/extHostModelView.ts +++ b/src/sql/workbench/api/common/extHostModelView.ts @@ -228,13 +228,6 @@ class ModelBuilderImpl implements azdata.ModelBuilder { return builder; } - dom(): azdata.ComponentBuilder { - let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new DomComponentWrapper(this._proxy, this._handle, id), id); - this._componentBuilders.set(id, builder); - return builder; - } - hyperlink(): azdata.ComponentBuilder { let id = this.getNextComponentId(); let builder: ComponentBuilderImpl = this.getComponentBuilder(new HyperlinkComponentWrapper(this._proxy, this._handle, id), id); @@ -1133,21 +1126,6 @@ class WebViewWrapper extends ComponentWrapper implements azdata.WebViewComponent } } -class DomComponentWrapper extends ComponentWrapper implements azdata.DomComponent { - - constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { - super(proxy, handle, ModelComponentTypes.Dom, id); - this.properties = {}; - } - - public get html(): string { - return this.properties['html']; - } - public set html(html: string) { - this.setProperty('html', html); - } -} - class EditorWrapper extends ComponentWrapper implements azdata.EditorComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Editor, id); diff --git a/src/sql/workbench/api/common/sqlExtHostTypes.ts b/src/sql/workbench/api/common/sqlExtHostTypes.ts index de9ebf7dbe..711c14d603 100644 --- a/src/sql/workbench/api/common/sqlExtHostTypes.ts +++ b/src/sql/workbench/api/common/sqlExtHostTypes.ts @@ -170,7 +170,6 @@ export enum ModelComponentTypes { FileBrowserTree, Editor, DiffEditor, - Dom, Hyperlink, Image, RadioCardGroup, diff --git a/src/sql/workbench/browser/modelComponents/dom.component.ts b/src/sql/workbench/browser/modelComponents/dom.component.ts deleted file mode 100644 index f9658f70d8..0000000000 --- a/src/sql/workbench/browser/modelComponents/dom.component.ts +++ /dev/null @@ -1,93 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./media/dom'; -import 'vs/css!./media/highlight'; -import 'vs/css!./media/markdown'; - -import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy -} from '@angular/core'; - -import * as azdata from 'azdata'; -import * as DOM from 'vs/base/browser/dom'; - -import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; -import { ILogService } from 'vs/platform/log/common/log'; - -@Component({ - template: '', - selector: 'modelview-dom-component' -}) -export default class DomComponent extends ComponentBase implements IComponent, OnDestroy { - @Input() descriptor: IComponentDescriptor; - @Input() modelStore: IModelStore; - private _renderedHtml: string; - private _rootElement: HTMLElement; - private _bodyElement: HTMLElement; - - constructor( - @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, - @Inject(forwardRef(() => ElementRef)) el: ElementRef, - @Inject(ILogService) logService: ILogService - ) { - super(changeRef, el, logService); - } - - ngAfterViewInit(): void { - this.createDomElement(); - this._register(DOM.addDisposableListener(window, DOM.EventType.RESIZE, e => { - this.layout(); - })); - this.baseInit(); - } - - ngOnDestroy(): void { - this.baseDestroy(); - } - - private createDomElement() { - this._rootElement = this._el.nativeElement; - this._bodyElement = DOM.$('.dom-body'); - this._rootElement.append(this._bodyElement); - } - - /// Dom Functions - private setHtml(): void { - if (this.html) { - this._renderedHtml = this.html; - this._bodyElement.innerHTML = this._renderedHtml; - } - } - - /// IComponent implementation - public layout(): void { - super.layout(); - const element = this._el.nativeElement; - element.style.width = this.getWidth(); - element.style.height = this.getHeight(); - } - - public setLayout(layout: any): void { - // TODO allow configuring the look and feel - this.layout(); - } - - public setProperties(properties: { [key: string]: any; }): void { - super.setProperties(properties); - if (this.html !== this._renderedHtml) { - this.setHtml(); - } - } - - // CSS-bound properties - public get html(): string { - return this.getPropertyOrDefault((props) => props.html, ''); - } - - public set html(newValue: string) { - this.setPropertyFromUI((properties, html) => { properties.html = html; }, newValue); - } -} diff --git a/src/sql/workbench/browser/modelComponents/media/dom.css b/src/sql/workbench/browser/modelComponents/media/dom.css deleted file mode 100644 index 1f172f166a..0000000000 --- a/src/sql/workbench/browser/modelComponents/media/dom.css +++ /dev/null @@ -1,9 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -modelview-dom-component { - display: block; - -webkit-user-select: text; -} \ No newline at end of file diff --git a/src/sql/workbench/contrib/modelView/browser/components.contribution.ts b/src/sql/workbench/contrib/modelView/browser/components.contribution.ts index fb24ac12ea..8d349bd970 100644 --- a/src/sql/workbench/contrib/modelView/browser/components.contribution.ts +++ b/src/sql/workbench/contrib/modelView/browser/components.contribution.ts @@ -25,7 +25,6 @@ import LoadingComponent from 'sql/workbench/browser/modelComponents/loadingCompo import FileBrowserTreeComponent from 'sql/workbench/browser/modelComponents/fileBrowserTree.component'; import EditorComponent from 'sql/workbench/browser/modelComponents/editor.component'; import DiffEditorComponent from 'sql/workbench/browser/modelComponents/diffeditor.component'; -import DomComponent from 'sql/workbench/browser/modelComponents/dom.component'; import { registerComponentType } from 'sql/platform/dashboard/browser/modelComponentRegistry'; import HyperlinkComponent from 'sql/workbench/browser/modelComponents/hyperlink.component'; import SplitViewContainer from 'sql/workbench/browser/modelComponents/splitviewContainer.component'; @@ -107,9 +106,6 @@ registerComponentType(EDITOR_COMPONENT, ModelComponentTypes.Editor, EditorCompon export const DIFF_EDITOR_COMPONENT = 'diff-editor-component'; registerComponentType(DIFF_EDITOR_COMPONENT, ModelComponentTypes.DiffEditor, DiffEditorComponent); -export const DOM_COMPONENT = 'dom-component'; -registerComponentType(DOM_COMPONENT, ModelComponentTypes.Dom, DomComponent); - export const HYPERLINK_COMPONENT = 'hyperlink-component'; registerComponentType(HYPERLINK_COMPONENT, ModelComponentTypes.Hyperlink, HyperlinkComponent);