Merge remote-tracking branch 'upstream/master'

@@ -439,7 +439,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         return entityId;
     }
 
-    function getStateEntityId(filter, stateParams) {
+    function getStateEntityInfo(filter, stateParams) {
         var entityId = null;
         if (stateParams) {
             if (filter.stateEntityParamName && filter.stateEntityParamName.length) {
@@ -456,7 +456,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         if (entityId) {
             entityId = resolveAliasEntityId(entityId.entityType, entityId.id);
         }
-        return entityId;
+        return {
+            entityId: entityId
+        };
     }
 
     function resolveAliasFilter(filter, stateParams, maxItems, failOnEmpty) {
@@ -468,7 +470,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         if (filter.stateEntityParamName && filter.stateEntityParamName.length) {
             result.entityParamName = filter.stateEntityParamName;
         }
-        var stateEntityId = getStateEntityId(filter, stateParams);
+        var stateEntityInfo = getStateEntityInfo(filter, stateParams);
+        var stateEntityId = stateEntityInfo.entityId;
         switch (filter.type) {
             case types.aliasFilterType.singleEntity.value:
                 var aliasEntityId = resolveAliasEntityId(filter.singleEntity.entityType, filter.singleEntity.id);
@@ -850,7 +853,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
 
     function getEntityFieldKeys (entityType, searchText) {
         let entityFieldKeys = [];
-        let query = searchText.toLowerCase();
+        let query = searchText ? searchText.toLowerCase() : "";
         switch(entityType) {
             case types.entityType.user:
                 entityFieldKeys.push(types.entityField.name.keyName);

@@ -44,8 +44,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat
     function openState(id, params, openRightLayout) {
         if (vm.states && vm.states[id]) {
             resolveEntity(params).then(
-                function success(entityName) {
-                    params.entityName = entityName;
+                function success() {
                     var newState = {
                         id: id,
                         params: params
@@ -66,8 +65,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat
         }
         if (vm.states && vm.states[id]) {
             resolveEntity(params).then(
-                function success(entityName) {
-                    params.entityName = entityName;
+                function success() {
                     var newState = {
                         id: id,
                         params: params
@@ -183,16 +181,16 @@ export default function EntityStateController($scope, $timeout, $location, $stat
             params = params[params.targetEntityParamName];
         }
         if (params && params.entityId && params.entityId.id && params.entityId.entityType) {
-            if (params.entityName && params.entityName.length) {
-                deferred.resolve(params.entityName);
+            if (isEntityResolved(params)) {
+                deferred.resolve();
             } else {
                 entityService.getEntity(params.entityId.entityType, params.entityId.id, {
                     ignoreLoading: true,
                     ignoreErrors: true
                 }).then(
                     function success(entity) {
-                        var entityName = entity.name;
-                        deferred.resolve(entityName);
+                        params.entityName = entity.name;
+                        deferred.resolve();
                     },
                     function fail() {
                         deferred.reject();
@@ -200,11 +198,18 @@ export default function EntityStateController($scope, $timeout, $location, $stat
                 );
             }
         } else {
-            deferred.resolve('');
+            deferred.resolve();
         }
         return deferred.promise;
     }
 
+    function isEntityResolved(params) {
+        if (!params.entityName || !params.entityName.length) {
+            return false;
+        }
+        return true;
+    }
+
     function parseState(stateBase64) {
         var result;
         if (stateBase64) {