From f8bb2839aa5399d7db91ac4249050c70ee5614ea Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 15 Oct 2019 17:11:59 +0300
Subject: [PATCH 1/3] Add support import label

---
 ui/src/app/api/entity.service.js                            | 3 ++-
 ui/src/app/common/types.constant.js                         | 4 ++++
 ui/src/app/import-export/import-dialog-csv.controller.js    | 6 +++++-
 .../app/import-export/table-columns-assignment.directive.js | 6 ++++++
 ui/src/app/import-export/table-columns-assignment.tpl.html  | 1 +
 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 +
 8 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/api/entity.service.js b/ui/src/app/api/entity.service.js
index f39615c933..f474ff4f42 100644
--- a/ui/src/app/api/entity.service.js
+++ b/ui/src/app/api/entity.service.js
@@ -1130,7 +1130,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         let statisticalInfo = {};
         let newEntity = {
             name: entityParameters.name,
-            type: entityParameters.type
+            type: entityParameters.type,
+            label: entityParameters.label
         };
         let promise;
         switch (entityType) {
diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js
index 37ccd91302..e6e65bbecf 100644
--- a/ui/src/app/common/types.constant.js
+++ b/ui/src/app/common/types.constant.js
@@ -369,6 +369,10 @@ export default angular.module('thingsboard.types', [])
                     name: 'import.column-type.type',
                     value: 'type'
                 },
+                label: {
+                    name: 'import.column-type.label',
+                    value: 'label'
+                },
                 clientAttribute: {
                     name: 'import.column-type.client-attribute',
                     value: 'CLIENT_ATTRIBUTE'
diff --git a/ui/src/app/import-export/import-dialog-csv.controller.js b/ui/src/app/import-export/import-dialog-csv.controller.js
index a7b5329205..e11f59c5b4 100644
--- a/ui/src/app/import-export/import-dialog-csv.controller.js
+++ b/ui/src/app/import-export/import-dialog-csv.controller.js
@@ -98,7 +98,7 @@ export default function ImportDialogCsvController($scope, $mdDialog, toast, impo
         vm.columnsParam = [];
         var columnParam = {};
         for (var i = 0; i < parseData.headers.length; i++) {
-            if (vm.importParameters.isHeader && parseData.headers[i].search(/^(name|type)$/im) === 0) {
+            if (vm.importParameters.isHeader && parseData.headers[i].search(/^(name|type|label)$/im) === 0) {
                 columnParam = {
                     type: types.importEntityColumnType[parseData.headers[i].toLowerCase()].value,
                     key: parseData.headers[i].toLowerCase(),
@@ -126,6 +126,7 @@ export default function ImportDialogCsvController($scope, $mdDialog, toast, impo
             var entityData = {
                 name: "",
                 type: "",
+                label: "",
                 accessToken: "",
                 attributes: {
                     server: [],
@@ -162,6 +163,9 @@ export default function ImportDialogCsvController($scope, $mdDialog, toast, impo
                     case types.importEntityColumnType.type.value:
                         entityData.type = importData.rows[i][j];
                         break;
+                    case types.importEntityColumnType.label.value:
+                        entityData.label = importData.rows[i][j];
+                        break;
                 }
             }
             entitiesData.push(entityData);
diff --git a/ui/src/app/import-export/table-columns-assignment.directive.js b/ui/src/app/import-export/table-columns-assignment.directive.js
index a645e07392..5d96ba1c83 100644
--- a/ui/src/app/import-export/table-columns-assignment.directive.js
+++ b/ui/src/app/import-export/table-columns-assignment.directive.js
@@ -44,6 +44,7 @@ function TableColumnsAssignmentController($scope, types, $timeout) {
 
     vm.columnTypes.name = types.importEntityColumnType.name;
     vm.columnTypes.type = types.importEntityColumnType.type;
+    vm.columnTypes.label = types.importEntityColumnType.label;
 
     switch (vm.entityType) {
         case types.entityType.device:
@@ -62,6 +63,7 @@ function TableColumnsAssignmentController($scope, types, $timeout) {
         if (newVal) {
             var isSelectName = false;
             var isSelectType = false;
+            var isSelectLabel = false;
             var isSelectCredentials = false;
             for (var i = 0; i < newVal.length; i++) {
                 switch (newVal[i].type) {
@@ -71,6 +73,9 @@ function TableColumnsAssignmentController($scope, types, $timeout) {
                     case types.importEntityColumnType.type.value:
                         isSelectType = true;
                         break;
+                    case types.importEntityColumnType.label.value:
+                        isSelectLabel = true;
+                        break;
                     case types.importEntityColumnType.accessToken.value:
                         isSelectCredentials = true;
                         break;
@@ -84,6 +89,7 @@ function TableColumnsAssignmentController($scope, types, $timeout) {
             $timeout(function () {
                 vm.columnTypes.name.disable = isSelectName;
                 vm.columnTypes.type.disable = isSelectType;
+                vm.columnTypes.label.disable = isSelectLabel;
                 if (angular.isDefined(vm.columnTypes.accessToken)) {
                     vm.columnTypes.accessToken.disable = isSelectCredentials;
                 }
diff --git a/ui/src/app/import-export/table-columns-assignment.tpl.html b/ui/src/app/import-export/table-columns-assignment.tpl.html
index f00a08251c..b1eeafb8a7 100644
--- a/ui/src/app/import-export/table-columns-assignment.tpl.html
+++ b/ui/src/app/import-export/table-columns-assignment.tpl.html
@@ -41,6 +41,7 @@
                 <md-input-container md-no-float
                                     ng-if="column.type != vm.columnTypes.name.value &&
                                            column.type != vm.columnTypes.type.value &&
+                                           column.type != vm.columnTypes.label.value &&
                                            column.type != vm.columnTypes.accessToken.value">
                     <input required name="columnKeyName"
                            placeholder="{{ 'import.column-value' | translate }}"
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 4eb0d9b7aa..ba7d76b017 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -1139,6 +1139,7 @@
         "column-type": {
             "name": "Name",
             "type": "Type",
+            "label": "Label",
             "column-type": "Column type",
             "client-attribute": "Client attribute",
             "shared-attribute": "Shared attribute",
diff --git a/ui/src/app/locale/locale.constant-ru_RU.json b/ui/src/app/locale/locale.constant-ru_RU.json
index 9f1d582e77..876806c368 100644
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@@ -1113,6 +1113,7 @@
         "column-type": {
             "name": "Название",
             "type": "Тип",
+            "label": "Метка",
             "column-type": "Тип колонки",
             "client-attribute": "Клиентский атрибут",
             "shared-attribute": "Общий атрибут",
diff --git a/ui/src/app/locale/locale.constant-uk_UA.json b/ui/src/app/locale/locale.constant-uk_UA.json
index df720c6cf8..6e928c3cde 100644
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@@ -1365,6 +1365,7 @@
         "column-type": {
             "name": "Назва",
             "type": "Тип",
+            "label": "Мітка",
             "column-type": "Тип колонки",
             "client-attribute": "Атрибут клієнта",
             "shared-attribute": "Спільний атрибут",

From 41a1c6679fb147f6f2442cb7a4563e37ea8c7073 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 27 Dec 2019 18:06:31 +0200
Subject: [PATCH 2/3] Added support entity Label to state name and breadcrumb
 for dashboard

---
 ui/src/app/api/subscription.js                |  8 ++++---
 .../components/widget/widget.controller.js    | 15 ++++++++----
 .../states/entity-state-controller.js         | 23 +++++++++++--------
 .../app/widget/lib/entities-table-widget.js   | 12 +++++-----
 ui/src/app/widget/lib/flot-widget.js          |  3 ++-
 ui/src/app/widget/lib/map-widget2.js          |  9 +++++---
 .../app/widget/lib/timeseries-table-widget.js | 10 ++++----
 7 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/ui/src/app/api/subscription.js b/ui/src/app/api/subscription.js
index 86ab823294..f3d8e5cf47 100644
--- a/ui/src/app/api/subscription.js
+++ b/ui/src/app/api/subscription.js
@@ -179,8 +179,7 @@ export default class Subscription {
     }
 
     getFirstEntityInfo() {
-        var entityId;
-        var entityName;
+        var entityId, entityName, entityLabel = null;
         if (this.type === this.ctx.types.widgetType.rpc.value) {
             if (this.targetDeviceId) {
                 entityId = {
@@ -196,6 +195,7 @@ export default class Subscription {
                     id: this.alarmSource.entityId
                 };
                 entityName = this.alarmSource.entityName;
+                entityLabel = this.alarmSource.entityLabel;
             }
         } else {
             for (var i=0;i<this.datasources.length;i++) {
@@ -206,6 +206,7 @@ export default class Subscription {
                         id: datasource.entityId
                     };
                     entityName = datasource.entityName;
+                    entityLabel = datasource.entityLabel;
                     break;
                 }
             }
@@ -213,7 +214,8 @@ export default class Subscription {
         if (entityId) {
             return {
                 entityId: entityId,
-                entityName: entityName
+                entityName: entityName,
+                entityLabel: entityLabel
             };
         } else {
             return null;
diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js
index 5cfb6b5a96..d093e0c1bd 100644
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/ui/src/app/components/widget/widget.controller.js
@@ -152,7 +152,8 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
             var entityInfo = getActiveEntityInfo();
             var entityId = entityInfo ? entityInfo.entityId : null;
             var entityName = entityInfo ? entityInfo.entityName : null;
-            handleWidgetAction($event, this.descriptor, entityId, entityName);
+            var entityLabel = entityInfo && entityInfo.label ? entityInfo.label : null;
+            handleWidgetAction($event, this.descriptor, entityId, entityName, null, entityLabel);
         }
         widgetContext.customHeaderActions.push(headerAction);
     }
@@ -458,14 +459,15 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
                         var entityInfo = getActiveEntityInfo();
                         var entityId = entityInfo ? entityInfo.entityId : null;
                         var entityName = entityInfo ? entityInfo.entityName : null;
-                        handleWidgetAction(event, descriptors[i], entityId, entityName);
+                        var entityLabel = entityInfo && entityInfo.entityLabel ? entityInfo.entityLabel : null;
+                        handleWidgetAction(event, descriptors[i], entityId, entityName, null, entityLabel);
                     }
                 }
             }
         }
     }
 
-    function updateEntityParams(params, targetEntityParamName, targetEntityId, entityName) {
+    function updateEntityParams(params, targetEntityParamName, targetEntityId, entityName, entityLabel) {
         if (targetEntityId) {
             var targetEntityParams;
             if (targetEntityParamName && targetEntityParamName.length) {
@@ -482,6 +484,9 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
             if (entityName) {
                 targetEntityParams.entityName = entityName;
             }
+            if (entityLabel) {
+                targetEntityParams.entityLabel = entityLabel;
+            }
         }
     }
 
@@ -500,7 +505,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
                 if (!params) {
                     params = {};
                 }
-                updateEntityParams(params, targetEntityParamName, targetEntityId, entityName);
+                updateEntityParams(params, targetEntityParamName, targetEntityId, entityName, entityLabel);
                 if (type == types.widgetActionTypes.openDashboardState.value) {
                     widgetContext.stateController.openState(targetDashboardStateId, params, descriptor.openRightLayout);
                 } else {
@@ -512,7 +517,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
                 targetDashboardStateId = descriptor.targetDashboardStateId;
                 var stateObject = {};
                 stateObject.params = {};
-                updateEntityParams(stateObject.params, targetEntityParamName, targetEntityId, entityName);
+                updateEntityParams(stateObject.params, targetEntityParamName, targetEntityId, entityName, entityLabel);
                 if (targetDashboardStateId) {
                     stateObject.id = targetDashboardStateId;
                 }
diff --git a/ui/src/app/dashboard/states/entity-state-controller.js b/ui/src/app/dashboard/states/entity-state-controller.js
index b5f9762708..f30f9d169e 100644
--- a/ui/src/app/dashboard/states/entity-state-controller.js
+++ b/ui/src/app/dashboard/states/entity-state-controller.js
@@ -159,22 +159,26 @@ export default function EntityStateController($scope, $timeout, $location, $stat
     }
 
     function getStateName(index) {
-        var result = '';
+        let result = '';
         if (vm.stateObject[index]) {
-            var stateName = vm.states[vm.stateObject[index].id].name;
+            let stateName = vm.states[vm.stateObject[index].id].name;
             stateName = utils.customTranslation(stateName, stateName);
             var params = vm.stateObject[index].params;
-            var entityName;
-            if (params && params.targetEntityParamName && params[params.targetEntityParamName].entityName) {
-                entityName = params[params.targetEntityParamName].entityName;
-            } else {
-                entityName = params && params.entityName ? params.entityName : '';
-            }
+            let targetParams = params && params.targetEntityParamName ? params[params.targetEntityParamName] : params;
+
+            let entityName, entityLabel;
+            entityName =targetParams.entityName ? targetParams.entityName : '';
+            entityLabel = targetParams.entityLabel ? targetParams.entityLabel : entityName;
+
             result = utils.insertVariable(stateName, 'entityName', entityName);
-            for (var prop in params) {
+            result = utils.insertVariable(result, 'entityLabel', entityLabel);
+            for (let prop in params) {
                 if (params[prop] && params[prop].entityName) {
                     result = utils.insertVariable(result, prop + ':entityName', params[prop].entityName);
                 }
+                if (params[prop] && params[prop].entityLabel) {
+                    result = utils.insertVariable(result, prop + ':entityLabel', params[prop].entityLabel);
+                }
             }
         }
         return result;
@@ -195,6 +199,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat
                 }).then(
                     function success(entity) {
                         params.entityName = entity.name;
+                        params.entityLabel = entity.label;
                         deferred.resolve();
                     },
                     function fail() {
diff --git a/ui/src/app/widget/lib/entities-table-widget.js b/ui/src/app/widget/lib/entities-table-widget.js
index 4da445ea0f..dfe6032908 100644
--- a/ui/src/app/widget/lib/entities-table-widget.js
+++ b/ui/src/app/widget/lib/entities-table-widget.js
@@ -311,13 +311,13 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
         var actionSourceId = isDouble ? 'rowDoubleClick' : 'rowClick';
         var descriptors = vm.ctx.actionsApi.getActionDescriptors(actionSourceId);
         if (descriptors.length) {
-            var entityId;
-            var entityName;
+            var entityId, entityName, entityLabel;
             if (vm.currentEntity) {
                 entityId = vm.currentEntity.id;
                 entityName = vm.currentEntity.entityName;
+                entityLabel = vm.currentEntity.entityLabel;
             }
-            vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
+            vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, null, entityLabel);
         }
     }
 
@@ -325,13 +325,13 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $mdP
         if ($event) {
             $event.stopPropagation();
         }
-        var entityId;
-        var entityName;
+        var entityId, entityName, entityLabel;
         if (entity) {
             entityId = entity.id;
             entityName = entity.entityName;
+            entityLabel = entity.entityLabel;
         }
-        vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName);
+        vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, null, entityLabel);
     }
 
     function isCurrent(entity) {
diff --git a/ui/src/app/widget/lib/flot-widget.js b/ui/src/app/widget/lib/flot-widget.js
index 063c68a4da..0f4785839b 100644
--- a/ui/src/app/widget/lib/flot-widget.js
+++ b/ui/src/app/widget/lib/flot-widget.js
@@ -1828,7 +1828,8 @@ export default class TbFlot {
             var entityInfo = this.ctx.actionsApi.getActiveEntityInfo();
             var entityId = entityInfo ? entityInfo.entityId : null;
             var entityName = entityInfo ? entityInfo.entityName : null;
-            this.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, item);
+            var entityLabel = entityInfo && entityInfo.entityLabel ? entityInfo.entityLabel : null;
+            this.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, item, entityLabel);
         }
     }
 }
diff --git a/ui/src/app/widget/lib/map-widget2.js b/ui/src/app/widget/lib/map-widget2.js
index c8d2428ded..027ae99e6f 100644
--- a/ui/src/app/widget/lib/map-widget2.js
+++ b/ui/src/app/widget/lib/map-widget2.js
@@ -291,7 +291,8 @@ export default class TbMapWidgetV2 {
 			entityId.id = datasource.entityId;
 			entityId.entityType = datasource.entityType;
 			var entityName = datasource.entityName;
-			this.ctx.actionsApi.handleWidgetAction(event, descriptor, entityId, entityName);
+			var entityLabel = datasource.entityLabel;
+			this.ctx.actionsApi.handleWidgetAction(event, descriptor, entityId, entityName, null, entityLabel);
 		}
 	}
 
@@ -560,7 +561,8 @@ export default class TbMapWidgetV2 {
 				entityId.id = datasource.entityId;
 				entityId.entityType = datasource.entityType;
 				var entityName = datasource.entityName;
-				tbMap.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
+				var entityLabel = datasource.entityLabel;
+				tbMap.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, null, entityLabel);
 			}
 		}
 		function locationPolygonClick($event, location) {
@@ -571,7 +573,8 @@ export default class TbMapWidgetV2 {
 				entityId.id = datasource.entityId;
 				entityId.entityType = datasource.entityType;
 				var entityName = datasource.entityName;
-				tbMap.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName);
+				var entityLabel = datasource.entityLabel;
+				tbMap.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, null, entityLabel);
 			}
 		}
 
diff --git a/ui/src/app/widget/lib/timeseries-table-widget.js b/ui/src/app/widget/lib/timeseries-table-widget.js
index 26f85ebf59..53bb0a1981 100644
--- a/ui/src/app/widget/lib/timeseries-table-widget.js
+++ b/ui/src/app/widget/lib/timeseries-table-widget.js
@@ -190,9 +190,10 @@ function TimeseriesTableWidgetController($element, $scope, $filter, $timeout, ty
         }
         var descriptors = vm.ctx.actionsApi.getActionDescriptors('rowClick');
         if (descriptors.length) {
-						var entityId = vm.ctx.activeEntityInfo.entityId;
+            var entityId = vm.ctx.activeEntityInfo.entityId;
             var entityName = vm.ctx.activeEntityInfo.entityName;
-            vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, row);
+            var entityLabel = vm.ctx.activeEntityInfo.entityLabel;
+            vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, row, entityLabel);
         }
     }
 
@@ -200,9 +201,10 @@ function TimeseriesTableWidgetController($element, $scope, $filter, $timeout, ty
         if ($event) {
             $event.stopPropagation();
         }
-				var entityId = vm.ctx.activeEntityInfo.entityId;
+        var entityId = vm.ctx.activeEntityInfo.entityId;
         var entityName = vm.ctx.activeEntityInfo.entityName;
-        vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, row);
+        var entityLabel = vm.ctx.activeEntityInfo.entityLabel;
+        vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, row, entityLabel);
     }
 
 

From dc6127de90da1847d83b13322b6321c6941bd7d4 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 6 Jan 2020 16:35:48 +0200
Subject: [PATCH 3/3] Fix: Add entityLabel to handleWidgetAction

---
 ui/src/app/components/widget/widget.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js
index d093e0c1bd..b9f1317528 100644
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/ui/src/app/components/widget/widget.controller.js
@@ -490,7 +490,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
         }
     }
 
-    function handleWidgetAction($event, descriptor, entityId, entityName, additionalParams) {
+    function handleWidgetAction($event, descriptor, entityId, entityName, additionalParams, entityLabel) {
         var type = descriptor.type;
         var targetEntityParamName = descriptor.stateEntityParamName;
         var targetEntityId;