mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
Adding keyboard shortcuts for column resizing in slickgrid (#21100)
* Adding column resize keyboard shortcuts in slickgrid * Switching to standard keyboard evt * Adding comment for the functionality * Cleaning up code and adding more comments * Using quick input to get column resize width * Adding check for negative sizes * Fixing some stuff
This commit is contained in:
13
src/sql/base/browser/ui/qucikInput/quickInputProvider.ts
Normal file
13
src/sql/base/browser/ui/qucikInput/quickInputProvider.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
/*---------------------------------------------------------------------------------------------
|
||||||
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||||
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
import { CancellationToken } from 'vs/base/common/cancellation';
|
||||||
|
import { IInputOptions } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
export interface IQuickInputProvider {
|
||||||
|
input(options?: IInputOptions, token?: CancellationToken): Promise<string | undefined>;
|
||||||
|
}
|
||||||
@@ -20,7 +20,11 @@ import { Event, Emitter } from 'vs/base/common/event';
|
|||||||
import { range } from 'vs/base/common/arrays';
|
import { range } from 'vs/base/common/arrays';
|
||||||
import { AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView';
|
import { AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView';
|
||||||
import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
|
import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
|
||||||
|
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
|
||||||
|
import { KeyCode } from 'vs/base/common/keyCodes';
|
||||||
import { IAccessibilityProvider } from 'sql/base/browser/ui/accessibility/accessibilityProvider';
|
import { IAccessibilityProvider } from 'sql/base/browser/ui/accessibility/accessibilityProvider';
|
||||||
|
import { IQuickInputProvider } from 'sql/base/browser/ui/qucikInput/quickInputProvider';
|
||||||
|
import { localize } from 'vs/nls';
|
||||||
|
|
||||||
function getDefaultOptions<T>(): Slick.GridOptions<T> {
|
function getDefaultOptions<T>(): Slick.GridOptions<T> {
|
||||||
return <Slick.GridOptions<T>>{
|
return <Slick.GridOptions<T>>{
|
||||||
@@ -66,7 +70,12 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
|
|||||||
private _onBlur = new Emitter<void>();
|
private _onBlur = new Emitter<void>();
|
||||||
public readonly onBlur = this._onBlur.event;
|
public readonly onBlur = this._onBlur.event;
|
||||||
|
|
||||||
constructor(parent: HTMLElement, accessibilityProvider: IAccessibilityProvider, configuration?: ITableConfiguration<T>, options?: Slick.GridOptions<T>) {
|
constructor(
|
||||||
|
parent: HTMLElement,
|
||||||
|
accessibilityProvider: IAccessibilityProvider,
|
||||||
|
private _quickInputProvider: IQuickInputProvider,
|
||||||
|
configuration?: ITableConfiguration<T>,
|
||||||
|
options?: Slick.GridOptions<T>) {
|
||||||
super();
|
super();
|
||||||
if (!configuration || !configuration.dataProvider || isArray(configuration.dataProvider)) {
|
if (!configuration || !configuration.dataProvider || isArray(configuration.dataProvider)) {
|
||||||
this._data = new TableDataView<T>(configuration && configuration.dataProvider as Array<T>);
|
this._data = new TableDataView<T>(configuration && configuration.dataProvider as Array<T>);
|
||||||
@@ -135,8 +144,16 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
|
|||||||
this.mapMouseEvent(this._grid.onDblClick, this._onDoubleClick);
|
this.mapMouseEvent(this._grid.onDblClick, this._onDoubleClick);
|
||||||
this._grid.onColumnsResized.subscribe(() => this._onColumnResize.fire());
|
this._grid.onColumnsResized.subscribe(() => this._onColumnResize.fire());
|
||||||
|
|
||||||
this._grid.onKeyDown.subscribe((e, args: Slick.OnKeyDownEventArgs<T>) => {
|
this._grid.onKeyDown.subscribe(async (e, args: Slick.OnKeyDownEventArgs<T>) => {
|
||||||
const evt = (e as JQuery.TriggeredEvent).originalEvent as KeyboardEvent;
|
const evt = (e as JQuery.TriggeredEvent).originalEvent as KeyboardEvent;
|
||||||
|
const stdEvt = new StandardKeyboardEvent(evt);
|
||||||
|
if (stdEvt.altKey && stdEvt.shiftKey && stdEvt.keyCode === KeyCode.KeyS) {
|
||||||
|
const newWidth = this.resizeActiveCellColumnByQuickInput();
|
||||||
|
if (newWidth) {
|
||||||
|
stdEvt.stopPropagation();
|
||||||
|
stdEvt.preventDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
this._onKeyDown.fire({
|
this._onKeyDown.fire({
|
||||||
event: evt,
|
event: evt,
|
||||||
cell: {
|
cell: {
|
||||||
@@ -147,6 +164,35 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async resizeActiveCellColumnByQuickInput(): Promise<number | undefined> {
|
||||||
|
const activeCell = this._grid.getActiveCell();
|
||||||
|
if (activeCell) {
|
||||||
|
const columns = this._grid.getColumns();
|
||||||
|
if (columns[activeCell.cell].resizable) {
|
||||||
|
const newColumnWidth = await this._quickInputProvider.input({
|
||||||
|
placeHolder: localize('table.resizeColumn', "Provide new column width"),
|
||||||
|
prompt: localize('table.resizeColumn', "Provide new column width"),
|
||||||
|
value: columns[activeCell.cell].width.toString(),
|
||||||
|
validateInput: async (value: string) => {
|
||||||
|
if (!Number(value)) {
|
||||||
|
return localize('table.resizeColumn.invalid', "Invalid column width");
|
||||||
|
} else if (parseInt(value) <= 0) {
|
||||||
|
return localize('table.resizeColumn.negativeSize', "Size cannot be 0 or negative");
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (newColumnWidth) {
|
||||||
|
columns[activeCell.cell].width = parseInt(newColumnWidth);
|
||||||
|
this._grid.setColumns(columns);
|
||||||
|
this.grid.setActiveCell(activeCell.row, activeCell.cell);
|
||||||
|
}
|
||||||
|
return parseInt(newColumnWidth);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
public rerenderGrid() {
|
public rerenderGrid() {
|
||||||
this._grid.updateRowCount();
|
this._grid.updateRowCount();
|
||||||
this._grid.setColumns(this._grid.getColumns());
|
this._grid.setColumns(this._grid.getColumns());
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
|
|||||||
import { createTreeGridExpandableColumnFormatter, textFormatter } from 'sql/base/browser/ui/table/formatters';
|
import { createTreeGridExpandableColumnFormatter, textFormatter } from 'sql/base/browser/ui/table/formatters';
|
||||||
import { escape } from 'sql/base/common/strings';
|
import { escape } from 'sql/base/common/strings';
|
||||||
import { IAccessibilityProvider } from 'sql/base/browser/ui/accessibility/accessibilityProvider';
|
import { IAccessibilityProvider } from 'sql/base/browser/ui/accessibility/accessibilityProvider';
|
||||||
|
import { IQuickInputProvider } from 'sql/base/browser/ui/qucikInput/quickInputProvider';
|
||||||
|
|
||||||
function defaultTreeGridFilter<T extends Slick.SlickData>(data: T[], columns: FilterableColumn<T>[], cellValueGetter: CellValueGetter = defaultCellValueGetter): T[] {
|
function defaultTreeGridFilter<T extends Slick.SlickData>(data: T[], columns: FilterableColumn<T>[], cellValueGetter: CellValueGetter = defaultCellValueGetter): T[] {
|
||||||
let filteredData = defaultFilter(data, columns, cellValueGetter);
|
let filteredData = defaultFilter(data, columns, cellValueGetter);
|
||||||
@@ -39,8 +40,8 @@ function defaultTreeGridFilter<T extends Slick.SlickData>(data: T[], columns: Fi
|
|||||||
* TreeGrid component displays a hierarchical table data grouped into expandable and collapsible nodes.
|
* TreeGrid component displays a hierarchical table data grouped into expandable and collapsible nodes.
|
||||||
*/
|
*/
|
||||||
export class TreeGrid<T extends Slick.SlickData> extends Table<T> {
|
export class TreeGrid<T extends Slick.SlickData> extends Table<T> {
|
||||||
constructor(parent: HTMLElement, accessibilityProvider: IAccessibilityProvider, configuration?: ITableConfiguration<T>, options?: Slick.GridOptions<T>) {
|
constructor(parent: HTMLElement, accessibilityProvider: IAccessibilityProvider, quickInputProvider: IQuickInputProvider, configuration?: ITableConfiguration<T>, options?: Slick.GridOptions<T>) {
|
||||||
super(parent, accessibilityProvider, configuration, options);
|
super(parent, accessibilityProvider, quickInputProvider, configuration, options);
|
||||||
this._tableContainer.setAttribute('role', 'treegrid');
|
this._tableContainer.setAttribute('role', 'treegrid');
|
||||||
if (configuration?.dataProvider && configuration.dataProvider instanceof TableDataView) {
|
if (configuration?.dataProvider && configuration.dataProvider instanceof TableDataView) {
|
||||||
this._data = configuration.dataProvider;
|
this._data = configuration.dataProvider;
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ import { listFocusAndSelectionBackground } from 'sql/platform/theme/common/color
|
|||||||
import { timeout } from 'vs/base/common/async';
|
import { timeout } from 'vs/base/common/async';
|
||||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export interface IDesignerStyle {
|
export interface IDesignerStyle {
|
||||||
tabbedPanelStyles?: ITabbedPanelStyles;
|
tabbedPanelStyles?: ITabbedPanelStyles;
|
||||||
@@ -115,7 +116,8 @@ export class Designer extends Disposable implements IThemable {
|
|||||||
@IDialogService private readonly _dialogService: IDialogService,
|
@IDialogService private readonly _dialogService: IDialogService,
|
||||||
@IThemeService private readonly _themeService: IThemeService,
|
@IThemeService private readonly _themeService: IThemeService,
|
||||||
@IContextMenuService private readonly _contextMenuService: IContextMenuService,
|
@IContextMenuService private readonly _contextMenuService: IContextMenuService,
|
||||||
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService) {
|
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private readonly _quickInputService: IQuickInputService) {
|
||||||
super();
|
super();
|
||||||
this._tableCellEditorFactory = new TableCellEditorFactory(
|
this._tableCellEditorFactory = new TableCellEditorFactory(
|
||||||
{
|
{
|
||||||
@@ -845,7 +847,7 @@ export class Designer extends Disposable implements IThemable {
|
|||||||
const tableProperties = componentDefinition.componentProperties as DesignerTableProperties;
|
const tableProperties = componentDefinition.componentProperties as DesignerTableProperties;
|
||||||
const taskbar = this.addTableTaskbar(container, tableProperties);
|
const taskbar = this.addTableTaskbar(container, tableProperties);
|
||||||
const tableContainer = container.appendChild(DOM.$('.full-row'));
|
const tableContainer = container.appendChild(DOM.$('.full-row'));
|
||||||
const table = new Table(tableContainer, this._accessibilityService, {
|
const table = new Table(tableContainer, this._accessibilityService, this._quickInputService, {
|
||||||
dataProvider: new TableDataView()
|
dataProvider: new TableDataView()
|
||||||
}, {
|
}, {
|
||||||
editable: true,
|
editable: true,
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import { IAction, Separator } from 'vs/base/common/actions';
|
|||||||
import { MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
|
import { MenuItemAction, MenuRegistry } from 'vs/platform/actions/common/actions';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export enum ColumnSizingMode {
|
export enum ColumnSizingMode {
|
||||||
ForceFit = 0, // all columns will be sized to fit in viewable space, no horiz scroll bar
|
ForceFit = 0, // all columns will be sized to fit in viewable space, no horiz scroll bar
|
||||||
@@ -92,7 +93,8 @@ export default class TableComponent extends ComponentBase<azdata.TableComponentP
|
|||||||
@Inject(IContextViewService) private contextViewService: IContextViewService,
|
@Inject(IContextViewService) private contextViewService: IContextViewService,
|
||||||
@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
|
@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
|
||||||
@Inject(IInstantiationService) private instantiationService: IInstantiationService,
|
@Inject(IInstantiationService) private instantiationService: IInstantiationService,
|
||||||
@Inject(IAccessibilityService) private accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(changeRef, el, logService);
|
super(changeRef, el, logService);
|
||||||
}
|
}
|
||||||
@@ -277,7 +279,7 @@ export default class TableComponent extends ComponentBase<azdata.TableComponentP
|
|||||||
dataItemColumnValueExtractor: slickGridDataItemColumnValueWithNoData // must change formatter if you are changing explicit column value extractor
|
dataItemColumnValueExtractor: slickGridDataItemColumnValueWithNoData // must change formatter if you are changing explicit column value extractor
|
||||||
};
|
};
|
||||||
|
|
||||||
this._table = new Table<Slick.SlickData>(this._inputContainer.nativeElement, this.accessibilityService, { dataProvider: this._tableData, columns: this._tableColumns }, options);
|
this._table = new Table<Slick.SlickData>(this._inputContainer.nativeElement, this.accessibilityService, this.quickInputService, { dataProvider: this._tableData, columns: this._tableColumns }, options);
|
||||||
this._table.setData(this._tableData);
|
this._table.setData(this._tableData);
|
||||||
this._table.setSelectionModel(new RowSelectionModel({ selectActiveRow: true }));
|
this._table.setSelectionModel(new RowSelectionModel({ selectActiveRow: true }));
|
||||||
|
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
|
|||||||
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
||||||
import { DASHBOARD_BORDER } from 'sql/workbench/common/theme';
|
import { DASHBOARD_BORDER } from 'sql/workbench/common/theme';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export const ASMTRESULTSVIEW_SELECTOR: string = 'asmt-results-view-component';
|
export const ASMTRESULTSVIEW_SELECTOR: string = 'asmt-results-view-component';
|
||||||
export const ROW_HEIGHT: number = 25;
|
export const ROW_HEIGHT: number = 25;
|
||||||
@@ -146,7 +147,8 @@ export class AsmtResultsViewComponent extends TabChild implements IAssessmentCom
|
|||||||
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
||||||
@Inject(ILogService) protected _logService: ILogService,
|
@Inject(ILogService) protected _logService: ILogService,
|
||||||
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
let self = this;
|
let self = this;
|
||||||
@@ -354,7 +356,7 @@ export class AsmtResultsViewComponent extends TabChild implements IAssessmentCom
|
|||||||
this.initActionBar(databaseInvokeAsmt, databaseSelectAsmt);
|
this.initActionBar(databaseInvokeAsmt, databaseSelectAsmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
this._table = this._register(new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, options));
|
this._table = this._register(new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, options));
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
this._table.registerPlugin(<any>this.rowDetail);
|
this._table.registerPlugin(<any>this.rowDetail);
|
||||||
this._table.registerPlugin(filterPlugin);
|
this._table.registerPlugin(filterPlugin);
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
|
|||||||
import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
|
import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
|
||||||
import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
|
import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export class TableInsight extends Disposable implements IInsight {
|
export class TableInsight extends Disposable implements IInsight {
|
||||||
public static readonly types = [InsightType.Table];
|
public static readonly types = [InsightType.Table];
|
||||||
@@ -27,7 +28,8 @@ export class TableInsight extends Disposable implements IInsight {
|
|||||||
|
|
||||||
constructor(container: HTMLElement, options: any,
|
constructor(container: HTMLElement, options: any,
|
||||||
@IThemeService themeService: IThemeService,
|
@IThemeService themeService: IThemeService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
let tableContainer = $('div');
|
let tableContainer = $('div');
|
||||||
@@ -35,7 +37,7 @@ export class TableInsight extends Disposable implements IInsight {
|
|||||||
tableContainer.style.height = '100%';
|
tableContainer.style.height = '100%';
|
||||||
container.appendChild(tableContainer);
|
container.appendChild(tableContainer);
|
||||||
this.dataView = new TableDataView();
|
this.dataView = new TableDataView();
|
||||||
this.table = new Table(tableContainer, accessibilityService, { dataProvider: this.dataView }, { showRowNumber: true });
|
this.table = new Table(tableContainer, accessibilityService, quickInputService, { dataProvider: this.dataView }, { showRowNumber: true });
|
||||||
this.table.setSelectionModel(new CellSelectionModel());
|
this.table.setSelectionModel(new CellSelectionModel());
|
||||||
this._register(attachTableStyler(this.table, themeService));
|
this._register(attachTableStyler(this.table, themeService));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
|
|||||||
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
||||||
import { ILogService } from 'vs/platform/log/common/log';
|
import { ILogService } from 'vs/platform/log/common/log';
|
||||||
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
|
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
|
|
||||||
const ShowActionsText: string = nls.localize('dashboard.explorer.actions', "Show Actions");
|
const ShowActionsText: string = nls.localize('dashboard.explorer.actions', "Show Actions");
|
||||||
@@ -65,7 +66,8 @@ export class ExplorerTable extends Disposable {
|
|||||||
private readonly progressService: IEditorProgressService,
|
private readonly progressService: IEditorProgressService,
|
||||||
private readonly logService: ILogService,
|
private readonly logService: ILogService,
|
||||||
private readonly dashboardService: IDashboardService,
|
private readonly dashboardService: IDashboardService,
|
||||||
readonly accessibilityService: IAccessibilityService) {
|
readonly accessibilityService: IAccessibilityService,
|
||||||
|
readonly quickInputService: IQuickInputService) {
|
||||||
super();
|
super();
|
||||||
this._explorerView = new ExplorerView(this.context);
|
this._explorerView = new ExplorerView(this.context);
|
||||||
const connectionInfo = this.bootStrapService.connectionManagementService.connectionInfo;
|
const connectionInfo = this.bootStrapService.connectionManagementService.connectionInfo;
|
||||||
@@ -74,7 +76,7 @@ export class ExplorerTable extends Disposable {
|
|||||||
this._view = new TableDataView<Slick.SlickData>(undefined, undefined, undefined, (data: Slick.SlickData[]): Slick.SlickData[] => {
|
this._view = new TableDataView<Slick.SlickData>(undefined, undefined, undefined, (data: Slick.SlickData[]): Slick.SlickData[] => {
|
||||||
return explorerFilter.filter(this._filterStr, data);
|
return explorerFilter.filter(this._filterStr, data);
|
||||||
});
|
});
|
||||||
this._table = new Table<Slick.SlickData>(parentElement, accessibilityService, { dataProvider: this._view }, { forceFitColumns: true });
|
this._table = new Table<Slick.SlickData>(parentElement, accessibilityService, quickInputService, { dataProvider: this._view }, { forceFitColumns: true });
|
||||||
this._table.setSelectionModel(new RowSelectionModel());
|
this._table.setSelectionModel(new RowSelectionModel());
|
||||||
this._actionsColumn = new ButtonColumn<Slick.SlickData>({
|
this._actionsColumn = new ButtonColumn<Slick.SlickData>({
|
||||||
id: 'actions',
|
id: 'actions',
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
|
|||||||
import { getFlavor } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry';
|
import { getFlavor } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry';
|
||||||
import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
|
import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'explorer-widget',
|
selector: 'explorer-widget',
|
||||||
@@ -62,6 +63,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
|
|||||||
@Inject(ICapabilitiesService) private readonly capabilitiesService: ICapabilitiesService,
|
@Inject(ICapabilitiesService) private readonly capabilitiesService: ICapabilitiesService,
|
||||||
@Inject(IDashboardService) private readonly dashboardService: IDashboardService,
|
@Inject(IDashboardService) private readonly dashboardService: IDashboardService,
|
||||||
@Inject(IAccessibilityService) private readonly accessibilityService: IAccessibilityService,
|
@Inject(IAccessibilityService) private readonly accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private readonly quickInputService: IQuickInputService,
|
||||||
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef
|
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef
|
||||||
) {
|
) {
|
||||||
super(changeRef);
|
super(changeRef);
|
||||||
@@ -95,7 +97,8 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
|
|||||||
this.progressService,
|
this.progressService,
|
||||||
this.logService,
|
this.logService,
|
||||||
this.dashboardService,
|
this.dashboardService,
|
||||||
this.accessibilityService);
|
this.accessibilityService,
|
||||||
|
this.quickInputService);
|
||||||
this._register(this._input);
|
this._register(this._input);
|
||||||
this._register(attachInputBoxStyler(this._input, this.themeService));
|
this._register(attachInputBoxStyler(this._input, this.themeService));
|
||||||
this._register(this._table);
|
this._register(this._table);
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { attachTableStyler } from 'sql/platform/theme/common/styler';
|
|||||||
import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
|
import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
|
||||||
import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
|
import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
template: ''
|
template: ''
|
||||||
@@ -27,7 +28,8 @@ export default class TableInsight extends Disposable implements IInsightsView, O
|
|||||||
constructor(
|
constructor(
|
||||||
@Inject(forwardRef(() => ElementRef)) private _elementRef: ElementRef,
|
@Inject(forwardRef(() => ElementRef)) private _elementRef: ElementRef,
|
||||||
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
|
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
|
||||||
@Inject(IAccessibilityService) private accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
@@ -63,7 +65,7 @@ export default class TableInsight extends Disposable implements IInsightsView, O
|
|||||||
|
|
||||||
private createTable() {
|
private createTable() {
|
||||||
if (!this.table) {
|
if (!this.table) {
|
||||||
this.table = new Table(this._elementRef.nativeElement, this.accessibilityService, { dataProvider: this.dataView, columns: this.columns }, { showRowNumber: true });
|
this.table = new Table(this._elementRef.nativeElement, this.accessibilityService, this.quickInputService, { dataProvider: this.dataView, columns: this.columns }, { showRowNumber: true });
|
||||||
this.table.setSelectionModel(new CellSelectionModel());
|
this.table.setSelectionModel(new CellSelectionModel());
|
||||||
this._register(attachTableStyler(this.table, this.themeService));
|
this._register(attachTableStyler(this.table, this.themeService));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import { equals } from 'vs/base/common/arrays';
|
|||||||
import * as DOM from 'vs/base/browser/dom';
|
import * as DOM from 'vs/base/browser/dom';
|
||||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export class EditDataGridPanel extends GridParentComponent {
|
export class EditDataGridPanel extends GridParentComponent {
|
||||||
// The time(in milliseconds) we wait before refreshing the grid.
|
// The time(in milliseconds) we wait before refreshing the grid.
|
||||||
@@ -107,7 +108,8 @@ export class EditDataGridPanel extends GridParentComponent {
|
|||||||
@IClipboardService clipboardService: IClipboardService,
|
@IClipboardService clipboardService: IClipboardService,
|
||||||
@IQueryEditorService queryEditorService: IQueryEditorService,
|
@IQueryEditorService queryEditorService: IQueryEditorService,
|
||||||
@ILogService logService: ILogService,
|
@ILogService logService: ILogService,
|
||||||
@IAccessibilityService private accessibilityService: IAccessibilityService
|
@IAccessibilityService private accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(contextMenuService, keybindingService, contextKeyService, configurationService, clipboardService, queryEditorService, logService);
|
super(contextMenuService, keybindingService, contextKeyService, configurationService, clipboardService, queryEditorService, logService);
|
||||||
this.nativeElement = document.createElement('div');
|
this.nativeElement = document.createElement('div');
|
||||||
@@ -895,7 +897,7 @@ export class EditDataGridPanel extends GridParentComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (dataSet.columnDefinitions) {
|
if (dataSet.columnDefinitions) {
|
||||||
this.table = new Table(this.nativeElement.appendChild(newGridContainer), this.accessibilityService, { dataProvider: this.gridDataProvider, columns: dataSet.columnDefinitions }, options);
|
this.table = new Table(this.nativeElement.appendChild(newGridContainer), this.accessibilityService, this.quickInputService, { dataProvider: this.gridDataProvider, columns: dataSet.columnDefinitions }, options);
|
||||||
for (let plugin of this.plugins) {
|
for (let plugin of this.plugins) {
|
||||||
this.table.registerPlugin(plugin);
|
this.table.registerPlugin(plugin);
|
||||||
}
|
}
|
||||||
@@ -905,7 +907,7 @@ export class EditDataGridPanel extends GridParentComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.table = new Table(this.nativeElement.appendChild(newGridContainer), this.accessibilityService);
|
this.table = new Table(this.nativeElement.appendChild(newGridContainer), this.accessibilityService, this.quickInputService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
|
|||||||
import { Codicon } from 'vs/base/common/codicons';
|
import { Codicon } from 'vs/base/common/codicons';
|
||||||
import { deepClone } from 'vs/base/common/objects';
|
import { deepClone } from 'vs/base/common/objects';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export enum ExecutionPlanCompareOrientation {
|
export enum ExecutionPlanCompareOrientation {
|
||||||
Horizontal = 'horizontal',
|
Horizontal = 'horizontal',
|
||||||
@@ -64,9 +65,10 @@ export class ExecutionPlanComparisonPropertiesView extends ExecutionPlanProperti
|
|||||||
@IInstantiationService instantiationService: IInstantiationService,
|
@IInstantiationService instantiationService: IInstantiationService,
|
||||||
@IContextMenuService contextMenuService: IContextMenuService,
|
@IContextMenuService contextMenuService: IContextMenuService,
|
||||||
@IContextViewService contextViewService: IContextViewService,
|
@IContextViewService contextViewService: IContextViewService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(parentContainer, themeService, instantiationService, contextMenuService, contextViewService, accessibilityService);
|
super(parentContainer, themeService, instantiationService, contextMenuService, contextViewService, accessibilityService, quickInputService);
|
||||||
this._model = <ExecutionPlanComparisonPropertiesViewModel>{};
|
this._model = <ExecutionPlanComparisonPropertiesViewModel>{};
|
||||||
this._parentContainer.style.display = 'none';
|
this._parentContainer.style.display = 'none';
|
||||||
const header = DOM.$('.compare-operation-name');
|
const header = DOM.$('.compare-operation-name');
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { ExecutionPlanPropertiesViewBase, PropertiesSortType } from 'sql/workben
|
|||||||
import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export class ExecutionPlanPropertiesView extends ExecutionPlanPropertiesViewBase {
|
export class ExecutionPlanPropertiesView extends ExecutionPlanPropertiesViewBase {
|
||||||
// Div that holds the name of the element selected
|
// Div that holds the name of the element selected
|
||||||
@@ -26,9 +27,10 @@ export class ExecutionPlanPropertiesView extends ExecutionPlanPropertiesViewBase
|
|||||||
@IInstantiationService instantiationService: IInstantiationService,
|
@IInstantiationService instantiationService: IInstantiationService,
|
||||||
@IContextMenuService contextMenuService: IContextMenuService,
|
@IContextMenuService contextMenuService: IContextMenuService,
|
||||||
@IContextViewService contextViewService: IContextViewService,
|
@IContextViewService contextViewService: IContextViewService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(parentContainer, themeService, instantiationService, contextMenuService, contextViewService, accessibilityService);
|
super(parentContainer, themeService, instantiationService, contextMenuService, contextViewService, accessibilityService, quickInputService);
|
||||||
this._model = <ExecutionPlanPropertiesView>{};
|
this._model = <ExecutionPlanPropertiesView>{};
|
||||||
this._operationName = DOM.$('h3');
|
this._operationName = DOM.$('h3');
|
||||||
this._operationName.classList.add('operation-name');
|
this._operationName.classList.add('operation-name');
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
|
|||||||
import { deepClone } from 'vs/base/common/objects';
|
import { deepClone } from 'vs/base/common/objects';
|
||||||
import { Disposable } from 'vs/base/common/lifecycle';
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export abstract class ExecutionPlanPropertiesViewBase extends Disposable implements IVerticalSashLayoutProvider {
|
export abstract class ExecutionPlanPropertiesViewBase extends Disposable implements IVerticalSashLayoutProvider {
|
||||||
// Title bar with close button action
|
// Title bar with close button action
|
||||||
@@ -69,7 +70,8 @@ export abstract class ExecutionPlanPropertiesViewBase extends Disposable impleme
|
|||||||
@IInstantiationService private _instantiationService: IInstantiationService,
|
@IInstantiationService private _instantiationService: IInstantiationService,
|
||||||
@IContextMenuService private _contextMenuService: IContextMenuService,
|
@IContextMenuService private _contextMenuService: IContextMenuService,
|
||||||
@IContextViewService private _contextViewService: IContextViewService,
|
@IContextViewService private _contextViewService: IContextViewService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
const sashContainer = DOM.$('.properties-sash');
|
const sashContainer = DOM.$('.properties-sash');
|
||||||
@@ -157,7 +159,7 @@ export abstract class ExecutionPlanPropertiesViewBase extends Disposable impleme
|
|||||||
|
|
||||||
this._selectionModel = new CellSelectionModel<Slick.SlickData>();
|
this._selectionModel = new CellSelectionModel<Slick.SlickData>();
|
||||||
|
|
||||||
this._tableComponent = this._register(new TreeGrid(table, accessibilityService, {
|
this._tableComponent = this._register(new TreeGrid(table, accessibilityService, quickInputService, {
|
||||||
columns: []
|
columns: []
|
||||||
}, {
|
}, {
|
||||||
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
|
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugi
|
|||||||
import { Disposable } from 'vs/base/common/lifecycle';
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
import { deepClone } from 'vs/base/common/objects';
|
import { deepClone } from 'vs/base/common/objects';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export class ExecutionPlanTreeTab extends Disposable implements IPanelTab {
|
export class ExecutionPlanTreeTab extends Disposable implements IPanelTab {
|
||||||
public readonly title: string = localize('planTreeTab.title', 'Plan Tree');
|
public readonly title: string = localize('planTreeTab.title', 'Plan Tree');
|
||||||
@@ -53,7 +54,8 @@ export class ExecutionPlanTreeTabView extends Disposable implements IPanelView {
|
|||||||
@IThemeService private _themeService: IThemeService,
|
@IThemeService private _themeService: IThemeService,
|
||||||
@IInstantiationService private _instantiationService: IInstantiationService,
|
@IInstantiationService private _instantiationService: IInstantiationService,
|
||||||
@IContextMenuService private _contextMenuService: IContextMenuService,
|
@IContextMenuService private _contextMenuService: IContextMenuService,
|
||||||
@IAccessibilityService private accessibilityService: IAccessibilityService
|
@IAccessibilityService private _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
@@ -194,7 +196,7 @@ export class ExecutionPlanTreeTabView extends Disposable implements IPanelView {
|
|||||||
|
|
||||||
const selectionModel = new CellSelectionModel<Slick.SlickData>();
|
const selectionModel = new CellSelectionModel<Slick.SlickData>();
|
||||||
|
|
||||||
const treeGrid = this._register(new TreeGrid<Slick.SlickData>(tableContainer, this.accessibilityService, {
|
const treeGrid = this._register(new TreeGrid<Slick.SlickData>(tableContainer, this._accessibilityService, this._quickInputService, {
|
||||||
columns: columns,
|
columns: columns,
|
||||||
sorter: (args) => {
|
sorter: (args) => {
|
||||||
const sortColumn = args.sortCol.field;
|
const sortColumn = args.sortCol.field;
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
|
|||||||
import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
|
import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
|
||||||
import { filterIconClassNames, searchPlaceholder, topOperationsSearchDescription } from 'sql/workbench/contrib/executionPlan/browser/constants';
|
import { filterIconClassNames, searchPlaceholder, topOperationsSearchDescription } from 'sql/workbench/contrib/executionPlan/browser/constants';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
const TABLE_SORT_COLUMN_KEY = 'tableCostColumnForSorting';
|
const TABLE_SORT_COLUMN_KEY = 'tableCostColumnForSorting';
|
||||||
|
|
||||||
@@ -63,7 +64,8 @@ export class TopOperationsTabView extends Disposable implements IPanelView {
|
|||||||
@IInstantiationService private _instantiationService: IInstantiationService,
|
@IInstantiationService private _instantiationService: IInstantiationService,
|
||||||
@IContextMenuService private _contextMenuService: IContextMenuService,
|
@IContextMenuService private _contextMenuService: IContextMenuService,
|
||||||
@IContextViewService private _contextViewService: IContextViewService,
|
@IContextViewService private _contextViewService: IContextViewService,
|
||||||
@IAccessibilityService private _accessibilityService: IAccessibilityService
|
@IAccessibilityService private _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private _quickInputService: IQuickInputService,
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
@@ -238,7 +240,7 @@ export class TopOperationsTabView extends Disposable implements IPanelView {
|
|||||||
|
|
||||||
const selectionModel = new CellSelectionModel<Slick.SlickData>({ hasRowSelector: true });
|
const selectionModel = new CellSelectionModel<Slick.SlickData>({ hasRowSelector: true });
|
||||||
|
|
||||||
const table = this._register(new Table<Slick.SlickData>(tableContainer, this._accessibilityService, {
|
const table = this._register(new Table<Slick.SlickData>(tableContainer, this._accessibilityService, this._quickInputService, {
|
||||||
columns: columns,
|
columns: columns,
|
||||||
sorter: (args) => {
|
sorter: (args) => {
|
||||||
const column = args.sortCol.field;
|
const column = args.sortCol.field;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi
|
|||||||
import { AlertsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
import { AlertsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
||||||
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export const VIEW_SELECTOR: string = 'jobalertsview-component';
|
export const VIEW_SELECTOR: string = 'jobalertsview-component';
|
||||||
export const ROW_HEIGHT: number = 45;
|
export const ROW_HEIGHT: number = 45;
|
||||||
@@ -78,7 +79,8 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On
|
|||||||
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
||||||
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
||||||
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService) {
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService) {
|
||||||
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
||||||
this._didTabChange = false;
|
this._didTabChange = false;
|
||||||
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
||||||
@@ -145,7 +147,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On
|
|||||||
jQuery(this.actionBarContainer.nativeElement).empty();
|
jQuery(this.actionBarContainer.nativeElement).empty();
|
||||||
this.initActionBar();
|
this.initActionBar();
|
||||||
|
|
||||||
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, this.options);
|
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, this.options);
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
this._register(this._table.onContextMenu(e => {
|
this._register(this._table.onContextMenu(e => {
|
||||||
self.openContextMenu(e);
|
self.openContextMenu(e);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
|
|||||||
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
|
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
|
||||||
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export const JOBSVIEW_SELECTOR: string = 'jobsview-component';
|
export const JOBSVIEW_SELECTOR: string = 'jobsview-component';
|
||||||
export const ROW_HEIGHT: number = 45;
|
export const ROW_HEIGHT: number = 45;
|
||||||
@@ -110,7 +111,8 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
|
|||||||
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
||||||
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
||||||
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
||||||
let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
|
let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
|
||||||
@@ -190,7 +192,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
|
|||||||
jQuery(this._gridEl.nativeElement).empty();
|
jQuery(this._gridEl.nativeElement).empty();
|
||||||
jQuery(this.actionBarContainer.nativeElement).empty();
|
jQuery(this.actionBarContainer.nativeElement).empty();
|
||||||
this.initActionBar();
|
this.initActionBar();
|
||||||
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, options);
|
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, options);
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
this._table.grid.onClick.subscribe((e, args) => {
|
this._table.grid.onClick.subscribe((e, args) => {
|
||||||
let job = self.getJob(args);
|
let job = self.getJob(args);
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import { IColorTheme } from 'vs/platform/theme/common/themeService';
|
|||||||
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
|
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
|
||||||
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
import { attachTableFilterStyler } from 'sql/platform/theme/common/styler';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
|
|
||||||
export const NOTEBOOKSVIEW_SELECTOR: string = 'notebooksview-component';
|
export const NOTEBOOKSVIEW_SELECTOR: string = 'notebooksview-component';
|
||||||
@@ -109,7 +110,8 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
|
|||||||
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
||||||
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
@Inject(IAdsTelemetryService) private _telemetryService: IAdsTelemetryService,
|
||||||
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
@Inject(IContextViewService) private _contextViewService: IContextViewService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
||||||
let notebookCacheObjectMap = this._jobManagementService.notebookCacheObjectMap;
|
let notebookCacheObjectMap = this._jobManagementService.notebookCacheObjectMap;
|
||||||
@@ -189,7 +191,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
|
|||||||
jQuery(this._gridEl.nativeElement).empty();
|
jQuery(this._gridEl.nativeElement).empty();
|
||||||
jQuery(this.actionBarContainer.nativeElement).empty();
|
jQuery(this.actionBarContainer.nativeElement).empty();
|
||||||
this.initActionBar();
|
this.initActionBar();
|
||||||
this._table = this._register(new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, options));
|
this._table = this._register(new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, options));
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
this._table.grid.onClick.subscribe((e, args) => {
|
this._table.grid.onClick.subscribe((e, args) => {
|
||||||
let notebook = self.getNotebook(args);
|
let notebook = self.getNotebook(args);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi
|
|||||||
import { OperatorsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
import { OperatorsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
||||||
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export const VIEW_SELECTOR: string = 'joboperatorsview-component';
|
export const VIEW_SELECTOR: string = 'joboperatorsview-component';
|
||||||
export const ROW_HEIGHT: number = 45;
|
export const ROW_HEIGHT: number = 45;
|
||||||
@@ -77,7 +78,8 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit,
|
|||||||
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
||||||
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
||||||
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
||||||
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
||||||
@@ -145,7 +147,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit,
|
|||||||
jQuery(this._gridEl.nativeElement).empty();
|
jQuery(this._gridEl.nativeElement).empty();
|
||||||
jQuery(this.actionBarContainer.nativeElement).empty();
|
jQuery(this.actionBarContainer.nativeElement).empty();
|
||||||
this.initActionBar();
|
this.initActionBar();
|
||||||
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, this.options);
|
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, this.options);
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
|
|
||||||
this._register(this._table.onContextMenu(e => {
|
this._register(this._table.onContextMenu(e => {
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi
|
|||||||
import { ProxiesCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
import { ProxiesCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService';
|
||||||
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export const VIEW_SELECTOR: string = 'jobproxiesview-component';
|
export const VIEW_SELECTOR: string = 'jobproxiesview-component';
|
||||||
export const ROW_HEIGHT: number = 45;
|
export const ROW_HEIGHT: number = 45;
|
||||||
@@ -78,7 +79,8 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O
|
|||||||
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
|
||||||
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
@Inject(IKeybindingService) keybindingService: IKeybindingService,
|
||||||
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
@Inject(IDashboardService) _dashboardService: IDashboardService,
|
||||||
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService
|
@Inject(IAccessibilityService) private _accessibilityService: IAccessibilityService,
|
||||||
|
@Inject(IQuickInputService) private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService, _agentViewComponent);
|
||||||
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
|
||||||
@@ -145,7 +147,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O
|
|||||||
jQuery(this._gridEl.nativeElement).empty();
|
jQuery(this._gridEl.nativeElement).empty();
|
||||||
jQuery(this.actionBarContainer.nativeElement).empty();
|
jQuery(this.actionBarContainer.nativeElement).empty();
|
||||||
this.initActionBar();
|
this.initActionBar();
|
||||||
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, { columns }, this.options);
|
this._table = new Table(this._gridEl.nativeElement, this._accessibilityService, this._quickInputService, { columns }, this.options);
|
||||||
this._table.grid.setData(this.dataView, true);
|
this._table.grid.setData(this.dataView, true);
|
||||||
|
|
||||||
this._register(this._table.onContextMenu(e => {
|
this._register(this._table.onContextMenu(e => {
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ import { IExecutionPlanService } from 'sql/workbench/services/executionPlan/comm
|
|||||||
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
||||||
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
|
import { mssqlProviderName } from 'sql/platform/connection/common/constants';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: GridOutputComponent.SELECTOR,
|
selector: GridOutputComponent.SELECTOR,
|
||||||
@@ -243,11 +244,12 @@ class DataResourceTable extends GridTableBase<any> {
|
|||||||
@INotificationService notificationService: INotificationService,
|
@INotificationService notificationService: INotificationService,
|
||||||
@IExecutionPlanService executionPlanService: IExecutionPlanService,
|
@IExecutionPlanService executionPlanService: IExecutionPlanService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService,
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(state, createResultSet(source), {
|
super(state, createResultSet(source), {
|
||||||
actionOrientation: ActionsOrientation.HORIZONTAL,
|
actionOrientation: ActionsOrientation.HORIZONTAL,
|
||||||
inMemoryDataProcessing: true
|
inMemoryDataProcessing: true
|
||||||
}, contextMenuService, instantiationService, editorService, untitledEditorService, configurationService, queryModelService, themeService, contextViewService, notificationService, executionPlanService, accessibilityService);
|
}, contextMenuService, instantiationService, editorService, untitledEditorService, configurationService, queryModelService, themeService, contextViewService, notificationService, executionPlanService, accessibilityService, quickInputService);
|
||||||
this._gridDataProvider = this.instantiationService.createInstance(DataResourceDataProvider, source, this.resultSet, this.cellModel);
|
this._gridDataProvider = this.instantiationService.createInstance(DataResourceDataProvider, source, this.resultSet, this.cellModel);
|
||||||
this._chart = this.instantiationService.createInstance(ChartView, false);
|
this._chart = this.instantiationService.createInstance(ChartView, false);
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor
|
|||||||
import { IModelService } from 'vs/editor/common/services/model';
|
import { IModelService } from 'vs/editor/common/services/model';
|
||||||
import { CommonFindController, FindStartFocusAction } from 'vs/editor/contrib/find/browser/findController';
|
import { CommonFindController, FindStartFocusAction } from 'vs/editor/contrib/find/browser/findController';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
class BasicView implements IView {
|
class BasicView implements IView {
|
||||||
public get element(): HTMLElement {
|
public get element(): HTMLElement {
|
||||||
@@ -173,7 +174,8 @@ export class ProfilerEditor extends EditorPane {
|
|||||||
@IClipboardService private _clipboardService: IClipboardService,
|
@IClipboardService private _clipboardService: IClipboardService,
|
||||||
@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
|
@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
|
||||||
@IEditorGroupsService editorGroupsService: IEditorGroupsService,
|
@IEditorGroupsService editorGroupsService: IEditorGroupsService,
|
||||||
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
|
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private readonly _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(ProfilerEditor.ID, telemetryService, themeService, storageService);
|
super(ProfilerEditor.ID, telemetryService, themeService, storageService);
|
||||||
this._profilerEditorContextKey = CONTEXT_PROFILER_EDITOR.bindTo(this._contextKeyService);
|
this._profilerEditorContextKey = CONTEXT_PROFILER_EDITOR.bindTo(this._contextKeyService);
|
||||||
@@ -389,7 +391,7 @@ export class ProfilerEditor extends EditorPane {
|
|||||||
detailTableContainer.style.width = '100%';
|
detailTableContainer.style.width = '100%';
|
||||||
detailTableContainer.style.height = '100%';
|
detailTableContainer.style.height = '100%';
|
||||||
this._detailTableData = new TableDataView<IDetailData>();
|
this._detailTableData = new TableDataView<IDetailData>();
|
||||||
this._detailTable = new Table(detailTableContainer, this._accessibilityService, {
|
this._detailTable = new Table(detailTableContainer, this._accessibilityService, this._quickInputService, {
|
||||||
dataProvider: this._detailTableData, columns: [
|
dataProvider: this._detailTableData, columns: [
|
||||||
{
|
{
|
||||||
id: 'label',
|
id: 'label',
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ import { handleCopyRequest } from 'sql/workbench/contrib/profiler/browser/profil
|
|||||||
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
||||||
import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
|
import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/browser/findState';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export interface ProfilerTableViewState {
|
export interface ProfilerTableViewState {
|
||||||
scrollTop: number;
|
scrollTop: number;
|
||||||
@@ -70,7 +71,8 @@ export class ProfilerTableEditor extends EditorPane implements IProfilerControll
|
|||||||
@IStatusbarService private _statusbarService: IStatusbarService,
|
@IStatusbarService private _statusbarService: IStatusbarService,
|
||||||
@IClipboardService private _clipboardService: IClipboardService,
|
@IClipboardService private _clipboardService: IClipboardService,
|
||||||
@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
|
@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService,
|
||||||
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
|
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private readonly _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(ProfilerTableEditor.ID, telemetryService, _themeService, storageService);
|
super(ProfilerTableEditor.ID, telemetryService, _themeService, storageService);
|
||||||
this._actionMap[ACTION_IDS.FIND_NEXT] = this._instantiationService.createInstance(ProfilerFindNext, this);
|
this._actionMap[ACTION_IDS.FIND_NEXT] = this._instantiationService.createInstance(ProfilerFindNext, this);
|
||||||
@@ -86,7 +88,7 @@ export class ProfilerTableEditor extends EditorPane implements IProfilerControll
|
|||||||
this._overlay.style.zIndex = '4';
|
this._overlay.style.zIndex = '4';
|
||||||
parent.appendChild(this._overlay);
|
parent.appendChild(this._overlay);
|
||||||
|
|
||||||
this._profilerTable = new Table(parent, this._accessibilityService, {
|
this._profilerTable = new Table(parent, this._accessibilityService, this._quickInputService, {
|
||||||
sorter: (args) => {
|
sorter: (args) => {
|
||||||
let input = this.input as ProfilerInput;
|
let input = this.input as ProfilerInput;
|
||||||
if (input && input.data) {
|
if (input && input.data) {
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/common/e
|
|||||||
import { CopyAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
|
import { CopyAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
|
||||||
import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/browser/format';
|
import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/browser/format';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
const ROW_HEIGHT = 29;
|
const ROW_HEIGHT = 29;
|
||||||
const HEADER_HEIGHT = 26;
|
const HEADER_HEIGHT = 26;
|
||||||
@@ -409,7 +410,8 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
|
|||||||
@IContextViewService private readonly contextViewService: IContextViewService,
|
@IContextViewService private readonly contextViewService: IContextViewService,
|
||||||
@INotificationService private readonly notificationService: INotificationService,
|
@INotificationService private readonly notificationService: INotificationService,
|
||||||
@IExecutionPlanService private readonly executionPlanService: IExecutionPlanService,
|
@IExecutionPlanService private readonly executionPlanService: IExecutionPlanService,
|
||||||
@IAccessibilityService private readonly accessibilityService: IAccessibilityService
|
@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private readonly quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
@@ -524,7 +526,7 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
|
|||||||
inMemoryDataProcessing: this.options.inMemoryDataProcessing,
|
inMemoryDataProcessing: this.options.inMemoryDataProcessing,
|
||||||
inMemoryDataCountThreshold: this.options.inMemoryDataCountThreshold
|
inMemoryDataCountThreshold: this.options.inMemoryDataCountThreshold
|
||||||
});
|
});
|
||||||
this.table = this._register(new Table(this.tableContainer, this.accessibilityService, { dataProvider: this.dataProvider, columns: this.columns }, tableOptions));
|
this.table = this._register(new Table(this.tableContainer, this.accessibilityService, this.quickInputService, { dataProvider: this.dataProvider, columns: this.columns }, tableOptions));
|
||||||
this.table.setTableTitle(localize('resultsGrid', "Results grid"));
|
this.table.setTableTitle(localize('resultsGrid', "Results grid"));
|
||||||
this.table.setSelectionModel(this.selectionModel);
|
this.table.setSelectionModel(this.selectionModel);
|
||||||
this.table.registerPlugin(new MouseWheelSupport());
|
this.table.registerPlugin(new MouseWheelSupport());
|
||||||
@@ -924,14 +926,15 @@ class GridTable<T> extends GridTableBase<T> {
|
|||||||
@IContextViewService contextViewService: IContextViewService,
|
@IContextViewService contextViewService: IContextViewService,
|
||||||
@INotificationService notificationService: INotificationService,
|
@INotificationService notificationService: INotificationService,
|
||||||
@IExecutionPlanService executionPlanService: IExecutionPlanService,
|
@IExecutionPlanService executionPlanService: IExecutionPlanService,
|
||||||
@IAccessibilityService accessibilityService: IAccessibilityService
|
@IAccessibilityService accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(state, resultSet, {
|
super(state, resultSet, {
|
||||||
actionOrientation: ActionsOrientation.VERTICAL,
|
actionOrientation: ActionsOrientation.VERTICAL,
|
||||||
inMemoryDataProcessing: true,
|
inMemoryDataProcessing: true,
|
||||||
showActionBar: true,
|
showActionBar: true,
|
||||||
inMemoryDataCountThreshold: configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.inMemoryDataProcessingThreshold,
|
inMemoryDataCountThreshold: configurationService.getValue<IQueryEditorConfiguration>('queryEditor').results.inMemoryDataProcessingThreshold,
|
||||||
}, contextMenuService, instantiationService, editorService, untitledEditorService, configurationService, queryModelService, themeService, contextViewService, notificationService, executionPlanService, accessibilityService);
|
}, contextMenuService, instantiationService, editorService, untitledEditorService, configurationService, queryModelService, themeService, contextViewService, notificationService, executionPlanService, accessibilityService, quickInputService);
|
||||||
this._gridDataProvider = this.instantiationService.createInstance(QueryGridDataProvider, this._runner, resultSet.batchId, resultSet.id);
|
this._gridDataProvider = this.instantiationService.createInstance(QueryGridDataProvider, this._runner, resultSet.batchId, resultSet.id);
|
||||||
this.providerId = this._runner.getProviderId();
|
this.providerId = this._runner.getProviderId();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import { ContextMenuAnchor } from 'sql/workbench/contrib/resourceViewer/browser/
|
|||||||
import { LoadingSpinnerPlugin } from 'sql/base/browser/ui/table/plugins/loadingSpinner.plugin';
|
import { LoadingSpinnerPlugin } from 'sql/base/browser/ui/table/plugins/loadingSpinner.plugin';
|
||||||
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
export class ResourceViewerTable extends Disposable {
|
export class ResourceViewerTable extends Disposable {
|
||||||
|
|
||||||
@@ -41,14 +42,15 @@ export class ResourceViewerTable extends Disposable {
|
|||||||
@ICommandService private _commandService: ICommandService,
|
@ICommandService private _commandService: ICommandService,
|
||||||
@INotificationService private _notificationService: INotificationService,
|
@INotificationService private _notificationService: INotificationService,
|
||||||
@IContextViewService private _contextViewService: IContextViewService,
|
@IContextViewService private _contextViewService: IContextViewService,
|
||||||
@IAccessibilityService private _accessibilityService: IAccessibilityService) {
|
@IAccessibilityService private _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private _quickInputService: IQuickInputService) {
|
||||||
super();
|
super();
|
||||||
let filterFn = (data: Array<azdata.DataGridItem>): Array<azdata.DataGridItem> => {
|
let filterFn = (data: Array<azdata.DataGridItem>): Array<azdata.DataGridItem> => {
|
||||||
return data.filter(item => this.filter(item));
|
return data.filter(item => this.filter(item));
|
||||||
};
|
};
|
||||||
|
|
||||||
this._dataView = new TableDataView<azdata.DataGridItem>(undefined, undefined, undefined, filterFn);
|
this._dataView = new TableDataView<azdata.DataGridItem>(undefined, undefined, undefined, filterFn);
|
||||||
this._resourceViewerTable = this._register(new Table(parent, this._accessibilityService, {
|
this._resourceViewerTable = this._register(new Table(parent, this._accessibilityService, this._quickInputService, {
|
||||||
sorter: (args) => {
|
sorter: (args) => {
|
||||||
this._dataView.sort(args);
|
this._dataView.sort(args);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ import { attachButtonStyler } from 'vs/platform/theme/common/styler';
|
|||||||
import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
|
import { IDisposableDataProvider } from 'sql/base/common/dataProvider';
|
||||||
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
const labelDisplay = nls.localize("insights.item", "Item");
|
const labelDisplay = nls.localize("insights.item", "Item");
|
||||||
const valueDisplay = nls.localize("insights.value", "Value");
|
const valueDisplay = nls.localize("insights.value", "Value");
|
||||||
@@ -88,13 +89,14 @@ class InsightTableView extends ViewPane {
|
|||||||
@IOpenerService openerService: IOpenerService,
|
@IOpenerService openerService: IOpenerService,
|
||||||
@IThemeService themeService: IThemeService,
|
@IThemeService themeService: IThemeService,
|
||||||
@ITelemetryService telemetryService: ITelemetryService,
|
@ITelemetryService telemetryService: ITelemetryService,
|
||||||
@IAccessibilityService private _accessibilityService: IAccessibilityService
|
@IAccessibilityService private _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override renderBody(container: HTMLElement): void {
|
protected override renderBody(container: HTMLElement): void {
|
||||||
this._table = new Table(container, this._accessibilityService, {
|
this._table = new Table(container, this._accessibilityService, this._quickInputService, {
|
||||||
columns: this.columns,
|
columns: this.columns,
|
||||||
dataProvider: this.data
|
dataProvider: this.data
|
||||||
}, this.tableOptions);
|
}, this.tableOptions);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
import { IRenderMime } from 'sql/workbench/services/notebook/browser/outputs/renderMimeInterfaces';
|
import { IRenderMime } from 'sql/workbench/services/notebook/browser/outputs/renderMimeInterfaces';
|
||||||
import { ReadonlyJSONObject } from 'sql/workbench/services/notebook/common/jsonext';
|
import { ReadonlyJSONObject } from 'sql/workbench/services/notebook/common/jsonext';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -22,6 +23,7 @@ export class MimeModel implements IRenderMime.IMimeModel {
|
|||||||
this._callback = options.callback;
|
this._callback = options.callback;
|
||||||
this._themeService = options.themeService;
|
this._themeService = options.themeService;
|
||||||
this._accessibilityService = options.accessibilityService;
|
this._accessibilityService = options.accessibilityService;
|
||||||
|
this._quickInputService = options.quickInputService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,6 +53,10 @@ export class MimeModel implements IRenderMime.IMimeModel {
|
|||||||
return this._accessibilityService;
|
return this._accessibilityService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get quickInputService(): IQuickInputService {
|
||||||
|
return this._quickInputService;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the data associated with the model.
|
* Set the data associated with the model.
|
||||||
*
|
*
|
||||||
@@ -69,6 +75,7 @@ export class MimeModel implements IRenderMime.IMimeModel {
|
|||||||
private _metadata: ReadonlyJSONObject;
|
private _metadata: ReadonlyJSONObject;
|
||||||
private _themeService: IThemeService;
|
private _themeService: IThemeService;
|
||||||
private _accessibilityService: IAccessibilityService;
|
private _accessibilityService: IAccessibilityService;
|
||||||
|
private _quickInputService: IQuickInputService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -105,5 +112,7 @@ export namespace MimeModel {
|
|||||||
themeService?: IThemeService;
|
themeService?: IThemeService;
|
||||||
|
|
||||||
accessibilityService?: IAccessibilityService;
|
accessibilityService?: IAccessibilityService;
|
||||||
|
|
||||||
|
quickInputService?: IQuickInputService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { ReadonlyJSONObject } from 'sql/workbench/services/notebook/common/jsonext';
|
import { ReadonlyJSONObject } from 'sql/workbench/services/notebook/common/jsonext';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A namespace for rendermime associated interfaces.
|
* A namespace for rendermime associated interfaces.
|
||||||
@@ -45,6 +46,7 @@ export namespace IRenderMime {
|
|||||||
readonly themeService: IThemeService;
|
readonly themeService: IThemeService;
|
||||||
|
|
||||||
readonly accessibilityService: IAccessibilityService;
|
readonly accessibilityService: IAccessibilityService;
|
||||||
|
readonly quickInputService: IQuickInputService;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additio
|
|||||||
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/common/constants';
|
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/common/constants';
|
||||||
import { values } from 'vs/base/common/collections';
|
import { values } from 'vs/base/common/collections';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render DataResource as a grid into a host node.
|
* Render DataResource as a grid into a host node.
|
||||||
@@ -56,7 +57,7 @@ export function renderDataResource(
|
|||||||
let transformedData = transformData(sourceObject.data, columnsTransformed);
|
let transformedData = transformData(sourceObject.data, columnsTransformed);
|
||||||
tableResultsData.push(transformedData);
|
tableResultsData.push(transformedData);
|
||||||
|
|
||||||
let detailTable = new Table(tableContainer, options.accessibilityService, {
|
let detailTable = new Table(tableContainer, options.accessibilityService, options.quickInputService, {
|
||||||
dataProvider: tableResultsData, columns: columnsTransformed
|
dataProvider: tableResultsData, columns: columnsTransformed
|
||||||
}, {
|
}, {
|
||||||
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
|
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
|
||||||
@@ -141,5 +142,10 @@ export namespace renderDataResource {
|
|||||||
* Accessibility service used to get screen reader optimization flag state
|
* Accessibility service used to get screen reader optimization flag state
|
||||||
*/
|
*/
|
||||||
accessibilityService: IAccessibilityService;
|
accessibilityService: IAccessibilityService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* quickInput service is used to get user's input in column resizing.
|
||||||
|
*/
|
||||||
|
quickInputService?: IQuickInputService;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -402,7 +402,8 @@ export class RenderedDataResource extends RenderedCommon {
|
|||||||
host: this.node,
|
host: this.node,
|
||||||
source: JSON.stringify(model.data[this.mimeType]),
|
source: JSON.stringify(model.data[this.mimeType]),
|
||||||
themeService: model.themeService,
|
themeService: model.themeService,
|
||||||
accessibilityService: model.accessibilityService
|
accessibilityService: model.accessibilityService,
|
||||||
|
quickInputService: model.quickInputService
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ import { IBackupRestoreUrlBrowserDialogService } from 'sql/workbench/services/ba
|
|||||||
import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants';
|
import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants';
|
||||||
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
|
||||||
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||||
|
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
|
||||||
|
|
||||||
interface FileListElement {
|
interface FileListElement {
|
||||||
logicalFileName: string;
|
logicalFileName: string;
|
||||||
@@ -159,7 +160,8 @@ export class RestoreDialog extends Modal {
|
|||||||
@IClipboardService clipboardService: IClipboardService,
|
@IClipboardService clipboardService: IClipboardService,
|
||||||
@ILogService logService: ILogService,
|
@ILogService logService: ILogService,
|
||||||
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService,
|
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService,
|
||||||
@IAccessibilityService private _accessibilityService: IAccessibilityService
|
@IAccessibilityService private _accessibilityService: IAccessibilityService,
|
||||||
|
@IQuickInputService private _quickInputService: IQuickInputService
|
||||||
) {
|
) {
|
||||||
super(localize('RestoreDialogTitle', "Restore database"), TelemetryKeys.ModalDialogName.Restore, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { hasErrors: true, width: 'wide', hasSpinner: true });
|
super(localize('RestoreDialogTitle', "Restore database"), TelemetryKeys.ModalDialogName.Restore, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { hasErrors: true, width: 'wide', hasSpinner: true });
|
||||||
// view model
|
// view model
|
||||||
@@ -310,7 +312,7 @@ export class RestoreDialog extends Modal {
|
|||||||
this._restorePlanTableContainer = DOM.append(restorePlanElement, DOM.$('.dialog-input-section.restore-list'));
|
this._restorePlanTableContainer = DOM.append(restorePlanElement, DOM.$('.dialog-input-section.restore-list'));
|
||||||
DOM.hide(this._restorePlanTableContainer);
|
DOM.hide(this._restorePlanTableContainer);
|
||||||
this._restorePlanData = new TableDataView<Slick.SlickData>();
|
this._restorePlanData = new TableDataView<Slick.SlickData>();
|
||||||
this._restorePlanTable = this._register(new Table<Slick.SlickData>(this._restorePlanTableContainer, this._accessibilityService,
|
this._restorePlanTable = this._register(new Table<Slick.SlickData>(this._restorePlanTableContainer, this._accessibilityService, this._quickInputService,
|
||||||
{ dataProvider: this._restorePlanData, columns: this._restorePlanColumn }, { enableColumnReorder: false }));
|
{ dataProvider: this._restorePlanData, columns: this._restorePlanColumn }, { enableColumnReorder: false }));
|
||||||
this._restorePlanTable.setTableTitle(localize('restorePlan', "Restore plan"));
|
this._restorePlanTable.setTableTitle(localize('restorePlan', "Restore plan"));
|
||||||
this._restorePlanTable.setSelectionModel(new RowSelectionModel({ selectActiveRow: false }));
|
this._restorePlanTable.setSelectionModel(new RowSelectionModel({ selectActiveRow: false }));
|
||||||
@@ -361,7 +363,7 @@ export class RestoreDialog extends Modal {
|
|||||||
field: 'restoreAs'
|
field: 'restoreAs'
|
||||||
}];
|
}];
|
||||||
this._fileListData = new TableDataView<FileListElement>();
|
this._fileListData = new TableDataView<FileListElement>();
|
||||||
this._fileListTable = this._register(new Table<FileListElement>(this._fileListTableContainer, this._accessibilityService,
|
this._fileListTable = this._register(new Table<FileListElement>(this._fileListTableContainer, this._accessibilityService, this._quickInputService,
|
||||||
{ dataProvider: this._fileListData, columns }, { enableColumnReorder: false }));
|
{ dataProvider: this._fileListData, columns }, { enableColumnReorder: false }));
|
||||||
this._fileListTable.setSelectionModel(new RowSelectionModel());
|
this._fileListTable.setSelectionModel(new RowSelectionModel());
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ suite('TableComponent Tests', () => {
|
|||||||
['4', '5', '6']
|
['4', '5', '6']
|
||||||
];
|
];
|
||||||
let columns = ['c1', 'c2', 'c3'];
|
let columns = ['c1', 'c2', 'c3'];
|
||||||
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined);
|
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined, undefined);
|
||||||
|
|
||||||
let actual = tableComponent.transformData(data, columns);
|
let actual = tableComponent.transformData(data, columns);
|
||||||
let expected: { [key: string]: string }[] = [
|
let expected: { [key: string]: string }[] = [
|
||||||
@@ -39,7 +39,7 @@ suite('TableComponent Tests', () => {
|
|||||||
|
|
||||||
test('Table transformData should return empty array given undefined rows', () => {
|
test('Table transformData should return empty array given undefined rows', () => {
|
||||||
let data = undefined;
|
let data = undefined;
|
||||||
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined);
|
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined, undefined);
|
||||||
let columns = ['c1', 'c2', 'c3'];
|
let columns = ['c1', 'c2', 'c3'];
|
||||||
let actual = tableComponent.transformData(data, columns);
|
let actual = tableComponent.transformData(data, columns);
|
||||||
let expected: { [key: string]: string }[] = [];
|
let expected: { [key: string]: string }[] = [];
|
||||||
@@ -52,7 +52,7 @@ suite('TableComponent Tests', () => {
|
|||||||
['4', '5', '6']
|
['4', '5', '6']
|
||||||
];
|
];
|
||||||
let columns;
|
let columns;
|
||||||
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined);
|
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined, undefined);
|
||||||
let actual = tableComponent.transformData(data, columns);
|
let actual = tableComponent.transformData(data, columns);
|
||||||
let expected: { [key: string]: string }[] = [];
|
let expected: { [key: string]: string }[] = [];
|
||||||
assert.deepStrictEqual(actual, expected);
|
assert.deepStrictEqual(actual, expected);
|
||||||
@@ -63,7 +63,7 @@ suite('TableComponent Tests', () => {
|
|||||||
['1', '2'],
|
['1', '2'],
|
||||||
['4', '5']
|
['4', '5']
|
||||||
];
|
];
|
||||||
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined);
|
const tableComponent = new TableComponent(undefined, undefined, undefined, new NullLogService(), undefined, undefined, undefined, undefined, undefined);
|
||||||
let columns = ['c1', 'c2', 'c3'];
|
let columns = ['c1', 'c2', 'c3'];
|
||||||
let actual = tableComponent.transformData(data, columns);
|
let actual = tableComponent.transformData(data, columns);
|
||||||
let expected: { [key: string]: string }[] = [
|
let expected: { [key: string]: string }[] = [
|
||||||
|
|||||||
Reference in New Issue
Block a user