Commit d5d562943027736a2a559620f1a2bf14ad8ee691

Authored by deaflynx
1 parent 1db3edec

EdgeEvents implementation unfinished

@@ -119,8 +119,9 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> { @@ -119,8 +119,9 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
119 this.columns = []; 119 this.columns = [];
120 this.columns.push( 120 this.columns.push(
121 new DateEntityTableColumn<Event>('createdTime', 'event.event-time', this.datePipe, '120px'), 121 new DateEntityTableColumn<Event>('createdTime', 'event.event-time', this.datePipe, '120px'),
122 - new EntityTableColumn<Event>('server', 'event.server', '100px',  
123 - (entity) => entity.body.server, entity => ({}), false)); 122 + // new EntityTableColumn<Event>('server', 'event.server', '100px',
  123 + // (entity) => entity.body.server, entity => ({}), false)
  124 + );
124 switch (this.eventType) { 125 switch (this.eventType) {
125 case EventType.ERROR: 126 case EventType.ERROR:
126 this.columns.push( 127 this.columns.push(
@@ -171,7 +172,11 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> { @@ -171,7 +172,11 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
171 this.columns.push( 172 this.columns.push(
172 new EntityTableColumn<Event>('type', 'event.type', '100%', 173 new EntityTableColumn<Event>('type', 'event.type', '100%',
173 (entity) => entity.type, entity => ({}), false), 174 (entity) => entity.type, entity => ({}), false),
174 - ); 175 + new EntityTableColumn<Event>('action', 'event.action', '100%',
  176 + (entity) => entity.action, entity => ({}), false),
  177 + new EntityTableColumn<Event>('entityId', 'event.entityId', '100%',
  178 + (entity) => entity.id.id, entity => ({}), false) //TODO: replace this to entity.entityId because of conflict wiht entityId model
  179 + );
175 break; 180 break;
176 case DebugEventType.DEBUG_RULE_NODE: 181 case DebugEventType.DEBUG_RULE_NODE:
177 case DebugEventType.DEBUG_RULE_CHAIN: 182 case DebugEventType.DEBUG_RULE_CHAIN:
@@ -90,4 +90,5 @@ export interface Event extends BaseData<EventId> { @@ -90,4 +90,5 @@ export interface Event extends BaseData<EventId> {
90 type: string; 90 type: string;
91 uid: string; 91 uid: string;
92 body: EventBody; 92 body: EventBody;
  93 + action: string; //TODO: refactor edgeEvents - move parameters to the entity.body
93 } 94 }