From aa7c946cb835494a7b460c796d1bc9540354ceec Mon Sep 17 00:00:00 2001
From: Vladyslav <vprykhodko@thingsboard.io>
Date: Mon, 23 Dec 2019 18:41:49 +0200
Subject: [PATCH] Improvement/new datakey types (#2291)

* Add support import label

* Add translate tooltip
---
 ui/src/app/components/datasource-entity.tpl.html | 6 +++---
 ui/src/app/locale/locale.constant-en_US.json     | 1 +
 ui/src/app/locale/locale.constant-ru_RU.json     | 1 +
 ui/src/app/locale/locale.constant-uk_UA.json     | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/components/datasource-entity.tpl.html b/ui/src/app/components/datasource-entity.tpl.html
index a167d313ee..df06e9465f 100644
--- a/ui/src/app/components/datasource-entity.tpl.html
+++ b/ui/src/app/components/datasource-entity.tpl.html
@@ -44,7 +44,7 @@
 								<ng-md-icon size="16" icon="alpha-a-circle-outline"></ng-md-icon>
 							</span>
 						    <span ng-show="item.type==types.dataKeyType.entityField">
-								<md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
+								<md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
 								<ng-md-icon size="16" icon="alpha-e-circle-outline"></ng-md-icon>
 							</span>
 							<span ng-show="item.type==types.dataKeyType.timeseries">
@@ -65,7 +65,7 @@
 									      <ng-md-icon size="16" icon="alpha-a-circle-outline" ng-click="createKey($event, types.dataKeyType.attribute, '#datakey_chips')"></ng-md-icon>
 									  </span>
 									  <span ng-show="widgetType == types.widgetType.latest.value">
-										  <md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
+										  <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
 									      <ng-md-icon size="16" icon="alpha-e-circle-outline" ng-click="createKey($event, types.dataKeyType.entityField, '#datakey_chips')"></ng-md-icon>
 									  </span>
 			                          <span>
@@ -91,7 +91,7 @@
                                           <ng-md-icon size="20" icon="alpha-a-circle-outline"></ng-md-icon>
                                       </span>
 									  <span ng-show="$chip.type==types.dataKeyType.entityField">
-                                          <md-tooltip>{{'datakey.entityField' | translate }}</md-tooltip>
+                                          <md-tooltip>{{'datakey.entity-field' | translate }}</md-tooltip>
                                           <ng-md-icon size="20" icon="alpha-e-circle-outline"></ng-md-icon>
                                       </span>
                                       <span ng-show="$chip.type==types.dataKeyType.timeseries">
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 6310438128..f6a42cd957 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -583,6 +583,7 @@
         "configuration": "Data key configuration",
         "timeseries": "Timeseries",
         "attributes": "Attributes",
+        "entity-field": "Entity field",
         "alarm": "Alarm fields",
         "timeseries-required": "Entity timeseries are required.",
         "timeseries-or-attributes-required": "Entity timeseries/attributes are required.",
diff --git a/ui/src/app/locale/locale.constant-ru_RU.json b/ui/src/app/locale/locale.constant-ru_RU.json
index 41fa69a3dc..25257232d0 100644
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@@ -583,6 +583,7 @@
         "configuration": "Конфигурация ключа данных",
         "timeseries": "Телеметрия",
         "attributes": "Атрибуты",
+        "entity-field": "Поле объекта",
         "alarm": "Параметры оповещения",
         "timeseries-required": "Телеметрия объекта обязательна.",
         "timeseries-or-attributes-required": "Телеметрия/атрибуты обязательны.",
diff --git a/ui/src/app/locale/locale.constant-uk_UA.json b/ui/src/app/locale/locale.constant-uk_UA.json
index 49fd45a409..bc64b52901 100644
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@@ -699,6 +699,7 @@
         "configuration": "Конфігурація ключа даних",
         "timeseries": "Телеметрія",
         "attributes": "Атрибути",
+        "entity-field": "Поле сутності",
         "alarm": "Поля сигнала тривоги",
         "timeseries-required": "Необхідно вказати Телеметрія.",
         "timeseries-or-attributes-required": "Необхідно вказати телеметрію/атрибути.",