add expression

ui/src/app/api/alias-controller.js

@@ -151,7 +151,8 @@ export default class AliasController {
                                     newDatasource.entityId = resolvedEntity.id;
                                     newDatasource.entityType = resolvedEntity.entityType;
                                     newDatasource.entityName = resolvedEntity.name;
-                                    newDatasource.entityDescription = resolvedEntity.entityDescription
+                                    newDatasource.entityLabel = resolvedEntity.label;
+                                    newDatasource.entityDescription = resolvedEntity.entityDescription;
                                     newDatasource.name = resolvedEntity.name;
                                     newDatasource.generated = i > 0 ? true : false;
                                     datasources.push(newDatasource);
@@ -177,6 +178,7 @@ export default class AliasController {
                                 datasource.entityId = entity.id;
                                 datasource.entityType = entity.entityType;
                                 datasource.entityName = entity.name;
+                                datasource.entityLabel = entity.label;
                                 datasource.name = entity.name;
                                 datasource.entityDescription = entity.entityDescription;
                                 deferred.resolve([datasource]);

ui/src/app/api/entity.service.js

@@ -344,7 +344,13 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
     }
 
     function entityToEntityInfo(entity) {
-        return { origEntity: entity, name: entity.name, entityType: entity.id.entityType, id: entity.id.id, entityDescription: entity.additionalInfo?entity.additionalInfo.description:"" };
+        return {
+            origEntity: entity,
+            name: entity.name,
+            entityType: entity.id.entityType,
+            id: entity.id.id,
+            entityDescription: entity.additionalInfo?entity.additionalInfo.description:""
+        };
     }
 
     function entityRelationInfoToEntityInfo(entityRelationInfo, direction) {

ui/src/app/common/utils.service.js

@@ -497,6 +497,8 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
                 label = label.split(variable).join(datasource.entityName);
             } else if (variableName === 'deviceName') {
                 label = label.split(variable).join(datasource.entityName);
+            } else if (variableName === 'entityLabel') {
+                label = label.split(variable).join(datasource.entityLabel);
             } else if (variableName === 'aliasName') {
                 label = label.split(variable).join(datasource.aliasName);
             } else if (variableName === 'entityDescription') {