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] 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": "Спільний атрибут",