dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code review. entity.service Router minor refactoring

Browse Source
This commit is contained in:
deaflynx 2020-11-04 08:44:48 +02:00
parent 7d561fb0a4
commit b5c6381eec
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/core/http/entity.service.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License. /// limitations under the License.
/// ///
import { Injectable } from '@angular/core'; import {Inject, Injectable} from '@angular/core';
import { EMPTY, forkJoin, Observable, of, throwError } from 'rxjs'; import { EMPTY, forkJoin, Observable, of, throwError } from 'rxjs';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { PageLink } from '@shared/models/page/page-link'; import { PageLink } from '@shared/models/page/page-link';
@ -68,7 +68,6 @@ import {
StringOperation StringOperation
} from '@shared/models/query/query.models'; } from '@shared/models/query/query.models';
import { alarmFields } from '@shared/models/alarm.models'; import { alarmFields } from '@shared/models/alarm.models';
import { EdgeService } from "@core/http/edge.service"; import { EdgeService } from "@core/http/edge.service";
import { ruleChainType } from "@shared/models/rule-chain.models"; import { ruleChainType } from "@shared/models/rule-chain.models";
import { Router } from "@angular/router"; import { Router } from "@angular/router";
@ -93,7 +92,7 @@ export class EntityService {
private entityRelationService: EntityRelationService, private entityRelationService: EntityRelationService,
private attributeService: AttributeService, private attributeService: AttributeService,
private utils: UtilsService, private utils: UtilsService,
private route: Router private router: Router
) { } ) { }
private getEntityObservable(entityType: EntityType, entityId: string, private getEntityObservable(entityType: EntityType, entityId: string,
@ -323,7 +322,7 @@ export class EntityService {
break; break;
case EntityType.RULE_CHAIN: case EntityType.RULE_CHAIN:
pageLink.sortOrder.property = 'name'; pageLink.sortOrder.property = 'name';
if (this.route.url.includes('edge')) { if (this.router.url.includes('edge')) {
entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.edge, config); entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.edge, config);
} else { } else {
entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.core, config); entitiesObservable = this.ruleChainService.getRuleChains(pageLink, ruleChainType.core, config);