From 6f6f6fb1164c258afcbaa4cb567bea02afde2aa0 Mon Sep 17 00:00:00 2001 From: deaflynx Date: Wed, 4 Nov 2020 08:00:27 +0200 Subject: [PATCH] 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';