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

Fix entities count datasource label overwriting, configured label was never displayed

Browse Source
This commit is contained in:
Chantsova Ekaterina 2021-06-08 14:34:55 +03:00
parent 08e517a6ee
commit f6957f836c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/shared/models/query/query.models.ts
View File

@ -819,12 +819,14 @@ export function updateDatasourceFromEntityInfo(datasource: Datasource, entity: E
datasource.entityId = entity.id; datasource.entityId = entity.id;
datasource.entityType = entity.entityType; datasource.entityType = entity.entityType;
if (datasource.type === DatasourceType.entity || datasource.type === DatasourceType.entityCount) { if (datasource.type === DatasourceType.entity || datasource.type === DatasourceType.entityCount) {
datasource.entityName = entity.name; if (datasource.type === DatasourceType.entity) {
datasource.entityLabel = entity.label; datasource.entityName = entity.name;
datasource.name = entity.name; datasource.entityLabel = entity.label;
datasource.entityDescription = entity.entityDescription; datasource.name = entity.name;
datasource.entity.label = entity.label; datasource.entityDescription = entity.entityDescription;
datasource.entity.name = entity.name; datasource.entity.label = entity.label;
datasource.entity.name = entity.name;
}
if (createFilter) { if (createFilter) {
datasource.entityFilter = { datasource.entityFilter = {
type: AliasFilterType.singleEntity, type: AliasFilterType.singleEntity,