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

Improve resolveAliasFilter method

Browse Source
This commit is contained in:
Igor Kulikov 2019-12-24 14:23:35 +02:00
parent 8d45f32d8d
commit 981f7443ce
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/app/api/entity.service.js
View File

@ -439,7 +439,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
return entityId; return entityId;
} }
function getStateEntityId(filter, stateParams) { function getStateEntityInfo(filter, stateParams) {
var entityId = null; var entityId = null;
if (stateParams) { if (stateParams) {
if (filter.stateEntityParamName && filter.stateEntityParamName.length) { if (filter.stateEntityParamName && filter.stateEntityParamName.length) {
@ -456,7 +456,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
if (entityId) { if (entityId) {
entityId = resolveAliasEntityId(entityId.entityType, entityId.id); entityId = resolveAliasEntityId(entityId.entityType, entityId.id);
} }
return entityId; return {
entityId: entityId
};
} }
function resolveAliasFilter(filter, stateParams, maxItems, failOnEmpty) { function resolveAliasFilter(filter, stateParams, maxItems, failOnEmpty) {
@ -468,7 +470,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
if (filter.stateEntityParamName && filter.stateEntityParamName.length) { if (filter.stateEntityParamName && filter.stateEntityParamName.length) {
result.entityParamName = filter.stateEntityParamName; result.entityParamName = filter.stateEntityParamName;
} }
var stateEntityId = getStateEntityId(filter, stateParams); var stateEntityInfo = getStateEntityInfo(filter, stateParams);
var stateEntityId = stateEntityInfo.entityId;
switch (filter.type) { switch (filter.type) {
case types.aliasFilterType.singleEntity.value: case types.aliasFilterType.singleEntity.value:
var aliasEntityId = resolveAliasEntityId(filter.singleEntity.entityType, filter.singleEntity.id); var aliasEntityId = resolveAliasEntityId(filter.singleEntity.entityType, filter.singleEntity.id);