|
|
|
@ -642,7 +642,6 @@ export class EntityService { |
|
|
|
return result; |
|
|
|
} |
|
|
|
)); |
|
|
|
break; |
|
|
|
case AliasFilterType.entityList: |
|
|
|
return this.getEntities(filter.entityType, filter.entityList, {ignoreLoading: true, ignoreErrors: true}).pipe( |
|
|
|
map((entities) => { |
|
|
|
@ -654,7 +653,6 @@ export class EntityService { |
|
|
|
} |
|
|
|
} |
|
|
|
)); |
|
|
|
break; |
|
|
|
case AliasFilterType.entityName: |
|
|
|
return this.getEntitiesByNameFilter(filter.entityType, filter.entityNameFilter, maxItems, |
|
|
|
'', {ignoreLoading: true, ignoreErrors: true}).pipe( |
|
|
|
@ -668,7 +666,6 @@ export class EntityService { |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
break; |
|
|
|
case AliasFilterType.stateEntity: |
|
|
|
result.stateEntity = true; |
|
|
|
if (stateEntityId) { |
|
|
|
@ -681,7 +678,6 @@ export class EntityService { |
|
|
|
} else { |
|
|
|
return of(result); |
|
|
|
} |
|
|
|
break; |
|
|
|
case AliasFilterType.assetType: |
|
|
|
return this.getEntitiesByNameFilter(EntityType.ASSET, filter.assetNameFilter, maxItems, |
|
|
|
filter.assetType, {ignoreLoading: true, ignoreErrors: true}).pipe( |
|
|
|
@ -695,7 +691,6 @@ export class EntityService { |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
break; |
|
|
|
case AliasFilterType.deviceType: |
|
|
|
return this.getEntitiesByNameFilter(EntityType.DEVICE, filter.deviceNameFilter, maxItems, |
|
|
|
filter.deviceType, {ignoreLoading: true, ignoreErrors: true}).pipe( |
|
|
|
@ -709,7 +704,6 @@ export class EntityService { |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
break; |
|
|
|
case AliasFilterType.entityViewType: |
|
|
|
return this.getEntitiesByNameFilter(EntityType.ENTITY_VIEW, filter.entityViewNameFilter, maxItems, |
|
|
|
filter.entityViewType, {ignoreLoading: true, ignoreErrors: true}).pipe( |
|
|
|
@ -723,7 +717,6 @@ export class EntityService { |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
break; |
|
|
|
case AliasFilterType.relationsQuery: |
|
|
|
result.stateEntity = filter.rootStateEntity; |
|
|
|
let rootEntityType; |
|
|
|
@ -768,7 +761,6 @@ export class EntityService { |
|
|
|
} else { |
|
|
|
return of(result); |
|
|
|
} |
|
|
|
break; |
|
|
|
case AliasFilterType.assetSearchQuery: |
|
|
|
case AliasFilterType.deviceSearchQuery: |
|
|
|
case AliasFilterType.entityViewSearchQuery: |
|
|
|
@ -823,7 +815,6 @@ export class EntityService { |
|
|
|
} else { |
|
|
|
return of(result); |
|
|
|
} |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|