...
|
...
|
@@ -20,25 +20,25 @@ import { |
20
|
20
|
EntityTableColumn,
|
21
|
21
|
EntityTableConfig
|
22
|
22
|
} from '@home/models/entity/entities-table-config.models';
|
23
|
|
-import { DebugEventType, Event, EventType } from '@shared/models/event.models';
|
24
|
|
-import { TimePageLink } from '@shared/models/page/page-link';
|
25
|
|
-import { TranslateService } from '@ngx-translate/core';
|
26
|
|
-import { DatePipe } from '@angular/common';
|
27
|
|
-import { MatDialog } from '@angular/material/dialog';
|
28
|
|
-import { EntityId } from '@shared/models/id/entity-id';
|
29
|
|
-import { EventService } from '@app/core/http/event.service';
|
30
|
|
-import { EventTableHeaderComponent } from '@home/components/event/event-table-header.component';
|
31
|
|
-import { EntityTypeResource } from '@shared/models/entity-type.models';
|
32
|
|
-import { Observable } from 'rxjs';
|
33
|
|
-import { PageData } from '@shared/models/page/page-data';
|
34
|
|
-import { Direction } from '@shared/models/page/sort-order';
|
35
|
|
-import { DialogService } from '@core/services/dialog.service';
|
36
|
|
-import { ContentType } from '@shared/models/constants';
|
|
23
|
+import {DebugEventType, Event, EventType} from '@shared/models/event.models';
|
|
24
|
+import {TimePageLink} from '@shared/models/page/page-link';
|
|
25
|
+import {TranslateService} from '@ngx-translate/core';
|
|
26
|
+import {DatePipe} from '@angular/common';
|
|
27
|
+import {MatDialog} from '@angular/material/dialog';
|
|
28
|
+import {EntityId} from '@shared/models/id/entity-id';
|
|
29
|
+import {EventService} from '@app/core/http/event.service';
|
|
30
|
+import {EventTableHeaderComponent} from '@home/components/event/event-table-header.component';
|
|
31
|
+import {EntityTypeResource} from '@shared/models/entity-type.models';
|
|
32
|
+import {Observable} from 'rxjs';
|
|
33
|
+import {PageData} from '@shared/models/page/page-data';
|
|
34
|
+import {Direction} from '@shared/models/page/sort-order';
|
|
35
|
+import {DialogService} from '@core/services/dialog.service';
|
|
36
|
+import {ContentType} from '@shared/models/constants';
|
37
|
37
|
import {
|
38
|
38
|
EventContentDialogComponent,
|
39
|
39
|
EventContentDialogData
|
40
|
40
|
} from '@home/components/event/event-content-dialog.component';
|
41
|
|
-import { sortObjectKeys } from '@core/utils';
|
|
41
|
+import {sortObjectKeys} from '@core/utils';
|
42
|
42
|
|
43
|
43
|
export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
|
44
|
44
|
|
...
|
...
|
@@ -104,7 +104,11 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> { |
104
|
104
|
}
|
105
|
105
|
|
106
|
106
|
fetchEvents(pageLink: TimePageLink): Observable<PageData<Event>> {
|
107
|
|
- return this.eventService.getEvents(this.entityId, this.eventType, this.tenantId, pageLink);
|
|
107
|
+ if (this.eventTypeValue === EventType.EDGE_EVENT) {
|
|
108
|
+ return this.eventService.getEdgeEvents(this.entityId, pageLink);
|
|
109
|
+ } else {
|
|
110
|
+ return this.eventService.getEvents(this.entityId, this.eventType, this.tenantId, pageLink);
|
|
111
|
+ }
|
108
|
112
|
}
|
109
|
113
|
|
110
|
114
|
updateColumns(updateTableColumns: boolean = false): void {
|
...
|
...
|
@@ -159,6 +163,12 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> { |
159
|
163
|
() => ({}), () => undefined, true)
|
160
|
164
|
);
|
161
|
165
|
break;
|
|
166
|
+ case EventType.EDGE_EVENT:
|
|
167
|
+ this.columns.push(
|
|
168
|
+ new EntityTableColumn<Event>('type', 'event.type', '100%',
|
|
169
|
+ (entity) => entity.type, entity => ({}), false),
|
|
170
|
+ );
|
|
171
|
+ break;
|
162
|
172
|
case DebugEventType.DEBUG_RULE_NODE:
|
163
|
173
|
case DebugEventType.DEBUG_RULE_CHAIN:
|
164
|
174
|
this.columns[0].width = '100px';
|
...
|
...
|
|