Browse Source

Merge pull request #15087 from mtsymbarov-del/feat/entities-events-tab

Hidden 'Events' tab for unsupported entities
pull/14982/merge
Vladyslav Prykhodko 7 months ago
committed by GitHub
parent
commit
65347afa6f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      ui-ngx/src/app/modules/home/pages/asset/asset-tabs.component.html
  2. 7
      ui-ngx/src/app/modules/home/pages/customer/customer-tabs.component.html
  3. 5
      ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html

4
ui-ngx/src/app/modules/home/pages/asset/asset-tabs.component.html

@ -43,10 +43,6 @@
<mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab"> <mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">
<tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table> <tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table>
</mat-tab> </mat-tab>
<mat-tab label="{{ 'asset.events' | translate }}" #eventsTab="matTab">
<tb-event-table [defaultEventType]="eventTypes.ERROR" [active]="eventsTab.isActive" [tenantId]="entity.tenantId.id"
[entityId]="entity.id"></tb-event-table>
</mat-tab>
<mat-tab label="{{ 'relation.relations' | translate }}" #relationsTab="matTab"> <mat-tab label="{{ 'relation.relations' | translate }}" #relationsTab="matTab">
<tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table> <tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table>
</mat-tab> </mat-tab>

7
ui-ngx/src/app/modules/home/pages/customer/customer-tabs.component.html

@ -39,13 +39,6 @@
<mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab"> <mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">
<tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table> <tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table>
</mat-tab> </mat-tab>
<mat-tab label="{{ 'customer.events' | translate }}" #eventsTab="matTab">
<tb-event-table [defaultEventType]="eventTypes.ERROR"
[active]="eventsTab.isActive"
[tenantId]="entity.tenantId.id"
[entityId]="entity.id">
</tb-event-table>
</mat-tab>
<mat-tab label="{{ 'relation.relations' | translate }}" #relationsTab="matTab"> <mat-tab label="{{ 'relation.relations' | translate }}" #relationsTab="matTab">
<tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table> <tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table>
</mat-tab> </mat-tab>

5
ui-ngx/src/app/modules/home/pages/entity-view/entity-view-tabs.component.html

@ -36,11 +36,6 @@
label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab"> label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">
<tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table> <tb-alarm-table [active]="alarmsTab.isActive" [entityId]="entity.id"></tb-alarm-table>
</mat-tab> </mat-tab>
<mat-tab *ngIf="entity"
label="{{ 'entity-view.events' | translate }}" #eventsTab="matTab">
<tb-event-table [defaultEventType]="eventTypes.ERROR" [active]="eventsTab.isActive" [tenantId]="entity.tenantId.id"
[entityId]="entity.id"></tb-event-table>
</mat-tab>
<mat-tab *ngIf="entity" <mat-tab *ngIf="entity"
label="{{ 'relation.relations' | translate }}" #relationsTab="matTab"> label="{{ 'relation.relations' | translate }}" #relationsTab="matTab">
<tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table> <tb-relation-table [active]="relationsTab.isActive" [entityId]="entity.id"></tb-relation-table>

Loading…
Cancel
Save