Browse Source
Merge pull request #4705 from ChantsovaEkaterina/bug/entities-count-datasource-label-not-displayed
UI: Fix entities count datasource label overwriting, configured label was never displayed
pull/4731/head
Igor Kulikov
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
8 additions and
6 deletions
-
ui-ngx/src/app/shared/models/query/query.models.ts
|
|
|
@ -819,12 +819,14 @@ export function updateDatasourceFromEntityInfo(datasource: Datasource, entity: E |
|
|
|
datasource.entityId = entity.id; |
|
|
|
datasource.entityType = entity.entityType; |
|
|
|
if (datasource.type === DatasourceType.entity || datasource.type === DatasourceType.entityCount) { |
|
|
|
datasource.entityName = entity.name; |
|
|
|
datasource.entityLabel = entity.label; |
|
|
|
datasource.name = entity.name; |
|
|
|
datasource.entityDescription = entity.entityDescription; |
|
|
|
datasource.entity.label = entity.label; |
|
|
|
datasource.entity.name = entity.name; |
|
|
|
if (datasource.type === DatasourceType.entity) { |
|
|
|
datasource.entityName = entity.name; |
|
|
|
datasource.entityLabel = entity.label; |
|
|
|
datasource.name = entity.name; |
|
|
|
datasource.entityDescription = entity.entityDescription; |
|
|
|
datasource.entity.label = entity.label; |
|
|
|
datasource.entity.name = entity.name; |
|
|
|
} |
|
|
|
if (createFilter) { |
|
|
|
datasource.entityFilter = { |
|
|
|
type: AliasFilterType.singleEntity, |
|
|
|
|
