From c60e99fad90f572b668e3fae5a153a736ba67d1c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 7 Apr 2020 17:06:04 +0300 Subject: [PATCH] UI: Entity table models improvements --- .../components/alarm/alarm-table-config.ts | 2 +- .../audit-log/audit-log-table-config.ts | 2 +- .../entity/add-entity-dialog.component.html | 2 +- .../entity/add-entity-dialog.component.ts | 33 ++++++-- .../entity/contact-based.component.ts | 7 +- .../entity/entities-table.component.html | 10 ++- .../entity/entities-table.component.ts | 78 ++++++++++++------- .../entity-details-panel.component.html | 4 +- .../entity/entity-details-panel.component.ts | 55 +++++++++++-- .../entity/entity-tabs.component.ts | 31 +++++++- .../components/entity/entity.component.ts | 25 +++--- .../components/event/event-table-config.ts | 2 +- .../models/datasource/entity-datasource.ts | 4 +- .../entity/entities-table-config.models.ts | 64 ++++++++------- .../home/pages/asset/asset.component.ts | 7 +- .../pages/customer/customer-routing.module.ts | 2 +- .../home/pages/customer/customer.component.ts | 7 +- .../dashboard/dashboard-form.component.ts | 13 +++- .../dashboard/dashboard-routing.module.ts | 5 +- .../home/pages/device/device.component.ts | 7 +- .../entity-view/entity-view.component.ts | 7 +- .../rulechain/rulechain-routing.module.ts | 10 ++- .../pages/rulechain/rulechain.component.ts | 7 +- .../home/pages/tenant/tenant.component.ts | 7 +- .../modules/home/pages/user/user.component.ts | 7 +- .../widget/widget-library-routing.module.ts | 13 ++-- .../pages/widget/widgets-bundle.component.ts | 7 +- .../shared/components/breadcrumb.component.ts | 2 +- .../src/app/shared/components/breadcrumb.ts | 6 +- .../app/shared/models/entity-type.models.ts | 6 +- 30 files changed, 299 insertions(+), 133 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts index 13d5c12af1..852363ffe9 100644 --- a/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts +++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts @@ -72,7 +72,7 @@ export class AlarmTableConfig extends EntityTableConfig this.entityType = EntityType.ALARM; this.entityTranslations = entityTypeTranslations.get(EntityType.ALARM); this.entityResources = { - } as EntityTypeResource; + } as EntityTypeResource; this.searchStatus = defaultSearchStatus; this.headerComponent = AlarmTableHeaderComponent; diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-table-config.ts b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-table-config.ts index c361f6714d..a50bb0cdaa 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-table-config.ts +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-table-config.ts @@ -68,7 +68,7 @@ export class AuditLogTableConfig extends EntityTableConfig; this.entitiesFetchFunction = pageLink => this.fetchAuditLogs(pageLink); diff --git a/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html b/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html index 47d6b385b2..12ef8beec1 100644 --- a/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html +++ b/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html @@ -19,7 +19,7 @@

{{ translations.add }}

-
+