From dfaa6ab4d3444f6e499c1c248e211b97b1a4dc18 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 23 Jun 2020 15:03:07 +0300
Subject: [PATCH] Minor improvements

---
 .../src/app/core/api/widget-subscription.ts   |  1 +
 ui-ngx/src/app/core/http/entity.service.ts    | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ui-ngx/src/app/core/api/widget-subscription.ts b/ui-ngx/src/app/core/api/widget-subscription.ts
index e4cfee4f3e..1e94d23624 100644
--- a/ui-ngx/src/app/core/api/widget-subscription.ts
+++ b/ui-ngx/src/app/core/api/widget-subscription.ts
@@ -383,6 +383,7 @@ export class WidgetSubscription implements IWidgetSubscription {
   private prepareDataSubscriptions(): Observable<any> {
     if (this.hasDataPageLink) {
       this.hasResolvedData = true;
+      this.notifyDataLoaded();
       return of(null);
     }
     const resolveResultObservables = this.configuredDatasources.map((datasource, index) => {
diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index ff1e4e193d..1440cfe4f3 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -45,23 +45,18 @@ import { Datasource, DatasourceType, KeyInfo } from '@app/shared/models/widget.m
 import { UtilsService } from '@core/services/utils.service';
 import { AliasFilterType, EntityAlias, EntityAliasFilter, EntityAliasFilterResult } from '@shared/models/alias.models';
 import { entityFields, EntityInfo, ImportEntitiesResultInfo, ImportEntityData } from '@shared/models/entity.models';
-import {
-  EntityRelationInfo,
-  EntityRelationsQuery,
-  EntitySearchDirection,
-  EntitySearchQuery
-} from '@shared/models/relation.models';
+import { EntityRelationInfo, EntitySearchDirection } from '@shared/models/relation.models';
 import { EntityRelationService } from '@core/http/entity-relation.service';
-import { deepClone, isDefined, isDefinedAndNotNull } from '@core/utils';
-import { Asset, AssetSearchQuery } from '@shared/models/asset.models';
-import { ClaimResult, Device, DeviceCredentialsType, DeviceSearchQuery } from '@shared/models/device.models';
-import { EntityViewSearchQuery } from '@shared/models/entity-view.models';
+import { deepClone, isDefinedAndNotNull } from '@core/utils';
+import { Asset } from '@shared/models/asset.models';
+import { Device, DeviceCredentialsType } from '@shared/models/device.models';
 import { AttributeService } from '@core/http/attribute.service';
 import {
   createDefaultEntityDataPageLink,
   EntityData,
   EntityDataQuery,
-  EntityFilter, EntityKeyType
+  EntityFilter,
+  EntityKeyType
 } from '@shared/models/query/query.models';
 
 @Injectable({
@@ -1259,6 +1254,14 @@ export class EntityService {
         name: entity.name,
         entityType: subscriptionInfo.entityType,
         entityId: entity.id.id,
+        pageLink: {
+          pageSize: 1,
+          page: 0
+        },
+        entityFilter: {
+          type: AliasFilterType.singleEntity,
+          singleEntity: entity.id
+        },
         dataKeys: []
       };
     } else if (subscriptionInfo.type === DatasourceType.function) {