Commit 1db3edecf820ebdd92118de4b8e2c97e5cca9db6

Authored by deaflynx
1 parent fe9d58d3

Added edge scope for EdgeEvents

... ... @@ -5,6 +5,7 @@
5 5 <env name="EDGES_RPC_PORT" value="7070" />
6 6 <env name="COAP_ENABLED" value="true" />
7 7 <env name="EDGES_RPC_ENABLED" value="true" />
  8 + <env name="MQTT_BIND_PORT" value="1884" />
8 9 </envs>
9 10 <option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardServerApplication" />
10 11 <module name="application" />
... ...
... ... @@ -28,7 +28,7 @@ import {MatDialog} from '@angular/material/dialog';
28 28 import {EntityId} from '@shared/models/id/entity-id';
29 29 import {EventService} from '@app/core/http/event.service';
30 30 import {EventTableHeaderComponent} from '@home/components/event/event-table-header.component';
31   -import {EntityTypeResource} from '@shared/models/entity-type.models';
  31 +import {EntityType, EntityTypeResource} from '@shared/models/entity-type.models';
32 32 import {Observable} from 'rxjs';
33 33 import {PageData} from '@shared/models/page/page-data';
34 34 import {Direction} from '@shared/models/page/sort-order';
... ... @@ -81,6 +81,10 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
81 81
82 82 this.eventTypes = Object.keys(EventType).map(type => EventType[type]);
83 83
  84 + if (this.entityId.entityType !== EntityType.EDGE) {
  85 + this.eventTypes.pop();
  86 + }
  87 +
84 88 if (disabledEventTypes && disabledEventTypes.length) {
85 89 this.eventTypes = this.eventTypes.filter(type => disabledEventTypes.indexOf(type) === -1);
86 90 }
... ...