Merge remote-tracking branch 'upstream/master'

msa/js-executor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "2.5.0",
+  "version": "2.4.3",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.js",
   "bin": "server.js",

msa/web-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "2.5.0",
+  "version": "2.4.3",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.js",
   "bin": "server.js",

ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thingsboard",
   "private": true,
-  "version": "2.5.0",
+  "version": "2.4.3",
   "description": "ThingsBoard UI",
   "licenses": [
     {

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">

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.",

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": "Телеметрия/атрибуты обязательны.",

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": "Необхідно вказати телеметрію/атрибути.",