diff --git a/src/sql/base/browser/ui/checkbox/checkbox.component.ts b/src/sql/base/browser/ui/checkbox/checkbox.component.ts new file mode 100644 index 0000000000..015e03a444 --- /dev/null +++ b/src/sql/base/browser/ui/checkbox/checkbox.component.ts @@ -0,0 +1,58 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { + Component, Inject, forwardRef, ElementRef, OnInit, Input, + Output, OnChanges, SimpleChanges, EventEmitter +} from '@angular/core'; + +import { Checkbox as vsCheckbox } from 'sql/base/browser/ui/checkbox/checkbox'; + +@Component({ + selector: 'checkbox', + template: '' +}) +export class Checkbox implements OnInit, OnChanges { + @Input() label: string; + @Input() enabled = true; + @Input() checked = true; + @Input() private ariaLabel: string; + + @Output() onChange = new EventEmitter(); + + private _checkbox: vsCheckbox; + + constructor( + @Inject(forwardRef(() => ElementRef)) private _el: ElementRef + ) { } + + ngOnInit(): void { + this._checkbox = new vsCheckbox(this._el.nativeElement, { + label: this.label, + ariaLabel: this.ariaLabel || this.label, + checked: this.checked, + enabled: this.enabled + }); + this._checkbox.onChange(e => { this.onChange.emit(e); }); + } + + ngOnChanges(changes: SimpleChanges): void { + if (this._checkbox) { + if (changes['label']) { + this._checkbox.label = changes['label'].currentValue; + } + + if (changes['enabled']) { + this._checkbox.enabled = changes['enabled'].currentValue; + } + + if (changes['checked']) { + this._checkbox.checked = changes['checked'].currentValue; + } + } + } +} diff --git a/src/sql/base/browser/ui/inputBox/inputBox.component.ts b/src/sql/base/browser/ui/inputBox/inputBox.component.ts new file mode 100644 index 0000000000..7109acd117 --- /dev/null +++ b/src/sql/base/browser/ui/inputBox/inputBox.component.ts @@ -0,0 +1,82 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { + Component, Inject, forwardRef, ElementRef, OnInit, Input, + Output, OnChanges, SimpleChanges, EventEmitter +} from '@angular/core'; + +import { InputBox as vsInputBox } from 'sql/base/browser/ui/inputBox/inputBox'; +import { AngularDisposable } from 'sql/base/common/lifecycle'; + +import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview'; +import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; + +@Component({ + selector: 'input-box', + template: '' +}) +export class InputBox extends AngularDisposable implements OnInit, OnChanges { + private _inputbox: vsInputBox; + + @Input() min: string; + @Input() max: string; + @Input() type: string; + @Input() placeholder: string; + @Input() ariaLabel: string; + + @Output() onDidChange = new EventEmitter(); + + constructor( + @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, + @Inject(IThemeService) private themeService: IThemeService, + @Inject(IContextViewService) private contextViewService: IContextViewService + ) { + super(); + } + + ngOnInit(): void { + this._inputbox = new vsInputBox(this._el.nativeElement, this.contextViewService, { + min: this.min, + max: this.max, + type: this.type, + placeholder: this.placeholder, + ariaLabel: this.ariaLabel + }); + this._inputbox.onDidChange(e => { + switch (this.type) { + case 'number': + if (e) { + this.onDidChange.emit(Number(e)); + break; + } + default: + this.onDidChange.emit(e); + } + }); + this._register(attachInputBoxStyler(this._inputbox, this.themeService)); + } + + ngOnChanges(changes: SimpleChanges): void { + if (this._inputbox) { + if (changes['min']) { + this._inputbox.inputElement.min = this.min; + } + if (changes['max']) { + this._inputbox.inputElement.max = this.max; + } + if (changes['type']) { + this._inputbox.inputElement.type = this.type; + } + if (changes['placeholder']) { + this._inputbox.inputElement.placeholder = this.placeholder; + } + } + } +} diff --git a/src/sql/base/browser/ui/panel/panel.component.ts b/src/sql/base/browser/ui/panel/panel.component.ts index a5ccf28049..0821508a16 100644 --- a/src/sql/base/browser/ui/panel/panel.component.ts +++ b/src/sql/base/browser/ui/panel/panel.component.ts @@ -102,43 +102,45 @@ export class PanelComponent extends Disposable implements AfterContentInit, OnIn } ngAfterViewInit(): void { - let container = this._titleContainer.nativeElement as HTMLElement; - let tabList = this._tabList.nativeElement as HTMLElement; - container.removeChild(tabList); + if (!this.options.showTabsWhenOne ? this._tabs.length !== 1 : true) { + let container = this._titleContainer.nativeElement as HTMLElement; + let tabList = this._tabList.nativeElement as HTMLElement; + container.removeChild(tabList); - this._scrollableElement = new ScrollableElement(tabList, { - horizontal: ScrollbarVisibility.Auto, - vertical: ScrollbarVisibility.Hidden, - scrollYToX: true, - useShadows: false, - horizontalScrollbarSize: 3 - }); + this._scrollableElement = new ScrollableElement(tabList, { + horizontal: ScrollbarVisibility.Auto, + vertical: ScrollbarVisibility.Hidden, + scrollYToX: true, + useShadows: false, + horizontalScrollbarSize: 3 + }); - this._scrollableElement.onScroll(e => { - tabList.scrollLeft = e.scrollLeft; - }); + this._scrollableElement.onScroll(e => { + tabList.scrollLeft = e.scrollLeft; + }); - container.insertBefore(this._scrollableElement.getDomNode(), container.firstChild); + container.insertBefore(this._scrollableElement.getDomNode(), container.firstChild); - this._scrollableElement.setScrollDimensions({ - width: tabList.offsetWidth, - scrollWidth: tabList.scrollWidth - }); + this._scrollableElement.setScrollDimensions({ + width: tabList.offsetWidth, + scrollWidth: tabList.scrollWidth + }); - this._register(addDisposableListener(window, EventType.RESIZE, () => { - // Todo: Need to set timeout because we have to make sure that the grids have already rearraged before the getContentHeight gets called. - setTimeout(() => { - this._scrollableElement.setScrollDimensions({ - width: tabList.offsetWidth, - scrollWidth: tabList.scrollWidth - }); - }, 100); - })); + this._register(addDisposableListener(window, EventType.RESIZE, () => { + // Todo: Need to set timeout because we have to make sure that the grids have already rearraged before the getContentHeight gets called. + setTimeout(() => { + this._scrollableElement.setScrollDimensions({ + width: tabList.offsetWidth, + scrollWidth: tabList.scrollWidth + }); + }, 100); + })); - if (this.options.layout === NavigationBarLayout.horizontal) { - (this._tabbedPanelRef.nativeElement).classList.add(horizontalLayout); - } else { - (this._tabbedPanelRef.nativeElement).classList.add(verticalLayout); + if (this.options.layout === NavigationBarLayout.horizontal) { + (this._tabbedPanelRef.nativeElement).classList.add(horizontalLayout); + } else { + (this._tabbedPanelRef.nativeElement).classList.add(verticalLayout); + } } } diff --git a/src/sql/base/browser/ui/selectBox/selectBox.component.ts b/src/sql/base/browser/ui/selectBox/selectBox.component.ts new file mode 100644 index 0000000000..22bc80c7e9 --- /dev/null +++ b/src/sql/base/browser/ui/selectBox/selectBox.component.ts @@ -0,0 +1,66 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { + Component, Inject, forwardRef, ElementRef, OnInit, Input, + Output, OnChanges, SimpleChanges, EventEmitter +} from '@angular/core'; + +import { SelectBox as vsSelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; +import { AngularDisposable } from 'sql/base/common/lifecycle'; + +import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; +import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; +import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; + +@Component({ + selector: 'select-box', + template: '' +}) +export class SelectBox extends AngularDisposable implements OnInit, OnChanges { + private _selectbox: vsSelectBox; + + @Input() options: string[]; + @Input() selectedOption: string; + @Input() onlyEmitOnChange = false; + + @Output() onDidSelect = new EventEmitter(); + + private _previousVal: string; + + constructor( + @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, + @Inject(IThemeService) private themeService: IThemeService, + @Inject(IContextViewService) private contextViewService: IContextViewService + ) { + super(); + } + + ngOnInit(): void { + this._selectbox = new vsSelectBox(this.options, this.selectedOption, this.contextViewService); + this._selectbox.render(this._el.nativeElement); + this._selectbox.onDidSelect(e => { + if (this.onlyEmitOnChange) { + if (this._previousVal !== e.selected) { + this.onDidSelect.emit(e); + this._previousVal = e.selected; + } + } else { + this.onDidSelect.emit(e); + } + }); + this._register(attachSelectBoxStyler(this._selectbox, this.themeService)); + } + + ngOnChanges(changes: SimpleChanges): void { + } + + public get value(): string { + return this._selectbox.value; + } +} diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts b/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts index 215086af19..27b69e3c8a 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts +++ b/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts @@ -87,7 +87,7 @@ export default class BarChart extends ChartInsight { yAxes: [{ display: true, ticks: { - max: config.yAxisMin + min: config.yAxisMin } }] } diff --git a/src/sql/parts/grid/views/query/chartViewer.component.html b/src/sql/parts/grid/views/query/chartViewer.component.html index 0d1c33e5b3..0a6cba759f 100644 --- a/src/sql/parts/grid/views/query/chartViewer.component.html +++ b/src/sql/parts/grid/views/query/chartViewer.component.html @@ -1,4 +1,3 @@ -
@@ -9,49 +8,246 @@
{{localizedStrings.CHART_TYPE}}
-
-
-
-
{{localizedStrings.DATA_TYPE}}
-
-
- {{localizedStrings.NUMBER}} -
-
- {{localizedStrings.POINT}} -
-
-
-
-
{{localizedStrings.DATA_DIRECTION}}
-
-
- {{localizedStrings.VERTICAL}} -
-
- {{localizedStrings.HORIZONTAL}} -
-
-
-
-
-
- -
-
-
- -
{{localizedStrings.LEGEND}}
-
- -
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
\ No newline at end of file +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{localizedStrings.LEGEND}}
+ + + + + +
{{localizedStrings.DATA_TYPE}}
+
+
+ {{localizedStrings.NUMBER}} +
+
+ {{localizedStrings.POINT}} +
+
+ + + + +
{{localizedStrings.DATA_DIRECTION}}
+
+
+ {{localizedStrings.VERTICAL}} +
+
+ {{localizedStrings.HORIZONTAL}} +
+
+ + + + + + + + + + + + + + + + {{localizedStrings.Y_AXIS_LABEL}} + + + + + + + {{localizedStrings.Y_AXIS_MAX_VAL}} + + + + {{localizedStrings.Y_AXIS_MIN_VAL}} + + + + + + + + + {{localizedStrings.X_AXIS_LABEL}} + + + + + + + {{localizedStrings.X_AXIS_MAX_VAL}} + + + + {{localizedStrings.X_AXIS_MIN_VAL}} + + + diff --git a/src/sql/parts/grid/views/query/chartViewer.component.ts b/src/sql/parts/grid/views/query/chartViewer.component.ts index c0c3c4e6c7..dc6f816bf4 100644 --- a/src/sql/parts/grid/views/query/chartViewer.component.ts +++ b/src/sql/parts/grid/views/query/chartViewer.component.ts @@ -14,7 +14,6 @@ import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; import { IGridDataSet } from 'sql/parts/grid/common/interfaces'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IBootstrapService, BOOTSTRAP_SERVICE_ID } from 'sql/services/bootstrap/bootstrapService'; import { IInsightData, IInsightsView, IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; @@ -24,6 +23,7 @@ import * as PathUtilities from 'sql/common/pathUtilities'; import { IChartViewActionContext, CopyAction, CreateInsightAction, SaveImageAction } from 'sql/parts/grid/views/query/chartViewerActions'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as Constants from 'sql/parts/query/common/constants'; +import { SelectBox as AngularSelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; /* Insights */ import { @@ -39,6 +39,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { mixin } from 'vs/base/common/objects'; import * as paths from 'vs/base/common/paths'; import * as pfs from 'vs/base/node/pfs'; +import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; const insightRegistry = Registry.as(Extensions.InsightContribution); @@ -53,7 +54,13 @@ const LocalizedStrings = { LABEL_FIRST_COLUMN: nls.localize('labelFirstColumnLabel', 'Use First Column as row label?'), COLUMNS_AS_LABELS: nls.localize('columnsAsLabelsLabel', 'Use Column names as labels?'), LEGEND: nls.localize('legendLabel', 'Legend Position'), - CHART_NOT_FOUND: nls.localize('chartNotFound', 'Could not find chart to save') + CHART_NOT_FOUND: nls.localize('chartNotFound', 'Could not find chart to save'), + X_AXIS_LABEL: nls.localize('xAxisLabel', 'X Axis Label'), + X_AXIS_MIN_VAL: nls.localize('xAxisMinVal', 'X Axis Minimum Value'), + X_AXIS_MAX_VAL: nls.localize('xAxisMaxVal', 'X Axis Maximum Value'), + Y_AXIS_LABEL: nls.localize('yAxisLabel', 'Y Axis Label'), + Y_AXIS_MIN_VAL: nls.localize('yAxisMinVal', 'Y Axis Minimum Value'), + Y_AXIS_MAX_VAL: nls.localize('yAxisMaxVal', 'Y Axis Maximum Value') }; @Component({ @@ -62,10 +69,7 @@ const LocalizedStrings = { }) export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewActionContext { public legendOptions: string[]; - private chartTypesSelectBox: SelectBox; - private legendSelectBox: SelectBox; - private labelFirstColumnCheckBox: Checkbox; - private columnsAsLabelsCheckBox: Checkbox; + @ViewChild('chartTypeSelect') private chartTypesSelectBox: AngularSelectBox; /* UI */ @@ -80,13 +84,12 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction private _chartComponent: ChartInsight; private localizedStrings = LocalizedStrings; + private insightRegistry = insightRegistry; @ViewChild(ComponentHostDirective) private componentHost: ComponentHostDirective; @ViewChild('taskbarContainer', { read: ElementRef }) private taskbarContainer; @ViewChild('chartTypesContainer', { read: ElementRef }) private chartTypesElement; @ViewChild('legendContainer', { read: ElementRef }) private legendElement; - @ViewChild('labelFirstColumnContainer', { read: ElementRef }) private labelFirstColumnElement; - @ViewChild('columnsAsLabelsContainer', { read: ElementRef }) private columnsAsLabelsElement; constructor( @Inject(forwardRef(() => ComponentFactoryResolver)) private _componentFactoryResolver: ComponentFactoryResolver, @@ -114,34 +117,6 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction private initializeUI() { // Initialize the taskbar this._initActionBar(); - - // Init chart type dropdown - this.chartTypesSelectBox = new SelectBox(insightRegistry.getAllIds(), this.getDefaultChartType(), this._bootstrapService.contextViewService); - this.chartTypesSelectBox.render(this.chartTypesElement.nativeElement); - this.chartTypesSelectBox.onDidSelect(selected => this.onChartChanged()); - this._disposables.push(attachSelectBoxStyler(this.chartTypesSelectBox, this._bootstrapService.themeService)); - - // Init label first column checkbox - // Note: must use 'self' for callback - this.labelFirstColumnCheckBox = new Checkbox(this.labelFirstColumnElement.nativeElement, { - label: LocalizedStrings.LABEL_FIRST_COLUMN, - onChange: () => this.onLabelFirstColumnChanged(), - ariaLabel: LocalizedStrings.LABEL_FIRST_COLUMN - }); - - // Init label first column checkbox - // Note: must use 'self' for callback - this.columnsAsLabelsCheckBox = new Checkbox(this.columnsAsLabelsElement.nativeElement, { - label: LocalizedStrings.COLUMNS_AS_LABELS, - onChange: () => this.columnsAsLabelsChanged(), - ariaLabel: LocalizedStrings.COLUMNS_AS_LABELS - }); - - // Init legend dropdown - this.legendSelectBox = new SelectBox(this.legendOptions, this._chartConfig.legendPosition, this._bootstrapService.contextViewService); - this.legendSelectBox.render(this.legendElement.nativeElement); - this.legendSelectBox.onDidSelect(selected => this.onLegendChanged()); - this._disposables.push(attachSelectBoxStyler(this.legendSelectBox, this._bootstrapService.themeService)); } private getDefaultChartType(): string { @@ -171,29 +146,20 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction ]); } - - public onChartChanged(): void { + public onChartChanged(e: ISelectData): void { this.setDefaultChartConfig(); - if ([Constants.chartTypeScatter, Constants.chartTypeTimeSeries].some(item => item === this.chartTypesSelectBox.value)) { + if ([Constants.chartTypeScatter, Constants.chartTypeTimeSeries].some(item => item === e.selected)) { this.dataType = DataType.Point; this.dataDirection = DataDirection.Horizontal; } this.initChart(); } - public onLabelFirstColumnChanged(): void { - this._chartConfig.labelFirstColumn = this.labelFirstColumnCheckBox.checked; - this.initChart(); - } - - public columnsAsLabelsChanged(): void { - this._chartConfig.columnsAsLabels = this.columnsAsLabelsCheckBox.checked; - this.initChart(); - } - - public onLegendChanged(): void { - this._chartConfig.legendPosition = this.legendSelectBox.value; - this.initChart(); + setConfigValue(key: string, value: any, refresh = true): void { + this._chartConfig[key] = value; + if (refresh) { + this.initChart(); + } } public set dataType(type: DataType) { diff --git a/src/sql/parts/query/views/queryOutput.module.ts b/src/sql/parts/query/views/queryOutput.module.ts index ed74b367c0..ddff2855c9 100644 --- a/src/sql/parts/query/views/queryOutput.module.ts +++ b/src/sql/parts/query/views/queryOutput.module.ts @@ -33,6 +33,10 @@ import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost import { MouseDownDirective } from 'sql/parts/grid/directives/mousedown.directive'; import { ScrollDirective } from 'sql/parts/grid/directives/scroll.directive'; +import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; +import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; +import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; + let baseComponents = [QueryComponent, ComponentHostDirective, QueryOutputComponent, QueryPlanComponent, TopOperationsComponent, ChartViewerComponent]; /* Insights */ let insightComponents = Registry.as(Extensions.InsightContribution).getAllCtors(); @@ -51,7 +55,10 @@ let insightComponents = Registry.as(Extensions.InsightContribu ...insightComponents, SlickGrid, ScrollDirective, - MouseDownDirective + MouseDownDirective, + Checkbox, + SelectBox, + InputBox ], entryComponents: [ QueryOutputComponent, diff --git a/src/sql/services/bootstrap/bootstrapService.ts b/src/sql/services/bootstrap/bootstrapService.ts index 4ea28deb59..58107d2349 100644 --- a/src/sql/services/bootstrap/bootstrapService.ts +++ b/src/sql/services/bootstrap/bootstrapService.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { NgModuleRef } from '@angular/core'; +import { NgModuleRef, InjectionToken } from '@angular/core'; import { BootstrapParams } from 'sql/services/bootstrap/bootstrapParams'; import { IConnectionManagementService, IConnectionDialogService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; @@ -23,6 +23,7 @@ import { IFileBrowserService, IFileBrowserDialogController } from 'sql/parts/fil import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; import { IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService'; +import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -43,7 +44,6 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; export const BOOTSTRAP_SERVICE_ID = 'bootstrapService'; export const IBootstrapService = createDecorator(BOOTSTRAP_SERVICE_ID); diff --git a/src/sql/services/bootstrap/bootstrapServiceImpl.ts b/src/sql/services/bootstrap/bootstrapServiceImpl.ts index d257f8670d..7d34f0406c 100644 --- a/src/sql/services/bootstrap/bootstrapServiceImpl.ts +++ b/src/sql/services/bootstrap/bootstrapServiceImpl.ts @@ -31,7 +31,6 @@ import { $ } from 'vs/base/browser/dom'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { IEditorInput } from 'vs/platform/editor/common/editor'; @@ -48,6 +47,8 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { INotificationService } from 'vs/platform/notification/common/notification'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; export class BootstrapService implements IBootstrapService { @@ -127,7 +128,11 @@ export class BootstrapService implements IBootstrapService { this._bootstrapParameterMap.set(uniqueSelectorString, params); // Perform the bootsrap - let providers = [{ provide: BOOTSTRAP_SERVICE_ID, useValue: this }]; + let providers = [ + { provide: BOOTSTRAP_SERVICE_ID, useValue: this }, + { provide: IWorkbenchThemeService, useValue: this.themeService }, + { provide: IContextViewService, useValue: this.contextViewService } + ]; platformBrowserDynamic(providers).bootstrapModule(moduleType).then(moduleRef => { if (input) { diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 4e3a7aac2e..a4da7a0db5 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -31,6 +31,7 @@ export interface IInputOptions extends IInputBoxStyles { // {{SQL CARBON EDIT}} Candidate for addition to vscode min?: string; + max?: string; } export interface IInputBoxStyles { @@ -168,6 +169,11 @@ export class InputBox extends Widget { this.input.min = this.options.min; } + // {{SQL CARBON EDIT}} Canidate for addition to vscode + if (this.options.max) { + this.input.max = this.options.max; + } + if (this.ariaLabel) { this.input.setAttribute('aria-label', this.ariaLabel); }