From 08e166d7030e54c15ddf00b379c5d7a1709d625f Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 11 Sep 2018 12:56:43 +0300
Subject: [PATCH 1/2] Added telemetry view

---
 ui/src/app/api/entity-view.service.js         |  3 --
 .../entity-view/entity-view-fieldset.tpl.html | 33 +++++++++++++++++++
 .../app/entity-view/entity-view.directive.js  | 14 +++++++-
 ui/src/app/locale/locale.constant-en_US.json  |  6 +++-
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/api/entity-view.service.js b/ui/src/app/api/entity-view.service.js
index d6d5868959..e34d3a4aee 100644
--- a/ui/src/app/api/entity-view.service.js
+++ b/ui/src/app/api/entity-view.service.js
@@ -156,9 +156,6 @@ function EntityViewService($http, $q, $window, userService, attributeService, cu
         var deferred = $q.defer();
         var url = '/api/entityView';
 
-        entityView.keys = {};
-        entityView.keys.timeseries = ['temp'];
-
         $http.post(url, entityView).then(function success(response) {
             deferred.resolve(response.data);
         }, function fail() {
diff --git a/ui/src/app/entity-view/entity-view-fieldset.tpl.html b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
index c73b0a2493..29287f9bce 100644
--- a/ui/src/app/entity-view/entity-view-fieldset.tpl.html
+++ b/ui/src/app/entity-view/entity-view-fieldset.tpl.html
@@ -62,6 +62,39 @@
             <label translate>entity-view.description</label>
             <textarea ng-model="entityView.additionalInfo.description" rows="2"></textarea>
         </md-input-container>
+        <section layout="column">
+            <label translate class="tb-title no-padding">entity-view.client-attributes</label>
+            <md-chips style="padding-bottom: 15px;"
+                      ng-required="false"
+                      readonly="!isEdit"
+                      ng-model="entityView.keys.attributes.cs"
+                      placeholder="{{'entity-view.client-attributes' | translate}}"
+                      md-separator-keys="separatorKeys">
+            </md-chips>
+            <label translate class="tb-title no-padding">entity-view.shared-attributes</label>
+            <md-chips style="padding-bottom: 15px;"
+                      ng-required="false"
+                      readonly="!isEdit"
+                      ng-model="entityView.keys.attributes.sh"
+                      placeholder="{{'entity-view.shared-attributes' | translate}}"
+                      md-separator-keys="separatorKeys">
+            </md-chips>
+            <label translate class="tb-title no-padding">entity-view.server-attributes</label>
+            <md-chips style="padding-bottom: 15px;"
+                      ng-required="false"
+                      readonly="!isEdit"
+                      ng-model="entityView.keys.attributes.ss"
+                      placeholder="{{'entity-view.server-attributes' | translate}}"
+                      md-separator-keys="separatorKeys">
+            </md-chips>
+            <label translate class="tb-title no-padding">entity-view.latest-timeseries</label>
+            <md-chips ng-required="false"
+                      readonly="!isEdit"
+                      ng-model="entityView.keys.timeseries"
+                      placeholder="{{'entity-view.latest-timeseries' | translate}}"
+                      md-separator-keys="separatorKeys">
+            </md-chips>
+        </section>
         <section layout="row" layout-align="start start">
             <mdp-date-picker ng-model="startTs"
                              mdp-max-date="maxStartTs"
diff --git a/ui/src/app/entity-view/entity-view.directive.js b/ui/src/app/entity-view/entity-view.directive.js
index 4ec03a12c7..e31b0d4acc 100644
--- a/ui/src/app/entity-view/entity-view.directive.js
+++ b/ui/src/app/entity-view/entity-view.directive.js
@@ -20,7 +20,8 @@ import entityViewFieldsetTemplate from './entity-view-fieldset.tpl.html';
 /* eslint-enable import/no-unresolved, import/default */
 
 /*@ngInject*/
-export default function EntityViewDirective($compile, $templateCache, $filter, toast, $translate, types, clipboardService, entityViewService, customerService) {
+export default function EntityViewDirective($compile, $templateCache, $filter, toast, $translate, $mdConstant,
+                                            types, clipboardService, entityViewService, customerService) {
     var linker = function (scope, element) {
         var template = $templateCache.get(entityViewFieldsetTemplate);
         element.html(template);
@@ -32,6 +33,9 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
 
         scope.allowedEntityTypes = [types.entityType.device, types.entityType.asset];
 
+        var semicolon = 186;
+        scope.separatorKeys = [$mdConstant.KEY_CODE.ENTER, $mdConstant.KEY_CODE.COMMA, semicolon];
+
         scope.$watch('entityView', function(newVal) {
             if (newVal) {
                 if (scope.entityView.customerId && scope.entityView.customerId.id !== types.id.nullUid) {
@@ -49,6 +53,14 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
                 }
                 scope.startTs = new Date(scope.entityView.startTs);
                 scope.endTs = new Date(scope.entityView.endTs);
+                if (!scope.entityView.keys) {
+                    scope.entityView.keys = {};
+                    scope.entityView.keys.timeseries = [];
+                    scope.entityView.keys.attributes = {};
+                    scope.entityView.keys.attributes.ss = [];
+                    scope.entityView.keys.attributes.cs = [];
+                    scope.entityView.keys.attributes.sh = [];
+                }
             }
         });
 
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 87a1b1bef4..4018c3ac2d 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -828,7 +828,11 @@
         "select-entity-view": "Select entity view",
         "make-public": "Make entity view public",
         "start-ts": "Start ts",
-        "end-ts": "End ts"
+        "end-ts": "End ts",
+        "client-attributes": "Client attributes",
+        "shared-attributes": "Shared attributes",
+        "server-attributes": "Server attributes",
+        "latest-timeseries": "Latest timeseries"
     },
     "event": {
         "event-type": "Event type",

From 5c31884c68e411db306853bbb561ddfe3610f11b Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 11 Sep 2018 13:22:34 +0300
Subject: [PATCH 2/2] Fixed dao for customer

---
 .../server/dao/sql/entityview/JpaEntityViewDao.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
index 6ef0acba7e..2f3edbe250 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
@@ -100,7 +100,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
                 entityViewRepository.findByTenantIdAndCustomerId(
                         fromTimeUUID(tenantId),
                         fromTimeUUID(customerId),
-                        Objects.toString(pageLink, ""),
+                        Objects.toString(pageLink.getTextSearch(), ""),
                         pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
                         new PageRequest(0, pageLink.getLimit())
                 ));
@@ -116,7 +116,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
                         fromTimeUUID(tenantId),
                         fromTimeUUID(customerId),
                         fromTimeUUID(entityId),
-                        Objects.toString(pageLink, ""),
+                        Objects.toString(pageLink.getTextSearch(), ""),
                         pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
                         new PageRequest(0, pageLink.getLimit())
                 ));