dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edgeEventStatusColor refactored

Browse Source
This commit is contained in:
Artem Babak 2020-11-05 16:52:37 +02:00
parent d6b10c9409
commit 6ac70dd76e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/event/event-table-config.ts
View File

@ -25,7 +25,7 @@ import {
Event, Event,
EventType, EventType,
EdgeEventType, EdgeEventType,
EdgeEventStatusColor, EdgeEventStatus,
edgeEventStatusColor edgeEventStatusColor
} from '@shared/models/event.models'; } from '@shared/models/event.models';
import {TimePageLink} from '@shared/models/page/page-link'; import {TimePageLink} from '@shared/models/page/page-link';
@ -197,7 +197,7 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
new EntityTableColumn<Event>('status', 'event.status', '100%', new EntityTableColumn<Event>('status', 'event.status', '100%',
(entity) => this.updateEdgeEventStatus(entity.createdTime), (entity) => this.updateEdgeEventStatus(entity.createdTime),
entity => ({ entity => ({
color: this.isPending(entity.createdTime) ? edgeEventStatusColor.get(EdgeEventStatusColor.PENDING) : edgeEventStatusColor.get(EdgeEventStatusColor.DEPLOYED) color: this.isPending(entity.createdTime) ? edgeEventStatusColor.get(EdgeEventStatus.PENDING) : edgeEventStatusColor.get(EdgeEventStatus.DEPLOYED)
}), false), }), false),
new EntityActionTableColumn<Event>('data', 'event.data', new EntityActionTableColumn<Event>('data', 'event.data',
{ {

1
ui-ngx/src/app/shared/models/asset.models.ts
View File

@ -19,7 +19,6 @@ import { AssetId } from './id/asset-id';
import { TenantId } from '@shared/models/id/tenant-id'; import { TenantId } from '@shared/models/id/tenant-id';
import { CustomerId } from '@shared/models/id/customer-id'; import { CustomerId } from '@shared/models/id/customer-id';
import { EntitySearchQuery } from '@shared/models/relation.models'; import { EntitySearchQuery } from '@shared/models/relation.models';
import { EdgeId } from "@shared/models/id/edge-id";
export interface Asset extends BaseData<AssetId> { export interface Asset extends BaseData<AssetId> {
tenantId?: TenantId; tenantId?: TenantId;

8
ui-ngx/src/app/shared/models/event.models.ts
View File

@ -54,15 +54,15 @@ export enum EdgeEventType {
ADMIN_SETTINGS = "ADMIN_SETTINGS" ADMIN_SETTINGS = "ADMIN_SETTINGS"
} }
export enum EdgeEventStatusColor { export enum EdgeEventStatus {
DEPLOYED = "DEPLOYED", DEPLOYED = "DEPLOYED",
PENDING = "PENDING" PENDING = "PENDING"
} }
export const edgeEventStatusColor = new Map<EdgeEventStatusColor, string> ( export const edgeEventStatusColor = new Map<EdgeEventStatus, string> (
[ [
[EdgeEventStatusColor.DEPLOYED, '#000000'], [EdgeEventStatus.DEPLOYED, '#000000'],
[EdgeEventStatusColor.PENDING, '#9e9e9e'] [EdgeEventStatus.PENDING, '#9e9e9e']
] ]
); );