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

EdgeEvents implementation unfinished

Browse Source
This commit is contained in:
deaflynx 2020-10-22 12:25:43 +03:00
parent 1db3edecf8
commit d5d5629430
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,9 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
this.columns = [];
this.columns.push(
new DateEntityTableColumn<Event>('createdTime', 'event.event-time', this.datePipe, '120px'),
new EntityTableColumn<Event>('server', 'event.server', '100px',
(entity) => entity.body.server, entity => ({}), false));
// new EntityTableColumn<Event>('server', 'event.server', '100px',
// (entity) => entity.body.server, entity => ({}), false)
);
switch (this.eventType) {
case EventType.ERROR:
this.columns.push(
@ -171,7 +172,11 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
this.columns.push(
new EntityTableColumn<Event>('type', 'event.type', '100%',
(entity) => entity.type, entity => ({}), false),
);
new EntityTableColumn<Event>('action', 'event.action', '100%',
(entity) => entity.action, entity => ({}), false),
new EntityTableColumn<Event>('entityId', 'event.entityId', '100%',
(entity) => entity.id.id, entity => ({}), false) //TODO: replace this to entity.entityId because of conflict wiht entityId model
);
break;
case DebugEventType.DEBUG_RULE_NODE:
case DebugEventType.DEBUG_RULE_CHAIN:

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

@ -90,4 +90,5 @@ export interface Event extends BaseData<EventId> {
type: string;
uid: string;
body: EventBody;
action: string; //TODO: refactor edgeEvents - move parameters to the entity.body
}