From 4e8af4a15dfdcdb1319e862179b8a8f0557b45dc Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 06:47:16 +0200 Subject: [PATCH 01/24] Code review: added 'edge' in AssetScope, refactored assets-table-config.resolver.ts for edge's assets title --- ui-ngx/src/app/modules/home/pages/asset/asset.component.ts | 2 +- .../modules/home/pages/asset/assets-table-config.resolver.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts b/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts index 5c3fd44a8e..ee79b58d45 100644 --- a/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts +++ b/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts @@ -35,7 +35,7 @@ export class AssetComponent extends EntityComponent { entityType = EntityType; - assetScope: 'tenant' | 'customer' | 'customer_user'; + assetScope: 'tenant' | 'customer' | 'customer_user' | 'edge'; constructor(protected store: Store, protected translate: TranslateService, diff --git a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts index 5b48a5c36c..f6cc059a76 100644 --- a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts @@ -137,8 +137,9 @@ export class AssetsTableConfigResolver implements Resolve - this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets'))).subscribe(); + this.edgeService.getEdge(this.edgeId).subscribe( + edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets') + ); } else { this.config.tableTitle = this.translate.instant('asset.assets'); } From f867e2c14f5ebb40e1fa4ae735d2b4e441499708 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 07:00:39 +0200 Subject: [PATCH 02/24] Code review: from assets-table-config.resolver removed var edgeId usage --- .../pages/asset/assets-table-config.resolver.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts index f6cc059a76..36ddf43760 100644 --- a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts +++ b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts @@ -70,7 +70,6 @@ export class AssetsTableConfigResolver implements Resolve = new EntityTableConfig(); private customerId: string; - private edgeId: string; constructor(private store: Store, private broadcast: BroadcastService, @@ -115,10 +114,10 @@ export class AssetsTableConfigResolver implements Resolve { if (authUser.authority === Authority.CUSTOMER_USER) { @@ -137,7 +136,7 @@ export class AssetsTableConfigResolver implements Resolve this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets') ); } else { @@ -182,7 +181,7 @@ export class AssetsTableConfigResolver implements Resolve this.assetService.deleteAsset(id.id); } else if (assetScope === 'edge') { this.config.entitiesFetchFunction = pageLink => - this.assetService.getEdgeAssets(this.edgeId, pageLink, this.config.componentsData.assetType); + this.assetService.getEdgeAssets(this.config.componentsData.edgeId, pageLink, this.config.componentsData.assetType); } else { this.config.entitiesFetchFunction = pageLink => this.assetService.getCustomerAssetInfos(this.customerId, pageLink, this.config.componentsData.assetType); @@ -480,7 +479,7 @@ export class AssetsTableConfigResolver implements Resolve { if (res) { - this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id).subscribe( + this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id).subscribe( () => { this.config.table.updateData(); } @@ -528,7 +527,7 @@ export class AssetsTableConfigResolver implements Resolve[] = []; assets.forEach( (asset) => { - tasks.push(this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id)); + tasks.push(this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id)); } ); forkJoin(tasks).subscribe( From f57bd5a10b6c9ece6a2cd5204913435265241d4f Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 07:08:05 +0200 Subject: [PATCH 03/24] Code review: dashboard.service beautify --- ui-ngx/src/app/core/http/dashboard.service.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/core/http/dashboard.service.ts b/ui-ngx/src/app/core/http/dashboard.service.ts index c039fed4da..f4355d7ebe 100644 --- a/ui-ngx/src/app/core/http/dashboard.service.ts +++ b/ui-ngx/src/app/core/http/dashboard.service.ts @@ -165,12 +165,14 @@ export class DashboardService { public assignDashboardToEdge(edgeId: string, dashboardId: string, config?: RequestConfig): Observable { - return this.http.post(`/api/edge/${edgeId}/dashboard/${dashboardId}`, - null, defaultHttpOptionsFromConfig(config)); + return this.http.post(`/api/edge/${edgeId}/dashboard/${dashboardId}`, null, + defaultHttpOptionsFromConfig(config)); } - public unassignDashboardFromEdge(edgeId: string, dashboardId: string, config?: RequestConfig) { - return this.http.delete(`/api/edge/${edgeId}/dashboard/${dashboardId}`, defaultHttpOptionsFromConfig(config)); + public unassignDashboardFromEdge(edgeId: string, dashboardId: string, + config?: RequestConfig) { + return this.http.delete(`/api/edge/${edgeId}/dashboard/${dashboardId}`, + defaultHttpOptionsFromConfig(config)); } } From 40feb8f6ec8ac24f42f1314eded2c0d8888a8c7e Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 07:18:54 +0200 Subject: [PATCH 04/24] Code review: device.service beautify --- ui-ngx/src/app/core/http/device.service.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/core/http/device.service.ts b/ui-ngx/src/app/core/http/device.service.ts index 23dd53c2fd..048a6196f7 100644 --- a/ui-ngx/src/app/core/http/device.service.ts +++ b/ui-ngx/src/app/core/http/device.service.ts @@ -155,11 +155,14 @@ export class DeviceService { return this.http.delete(`/api/customer/device/${deviceName}/claim`, defaultHttpOptionsFromConfig(config)); } - public assignDeviceToEdge(edgeId: string, deviceId: string, config?: RequestConfig): Observable { - return this.http.post(`/api/edge/${edgeId}/device/${deviceId}`, defaultHttpOptionsFromConfig(config)); + public assignDeviceToEdge(edgeId: string, deviceId: string, + config?: RequestConfig): Observable { + return this.http.post(`/api/edge/${edgeId}/device/${deviceId}`, + defaultHttpOptionsFromConfig(config)); } - public unassignDeviceFromEdge(edgeId: string, deviceId: string, config?: RequestConfig) { + public unassignDeviceFromEdge(edgeId: string, deviceId: string, + config?: RequestConfig) { return this.http.delete(`/api/edge/${edgeId}/device/${deviceId}`, defaultHttpOptionsFromConfig(config)); } From 6f6f6fb1164c258afcbaa4cb567bea02afde2aa0 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 08:00:27 +0200 Subject: [PATCH 05/24] Code review. 1) edge.service: removed getTenantEdges, getCustomerEdges 2)service.completion.model.ts: code beautify --- ui-ngx/src/app/core/http/edge.service.ts | 36 +++++++++---------- .../models/ace/service-completion.models.ts | 16 ++++----- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/ui-ngx/src/app/core/http/edge.service.ts b/ui-ngx/src/app/core/http/edge.service.ts index b8bf6c7282..b33b13378d 100644 --- a/ui-ngx/src/app/core/http/edge.service.ts +++ b/ui-ngx/src/app/core/http/edge.service.ts @@ -54,38 +54,32 @@ export class EdgeService { return this.http.get>('/api/edge/types', defaultHttpOptionsFromConfig(config)); } - public getTenantEdges(pageLink: PageLink, type: string = '', - config?: RequestConfig): Observable> { - return this.http.get>(`/api/tenant/edges${pageLink.toQuery()}&type=${type}`, - defaultHttpOptionsFromConfig(config)); - } - - public getCustomerEdges(customerId: string, pageLink: PageLink, type: string = '', - config?: RequestConfig): Observable> { - return this.http.get>(`/api/customer/${customerId}/edges${pageLink.toQuery()}&type=${type}`, - defaultHttpOptionsFromConfig(config)); - } - public getCustomerEdgeInfos(customerId: string, pageLink: PageLink, type: string = '', config?: RequestConfig): Observable> { return this.http.get>(`/api/customer/${customerId}/edgeInfos${pageLink.toQuery()}&type=${type}`, defaultHttpOptionsFromConfig(config)); } - public assignEdgeToCustomer(customerId: string, edgeId: string, config?: RequestConfig): Observable { - return this.http.post(`/api/customer/${customerId}/edge/${edgeId}`, defaultHttpOptionsFromConfig(config)); + public assignEdgeToCustomer(customerId: string, edgeId: string, + config?: RequestConfig): Observable { + return this.http.post(`/api/customer/${customerId}/edge/${edgeId}`, + defaultHttpOptionsFromConfig(config)); } public unassignEdgeFromCustomer(edgeId: string, config?: RequestConfig) { - return this.http.delete(`/api/customer/edge/${edgeId}`, defaultHttpOptionsFromConfig(config)); + return this.http.delete(`/api/customer/edge/${edgeId}`, + defaultHttpOptionsFromConfig(config)); } public makeEdgePublic(edgeId: string, config?: RequestConfig): Observable { - return this.http.post(`/api/customer/public/edge/${edgeId}`, defaultHttpOptionsFromConfig(config)); + return this.http.post(`/api/customer/public/edge/${edgeId}`, + defaultHttpOptionsFromConfig(config)); } - public setRootRuleChain(edgeId: string, ruleChainId: string, config?: RequestConfig): Observable { - return this.http.post(`/api/edge/${edgeId}/${ruleChainId}/root`, defaultHttpOptionsFromConfig(config)); + public setRootRuleChain(edgeId: string, ruleChainId: string, + config?: RequestConfig): Observable { + return this.http.post(`/api/edge/${edgeId}/${ruleChainId}/root`, + defaultHttpOptionsFromConfig(config)); } public getTenantEdgeInfos(pageLink: PageLink, type: string = '', @@ -95,10 +89,12 @@ export class EdgeService { } public findByQuery(query: EdgeSearchQuery, config?: RequestConfig): Observable> { - return this.http.post>('/api/edges', query, defaultHttpOptionsFromConfig(config)); + return this.http.post>('/api/edges', query, + defaultHttpOptionsFromConfig(config)); } - public getEdgeEvents(entityId: EntityId, pageLink: TimePageLink, config?: RequestConfig): Observable> { + public getEdgeEvents(entityId: EntityId, pageLink: TimePageLink, + config?: RequestConfig): Observable> { return this.http.get>(`/api/edge/${entityId.id}/events` + `${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config)); } diff --git a/ui-ngx/src/app/shared/models/ace/service-completion.models.ts b/ui-ngx/src/app/shared/models/ace/service-completion.models.ts index f9b42f12f5..60c3be986d 100644 --- a/ui-ngx/src/app/shared/models/ace/service-completion.models.ts +++ b/ui-ngx/src/app/shared/models/ace/service-completion.models.ts @@ -18,13 +18,13 @@ import { FunctionArg, FunctionArgType, TbEditorCompletions } from '@shared/model export const entityIdHref = 'EntityId'; -export const baseDataHref = 'Base data'; +export const baseDataHref = 'Base data'; export const alarmDataHref = 'Alarm data'; -export const alarmDataQueryHref = 'Alarm data query'; +export const alarmDataQueryHref = 'Alarm data query'; -export const attributeScopeHref = 'Attribute scope'; +export const attributeScopeHref = 'Attribute scope'; export const entityTypeHref = 'EntityType'; @@ -32,15 +32,15 @@ export const pageDataHref = 'DeviceInfo'; -export const assetInfoHref = 'AssetInfo'; +export const assetInfoHref = 'AssetInfo'; export const entityViewInfoHref = 'EntityViewInfo'; export const entityRelationsQueryHref = 'EntityRelationsQuery'; -export const entityRelationInfoHref = 'EntityRelationInfo'; +export const entityRelationInfoHref = 'EntityRelationInfo'; -export const dashboardInfoHref = 'DashboardInfo'; +export const dashboardInfoHref = 'DashboardInfo'; export const deviceHref = 'Device'; @@ -50,13 +50,13 @@ export const entityViewHref = 'Entity relation'; -export const dashboardHref = 'Dashboard'; +export const dashboardHref = 'Dashboard'; export const customerHref = 'Customer'; export const attributeDataHref = 'Attribute Data'; -export const userHref = 'User'; +export const userHref = 'User'; export const entityDataHref = 'Entity data'; From 7d561fb0a40ed5b73076f6ef85d2c9fecb6232d5 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 08:02:27 +0200 Subject: [PATCH 06/24] Code review. entity-view.service beautify --- ui-ngx/src/app/core/http/entity-view.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/core/http/entity-view.service.ts b/ui-ngx/src/app/core/http/entity-view.service.ts index 468ccca53d..a9f59e5821 100644 --- a/ui-ngx/src/app/core/http/entity-view.service.ts +++ b/ui-ngx/src/app/core/http/entity-view.service.ts @@ -88,7 +88,8 @@ export class EntityViewService { defaultHttpOptionsFromConfig(config)); } - public unassignEntityViewFromEdge(edgeId: string, entityViewId: string, config?: RequestConfig) { + public unassignEntityViewFromEdge(edgeId: string, entityViewId: string, + config?: RequestConfig) { return this.http.delete(`/api/edge/${edgeId}/entityView/${entityViewId}`, defaultHttpOptionsFromConfig(config)); } From b5c6381eecc340b71e2a33aad1bbed7bd33aee66 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 08:44:48 +0200 Subject: [PATCH 07/24] Code review. entity.service Router minor refactoring --- ui-ngx/src/app/core/http/entity.service.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts index 0d077fea45..0931ea0abf 100644 --- a/ui-ngx/src/app/core/http/entity.service.ts +++ b/ui-ngx/src/app/core/http/entity.service.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Injectable } from '@angular/core'; +import {Inject, Injectable} from '@angular/core'; import { EMPTY, forkJoin, Observable, of, throwError } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { PageLink } from '@shared/models/page/page-link'; @@ -68,7 +68,6 @@ import { StringOperation } from '@shared/models/query/query.models'; import { alarmFields } from '@shared/models/alarm.models'; - import { EdgeService } from "@core/http/edge.service"; import { ruleChainType } from "@shared/models/rule-chain.models"; import { Router } from "@angular/router"; @@ -93,7 +92,7 @@ export class EntityService { private entityRelationService: EntityRelationService, private attributeService: AttributeService, private utils: UtilsService, - private route: Router + private router: Router ) { } private getEntityObservable(entityType: EntityType, entityId: string, @@ -323,7 +322,7 @@ export class EntityService { break; case EntityType.RULE_CHAIN: pageLink.sortOrder.property = 'name'; - if (this.route.url.includes('edge')) { + if (this.router.url.includes('edge')) { entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.edge, config); } else { entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.core, config); From 9581b9485fc2f1eea0fadd01410af4e1b37729b2 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 09:32:34 +0200 Subject: [PATCH 08/24] Code review. event.service minor code beautify --- ui-ngx/src/app/core/http/event.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/core/http/event.service.ts b/ui-ngx/src/app/core/http/event.service.ts index 62a8a01780..fe5c064cb5 100644 --- a/ui-ngx/src/app/core/http/event.service.ts +++ b/ui-ngx/src/app/core/http/event.service.ts @@ -39,7 +39,8 @@ export class EventService { defaultHttpOptionsFromConfig(config)); } - public getEdgeEvents(entityId: EntityId, pageLink: TimePageLink, config?: RequestConfig): Observable> { + public getEdgeEvents(entityId: EntityId, pageLink: TimePageLink, + config?: RequestConfig): Observable> { return this.http.get>(`/api/edge/${entityId.id}/events` + `${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config)); } From bfab30b6d1aedfd02f2d3160dc3b3615ed15434b Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 10:14:08 +0200 Subject: [PATCH 09/24] Code review. rule-chain.service minor code beautify --- ui-ngx/src/app/core/http/rule-chain.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/core/http/rule-chain.service.ts b/ui-ngx/src/app/core/http/rule-chain.service.ts index 1a6c011a4c..61a52e899b 100644 --- a/ui-ngx/src/app/core/http/rule-chain.service.ts +++ b/ui-ngx/src/app/core/http/rule-chain.service.ts @@ -25,9 +25,10 @@ import { RuleChain, RuleChainConnectionInfo, RuleChainMetaData, - ruleChainNodeComponent, RuleChainType, + ruleChainNodeComponent, ruleNodeTypeComponentTypes, - unknownNodeComponent + unknownNodeComponent, + RuleChainType } from '@shared/models/rule-chain.models'; import { ComponentDescriptorService } from './component-descriptor.service'; import { From 71db8aa8c88e9e7b17965f5287f2003e524952af Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 12:11:22 +0200 Subject: [PATCH 10/24] Fixed edgeEvents status for not yet connected edges --- .../components/event/event-table-config.ts | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts index 02ee8ea578..c3d0f98740 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts @@ -22,11 +22,11 @@ import { } from '@home/models/entity/entities-table-config.models'; import { DebugEventType, + Event, + EventType, EdgeEventType, EdgeEventStatusColor, - edgeEventStatusColor, - Event, - EventType + edgeEventStatusColor } from '@shared/models/event.models'; import {TimePageLink} from '@shared/models/page/page-link'; import {TranslateService} from '@ngx-translate/core'; @@ -66,7 +66,7 @@ export class EventTableConfig extends EntityTableConfig { } eventTypes: Array; - queueStartTs: any; + queueStartTs: number; constructor(private eventService: EventService, private dialogService: DialogService, @@ -347,14 +347,10 @@ export class EventTableConfig extends EntityTableConfig { } updateEdgeEventStatus(createdTime) { - if (this.queueStartTs) { - var status: string; - if (createdTime < this.queueStartTs) { - status = this.translate.instant('edge.success'); - } else { - status = this.translate.instant('edge.failed'); - } - return status; + if (this.queueStartTs && createdTime < this.queueStartTs) { + return this.translate.instant('edge.success'); + } else { + return this.translate.instant('edge.failed'); } } @@ -363,13 +359,14 @@ export class EventTableConfig extends EntityTableConfig { } loadEdgeInfo() { - this.attributeService.getEntityAttributes(this.entityId, AttributeScope.SERVER_SCOPE,["queueStartTs"]) + this.attributeService.getEntityAttributes(this.entityId, AttributeScope.SERVER_SCOPE, ['queueStartTs']) .subscribe( attributes => this.onUpdate(attributes) ); } onUpdate(attributes) { + this.queueStartTs = 0; let edge = attributes.reduce(function (map, attribute) { map[attribute.key] = attribute; return map; From 391d94a9fcb3e5a27ac55853668c92166d75e636 Mon Sep 17 00:00:00 2001 From: Artem Babak Date: Thu, 5 Nov 2020 11:59:52 +0200 Subject: [PATCH 11/24] event-table.component.ts --- .../app/modules/home/components/event/event-table.component.ts | 2 +- .../modules/home/models/entity/entities-table-config.models.ts | 1 + .../app/modules/home/pages/customer/customer-routing.module.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/event/event-table.component.ts b/ui-ngx/src/app/modules/home/components/event/event-table.component.ts index 6aa96c83da..ac1ccd1e09 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-table.component.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-table.component.ts @@ -25,7 +25,7 @@ import { EventService } from '@core/http/event.service'; import { DialogService } from '@core/services/dialog.service'; import { DebugEventType, EventType } from '@shared/models/event.models'; import { RuleChainService } from "@core/http/rule-chain.service"; -import {AttributeService} from "@core/http/attribute.service"; +import { AttributeService } from "@core/http/attribute.service"; @Component({ selector: 'tb-event-table', diff --git a/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts b/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts index 416fd35992..4fbbd32900 100644 --- a/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts +++ b/ui-ngx/src/app/modules/home/models/entity/entities-table-config.models.ts @@ -107,6 +107,7 @@ export class EntityActionTableColumn> extends BaseEnti super('action', key, title, width, false); } } + export class DateEntityTableColumn> extends EntityTableColumn { constructor(key: string, title: string, diff --git a/ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts b/ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts index 732f14184c..27988c70c6 100644 --- a/ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts +++ b/ui-ngx/src/app/modules/home/pages/customer/customer-routing.module.ts @@ -27,7 +27,7 @@ import { DashboardsTableConfigResolver } from '@modules/home/pages/dashboard/das import { DashboardPageComponent } from '@home/pages/dashboard/dashboard-page.component'; import { BreadCrumbConfig } from '@shared/components/breadcrumb'; import { dashboardBreadcumbLabelFunction, DashboardResolver } from '@home/pages/dashboard/dashboard-routing.module'; -import {EdgesTableConfigResolver} from "@home/pages/edge/edges-table-config.resolver"; +import { EdgesTableConfigResolver } from "@home/pages/edge/edges-table-config.resolver"; const routes: Routes = [ { From 0be81ae7fea070059c086024b4e82471deb28bde Mon Sep 17 00:00:00 2001 From: Artem Babak Date: Thu, 5 Nov 2020 12:18:46 +0200 Subject: [PATCH 12/24] Refactored method get edge name for title in edge's assigned entities --- .run/[CE Edge] Server.run.xml | 1 + .../pages/dashboard/dashboards-table-config.resolver.ts | 5 +++-- .../home/pages/device/devices-table-config.resolver.ts | 5 +++-- .../pages/entity-view/entity-views-table-config.resolver.ts | 5 +++-- .../pages/rulechain/rulechains-table-config.resolver.ts | 6 +++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.run/[CE Edge] Server.run.xml b/.run/[CE Edge] Server.run.xml index 89667da5db..e13a1b0574 100644 --- a/.run/[CE Edge] Server.run.xml +++ b/.run/[CE Edge] Server.run.xml @@ -9,6 +9,7 @@