mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-23 01:25:38 -05:00
Support view model toolbar (#1533)
* support view model toolbar * add EULA * formatting * address comment
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
|
||||
import FlexContainer from './flexContainer.component';
|
||||
import FormContainer from './formContainer.component';
|
||||
import ToolbarContainer from './toolbarContainer.component';
|
||||
import GroupContainer from './groupContainer.component';
|
||||
import CardComponent from './card.component';
|
||||
import InputBoxComponent from './inputbox.component';
|
||||
@@ -23,6 +24,9 @@ registerComponentType(FLEX_CONTAINER, ModelComponentTypes.FlexContainer, FlexCon
|
||||
export const FORM_CONTAINER = 'form-container';
|
||||
registerComponentType(FORM_CONTAINER, ModelComponentTypes.Form, FormContainer);
|
||||
|
||||
export const TOOLBAR_CONTAINER = 'toolbar-container';
|
||||
registerComponentType(TOOLBAR_CONTAINER, ModelComponentTypes.Toolbar, ToolbarContainer);
|
||||
|
||||
export const GROUP_CONTAINER = 'group-container';
|
||||
registerComponentType(GROUP_CONTAINER, ModelComponentTypes.Group, GroupContainer);
|
||||
|
||||
|
||||
91
src/sql/parts/modelComponents/toolbarContainer.component.ts
Normal file
91
src/sql/parts/modelComponents/toolbarContainer.component.ts
Normal file
@@ -0,0 +1,91 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
import 'vs/css!./toolbarLayout';
|
||||
|
||||
import {
|
||||
Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
|
||||
ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
|
||||
} from '@angular/core';
|
||||
|
||||
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
|
||||
|
||||
import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
|
||||
import { ContainerBase } from 'sql/parts/modelComponents/componentBase';
|
||||
import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component';
|
||||
import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
|
||||
|
||||
export interface ToolbarItemConfig {
|
||||
title?: string;
|
||||
}
|
||||
|
||||
class ToolbarItem {
|
||||
constructor(public descriptor: IComponentDescriptor, public config: ToolbarItemConfig) { }
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'modelview-toolbarContainer',
|
||||
template: `
|
||||
<div #container *ngIf="items" class="modelview-toolbar-container">
|
||||
<ng-container *ngFor="let item of items">
|
||||
<div class="modelview-toolbar-item" >
|
||||
<div *ngIf="hasTitle(item)" class="modelview-toolbar-title" >
|
||||
{{getItemTitle(item)}}
|
||||
</div>
|
||||
<div class="modelview-toolbar-component">
|
||||
<model-component-wrapper [descriptor]="item.descriptor" [modelStore]="modelStore" >
|
||||
</model-component-wrapper>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
`
|
||||
})
|
||||
export default class ToolbarContainer extends ContainerBase<ToolbarItemConfig> implements IComponent, OnDestroy, AfterViewInit {
|
||||
@Input() descriptor: IComponentDescriptor;
|
||||
@Input() modelStore: IModelStore;
|
||||
|
||||
@ViewChildren(ModelComponentWrapper) private _componentWrappers: QueryList<ModelComponentWrapper>;
|
||||
@ViewChild('container', { read: ElementRef }) private _container: ElementRef;
|
||||
|
||||
constructor(
|
||||
@Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface,
|
||||
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef) {
|
||||
super(changeRef);
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.baseInit();
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.baseDestroy();
|
||||
}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
}
|
||||
|
||||
/// IComponent implementation
|
||||
|
||||
public layout(): void {
|
||||
if (this._componentWrappers) {
|
||||
this._componentWrappers.forEach(wrapper => {
|
||||
wrapper.layout();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public setLayout(layout: any): void {
|
||||
this.layout();
|
||||
}
|
||||
|
||||
private getItemTitle(item: ToolbarItem): string {
|
||||
let itemConfig = item.config;
|
||||
return itemConfig ? itemConfig.title : '';
|
||||
}
|
||||
|
||||
private hasTitle(item: ToolbarItem): boolean {
|
||||
return item && item.config && item.config.title !== undefined;
|
||||
}
|
||||
}
|
||||
45
src/sql/parts/modelComponents/toolbarLayout.css
Normal file
45
src/sql/parts/modelComponents/toolbarLayout.css
Normal file
@@ -0,0 +1,45 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
.modelview-toolbar-container {
|
||||
display: flex;
|
||||
padding: 15px;
|
||||
justify-content: flex-start;
|
||||
line-height: 1.4em;
|
||||
white-space: nowrap;
|
||||
flex-wrap: wrap;
|
||||
border-bottom-width: .5px;
|
||||
border-bottom-style: solid;
|
||||
box-sizing: border-box;
|
||||
border-bottom-color: rgba(128, 128, 128, 0.35);
|
||||
}
|
||||
|
||||
.modelview-toolbar-container .modelview-toolbar-item {
|
||||
flex: 0 0;
|
||||
flex-direction: row;
|
||||
display: flex;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.modelview-toolbar-container .modelview-toolbar-title {
|
||||
padding-right: 5px;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.modelview-toolbar-container .modelview-toolbar-component .select-box,
|
||||
.modelview-toolbar-container .modelview-toolbar-component .monaco-inputbox {
|
||||
width: 200px;
|
||||
height: 25px;
|
||||
}
|
||||
|
||||
.modelview-toolbar-container .modelview-toolbar-component button {
|
||||
height: 25px;
|
||||
}
|
||||
|
||||
.modelview-toolbar-container .modelview-toolbar-component button .monaco-text-button {
|
||||
padding: 0px
|
||||
}
|
||||
27
src/sql/sqlops.proposed.d.ts
vendored
27
src/sql/sqlops.proposed.d.ts
vendored
@@ -30,6 +30,7 @@ declare module 'sqlops' {
|
||||
dashboardWebview(webviewId: string): ComponentBuilder<DashboardWebviewComponent>;
|
||||
formContainer(): FormBuilder;
|
||||
groupContainer(): GroupBuilder;
|
||||
toolbarContainer(): ToolbarBuilder;
|
||||
}
|
||||
|
||||
export interface ComponentBuilder<T extends Component> {
|
||||
@@ -49,6 +50,24 @@ declare module 'sqlops' {
|
||||
export interface GroupBuilder extends ContainerBuilder<GroupContainer, GroupLayout, GroupItemLayout> {
|
||||
}
|
||||
|
||||
export interface ToolbarBuilder extends ContainerBuilder<ToolbarContainer, any, any> {
|
||||
withToolbarItems(components: ToolbarComponent[]): ContainerBuilder<ToolbarContainer, any, any>;
|
||||
|
||||
/**
|
||||
* Creates a collection of child components and adds them all to this container
|
||||
*
|
||||
* @param toolbarComponents the definitions
|
||||
*/
|
||||
addToolbarItems(toolbarComponents: Array<ToolbarComponent>): void;
|
||||
|
||||
/**
|
||||
* Creates a child component and adds it to this container.
|
||||
*
|
||||
* @param toolbarComponent the component to be added
|
||||
*/
|
||||
addToolbarItem(toolbarComponent: ToolbarComponent): void;
|
||||
}
|
||||
|
||||
export interface FormBuilder extends ContainerBuilder<FormContainer, FormLayout, FormItemLayout> {
|
||||
withFormItems(components: FormComponent[], itemLayout?: FormItemLayout): ContainerBuilder<FormContainer, FormLayout, FormItemLayout>;
|
||||
|
||||
@@ -104,6 +123,11 @@ declare module 'sqlops' {
|
||||
actions?: Component[];
|
||||
}
|
||||
|
||||
export interface ToolbarComponent {
|
||||
component: Component;
|
||||
title?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* A component that contains other components
|
||||
*/
|
||||
@@ -212,6 +236,9 @@ declare module 'sqlops' {
|
||||
export interface GroupContainer extends Container<GroupLayout, GroupItemLayout> {
|
||||
}
|
||||
|
||||
export interface ToolbarContainer extends Container<any, any> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Describes an action to be shown in the UI, with a user-readable label
|
||||
* and a callback to execute the action
|
||||
|
||||
@@ -77,7 +77,8 @@ export enum ModelComponentTypes {
|
||||
DashboardWidget,
|
||||
DashboardWebview,
|
||||
Form,
|
||||
Group
|
||||
Group,
|
||||
Toolbar
|
||||
}
|
||||
|
||||
export interface IComponentShape {
|
||||
|
||||
@@ -45,6 +45,13 @@ class ModelBuilderImpl implements sqlops.ModelBuilder {
|
||||
return container;
|
||||
}
|
||||
|
||||
toolbarContainer(): sqlops.ToolbarBuilder {
|
||||
let id = this.getNextComponentId();
|
||||
let container = new ToolbarContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Toolbar, id);
|
||||
this._componentBuilders.set(id, container);
|
||||
return container;
|
||||
}
|
||||
|
||||
groupContainer(): sqlops.GroupBuilder {
|
||||
let id = this.getNextComponentId();
|
||||
let container: ContainerBuilderImpl<sqlops.GroupContainer, any, any> = new ContainerBuilderImpl<sqlops.GroupContainer, sqlops.GroupLayout, sqlops.GroupItemLayout>(this._proxy, this._handle, ModelComponentTypes.Group, id);
|
||||
@@ -256,6 +263,34 @@ class FormContainerBuilder extends ContainerBuilderImpl<sqlops.FormContainer, sq
|
||||
}
|
||||
}
|
||||
|
||||
class ToolbarContainerBuilder extends ContainerBuilderImpl<sqlops.ToolbarContainer, any, any> implements sqlops.ToolbarBuilder {
|
||||
withToolbarItems(components: sqlops.ToolbarComponent[]): sqlops.ContainerBuilder<sqlops.ToolbarContainer, any, any> {
|
||||
this._component.itemConfigs = components.map(item => {
|
||||
return this.convertToItemConfig(item);
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
private convertToItemConfig(toolbarComponent: sqlops.ToolbarComponent): InternalItemConfig {
|
||||
let componentWrapper = toolbarComponent.component as ComponentWrapper;
|
||||
|
||||
return new InternalItemConfig(componentWrapper, {
|
||||
title: toolbarComponent.title
|
||||
});
|
||||
}
|
||||
|
||||
addToolbarItems(toolbarComponent: Array<sqlops.ToolbarComponent>): void {
|
||||
toolbarComponent.forEach(toolbarComponent => {
|
||||
this.addToolbarItem(toolbarComponent);
|
||||
});
|
||||
}
|
||||
|
||||
addToolbarItem(toolbarComponent: sqlops.ToolbarComponent): void {
|
||||
let itemImpl = this.convertToItemConfig(toolbarComponent);
|
||||
this._component.addItem(toolbarComponent.component as ComponentWrapper, itemImpl.config);
|
||||
}
|
||||
}
|
||||
|
||||
class InternalItemConfig {
|
||||
constructor(private _component: ComponentWrapper, public config: any) { }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user