Add action list to cards with callback (#1392)

- Add the ActionDescriptor functionality. This is a table of information with actionable links
- Also add optional status indicator which shows a color. In the future, would like to extend to have icon in this space as an alternative.
- Fixed 1 issue with account management UI throwing an error on cancel
This commit is contained in:
Kevin Cunnane
2018-05-11 10:59:42 -07:00
committed by GitHub
parent c0a6f3e012
commit 41ffd6e8ae
9 changed files with 178 additions and 29 deletions

View File

@@ -0,0 +1,19 @@
<div *ngIf="label" class="model-card">
<span *ngIf="hasStatus" class="card-status">
<div class="status-content" [style.backgroundColor]="statusColor"></div>
</span>
<div class="card-content">
<h4 class="card-label">{{label}}</h4>
<p class="card-value">{{value}}</p>
<span *ngIf="actions">
<table class="model-table">
<tr *ngFor="let action of actions">
<td class="table-row">{{action.label}}</td>
<td *ngIf="action.actionTitle" class="table-row">
<a class="pointer prominent" (click)="onDidActionClick(action)">{{action.actionTitle}}</a>
</td>
</tr>
</table>
</span>
</div>
</div>

View File

@@ -9,29 +9,37 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFacto
} from '@angular/core';
import * as sqlops from 'sqlops';
import { ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
import * as colors from 'vs/platform/theme/common/colorRegistry';
import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
import { BOOTSTRAP_SERVICE_ID, IBootstrapService } from 'sql/services/bootstrap/bootstrapService';
import { IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { StatusIndicator, CardProperties, ActionDescriptor } from 'sql/workbench/api/common/sqlExtHostTypes';
@Component({
template: `
<div *ngIf="label" class="model-card" >
<h4 class="card-label">{{label}}</h4>
<p class="card-value">{{value}}</p>
</div>
`
templateUrl: decodeURI(require.toUrl('sql/parts/modelComponents/card.component.html'))
})
export default class CardComponent extends ComponentBase implements IComponent, OnDestroy {
@Input() descriptor: IComponentDescriptor;
@Input() modelStore: IModelStore;
constructor(@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef) {
private backgroundColor: string;
constructor(@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
@Inject(BOOTSTRAP_SERVICE_ID) private _bootstrapService: IBootstrapService
) {
super(changeRef);
}
ngOnInit(): void {
this.baseInit();
this._register(this._bootstrapService.themeService.onDidColorThemeChange(this.updateTheme, this));
this.updateTheme(this._bootstrapService.themeService.getColorTheme());
}
ngOnDestroy(): void {
@@ -52,15 +60,45 @@ export default class CardComponent extends ComponentBase implements IComponent,
// CSS-bound properties
public get label(): string {
return this.getPropertyOrDefault<sqlops.CardProperties, string>((props) => props.label, '');
return this.getPropertyOrDefault<CardProperties, string>((props) => props.label, '');
}
public get value(): string {
return this.getPropertyOrDefault<sqlops.CardProperties, string>((props) => props.value, '');
return this.getPropertyOrDefault<CardProperties, string>((props) => props.value, '');
}
public get actions(): sqlops.ActionDescriptor[] {
return this.getPropertyOrDefault<sqlops.CardProperties, sqlops.ActionDescriptor[]>((props) => props.actions, []);
public get actions(): ActionDescriptor[] {
return this.getPropertyOrDefault<CardProperties, ActionDescriptor[]>((props) => props.actions, []);
}
public hasStatus(): boolean {
let status = this.getPropertyOrDefault<CardProperties, StatusIndicator>((props) => props.status, StatusIndicator.None);
return status !== StatusIndicator.None;
}
public get statusColor(): string {
let status = this.getPropertyOrDefault<CardProperties, StatusIndicator>((props) => props.status, StatusIndicator.None);
switch(status) {
case StatusIndicator.Ok:
return 'green';
case StatusIndicator.Warning:
return 'orange';
case StatusIndicator.Error:
return 'red';
default:
return this.backgroundColor;
}
}
private updateTheme(theme: IColorTheme) {
this.backgroundColor = theme.getColor(colors.editorBackground, true).toString();
}
private onDidActionClick(action: ActionDescriptor): void {
this._onEventEmitter.fire({
eventType: ComponentEventType.onDidClick,
args: action
});
}
}

View File

@@ -2,12 +2,9 @@
.model-card {
position: relative;
display: inline-block;
height: auto;
height: 90%;
width: auto;
margin: 15px;
padding: 10px 45px 20px 45px;
min-height: 30px;
min-width: 30px;
border-width: 1px;
border-style: solid;
border-color: rgb(214, 214, 214);
@@ -16,6 +13,16 @@
box-shadow: rgba(120, 120, 120, 0.75) 0px 0px 6px;
}
.model-card .card-content {
position: relative;
display: inline-block;
height: auto;
width: auto;
padding: 10px 45px 20px 45px;
min-height: 30px;
min-width: 30px;
}
.model-card .card-label {
font-size: 12px;
font-weight: bold;
@@ -24,4 +31,42 @@
.model-card .card-value {
font-size: 12px;
line-height: 18px;
}
}
.model-card .card-status {
position: absolute;
top: 7px;
left: 5px;
overflow: hidden;
width: 22px;
height: 22px;
}
.model-card .status-content {
position: absolute;
top: 0px;
right: 0px;
min-width: 16px;
height: 16px;
border-radius: 8px;
text-align: center;
}
.model-card .model-table {
border-spacing: 5px;
}
.model-table .table-row {
width: auto;
clear: both;
}
.model-table .table-cell {
vertical-align: top;
padding: 7px;
}
.model-table a {
cursor: pointer;
text-decoration: underline
}